#10 Purize bem-core tests. #39 Add helper to have blocks despite post…

…-processor clearing
askirmas · Mar 12, 2021 · ef757ff · ef757ff
1 parent b64a3d4
commit ef757ff
Show file tree

Hide file tree

Showing 7 changed files with 61 additions and 127 deletions.
diff --git a/__recipes__/index.test.ts b/__recipes__/index.test.ts
@@ -5,19 +5,19 @@ import type {ClassHash, ReactClassNaming} from "react-classnaming"
 declare module "react-classnaming" {
   namespace ReactClassNaming {
     interface BemOptions {
-      // TODO #30 elementDelimiter: "_";
+      elementDelimiter: "_";
       modDelimiter: "-";
     }
   }
 }
 
 setOptions({
-  // TODO #30 elementDelimiter: "_",
+  elementDelimiter: "_",
   modDelimiter: "-",
 })
 
 type CssModule = Record<
-  "block"|"block-m"
+  |"block-m"
   |"block_el"|"block_el-m-X"|"block_el-m-Y",
   ClassHash
 >

diff --git a/__sandbox__/bem.test.ts b/__sandbox__/bem.test.ts
@@ -155,9 +155,9 @@ describe("upon delimiter", () => {
     type Elements<
         classes extends string,
         b extends string,
-        delE extends string = "__" /*"elementDelimiter" extends keyof ReactClassNaming.BemOptions
+        delE extends string = "elementDelimiter" extends keyof ReactClassNaming.BemOptions
         ? ReactClassNaming.BemOptions["elementDelimiter"]
-        : ReactClassNaming.BemOptions["$default"]["elementDelimiter"]*/,
+        : ReactClassNaming.BemOptions["$default"]["elementDelimiter"],
         delM extends string = "modDelimiter" extends keyof ReactClassNaming.BemOptions
         ? ReactClassNaming.BemOptions["modDelimiter"]
         : ReactClassNaming.BemOptions["$default"]["modDelimiter"],
@@ -172,9 +172,9 @@ describe("upon delimiter", () => {
 
     type BemQuery<
       classes extends string,
-      delE extends string = "__" /*"elementDelimiter" extends keyof ReactClassNaming.BemOptions
+      delE extends string = "elementDelimiter" extends keyof ReactClassNaming.BemOptions
       ? ReactClassNaming.BemOptions["elementDelimiter"]
-      : ReactClassNaming.BemOptions["$default"]["elementDelimiter"]*/,
+      : ReactClassNaming.BemOptions["$default"]["elementDelimiter"],
       delM extends string = "modDelimiter" extends keyof ReactClassNaming.BemOptions
       ? ReactClassNaming.BemOptions["modDelimiter"]
       : ReactClassNaming.BemOptions["$default"]["modDelimiter"],
@@ -211,9 +211,9 @@ describe("upon delimiter", () => {
       classes extends string,
       b extends string,
       e extends string,
-      delE extends string = "__" /*"elementDelimiter" extends keyof ReactClassNaming.BemOptions
+      delE extends string = "elementDelimiter" extends keyof ReactClassNaming.BemOptions
       ? ReactClassNaming.BemOptions["elementDelimiter"]
-      : ReactClassNaming.BemOptions["$default"]["elementDelimiter"]*/,
+      : ReactClassNaming.BemOptions["$default"]["elementDelimiter"],
       delM extends string = "modDelimiter" extends keyof ReactClassNaming.BemOptions
       ? ReactClassNaming.BemOptions["modDelimiter"]
       : ReactClassNaming.BemOptions["$default"]["modDelimiter"],

diff --git a/src/bem.core.test.ts b/src/bem.core.test.ts
@@ -36,7 +36,7 @@ describe(bem2arr.name, () => {
 
 describe("optioning", () => {
   const defaultOpts: BemOptions = {
-    // TODO #30 elementDelimiter: "__",
+    elementDelimiter: "__",
     modDelimiter: "--",
   }
 
@@ -56,7 +56,7 @@ describe("optioning", () => {
   it("set another", () => {
     //TODO #29 test bem with not default options
     const opts: BemOptions = {
-      // TODO #30 elementDelimiter: "_",
+      elementDelimiter: "_",
       modDelimiter: "-",
     }
     setOptions(opts)

diff --git a/src/bem.core.ts b/src/bem.core.ts
@@ -1,10 +1,10 @@
 import type { BemInGeneral } from "./bem.types"
 
 let modDelimiter = "--"
-// TODO #30 , elementDelimiter = "__"
+, elementDelimiter = "__"
 
 export type BemOptions = {
-  // TODO #30 elementDelimiter: string
+  elementDelimiter: string
   modDelimiter: string
 }
 
@@ -46,15 +46,16 @@ function bem2arr(query: BemInGeneral) {
 }
 
 function setOptions({
-  // TODO #30 elementDelimiter: elD = elementDelimiter,
+  elementDelimiter: elD = elementDelimiter,
   modDelimiter: modDel = modDelimiter
 }: Partial<BemOptions>) {
   modDelimiter = modDel
+  elementDelimiter = elD
 }
 
 function getOptions() {
   return {
-    // TODO #30 elementDelimiter,
+    elementDelimiter,
     modDelimiter,
   }
 }
diff --git a/src/bem.types.test.ts b/src/bem.types.test.ts
@@ -2,146 +2,76 @@ import type {BemQuery} from "./bem.types"
 
 describe("BemQuery", () => {
   it("block", () => {
+    const {block} = {} as Record<string, undefined>
+
     const checks: Record<string, BemQuery<"block">> = {
-      //@ts-expect-error
-      "number": {block: 1},
       "true": {block: true},
+      "undefined": {block},
+
+      /** No modifier - couldn't be false as return of condition */
       //@ts-expect-error
+      "false": {block: false},
+      //@ts-expect-error 
       "{}": {block: {}},
     }
     expect(checks).toBeInstanceOf(Object)
   })
 
   it("block__el", () => {
     const checks: Record<string, BemQuery<"block__el">> = {
-      //@ts-expect-error
-      "number": {block: 1},
-      //@ts-expect-error
-      "true": {block: true},
-      //@ts-expect-error
-      "{}": {block: {}},
-      //@ts-expect-error
-      "el=1": {block: {el: {}}},
-      //@ts-expect-error
-      "el": {block: {el: true}},
-      "block__el": {block__el: true}
-    }
-    expect(checks).toBeInstanceOf(Object)
-  })
-
-  it("block__el--mod", () => {
-    const checks: Record<string, BemQuery<"block__el--mod">> = {
-      //@ts-expect-error
-      "number": {block: 1},
-      //@ts-expect-error
-      "true": {block: true},
-      //@ts-expect-error
-      "{}": {block: {}},
-      //@ts-expect-error
-      "el=1": {block: {el: 1}},
-      //@ts-expect-error`
-      "el": {block: {el: true}},
-      //@ts-expect-error
-      "el: mod": {block: {el: "mod"}},
-      //@ts-expect-error
-      "el: [mod]": {block: {el: ["mod"]}},
-      //@ts-expect-error
-      "el: -mod": {block: {el: {mod: false}}},
-      //@ts-expect-error
-      "el: +mod": {block: {el: {mod: true}}},
-
-      //@ts-expect-error
-      "block__el=1": {block__el: 1},
       "block__el": {block__el: true},
-      "block__el: mod": {block__el: "mod"},
-      //@ts-expect-error //TODO #40
-      "block__el: [mod]": {block__el: ["mod"]},
-      "block__el: -mod": {block__el: {mod: false}},
-      "block__el: +mod": {block__el: {mod: true}}
-    }
-    expect(checks).toBeInstanceOf(Object)
-  })  
-
-  it("block__el--mod--val", () => {
-    const checks: Record<string, BemQuery<"block__el--mod--val">> = {
-      //@ts-expect-error
-      "number": {block: 1},
-      //@ts-expect-error
-      "true": {block: true},
-      //@ts-expect-error
-      "{}": {block: {}},
-      //@ts-expect-error
-      "el=1": {block__el: 1},
-      "el": {block__el: true},
-      //@ts-expect-error
-      "el: mod": {block__el: "mod"},
-      //@ts-expect-error
-      "el: mod": {block__el: ["mod"]},
-      "el: -mod": {block__el: {mod: false}},
-      //@ts-expect-error
-      "el: +mod": {block__el: {mod: true}},
-      "el: mod=val": {block__el: {mod: "val"}},
+      /** `block` may be ommited in CSS post-processor but it exists in ontology  */
+      "block": {block: true},
     }
     expect(checks).toBeInstanceOf(Object)
-  })  
+  })
 
   it("block--mod", () => {
     const checks: Record<string, BemQuery<"block--mod">> = {
-      //@ts-expect-error
-      "number": {block: 1},
-      "true": {block: true},
+      /** Numbers are not allowed */
+      //@ts-expect-error 
+      "0": {block: 0},
+      //@ts-expect-error 
+      "1": {block: 1},
+
+      /** Possible Output of applied conditions for modifications */
+      "false": {block: false},
+      "{}": {block: {}}, 
+
+      /** Possible mod apply options */
       "mod": {block: "mod"},
-      "{}": {block: {}},
-      //@ts-expect-error
-      "el": {block: {el: true}},
-      //@ts-expect-error
-      "$": {block: {$: true}},
-      //@ts-expect-error
-      "$: mod": {block: {$: "mod"}},
-      //@ts-expect-error
-      "$: +mod": {block: {$: {mod: true}}},
-      //@ts-expect-error
-      "$: -mod": {block: {$: {mod: false}}},
+      "mod-": {block: {mod: false}},
+      "mod+": {block: {mod: true}},
+      "-mod": {block: false && {mod: true}},
     }
     expect(checks).toBeInstanceOf(Object)
   })  
 
   it("block--mod--val", () => {
     const checks: Record<string, BemQuery<"block--mod--val">> = {
-      //@ts-expect-error
-      "number": {block: 1},
-      "true": {block: true},
+      /** Modifier should have value */
       //@ts-expect-error
       "mod": {block: "mod"},
-      "{}": {block: {}},
-      //@ts-expect-error
-      "el": {block: {el: true}},
-      //@ts-expect-error
-      "mod---val": {block: "mod--val"},
-      //@ts-expect-error,
-      "mod+": {block: {"mod": true}},
-      "mod-": {block: {"mod": false}},
-      "mod:val": {block: {"mod": "val"}},
-      //@ts-expect-error
-      "$": {block: {$: true}},
       //@ts-expect-error
-      "$: mod": {block: {$: "mod"}},
-      //@ts-expect-error
-      "$: mod--val": {block: {$: "mod--val"}},
-      //@ts-expect-error
-      "$: +mod--val": {block: {$: {"mod--val": true}}},
-      //@ts-expect-error
-      "$: -mod--val": {block: {$: {"mod--val": false}}},
-      //@ts-expect-error
-      "$: -mod": {block: {$: {mod: false}}},
-      //@ts-expect-error
-      "$: +mod": {block: {$: {mod: true}}},
-      //@ts-expect-error
-      "$: mod=val": {block: {$: {mod: "val"}}},
+      "mod+": {block: {mod: true}},
+
+      /** Usage */
+      "mod-": {block: {mod: false}},
+      "mod: val": {block: {mod: "val"}},
     }
     expect(checks).toBeInstanceOf(Object)
   })  
 
+  it("#40 array of midfiers", () => {
+    type Single = BemQuery<"block--modB"|"block--modV--val">
+    //@ts-expect-error
+    const modB_string: Single = {block: ["modB"]}
+    //@ts-expect-error
+    , modB_obj: Single = {block: [{modB: true}]}
+    //@ts-expect-error
+    , modV_obj: Single = {block: [{modV: "val"}]}
+  })
+
   it("mix #1", () => {
     const checks: Record<string, BemQuery<
     `${"block" | "block__el"}--${"mod1"|"mod2--val1"|"mod2--val2"}`

diff --git a/src/bem.types.ts b/src/bem.types.ts
@@ -45,11 +45,14 @@ export type ClassBeming<
 
 export type BemQuery<
   classes extends string,
+  delE extends string = "elementDelimiter" extends keyof ReactClassNaming.BemOptions
+  ? ReactClassNaming.BemOptions["elementDelimiter"]
+  : ReactClassNaming.BemOptions["$default"]["elementDelimiter"],
   delM extends string = "modDelimiter" extends keyof ReactClassNaming.BemOptions
   ? ReactClassNaming.BemOptions["modDelimiter"]
   : ReactClassNaming.BemOptions["$default"]["modDelimiter"],
 > = string extends classes ? BemInGeneral : PartDeep<{
-  [base in Strip<classes, delM>]: true
+  [base in Strip<classes, delM> | Strip<Strip<classes, delM>, delE>]: true
   | (
     Extends<classes, `${base}${delM}${string}`, 
       false

diff --git a/src/index.ts b/src/index.ts
@@ -18,7 +18,7 @@ export { setOptions } from "./bem.core"
 export declare namespace ReactClassNaming {
   export interface BemOptions {
     $default: {
-      // TODO #30 elementDelimiter: "__"
+      elementDelimiter: "__",
       modDelimiter: "--"
     } 
   }