@eslint-react/core 1.24.0-next.1 → 1.24.0-next.12

package/dist/index.mjs

@@ -1,30 +1,12 @@
 import * as AST8 from '@eslint-react/ast';
-import { flip, birecord, dual, _, returnFalse } from '@eslint-react/eff';
-import * as JSX4 from '@eslint-react/jsx';
+import { flip, dual, _, returnFalse } from '@eslint-react/eff';
+import * as JSX3 from '@eslint-react/jsx';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import * as VAR from '@eslint-react/var';
 import { unsafeDecodeSettings } from '@eslint-react/shared';
+import * as VAR from '@eslint-react/var';
+import birecord from 'birecord';
 
 // src/component/component-collector.ts
-function getElementNameAndRepresentName(node, context, polymorphicPropName, additionalComponents = []) {
-  const name = JSX4.getElementName(node);
-  if (name === name.toLowerCase()) return [name, name];
-  const component = additionalComponents.findLast((c) => c.name === name || c.re.test(name));
-  if (component != null) return [name, component.as];
-  if (polymorphicPropName == null) return [name, name];
-  const initialScope = context.sourceCode.getScope(node);
-  const polymorphicProp = JSX4.findPropInAttributes(
-    polymorphicPropName,
-    initialScope,
-    node.attributes
-  );
-  if (polymorphicProp == null) return [name, name];
-  const polymorphicName = VAR.toResolved(JSX4.getPropValue(polymorphicProp, initialScope)).value;
-  if (typeof polymorphicName === "string") {
-    return [name, polymorphicName];
-  }
-  return [name, name];
-}
 
 // src/utils/get-id.ts
 var id = 0n;
@@ -140,9 +122,9 @@ var isMemoCall = isReactAPICallWithName("memo");
 
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
-  const call = AST8.findParentNodeGuard(node, isCreateElementCall(context));
+  const call = AST8.findParentNode(node, isCreateElementCall(context));
   if (call == null) return false;
-  const prop = AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.ObjectExpression));
+  const prop = AST8.findParentNode(node, AST8.is(AST_NODE_TYPES.ObjectExpression));
   if (prop == null) return false;
   return prop === call.arguments[1];
 }
@@ -252,7 +234,7 @@ var isUseTransitionCall = flip(isReactHookCallWithName)("useTransition");
 
 // src/hook/hierarchy.ts
 function isInsideReactHook(node) {
-  return isReactHook(AST8.findParentNodeGuard(node, AST8.isFunction));
+  return isReactHook(AST8.findParentNode(node, AST8.isFunction));
 }
 function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
@@ -264,8 +246,8 @@ function useHookCollector() {
       const key = getId();
       fEntries.push({ key, node });
       hooks.set(key, {
-        _: key,
         id: id2,
+        key,
         kind: "function",
         name,
         node,
@@ -304,19 +286,13 @@ function useHookCollector() {
       if (hook == null) {
         return;
       }
-      hooks.set(hook._, {
-        ...hook,
-        hookCalls: [
-          ...hook.hookCalls,
-          node
-        ]
-      });
+      hook.hookCalls.push(node);
     }
   };
   return { ctx, listeners };
 }
 var ERComponentHint = {
-  ...JSX4.JSXValueHint,
+  ...JSX3.JSXValueHint,
   // 1n << 0n - 1n << 63n are reserved for JSXValueHint
   // Skip function component created by React.memo
   SkipMemo: 1n << 64n,
@@ -371,14 +347,6 @@ function getFunctionComponentIdentifier(node, context) {
   }
   return _;
 }
-var RE_COMPONENT_NAME = /^_?[A-Z]/u;
-function getComponentNameFromIdentifier(node) {
-  if (node == null) return _;
-  return Array.isArray(node) ? node.map((n) => n.name).join(".") : node.name;
-}
-function isComponentName(name) {
-  return RE_COMPONENT_NAME.test(name);
-}
 function isClassComponent(node) {
   if ("superClass" in node && node.superClass != null) {
     const re = /^(?:Pure)?Component$/u;
@@ -404,9 +372,30 @@ function isPureComponent(node) {
   return false;
 }
 
-// src/component/component-render-method.ts
+// src/component/component-lifecycle.ts
+function isComponentDidMount(node) {
+  return AST8.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
+}
+function isComponentWillUnmount(node) {
+  return AST8.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillUnmount";
+}
+function isComponentDidCatch(node) {
+  return AST8.isMethodOrProperty(node) && !node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidCatch";
+}
+function isGetDerivedStateFromError(node) {
+  return AST8.isMethodOrProperty(node) && node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "getDerivedStateFromError";
+}
+function isGetDerivedStateFromProps(node) {
+  return AST8.isMethodOrProperty(node) && node.static && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "getDerivedStateFromProps";
+}
+function isFunctionOfComponentDidMount(node) {
+  return AST8.isFunction(node) && isComponentDidMount(node.parent) && node.parent.value === node;
+}
+function isFunctionOfComponentWillUnmount(node) {
+  return AST8.isFunction(node) && isComponentWillUnmount(node.parent) && node.parent.value === node;
+}
 function isRenderMethodLike(node) {
-  return (node.type === AST_NODE_TYPES.MethodDefinition || node.type === AST_NODE_TYPES.PropertyDefinition) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "render" && node.parent.parent.type === AST_NODE_TYPES.ClassDeclaration;
+  return AST8.isMethodOrProperty(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "render" && node.parent.parent.type === AST_NODE_TYPES.ClassDeclaration;
 }
 function isFunctionOfRenderMethod(node) {
   if (!isRenderMethodLike(node.parent)) {
@@ -417,8 +406,14 @@ function isFunctionOfRenderMethod(node) {
 function isInsideRenderMethod(node) {
   return AST8.findParentNode(node, (node2) => isRenderMethodLike(node2) && isClassComponent(node2.parent.parent)) != null;
 }
-
-// src/component/misc.ts
+var RE_COMPONENT_NAME = /^_?[A-Z]/u;
+function getComponentNameFromIdentifier(node) {
+  if (node == null) return _;
+  return Array.isArray(node) ? node.map((n) => n.name).join(".") : node.name;
+}
+function isComponentName(name) {
+  return RE_COMPONENT_NAME.test(name);
+}
 function hasNoneOrValidComponentName(node, context) {
   const id2 = getFunctionComponentIdentifier(node, context);
   if (id2 == null) return true;
@@ -457,15 +452,17 @@ function hasValidHierarchy(node, context, hint) {
 }
 function getComponentFlag(initPath) {
   let flag = ERFunctionComponentFlag.None;
-  if (initPath != null && AST8.hasCallInFunctionInitPath("memo")(initPath)) {
+  if (initPath != null && AST8.hasCallInFunctionInitPath("memo", initPath)) {
     flag |= ERFunctionComponentFlag.Memo;
   }
-  if (initPath != null && AST8.hasCallInFunctionInitPath("forwardRef")(initPath)) {
+  if (initPath != null && AST8.hasCallInFunctionInitPath("forwardRef", initPath)) {
     flag |= ERFunctionComponentFlag.ForwardRef;
   }
   return flag;
 }
-function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
+var displayNameAssignmentSelector = "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']";
+function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT, options = {}) {
+  const { collectDisplayName = false, collectHookCalls = false } = options;
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
   const components = /* @__PURE__ */ new Map();
   const functionEntries = [];
@@ -481,7 +478,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       return functionEntries.pop();
     }
     const shouldDrop = AST8.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX3.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -507,7 +504,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
         return;
       }
       const { body } = entry.node;
-      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) {
         return;
       }
@@ -516,8 +513,8 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       const name = getComponentNameFromIdentifier(id2);
       const key = getId();
       components.set(key, {
-        _: key,
         id: id2,
+        key,
         kind: "function",
         name,
         node: entry.node,
@@ -528,35 +525,35 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
         initPath
       });
     },
-    "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']"(node) {
-      const { left, right } = node;
-      const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : _;
-      const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
-      if (component == null) {
-        return;
+    ...collectDisplayName ? {
+      [displayNameAssignmentSelector](node) {
+        const { left, right } = node;
+        const componentName = left.object.type === AST_NODE_TYPES.Identifier ? left.object.name : _;
+        const component = [...components.values()].findLast(({ name }) => name != null && name === componentName);
+        if (component == null) {
+          return;
+        }
+        component.displayName = right;
       }
-      components.set(component._, {
-        ...component,
-        displayName: right
-      });
-    },
-    "CallExpression[type]:exit"(node) {
-      if (!isReactHookCall(node)) {
-        return;
+    } : {},
+    ...collectHookCalls ? {
+      "CallExpression[type]:exit"(node) {
+        if (!isReactHookCall(node)) {
+          return;
+        }
+        const entry = getCurrentEntry();
+        if (entry == null) {
+          return;
+        }
+        entry.hookCalls.push(node);
       }
-      const entry = getCurrentEntry();
-      if (entry == null) {
-        return;
-      }
-      functionEntries.pop();
-      functionEntries.push({ ...entry, hookCalls: [...entry.hookCalls, node] });
-    },
+    } : {},
     "ReturnStatement[type]"(node) {
       const entry = getCurrentEntry();
       if (entry == null) {
         return;
       }
-      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX4.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
+      const isComponent = hasNoneOrValidComponentName(entry.node, context) && JSX3.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(entry.node, context, hint);
       if (!isComponent) {
         return;
       }
@@ -566,8 +563,8 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       const id2 = getFunctionComponentIdentifier(entry.node, context);
       const name = getComponentNameFromIdentifier(id2);
       components.set(entry.key, {
-        _: entry.key,
         id: id2,
+        key: entry.key,
         kind: "function",
         name,
         node: entry.node,
@@ -599,8 +596,8 @@ function useComponentCollectorLegacy() {
     components.set(
       key,
       {
-        _: key,
         id: id2,
+        key,
         kind: "class",
         name: id2?.name,
         node,
@@ -619,60 +616,22 @@ function useComponentCollectorLegacy() {
   };
   return { ctx, listeners };
 }
-function isSetupFunction(node) {
-  if (node == null) return _;
-  return node.parent?.type === AST_NODE_TYPES.CallExpression && node.parent.callee !== node && node.parent.callee.type === AST_NODE_TYPES.Identifier && node.parent.arguments.at(0) === node && isUseEffectCallLoose(node.parent);
-}
-function isCleanupFunction(node) {
-  const nearReturn = AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.ReturnStatement));
-  const nearFunction = AST8.findParentNodeGuard(node, AST8.isFunction);
-  const nearFunctionOfReturn = AST8.findParentNodeGuard(nearReturn, AST8.isFunction);
-  return nearFunction === nearFunctionOfReturn && isSetupFunction(nearFunction);
-}
-function isComponentDidMount(node) {
-  return AST8.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
-}
-function isComponentWillUnmount(node) {
-  return AST8.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentWillUnmount";
-}
-function isComponentDidMountFunction(node) {
-  return AST8.isFunction(node) && isComponentDidMount(node.parent) && node.parent.value === node;
-}
-function isComponentWillUnmountFunction(node) {
-  return AST8.isFunction(node) && isComponentWillUnmount(node.parent) && node.parent.value === node;
-}
 var ERPhaseRelevance = birecord({
   mount: "unmount",
   setup: "cleanup"
 });
 var isInversePhase = dual(2, (a, b) => ERPhaseRelevance.get(a) === b);
-function isDirectValueOfRenderPropertyLoose(node) {
-  const matching = (node2) => {
-    return node2.type === AST_NODE_TYPES.Property && node2.key.type === AST_NODE_TYPES.Identifier && node2.key.name.startsWith("render");
-  };
-  return matching(node) || node.parent != null && matching(node.parent);
-}
-function isDeclaredInRenderPropLoose(node) {
-  if (isDirectValueOfRenderPropertyLoose(node)) {
-    return true;
-  }
-  const parent = AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.JSXExpressionContainer))?.parent;
-  if (parent?.type !== AST_NODE_TYPES.JSXAttribute) {
-    return false;
-  }
-  return parent.name.type === AST_NODE_TYPES.JSXIdentifier && parent.name.name.startsWith("render");
-}
 function isRenderFunctionLoose(node, context) {
   const { body, parent } = node;
   if (AST8.getFunctionIdentifier(node)?.name.startsWith("render")) {
     return parent.type === AST_NODE_TYPES.JSXExpressionContainer && parent.parent.type === AST_NODE_TYPES.JSXAttribute && parent.parent.name.type === AST_NODE_TYPES.JSXIdentifier && parent.parent.name.name.startsWith("render");
   }
-  return JSX4.isJSXValue(
+  return JSX3.isJSXValue(
     body,
     {
       getScope: (node2) => context.sourceCode.getScope(node2)
     },
-    JSX4.JSXValueHint.SkipNullLiteral | JSX4.JSXValueHint.SkipUndefined | JSX4.JSXValueHint.StrictLogical | JSX4.JSXValueHint.StrictConditional
+    JSX3.JSXValueHint.SkipNullLiteral | JSX3.JSXValueHint.SkipUndefined | JSX3.JSXValueHint.StrictLogical | JSX3.JSXValueHint.StrictConditional
   );
 }
 function isRenderPropLoose(node, context) {
@@ -681,9 +640,35 @@ function isRenderPropLoose(node, context) {
   }
   return node.name.name.startsWith("render") && node.value?.type === AST_NODE_TYPES.JSXExpressionContainer && AST8.isFunction(node.value.expression) && isRenderFunctionLoose(node.value.expression, context);
 }
+function isDirectValueOfRenderPropertyLoose(node) {
+  const matching = (node2) => {
+    return node2.type === AST_NODE_TYPES.Property && node2.key.type === AST_NODE_TYPES.Identifier && node2.key.name.startsWith("render");
+  };
+  return matching(node) || node.parent != null && matching(node.parent);
+}
+function isDeclaredInRenderPropLoose(node) {
+  if (isDirectValueOfRenderPropertyLoose(node)) {
+    return true;
+  }
+  const parent = AST8.findParentNode(node, AST8.is(AST_NODE_TYPES.JSXExpressionContainer))?.parent;
+  if (parent?.type !== AST_NODE_TYPES.JSXAttribute) {
+    return false;
+  }
+  return parent.name.type === AST_NODE_TYPES.JSXIdentifier && parent.name.name.startsWith("render");
+}
 function isThisSetState(node) {
   const { callee } = node;
   return callee.type === AST_NODE_TYPES.MemberExpression && AST8.isThisExpression(callee.object) && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "setState";
 }
+function isFunctionOfUseEffectSetup(node) {
+  if (node == null) return _;
+  return node.parent?.type === AST_NODE_TYPES.CallExpression && node.parent.callee !== node && node.parent.callee.type === AST_NODE_TYPES.Identifier && node.parent.arguments.at(0) === node && isUseEffectCallLoose(node.parent);
+}
+function isFunctionOfUseEffectCleanup(node) {
+  const nearReturn = AST8.findParentNode(node, AST8.is(AST_NODE_TYPES.ReturnStatement));
+  const nearFunction = AST8.findParentNode(node, AST8.isFunction);
+  const nearFunctionOfReturn = AST8.findParentNode(nearReturn, AST8.isFunction);
+  return nearFunction === nearFunctionOfReturn && isFunctionOfUseEffectSetup(nearFunction);
+}
 
-export { DEFAULT_COMPONENT_HINT, ERClassComponentFlag, ERComponentHint, ERFunctionComponentFlag, ERPhaseRelevance, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementNameAndRepresentName, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCleanupFunction, isCloneElement, isCloneElementCall, isComponentDidMount, isComponentDidMountFunction, isComponentName, isComponentWillUnmount, isComponentWillUnmountFunction, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isSetupFunction, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };
+export { DEFAULT_COMPONENT_HINT, ERClassComponentFlag, ERComponentHint, ERFunctionComponentFlag, ERPhaseRelevance, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getFunctionComponentIdentifier, getId, hasNoneOrValidComponentName, isCallFromReact, isCallFromReactMember, isChildrenCount, isChildrenCountCall, isChildrenForEach, isChildrenForEachCall, isChildrenMap, isChildrenMapCall, isChildrenOfCreateElement, isChildrenOnly, isChildrenOnlyCall, isChildrenToArray, isChildrenToArrayCall, isClassComponent, isCloneElement, isCloneElementCall, isComponentDidCatch, isComponentDidMount, isComponentName, isComponentWillUnmount, isCreateContext, isCreateContextCall, isCreateElement, isCreateElementCall, isCreateRef, isCreateRefCall, isDeclaredInRenderPropLoose, isDirectValueOfRenderPropertyLoose, isForwardRef, isForwardRefCall, isFromReact, isFromReactMember, isFunctionOfComponentDidMount, isFunctionOfComponentWillUnmount, isFunctionOfRenderMethod, isFunctionOfUseEffectCleanup, isFunctionOfUseEffectSetup, isGetDerivedStateFromError, isGetDerivedStateFromProps, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderMethodLike, isRenderPropLoose, isThisSetState, isUseCallbackCall, isUseContextCall, isUseDebugValueCall, isUseDeferredValueCall, isUseEffectCall, isUseEffectCallLoose, isUseIdCall, isUseImperativeHandleCall, isUseInsertionEffectCall, isUseLayoutEffectCall, isUseMemoCall, isUseReducerCall, isUseRefCall, isUseStateCall, isUseSyncExternalStoreCall, isUseTransitionCall, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.24.0-next.1",
+  "version": "1.24.0-next.12",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and Patterns.",
   "homepage": "https://github.com/Rel1cx/eslint-react",
   "bugs": {
@@ -33,17 +33,17 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.19.1",
-    "@typescript-eslint/type-utils": "^8.19.1",
-    "@typescript-eslint/types": "^8.19.1",
-    "@typescript-eslint/utils": "^8.19.1",
+    "@typescript-eslint/scope-manager": "^8.20.0",
+    "@typescript-eslint/type-utils": "^8.20.0",
+    "@typescript-eslint/types": "^8.20.0",
+    "@typescript-eslint/utils": "^8.20.0",
+    "birecord": "^0.1.1",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.24.0-next.1",
-    "@eslint-react/jsx": "1.24.0-next.1",
-    "@eslint-react/eff": "1.24.0-next.1",
-    "@eslint-react/shared": "1.24.0-next.1",
-    "@eslint-react/var": "1.24.0-next.1",
-    "@eslint-react/types": "1.24.0-next.1"
+    "@eslint-react/ast": "1.24.0-next.12",
+    "@eslint-react/eff": "1.24.0-next.12",
+    "@eslint-react/jsx": "1.24.0-next.12",
+    "@eslint-react/shared": "1.24.0-next.12",
+    "@eslint-react/var": "1.24.0-next.12"
   },
   "devDependencies": {
     "tsup": "^8.3.5",