From c3ba8b58b86a55613f48d28c4fd6ce72eb0df29b Mon Sep 17 00:00:00 2001
From: Andrii Kirmas <kirmas@phystech.edu>
Date: Thu, 11 Mar 2021 10:00:09 +0300
Subject: [PATCH] #24 Recover el-mod shortcut in bem

---
 __recipes__/index.test.ts |  1 -
 src/bem.types.test.ts     |  2 --
 src/bem.types.ts          | 13 +++++++------
 src/ts-swiss.types.ts     |  5 ++++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/__recipes__/index.test.ts b/__recipes__/index.test.ts
index b753bb0..501790a 100644
--- a/__recipes__/index.test.ts
+++ b/__recipes__/index.test.ts
@@ -28,7 +28,6 @@ it("go", () => {
   const bem = classBeming<ClassNamesProperty<CssModule> & ClassNamed>()
   expect(bem(true, {
     "block": {
-      //@ts-expect-error //TODO Recover shortcut
       "&": "m",
       "el": {"m": "X"}
     }
diff --git a/src/bem.types.test.ts b/src/bem.types.test.ts
index 0b2bbaa..5c26baf 100644
--- a/src/bem.types.test.ts
+++ b/src/bem.types.test.ts
@@ -35,7 +35,6 @@ describe("BemQuery", () => {
       //@ts-expect-error
       "el=1": {block: {el: 1}},
       "el": {block: {el: true}},
-      //@ts-expect-error //TODO Recover shortcut
       "el: mod": {block: {el: "mod"}},
       "el: -mod": {block: {el: {mod: false}}},
       "el: +mod": {block: {el: {mod: true}}}
@@ -73,7 +72,6 @@ describe("BemQuery", () => {
       //@ts-expect-error
       "el": {block: {el: true}},
       "$": {block: {$: true}},
-      //@ts-expect-error //TODO Recover shortcut
       "$: mod": {block: {$: "mod"}},
       "$: +mod": {block: {$: {mod: true}}},
       "$: -mod": {block: {$: {mod: false}}},
diff --git a/src/bem.types.ts b/src/bem.types.ts
index a3c6402..8875d84 100644
--- a/src/bem.types.ts
+++ b/src/bem.types.ts
@@ -2,6 +2,7 @@ import type { CssModule } from "./definitions.types"
 import type {
   Subest,
   Strip,
+  PartDeep,
   // PartDeep
 } from "./ts-swiss.types"
 import type { ClassNamed } from "./main.types"
@@ -29,14 +30,14 @@ export type BemQuery<
   bModKey extends string = "blockModKey" extends keyof ReactClassNaming.BemOptions
   ? ReactClassNaming.BemOptions["blockModKey"]
   : ReactClassNaming.BemOptions["$default"]["blockModKey"],
-> = string extends classes ? BemAbsraction : {
-  [b in Strip<Strip<classes, delM>, delE>]?: boolean | (
-    // [classes extends `${b}${delE | delM}${string}` ? true : never] extends [never] ? never :
+> = string extends classes ? BemAbsraction : PartDeep<{
+  [b in Strip<Strip<classes, delM>, delE>]: boolean | (
     Extends<classes, `${b}${delE | delM}${string}`, 
       {
-        [e in Elements<classes, b>]?: boolean
+        [e in Elements<classes, b>]: boolean
+        | (MVs<classes, b, e> extends `${string}${delM}${string}` ? never : MVs<classes, b, e>)
         | (
-          {[m in Strip<MVs<classes, b, e>, delM>]?: 
+          {[m in Strip<MVs<classes, b, e>, delM>]: 
             classes extends `${b}${
               e extends bModKey ? "" : `${delE}${e}`
             }${delM}${m}${delM}${infer V}`
@@ -48,7 +49,7 @@ export type BemQuery<
     >
     // : never
   )
-}
+}>
 
 type Extends<T, V, X> = [T extends V ? true : never] extends [never] ? never : X
 
diff --git a/src/ts-swiss.types.ts b/src/ts-swiss.types.ts
index 0711297..4739854 100644
--- a/src/ts-swiss.types.ts
+++ b/src/ts-swiss.types.ts
@@ -27,4 +27,7 @@ export type Cut<Str extends string, Delimiter extends string> = Str extends `${s
 export type Subest<Base, Extendent> = Base extends Extendent ? Extendent : Base
 // export type SubestDeep<Base, Extendent> = Base extends Extendent ? Extendent : Base
 
-export type PartDeep<T> = Exclude<T, AnyObject> | {[K in keyof Extract<T, AnyObject>]?: Extract<T, AnyObject>[K]}
+export type PartDeep<T> = Exclude<T, AnyObject> | (
+  // [Extract<T, AnyObject>] extends [never] ? never :
+  T extends AnyObject ? {[K in keyof Extract<T, AnyObject>]?: PartDeep<Extract<T, AnyObject>[K]>} : never
+)