eslint-plugin-react-hooks 7.0.0-canary-5f2b5718-20251014 → 7.0.0-canary-93f85932-20251016

package/cjs/eslint-plugin-react-hooks.development.js

@@ -37130,30 +37130,49 @@ function memoizeFbtAndMacroOperandsInSameScope(fn) {
         ...Array.from(FBT_TAGS).map((tag) => [tag, []]),
         ...((_a = fn.env.config.customMacros) !== null && _a !== void 0 ? _a : []),
     ]);
-    const fbtValues = new Set();
+    const macroTagsCalls = new Set();
+    const macroValues = new Map();
     const macroMethods = new Map();
-    while (true) {
-        let vsize = fbtValues.size;
-        let msize = macroMethods.size;
-        visit$1(fn, fbtMacroTags, fbtValues, macroMethods);
-        if (vsize === fbtValues.size && msize === macroMethods.size) {
-            break;
+    visit$1(fn, fbtMacroTags, macroTagsCalls, macroMethods, macroValues);
+    for (const root of macroValues.keys()) {
+        const scope = root.scope;
+        if (scope == null) {
+            continue;
         }
+        if (!macroTagsCalls.has(root.id)) {
+            continue;
+        }
+        mergeScopes(root, scope, macroValues, macroTagsCalls);
     }
-    return fbtValues;
+    return macroTagsCalls;
 }
 const FBT_TAGS = new Set([
     'fbt',
     'fbt:param',
+    'fbt:enum',
+    'fbt:plural',
     'fbs',
     'fbs:param',
+    'fbs:enum',
+    'fbs:plural',
 ]);
 const SINGLE_CHILD_FBT_TAGS = new Set([
     'fbt:param',
     'fbs:param',
 ]);
-function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
+function visit$1(fn, fbtMacroTags, macroTagsCalls, macroMethods, macroValues) {
     for (const [, block] of fn.body.blocks) {
+        for (const phi of block.phis) {
+            const macroOperands = [];
+            for (const operand of phi.operands.values()) {
+                if (macroValues.has(operand.identifier)) {
+                    macroOperands.push(operand.identifier);
+                }
+            }
+            if (macroOperands.length !== 0) {
+                macroValues.set(phi.place.identifier, macroOperands);
+            }
+        }
         for (const instruction of block.instructions) {
             const { lvalue, value } = instruction;
             if (lvalue === null) {
@@ -37162,11 +37181,11 @@ function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
             if (value.kind === 'Primitive' &&
                 typeof value.value === 'string' &&
                 matchesExactTag(value.value, fbtMacroTags)) {
-                fbtValues.add(lvalue.identifier.id);
+                macroTagsCalls.add(lvalue.identifier.id);
             }
             else if (value.kind === 'LoadGlobal' &&
                 matchesExactTag(value.binding.name, fbtMacroTags)) {
-                fbtValues.add(lvalue.identifier.id);
+                macroTagsCalls.add(lvalue.identifier.id);
             }
             else if (value.kind === 'LoadGlobal' &&
                 matchTagRoot(value.binding.name, fbtMacroTags) !== null) {
@@ -37185,7 +37204,7 @@ function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
                             newMethods.push(method.slice(1));
                         }
                         else {
-                            fbtValues.add(lvalue.identifier.id);
+                            macroTagsCalls.add(lvalue.identifier.id);
                         }
                     }
                 }
@@ -37193,46 +37212,40 @@ function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
                     macroMethods.set(lvalue.identifier.id, newMethods);
                 }
             }
-            else if (isFbtCallExpression(fbtValues, value)) {
-                const fbtScope = lvalue.identifier.scope;
-                if (fbtScope === null) {
-                    continue;
-                }
-                for (const operand of eachReactiveValueOperand(value)) {
-                    operand.identifier.scope = fbtScope;
-                    expandFbtScopeRange(fbtScope.range, operand.identifier.mutableRange);
-                    fbtValues.add(operand.identifier.id);
-                }
+            else if (value.kind === 'PropertyLoad' &&
+                macroTagsCalls.has(value.object.identifier.id)) {
+                macroTagsCalls.add(lvalue.identifier.id);
             }
-            else if (isFbtJsxExpression(fbtMacroTags, fbtValues, value) ||
-                isFbtJsxChild(fbtValues, lvalue, value)) {
-                const fbtScope = lvalue.identifier.scope;
-                if (fbtScope === null) {
-                    continue;
-                }
-                for (const operand of eachReactiveValueOperand(value)) {
-                    operand.identifier.scope = fbtScope;
-                    expandFbtScopeRange(fbtScope.range, operand.identifier.mutableRange);
-                    fbtValues.add(operand.identifier.id);
-                }
+            else if (isFbtJsxExpression(fbtMacroTags, macroTagsCalls, value) ||
+                isFbtJsxChild(macroTagsCalls, lvalue, value) ||
+                isFbtCallExpression(macroTagsCalls, value)) {
+                macroTagsCalls.add(lvalue.identifier.id);
+                macroValues.set(lvalue.identifier, Array.from(eachInstructionValueOperand(value), operand => operand.identifier));
             }
-            else if (fbtValues.has(lvalue.identifier.id)) {
-                const fbtScope = lvalue.identifier.scope;
-                if (fbtScope === null) {
-                    return;
-                }
-                for (const operand of eachReactiveValueOperand(value)) {
-                    if (operand.identifier.name !== null &&
-                        operand.identifier.name.kind === 'named') {
-                        continue;
+            else if (Iterable_some(eachInstructionValueOperand(value), operand => macroValues.has(operand.identifier))) {
+                const macroOperands = [];
+                for (const operand of eachInstructionValueOperand(value)) {
+                    if (macroValues.has(operand.identifier)) {
+                        macroOperands.push(operand.identifier);
                     }
-                    operand.identifier.scope = fbtScope;
-                    expandFbtScopeRange(fbtScope.range, operand.identifier.mutableRange);
                 }
+                macroValues.set(lvalue.identifier, macroOperands);
             }
         }
     }
 }
+function mergeScopes(root, scope, macroValues, macroTagsCalls) {
+    const operands = macroValues.get(root);
+    if (operands == null) {
+        return;
+    }
+    for (const operand of operands) {
+        operand.scope = scope;
+        expandFbtScopeRange(scope.range, operand.mutableRange);
+        macroTagsCalls.add(operand.id);
+        mergeScopes(operand, scope, macroValues, macroTagsCalls);
+    }
+}
 function matchesExactTag(s, tags) {
     return Array.from(tags).some(macro => typeof macro === 'string'
         ? s === macro
@@ -37256,22 +37269,23 @@ function matchTagRoot(s, tags) {
         return null;
     }
 }
-function isFbtCallExpression(fbtValues, value) {
+function isFbtCallExpression(macroTagsCalls, value) {
     return ((value.kind === 'CallExpression' &&
-        fbtValues.has(value.callee.identifier.id)) ||
-        (value.kind === 'MethodCall' && fbtValues.has(value.property.identifier.id)));
+        macroTagsCalls.has(value.callee.identifier.id)) ||
+        (value.kind === 'MethodCall' &&
+            macroTagsCalls.has(value.property.identifier.id)));
 }
-function isFbtJsxExpression(fbtMacroTags, fbtValues, value) {
+function isFbtJsxExpression(fbtMacroTags, macroTagsCalls, value) {
     return (value.kind === 'JsxExpression' &&
         ((value.tag.kind === 'Identifier' &&
-            fbtValues.has(value.tag.identifier.id)) ||
+            macroTagsCalls.has(value.tag.identifier.id)) ||
             (value.tag.kind === 'BuiltinTag' &&
                 matchesExactTag(value.tag.name, fbtMacroTags))));
 }
-function isFbtJsxChild(fbtValues, lvalue, value) {
+function isFbtJsxChild(macroTagsCalls, lvalue, value) {
     return ((value.kind === 'JsxExpression' || value.kind === 'JsxFragment') &&
         lvalue !== null &&
-        fbtValues.has(lvalue.identifier.id));
+        macroTagsCalls.has(lvalue.identifier.id));
 }
 function expandFbtScopeRange(fbtRange, extendWith) {
     if (extendWith.start !== 0) {
@@ -48124,7 +48138,7 @@ function* generateInstructionTypes(env, names, instr) {
                         });
                     }
                     else {
-                        break;
+                        continue;
                     }
                 }
             }

package/cjs/eslint-plugin-react-hooks.production.js

@@ -36957,30 +36957,49 @@ function memoizeFbtAndMacroOperandsInSameScope(fn) {
         ...Array.from(FBT_TAGS).map((tag) => [tag, []]),
         ...((_a = fn.env.config.customMacros) !== null && _a !== void 0 ? _a : []),
     ]);
-    const fbtValues = new Set();
+    const macroTagsCalls = new Set();
+    const macroValues = new Map();
     const macroMethods = new Map();
-    while (true) {
-        let vsize = fbtValues.size;
-        let msize = macroMethods.size;
-        visit$1(fn, fbtMacroTags, fbtValues, macroMethods);
-        if (vsize === fbtValues.size && msize === macroMethods.size) {
-            break;
+    visit$1(fn, fbtMacroTags, macroTagsCalls, macroMethods, macroValues);
+    for (const root of macroValues.keys()) {
+        const scope = root.scope;
+        if (scope == null) {
+            continue;
         }
+        if (!macroTagsCalls.has(root.id)) {
+            continue;
+        }
+        mergeScopes(root, scope, macroValues, macroTagsCalls);
     }
-    return fbtValues;
+    return macroTagsCalls;
 }
 const FBT_TAGS = new Set([
     'fbt',
     'fbt:param',
+    'fbt:enum',
+    'fbt:plural',
     'fbs',
     'fbs:param',
+    'fbs:enum',
+    'fbs:plural',
 ]);
 const SINGLE_CHILD_FBT_TAGS = new Set([
     'fbt:param',
     'fbs:param',
 ]);
-function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
+function visit$1(fn, fbtMacroTags, macroTagsCalls, macroMethods, macroValues) {
     for (const [, block] of fn.body.blocks) {
+        for (const phi of block.phis) {
+            const macroOperands = [];
+            for (const operand of phi.operands.values()) {
+                if (macroValues.has(operand.identifier)) {
+                    macroOperands.push(operand.identifier);
+                }
+            }
+            if (macroOperands.length !== 0) {
+                macroValues.set(phi.place.identifier, macroOperands);
+            }
+        }
         for (const instruction of block.instructions) {
             const { lvalue, value } = instruction;
             if (lvalue === null) {
@@ -36989,11 +37008,11 @@ function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
             if (value.kind === 'Primitive' &&
                 typeof value.value === 'string' &&
                 matchesExactTag(value.value, fbtMacroTags)) {
-                fbtValues.add(lvalue.identifier.id);
+                macroTagsCalls.add(lvalue.identifier.id);
             }
             else if (value.kind === 'LoadGlobal' &&
                 matchesExactTag(value.binding.name, fbtMacroTags)) {
-                fbtValues.add(lvalue.identifier.id);
+                macroTagsCalls.add(lvalue.identifier.id);
             }
             else if (value.kind === 'LoadGlobal' &&
                 matchTagRoot(value.binding.name, fbtMacroTags) !== null) {
@@ -37012,7 +37031,7 @@ function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
                             newMethods.push(method.slice(1));
                         }
                         else {
-                            fbtValues.add(lvalue.identifier.id);
+                            macroTagsCalls.add(lvalue.identifier.id);
                         }
                     }
                 }
@@ -37020,46 +37039,40 @@ function visit$1(fn, fbtMacroTags, fbtValues, macroMethods) {
                     macroMethods.set(lvalue.identifier.id, newMethods);
                 }
             }
-            else if (isFbtCallExpression(fbtValues, value)) {
-                const fbtScope = lvalue.identifier.scope;
-                if (fbtScope === null) {
-                    continue;
-                }
-                for (const operand of eachReactiveValueOperand(value)) {
-                    operand.identifier.scope = fbtScope;
-                    expandFbtScopeRange(fbtScope.range, operand.identifier.mutableRange);
-                    fbtValues.add(operand.identifier.id);
-                }
+            else if (value.kind === 'PropertyLoad' &&
+                macroTagsCalls.has(value.object.identifier.id)) {
+                macroTagsCalls.add(lvalue.identifier.id);
             }
-            else if (isFbtJsxExpression(fbtMacroTags, fbtValues, value) ||
-                isFbtJsxChild(fbtValues, lvalue, value)) {
-                const fbtScope = lvalue.identifier.scope;
-                if (fbtScope === null) {
-                    continue;
-                }
-                for (const operand of eachReactiveValueOperand(value)) {
-                    operand.identifier.scope = fbtScope;
-                    expandFbtScopeRange(fbtScope.range, operand.identifier.mutableRange);
-                    fbtValues.add(operand.identifier.id);
-                }
+            else if (isFbtJsxExpression(fbtMacroTags, macroTagsCalls, value) ||
+                isFbtJsxChild(macroTagsCalls, lvalue, value) ||
+                isFbtCallExpression(macroTagsCalls, value)) {
+                macroTagsCalls.add(lvalue.identifier.id);
+                macroValues.set(lvalue.identifier, Array.from(eachInstructionValueOperand(value), operand => operand.identifier));
             }
-            else if (fbtValues.has(lvalue.identifier.id)) {
-                const fbtScope = lvalue.identifier.scope;
-                if (fbtScope === null) {
-                    return;
-                }
-                for (const operand of eachReactiveValueOperand(value)) {
-                    if (operand.identifier.name !== null &&
-                        operand.identifier.name.kind === 'named') {
-                        continue;
+            else if (Iterable_some(eachInstructionValueOperand(value), operand => macroValues.has(operand.identifier))) {
+                const macroOperands = [];
+                for (const operand of eachInstructionValueOperand(value)) {
+                    if (macroValues.has(operand.identifier)) {
+                        macroOperands.push(operand.identifier);
                     }
-                    operand.identifier.scope = fbtScope;
-                    expandFbtScopeRange(fbtScope.range, operand.identifier.mutableRange);
                 }
+                macroValues.set(lvalue.identifier, macroOperands);
             }
         }
     }
 }
+function mergeScopes(root, scope, macroValues, macroTagsCalls) {
+    const operands = macroValues.get(root);
+    if (operands == null) {
+        return;
+    }
+    for (const operand of operands) {
+        operand.scope = scope;
+        expandFbtScopeRange(scope.range, operand.mutableRange);
+        macroTagsCalls.add(operand.id);
+        mergeScopes(operand, scope, macroValues, macroTagsCalls);
+    }
+}
 function matchesExactTag(s, tags) {
     return Array.from(tags).some(macro => typeof macro === 'string'
         ? s === macro
@@ -37083,22 +37096,23 @@ function matchTagRoot(s, tags) {
         return null;
     }
 }
-function isFbtCallExpression(fbtValues, value) {
+function isFbtCallExpression(macroTagsCalls, value) {
     return ((value.kind === 'CallExpression' &&
-        fbtValues.has(value.callee.identifier.id)) ||
-        (value.kind === 'MethodCall' && fbtValues.has(value.property.identifier.id)));
+        macroTagsCalls.has(value.callee.identifier.id)) ||
+        (value.kind === 'MethodCall' &&
+            macroTagsCalls.has(value.property.identifier.id)));
 }
-function isFbtJsxExpression(fbtMacroTags, fbtValues, value) {
+function isFbtJsxExpression(fbtMacroTags, macroTagsCalls, value) {
     return (value.kind === 'JsxExpression' &&
         ((value.tag.kind === 'Identifier' &&
-            fbtValues.has(value.tag.identifier.id)) ||
+            macroTagsCalls.has(value.tag.identifier.id)) ||
             (value.tag.kind === 'BuiltinTag' &&
                 matchesExactTag(value.tag.name, fbtMacroTags))));
 }
-function isFbtJsxChild(fbtValues, lvalue, value) {
+function isFbtJsxChild(macroTagsCalls, lvalue, value) {
     return ((value.kind === 'JsxExpression' || value.kind === 'JsxFragment') &&
         lvalue !== null &&
-        fbtValues.has(lvalue.identifier.id));
+        macroTagsCalls.has(lvalue.identifier.id));
 }
 function expandFbtScopeRange(fbtRange, extendWith) {
     if (extendWith.start !== 0) {
@@ -47951,7 +47965,7 @@ function* generateInstructionTypes(env, names, instr) {
                         });
                     }
                     else {
-                        break;
+                        continue;
                     }
                 }
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eslint-plugin-react-hooks",
   "description": "ESLint rules for React Hooks",
-  "version": "7.0.0-canary-5f2b5718-20251014",
+  "version": "7.0.0-canary-93f85932-20251016",
   "repository": {
     "type": "git",
     "url": "https://github.com/facebook/react.git",