refactor: code optimization (#945)

.pkgs/eslint-plugin-local/dist/index.js

@@ -26,7 +26,7 @@ function isInitializedFromSource(name2, source, initialScope) {
     }
     const args = getRequireExpressionArguments(init);
     const arg0 = args?.[0];
-    if (arg0 == null || !AST.isStringLiteral(arg0)) {
+    if (arg0 == null || !AST.isKindOfLiteral(arg0, "string")) {
       return false;
     }
     return arg0.value === source || arg0.value.startsWith(`${source}/`);

.pkgs/eslint-plugin-local/src/utils/is-initialized-from-source.ts

@@ -33,7 +33,7 @@ export function isInitializedFromSource(
     // check for: `variable = require('source')` or `variable = require('source').variable`
     const args = getRequireExpressionArguments(init);
     const arg0 = args?.[0];
-    if (arg0 == null || !AST.isStringLiteral(arg0)) {
+    if (arg0 == null || !AST.isKindOfLiteral(arg0, "string")) {
       return false;
     }
     // check for: `require('source')` or `require('source/...')`

packages/core/docs/-internal-/interfaces/TSTypeOperator.md

@@ -28,7 +28,7 @@ The loc property is defined as nullable by ESTree, but ESLint requires this prop
 
 ### operator
 
-> **operator**: `"keyof"` \| `"readonly"` \| `"unique"`
+> **operator**: `"readonly"` \| `"keyof"` \| `"unique"`
 
 ***
 

packages/core/docs/README.md

@@ -52,6 +52,7 @@
 - [getComponentNameFromIdentifier](functions/getComponentNameFromIdentifier.md)
 - [getFunctionComponentIdentifier](functions/getFunctionComponentIdentifier.md)
 - [hasNoneOrValidComponentName](functions/hasNoneOrValidComponentName.md)
+- [hasValidHierarchy](functions/hasValidHierarchy.md)
 - [isCallFromReact](functions/isCallFromReact.md)
 - [isCallFromReactMember](functions/isCallFromReactMember.md)
 - [isChildrenCount](functions/isChildrenCount.md)
@@ -83,6 +84,11 @@
 - [isForwardRef](functions/isForwardRef.md)
 - [isForwardRefCall](functions/isForwardRefCall.md)
 - [isFromReact](functions/isFromReact.md)
+- [isFromReactLoose](functions/isFromReactLoose.md)
+- [isFromReactMember](functions/isFromReactMember.md)
+- [isFromReactMemberLoose](functions/isFromReactMemberLoose.md)
+- [isFromReactMemberStrict](functions/isFromReactMemberStrict.md)
+- [isFromReactStrict](functions/isFromReactStrict.md)
 - [isFunctionOfComponentDidMount](functions/isFunctionOfComponentDidMount.md)
 - [isFunctionOfComponentWillUnmount](functions/isFunctionOfComponentWillUnmount.md)
 - [isFunctionOfRenderMethod](functions/isFunctionOfRenderMethod.md)

packages/core/docs/functions/hasValidHierarchy.md

@@ -0,0 +1,29 @@
+[**@eslint-react/core**](../README.md)
+
+***
+
+[@eslint-react/core](../README.md) / hasValidHierarchy
+
+# Function: hasValidHierarchy()
+
+> **hasValidHierarchy**(`node`, `context`, `hint`): `boolean`
+
+internal
+
+## Parameters
+
+### node
+
+[`TSESTreeFunction`](../-internal-/type-aliases/TSESTreeFunction.md)
+
+### context
+
+[`Readonly`](../-internal-/type-aliases/Readonly.md)
+
+### hint
+
+`bigint`
+
+## Returns
+
+`boolean`

packages/core/docs/functions/isFromReact.md

@@ -8,22 +8,16 @@
 
 > **isFromReact**(`name`): (`node`, `context`) => `boolean`
 
-Checks if the given node is a call expression to the given function or method of the pragma
-
 ## Parameters
 
 ### name
 
 `string`
 
-The name of the function or method to check
-
 ## Returns
 
 `Function`
 
-A predicate that checks if the given node is a call expression to the given function or method
-
 ### Parameters
 
 #### node

packages/core/docs/functions/isFromReactLoose.md

@@ -0,0 +1,23 @@
+[**@eslint-react/core**](../README.md)
+
+***
+
+[@eslint-react/core](../README.md) / isFromReactLoose
+
+# Function: isFromReactLoose()
+
+> **isFromReactLoose**(`node`, `name`): `boolean`
+
+## Parameters
+
+### node
+
+[`Identifier`](../-internal-/interfaces/Identifier.md) | [`MemberExpression`](../-internal-/type-aliases/MemberExpression.md)
+
+### name
+
+`string`
+
+## Returns
+
+`boolean`

packages/core/docs/functions/isFromReactMember.md

@@ -0,0 +1,37 @@
+[**@eslint-react/core**](../README.md)
+
+***
+
+[@eslint-react/core](../README.md) / isFromReactMember
+
+# Function: isFromReactMember()
+
+> **isFromReactMember**(`memberName`, `name`): (`node`, `context`) => `boolean`
+
+## Parameters
+
+### memberName
+
+`string`
+
+### name
+
+`string`
+
+## Returns
+
+`Function`
+
+### Parameters
+
+#### node
+
+[`MemberExpression`](../-internal-/type-aliases/MemberExpression.md)
+
+#### context
+
+[`Readonly`](../-internal-/type-aliases/Readonly.md)
+
+### Returns
+
+`boolean`

packages/core/docs/functions/isFromReactMemberLoose.md

@@ -0,0 +1,27 @@
+[**@eslint-react/core**](../README.md)
+
+***
+
+[@eslint-react/core](../README.md) / isFromReactMemberLoose
+
+# Function: isFromReactMemberLoose()
+
+> **isFromReactMemberLoose**(`node`, `memberName`, `name`): `boolean`
+
+## Parameters
+
+### node
+
+[`MemberExpression`](../-internal-/type-aliases/MemberExpression.md)
+
+### memberName
+
+`string`
+
+### name
+
+`string`
+
+## Returns
+
+`boolean`

packages/core/docs/functions/isFromReactMemberStrict.md

@@ -0,0 +1,35 @@
+[**@eslint-react/core**](../README.md)
+
+***
+
+[@eslint-react/core](../README.md) / isFromReactMemberStrict
+
+# Function: isFromReactMemberStrict()
+
+> **isFromReactMemberStrict**(`node`, `memberName`, `name`, `importSource`, `initialScope`): `boolean`
+
+## Parameters
+
+### node
+
+[`MemberExpression`](../-internal-/type-aliases/MemberExpression.md)
+
+### memberName
+
+`string`
+
+### name
+
+`string`
+
+### importSource
+
+`string`
+
+### initialScope
+
+[`Scope`](../-internal-/type-aliases/Scope.md)
+
+## Returns
+
+`boolean`

packages/core/docs/functions/isFromReactStrict.md

@@ -0,0 +1,31 @@
+[**@eslint-react/core**](../README.md)
+
+***
+
+[@eslint-react/core](../README.md) / isFromReactStrict
+
+# Function: isFromReactStrict()
+
+> **isFromReactStrict**(`node`, `name`, `importSource`, `initialScope`): `boolean`
+
+## Parameters
+
+### node
+
+[`Identifier`](../-internal-/interfaces/Identifier.md) | [`MemberExpression`](../-internal-/type-aliases/MemberExpression.md)
+
+### name
+
+`string`
+
+### importSource
+
+`string`
+
+### initialScope
+
+[`Scope`](../-internal-/type-aliases/Scope.md)
+
+## Returns
+
+`boolean`

packages/core/src/component/component-collector.ts

@@ -7,15 +7,14 @@ import type { TSESTree } from "@typescript-eslint/types";
 import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
 import type { ESLintUtils } from "@typescript-eslint/utils";
 
-import { isChildrenOfCreateElement } from "../element";
 import { isReactHookCall } from "../hook";
 import { DISPLAY_NAME_ASSIGNMENT_SELECTOR } from "../utils";
-import { DEFAULT_COMPONENT_HINT, ERComponentHint } from "./component-collector-hint";
+import { DEFAULT_COMPONENT_HINT } from "./component-collector-hint";
 import { ERComponentFlag } from "./component-flag";
 import { getFunctionComponentIdentifier } from "./component-id";
-import { isFunctionOfRenderMethod } from "./component-lifecycle";
 import { getComponentNameFromIdentifier, hasNoneOrValidComponentName } from "./component-name";
 import type { ERFunctionComponent } from "./component-semantic-node";
+import { hasValidHierarchy } from "./hierarchy";
 
 type FunctionEntry = {
   key: string;
@@ -172,35 +171,6 @@ export function useComponentCollector(
   return { ctx, listeners } as const;
 }
 
-function hasValidHierarchy(node: AST.TSESTreeFunction, context: RuleContext, hint: bigint) {
-  if (isChildrenOfCreateElement(node, context) || isFunctionOfRenderMethod(node)) {
-    return false;
-  }
-  if (hint & ERComponentHint.SkipMapCallback && AST.isMapCallLoose(node.parent)) {
-    return false;
-  }
-  if (hint & ERComponentHint.SkipObjectMethod && AST.isFunctionOfObjectMethod(node.parent)) {
-    return false;
-  }
-  if (hint & ERComponentHint.SkipClassMethod && AST.isFunctionOfClassMethod(node.parent)) {
-    return false;
-  }
-  if (hint & ERComponentHint.SkipClassProperty && AST.isFunctionOfClassProperty(node.parent)) {
-    return false;
-  }
-  const boundaryNode = AST.findParentNode(
-    node,
-    AST.isOneOf([
-      T.JSXExpressionContainer,
-      T.ArrowFunctionExpression,
-      T.FunctionExpression,
-      T.Property,
-      T.ClassBody,
-    ]),
-  );
-  return boundaryNode == null || boundaryNode.type !== T.JSXExpressionContainer;
-}
-
 function getComponentFlag(initPath: ERFunctionComponent["initPath"]) {
   let flag = ERComponentFlag.None;
   if (initPath != null && AST.hasCallInFunctionInitPath("memo", initPath)) {

packages/core/src/component/hierarchy.ts

@@ -0,0 +1,61 @@
+/* eslint-disable jsdoc/require-param */
+import * as AST from "@eslint-react/ast";
+import { type RuleContext } from "@eslint-react/shared";
+import type { TSESTree } from "@typescript-eslint/types";
+import { AST_NODE_TYPES as T } from "@typescript-eslint/types";
+
+import { isChildrenOfCreateElement } from "../element";
+import { ERComponentHint } from "./component-collector-hint";
+import { isFunctionOfRenderMethod } from "./component-lifecycle";
+
+/** internal */
+export function hasValidHierarchy(node: AST.TSESTreeFunction, context: RuleContext, hint: bigint) {
+  if (isChildrenOfCreateElement(node, context) || isFunctionOfRenderMethod(node)) {
+    return false;
+  }
+  if (hint & ERComponentHint.SkipMapCallback && AST.isMapCallLoose(node.parent)) {
+    return false;
+  }
+  if (hint & ERComponentHint.SkipObjectMethod && isFunctionOfObjectMethod(node.parent)) {
+    return false;
+  }
+  if (hint & ERComponentHint.SkipClassMethod && isFunctionOfClassMethod(node.parent)) {
+    return false;
+  }
+  if (hint & ERComponentHint.SkipClassProperty && isFunctionOfClassProperty(node.parent)) {
+    return false;
+  }
+  const boundaryNode = AST.findParentNode(
+    node,
+    AST.isOneOf([
+      T.JSXExpressionContainer,
+      T.ArrowFunctionExpression,
+      T.FunctionExpression,
+      T.Property,
+      T.ClassBody,
+    ]),
+  );
+  return boundaryNode == null || boundaryNode.type !== T.JSXExpressionContainer;
+}
+
+function isFunctionOfClassMethod(node: TSESTree.Node): node is
+  | TSESTree.ArrowFunctionExpression
+  | TSESTree.FunctionExpression
+{
+  return (node.type === T.FunctionExpression || node.type === T.ArrowFunctionExpression)
+    && node.parent.type === T.MethodDefinition;
+}
+
+function isFunctionOfClassProperty(node: TSESTree.Node): node is
+  | TSESTree.ArrowFunctionExpression
+  | TSESTree.FunctionExpression
+{
+  return (node.type === T.FunctionExpression || node.type === T.ArrowFunctionExpression)
+    && node.parent.type === T.Property;
+}
+
+function isFunctionOfObjectMethod(node: TSESTree.Node) {
+  return (node.type === T.FunctionExpression || node.type === T.ArrowFunctionExpression)
+    && node.parent.type === T.Property
+    && node.parent.parent.type === T.ObjectExpression;
+}

packages/core/src/component/index.ts

@@ -10,4 +10,5 @@ export * from "./component-phase";
 export * from "./component-render-prop";
 export type * from "./component-semantic-node";
 export * from "./component-state";
+export * from "./hierarchy";
 export * from "./is";

packages/core/src/utils/index.ts

@@ -1,3 +1,4 @@
+export * from "./is-call-from-react";
 export * from "./is-display-name-assignment";
 export * from "./is-from-react";
 export * from "./is-initialized-from-react";