@eslint-react/jsx 1.23.2-next.2 → 1.23.2-next.6

package/dist/index.d.mts

@@ -1,9 +1,11 @@
-import { TSESTree } from '@typescript-eslint/types';
 import { O } from '@eslint-react/eff';
+import { TSESTree } from '@typescript-eslint/types';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as _eslint_react_types from '@eslint-react/types';
 
+declare function findParentProp(node: TSESTree.Node, predicate?: (node: TSESTree.JSXAttribute) => boolean): O.Option<TSESTree.JSXAttribute>;
+
 /**
  * Returns the tag name associated with a JSXOpeningElement.
  * @param node The visited JSXOpeningElement node object.
@@ -109,7 +111,7 @@ declare function isJSXValue(node: null | TSESTree$1.Node | undefined, jsxCtx: {
  * @param node The AST node to check
  * @returns boolean `true` if the node is a Literal or JSXText
  */
-declare const isLiteral: (node: TSESTree.Node | null | undefined) => node is TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.JSXText;
+declare const isLiteral: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXText | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral;
 /**
  * Check if a Literal or JSXText node is whitespace
  * @param node The AST node to check
@@ -129,14 +131,6 @@ declare function isLineBreak(node: TSESTree.Node): boolean;
  */
 declare function isPaddingSpaces(node: TSESTree.Node): boolean;
 
-/**
- * Traverses up prop node
- * @param node The AST node to start traversing from
- * @param predicate The predicate to check each node
- * @returns prop node if found
- */
-declare function traverseUpProp(node: TSESTree.Node, predicate?: (node: TSESTree.JSXAttribute) => boolean): O.Option<TSESTree.JSXAttribute>;
-
 /**
  * Unescape the text content of string literals, e.g. &amp; -> &
  * @param text The escaped string literal text.
@@ -400,4 +394,4 @@ declare const xhtmlEntities: _eslint_react_types.BiRecord<{
     readonly zwnj: "‌";
 }>;
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp, unescapeStringLiteralText, xhtmlEntities };
+export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findParentProp, findPropInAttributes, findPropInProperties, getElementName, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, unescapeStringLiteralText, xhtmlEntities };

package/dist/index.d.ts

@@ -1,9 +1,11 @@
-import { TSESTree } from '@typescript-eslint/types';
 import { O } from '@eslint-react/eff';
+import { TSESTree } from '@typescript-eslint/types';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as _eslint_react_types from '@eslint-react/types';
 
+declare function findParentProp(node: TSESTree.Node, predicate?: (node: TSESTree.JSXAttribute) => boolean): O.Option<TSESTree.JSXAttribute>;
+
 /**
  * Returns the tag name associated with a JSXOpeningElement.
  * @param node The visited JSXOpeningElement node object.
@@ -109,7 +111,7 @@ declare function isJSXValue(node: null | TSESTree$1.Node | undefined, jsxCtx: {
  * @param node The AST node to check
  * @returns boolean `true` if the node is a Literal or JSXText
  */
-declare const isLiteral: (node: TSESTree.Node | null | undefined) => node is TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral | TSESTree.JSXText;
+declare const isLiteral: (node: TSESTree.Node | null | undefined) => node is TSESTree.JSXText | TSESTree.BigIntLiteral | TSESTree.BooleanLiteral | TSESTree.NullLiteral | TSESTree.NumberLiteral | TSESTree.RegExpLiteral | TSESTree.StringLiteral;
 /**
  * Check if a Literal or JSXText node is whitespace
  * @param node The AST node to check
@@ -129,14 +131,6 @@ declare function isLineBreak(node: TSESTree.Node): boolean;
  */
 declare function isPaddingSpaces(node: TSESTree.Node): boolean;
 
-/**
- * Traverses up prop node
- * @param node The AST node to start traversing from
- * @param predicate The predicate to check each node
- * @returns prop node if found
- */
-declare function traverseUpProp(node: TSESTree.Node, predicate?: (node: TSESTree.JSXAttribute) => boolean): O.Option<TSESTree.JSXAttribute>;
-
 /**
  * Unescape the text content of string literals, e.g. &amp; -> &
  * @param text The escaped string literal text.
@@ -400,4 +394,4 @@ declare const xhtmlEntities: _eslint_react_types.BiRecord<{
     readonly zwnj: "‌";
 }>;
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp, unescapeStringLiteralText, xhtmlEntities };
+export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findParentProp, findPropInAttributes, findPropInProperties, getElementName, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, unescapeStringLiteralText, xhtmlEntities };

package/dist/index.js

@@ -1,8 +1,8 @@
 'use strict';
 
-var types = require('@typescript-eslint/types');
-var AST = require('@eslint-react/ast');
+var AST2 = require('@eslint-react/ast');
 var eff = require('@eslint-react/eff');
+var types = require('@typescript-eslint/types');
 var VAR = require('@eslint-react/var');
 var tsPattern = require('ts-pattern');
 var types$1 = require('@eslint-react/types');
@@ -25,10 +25,16 @@ function _interopNamespace(e) {
   return Object.freeze(n);
 }
 
-var AST__namespace = /*#__PURE__*/_interopNamespace(AST);
+var AST2__namespace = /*#__PURE__*/_interopNamespace(AST2);
 var VAR__namespace = /*#__PURE__*/_interopNamespace(VAR);
 
-// src/get-element-name.ts
+// src/find-parent-prop.ts
+function findParentProp(node, predicate = eff.F.constTrue) {
+  const guard = (node2) => {
+    return node2.type === types.AST_NODE_TYPES.JSXAttribute && predicate(node2);
+  };
+  return AST2__namespace.findParentNodeGuard(node, guard);
+}
 function resolveJSXMemberExpressions(object, property) {
   if (object.type === types.AST_NODE_TYPES.JSXMemberExpression) {
     return `${resolveJSXMemberExpressions(object.object, object.property)}.${property.name}`;
@@ -87,16 +93,15 @@ function findPropInProperties(properties, initialScope, seenProps = []) {
             switch (true) {
               case prop.argument.type === types.AST_NODE_TYPES.Identifier: {
                 const { name } = prop.argument;
-                const maybeInit = eff.O.flatMap(
-                  VAR__namespace.findVariable(name, initialScope),
-                  VAR__namespace.getVariableNode(0)
-                );
-                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 eff.O.isSome(
-                  findPropInProperties(init.properties, initialScope, [...seenProps, name])(propName)
+                return eff.F.pipe(
+                  VAR__namespace.findVariable(name, initialScope),
+                  eff.O.flatMap(VAR__namespace.getVariableNode(0)),
+                  eff.O.filter(AST2__namespace.is(types.AST_NODE_TYPES.ObjectExpression)),
+                  eff.O.flatMap(
+                    (init) => findPropInProperties(init.properties, initialScope, [...seenProps, name])(propName)
+                  ),
+                  eff.O.isSome
                 );
               }
               case prop.argument.type === types.AST_NODE_TYPES.ObjectExpression: {
@@ -130,14 +135,13 @@ function findPropInAttributes(attributes, initialScope) {
                 return false;
               case types.AST_NODE_TYPES.Identifier: {
                 const { name } = attr.argument;
-                const maybeInit = eff.O.flatMap(
+                return eff.F.pipe(
                   VAR__namespace.findVariable(name, initialScope),
-                  VAR__namespace.getVariableNode(0)
+                  eff.O.flatMap(VAR__namespace.getVariableNode(0)),
+                  eff.O.filter(AST2__namespace.is(types.AST_NODE_TYPES.ObjectExpression)),
+                  eff.O.flatMap((init) => findPropInProperties(init.properties, initialScope)(propName)),
+                  eff.O.isSome
                 );
-                if (eff.O.isNone(maybeInit)) return false;
-                const init = maybeInit.value;
-                if (!AST__namespace.is(types.AST_NODE_TYPES.ObjectExpression)(init)) return false;
-                return eff.O.isSome(findPropInProperties(init.properties, initialScope)(propName));
               }
               case types.AST_NODE_TYPES.MemberExpression:
                 return false;
@@ -224,7 +228,7 @@ function isJSXValue(node, jsxCtx, hint = DEFAULT_JSX_VALUE_HINT) {
   }).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;
+    if (AST2__namespace.isJSXTagNameExpression(node2)) return true;
     const initialScope = jsxCtx.getScope(node2);
     return eff.F.pipe(
       VAR__namespace.findVariable(name, initialScope),
@@ -233,22 +237,16 @@ function isJSXValue(node, jsxCtx, hint = DEFAULT_JSX_VALUE_HINT) {
     );
   }).otherwise(eff.F.constFalse);
 }
-var isLiteral = AST__namespace.isOneOf([types.AST_NODE_TYPES.Literal, types.AST_NODE_TYPES.JSXText]);
+var isLiteral = AST2__namespace.isOneOf([types.AST_NODE_TYPES.Literal, types.AST_NODE_TYPES.JSXText]);
 function isWhiteSpace(node) {
   return eff.isString(node.value) && node.value.trim() === "";
 }
 function isLineBreak(node) {
-  return isLiteral(node) && isWhiteSpace(node) && AST__namespace.isMultiLine(node);
+  return isLiteral(node) && isWhiteSpace(node) && AST2__namespace.isMultiLine(node);
 }
 function isPaddingSpaces(node) {
   return isLiteral(node) && isWhiteSpace(node) && node.raw.includes("\n");
 }
-function traverseUpProp(node, predicate = eff.F.constTrue) {
-  const guard = (node2) => {
-    return node2.type === types.AST_NODE_TYPES.JSXAttribute && predicate(node2);
-  };
-  return AST__namespace.traverseUpGuard(node, guard);
-}
 var xhtmlEntities = types$1.birecord({
   Aacute: "\xC1",
   aacute: "\xE1",
@@ -519,6 +517,7 @@ function unescapeStringLiteralText(text) {
 
 exports.DEFAULT_JSX_VALUE_HINT = DEFAULT_JSX_VALUE_HINT;
 exports.JSXValueHint = JSXValueHint;
+exports.findParentProp = findParentProp;
 exports.findPropInAttributes = findPropInAttributes;
 exports.findPropInProperties = findPropInProperties;
 exports.getElementName = getElementName;
@@ -536,6 +535,5 @@ exports.isLiteral = isLiteral;
 exports.isPaddingSpaces = isPaddingSpaces;
 exports.isUserDefinedElement = isUserDefinedElement;
 exports.isWhiteSpace = isWhiteSpace;
-exports.traverseUpProp = traverseUpProp;
 exports.unescapeStringLiteralText = unescapeStringLiteralText;
 exports.xhtmlEntities = xhtmlEntities;

package/dist/index.mjs

@@ -1,11 +1,17 @@
+import * as AST2 from '@eslint-react/ast';
+import { F, O, isString } from '@eslint-react/eff';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import * as AST from '@eslint-react/ast';
-import { O, F, isString } from '@eslint-react/eff';
 import * as VAR from '@eslint-react/var';
 import { match, P } from 'ts-pattern';
 import { birecord } from '@eslint-react/types';
 
-// src/get-element-name.ts
+// src/find-parent-prop.ts
+function findParentProp(node, predicate = F.constTrue) {
+  const guard = (node2) => {
+    return node2.type === AST_NODE_TYPES.JSXAttribute && predicate(node2);
+  };
+  return AST2.findParentNodeGuard(node, guard);
+}
 function resolveJSXMemberExpressions(object, property) {
   if (object.type === AST_NODE_TYPES.JSXMemberExpression) {
     return `${resolveJSXMemberExpressions(object.object, object.property)}.${property.name}`;
@@ -64,16 +70,15 @@ function findPropInProperties(properties, initialScope, seenProps = []) {
             switch (true) {
               case prop.argument.type === AST_NODE_TYPES.Identifier: {
                 const { name } = prop.argument;
-                const maybeInit = O.flatMap(
-                  VAR.findVariable(name, initialScope),
-                  VAR.getVariableNode(0)
-                );
-                if (O.isNone(maybeInit)) return false;
-                const init = maybeInit.value;
-                if (!AST.is(AST_NODE_TYPES.ObjectExpression)(init)) return false;
                 if (seenProps.includes(name)) return false;
-                return O.isSome(
-                  findPropInProperties(init.properties, initialScope, [...seenProps, name])(propName)
+                return F.pipe(
+                  VAR.findVariable(name, initialScope),
+                  O.flatMap(VAR.getVariableNode(0)),
+                  O.filter(AST2.is(AST_NODE_TYPES.ObjectExpression)),
+                  O.flatMap(
+                    (init) => findPropInProperties(init.properties, initialScope, [...seenProps, name])(propName)
+                  ),
+                  O.isSome
                 );
               }
               case prop.argument.type === AST_NODE_TYPES.ObjectExpression: {
@@ -107,14 +112,13 @@ function findPropInAttributes(attributes, initialScope) {
                 return false;
               case AST_NODE_TYPES.Identifier: {
                 const { name } = attr.argument;
-                const maybeInit = O.flatMap(
+                return F.pipe(
                   VAR.findVariable(name, initialScope),
-                  VAR.getVariableNode(0)
+                  O.flatMap(VAR.getVariableNode(0)),
+                  O.filter(AST2.is(AST_NODE_TYPES.ObjectExpression)),
+                  O.flatMap((init) => findPropInProperties(init.properties, initialScope)(propName)),
+                  O.isSome
                 );
-                if (O.isNone(maybeInit)) return false;
-                const init = maybeInit.value;
-                if (!AST.is(AST_NODE_TYPES.ObjectExpression)(init)) return false;
-                return O.isSome(findPropInProperties(init.properties, initialScope)(propName));
               }
               case AST_NODE_TYPES.MemberExpression:
                 return false;
@@ -201,7 +205,7 @@ function isJSXValue(node, jsxCtx, hint = DEFAULT_JSX_VALUE_HINT) {
   }).with({ type: AST_NODE_TYPES.Identifier }, (node2) => {
     const { name } = node2;
     if (name === "undefined") return !(hint & JSXValueHint.SkipUndefinedLiteral);
-    if (AST.isJSXTagNameExpression(node2)) return true;
+    if (AST2.isJSXTagNameExpression(node2)) return true;
     const initialScope = jsxCtx.getScope(node2);
     return F.pipe(
       VAR.findVariable(name, initialScope),
@@ -210,22 +214,16 @@ function isJSXValue(node, jsxCtx, hint = DEFAULT_JSX_VALUE_HINT) {
     );
   }).otherwise(F.constFalse);
 }
-var isLiteral = AST.isOneOf([AST_NODE_TYPES.Literal, AST_NODE_TYPES.JSXText]);
+var isLiteral = AST2.isOneOf([AST_NODE_TYPES.Literal, AST_NODE_TYPES.JSXText]);
 function isWhiteSpace(node) {
   return isString(node.value) && node.value.trim() === "";
 }
 function isLineBreak(node) {
-  return isLiteral(node) && isWhiteSpace(node) && AST.isMultiLine(node);
+  return isLiteral(node) && isWhiteSpace(node) && AST2.isMultiLine(node);
 }
 function isPaddingSpaces(node) {
   return isLiteral(node) && isWhiteSpace(node) && node.raw.includes("\n");
 }
-function traverseUpProp(node, predicate = F.constTrue) {
-  const guard = (node2) => {
-    return node2.type === AST_NODE_TYPES.JSXAttribute && predicate(node2);
-  };
-  return AST.traverseUpGuard(node, guard);
-}
 var xhtmlEntities = birecord({
   Aacute: "\xC1",
   aacute: "\xE1",
@@ -494,4 +492,4 @@ function unescapeStringLiteralText(text) {
   });
 }
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp, unescapeStringLiteralText, xhtmlEntities };
+export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findParentProp, findPropInAttributes, findPropInProperties, getElementName, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, unescapeStringLiteralText, xhtmlEntities };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "1.23.2-next.2",
+  "version": "1.23.2-next.6",
   "description": "ESLint React's TSESTree AST utility module for static analysis of JSX.",
   "homepage": "https://github.com/rEl1cx/eslint-react",
   "bugs": {
@@ -33,14 +33,14 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^8.19.0",
-    "@typescript-eslint/types": "^8.19.0",
-    "@typescript-eslint/utils": "^8.19.0",
+    "@typescript-eslint/scope-manager": "^8.19.1",
+    "@typescript-eslint/types": "^8.19.1",
+    "@typescript-eslint/utils": "^8.19.1",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.23.2-next.2",
-    "@eslint-react/eff": "1.23.2-next.2",
-    "@eslint-react/types": "1.23.2-next.2",
-    "@eslint-react/var": "1.23.2-next.2"
+    "@eslint-react/ast": "1.23.2-next.6",
+    "@eslint-react/eff": "1.23.2-next.6",
+    "@eslint-react/types": "1.23.2-next.6",
+    "@eslint-react/var": "1.23.2-next.6"
   },
   "devDependencies": {
     "tsup": "^8.3.5",