@eslint-react/core 1.17.2-next.5 → 1.17.2-next.6

package/dist/index.js

@@ -41,38 +41,7 @@ function isInitializedFromReact(name, initialScope, settings) {
   if (!settings.strictImportCheck) return true;
   if (name.toLowerCase() === "react") return true;
   const { importSource = "react" } = settings;
-  const maybeLatestDef = tools.O.flatMapNullable(VAR__namespace.findVariable(name, initialScope), (v) => v.defs.at(-1));
-  if (tools.O.isNone(maybeLatestDef)) return false;
-  const latestDef = maybeLatestDef.value;
-  const { node, parent } = latestDef;
-  if (node.type === types.AST_NODE_TYPES.VariableDeclarator && node.init) {
-    const { init } = node;
-    if (init.type === types.AST_NODE_TYPES.MemberExpression && init.object.type === types.AST_NODE_TYPES.Identifier) {
-      return isInitializedFromReact(init.object.name, initialScope, settings);
-    }
-    if (init.type === types.AST_NODE_TYPES.Identifier) {
-      return isInitializedFromReact(init.name, initialScope, settings);
-    }
-    const maybeRequireExpression = tsPattern.match(init).with({
-      type: types.AST_NODE_TYPES.CallExpression,
-      callee: { type: types.AST_NODE_TYPES.Identifier, name: "require" }
-    }, (exp) => tools.O.some(exp)).with(
-      {
-        type: types.AST_NODE_TYPES.MemberExpression,
-        object: {
-          type: types.AST_NODE_TYPES.CallExpression,
-          callee: { type: types.AST_NODE_TYPES.Identifier, name: "require" }
-        }
-      },
-      ({ object }) => tools.O.some(object)
-    ).otherwise(tools.O.none);
-    if (tools.O.isNone(maybeRequireExpression)) return false;
-    const requireExpression = maybeRequireExpression.value;
-    const [firstArg] = requireExpression.arguments;
-    if (firstArg?.type !== types.AST_NODE_TYPES.Literal || !tools.isString(firstArg.value)) return false;
-    return firstArg.value === importSource || firstArg.value.startsWith(`${importSource}/`);
-  }
-  return tsPattern.isMatching({ type: "ImportDeclaration", source: { value: importSource } }, parent);
+  return VAR__namespace.isInitializedFromSource(name, importSource, initialScope);
 }
 
 // src/is-from-react.ts
@@ -665,9 +634,6 @@ var PHASE_RELEVANCE = birecord__default.default({
   setup: "cleanup"
 });
 var isInversePhase = tools.F.dual(2, (a, b) => PHASE_RELEVANCE.get(a) === b);
-function getPhaseKindOfFunction(node) {
-  return tsPattern.match(node).when(isSetupFunction, () => tools.O.some("setup")).when(isCleanupFunction, () => tools.O.some("cleanup")).when(isComponentDidMountFunction, () => tools.O.some("mount")).when(isComponentWillUnmountFunction, () => tools.O.some("unmount")).otherwise(tools.O.none);
-}
 function isDirectValueOfRenderPropertyLoose(node) {
   const matching = tsPattern.isMatching({
     key: {
@@ -724,7 +690,6 @@ exports.RE_COMPONENT_NAME = RE_COMPONENT_NAME;
 exports.RE_HOOK_NAME = RE_HOOK_NAME;
 exports.getComponentNameFromIdentifier = getComponentNameFromIdentifier;
 exports.getFunctionComponentIdentifier = getFunctionComponentIdentifier;
-exports.getPhaseKindOfFunction = getPhaseKindOfFunction;
 exports.hasNoneOrValidComponentName = hasNoneOrValidComponentName;
 exports.isCallFromReact = isCallFromReact;
 exports.isCallFromReactMember = isCallFromReactMember;

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import * as AST9 from '@eslint-react/ast';
 import * as JSX3 from '@eslint-react/jsx';
-import { F, O, isString } from '@eslint-react/tools';
+import { F, O } from '@eslint-react/tools';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import ShortUniqueId from 'short-unique-id';
 import { isMatching, P, match } from 'ts-pattern';
@@ -13,38 +13,7 @@ function isInitializedFromReact(name, initialScope, settings) {
   if (!settings.strictImportCheck) return true;
   if (name.toLowerCase() === "react") return true;
   const { importSource = "react" } = settings;
-  const maybeLatestDef = O.flatMapNullable(VAR.findVariable(name, initialScope), (v) => v.defs.at(-1));
-  if (O.isNone(maybeLatestDef)) return false;
-  const latestDef = maybeLatestDef.value;
-  const { node, parent } = latestDef;
-  if (node.type === AST_NODE_TYPES.VariableDeclarator && node.init) {
-    const { init } = node;
-    if (init.type === AST_NODE_TYPES.MemberExpression && init.object.type === AST_NODE_TYPES.Identifier) {
-      return isInitializedFromReact(init.object.name, initialScope, settings);
-    }
-    if (init.type === AST_NODE_TYPES.Identifier) {
-      return isInitializedFromReact(init.name, initialScope, settings);
-    }
-    const maybeRequireExpression = match(init).with({
-      type: AST_NODE_TYPES.CallExpression,
-      callee: { type: AST_NODE_TYPES.Identifier, name: "require" }
-    }, (exp) => O.some(exp)).with(
-      {
-        type: AST_NODE_TYPES.MemberExpression,
-        object: {
-          type: AST_NODE_TYPES.CallExpression,
-          callee: { type: AST_NODE_TYPES.Identifier, name: "require" }
-        }
-      },
-      ({ object }) => O.some(object)
-    ).otherwise(O.none);
-    if (O.isNone(maybeRequireExpression)) return false;
-    const requireExpression = maybeRequireExpression.value;
-    const [firstArg] = requireExpression.arguments;
-    if (firstArg?.type !== AST_NODE_TYPES.Literal || !isString(firstArg.value)) return false;
-    return firstArg.value === importSource || firstArg.value.startsWith(`${importSource}/`);
-  }
-  return isMatching({ type: "ImportDeclaration", source: { value: importSource } }, parent);
+  return VAR.isInitializedFromSource(name, importSource, initialScope);
 }
 
 // src/is-from-react.ts
@@ -637,9 +606,6 @@ var PHASE_RELEVANCE = birecord({
   setup: "cleanup"
 });
 var isInversePhase = F.dual(2, (a, b) => PHASE_RELEVANCE.get(a) === b);
-function getPhaseKindOfFunction(node) {
-  return match(node).when(isSetupFunction, () => O.some("setup")).when(isCleanupFunction, () => O.some("cleanup")).when(isComponentDidMountFunction, () => O.some("mount")).when(isComponentWillUnmountFunction, () => O.some("unmount")).otherwise(O.none);
-}
 function isDirectValueOfRenderPropertyLoose(node) {
   const matching = isMatching({
     key: {
@@ -687,4 +653,4 @@ function isThisSetState(node) {
   return callee.type === AST_NODE_TYPES.MemberExpression && AST9.isThisExpression(callee.object) && callee.property.type === AST_NODE_TYPES.Identifier && callee.property.name === "setState";
 }
 
-export { DEFAULT_COMPONENT_HINT, ERClassComponentFlag, ERComponentHint, ERFunctionComponentFlag, PHASE_RELEVANCE, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getFunctionComponentIdentifier, getPhaseKindOfFunction, 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, isFragmentElement, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideReactHookCall, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, 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, PHASE_RELEVANCE, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getFunctionComponentIdentifier, 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, isFragmentElement, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, isInsideReactHookCall, isInsideRenderMethod, isInversePhase, isMemo, isMemoCall, isPureComponent, isReactAPICallWithName, isReactAPIWithName, isReactHook, isReactHookCall, isReactHookCallWithName, isReactHookCallWithNameAlias, isReactHookCallWithNameLoose, isReactHookName, isRenderFunctionLoose, isRenderPropLoose, isSetupFunction, 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.17.2-next.5",
+  "version": "1.17.2-next.6",
   "description": "ESLint React's ESLint utility module for static analysis of React core APIs and Patterns.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -42,12 +42,12 @@
     "birecord": "^0.1.1",
     "short-unique-id": "^5.2.0",
     "ts-pattern": "^5.5.0",
-    "@eslint-react/ast": "1.17.2-next.5",
-    "@eslint-react/jsx": "1.17.2-next.5",
-    "@eslint-react/tools": "1.17.2-next.5",
-    "@eslint-react/shared": "1.17.2-next.5",
-    "@eslint-react/types": "1.17.2-next.5",
-    "@eslint-react/var": "1.17.2-next.5"
+    "@eslint-react/ast": "1.17.2-next.6",
+    "@eslint-react/jsx": "1.17.2-next.6",
+    "@eslint-react/shared": "1.17.2-next.6",
+    "@eslint-react/tools": "1.17.2-next.6",
+    "@eslint-react/types": "1.17.2-next.6",
+    "@eslint-react/var": "1.17.2-next.6"
   },
   "devDependencies": {
     "tsup": "^8.3.5"