feat(multi selector): implement multi selector support

wix-incubator · Feb 24, 2021 · 897986c · 897986c
1 parent 194a4e7
commit 897986c
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 9 deletions.
diff --git a/src_types/pages/$w.d.ts b/src_types/pages/$w.d.ts
@@ -1,18 +1,37 @@
 // the first part of this file is being generated by => scripts/selector-declaration-builder.js
 // Run `npm run generate-dts` to generate it
-declare type IntersectionArrayAndBase<T, P> = {
+type IntersectionArrayAndBase<T, P> = {
  [K in keyof T]: K extends P ? T[K] : T[K] & T[K][];
 };
+type CommaChar = ","
+type LegalChars = CommaChar | " " | "\n" | "\t"
+type WixElements = PageElementsMap & IntersectionArrayAndBase<TypeNameToSdkType, 'Document'>;
+type NicknameSelector = keyof PageElementsMap
+type TypeSelector = keyof IntersectionArrayAndBase<TypeNameToSdkType, 'Document'>
 
-declare type IsWixElementSelector<S> = S extends keyof WixElementSelector ? WixElementSelector[S] : never;
-declare type WixElementSelector = PageElementsMap & IntersectionArrayAndBase<TypeNameToSdkType, 'Document'>;
+type WixElementSelector = NicknameSelector | TypeSelector
+type VaildSelectorsChars = WixElementSelector | LegalChars
 
+type OnlyVaildSelectorsChars<S> =
+ S extends ""
+ ? any
+ : S extends `${VaildSelectorsChars}${infer Tail}`
+ ? OnlyVaildSelectorsChars<Tail>
+ : never
+
+type HasComma<S> = 
+ S extends `${CommaChar}${infer Tail}`
+ ? unknown
+ : S extends `${VaildSelectorsChars}${infer Tail2}`
+ ? HasCommaRec2<Tail2>
+ : never
+type MultiSelector<S> = S & OnlyVaildSelectorsChars<S> & HasComma<S>
 /**
  * Selects and returns elements from a page.
  */
-declare function $w<T extends keyof WixElementSelector, S extends string>(selector: T | S & IsWixElementSelector<S>):
- S extends keyof WixElementSelector 
- ? WixElementSelector[S]
+declare function $w<T extends WixElementSelector, S extends string>(selector: T | MultiSelector<S>):
+ S extends keyof WixElements 
+ ? WixElements[S]
  : any
 /**
  * The `$w` namespace contains everything you need in order to work
@@ -32,9 +51,9 @@ declare namespace $w {
  /**
  * Selects and returns elements from a page.
  */
- type $w = <T extends keyof WixElementSelector, S extends string>(selector: T | S & IsWixElementSelector<S>) =>
- S extends keyof WixElementSelector 
- ? WixElementSelector[S]
+ type $w = <T extends keyof WixElements, S extends string>(selector: T | MultiSelector<S>) =>
+ S extends keyof WixElements 
+ ? WixElements[S]
  : any
 }
 
diff --git a/test/it/code-samples/positive/pages-$w-dynamic-nicknames/dynamic.js b/test/it/code-samples/positive/pages-$w-dynamic-nicknames/dynamic.js
@@ -21,6 +21,10 @@ $w.onReady(function() {
 
  $w("#text1").text = lastClicked
  $w("#text2").text = previousPageURL
+ $w("Button").hide()
+ $w("Button").forEach(b => b.show())
+ $w("Button, Text").anyProperty()
+ $w("#button1, Text, Document").anyProperty2
 
 });