eslint-plugin-stratified-design 0.12.6 → 0.12.8

package/lib/rules/no-disallowed-imports.js

@@ -121,6 +121,26 @@ module.exports = {
       fileDir,
       createAliases(options.aliases)
     );
+    const report = (node, pathSearcher) => {
+      const [theMember, theImportSpec] = options.imports.reduce(
+        pathSearcher,
+        [undefined, undefined]
+      );
+      if (!theMember || !theImportSpec) return;
+
+      const { allow, disallow } = theImportSpec;
+      const fileSourceFromCwd = fromCwd(context.cwd, fileSource);
+      const isAllowed =
+        (allow ? Boolean(allow.find(match(fileSourceFromCwd))) : true) &&
+        (disallow ? !disallow.find(match(fileSourceFromCwd)) : true);
+      if (isAllowed) return;
+
+      context.report({
+        node,
+        messageId: "no-disallowed-imports",
+        data: { member: theMember, from: theImportSpec.import.from },
+      });
+    }
     return {
       ImportDeclaration(node) {
         const modulePath = createModulePath(node.source.value);
@@ -168,26 +188,63 @@ module.exports = {
 
           return [undefined, undefined];
         };
+        report(node, searchTheImportPath)
+      },
+      ExportNamedDeclaration(node) {
+        if (!node.source) return
+        const modulePath = createModulePath(node.source.value);
+        /**
+         * @param {[string | undefined, ImportPath | undefined]} param0
+         * @param {ImportPath} importSpec
+         */
+        const searchTheImportPath = ([theMember, theImportSpec], importSpec) => {
+          if (theMember && theImportSpec) return [theMember, theImportSpec];
+
+          const isModulePathMatched = match(fromCwd(context.cwd, modulePath))(importSpec.import.from)
 
-        const [theMember, theImportSpec] = options.imports.reduce(
-          searchTheImportPath,
-          [undefined, undefined]
-        );
-        if (!theMember || !theImportSpec) return;
-
-        const { allow, disallow } = theImportSpec;
-        const fileSourceFromCwd = fromCwd(context.cwd, fileSource);
-        const isAllowed =
-          (allow ? Boolean(allow.find(match(fileSourceFromCwd))) : true) &&
-          (disallow ? !disallow.find(match(fileSourceFromCwd)) : true);
-        if (isAllowed) return;
-
-        context.report({
-          node,
-          messageId: "no-disallowed-imports",
-          data: { member: theMember, from: theImportSpec.import.from },
-        });
+          if (importSpec.import.member === ANY_MEMBER) {
+            return isModulePathMatched ? ['Any member', importSpec] : [undefined, undefined]
+          }
+
+          const exportedSpecifiers = node.specifiers.map((specifier) => {
+            if (specifier.type === "ExportSpecifier") return specifier.exported.name;
+            return "";
+          });
+
+          const member = importSpec.import.member.find((specifier) =>
+            exportedSpecifiers.some((sp) => sp === specifier)
+          );
+
+          if (member && isModulePathMatched) return [`'${member}'`, importSpec];
+          return [undefined, undefined];
+        }
+        report(node, searchTheImportPath)
       },
+      ExportAllDeclaration(node) {
+        if (!node.source) return
+        const modulePath = createModulePath(node.source.value);
+        /**
+         * @param {[string | undefined, ImportPath | undefined]} param0
+         * @param {ImportPath} importSpec
+         */
+        const searchTheImportPath = ([theMember, theImportSpec], importSpec) => {
+          if (theMember && theImportSpec) return [theMember, theImportSpec];
+
+          const isModulePathMatched = match(fromCwd(context.cwd, modulePath))(importSpec.import.from)
+
+          if (importSpec.import.member === ANY_MEMBER) {
+            return isModulePathMatched ? ['Any member', importSpec] : [undefined, undefined]
+          }
+
+          if (importSpec.import.member.includes(NAMESPACE) && isModulePathMatched) {
+            if (!node.exported) return [`'${NAMESPACE}'`, importSpec]
+            return [`'${node.exported.name}'`, importSpec]
+            
+          }
+          return [undefined, undefined];
+        }
+        report(node, searchTheImportPath)
+      }
     };
   },
 };

package/lib/rules/no-same-level-funcs.js

@@ -111,6 +111,31 @@ const deriveVarName = (nodeOrToken, levels) => {
   }
 };
 
+const or = (...args) => {
+  for (const arg of args) {
+    try {
+      const result = arg();
+      if (result) return result;
+      else continue;
+    } catch (e) {
+      continue;
+    }
+  }
+  return undefined;
+};
+
+const deriveNames = (nodeOrToken) => {
+  const declaration = deriveDeclaration(nodeOrToken);
+  const names = or(
+    () => declaration.id.name,
+    () => declaration.declarations[0].id.name,
+    () => declaration.declarations[0].id.elements.map(({ name }) => name),
+    () =>
+      declaration.declarations[0].id.properties.map(({ value }) => value.name)
+  );
+  return names === undefined ? [] : Array.isArray(names) ? names : [names];
+};
+
 /**
  * @param {SourceCode} sourceCode
  * @param {Node | Token} nodeOrToken
@@ -243,12 +268,9 @@ module.exports = {
     return {
       Program(node) {
         node.body.forEach((token) => {
-          const name = deriveFuncName(token);
-          if (name !== null) levels[name] = deriveLevel(sourceCode, token);
-        });
-        node.body.forEach((token) => {
-          const name = deriveVarName(token, levels);
-          if (name !== null) levels[name] = deriveLevel(sourceCode, token);
+          deriveNames(token).forEach((name) => {
+            if (name) levels[name] = deriveLevel(sourceCode, token);
+          });
         });
       },
       CallExpression(node) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-stratified-design",
-  "version": "0.12.6",
+  "version": "0.12.8",
   "description": "ESlint rules for stratified design",
   "keywords": [
     "eslint",
@@ -20,6 +20,7 @@
   "scripts": {
     "lint": "eslint .",
     "test": "mocha tests --recursive",
+    "test:watch": "mocha tests --recursive --watch",
     "versioning": "node ./scripts/versioning"
   },
   "dependencies": {

package/tests/lib/rules/no-disallowed-imports.js

@@ -215,6 +215,224 @@ ruleTester.run("no-disallowed-imports", rule, {
         },
       ],
     },
+
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [],
+    },
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [{ import: { member: ["foo"], from: "src/fileA" } }],
+        },
+      ],
+    },
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["baz"], from: "src/fileC" },
+              allow: ["src/**/*.js"],
+            },
+            {
+              import: { member: ["foo", "bar"], from: "src/fileA" },
+              allow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo", "bar"], from: "src/fileA" },
+              disallow: ["src/**/*.test.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo", "bar"], from: "src/fileA" },
+              allow: ["src/**/*.js"],
+              disallow: ["src/**/*.test.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { foo } from '@/fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo"], from: "src/fileA" },
+              allow: ["src/**/*.js"],
+            },
+          ],
+          aliases: { "@/": "./src/" },
+        },
+      ],
+    },
+    {
+      code: "export * from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["*"], from: "src/fileA" },
+              allow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export * as name from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["*"], from: "src/fileA" },
+              allow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { foo } from 'nodeModule'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["*"], from: "src/fileA" },
+              disallow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { anyMember } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "src/fileA" },
+              allow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export * as namespace from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "src/fileA" },
+              allow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { anyMember } from './fileA.act'",
+      filename: "./src/fileB.cal.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "**/*.act" },
+              allow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { anyMember } from 'fileA.cal'",
+      filename: "./src/fileB.act.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "**/*.act" },
+              disallow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "export { anyMember } from 'nodeModule'",
+      filename: "./src/fileB.cal.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "**/*.act" },
+              disallow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
+
+    {
+      code: "const foo = 'a'; export { foo };",
+      filename: "./src/fileB.cal.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo"], from: "**/*.act" },
+              disallow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "const foo = 'a'; export default foo;",
+      filename: "./src/fileB.cal.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo"], from: "**/*.act" },
+              disallow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
   ],
   invalid: [
     {
@@ -312,5 +530,101 @@ ruleTester.run("no-disallowed-imports", rule, {
         { messageId: "no-disallowed-imports", data: { member: "Any member", from: "**/*.act" } },
       ],
     },
+
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo"], from: "src/fileA" },
+              allow: ["src/**/*.test.js"],
+            },
+          ],
+        },
+      ],
+      errors: [{ messageId: "no-disallowed-imports", data: { member: "'foo'", from: "src/fileA" } }],
+    },
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo"], from: "src/fileA" },
+              disallow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+      errors: [{ messageId: "no-disallowed-imports", data: { member: "'foo'", from: "src/fileA" } }],
+    },
+    {
+      code: "export { foo } from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["foo"], from: "src/fileA" },
+              allow: ["src/**/*.js"],
+              disallow: ["src/**/fileB.*"],
+            },
+          ],
+        },
+      ],
+      errors: [{ messageId: "no-disallowed-imports", data: { member: "'foo'", from: "src/fileA" } }],
+    },
+    {
+      code: "export * from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["*"], from: "src/fileA" },
+              disallow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+      errors: [{ messageId: "no-disallowed-imports", data: { member: "'*'", from: "src/fileA" } }],
+    },
+    {
+      code: "export * as name from './fileA'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["*"], from: "src/fileA" },
+              disallow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+      errors: [
+        { messageId: "no-disallowed-imports", data: { member: "'name'", from: "src/fileA" } },
+      ],
+    },
+    {
+      code: "export { anyMember } from './fileA.act'",
+      filename: "./src/fileB.cal.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "**/*.act" },
+              disallow: ["**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+      errors: [
+        { messageId: "no-disallowed-imports", data: { member: "Any member", from: "**/*.act" } },
+      ],
+    },
   ],
 });

package/tests/lib/rules/no-same-level-funcs.js

@@ -218,6 +218,19 @@ ruleTester.run("no-same-level-funcs", rule, {
       code: "const arr2 = []; const arr1 = [...arr2];",
       filename: "./src/foo.js",
     },
+
+    {
+      code: "//@level 2\nconst [dat, fn2] = someFn()\nconst fn1 = () => { fn2() }\n",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "//@level 2\nconst {dat, fn2} = someFn()\nconst fn1 = () => { fn2() }\n",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "//@level 2\nconst {dat, fn2: func2} = someFn()\nconst fn1 = () => { func2() }\n",
+      filename: "./src/foo.js",
+    },
   ],
   invalid: [
     {
@@ -377,5 +390,21 @@ ruleTester.run("no-same-level-funcs", rule, {
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "arr" } }],
     },
+
+    {
+      code: "const [dat, fn2] = someFn()\nconst fn1 = () => { fn2() }\n",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "fn2" } }],
+    },
+    {
+      code: "const {dat, fn2} = someFn()\nconst fn1 = () => { fn2() }\n",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "fn2" } }],
+    },
+    {
+      code: "const {dat, fn2: func2} = someFn()\nconst fn1 = () => { func2() }\n",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func2" } }],
+    },
   ],
 });