@eslint-react/core 1.20.2-next.2 → 1.20.2-next.3

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as AST from '@eslint-react/ast';
-import { O } from '@eslint-react/tools';
+import { O } from '@eslint-react/eff';
 import { TSESTree } from '@typescript-eslint/types';
 import * as _eslint_react_types from '@eslint-react/types';
 import { RuleContext } from '@eslint-react/types';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as AST from '@eslint-react/ast';
-import { O } from '@eslint-react/tools';
+import { O } from '@eslint-react/eff';
 import { TSESTree } from '@typescript-eslint/types';
 import * as _eslint_react_types from '@eslint-react/types';
 import { RuleContext } from '@eslint-react/types';

package/dist/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var AST9 = require('@eslint-react/ast');
+var eff = require('@eslint-react/eff');
 var JSX4 = require('@eslint-react/jsx');
-var tools = require('@eslint-react/tools');
 var types = require('@typescript-eslint/types');
 var ShortUniqueId = require('short-unique-id');
 var tsPattern = require('ts-pattern');
@@ -42,13 +42,13 @@ function getElementRepresentName(node, context) {
   if (rawElementName === rawElementName.toLowerCase()) return rawElementName;
   const { components, polymorphicPropName } = shared.normalizeSettings(shared.decodeSettings(context.settings));
   const asElementName = components.get(rawElementName);
-  if (tools.isString(asElementName)) return asElementName;
-  return tools.F.pipe(
-    tools.O.fromNullable(polymorphicPropName),
-    tools.O.flatMap(JSX4__namespace.findPropInAttributes(node.attributes, context.sourceCode.getScope(node))),
-    tools.O.flatMap((attr) => JSX4__namespace.getPropValue(attr, context.sourceCode.getScope(attr))),
-    tools.O.filter(tools.isString),
-    tools.O.getOrElse(() => rawElementName)
+  if (eff.isString(asElementName)) return asElementName;
+  return eff.F.pipe(
+    eff.O.fromNullable(polymorphicPropName),
+    eff.O.flatMap(JSX4__namespace.findPropInAttributes(node.attributes, context.sourceCode.getScope(node))),
+    eff.O.flatMap((attr) => JSX4__namespace.getPropValue(attr, context.sourceCode.getScope(attr))),
+    eff.O.filter(eff.isString),
+    eff.O.getOrElse(() => rawElementName)
   );
 }
 function isInitializedFromReact(name, initialScope, settings) {
@@ -129,21 +129,21 @@ var isMemoCall = isReactAPICallWithName("memo");
 
 // src/element/hierarchy.ts
 function isInsideCreateElementProps(node, context) {
-  return tools.F.pipe(
+  return eff.F.pipe(
     AST9__namespace.traverseUp(node, (n) => AST9__namespace.is(types.AST_NODE_TYPES.CallExpression)(n) && isCreateElementCall(n, context)),
-    tools.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.CallExpression)),
-    tools.O.flatMapNullable((c) => c.arguments.at(1)),
-    tools.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.ObjectExpression)),
-    tools.O.zipWith(AST9__namespace.traverseUp(node, AST9__namespace.is(types.AST_NODE_TYPES.ObjectExpression)), (a, b) => a === b),
-    tools.O.getOrElse(tools.F.constFalse)
+    eff.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.CallExpression)),
+    eff.O.flatMapNullable((c) => c.arguments.at(1)),
+    eff.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.ObjectExpression)),
+    eff.O.zipWith(AST9__namespace.traverseUp(node, AST9__namespace.is(types.AST_NODE_TYPES.ObjectExpression)), (a, b) => a === b),
+    eff.O.getOrElse(eff.F.constFalse)
   );
 }
 function isChildrenOfCreateElement(node, context) {
-  return tools.F.pipe(
-    tools.O.fromNullable(node.parent),
-    tools.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.CallExpression)),
-    tools.O.filter((n) => isCreateElementCall(n, context)),
-    tools.O.exists(
+  return eff.F.pipe(
+    eff.O.fromNullable(node.parent),
+    eff.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.CallExpression)),
+    eff.O.filter((n) => isCreateElementCall(n, context)),
+    eff.O.exists(
       (n) => n.arguments.slice(2).some((arg) => arg === node)
     )
   );
@@ -164,10 +164,10 @@ function isReactHookName(name) {
 
 // src/hook/is.ts
 function isReactHook(node) {
-  return tools.F.pipe(
+  return eff.F.pipe(
     AST9__namespace.getFunctionIdentifier(node),
-    tools.O.flatMapNullable((id) => id.name),
-    tools.O.exists(isReactHookName)
+    eff.O.flatMapNullable((id) => id.name),
+    eff.O.exists(isReactHookName)
   );
 }
 function isReactHookCall(node) {
@@ -228,28 +228,28 @@ function isUseEffectCallLoose(node) {
       return false;
   }
 }
-var isUseCallbackCall = tools.F.flip(isReactHookCallWithName)("useCallback");
-var isUseContextCall = tools.F.flip(isReactHookCallWithName)("useContext");
-var isUseDebugValueCall = tools.F.flip(isReactHookCallWithName)("useDebugValue");
-var isUseDeferredValueCall = tools.F.flip(isReactHookCallWithName)("useDeferredValue");
-var isUseEffectCall = tools.F.flip(isReactHookCallWithName)("useEffect");
-var isUseIdCall = tools.F.flip(isReactHookCallWithName)("useId");
-var isUseImperativeHandleCall = tools.F.flip(isReactHookCallWithName)("useImperativeHandle");
-var isUseInsertionEffectCall = tools.F.flip(isReactHookCallWithName)("useInsertionEffect");
-var isUseLayoutEffectCall = tools.F.flip(isReactHookCallWithName)("useLayoutEffect");
-var isUseMemoCall = tools.F.flip(isReactHookCallWithName)("useMemo");
-var isUseReducerCall = tools.F.flip(isReactHookCallWithName)("useReducer");
-var isUseRefCall = tools.F.flip(isReactHookCallWithName)("useRef");
-var isUseStateCall = tools.F.flip(isReactHookCallWithName)("useState");
-var isUseSyncExternalStoreCall = tools.F.flip(isReactHookCallWithName)("useSyncExternalStore");
-var isUseTransitionCall = tools.F.flip(isReactHookCallWithName)("useTransition");
+var isUseCallbackCall = eff.F.flip(isReactHookCallWithName)("useCallback");
+var isUseContextCall = eff.F.flip(isReactHookCallWithName)("useContext");
+var isUseDebugValueCall = eff.F.flip(isReactHookCallWithName)("useDebugValue");
+var isUseDeferredValueCall = eff.F.flip(isReactHookCallWithName)("useDeferredValue");
+var isUseEffectCall = eff.F.flip(isReactHookCallWithName)("useEffect");
+var isUseIdCall = eff.F.flip(isReactHookCallWithName)("useId");
+var isUseImperativeHandleCall = eff.F.flip(isReactHookCallWithName)("useImperativeHandle");
+var isUseInsertionEffectCall = eff.F.flip(isReactHookCallWithName)("useInsertionEffect");
+var isUseLayoutEffectCall = eff.F.flip(isReactHookCallWithName)("useLayoutEffect");
+var isUseMemoCall = eff.F.flip(isReactHookCallWithName)("useMemo");
+var isUseReducerCall = eff.F.flip(isReactHookCallWithName)("useReducer");
+var isUseRefCall = eff.F.flip(isReactHookCallWithName)("useRef");
+var isUseStateCall = eff.F.flip(isReactHookCallWithName)("useState");
+var isUseSyncExternalStoreCall = eff.F.flip(isReactHookCallWithName)("useSyncExternalStore");
+var isUseTransitionCall = eff.F.flip(isReactHookCallWithName)("useTransition");
 
 // src/hook/hierarchy.ts
 function isInsideReactHook(node) {
-  return tools.O.exists(AST9__namespace.traverseUpGuard(node, AST9__namespace.isFunction), isReactHook);
+  return eff.O.exists(AST9__namespace.traverseUpGuard(node, AST9__namespace.isFunction), isReactHook);
 }
 function isInsideReactHookCall(node) {
-  return tools.O.isSome(AST9__namespace.traverseUp(node, (n) => AST9__namespace.is(types.AST_NODE_TYPES.CallExpression)(n) && isReactHookCall(n)));
+  return eff.O.isSome(AST9__namespace.traverseUp(node, (n) => AST9__namespace.is(types.AST_NODE_TYPES.CallExpression)(n) && isReactHookCall(n)));
 }
 var uid = new ShortUniqueId__default.default({ length: 10 });
 function useHookCollector() {
@@ -257,14 +257,14 @@ function useHookCollector() {
   const fStack = [];
   const onFunctionEnter = (node) => {
     const id = AST9__namespace.getFunctionIdentifier(node);
-    const name = tools.O.flatMapNullable(id, (id2) => id2.name);
-    const isHook = tools.O.isSome(id) && tools.O.isSome(name) && isReactHookName(name.value);
+    const name = eff.O.flatMapNullable(id, (id2) => id2.name);
+    const isHook = eff.O.isSome(id) && eff.O.isSome(name) && isReactHookName(name.value);
     if (!isHook) {
-      fStack.push([node, tools.O.none()]);
+      fStack.push([node, eff.O.none()]);
       return;
     }
     const key = uid.rnd();
-    fStack.push([node, tools.O.some(key)]);
+    fStack.push([node, eff.O.some(key)]);
     hooks.set(key, {
       _: key,
       id,
@@ -294,11 +294,11 @@ function useHookCollector() {
       if (!isReactHookCall(node)) return;
       const [fNode, hookId] = fStack.at(-1) ?? [];
       if (!fNode || !hookId) return;
-      tools.F.pipe(
-        tools.O.Do,
-        tools.O.bind("id", () => hookId),
-        tools.O.bind("hook", ({ id }) => tools.O.fromNullable(hooks.get(id))),
-        tools.O.map(({ id, hook }) => {
+      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, {
             ...hook,
             hookCalls: [
@@ -354,15 +354,15 @@ function isComponentWrapperCall(node, context) {
 }
 function getFunctionComponentIdentifier(node, context) {
   const functionId = AST9__namespace.getFunctionIdentifier(node);
-  if (tools.O.isSome(functionId)) return functionId;
+  if (eff.O.isSome(functionId)) return functionId;
   const { parent } = node;
   if (parent.type === types.AST_NODE_TYPES.CallExpression && isComponentWrapperCall(parent, context) && parent.parent.type === types.AST_NODE_TYPES.VariableDeclarator && parent.parent.id.type === types.AST_NODE_TYPES.Identifier) {
-    return tools.O.some(parent.parent.id);
+    return eff.O.some(parent.parent.id);
   }
   if (parent.type === types.AST_NODE_TYPES.CallExpression && isComponentWrapperCall(parent, context) && parent.parent.type === types.AST_NODE_TYPES.CallExpression && isComponentWrapperCall(parent.parent, context) && parent.parent.parent.type === types.AST_NODE_TYPES.VariableDeclarator && parent.parent.parent.id.type === types.AST_NODE_TYPES.Identifier) {
-    return tools.O.some(parent.parent.parent.id);
+    return eff.O.some(parent.parent.parent.id);
   }
-  return tools.O.none();
+  return eff.O.none();
 }
 
 // src/component/component-name.ts
@@ -430,10 +430,10 @@ function useComponentCollectorLegacy() {
         _: key,
         id,
         kind: "class",
-        name: tools.O.flatMapNullable(id, (n) => n.name),
+        name: eff.O.flatMapNullable(id, (n) => n.name),
         node,
         // TODO: Get displayName of class component
-        displayName: tools.O.none(),
+        displayName: eff.O.none(),
         flag,
         hint: 0n,
         // TODO: Get methods of class component
@@ -470,13 +470,13 @@ function isInsideRenderMethod(node) {
   const predicate = (node2) => {
     return isRenderMethodLike(node2) && isClassComponent(node2.parent.parent);
   };
-  return tools.O.isSome(AST9__namespace.traverseUp(node, predicate));
+  return eff.O.isSome(AST9__namespace.traverseUp(node, predicate));
 }
 function hasNoneOrValidComponentName(node, context) {
-  return tools.O.match(
+  return eff.O.match(
     getFunctionComponentIdentifier(node, context),
     {
-      onNone: tools.F.constTrue,
+      onNone: eff.F.constTrue,
       onSome: (id) => {
         const name = Array.isArray(id) ? id.at(-1)?.name : id.name;
         return !!name && isComponentName(name);
@@ -503,7 +503,7 @@ function hasValidHierarchy(node, context, hint) {
   if (hint & ERComponentHint.SkipClassProperty && AST9__namespace.isFunctionOfClassProperty(node.parent)) {
     return false;
   }
-  return !tools.O.exists(
+  return !eff.O.exists(
     AST9__namespace.traverseUp(
       node,
       AST9__namespace.isOneOf([
@@ -531,7 +531,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
   const jsxCtx = { getScope: (node) => context.sourceCode.getScope(node) };
   const components = /* @__PURE__ */ new Map();
   const functionStack = [];
-  const getCurrentFunction = () => tools.O.fromNullable(functionStack.at(-1));
+  const getCurrentFunction = () => eff.O.fromNullable(functionStack.at(-1));
   const onFunctionEnter = (node) => functionStack.push([uid3.rnd(), node, false, []]);
   const onFunctionExit = () => {
     const [key, fn, isComponent] = functionStack.at(-1) ?? [];
@@ -559,14 +559,14 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
     ":function[type]:exit": onFunctionExit,
     "ArrowFunctionExpression[type][body.type!='BlockStatement']"() {
       const maybeCurrentFn = getCurrentFunction();
-      if (tools.O.isNone(maybeCurrentFn)) return;
+      if (eff.O.isNone(maybeCurrentFn)) return;
       const [_key, currentFn, _isComponent, hookCalls] = maybeCurrentFn.value;
       const { body } = currentFn;
       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 = tools.O.flatMapNullable(id, getComponentNameFromIdentifier);
+      const name = eff.O.flatMapNullable(id, getComponentNameFromIdentifier);
       const key = uid3.rnd();
       components.set(key, {
         _: key,
@@ -574,7 +574,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
         kind: "function",
         name,
         node: currentFn,
-        displayName: tools.O.none(),
+        displayName: eff.O.none(),
         flag: getComponentFlag(initPath),
         hint,
         hookCalls,
@@ -585,26 +585,26 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       if (node.type !== types.AST_NODE_TYPES.AssignmentExpression) return;
       const { left, right } = node;
       if (left.type !== types.AST_NODE_TYPES.MemberExpression) return;
-      const maybeComponentName = tsPattern.match(left.object).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => tools.O.some(n.name)).otherwise(tools.O.none);
-      if (tools.O.isNone(maybeComponentName)) return;
-      const component = Array.from(components.values()).findLast(({ name }) => tools.O.exists(name, (n) => n === maybeComponentName.value));
+      const maybeComponentName = tsPattern.match(left.object).with({ type: types.AST_NODE_TYPES.Identifier }, (n) => eff.O.some(n.name)).otherwise(eff.O.none);
+      if (eff.O.isNone(maybeComponentName)) return;
+      const component = Array.from(components.values()).findLast(({ name }) => eff.O.exists(name, (n) => n === maybeComponentName.value));
       if (!component) return;
       components.set(component._, {
         ...component,
-        displayName: tools.O.some(right)
+        displayName: eff.O.some(right)
       });
     },
     "CallExpression[type]:exit"(node) {
       if (!isReactHookCall(node)) return;
       const maybeCurrentFn = getCurrentFunction();
-      if (tools.O.isNone(maybeCurrentFn)) return;
+      if (eff.O.isNone(maybeCurrentFn)) return;
       const [key, currentFn, isComponent, hookCalls] = maybeCurrentFn.value;
       functionStack.pop();
       functionStack.push([key, currentFn, isComponent, [...hookCalls, node]]);
     },
     "ReturnStatement[type]"(node) {
       const maybeCurrentFn = getCurrentFunction();
-      if (tools.O.isNone(maybeCurrentFn)) return;
+      if (eff.O.isNone(maybeCurrentFn)) return;
       const [key, currentFn, isKnown, hookCalls] = maybeCurrentFn.value;
       if (isKnown) return;
       const isComponent = hasNoneOrValidComponentName(currentFn, context) && JSX4__namespace.isJSXValue(node.argument, jsxCtx, hint) && hasValidHierarchy(currentFn, context, hint);
@@ -613,14 +613,14 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       functionStack.push([key, currentFn, true, []]);
       const initPath = AST9__namespace.getFunctionInitPath(currentFn);
       const id = getFunctionComponentIdentifier(currentFn, context);
-      const name = tools.O.flatMapNullable(id, getComponentNameFromIdentifier);
+      const name = eff.O.flatMapNullable(id, getComponentNameFromIdentifier);
       components.set(key, {
         _: key,
         id,
         kind: "function",
         name,
         node: currentFn,
-        displayName: tools.O.none(),
+        displayName: eff.O.none(),
         flag: getComponentFlag(initPath),
         hint,
         hookCalls,
@@ -634,10 +634,10 @@ function isSetupFunction(node) {
   return node.parent?.type === types.AST_NODE_TYPES.CallExpression && node.parent.callee !== node && node.parent.callee.type === types.AST_NODE_TYPES.Identifier && node.parent.arguments.at(0) === node && isUseEffectCallLoose(node.parent);
 }
 function isCleanupFunction(node) {
-  const nearestRet = tools.O.getOrNull(AST9__namespace.traverseUpGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.ReturnStatement)));
+  const nearestRet = eff.O.getOrNull(AST9__namespace.traverseUpGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.ReturnStatement)));
   if (!nearestRet) return false;
-  const nearestFunction = tools.O.getOrNull(AST9__namespace.traverseUpGuard(node, AST9__namespace.isFunction));
-  const nearestFunctionOfRet = tools.O.getOrNull(AST9__namespace.traverseUpGuard(nearestRet, AST9__namespace.isFunction));
+  const nearestFunction = eff.O.getOrNull(AST9__namespace.traverseUpGuard(node, AST9__namespace.isFunction));
+  const nearestFunctionOfRet = eff.O.getOrNull(AST9__namespace.traverseUpGuard(nearestRet, AST9__namespace.isFunction));
   if (!nearestFunction || !nearestFunctionOfRet) return false;
   return nearestFunction === nearestFunctionOfRet && isSetupFunction(nearestFunction);
 }
@@ -645,7 +645,7 @@ var ERPhaseRelevance = birecord__default.default({
   mount: "unmount",
   setup: "cleanup"
 });
-var isInversePhase = tools.F.dual(2, (a, b) => ERPhaseRelevance.get(a) === b);
+var isInversePhase = eff.F.dual(2, (a, b) => ERPhaseRelevance.get(a) === b);
 function isDirectValueOfRenderPropertyLoose(node) {
   const matching = tsPattern.isMatching({
     key: {
@@ -660,12 +660,12 @@ function isDeclaredInRenderPropLoose(node) {
   if (isDirectValueOfRenderPropertyLoose(node)) {
     return true;
   }
-  return tools.F.pipe(
+  return eff.F.pipe(
     AST9__namespace.traverseUpGuard(node, AST9__namespace.is(types.AST_NODE_TYPES.JSXExpressionContainer)),
-    tools.O.flatMapNullable((c) => c.parent),
-    tools.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.JSXAttribute)),
-    tools.O.flatMapNullable((a) => a.name),
-    tools.O.exists(tsPattern.isMatching({
+    eff.O.flatMapNullable((c) => c.parent),
+    eff.O.filter(AST9__namespace.is(types.AST_NODE_TYPES.JSXAttribute)),
+    eff.O.flatMapNullable((a) => a.name),
+    eff.O.exists(tsPattern.isMatching({
       type: types.AST_NODE_TYPES.JSXIdentifier,
       name: tsPattern.P.string.startsWith("render")
     }))
@@ -674,7 +674,7 @@ function isDeclaredInRenderPropLoose(node) {
 function isRenderFunctionLoose(node, context) {
   const { body, parent } = node;
   const maybeId = AST9__namespace.getFunctionIdentifier(node);
-  if (tools.O.isSome(maybeId) && !maybeId.value.name.startsWith("render")) {
+  if (eff.O.isSome(maybeId) && !maybeId.value.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");
   }
   const jsxCtx = { getScope: (node2) => context.sourceCode.getScope(node2) };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import * as AST9 from '@eslint-react/ast';
+import { F, isString, O } from '@eslint-react/eff';
 import * as JSX4 from '@eslint-react/jsx';
-import { F, isString, 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';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.20.2-next.2",
+  "version": "1.20.2-next.3",
   "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.6.0",
-    "@eslint-react/ast": "1.20.2-next.2",
-    "@eslint-react/jsx": "1.20.2-next.2",
-    "@eslint-react/shared": "1.20.2-next.2",
-    "@eslint-react/tools": "1.20.2-next.2",
-    "@eslint-react/types": "1.20.2-next.2",
-    "@eslint-react/var": "1.20.2-next.2"
+    "@eslint-react/ast": "1.20.2-next.3",
+    "@eslint-react/jsx": "1.20.2-next.3",
+    "@eslint-react/eff": "1.20.2-next.3",
+    "@eslint-react/shared": "1.20.2-next.3",
+    "@eslint-react/types": "1.20.2-next.3",
+    "@eslint-react/var": "1.20.2-next.3"
   },
   "devDependencies": {
     "tsup": "^8.3.5",