eslint-plugin-stratified-design 0.12.0 → 0.12.2

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

@@ -136,8 +136,10 @@ module.exports = {
             return [theMember, theImportSpec];
           }
 
+          const isModulePathMatched = match(fromCwd(context.cwd, modulePath))(importSpec.import.from)
+
           if (importSpec.import.member === ANY_MEMBER) {
-            return ['Any member', importSpec]
+            return isModulePathMatched ? ['Any member', importSpec] : [undefined, undefined]
           }
 
           const importedSpecifiers = node.specifiers.map((specifier) => {
@@ -152,10 +154,7 @@ module.exports = {
             importedSpecifiers.some((sp) => sp === specifier)
           );
 
-          if (
-            member &&
-            match(fromCwd(context.cwd, modulePath))(importSpec.import.from)
-          ) {
+          if (member && isModulePathMatched) {
             if (member === DEFAULT || member === NAMESPACE) {
               const theMember = node.specifiers.find(
                 ({ type }) =>

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

@@ -140,21 +140,22 @@ module.exports = {
     return {
       Program(node) {
         node.body.forEach((token) => {
-          const isFuncDeclaration = token.type === "FunctionDeclaration";
+          const declaration = token.type === 'ExportNamedDeclaration' || token.type === 'ExportDefaultDeclaration' ? token.declaration : token
+          const isFuncDeclaration = declaration.type === "FunctionDeclaration";
           const isVarDeclaration =
-            token.type === "VariableDeclaration" &&
+          declaration.type === "VariableDeclaration" &&
             [
               "ArrowFunctionExpression",
               "FunctionExpression",
               "CallExpression",
               "TaggedTemplateExpression",
-            ].includes(token.declarations[0].init.type);
+            ].includes(declaration.declarations[0].init.type);
 
           if (isFuncDeclaration || isVarDeclaration) {
-            const level = deriveLevel(sourceCode, token);
+            const level = deriveLevel(sourceCode, declaration);
             const name = isFuncDeclaration
-              ? token.id.name
-              : token.declarations[0].id.name;
+              ? declaration.id.name
+              : declaration.declarations[0].id.name;
             levels[name] = level;
           }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-stratified-design",
-  "version": "0.12.0",
+  "version": "0.12.2",
   "description": "ESlint rules for stratified design",
   "keywords": [
     "eslint",

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

@@ -131,6 +131,20 @@ ruleTester.run("no-disallowed-imports", rule, {
         },
       ],
     },
+    {
+      code: "import { foo } from 'nodeModule'",
+      filename: "./src/fileB.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: ["*"], from: "src/fileA" },
+              disallow: ["src/**/*.js"],
+            },
+          ],
+        },
+      ],
+    },
     {
       code: "import { anyMember } from './fileA'",
       filename: "./src/fileB.js",
@@ -159,6 +173,48 @@ ruleTester.run("no-disallowed-imports", rule, {
         },
       ],
     },
+    {
+      code: "import { anyMember } from './fileA.act'",
+      filename: "./src/fileB.cal.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "**/*.act" },
+              allow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "import { anyMember } from 'fileA.cal'",
+      filename: "./src/fileB.act.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "**/*.act" },
+              disallow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
+    {
+      code: "import { anyMember } from 'nodeModule'",
+      filename: "./src/fileB.cal.js",
+      options: [
+        {
+          imports: [
+            {
+              import: { member: "*", from: "**/*.act" },
+              disallow: ["src/**/*.cal.js"],
+            },
+          ],
+        },
+      ],
+    },
   ],
   invalid: [
     {
@@ -240,20 +296,20 @@ ruleTester.run("no-disallowed-imports", rule, {
       ],
     },
     {
-      code: "import { anyMember } from './fileA'",
-      filename: "./src/fileB.js",
+      code: "import { anyMember } from './fileA.act'",
+      filename: "./src/fileB.cal.js",
       options: [
         {
           imports: [
             {
-              import: { member: "*", from: "src/fileA" },
-              disallow: ["src/**/*.js"],
+              import: { member: "*", from: "**/*.act" },
+              disallow: ["**/*.cal.js"],
             },
           ],
         },
       ],
       errors: [
-        { messageId: "no-disallowed-imports", data: { member: "Any member", from: "src/fileA" } },
+        { messageId: "no-disallowed-imports", data: { member: "Any member", from: "**/*.act" } },
       ],
     },
   ],

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

@@ -81,31 +81,77 @@ ruleTester.run("no-same-level-funcs", rule, {
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
     },
+    {
+      code: "export function func1(){}; function func2(){ func1(); }",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
+    },
+    {
+      code: "export default function func1(){}; function func2(){ func1(); }",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
+    },
+
     {
       code: "function func2(){ func1(); }; function func1(){}",
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
     },
+
+    {
+      code: "export function func2(){ func1(); }; function func1(){}",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
+    },
+    {
+      code: "export default function func2(){ func1(); }; function func1(){}",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
+    },
+
     {
       code: "const func1 = () => {}; const func2 = () => { func1(); }",
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
     },
+    {
+      code: "export const func1 = () => {}; const func2 = () => { func1(); }",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
+    },
+
     {
       code: "const func1 = function(){}; const func2 = function(){ func1(); }",
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
     },
+    {
+      code: "export const func1 = function(){}; const func2 = function(){ func1(); }",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
+    },
+
     {
       code: "const func1 = function func1(){}; const func2 = function func2(){ func1(); }",
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
     },
+    {
+      code: "export const func1 = function func1(){}; const func2 = function func2(){ func1(); }",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
+    },
+
     {
       code: "const fn = () => 1; const value = fn()",
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "fn" } }],
     },
+    {
+      code: "export const fn = () => 1; const value = fn()",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "fn" } }],
+    },
     {
       code: "const hof = (fn) => fn(); const fnByHof = hof(() => 1);",
       filename: "./src/foo.js",