@eslint-react/core 1.23.3-next.5 → 1.23.3-next.7

package/dist/index.js

@@ -135,10 +135,10 @@ function isCallFromReactMember(pragmaMemberName, name) {
 
 // src/utils/is-react-api.ts
 function isReactAPIWithName(name, member) {
-  return member ? isFromReactMember(name, member) : isFromReact(name);
+  return member == null ? isFromReact(name) : isFromReactMember(name, member);
 }
 function isReactAPICallWithName(name, member) {
-  return member ? isCallFromReactMember(name, member) : isCallFromReact(name);
+  return member == null ? isCallFromReact(name) : isCallFromReactMember(name, member);
 }
 var isChildrenCount = isReactAPIWithName("Children", "count");
 var isChildrenForEach = isReactAPIWithName("Children", "forEach");
@@ -325,7 +325,7 @@ function useHookCollector() {
         return;
       }
       const [fNode, hookId] = fStack.at(-1) ?? [];
-      if (!fNode || !hookId) {
+      if (fNode == null || hookId == null) {
         return;
       }
       eff.F.pipe(
@@ -409,10 +409,10 @@ function getComponentNameFromIdentifier(node) {
   return Array.isArray(node) ? node.map((n) => n.name).join(".") : node.name;
 }
 function isComponentName(name) {
-  return !!name && RE_COMPONENT_NAME.test(name);
+  return RE_COMPONENT_NAME.test(name);
 }
 function isClassComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^(?:Pure)?Component$/u;
     switch (true) {
       case node.superClass.type === types$1.AST_NODE_TYPES.Identifier:
@@ -424,7 +424,7 @@ function isClassComponent(node) {
   return false;
 }
 function isPureComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^PureComponent$/u;
     switch (true) {
       case node.superClass.type === types$1.AST_NODE_TYPES.Identifier:
@@ -456,7 +456,7 @@ function hasNoneOrValidComponentName(node, context) {
   }
   const id2 = mbIdentifier.value;
   const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
-  return !!name && isComponentName(name);
+  return name != null && isComponentName(name);
 }
 
 // src/component/component-collector.ts
@@ -515,7 +515,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       return functionEntries.pop();
     }
     const shouldDrop = AST8__namespace.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && r.argument !== null && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX4__namespace.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -570,7 +570,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       }
       const componentName = mbComponentName.value;
       const component = Array.from(components.values()).findLast(({ name }) => eff.O.exists(name, (n) => n === componentName));
-      if (!component) {
+      if (component == null) {
         return;
       }
       components.set(component._, {
@@ -662,16 +662,15 @@ function isSetupFunction(node) {
   return node.parent?.type === types$1.AST_NODE_TYPES.CallExpression && node.parent.callee !== node && node.parent.callee.type === types$1.AST_NODE_TYPES.Identifier && node.parent.arguments.at(0) === node && isUseEffectCallLoose(node.parent);
 }
 function isCleanupFunction(node) {
-  const nearestRet = eff.O.getOrNull(AST8__namespace.findParentNodeGuard(node, AST8__namespace.is(types$1.AST_NODE_TYPES.ReturnStatement)));
-  if (!nearestRet) {
-    return false;
-  }
-  const nearestFunction = eff.O.getOrNull(AST8__namespace.findParentNodeGuard(node, AST8__namespace.isFunction));
-  const nearestFunctionOfRet = eff.O.getOrNull(AST8__namespace.findParentNodeGuard(nearestRet, AST8__namespace.isFunction));
-  if (!nearestFunction || !nearestFunctionOfRet) {
-    return false;
-  }
-  return nearestFunction === nearestFunctionOfRet && isSetupFunction(nearestFunction);
+  return eff.F.pipe(
+    eff.O.Do,
+    eff.O.bind("nearReturn", () => AST8__namespace.findParentNodeGuard(node, AST8__namespace.is(types$1.AST_NODE_TYPES.ReturnStatement))),
+    eff.O.bind("nearFunction", () => AST8__namespace.findParentNodeGuard(node, AST8__namespace.isFunction)),
+    eff.O.bind("nearFunctionOfReturn", ({ nearReturn }) => AST8__namespace.findParentNodeGuard(nearReturn, AST8__namespace.isFunction)),
+    eff.O.exists(
+      ({ nearFunction, nearFunctionOfReturn }) => nearFunction === nearFunctionOfReturn && isSetupFunction(nearFunction)
+    )
+  );
 }
 function isComponentDidMount(node) {
   return AST8__namespace.isOneOf([types$1.AST_NODE_TYPES.MethodDefinition, types$1.AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === types$1.AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
@@ -691,14 +690,10 @@ var ERPhaseRelevance = types.birecord({
 });
 var isInversePhase = eff.F.dual(2, (a, b) => ERPhaseRelevance.get(a) === b);
 function isDirectValueOfRenderPropertyLoose(node) {
-  const matching = tsPattern.isMatching({
-    key: {
-      type: types$1.AST_NODE_TYPES.Identifier,
-      name: tsPattern.P.string.startsWith("render")
-    },
-    type: types$1.AST_NODE_TYPES.Property
-  });
-  return matching(node) || matching(node.parent);
+  const matching = (node2) => {
+    return node2.type === types$1.AST_NODE_TYPES.Property && node2.key.type === types$1.AST_NODE_TYPES.Identifier && node2.key.name.startsWith("render");
+  };
+  return matching(node) || node.parent != null && matching(node.parent);
 }
 function isDeclaredInRenderPropLoose(node) {
   if (isDirectValueOfRenderPropertyLoose(node)) {
@@ -709,10 +704,9 @@ function isDeclaredInRenderPropLoose(node) {
     eff.O.flatMapNullable((c) => c.parent),
     eff.O.filter(AST8__namespace.is(types$1.AST_NODE_TYPES.JSXAttribute)),
     eff.O.flatMapNullable((a) => a.name),
-    eff.O.exists(tsPattern.isMatching({
-      type: types$1.AST_NODE_TYPES.JSXIdentifier,
-      name: tsPattern.P.string.startsWith("render")
-    }))
+    eff.O.exists(
+      (n) => n.type === types$1.AST_NODE_TYPES.JSXIdentifier && n.name.startsWith("render")
+    )
   );
 }
 function isRenderFunctionLoose(node, context) {

package/dist/index.mjs

@@ -2,7 +2,7 @@ import * as AST8 from '@eslint-react/ast';
 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 { match } from 'ts-pattern';
 import { getSettingsFromContext, unsafeDecodeSettings } from '@eslint-react/shared';
 import * as VAR from '@eslint-react/var';
 import { birecord } from '@eslint-react/types';
@@ -111,10 +111,10 @@ function isCallFromReactMember(pragmaMemberName, name) {
 
 // src/utils/is-react-api.ts
 function isReactAPIWithName(name, member) {
-  return member ? isFromReactMember(name, member) : isFromReact(name);
+  return member == null ? isFromReact(name) : isFromReactMember(name, member);
 }
 function isReactAPICallWithName(name, member) {
-  return member ? isCallFromReactMember(name, member) : isCallFromReact(name);
+  return member == null ? isCallFromReact(name) : isCallFromReactMember(name, member);
 }
 var isChildrenCount = isReactAPIWithName("Children", "count");
 var isChildrenForEach = isReactAPIWithName("Children", "forEach");
@@ -301,7 +301,7 @@ function useHookCollector() {
         return;
       }
       const [fNode, hookId] = fStack.at(-1) ?? [];
-      if (!fNode || !hookId) {
+      if (fNode == null || hookId == null) {
         return;
       }
       F.pipe(
@@ -385,10 +385,10 @@ function getComponentNameFromIdentifier(node) {
   return Array.isArray(node) ? node.map((n) => n.name).join(".") : node.name;
 }
 function isComponentName(name) {
-  return !!name && RE_COMPONENT_NAME.test(name);
+  return RE_COMPONENT_NAME.test(name);
 }
 function isClassComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^(?:Pure)?Component$/u;
     switch (true) {
       case node.superClass.type === AST_NODE_TYPES.Identifier:
@@ -400,7 +400,7 @@ function isClassComponent(node) {
   return false;
 }
 function isPureComponent(node) {
-  if ("superClass" in node && node.superClass) {
+  if ("superClass" in node && node.superClass != null) {
     const re = /^PureComponent$/u;
     switch (true) {
       case node.superClass.type === AST_NODE_TYPES.Identifier:
@@ -432,7 +432,7 @@ function hasNoneOrValidComponentName(node, context) {
   }
   const id2 = mbIdentifier.value;
   const name = Array.isArray(id2) ? id2.at(-1)?.name : id2.name;
-  return !!name && isComponentName(name);
+  return name != null && isComponentName(name);
 }
 
 // src/component/component-collector.ts
@@ -491,7 +491,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       return functionEntries.pop();
     }
     const shouldDrop = AST8.getNestedReturnStatements(entry.node.body).slice().reverse().some((r) => {
-      return context.sourceCode.getScope(r).block === entry.node && r.argument !== null && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
+      return context.sourceCode.getScope(r).block === entry.node && r.argument != null && !JSX4.isJSXValue(r.argument, jsxCtx, hint);
     });
     if (shouldDrop) {
       components.delete(entry.key);
@@ -546,7 +546,7 @@ function useComponentCollector(context, hint = DEFAULT_COMPONENT_HINT) {
       }
       const componentName = mbComponentName.value;
       const component = Array.from(components.values()).findLast(({ name }) => O.exists(name, (n) => n === componentName));
-      if (!component) {
+      if (component == null) {
         return;
       }
       components.set(component._, {
@@ -638,16 +638,15 @@ function isSetupFunction(node) {
   return node.parent?.type === AST_NODE_TYPES.CallExpression && node.parent.callee !== node && node.parent.callee.type === AST_NODE_TYPES.Identifier && node.parent.arguments.at(0) === node && isUseEffectCallLoose(node.parent);
 }
 function isCleanupFunction(node) {
-  const nearestRet = O.getOrNull(AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.ReturnStatement)));
-  if (!nearestRet) {
-    return false;
-  }
-  const nearestFunction = O.getOrNull(AST8.findParentNodeGuard(node, AST8.isFunction));
-  const nearestFunctionOfRet = O.getOrNull(AST8.findParentNodeGuard(nearestRet, AST8.isFunction));
-  if (!nearestFunction || !nearestFunctionOfRet) {
-    return false;
-  }
-  return nearestFunction === nearestFunctionOfRet && isSetupFunction(nearestFunction);
+  return F.pipe(
+    O.Do,
+    O.bind("nearReturn", () => AST8.findParentNodeGuard(node, AST8.is(AST_NODE_TYPES.ReturnStatement))),
+    O.bind("nearFunction", () => AST8.findParentNodeGuard(node, AST8.isFunction)),
+    O.bind("nearFunctionOfReturn", ({ nearReturn }) => AST8.findParentNodeGuard(nearReturn, AST8.isFunction)),
+    O.exists(
+      ({ nearFunction, nearFunctionOfReturn }) => nearFunction === nearFunctionOfReturn && isSetupFunction(nearFunction)
+    )
+  );
 }
 function isComponentDidMount(node) {
   return AST8.isOneOf([AST_NODE_TYPES.MethodDefinition, AST_NODE_TYPES.PropertyDefinition])(node) && node.key.type === AST_NODE_TYPES.Identifier && node.key.name === "componentDidMount";
@@ -667,14 +666,10 @@ var ERPhaseRelevance = birecord({
 });
 var isInversePhase = F.dual(2, (a, b) => ERPhaseRelevance.get(a) === b);
 function isDirectValueOfRenderPropertyLoose(node) {
-  const matching = isMatching({
-    key: {
-      type: AST_NODE_TYPES.Identifier,
-      name: P.string.startsWith("render")
-    },
-    type: AST_NODE_TYPES.Property
-  });
-  return matching(node) || matching(node.parent);
+  const matching = (node2) => {
+    return node2.type === AST_NODE_TYPES.Property && node2.key.type === AST_NODE_TYPES.Identifier && node2.key.name.startsWith("render");
+  };
+  return matching(node) || node.parent != null && matching(node.parent);
 }
 function isDeclaredInRenderPropLoose(node) {
   if (isDirectValueOfRenderPropertyLoose(node)) {
@@ -685,10 +680,9 @@ function isDeclaredInRenderPropLoose(node) {
     O.flatMapNullable((c) => c.parent),
     O.filter(AST8.is(AST_NODE_TYPES.JSXAttribute)),
     O.flatMapNullable((a) => a.name),
-    O.exists(isMatching({
-      type: AST_NODE_TYPES.JSXIdentifier,
-      name: P.string.startsWith("render")
-    }))
+    O.exists(
+      (n) => n.type === AST_NODE_TYPES.JSXIdentifier && n.name.startsWith("render")
+    )
   );
 }
 function isRenderFunctionLoose(node, context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/core",
-  "version": "1.23.3-next.5",
+  "version": "1.23.3-next.7",
   "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,12 +38,12 @@
     "@typescript-eslint/types": "^8.19.1",
     "@typescript-eslint/utils": "^8.19.1",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.23.3-next.5",
-    "@eslint-react/eff": "1.23.3-next.5",
-    "@eslint-react/shared": "1.23.3-next.5",
-    "@eslint-react/jsx": "1.23.3-next.5",
-    "@eslint-react/types": "1.23.3-next.5",
-    "@eslint-react/var": "1.23.3-next.5"
+    "@eslint-react/eff": "1.23.3-next.7",
+    "@eslint-react/ast": "1.23.3-next.7",
+    "@eslint-react/jsx": "1.23.3-next.7",
+    "@eslint-react/types": "1.23.3-next.7",
+    "@eslint-react/shared": "1.23.3-next.7",
+    "@eslint-react/var": "1.23.3-next.7"
   },
   "devDependencies": {
     "tsup": "^8.3.5",