eslint-plugin-stratified-design 0.12.1 → 0.12.3

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') && Boolean(token.declaration) ? 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 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.1",
+  "version": "0.12.3",
   "description": "ESlint rules for stratified design",
   "keywords": [
     "eslint",

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

@@ -50,30 +50,60 @@ ruleTester.run("no-same-level-funcs", rule, {
       filename: "./src/foo.js",
       options: [{ include: ["src/**/*.*"], exclude: ["src/foo.js"] }],
     },
+
     {
       code: "// @level 2\nfunction func2(){};\n// @level 1\nfunction func1(){ func2(); }",
       filename: "./src/foo.js",
     },
+    {
+      code: "// @level 2\nexport function func2(){};\n// @level 1\nfunction func1(){ func2(); }",
+      filename: "./src/foo.js",
+    },
+
     {
       code: "// @level 2\nconst func2 = () => {};\n// @level 1\nfunction func1(){ func2(); }",
       filename: "./src/foo.js",
     },
+    {
+      code: "// @level 2\nexport const func2 = () => {};\n// @level 1\nfunction func1(){ func2(); }",
+      filename: "./src/foo.js",
+    },
+
     {
       code: "// @level 2\nconst func2 = () => {};\n// @level 1\nconst func1 = () => func2();",
       filename: "./src/foo.js",
     },
+    {
+      code: "// @level 2\nexport const func2 = () => {};\n// @level 1\nconst func1 = () => func2();",
+      filename: "./src/foo.js",
+    },
+
     {
       code: "/*@level 2*/\nconst func2 = () => {};\n/*@level 1*/\nconst func1 = () => func2();",
       filename: "./src/foo.js",
     },
+    {
+      code: "/*@level 2*/\nexport const func2 = () => {};\n/*@level 1*/\nconst func1 = () => func2();",
+      filename: "./src/foo.js",
+    },
+
     {
       code: "// @level 2 something\nconst func2 = () => {};\n// @level 1 something\nconst func1 = () => func2();",
       filename: "./src/foo.js",
     },
+    {
+      code: "// @level 2 something\nexport const func2 = () => {};\n// @level 1 something\nconst func1 = () => func2();",
+      filename: "./src/foo.js",
+    },
+
     {
       code: "/*\n@level 2\nsomething\n*/\nconst func2 = () => {};\n/*something\n@level 1\n*/\nconst func1 = () => func2();",
       filename: "./src/foo.js",
     },
+    {
+      code: "/*\n@level 2\nsomething\n*/\nexport const func2 = () => {};\n/*something\n@level 1\n*/\nconst func1 = () => func2();",
+      filename: "./src/foo.js",
+    },
   ],
   invalid: [
     {
@@ -81,31 +111,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",
@@ -146,11 +222,18 @@ ruleTester.run("no-same-level-funcs", rule, {
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "func1" } }],
     },
+
     {
       code: "// @level 2\nfunction func2(){};\nfunction func1(){ func2(); }",
       filename: "./src/foo.js",
       errors: [{ messageId: "no-same-level-funcs", data: { func: "func2" } }],
     },
+    {
+      code: "// @level 2\nexport function func2(){};\nfunction func1(){ func2(); }",
+      filename: "./src/foo.js",
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func2" } }],
+    },
+
     {
       code: "function func2(){};\n// @level 1\nfunction func1(){ func2(); }",
       filename: "./src/foo.js",