#24 Implement v2 bem query

askirmas · Mar 10, 2021 · fafc380 · fafc380
1 parent 086eebc
commit fafc380
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 43 deletions.
diff --git a/src/bem.types.test.ts b/src/bem.types.test.ts
@@ -91,7 +91,6 @@ describe("BemQuery2", () => {
       "{}": {block: {}},
       //@ts-expect-error
       "el": {block: {el: true}},
-      //@ts-expect-error
       "$": {block: {$: true}},
       "$: mod": {block: {$: "mod"}},
       "$: +mod": {block: {$: {mod: true}}},
@@ -108,7 +107,6 @@ describe("BemQuery2", () => {
       "{}": {block: {}},
       //@ts-expect-error
       "el": {block: {el: true}},
-      //@ts-expect-error
       "$": {block: {$: true}},
       //@ts-expect-error
       "$: mod": {block: {$: "mod"}},
@@ -132,13 +130,9 @@ describe("BemQuery2", () => {
     >> = {
       "exact": {
         block: {
-          $: {
-            mod1: true,
-            mod2: "val1"
-          },
+          $: "mod1",
           el: {
             mod1: false,
-            //@ts-expect-error weird bug
             mod2: "val1"
           }
         }

diff --git a/src/bem.types.ts b/src/bem.types.ts
@@ -67,44 +67,24 @@ export type BemQuery2<
         : classes extends `${b}${delM}${string}`
         ? bModKey
         : never
-      )]?: e extends bModKey
+      )]?: boolean
+      | (
+        classes extends `${b}${
+          e extends bModKey ? "" : `${delE}${e}`
+        }${delM}${infer MV}`
         ? (
-          classes extends `${b}${delM}${infer bMV}`
-          ? (
-            (
-              bMV extends `${infer bM}${delM}${infer bV}`
-              ? {[k in bM]?: false | bV}
-              : (
-                bMV | {[k in bMV]?: boolean}
-              )
-            )
-          )
-          : never
-        )
-        : (
-          boolean | (
-            classes extends `${b}${delE}${e}${delM}${infer eMV}`
-            ? (
-              (
-                eMV extends `${infer eM}${delM}${infer eV}`
-                ? {[k in eM]?: false | eV}
-                : (
-                  eMV | {[k in eMV]?: boolean}
-                )
-              )
-              // (
-              //   eMV extends `${string}${delM}${string}`
-              //   ? never 
-              //   : eMV
-              // ) | {
-              //   [eM in Strip<eMV, delM>]?: false | (
-              //     eMV extends `${eM}${delM}${infer eV}` ? eV : true
-              //   )
-              // }
-            )
-            : never
-          )
+          (MV extends `${string}${delM}${string}` ? never : MV)
+          | {
+            [
+              m in Strip<MV, delM>
+            ]?: MV extends `${m}${delM}${infer V}`
+            //TODO why `[]` is hack to make things work?
+            ? false | V | []
+            : boolean
+          }
         )
+        : never
+      )
     }
     : never
   )