improve nested checks

planttheidea · Jun 5, 2019 · c74f9f7 · c74f9f7
1 parent 06fc4e4
commit c74f9f7
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 19 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -9,6 +9,7 @@
     "no-param-reassign": "off",
     "no-plusplus": "off",
     "no-shadow": "off",
+    "no-underscore-dangle": "off",
     "no-use-before-define": "off",
 
     "import/order": "off"

diff --git a/inline-loops.macro.js b/inline-loops.macro.js
@@ -948,6 +948,10 @@ function inlineLoops({ references, babel }) {
     return allMethods.push(...incrementingCalls, ...decrementingCalls, ...objectCalls);
   });
 
+  allMethods.forEach((method) => {
+    method.node.__inlineLoopsMacro = true;
+  });
+
   const handlers = {
     every: handleEvery,
     filter: handleFilter,
@@ -971,33 +975,24 @@ function inlineLoops({ references, babel }) {
       const { callee } = path.parentPath.parent;
 
       if (callee) {
-        let ancestorPath = path.parentPath;
-
-        while (ancestorPath) {
-          if (ancestorPath.node && ancestorPath.node.body) {
-            break;
-          }
-
+        const ancestry = path.parentPath.getAncestry();
+
+        for (let index = 0; index < ancestry.length; index++) {
+          const ancestorPath = ancestry[index];
+
           if (t.isCallExpression(ancestorPath)) {
-            const { expression } = ancestorPath.parent;
-            const caller = expression
-              ? expression.callee
-              : ancestorPath.parent.callee;
-
-            if (
-              allMethods.find(
-                ({ node }) => node === caller && node !== path.node,
-              )
-            ) {
+            const callee = ancestorPath.node
+              ? ancestorPath.node.callee
+              : ancestorPath.parent.expression.callee;
+
+            if (callee !== path.node && callee.__inlineLoopsMacro) {
               throw new MacroError(
                 `You cannot nest looper methods. You should store the results of ${name} to a variable, and then call ${
                   path.parentPath.parent.callee.name
                 } with it.`,
               );
             }
           }
-
-          ancestorPath = ancestorPath.parentPath;
         }
       }