eslint-plugin-stratified-design 0.12.3 → 0.12.4

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

@@ -17,9 +17,39 @@ const { fromCwd, match } = require("../helpers/common");
  * @typedef {import('eslint').Rule.Node} Node
  * @typedef {import('eslint').AST.Token} Token
  * @typedef {import('eslint').SourceCode} SourceCode
- * @typedef {({[name: string]: number | null})} Levels
+ * @typedef {({[name: string]: number})} Levels
  */
 
+/**
+ * @param {Node | Token} nodeOrToken
+ * @returns {string | null}
+ */
+const deriveFuncName = (nodeOrToken) => {
+  const declaration =
+    (nodeOrToken.type === "ExportNamedDeclaration" ||
+      nodeOrToken.type === "ExportDefaultDeclaration") &&
+    Boolean(nodeOrToken.declaration)
+      ? nodeOrToken.declaration
+      : nodeOrToken;
+  const isFuncDeclaration = declaration.type === "FunctionDeclaration";
+  const isVarDeclaration =
+    declaration.type === "VariableDeclaration" &&
+    [
+      "ArrowFunctionExpression",
+      "FunctionExpression",
+      "CallExpression",
+      "TaggedTemplateExpression",
+    ].includes(declaration.declarations[0].init.type);
+
+  if (isFuncDeclaration || isVarDeclaration) {
+    const name = isFuncDeclaration
+      ? declaration.id.name
+      : declaration.declarations[0].id.name;
+    return name;
+  }
+  return null;
+};
+
 /**
  * @param {SourceCode} sourceCode
  * @param {Node | Token} nodeOrToken
@@ -34,7 +64,7 @@ const deriveLevel = (sourceCode, nodeOrToken) => {
       return levelInNum;
     }
   }
-  return null;
+  return 1;
 };
 
 /**
@@ -56,12 +86,15 @@ const isCalleeLowerLevel = (sourceCode, levels) => {
    */
   return (node, calleeName) => {
     const calleeLevel = levels[calleeName];
-    if (calleeLevel === undefined) return true;
-    if (calleeLevel !== null) {
-      const caller = traceAncestor(sourceCode, node);
-      const callerLevel = deriveLevel(sourceCode, caller);
-      if (callerLevel !== null && callerLevel < calleeLevel) return true;
-    }
+    if (calleeLevel === undefined) return true; // 호출되는 함수가 존재하지 않으면 true 리턴. 함수 내의 함수의 경우에는 항상 calleeLevel 이 undefined 이다.
+
+    const caller = traceAncestor(sourceCode, node);
+    const callerLevel = deriveLevel(sourceCode, caller);
+    if (callerLevel < calleeLevel) return true;
+
+    const callerName = deriveFuncName(caller);
+    if (callerName === calleeName) return true; // recursive function
+
     return false;
   };
 };
@@ -116,6 +149,7 @@ module.exports = {
     if (isExcludedFile) return {};
 
     /**
+     * @description 함수들의 레벨. 함수 내의 함수는 여기에 기록되지 않는다.
      * @type {Levels}
      */
     const levels = {};
@@ -140,22 +174,9 @@ module.exports = {
     return {
       Program(node) {
         node.body.forEach((token) => {
-          const declaration = (token.type === 'ExportNamedDeclaration' || token.type === 'ExportDefaultDeclaration') && Boolean(token.declaration) ? token.declaration : token
-          const isFuncDeclaration = declaration.type === "FunctionDeclaration";
-          const isVarDeclaration =
-          declaration.type === "VariableDeclaration" &&
-            [
-              "ArrowFunctionExpression",
-              "FunctionExpression",
-              "CallExpression",
-              "TaggedTemplateExpression",
-            ].includes(declaration.declarations[0].init.type);
-
-          if (isFuncDeclaration || isVarDeclaration) {
+          const name = deriveFuncName(token);
+          if (name) {
             const level = deriveLevel(sourceCode, token);
-            const name = isFuncDeclaration
-              ? 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.3",
+  "version": "0.12.4",
   "description": "ESlint rules for stratified design",
   "keywords": [
     "eslint",

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

@@ -56,7 +56,15 @@ ruleTester.run("no-same-level-funcs", rule, {
       filename: "./src/foo.js",
     },
     {
-      code: "// @level 2\nexport function func2(){};\n// @level 1\nfunction func1(){ func2(); }",
+      code: "/*@level 2*/function func2(){}; /*@level 1*/function func1(){ func2(); }",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "/*@level 2*/function func2(){}; function func1(){ func2(); }",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "/*@level 2*/export function func2(){}; /*@level 1*/function func1(){ func2(); }",
       filename: "./src/foo.js",
     },
 
@@ -104,6 +112,52 @@ ruleTester.run("no-same-level-funcs", rule, {
       code: "/*\n@level 2\nsomething\n*/\nexport const func2 = () => {};\n/*something\n@level 1\n*/\nconst func1 = () => func2();",
       filename: "./src/foo.js",
     },
+
+    {
+      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 recursiveFunc() { recursiveFunc() }",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "const recursiveFunc = () => { recursiveFunc() }",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "export const recursiveFunc = () => { recursiveFunc() }",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "//@level 2\nconst recursiveFunc = () => { recursiveFunc() }",
+      filename: "./src/foo.js",
+    },
+
+    {
+      code: "const funcWithInnerFunc = () => { const innerFunc = () => {}; innerFunc()  }",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "/*@level 2*/const func2 = () => {}; /*@level 1*/const func1 = () => { const innerFunc = () => { func2() }; innerFunc(); }",
+      filename: "./src/foo.js",
+    },
+
+    {
+      code: "/*@level 2*/const func = () => 'a'; /*@level 1*/const obj = { a: func() } ",
+      filename: "./src/foo.js",
+    },
+    {
+      code: "/*@level 2*/const func = () => 'a'; /*@level 1*/const obj = { func: () => { func() } } ",
+      filename: "./src/foo.js",
+    },
   ],
   invalid: [
     {
@@ -224,20 +278,20 @@ ruleTester.run("no-same-level-funcs", rule, {
     },
 
     {
-      code: "// @level 2\nfunction func2(){};\nfunction func1(){ func2(); }",
+      code: "function func2(){};\n// @level 1\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(); }",
+      code: "const func = () => 'a'; const obj = { a: func() } ",
       filename: "./src/foo.js",
-      errors: [{ messageId: "no-same-level-funcs", data: { func: "func2" } }],
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func" } }],
     },
-
     {
-      code: "function func2(){};\n// @level 1\nfunction func1(){ func2(); }",
+      code: "const func = () => 'a'; const obj = { func: () => { func() } } ",
       filename: "./src/foo.js",
-      errors: [{ messageId: "no-same-level-funcs", data: { func: "func2" } }],
+      errors: [{ messageId: "no-same-level-funcs", data: { func: "func" } }],
     },
   ],
 });