@eslint-react/core 1.23.1-beta.0 → 1.23.1-beta.6

package/dist/index.d.mts

@@ -80,12 +80,11 @@ type ERComponent = ERClassComponent | ERFunctionComponent;
 declare function useComponentCollector(context: RuleContext, hint?: bigint): {
     readonly ctx: {
         readonly getAllComponents: (_: TSESTree.Program) => Map<string, ERFunctionComponent>;
-        readonly getCurrentComponents: () => Map<string, ERFunctionComponent>;
         readonly getCurrentFunction: () => O.Option<[key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]]>;
         readonly getCurrentFunctionStack: () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]][];
     };
     readonly listeners: {
-        readonly ":function[type]": (node: AST.TSESTreeFunction) => number;
+        readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
         readonly ":function[type]:exit": () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]] | undefined;
         readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
         readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']": (node: TSESTree.Node) => void;
@@ -113,7 +112,6 @@ declare function isComponentWillUnmountFunction(node: TSESTree$1.Node): boolean;
 declare function useComponentCollectorLegacy(): {
     readonly ctx: {
         readonly getAllComponents: (_: TSESTree$1.Program) => Map<string, ERClassComponent>;
-        readonly getCurrentComponents: () => Map<string, ERClassComponent>;
     };
     readonly listeners: {
         readonly "ClassDeclaration[type]": (node: AST.TSESTreeClass) => void;
@@ -2560,4 +2558,11 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_types.RuleContext): node is CallExpression;
 };
 
-export { DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, 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, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, 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 };
+declare function next(): bigint;
+
+declare const uid_next: typeof next;
+declare namespace uid {
+  export { uid_next as next };
+}
+
+export { DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, 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, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, 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, uid, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/dist/index.d.ts

@@ -80,12 +80,11 @@ type ERComponent = ERClassComponent | ERFunctionComponent;
 declare function useComponentCollector(context: RuleContext, hint?: bigint): {
     readonly ctx: {
         readonly getAllComponents: (_: TSESTree.Program) => Map<string, ERFunctionComponent>;
-        readonly getCurrentComponents: () => Map<string, ERFunctionComponent>;
         readonly getCurrentFunction: () => O.Option<[key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]]>;
         readonly getCurrentFunctionStack: () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]][];
     };
     readonly listeners: {
-        readonly ":function[type]": (node: AST.TSESTreeFunction) => number;
+        readonly ":function[type]": (node: AST.TSESTreeFunction) => void;
         readonly ":function[type]:exit": () => [key: string, node: AST.TSESTreeFunction, isComponent: boolean, hookCalls: TSESTree.CallExpression[]] | undefined;
         readonly "ArrowFunctionExpression[type][body.type!='BlockStatement']": () => void;
         readonly "AssignmentExpression[type][operator='='][left.type='MemberExpression'][left.property.name='displayName']": (node: TSESTree.Node) => void;
@@ -113,7 +112,6 @@ declare function isComponentWillUnmountFunction(node: TSESTree$1.Node): boolean;
 declare function useComponentCollectorLegacy(): {
     readonly ctx: {
         readonly getAllComponents: (_: TSESTree$1.Program) => Map<string, ERClassComponent>;
-        readonly getCurrentComponents: () => Map<string, ERClassComponent>;
     };
     readonly listeners: {
         readonly "ClassDeclaration[type]": (node: AST.TSESTreeClass) => void;
@@ -2560,4 +2558,11 @@ declare const isMemoCall: {
     (node: Node, context: _eslint_react_types.RuleContext): node is CallExpression;
 };
 
-export { DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, 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, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, 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 };
+declare function next(): bigint;
+
+declare const uid_next: typeof next;
+declare namespace uid {
+  export { uid_next as next };
+}
+
+export { DEFAULT_COMPONENT_HINT, type ERClassComponent, ERClassComponentFlag, type ERComponent, ERComponentHint, type ERComponentKind, type EREffectKind, type EREffectMethodKind, type EREffectPhaseKind, type ERFunctionComponent, ERFunctionComponentFlag, type ERHook, type ERHookKind, type ERLifecycleMethodKind, type ERLifecyclePhaseKind, type ERPhaseKind, ERPhaseRelevance, type ERSemanticEntry, type ERSemanticNode, type ERStateKind, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, 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, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, 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, uid, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/dist/index.js

@@ -5,7 +5,6 @@ var eff = require('@eslint-react/eff');
 var JSX4 = require('@eslint-react/jsx');
 var types = require('@typescript-eslint/types');
 var tsPattern = require('ts-pattern');
-var uid = require('uid');
 var shared = require('@eslint-react/shared');
 var VAR = require('@eslint-react/var');
 var types$1 = require('@eslint-react/types');
@@ -32,7 +31,11 @@ var AST9__namespace = /*#__PURE__*/_interopNamespace(AST9);
 var JSX4__namespace = /*#__PURE__*/_interopNamespace(JSX4);
 var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 
-// src/component/component-collector.ts
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 function getElementRepresentName(node, context) {
   const rawElementName = JSX4__namespace.getElementName(node);
   if (rawElementName === rawElementName.toLowerCase()) return rawElementName;
@@ -125,6 +128,16 @@ var isCreateRefCall = isReactAPICallWithName("createRef");
 var isForwardRefCall = isReactAPICallWithName("forwardRef");
 var isMemoCall = isReactAPICallWithName("memo");
 
+// src/utils/uid.ts
+var uid_exports = {};
+__export(uid_exports, {
+  next: () => next
+});
+var id = 0n;
+function next() {
+  return id++;
+}
+
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
   return eff.F.pipe(
@@ -156,7 +169,7 @@ function isReactHookName(name) {
 function isReactHook(node) {
   return eff.F.pipe(
     AST9__namespace.getFunctionIdentifier(node),
-    eff.O.flatMapNullable((id) => id.name),
+    eff.O.flatMapNullable((id2) => id2.name),
     eff.O.exists(isReactHookName)
   );
 }
@@ -243,14 +256,14 @@ function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
   const fStack = [];
   const onFunctionEnter = (node) => {
-    const id = AST9__namespace.getFunctionIdentifier(node);
-    const name = eff.O.flatMapNullable(id, (id2) => id2.name);
-    if (eff.O.isSome(id) && eff.O.isSome(name) && isReactHookName(name.value)) {
-      const key = uid.uid(10);
+    const id2 = AST9__namespace.getFunctionIdentifier(node);
+    const name = eff.O.flatMapNullable(id2, (id3) => id3.name);
+    if (eff.O.isSome(id2) && eff.O.isSome(name) && isReactHookName(name.value)) {
+      const key = uid_exports.next().toString();
       fStack.push([node, eff.O.some(key)]);
       hooks.set(key, {
         _: key,
-        id,
+        id: id2,
         kind: "function",
         name,
         node,
@@ -283,9 +296,9 @@ function useHookCollector() {
       eff.F.pipe(
         eff.O.Do,
         eff.O.bind("id", () => hookId),
-        eff.O.bind("hook", ({ id }) => eff.O.fromNullable(hooks.get(id))),
-        eff.O.map(({ id, hook }) => {
-          hooks.set(id, {
+        eff.O.bind("hook", ({ id: id2 }) => eff.O.fromNullable(hooks.get(id2))),
+        eff.O.map(({ id: id2, hook }) => {
+          hooks.set(id2, {
             ...hook,
             hookCalls: [
               ...hook.hookCalls,
@@ -399,23 +412,20 @@ function useComponentCollectorLegacy() {
   const ctx = {
     getAllComponents(_) {
       return components;
-    },
-    getCurrentComponents() {
-      return new Map(components);
     }
   };
   const collect = (node) => {
     if (!isClassComponent(node)) return;
-    const id = AST9__namespace.getClassIdentifier(node);
-    const key = uid.uid(10);
+    const id2 = AST9__namespace.getClassIdentifier(node);
+    const key = uid_exports.next().toString();
     const flag = isPureComponent(node) ? ERClassComponentFlag.PureComponent : ERClassComponentFlag.None;
     components.set(
       key,
       {
         _: key,
-        id,
+        id: id2,
         kind: "class",
-        name: eff.O.flatMapNullable(id, (n) => n.name),
+        name: eff.O.flatMapNullable(id2, (n) => n.name),
         node,
         // TODO: Get displayName of class component
         displayName: eff.O.none(),
@@ -461,8 +471,8 @@ function hasNoneOrValidComponentName(node, context) {
     getFunctionComponentIdentifier(node, context),
     {
       onNone: eff.F.constTrue,
-      onSome: (id) => {
-        const name = Array.isArray(id) ? id.at(-1)?.name : id.name;
+      onSome: (id2) => {
+        const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
         return !!name && isComponentName(name);
       }
     }
@@ -515,7 +525,10 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
   const components = /* @__PURE__ */ new Map();
   const functionStack = [];
   const getCurrentFunction = () => eff.O.fromNullable(functionStack.at(-1));
-  const onFunctionEnter = (node) => functionStack.push([uid.uid(10), node, false, []]);
+  const onFunctionEnter = (node) => {
+    const key = uid_exports.next().toString();
+    functionStack.push([key, node, false, []]);
+  };
   const onFunctionExit = () => {
     const [key, fn, isComponent] = functionStack.at(-1) ?? [];
     if (!key || !fn || !isComponent) return functionStack.pop();
@@ -529,9 +542,6 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     getAllComponents(_) {
       return components;
     },
-    getCurrentComponents() {
-      return new Map(components);
-    },
     getCurrentFunction,
     getCurrentFunctionStack() {
       return [...functionStack];
@@ -548,12 +558,12 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       const isComponent = hasNoneOrValidComponentName(currentFn, context) && JSX4__namespace.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(currentFn, context, hint);
       if (!isComponent) return;
       const initPath = AST9__namespace.getFunctionInitPath(currentFn);
-      const id = getFunctionComponentIdentifier(currentFn, context);
-      const name = eff.O.flatMapNullable(id, getComponentNameFromIdentifier);
-      const key = uid.uid(10);
+      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      const name = eff.O.flatMapNullable(id2, getComponentNameFromIdentifier);
+      const key = uid_exports.next().toString();
       components.set(key, {
         _: key,
-        id,
+        id: id2,
         kind: "function",
         name,
         node: currentFn,
@@ -595,11 +605,11 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       functionStack.pop();
       functionStack.push([key, currentFn, true, []]);
       const initPath = AST9__namespace.getFunctionInitPath(currentFn);
-      const id = getFunctionComponentIdentifier(currentFn, context);
-      const name = eff.O.flatMapNullable(id, getComponentNameFromIdentifier);
+      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      const name = eff.O.flatMapNullable(id2, getComponentNameFromIdentifier);
       components.set(key, {
         _: key,
-        id,
+        id: id2,
         kind: "function",
         name,
         node: currentFn,
@@ -656,7 +666,7 @@ function isDeclaredInRenderPropLoose(node) {
 }
 function isRenderFunctionLoose(node, context) {
   const { body, parent } = node;
-  if (eff.O.exists(AST9__namespace.getFunctionIdentifier(node), (id) => id.name.startsWith("render"))) {
+  if (eff.O.exists(AST9__namespace.getFunctionIdentifier(node), (id2) => id2.name.startsWith("render"))) {
     return parent.type === types.AST_NODE_TYPES.JSXExpressionContainer && parent.parent.type === types.AST_NODE_TYPES.JSXAttribute && parent.parent.name.type === types.AST_NODE_TYPES.JSXIdentifier && parent.parent.name.name.startsWith("render");
   }
   return JSX4__namespace.isJSXValue(
@@ -758,6 +768,7 @@ exports.isUseRefCall = isUseRefCall;
 exports.isUseStateCall = isUseStateCall;
 exports.isUseSyncExternalStoreCall = isUseSyncExternalStoreCall;
 exports.isUseTransitionCall = isUseTransitionCall;
+exports.uid = uid_exports;
 exports.useComponentCollector = useComponentCollector;
 exports.useComponentCollectorLegacy = useComponentCollectorLegacy;
 exports.useHookCollector = useHookCollector;

package/dist/index.mjs

@@ -3,12 +3,15 @@ import { F, isString, O } from '@eslint-react/eff';
 import * as JSX4 from '@eslint-react/jsx';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { isMatching, P, match } from 'ts-pattern';
-import { uid } from 'uid';
 import { normalizeSettings, decodeSettings, unsafeReadSettings } from '@eslint-react/shared';
 import * as VAR from '@eslint-react/var';
 import { birecord } from '@eslint-react/types';
 
-// src/component/component-collector.ts
+var __defProp = Object.defineProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
 function getElementRepresentName(node, context) {
   const rawElementName = JSX4.getElementName(node);
   if (rawElementName === rawElementName.toLowerCase()) return rawElementName;
@@ -101,6 +104,16 @@ var isCreateRefCall = isReactAPICallWithName("createRef");
 var isForwardRefCall = isReactAPICallWithName("forwardRef");
 var isMemoCall = isReactAPICallWithName("memo");
 
+// src/utils/uid.ts
+var uid_exports = {};
+__export(uid_exports, {
+  next: () => next
+});
+var id = 0n;
+function next() {
+  return id++;
+}
+
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
   return F.pipe(
@@ -132,7 +145,7 @@ function isReactHookName(name) {
 function isReactHook(node) {
   return F.pipe(
     AST9.getFunctionIdentifier(node),
-    O.flatMapNullable((id) => id.name),
+    O.flatMapNullable((id2) => id2.name),
     O.exists(isReactHookName)
   );
 }
@@ -219,14 +232,14 @@ function useHookCollector() {
   const hooks = /* @__PURE__ */ new Map();
   const fStack = [];
   const onFunctionEnter = (node) => {
-    const id = AST9.getFunctionIdentifier(node);
-    const name = O.flatMapNullable(id, (id2) => id2.name);
-    if (O.isSome(id) && O.isSome(name) && isReactHookName(name.value)) {
-      const key = uid(10);
+    const id2 = AST9.getFunctionIdentifier(node);
+    const name = O.flatMapNullable(id2, (id3) => id3.name);
+    if (O.isSome(id2) && O.isSome(name) && isReactHookName(name.value)) {
+      const key = uid_exports.next().toString();
       fStack.push([node, O.some(key)]);
       hooks.set(key, {
         _: key,
-        id,
+        id: id2,
         kind: "function",
         name,
         node,
@@ -259,9 +272,9 @@ function useHookCollector() {
       F.pipe(
         O.Do,
         O.bind("id", () => hookId),
-        O.bind("hook", ({ id }) => O.fromNullable(hooks.get(id))),
-        O.map(({ id, hook }) => {
-          hooks.set(id, {
+        O.bind("hook", ({ id: id2 }) => O.fromNullable(hooks.get(id2))),
+        O.map(({ id: id2, hook }) => {
+          hooks.set(id2, {
             ...hook,
             hookCalls: [
               ...hook.hookCalls,
@@ -375,23 +388,20 @@ function useComponentCollectorLegacy() {
   const ctx = {
     getAllComponents(_) {
       return components;
-    },
-    getCurrentComponents() {
-      return new Map(components);
     }
   };
   const collect = (node) => {
     if (!isClassComponent(node)) return;
-    const id = AST9.getClassIdentifier(node);
-    const key = uid(10);
+    const id2 = AST9.getClassIdentifier(node);
+    const key = uid_exports.next().toString();
     const flag = isPureComponent(node) ? ERClassComponentFlag.PureComponent : ERClassComponentFlag.None;
     components.set(
       key,
       {
         _: key,
-        id,
+        id: id2,
         kind: "class",
-        name: O.flatMapNullable(id, (n) => n.name),
+        name: O.flatMapNullable(id2, (n) => n.name),
         node,
         // TODO: Get displayName of class component
         displayName: O.none(),
@@ -437,8 +447,8 @@ function hasNoneOrValidComponentName(node, context) {
     getFunctionComponentIdentifier(node, context),
     {
       onNone: F.constTrue,
-      onSome: (id) => {
-        const name = Array.isArray(id) ? id.at(-1)?.name : id.name;
+      onSome: (id2) => {
+        const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
         return !!name && isComponentName(name);
       }
     }
@@ -491,7 +501,10 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
   const components = /* @__PURE__ */ new Map();
   const functionStack = [];
   const getCurrentFunction = () => O.fromNullable(functionStack.at(-1));
-  const onFunctionEnter = (node) => functionStack.push([uid(10), node, false, []]);
+  const onFunctionEnter = (node) => {
+    const key = uid_exports.next().toString();
+    functionStack.push([key, node, false, []]);
+  };
   const onFunctionExit = () => {
     const [key, fn, isComponent] = functionStack.at(-1) ?? [];
     if (!key || !fn || !isComponent) return functionStack.pop();
@@ -505,9 +518,6 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     getAllComponents(_) {
       return components;
     },
-    getCurrentComponents() {
-      return new Map(components);
-    },
     getCurrentFunction,
     getCurrentFunctionStack() {
       return [...functionStack];
@@ -524,12 +534,12 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       const isComponent = hasNoneOrValidComponentName(currentFn, context) && JSX4.isJSXValue(body, jsxCtx, hint) && hasValidHierarchy(currentFn, context, hint);
       if (!isComponent) return;
       const initPath = AST9.getFunctionInitPath(currentFn);
-      const id = getFunctionComponentIdentifier(currentFn, context);
-      const name = O.flatMapNullable(id, getComponentNameFromIdentifier);
-      const key = uid(10);
+      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      const name = O.flatMapNullable(id2, getComponentNameFromIdentifier);
+      const key = uid_exports.next().toString();
       components.set(key, {
         _: key,
-        id,
+        id: id2,
         kind: "function",
         name,
         node: currentFn,
@@ -571,11 +581,11 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       functionStack.pop();
       functionStack.push([key, currentFn, true, []]);
       const initPath = AST9.getFunctionInitPath(currentFn);
-      const id = getFunctionComponentIdentifier(currentFn, context);
-      const name = O.flatMapNullable(id, getComponentNameFromIdentifier);
+      const id2 = getFunctionComponentIdentifier(currentFn, context);
+      const name = O.flatMapNullable(id2, getComponentNameFromIdentifier);
       components.set(key, {
         _: key,
-        id,
+        id: id2,
         kind: "function",
         name,
         node: currentFn,
@@ -632,7 +642,7 @@ function isDeclaredInRenderPropLoose(node) {
 }
 function isRenderFunctionLoose(node, context) {
   const { body, parent } = node;
-  if (O.exists(AST9.getFunctionIdentifier(node), (id) => id.name.startsWith("render"))) {
+  if (O.exists(AST9.getFunctionIdentifier(node), (id2) => id2.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(
@@ -652,4 +662,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, ERPhaseRelevance, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, 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, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, 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, ERPhaseRelevance, RE_COMPONENT_NAME, RE_HOOK_NAME, getComponentNameFromIdentifier, getElementRepresentName, 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, isFromReact, isFromReactMember, isFunctionOfRenderMethod, isInitializedFromReact, isInsideCreateElementProps, isInsideReactHook, 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, uid_exports as uid, useComponentCollector, useComponentCollectorLegacy, useHookCollector };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.23.1-beta.0",
+  "version": "1.23.1-beta.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": {
@@ -38,13 +38,12 @@
     "@typescript-eslint/types": "^8.19.0",
     "@typescript-eslint/utils": "^8.19.0",
     "ts-pattern": "^5.6.0",
-    "uid": "^2.0.2",
-    "@eslint-react/ast": "1.23.1-beta.0",
-    "@eslint-react/eff": "1.23.1-beta.0",
-    "@eslint-react/shared": "1.23.1-beta.0",
-    "@eslint-react/var": "1.23.1-beta.0",
-    "@eslint-react/jsx": "1.23.1-beta.0",
-    "@eslint-react/types": "1.23.1-beta.0"
+    "@eslint-react/ast": "1.23.1-beta.6",
+    "@eslint-react/eff": "1.23.1-beta.6",
+    "@eslint-react/shared": "1.23.1-beta.6",
+    "@eslint-react/types": "1.23.1-beta.6",
+    "@eslint-react/var": "1.23.1-beta.6",
+    "@eslint-react/jsx": "1.23.1-beta.6"
   },
   "devDependencies": {
     "tsup": "^8.3.5",