@eslint-react/jsx 1.6.1-next.2 → 1.7.0-beta.2

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { TSESTree } from '@typescript-eslint/types';
-import { O } from '@eslint-react/tools';
 import { RuleContext } from '@eslint-react/types';
+import { O } from '@eslint-react/tools';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 
@@ -9,7 +9,9 @@ import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
  * @param node The visited JSXOpeningElement node object.
  * @returns The element's tag name.
  */
-declare function elementName(node: TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment): string;
+declare function getElementName(node: TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment): string;
+
+declare function getElementType(context: RuleContext, polymorphicPropName?: string): (node: TSESTree.JSXOpeningElement) => string;
 
 declare function getJSXPragma(context: RuleContext): O.Option<string>;
 
@@ -145,4 +147,4 @@ declare function isPaddingSpaces(node: TSESTree.Node): boolean;
  */
 declare function traverseUpProp(node: TSESTree.Node, predicate?: (node: TSESTree.JSXAttribute) => boolean): O.Option<TSESTree.JSXAttribute>;
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, elementName, findPropInAttributes, findPropInProperties, getJSXPragma, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp };
+export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getElementType, getJSXPragma, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { TSESTree } from '@typescript-eslint/types';
-import { O } from '@eslint-react/tools';
 import { RuleContext } from '@eslint-react/types';
+import { O } from '@eslint-react/tools';
 import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 
@@ -9,7 +9,9 @@ import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
  * @param node The visited JSXOpeningElement node object.
  * @returns The element's tag name.
  */
-declare function elementName(node: TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment): string;
+declare function getElementName(node: TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment): string;
+
+declare function getElementType(context: RuleContext, polymorphicPropName?: string): (node: TSESTree.JSXOpeningElement) => string;
 
 declare function getJSXPragma(context: RuleContext): O.Option<string>;
 
@@ -145,4 +147,4 @@ declare function isPaddingSpaces(node: TSESTree.Node): boolean;
  */
 declare function traverseUpProp(node: TSESTree.Node, predicate?: (node: TSESTree.JSXAttribute) => boolean): O.Option<TSESTree.JSXAttribute>;
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, elementName, findPropInAttributes, findPropInProperties, getJSXPragma, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp };
+export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getElementType, getJSXPragma, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp };

package/dist/index.js

@@ -1,47 +1,56 @@
 'use strict';
 
-var types = require('@typescript-eslint/types');
-var tools = require('@eslint-react/tools');
 var ast = require('@eslint-react/ast');
+var tools = require('@eslint-react/tools');
+var R = require('remeda');
 var _var = require('@eslint-react/var');
 var astUtils = require('@typescript-eslint/utils/ast-utils');
 var tsPattern = require('ts-pattern');
 
-// src/element-name.ts
-function resolveMemberExpressions(object, property) {
-  if (object.type === types.AST_NODE_TYPES.JSXMemberExpression) {
-    return `${resolveMemberExpressions(object.object, object.property)}.${property.name}`;
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
   }
-  if (object.type === types.AST_NODE_TYPES.JSXNamespacedName) {
+  n.default = e;
+  return Object.freeze(n);
+}
+
+var R__namespace = /*#__PURE__*/_interopNamespace(R);
+
+// src/get-element-name.ts
+function resolveJSXMemberExpressions(object, property) {
+  if (object.type === ast.NodeType.JSXMemberExpression) {
+    return `${resolveJSXMemberExpressions(object.object, object.property)}.${property.name}`;
+  }
+  if (object.type === ast.NodeType.JSXNamespacedName) {
     return `${object.namespace.name}:${object.name.name}.${property.name}`;
   }
   return `${object.name}.${property.name}`;
 }
-function elementName(node) {
-  if (node.type === types.AST_NODE_TYPES.JSXOpeningFragment) {
+function getElementName(node) {
+  if (node.type === ast.NodeType.JSXOpeningFragment) {
     return "<>";
   }
   const { name } = node;
-  if (name.type === types.AST_NODE_TYPES.JSXMemberExpression) {
+  if (name.type === ast.NodeType.JSXMemberExpression) {
     const { object, property } = name;
-    return resolveMemberExpressions(object, property);
+    return resolveJSXMemberExpressions(object, property);
   }
-  if (name.type === types.AST_NODE_TYPES.JSXNamespacedName) {
+  if (name.type === ast.NodeType.JSXNamespacedName) {
     return `${name.namespace.name}:${name.name.name}`;
   }
   return name.name;
 }
-var RE_JSX_ANNOTATION_REGEX = /@jsx\s+(\S+)/u;
-var RE_JS_IDENTIFIER_REGEX = /^[$A-Z_a-z][\w$]*$/u;
-function getJSXPragma(context) {
-  const { sourceCode } = context;
-  return tools.F.pipe(
-    tools.O.fromNullable(sourceCode.getAllComments().find((node) => RE_JSX_ANNOTATION_REGEX.test(node.value))),
-    tools.O.map(({ value }) => RE_JSX_ANNOTATION_REGEX.exec(value)),
-    tools.O.flatMapNullable((matches) => matches?.[1]),
-    tools.O.filter((pragma) => RE_JS_IDENTIFIER_REGEX.test(pragma))
-  );
-}
 function getPropName(node) {
   return tsPattern.match(node.name).when(ast.is(ast.NodeType.JSXIdentifier), (n) => n.name).when(ast.is(ast.NodeType.JSXNamespacedName), (n) => `${n.namespace.name}:${n.name.name}`).exhaustive();
 }
@@ -119,6 +128,32 @@ function findPropInAttributes(attributes, context, initialScope) {
     );
   };
 }
+
+// src/get-element-type.ts
+function getElementType(context, polymorphicPropName) {
+  return (node) => {
+    const initialScope = context.sourceCode.getScope(node);
+    return tools.F.pipe(
+      tools.O.fromNullable(polymorphicPropName),
+      tools.O.flatMap(findPropInAttributes(node.attributes, context, initialScope)),
+      tools.O.flatMap((attr) => getPropValue(attr, context)),
+      tools.O.flatMapNullable((v) => v?.value),
+      tools.O.filter(R__namespace.isString),
+      tools.O.getOrElse(() => getElementName(node))
+    );
+  };
+}
+var RE_JSX_ANNOTATION_REGEX = /@jsx\s+(\S+)/u;
+var RE_JS_IDENTIFIER_REGEX = /^[$A-Z_a-z][\w$]*$/u;
+function getJSXPragma(context) {
+  const { sourceCode } = context;
+  return tools.F.pipe(
+    tools.O.fromNullable(sourceCode.getAllComments().find((node) => RE_JSX_ANNOTATION_REGEX.test(node.value))),
+    tools.O.map(({ value }) => RE_JSX_ANNOTATION_REGEX.exec(value)),
+    tools.O.flatMapNullable((matches) => matches?.[1]),
+    tools.O.filter((pragma) => RE_JS_IDENTIFIER_REGEX.test(pragma))
+  );
+}
 function hasProp(attributes, propName, context, initialScope) {
   return tools.O.isSome(findPropInAttributes(attributes, context, initialScope)(propName));
 }
@@ -129,16 +164,13 @@ function hasEveryProp(attributes, propNames, context, initialScope) {
   return propNames.every((propName) => hasProp(attributes, propName, context, initialScope));
 }
 function isKeyedElement(node, context) {
-  if (node.type !== ast.NodeType.JSXElement) return false;
-  return hasProp(node.openingElement.attributes, "key", context, context.sourceCode.getScope(node));
+  return node.type === ast.NodeType.JSXElement && hasProp(node.openingElement.attributes, "key", context, context.sourceCode.getScope(node));
 }
 function isUserDefinedElement(node) {
-  if (node.type !== ast.NodeType.JSXElement) return false;
-  return node.openingElement.name.type === ast.NodeType.JSXIdentifier && /^[A-Z]/u.test(node.openingElement.name.name);
+  return node.type === ast.NodeType.JSXElement && node.openingElement.name.type === ast.NodeType.JSXIdentifier && /^[A-Z]/u.test(node.openingElement.name.name);
 }
 function isBuiltInElement(node) {
-  if (node.type !== ast.NodeType.JSXElement) return false;
-  return node.openingElement.name.type === ast.NodeType.JSXIdentifier && node.openingElement.name.name.toLowerCase() === node.openingElement.name.name && /^[a-z]/u.test(node.openingElement.name.name);
+  return node.type === ast.NodeType.JSXElement && node.openingElement.name.type === ast.NodeType.JSXIdentifier && node.openingElement.name.name.toLowerCase() === node.openingElement.name.name && /^[a-z]/u.test(node.openingElement.name.name);
 }
 var JSXValueHint = {
   None: 0n,
@@ -205,7 +237,7 @@ function isJSXValue(node, context, hint = DEFAULT_JSX_VALUE_HINT) {
 }
 var isLiteral = ast.isOneOf([ast.NodeType.Literal, ast.NodeType.JSXText]);
 function isWhiteSpace(node) {
-  return tools.Pred.isString(node.value) && node.value.trim() === "";
+  return R__namespace.isString(node.value) && node.value.trim() === "";
 }
 function isLineBreak(node) {
   return isLiteral(node) && isWhiteSpace(node) && ast.isMultiLine(node);
@@ -222,9 +254,10 @@ function traverseUpProp(node, predicate = tools.F.constTrue) {
 
 exports.DEFAULT_JSX_VALUE_HINT = DEFAULT_JSX_VALUE_HINT;
 exports.JSXValueHint = JSXValueHint;
-exports.elementName = elementName;
 exports.findPropInAttributes = findPropInAttributes;
 exports.findPropInProperties = findPropInProperties;
+exports.getElementName = getElementName;
+exports.getElementType = getElementType;
 exports.getJSXPragma = getJSXPragma;
 exports.getProp = getProp;
 exports.getPropName = getPropName;

package/dist/index.mjs

@@ -1,45 +1,34 @@
-import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import { F, O, Pred } from '@eslint-react/tools';
 import { isOneOf, NodeType, is, isJSXTagNameExpression, isMultiLine, traverseUpGuard } from '@eslint-react/ast';
+import { O, F } from '@eslint-react/tools';
+import * as R from 'remeda';
 import { findVariable, getVariableNode } from '@eslint-react/var';
 import { getStaticValue } from '@typescript-eslint/utils/ast-utils';
 import { match, P } from 'ts-pattern';
 
-// src/element-name.ts
-function resolveMemberExpressions(object, property) {
-  if (object.type === AST_NODE_TYPES.JSXMemberExpression) {
-    return `${resolveMemberExpressions(object.object, object.property)}.${property.name}`;
+// src/get-element-name.ts
+function resolveJSXMemberExpressions(object, property) {
+  if (object.type === NodeType.JSXMemberExpression) {
+    return `${resolveJSXMemberExpressions(object.object, object.property)}.${property.name}`;
   }
-  if (object.type === AST_NODE_TYPES.JSXNamespacedName) {
+  if (object.type === NodeType.JSXNamespacedName) {
     return `${object.namespace.name}:${object.name.name}.${property.name}`;
   }
   return `${object.name}.${property.name}`;
 }
-function elementName(node) {
-  if (node.type === AST_NODE_TYPES.JSXOpeningFragment) {
+function getElementName(node) {
+  if (node.type === NodeType.JSXOpeningFragment) {
     return "<>";
   }
   const { name } = node;
-  if (name.type === AST_NODE_TYPES.JSXMemberExpression) {
+  if (name.type === NodeType.JSXMemberExpression) {
     const { object, property } = name;
-    return resolveMemberExpressions(object, property);
+    return resolveJSXMemberExpressions(object, property);
   }
-  if (name.type === AST_NODE_TYPES.JSXNamespacedName) {
+  if (name.type === NodeType.JSXNamespacedName) {
     return `${name.namespace.name}:${name.name.name}`;
   }
   return name.name;
 }
-var RE_JSX_ANNOTATION_REGEX = /@jsx\s+(\S+)/u;
-var RE_JS_IDENTIFIER_REGEX = /^[$A-Z_a-z][\w$]*$/u;
-function getJSXPragma(context) {
-  const { sourceCode } = context;
-  return F.pipe(
-    O.fromNullable(sourceCode.getAllComments().find((node) => RE_JSX_ANNOTATION_REGEX.test(node.value))),
-    O.map(({ value }) => RE_JSX_ANNOTATION_REGEX.exec(value)),
-    O.flatMapNullable((matches) => matches?.[1]),
-    O.filter((pragma) => RE_JS_IDENTIFIER_REGEX.test(pragma))
-  );
-}
 function getPropName(node) {
   return match(node.name).when(is(NodeType.JSXIdentifier), (n) => n.name).when(is(NodeType.JSXNamespacedName), (n) => `${n.namespace.name}:${n.name.name}`).exhaustive();
 }
@@ -117,6 +106,32 @@ function findPropInAttributes(attributes, context, initialScope) {
     );
   };
 }
+
+// src/get-element-type.ts
+function getElementType(context, polymorphicPropName) {
+  return (node) => {
+    const initialScope = context.sourceCode.getScope(node);
+    return F.pipe(
+      O.fromNullable(polymorphicPropName),
+      O.flatMap(findPropInAttributes(node.attributes, context, initialScope)),
+      O.flatMap((attr) => getPropValue(attr, context)),
+      O.flatMapNullable((v) => v?.value),
+      O.filter(R.isString),
+      O.getOrElse(() => getElementName(node))
+    );
+  };
+}
+var RE_JSX_ANNOTATION_REGEX = /@jsx\s+(\S+)/u;
+var RE_JS_IDENTIFIER_REGEX = /^[$A-Z_a-z][\w$]*$/u;
+function getJSXPragma(context) {
+  const { sourceCode } = context;
+  return F.pipe(
+    O.fromNullable(sourceCode.getAllComments().find((node) => RE_JSX_ANNOTATION_REGEX.test(node.value))),
+    O.map(({ value }) => RE_JSX_ANNOTATION_REGEX.exec(value)),
+    O.flatMapNullable((matches) => matches?.[1]),
+    O.filter((pragma) => RE_JS_IDENTIFIER_REGEX.test(pragma))
+  );
+}
 function hasProp(attributes, propName, context, initialScope) {
   return O.isSome(findPropInAttributes(attributes, context, initialScope)(propName));
 }
@@ -127,16 +142,13 @@ function hasEveryProp(attributes, propNames, context, initialScope) {
   return propNames.every((propName) => hasProp(attributes, propName, context, initialScope));
 }
 function isKeyedElement(node, context) {
-  if (node.type !== NodeType.JSXElement) return false;
-  return hasProp(node.openingElement.attributes, "key", context, context.sourceCode.getScope(node));
+  return node.type === NodeType.JSXElement && hasProp(node.openingElement.attributes, "key", context, context.sourceCode.getScope(node));
 }
 function isUserDefinedElement(node) {
-  if (node.type !== NodeType.JSXElement) return false;
-  return node.openingElement.name.type === NodeType.JSXIdentifier && /^[A-Z]/u.test(node.openingElement.name.name);
+  return node.type === NodeType.JSXElement && node.openingElement.name.type === NodeType.JSXIdentifier && /^[A-Z]/u.test(node.openingElement.name.name);
 }
 function isBuiltInElement(node) {
-  if (node.type !== NodeType.JSXElement) return false;
-  return node.openingElement.name.type === NodeType.JSXIdentifier && node.openingElement.name.name.toLowerCase() === node.openingElement.name.name && /^[a-z]/u.test(node.openingElement.name.name);
+  return node.type === NodeType.JSXElement && node.openingElement.name.type === NodeType.JSXIdentifier && node.openingElement.name.name.toLowerCase() === node.openingElement.name.name && /^[a-z]/u.test(node.openingElement.name.name);
 }
 var JSXValueHint = {
   None: 0n,
@@ -203,7 +215,7 @@ function isJSXValue(node, context, hint = DEFAULT_JSX_VALUE_HINT) {
 }
 var isLiteral = isOneOf([NodeType.Literal, NodeType.JSXText]);
 function isWhiteSpace(node) {
-  return Pred.isString(node.value) && node.value.trim() === "";
+  return R.isString(node.value) && node.value.trim() === "";
 }
 function isLineBreak(node) {
   return isLiteral(node) && isWhiteSpace(node) && isMultiLine(node);
@@ -218,4 +230,4 @@ function traverseUpProp(node, predicate = F.constTrue) {
   return traverseUpGuard(node, guard);
 }
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, elementName, findPropInAttributes, findPropInProperties, getJSXPragma, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp };
+export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getElementType, getJSXPragma, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "1.6.1-next.2",
+  "version": "1.7.0-beta.2",
   "description": "ESLint React's TSESTree AST utility module for static analysis of JSX.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -35,14 +35,15 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "^7.17.0",
-    "@typescript-eslint/types": "^7.17.0",
-    "@typescript-eslint/utils": "^7.17.0",
+    "@typescript-eslint/scope-manager": "^7.18.0",
+    "@typescript-eslint/types": "^7.18.0",
+    "@typescript-eslint/utils": "^7.18.0",
+    "remeda": "^2.6.0",
     "ts-pattern": "^5.2.0",
-    "@eslint-react/var": "1.6.1-next.2",
-    "@eslint-react/ast": "1.6.1-next.2",
-    "@eslint-react/tools": "1.6.1-next.2",
-    "@eslint-react/types": "1.6.1-next.2"
+    "@eslint-react/ast": "1.7.0-beta.2",
+    "@eslint-react/tools": "1.7.0-beta.2",
+    "@eslint-react/types": "1.7.0-beta.2",
+    "@eslint-react/var": "1.7.0-beta.2"
   },
   "devDependencies": {
     "tsup": "8.2.3"