@dineroregnskab/eslint-plugin-custom-rules 4.2.0 → 4.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dineroregnskab/eslint-plugin-custom-rules",
-  "version": "4.2.0",
+  "version": "4.3.0",
   "description": "ESLint plugin with custom rules for Dinero Regnskab",
   "main": "eslint-plugin-custom-rules.js",
   "scripts": {

package/rules/no-feature-toggle-without-await.js

@@ -14,19 +14,29 @@ module.exports = {
     },
 
     create(context) {
-        let describeStack = [];
+        // Map each describe/context CallExpression node -> whether its beforeEach contains feature toggles
+        const describeFeatureMap = new WeakMap();
+
+        function findNearestDescribe(node) {
+            let current = node && node.parent;
+            while (current) {
+                if (
+                    current.type === 'CallExpression' &&
+                    current.callee &&
+                    (current.callee.name === 'describe' || current.callee.name === 'context')
+                ) {
+                    return current;
+                }
+                current = current.parent;
+            }
+            return null;
+        }
 
         return {
-            'CallExpression[callee.name="describe"], CallExpression[callee.name="context"]'() {
-                describeStack.push({
-                    beforeEachHasFeatureToggles: false,
-                });
-            },
-
             'CallExpression[callee.name="beforeEach"]'(node) {
-                if (describeStack.length === 0) return;
+                const describeNode = findNearestDescribe(node);
+                if (!describeNode) return;
 
-                const currentLevel = describeStack[describeStack.length - 1];
                 const callback = node.arguments[0];
                 if (!callback) return;
 
@@ -61,24 +71,33 @@ module.exports = {
                 });
 
                 if (hasFeatureToggles) {
-                    currentLevel.beforeEachHasFeatureToggles = true;
+                    describeFeatureMap.set(describeNode, true);
                 }
             },
 
             'CallExpression[callee.name="it"]'(node) {
-                if (describeStack.length === 0) return;
-
-                const hasFeatureTogglesInAnyAncestor = describeStack.some(
-                    (level) => level.beforeEachHasFeatureToggles
-                );
+                // Walk ancestors to see if any describe/context has feature toggles
+                let current = node.parent;
+                let hasFeatureTogglesInAnyAncestor = false;
+                while (current) {
+                    if (
+                        current.type === 'CallExpression' &&
+                        current.callee &&
+                        (current.callee.name === 'describe' || current.callee.name === 'context')
+                    ) {
+                        if (describeFeatureMap.get(current)) {
+                            hasFeatureTogglesInAnyAncestor = true;
+                            break;
+                        }
+                    }
+                    current = current.parent;
+                }
                 if (!hasFeatureTogglesInAnyAncestor) return;
 
-
-                const callback = node.arguments[1];
+                const callback = node.arguments[1] || node.arguments[0];
                 if (!callback) return;
 
                 let hasAwaitFeatureReady = false;
-
                 walkNode(callback, (child) => {
                     if (
                         child.type === 'CallExpression' &&
@@ -101,10 +120,6 @@ module.exports = {
                     });
                 }
             },
-
-            'CallExpression[callee.name="describe"]:exit, CallExpression[callee.name="context"]:exit'() {
-                describeStack.pop();
-            },
         };
     },
 };