fix: add scope to jss test

hosseinmd · Nov 19, 2021 · 7c683ef · 7c683ef
1 parent 26024aa
commit 7c683ef
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 14 deletions.
diff --git a/packages/component/src/__test__/jss.test.ts b/packages/component/src/__test__/jss.test.ts
@@ -1,3 +1,3 @@
 import { checkJssIndex } from "reactjs-view-core/src/tests/jssStructure";
 
-checkJssIndex(__dirname);
+checkJssIndex(__dirname, "coreModule");
diff --git a/packages/component/src/atoms/anchorView/index.tsx b/packages/component/src/atoms/anchorView/index.tsx
@@ -16,7 +16,7 @@ const useStyles = createUseStyles(
     },
   },
   {
-    index: generateIndex("atoms", "module"),
+    index: generateIndex("atoms", "coreModule"),
   },
 );
 

diff --git a/packages/component/src/atoms/view/index.tsx b/packages/component/src/atoms/view/index.tsx
@@ -19,7 +19,7 @@ const useStyles = createUseStyles(
     },
   },
   {
-    index: generateIndex("atoms", "module"),
+    index: generateIndex("atoms", "coreModule"),
   },
 );
 

diff --git a/packages/component/src/molecules/loadingView/styles.ts b/packages/component/src/molecules/loadingView/styles.ts
@@ -10,7 +10,7 @@ const useStyles = createUseStyles(
     },
     container: {},
   },
-  { index: generateIndex("molecules", "module") },
+  { index: generateIndex("molecules", "coreModule") },
 );
 
 export default useStyles;
diff --git a/packages/component/src/molecules/scrollView/index.tsx b/packages/component/src/molecules/scrollView/index.tsx
@@ -16,7 +16,7 @@ const useStyle = createUseStyles(
     },
   },
   {
-    index: generateIndex("molecules", "module"),
+    index: generateIndex("molecules", "coreModule"),
   },
 );
 

diff --git a/packages/component/src/molecules/textView/base.tsx b/packages/component/src/molecules/textView/base.tsx
@@ -72,7 +72,7 @@ const classes = jss
       },
     },
     {
-      index: generateIndex("molecules", "module"),
+      index: generateIndex("molecules", "coreModule"),
     },
   )
   .attach().classes;

diff --git a/packages/component/src/molecules/textView/styles.ts b/packages/component/src/molecules/textView/styles.ts
@@ -81,7 +81,7 @@ const useThemes = createUseStyles(
       fontFamily: "yekanBakhFaBold",
     },
   },
-  { index: generateIndex("molecules", "module") },
+  { index: generateIndex("molecules", "coreModule") },
 );
 
 jss

diff --git a/packages/core/src/tests/jssStructure.ts b/packages/core/src/tests/jssStructure.ts
@@ -1,5 +1,6 @@
 import fs from "fs";
 import { join, resolve } from "path";
+import { Scope } from "../utilities/generateIndex";
 
 const components = [
   "atoms",
@@ -44,11 +45,12 @@ function recursiveChecker(
   componentDir: string,
   atomicName: string,
   resolver: (...dirs: string[]) => string,
+  scope?: Scope,
 ) {
   const files = fs.readdirSync(resolver(componentDir));
   files.forEach((file) => {
     if (fs.lstatSync(resolver(componentDir, file)).isDirectory()) {
-      recursiveChecker(join(componentDir, file), atomicName, resolver);
+      recursiveChecker(join(componentDir, file), atomicName, resolver, scope);
 
       return;
     }
@@ -60,7 +62,17 @@ function recursiveChecker(
     const content = fs.readFileSync(resolver(componentDir, file)).toString();
 
     if (content.includes("generateIndex")) {
-      if (content.includes(`generateIndex("${atomicName}"`)) {
+      if (
+        content
+          .replace(/[\n\s]+/g, "")
+          .match(
+            new RegExp(
+              `generateIndex\\(["']${atomicName}["']${
+                scope ? `,["']${scope}["']` : ""
+              }`,
+            ),
+          )
+      ) {
         return;
       } else {
         throwError("", componentDir, file, atomicName, resolver);
@@ -74,7 +86,7 @@ function recursiveChecker(
   });
 }
 
-function checkJssIndex(dirname: string) {
+function checkJssIndex(dirname: string, scope?: Scope) {
   const resolver = (...dirs: string[]) => resolve(dirname, `../`, ...dirs);
 
   const atomicsDirs = readRoot(resolver);
@@ -90,7 +102,12 @@ function checkJssIndex(dirname: string) {
             return;
           }
 
-          recursiveChecker(join(atomicDir, componentDir), atomicDir, resolver);
+          recursiveChecker(
+            join(atomicDir, componentDir),
+            atomicDir,
+            resolver,
+            scope,
+          );
         });
       }
     });

diff --git a/packages/core/src/utilities/generateIndex.ts b/packages/core/src/utilities/generateIndex.ts
@@ -15,14 +15,16 @@ const getIndexes = (startIndex: number) => ({
   pages: startIndex + 11000,
 });
 
-const levels = {
+const scopes = {
   coreModule: getIndexes(0),
   module: getIndexes(20000),
   app: getIndexes(40000),
 };
 
-function generateIndex(scope: Index, level: keyof typeof levels = "app") {
-  return levels[level][scope]++;
+export type Scope = keyof typeof scopes;
+
+function generateIndex(index: Index, scope: Scope = "app") {
+  return scopes[scope][index]++;
 }
 
 export { generateIndex };
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,7 @@ const useStyles = createUseStyles( @@
         },
       },
       {
-        index: generateIndex("atoms", "module"),
+        index: generateIndex("atoms", "coreModule"),
       },
     );
@@ Expand Down @@