Minor imports fixes

Author: Rel1cx

packages/plugins/eslint-plugin-react-hooks-extra/src/rules/no-direct-set-state-in-use-effect.ts

@@ -1,5 +1,5 @@
 import * as ast from "@eslint-react/ast";
-import { isUseCallbackCall, isUseEffectLikeCall, isUseMemoCall, isUseStateLikeCall } from "@eslint-react/core";
+import * as core from "@eslint-react/core";
 import { constVoid, getOrElseUpdate, not } from "@eslint-react/eff";
 import { type RuleContext, type RuleFeature, getSettingsFromContext } from "@eslint-react/shared";
 import { findVariable, getVariableDefinitionNode } from "@eslint-react/var";
@@ -83,13 +83,13 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
   }
 
   function isUseStateCall(node: TSESTree.Node) {
-    return isUseStateLikeCall(node, additionalStateHooks);
+    return core.isUseStateLikeCall(node, additionalStateHooks);
   }
 
   function isUseEffectSetupCallback(node: TSESTree.Node) {
     return node.parent?.type === AST.CallExpression
       && node.parent.callee !== node
-      && isUseEffectLikeCall(node.parent);
+      && core.isUseEffectLikeCall(node.parent);
   }
 
   function getCallName(node: TSESTree.Node) {
@@ -102,7 +102,7 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
   function getCallKind(node: TSESTree.CallExpression) {
     return match<TSESTree.CallExpression, CallKind>(node)
       .when(isUseStateCall, () => "useState")
-      .when(isUseEffectLikeCall, () => "useEffect")
+      .when(core.isUseEffectLikeCall, () => "useEffect")
       .when(isSetStateCall, () => "setState")
       .when(isThenCall, () => "then")
       .otherwise(() => "other");
@@ -258,7 +258,7 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
           // const [state, setState] = useState();
           // const set = useMemo(() => setState, []);
           // useEffect(set, []);
-          if (!isUseMemoCall(parent)) {
+          if (!core.isUseMemoCall(parent)) {
             break;
           }
           const init = ast.findParentNode(parent, isVariableDeclaratorFromHookCall)?.init;
@@ -274,7 +274,7 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
           // const [state, setState] = useState();
           // const set = useCallback(setState, []);
           // useEffect(set, []);
-          if (isUseCallbackCall(node.parent)) {
+          if (core.isUseCallbackCall(node.parent)) {
             const init = ast.findParentNode(node.parent, isVariableDeclaratorFromHookCall)?.init;
             if (init != null) {
               getOrElseUpdate(setStateInEffectArg, init, () => []).push(node);
@@ -283,7 +283,7 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
           }
           // const [state, setState] = useState();
           // useEffect(setState);
-          if (isUseEffectLikeCall(node.parent)) {
+          if (core.isUseEffectLikeCall(node.parent)) {
             getOrElseUpdate(setStateInEffectSetup, node.parent, () => []).push(node);
           }
         }

packages/plugins/eslint-plugin-react-x/src/rules/no-class-component.ts

@@ -1,4 +1,4 @@
-import { isComponentDidCatch, isGetDerivedStateFromError, useComponentCollectorLegacy } from "@eslint-react/core";
+import * as core from "@eslint-react/core";
 import { type RuleContext, type RuleFeature, defineRuleListener } from "@eslint-react/shared";
 import type { RuleListener } from "@typescript-eslint/utils/ts-eslint";
 import type { CamelCase } from "string-ts";
@@ -30,13 +30,13 @@ export default createRule<[], MessageID>({
 export function create(context: RuleContext<MessageID, []>): RuleListener {
   // Fast path: skip if `Component` is not present in the file
   if (!context.sourceCode.text.includes("Component")) return {};
-  const { ctx, visitor } = useComponentCollectorLegacy(context);
+  const { ctx, visitor } = core.useComponentCollectorLegacy(context);
   return defineRuleListener(
     visitor,
     {
       "Program:exit"(program) {
         for (const { name = "anonymous", node: component } of ctx.getAllComponents(program)) {
-          if (component.body.body.some((m) => isComponentDidCatch(m) || isGetDerivedStateFromError(m))) {
+          if (component.body.body.some((m) => core.isComponentDidCatch(m) || core.isGetDerivedStateFromError(m))) {
             continue;
           }
           context.report({

packages/plugins/eslint-plugin-react-x/src/rules/no-missing-component-display-name.ts

@@ -1,5 +1,5 @@
 import * as ast from "@eslint-react/ast";
-import { ComponentFlag, DEFAULT_COMPONENT_DETECTION_HINT, useComponentCollector } from "@eslint-react/core";
+import * as core from "@eslint-react/core";
 import { type RuleContext, type RuleFeature, defineRuleListener } from "@eslint-react/shared";
 import type { RuleListener } from "@typescript-eslint/utils/ts-eslint";
 import type { CamelCase } from "string-ts";
@@ -32,9 +32,9 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
   // Fast path: skip if `memo` or `forwardRef` is not present in the file
   if (!context.sourceCode.text.includes("memo") && !context.sourceCode.text.includes("forwardRef")) return {};
 
-  const { ctx, visitor } = useComponentCollector(context, {
+  const { ctx, visitor } = core.useComponentCollector(context, {
     collectDisplayName: true,
-    hint: DEFAULT_COMPONENT_DETECTION_HINT,
+    hint: core.DEFAULT_COMPONENT_DETECTION_HINT,
   });
 
   return defineRuleListener(
@@ -44,7 +44,7 @@ export function create(context: RuleContext<MessageID, []>): RuleListener {
         for (const { node, displayName, flag } of ctx.getAllComponents(program)) {
           const id = ast.getFunctionId(node);
           // Check if the component is wrapped with `forwardRef` or `memo`
-          const isMemoOrForwardRef = (flag & (ComponentFlag.ForwardRef | ComponentFlag.Memo)) > 0n;
+          const isMemoOrForwardRef = (flag & (core.ComponentFlag.ForwardRef | core.ComponentFlag.Memo)) > 0n;
           // If the component is a named function, it has an implicit displayName
           if (id != null) {
             continue;