eslint-plugin-react-x 1.22.2-next.9 → 1.22.2

package/dist/index.js

@@ -42,7 +42,7 @@ var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.22.2-next.9";
+var version = "1.22.2";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -327,12 +327,10 @@ var no_array_index_key_default = createRule({
   name: RULE_NAME5,
   create(context) {
     const indexParamNames = [];
+    const isCreateOrCloneElementCall = eff.or(core.isCreateElementCall(context), core.isCloneElementCall(context));
     function isArrayIndex(node) {
       return node.type === types.AST_NODE_TYPES.Identifier && indexParamNames.some(eff.O.exists((name2) => name2 === node.name));
     }
-    function isCreateOrCloneElementCall(node) {
-      return core.isCreateElementCall(node, context) || core.isCloneElementCall(node, context);
-    }
     function getReportDescriptor(node) {
       if (isArrayIndex(node)) return [{ messageId: "noArrayIndexKey", node }];
       if (AST11__namespace.isOneOf([types.AST_NODE_TYPES.TemplateLiteral, types.AST_NODE_TYPES.BinaryExpression])(node)) {
@@ -1862,9 +1860,15 @@ var no_set_state_in_component_did_mount_default = createRule({
         eff.O.Do,
         eff.O.bind("clazz", () => AST11__namespace.traverseUpGuard(node, core.isClassComponent)),
         eff.O.bind("method", ({ clazz }) => AST11__namespace.traverseUpStop(node, clazz, isComponentDidMount)),
+        eff.O.bind("methodScope", ({ method }) => eff.O.some(context.sourceCode.getScope(method))),
         eff.O.bind("upperScope", () => eff.O.fromNullable(context.sourceCode.getScope(node).upper)),
         eff.O.filter(
-          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+          ({
+            clazz,
+            method,
+            methodScope,
+            upperScope
+          }) => method.parent === clazz.body && upperScope === methodScope
         ),
         eff.O.map(() => ({
           messageId: "noSetStateInComponentDidMount",
@@ -2156,39 +2160,40 @@ var no_unstable_context_value_default = createRule({
   name: RULE_NAME40,
   create(context) {
     const { ctx, listeners } = core.useComponentCollector(context);
-    const possibleValueConstructions = /* @__PURE__ */ new Map();
+    const constructions = /* @__PURE__ */ new Map();
     return {
       ...listeners,
       JSXOpeningElement(node) {
         const openingElementName = node.name;
         if (openingElementName.type !== types.AST_NODE_TYPES.JSXMemberExpression) return;
         if (openingElementName.property.name !== "Provider") return;
-        const maybeJSXValueAttribute = eff.O.fromNullable(
-          node.attributes.find((attribute) => {
-            return attribute.type === types.AST_NODE_TYPES.JSXAttribute && attribute.name.name === "value";
-          })
+        const constructionEntry = eff.F.pipe(
+          eff.O.Do,
+          eff.O.bind("function", ctx.getCurrentFunction),
+          eff.O.bind("attribute", () => eff.O.fromNullable(
+            node.attributes.find((attribute) => {
+              return attribute.type === types.AST_NODE_TYPES.JSXAttribute && attribute.name.name === "value";
+            })
+          )),
+          eff.O.bind("value", ({ attribute }) => "value" in attribute ? eff.O.some(attribute.value) : eff.O.none()),
+          eff.O.bind("valueExpression", ({ value }) => value?.type === types.AST_NODE_TYPES.JSXExpressionContainer ? eff.O.some(value.expression) : eff.O.none()),
+          eff.O.bind("construction", ({ valueExpression }) => {
+            const initialScope = context.sourceCode.getScope(valueExpression);
+            return eff.O.some(VAR__namespace.inspectConstruction(valueExpression, initialScope));
+          }),
+          eff.O.filter(({ construction }) => construction._tag !== "None")
         );
-        if (eff.O.isNone(maybeJSXValueAttribute) || !("value" in maybeJSXValueAttribute.value)) return;
-        const valueNode = maybeJSXValueAttribute.value.value;
-        if (valueNode?.type !== types.AST_NODE_TYPES.JSXExpressionContainer) return;
-        const valueExpression = valueNode.expression;
-        const initialScope = context.sourceCode.getScope(valueExpression);
-        const construction = VAR__namespace.inspectConstruction(valueExpression, initialScope);
-        if (construction._tag === "None") return;
-        eff.O.map(
-          ctx.getCurrentFunction(),
-          ([_, currentFn]) => possibleValueConstructions.set(currentFn, [
-            ...possibleValueConstructions.get(currentFn) ?? [],
+        for (const { construction, function: [_, fNode] } of eff.O.toArray(constructionEntry)) {
+          constructions.set(fNode, [
+            ...constructions.get(fNode) ?? [],
             construction
-          ])
-        );
+          ]);
+        }
       },
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node).values();
         for (const { node: component } of components) {
-          const constructions = possibleValueConstructions.get(component);
-          if (!constructions) continue;
-          for (const construction of constructions) {
+          for (const construction of constructions.get(component) ?? []) {
             if (construction._tag === "None") continue;
             const { node: constructionNode, _tag } = construction;
             const messageId = _tag.startsWith("Function") ? "noUnstableContextValueWithFunction" : "noUnstableContextValueWithIdentifier";
@@ -2225,7 +2230,7 @@ var no_unstable_default_props_default = createRule({
   name: RULE_NAME41,
   create(context) {
     const { ctx, listeners } = core.useComponentCollector(context);
-    const possibleDestructuringDeclarators = /* @__PURE__ */ new WeakMap();
+    const declarators = /* @__PURE__ */ new WeakMap();
     return {
       ...listeners,
       "Program:exit"(node) {
@@ -2235,10 +2240,7 @@ var no_unstable_default_props_default = createRule({
           const [props] = params;
           if (!props) continue;
           const properties = tsPattern.match(props).with({ type: types.AST_NODE_TYPES.ObjectPattern }, ({ properties: properties2 }) => properties2).with({ type: types.AST_NODE_TYPES.Identifier }, ({ name: name2 }) => {
-            const variableDeclarators = possibleDestructuringDeclarators.get(component);
-            if (!variableDeclarators) return [];
-            const declarators = variableDeclarators.filter((d) => d.init.name === name2);
-            return declarators.flatMap((d) => d.id.properties);
+            return declarators.get(component)?.filter((d) => d.init.name === name2).flatMap((d) => d.id.properties) ?? [];
           }).otherwise(() => []);
           for (const prop of properties) {
             if (prop.type !== types.AST_NODE_TYPES.Property || prop.value.type !== types.AST_NODE_TYPES.AssignmentPattern) continue;
@@ -2263,13 +2265,10 @@ var no_unstable_default_props_default = createRule({
         }
       },
       "VariableDeclarator[id.type='ObjectPattern'][init.type='Identifier']"(node) {
-        eff.O.map(
-          ctx.getCurrentFunction(),
-          ([_, currentFn]) => possibleDestructuringDeclarators.set(currentFn, [
-            ...possibleDestructuringDeclarators.get(currentFn) ?? [],
-            node
-          ])
-        );
+        for (const [_, currentFn] of eff.O.toArray(ctx.getCurrentFunction())) {
+          const prevDeclarators = declarators.get(currentFn) ?? [];
+          declarators.set(currentFn, [...prevDeclarators, node]);
+        }
       }
     };
   },
@@ -2397,7 +2396,9 @@ var no_unused_class_component_members_default = createRule({
         if (node.init && AST11__namespace.isThisExpression(node.init) && node.id.type === types.AST_NODE_TYPES.ObjectPattern) {
           for (const prop of node.id.properties) {
             if (prop.type === types.AST_NODE_TYPES.Property && AST11__namespace.isKeyLiteralLike(prop, prop.key)) {
-              eff.O.map(getName3(prop.key), (name2) => propertyUsages.get(currentClass)?.add(name2));
+              for (const name2 of eff.O.toArray(getName3(prop.key))) {
+                propertyUsages.get(currentClass)?.add(name2);
+              }
             }
           }
         }
@@ -2864,10 +2865,8 @@ var use_jsx_vars_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: (
-        // eslint-disable-next-line eslint-plugin/require-meta-docs-description
-        "helpes `eslint/no-unused-vars` to correctly mark JSX variables as used."
-      ),
+      // eslint-disable-next-line eslint-plugin/require-meta-docs-description
+      description: "helpes `eslint/no-unused-vars` to correctly mark JSX variables as used.",
       [Symbol.for("rule_features")]: RULE_FEATURES49
     },
     messages: {
@@ -2890,9 +2889,9 @@ var use_jsx_vars_default = createRule({
     return {
       JSXOpeningElement(node) {
         if (node.name.type === types.AST_NODE_TYPES.JSXIdentifier && /^[a-z]/u.test(node.name.name)) return;
-        eff.O.map(getName5(node.name), (name2) => {
+        for (const name2 of eff.O.toArray(getName5(node.name))) {
           context.sourceCode.markVariableAsUsed(name2, node);
-        });
+        }
       }
     };
   },

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { F, O, isString, or, isNullable } from '@eslint-react/eff';
+import { F, O, or, isString, isNullable } from '@eslint-react/eff';
 import * as JSX7 from '@eslint-react/jsx';
 import { createRuleForPlugin, normalizeSettings, decodeSettings, unsafeReadSettings } from '@eslint-react/shared';
 import * as AST11 from '@eslint-react/ast';
-import { isForwardRefCall, isThisSetState, isClassComponent, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isCloneElementCall, isCreateRefCall, isComponentName, useComponentCollector, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isFragmentElement, isCreateElementCall, isInitializedFromReact } from '@eslint-react/core';
+import { isForwardRefCall, isThisSetState, isClassComponent, isCreateElementCall, isCloneElementCall, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isCreateRefCall, isComponentName, useComponentCollector, ERFunctionComponentFlag, isChildrenToArrayCall, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isFragmentElement, isInitializedFromReact } from '@eslint-react/core';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, P, match } from 'ts-pattern';
 import { compare } from 'compare-versions';
@@ -15,7 +15,7 @@ import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReado
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.22.2-next.9";
+var version = "1.22.2";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -300,12 +300,10 @@ var no_array_index_key_default = createRule({
   name: RULE_NAME5,
   create(context) {
     const indexParamNames = [];
+    const isCreateOrCloneElementCall = or(isCreateElementCall(context), isCloneElementCall(context));
     function isArrayIndex(node) {
       return node.type === AST_NODE_TYPES.Identifier && indexParamNames.some(O.exists((name2) => name2 === node.name));
     }
-    function isCreateOrCloneElementCall(node) {
-      return isCreateElementCall(node, context) || isCloneElementCall(node, context);
-    }
     function getReportDescriptor(node) {
       if (isArrayIndex(node)) return [{ messageId: "noArrayIndexKey", node }];
       if (AST11.isOneOf([AST_NODE_TYPES.TemplateLiteral, AST_NODE_TYPES.BinaryExpression])(node)) {
@@ -1835,9 +1833,15 @@ var no_set_state_in_component_did_mount_default = createRule({
         O.Do,
         O.bind("clazz", () => AST11.traverseUpGuard(node, isClassComponent)),
         O.bind("method", ({ clazz }) => AST11.traverseUpStop(node, clazz, isComponentDidMount)),
+        O.bind("methodScope", ({ method }) => O.some(context.sourceCode.getScope(method))),
         O.bind("upperScope", () => O.fromNullable(context.sourceCode.getScope(node).upper)),
         O.filter(
-          ({ clazz, method, upperScope }) => method.parent === clazz.body && upperScope === context.sourceCode.getScope(method)
+          ({
+            clazz,
+            method,
+            methodScope,
+            upperScope
+          }) => method.parent === clazz.body && upperScope === methodScope
         ),
         O.map(() => ({
           messageId: "noSetStateInComponentDidMount",
@@ -2129,39 +2133,40 @@ var no_unstable_context_value_default = createRule({
   name: RULE_NAME40,
   create(context) {
     const { ctx, listeners } = useComponentCollector(context);
-    const possibleValueConstructions = /* @__PURE__ */ new Map();
+    const constructions = /* @__PURE__ */ new Map();
     return {
       ...listeners,
       JSXOpeningElement(node) {
         const openingElementName = node.name;
         if (openingElementName.type !== AST_NODE_TYPES.JSXMemberExpression) return;
         if (openingElementName.property.name !== "Provider") return;
-        const maybeJSXValueAttribute = O.fromNullable(
-          node.attributes.find((attribute) => {
-            return attribute.type === AST_NODE_TYPES.JSXAttribute && attribute.name.name === "value";
-          })
+        const constructionEntry = F.pipe(
+          O.Do,
+          O.bind("function", ctx.getCurrentFunction),
+          O.bind("attribute", () => O.fromNullable(
+            node.attributes.find((attribute) => {
+              return attribute.type === AST_NODE_TYPES.JSXAttribute && attribute.name.name === "value";
+            })
+          )),
+          O.bind("value", ({ attribute }) => "value" in attribute ? O.some(attribute.value) : O.none()),
+          O.bind("valueExpression", ({ value }) => value?.type === AST_NODE_TYPES.JSXExpressionContainer ? O.some(value.expression) : O.none()),
+          O.bind("construction", ({ valueExpression }) => {
+            const initialScope = context.sourceCode.getScope(valueExpression);
+            return O.some(VAR.inspectConstruction(valueExpression, initialScope));
+          }),
+          O.filter(({ construction }) => construction._tag !== "None")
         );
-        if (O.isNone(maybeJSXValueAttribute) || !("value" in maybeJSXValueAttribute.value)) return;
-        const valueNode = maybeJSXValueAttribute.value.value;
-        if (valueNode?.type !== AST_NODE_TYPES.JSXExpressionContainer) return;
-        const valueExpression = valueNode.expression;
-        const initialScope = context.sourceCode.getScope(valueExpression);
-        const construction = VAR.inspectConstruction(valueExpression, initialScope);
-        if (construction._tag === "None") return;
-        O.map(
-          ctx.getCurrentFunction(),
-          ([_, currentFn]) => possibleValueConstructions.set(currentFn, [
-            ...possibleValueConstructions.get(currentFn) ?? [],
+        for (const { construction, function: [_, fNode] } of O.toArray(constructionEntry)) {
+          constructions.set(fNode, [
+            ...constructions.get(fNode) ?? [],
             construction
-          ])
-        );
+          ]);
+        }
       },
       "Program:exit"(node) {
         const components = ctx.getAllComponents(node).values();
         for (const { node: component } of components) {
-          const constructions = possibleValueConstructions.get(component);
-          if (!constructions) continue;
-          for (const construction of constructions) {
+          for (const construction of constructions.get(component) ?? []) {
             if (construction._tag === "None") continue;
             const { node: constructionNode, _tag } = construction;
             const messageId = _tag.startsWith("Function") ? "noUnstableContextValueWithFunction" : "noUnstableContextValueWithIdentifier";
@@ -2198,7 +2203,7 @@ var no_unstable_default_props_default = createRule({
   name: RULE_NAME41,
   create(context) {
     const { ctx, listeners } = useComponentCollector(context);
-    const possibleDestructuringDeclarators = /* @__PURE__ */ new WeakMap();
+    const declarators = /* @__PURE__ */ new WeakMap();
     return {
       ...listeners,
       "Program:exit"(node) {
@@ -2208,10 +2213,7 @@ var no_unstable_default_props_default = createRule({
           const [props] = params;
           if (!props) continue;
           const properties = match(props).with({ type: AST_NODE_TYPES.ObjectPattern }, ({ properties: properties2 }) => properties2).with({ type: AST_NODE_TYPES.Identifier }, ({ name: name2 }) => {
-            const variableDeclarators = possibleDestructuringDeclarators.get(component);
-            if (!variableDeclarators) return [];
-            const declarators = variableDeclarators.filter((d) => d.init.name === name2);
-            return declarators.flatMap((d) => d.id.properties);
+            return declarators.get(component)?.filter((d) => d.init.name === name2).flatMap((d) => d.id.properties) ?? [];
           }).otherwise(() => []);
           for (const prop of properties) {
             if (prop.type !== AST_NODE_TYPES.Property || prop.value.type !== AST_NODE_TYPES.AssignmentPattern) continue;
@@ -2236,13 +2238,10 @@ var no_unstable_default_props_default = createRule({
         }
       },
       "VariableDeclarator[id.type='ObjectPattern'][init.type='Identifier']"(node) {
-        O.map(
-          ctx.getCurrentFunction(),
-          ([_, currentFn]) => possibleDestructuringDeclarators.set(currentFn, [
-            ...possibleDestructuringDeclarators.get(currentFn) ?? [],
-            node
-          ])
-        );
+        for (const [_, currentFn] of O.toArray(ctx.getCurrentFunction())) {
+          const prevDeclarators = declarators.get(currentFn) ?? [];
+          declarators.set(currentFn, [...prevDeclarators, node]);
+        }
       }
     };
   },
@@ -2370,7 +2369,9 @@ var no_unused_class_component_members_default = createRule({
         if (node.init && AST11.isThisExpression(node.init) && node.id.type === AST_NODE_TYPES.ObjectPattern) {
           for (const prop of node.id.properties) {
             if (prop.type === AST_NODE_TYPES.Property && AST11.isKeyLiteralLike(prop, prop.key)) {
-              O.map(getName3(prop.key), (name2) => propertyUsages.get(currentClass)?.add(name2));
+              for (const name2 of O.toArray(getName3(prop.key))) {
+                propertyUsages.get(currentClass)?.add(name2);
+              }
             }
           }
         }
@@ -2837,10 +2838,8 @@ var use_jsx_vars_default = createRule({
   meta: {
     type: "problem",
     docs: {
-      description: (
-        // eslint-disable-next-line eslint-plugin/require-meta-docs-description
-        "helpes `eslint/no-unused-vars` to correctly mark JSX variables as used."
-      ),
+      // eslint-disable-next-line eslint-plugin/require-meta-docs-description
+      description: "helpes `eslint/no-unused-vars` to correctly mark JSX variables as used.",
       [Symbol.for("rule_features")]: RULE_FEATURES49
     },
     messages: {
@@ -2863,9 +2862,9 @@ var use_jsx_vars_default = createRule({
     return {
       JSXOpeningElement(node) {
         if (node.name.type === AST_NODE_TYPES.JSXIdentifier && /^[a-z]/u.test(node.name.name)) return;
-        O.map(getName5(node.name), (name2) => {
+        for (const name2 of O.toArray(getName5(node.name))) {
           context.sourceCode.markVariableAsUsed(name2, node);
-        });
+        }
       }
     };
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.22.2-next.9",
+  "version": "1.22.2",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -49,13 +49,13 @@
     "string-ts": "^2.2.0",
     "ts-api-utils": "^2.0.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.22.2-next.9",
-    "@eslint-react/core": "1.22.2-next.9",
-    "@eslint-react/jsx": "1.22.2-next.9",
-    "@eslint-react/eff": "1.22.2-next.9",
-    "@eslint-react/shared": "1.22.2-next.9",
-    "@eslint-react/types": "1.22.2-next.9",
-    "@eslint-react/var": "1.22.2-next.9"
+    "@eslint-react/ast": "1.22.2",
+    "@eslint-react/core": "1.22.2",
+    "@eslint-react/eff": "1.22.2",
+    "@eslint-react/jsx": "1.22.2",
+    "@eslint-react/types": "1.22.2",
+    "@eslint-react/var": "1.22.2",
+    "@eslint-react/shared": "1.22.2"
   },
   "devDependencies": {
     "@types/react": "^19.0.2",