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

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { TSESTree } from '@typescript-eslint/types';
-import { O } from '@eslint-react/tools';
+import { O } from '@eslint-react/eff';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as birecord from 'birecord';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { TSESTree } from '@typescript-eslint/types';
-import { O } from '@eslint-react/tools';
+import { O } from '@eslint-react/eff';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as birecord from 'birecord';

package/dist/index.js

@@ -2,7 +2,7 @@
 
 var types = require('@typescript-eslint/types');
 var AST = require('@eslint-react/ast');
-var tools = require('@eslint-react/tools');
+var eff = require('@eslint-react/eff');
 var VAR = require('@eslint-react/var');
 var tsPattern = require('ts-pattern');
 var birecord = require('birecord');
@@ -69,19 +69,19 @@ function getProp(props, propName, initialScope) {
 function getPropValue(attribute, initialScope) {
   if (attribute.type === types.AST_NODE_TYPES.JSXAttribute && "value" in attribute) {
     const { value } = attribute;
-    if (value === null) return tools.O.none();
+    if (value === null) return eff.O.none();
     if (value.type === types.AST_NODE_TYPES.Literal) return VAR__namespace.getStaticValue(value, initialScope);
     if (value.type === types.AST_NODE_TYPES.JSXExpressionContainer) {
       return VAR__namespace.getStaticValue(value.expression, initialScope);
     }
-    return tools.O.none();
+    return eff.O.none();
   }
   const { argument } = attribute;
   return VAR__namespace.getStaticValue(argument, initialScope);
 }
 function findPropInProperties(properties, initialScope, seenProps = []) {
   return (propName) => {
-    return tools.O.fromNullable(
+    return eff.O.fromNullable(
       properties.findLast((prop) => {
         switch (true) {
           case (prop.type === types.AST_NODE_TYPES.Property && "name" in prop.key && prop.key.name === propName):
@@ -90,20 +90,20 @@ function findPropInProperties(properties, initialScope, seenProps = []) {
             switch (true) {
               case prop.argument.type === types.AST_NODE_TYPES.Identifier: {
                 const { name } = prop.argument;
-                const maybeInit = tools.O.flatMap(
+                const maybeInit = eff.O.flatMap(
                   VAR__namespace.findVariable(name, initialScope),
                   VAR__namespace.getVariableNode(0)
                 );
-                if (tools.O.isNone(maybeInit)) return false;
+                if (eff.O.isNone(maybeInit)) return false;
                 const init = maybeInit.value;
                 if (!AST__namespace.is(types.AST_NODE_TYPES.ObjectExpression)(init)) return false;
                 if (seenProps.includes(name)) return false;
-                return tools.O.isSome(
+                return eff.O.isSome(
                   findPropInProperties(init.properties, initialScope, [...seenProps, name])(propName)
                 );
               }
               case prop.argument.type === types.AST_NODE_TYPES.ObjectExpression: {
-                return tools.O.isSome(
+                return eff.O.isSome(
                   findPropInProperties(prop.argument.properties, initialScope, seenProps)(propName)
                 );
               }
@@ -122,7 +122,7 @@ function findPropInProperties(properties, initialScope, seenProps = []) {
 }
 function findPropInAttributes(attributes, initialScope) {
   return (propName) => {
-    return tools.O.fromNullable(
+    return eff.O.fromNullable(
       attributes.findLast((attr) => {
         switch (attr.type) {
           case types.AST_NODE_TYPES.JSXAttribute:
@@ -133,19 +133,19 @@ function findPropInAttributes(attributes, initialScope) {
                 return false;
               case types.AST_NODE_TYPES.Identifier: {
                 const { name } = attr.argument;
-                const maybeInit = tools.O.flatMap(
+                const maybeInit = eff.O.flatMap(
                   VAR__namespace.findVariable(name, initialScope),
                   VAR__namespace.getVariableNode(0)
                 );
-                if (tools.O.isNone(maybeInit)) return false;
+                if (eff.O.isNone(maybeInit)) return false;
                 const init = maybeInit.value;
                 if (!AST__namespace.is(types.AST_NODE_TYPES.ObjectExpression)(init)) return false;
-                return tools.O.isSome(findPropInProperties(init.properties, initialScope)(propName));
+                return eff.O.isSome(findPropInProperties(init.properties, initialScope)(propName));
               }
               case types.AST_NODE_TYPES.MemberExpression:
                 return false;
               case types.AST_NODE_TYPES.ObjectExpression:
-                return tools.O.isSome(findPropInProperties(attr.argument.properties, initialScope)(propName));
+                return eff.O.isSome(findPropInProperties(attr.argument.properties, initialScope)(propName));
               default:
                 return false;
             }
@@ -157,7 +157,7 @@ function findPropInAttributes(attributes, initialScope) {
   };
 }
 function hasProp(attributes, propName, initialScope) {
-  return tools.O.isSome(findPropInAttributes(attributes, initialScope)(propName));
+  return eff.O.isSome(findPropInAttributes(attributes, initialScope)(propName));
 }
 function hasAnyProp(attributes, propNames, initialScope) {
   return propNames.some((propName) => hasProp(attributes, propName, initialScope));
@@ -190,8 +190,8 @@ var JSXValueHint = {
 var DEFAULT_JSX_VALUE_HINT = 0n | JSXValueHint.SkipUndefinedLiteral | JSXValueHint.SkipBooleanLiteral;
 function isJSXValue(node, jsxCtx, hint = DEFAULT_JSX_VALUE_HINT) {
   if (!node) return false;
-  return tsPattern.match(node).with({ type: types.AST_NODE_TYPES.JSXElement }, tools.F.constTrue).with({ type: types.AST_NODE_TYPES.JSXFragment }, tools.F.constTrue).with({ type: types.AST_NODE_TYPES.JSXMemberExpression }, tools.F.constTrue).with({ type: types.AST_NODE_TYPES.JSXNamespacedName }, tools.F.constTrue).with({ type: types.AST_NODE_TYPES.Literal }, (node2) => {
-    return tsPattern.match(node2.value).with(null, () => !(hint & JSXValueHint.SkipNullLiteral)).with(tsPattern.P.boolean, () => !(hint & JSXValueHint.SkipBooleanLiteral)).with(tsPattern.P.string, () => !(hint & JSXValueHint.SkipStringLiteral)).with(tsPattern.P.number, () => !(hint & JSXValueHint.SkipNumberLiteral)).otherwise(tools.F.constFalse);
+  return tsPattern.match(node).with({ type: types.AST_NODE_TYPES.JSXElement }, eff.F.constTrue).with({ type: types.AST_NODE_TYPES.JSXFragment }, eff.F.constTrue).with({ type: types.AST_NODE_TYPES.JSXMemberExpression }, eff.F.constTrue).with({ type: types.AST_NODE_TYPES.JSXNamespacedName }, eff.F.constTrue).with({ type: types.AST_NODE_TYPES.Literal }, (node2) => {
+    return tsPattern.match(node2.value).with(null, () => !(hint & JSXValueHint.SkipNullLiteral)).with(tsPattern.P.boolean, () => !(hint & JSXValueHint.SkipBooleanLiteral)).with(tsPattern.P.string, () => !(hint & JSXValueHint.SkipStringLiteral)).with(tsPattern.P.number, () => !(hint & JSXValueHint.SkipNumberLiteral)).otherwise(eff.F.constFalse);
   }).with({ type: types.AST_NODE_TYPES.TemplateLiteral }, () => !(hint & JSXValueHint.SkipStringLiteral)).with({ type: types.AST_NODE_TYPES.ArrayExpression }, (node2) => {
     if (hint & JSXValueHint.StrictArray) return node2.elements.every((n) => isJSXValue(n, jsxCtx, hint));
     return node2.elements.some((n) => isJSXValue(n, jsxCtx, hint));
@@ -223,22 +223,22 @@ function isJSXValue(node, jsxCtx, hint = DEFAULT_JSX_VALUE_HINT) {
     return isJSXValue(exp, jsxCtx, hint);
   }).with({ type: types.AST_NODE_TYPES.CallExpression }, (node2) => {
     if (hint & JSXValueHint.SkipCreateElement) return false;
-    return tsPattern.match(node2.callee).with({ type: types.AST_NODE_TYPES.Identifier, name: "createElement" }, tools.F.constTrue).with({ type: types.AST_NODE_TYPES.MemberExpression, property: { name: "createElement" } }, tools.F.constTrue).otherwise(tools.F.constFalse);
+    return tsPattern.match(node2.callee).with({ type: types.AST_NODE_TYPES.Identifier, name: "createElement" }, eff.F.constTrue).with({ type: types.AST_NODE_TYPES.MemberExpression, property: { name: "createElement" } }, eff.F.constTrue).otherwise(eff.F.constFalse);
   }).with({ type: types.AST_NODE_TYPES.Identifier }, (node2) => {
     const { name } = node2;
     if (name === "undefined") return !(hint & JSXValueHint.SkipUndefinedLiteral);
     if (AST__namespace.isJSXTagNameExpression(node2)) return true;
     const initialScope = jsxCtx.getScope(node2);
-    return tools.F.pipe(
+    return eff.F.pipe(
       VAR__namespace.findVariable(name, initialScope),
-      tools.O.flatMap(VAR__namespace.getVariableNode(0)),
-      tools.O.exists((n) => isJSXValue(n, jsxCtx, hint))
+      eff.O.flatMap(VAR__namespace.getVariableNode(0)),
+      eff.O.exists((n) => isJSXValue(n, jsxCtx, hint))
     );
-  }).otherwise(tools.F.constFalse);
+  }).otherwise(eff.F.constFalse);
 }
 var isLiteral = AST__namespace.isOneOf([types.AST_NODE_TYPES.Literal, types.AST_NODE_TYPES.JSXText]);
 function isWhiteSpace(node) {
-  return tools.isString(node.value) && node.value.trim() === "";
+  return eff.isString(node.value) && node.value.trim() === "";
 }
 function isLineBreak(node) {
   return isLiteral(node) && isWhiteSpace(node) && AST__namespace.isMultiLine(node);
@@ -246,7 +246,7 @@ function isLineBreak(node) {
 function isPaddingSpaces(node) {
   return isLiteral(node) && isWhiteSpace(node) && node.raw.includes("\n");
 }
-function traverseUpProp(node, predicate = tools.F.constTrue) {
+function traverseUpProp(node, predicate = eff.F.constTrue) {
   const guard = (node2) => {
     return node2.type === types.AST_NODE_TYPES.JSXAttribute && predicate(node2);
   };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import * as AST from '@eslint-react/ast';
-import { O, F, isString } from '@eslint-react/tools';
+import { O, F, isString } from '@eslint-react/eff';
 import * as VAR from '@eslint-react/var';
 import { match, P } from 'ts-pattern';
 import birecord from 'birecord';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "1.20.2-next.2",
+  "version": "1.20.2-next.3",
   "description": "ESLint React's TSESTree AST utility module for static analysis of JSX.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -40,10 +40,10 @@
     "@typescript-eslint/utils": "^8.18.1",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.20.2-next.2",
-    "@eslint-react/tools": "1.20.2-next.2",
-    "@eslint-react/var": "1.20.2-next.2",
-    "@eslint-react/types": "1.20.2-next.2"
+    "@eslint-react/ast": "1.20.2-next.3",
+    "@eslint-react/eff": "1.20.2-next.3",
+    "@eslint-react/var": "1.20.2-next.3",
+    "@eslint-react/types": "1.20.2-next.3"
   },
   "devDependencies": {
     "tsup": "^8.3.5",