@eslint-react/jsx 1.17.4-beta.0 → 1.17.4-beta.12

package/dist/index.d.mts

@@ -1,6 +1,6 @@
 import { TSESTree } from '@typescript-eslint/types';
-import { Scope } from '@typescript-eslint/scope-manager';
 import { O } from '@eslint-react/tools';
+import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as birecord from 'birecord';
 
@@ -11,10 +11,6 @@ import * as birecord from 'birecord';
  */
 declare function getElementName(node: TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment): string;
 
-declare function getElementType(jsxCtx: {
-    getScope: (node: TSESTree.Node) => Scope;
-}, components?: Map<string, string>, polymorphicPropName?: string): (node: TSESTree.JSXOpeningElement) => string;
-
 /**
  * Get the name of a JSX attribute with namespace
  * @param node The JSX attribute node
@@ -28,11 +24,7 @@ declare function getProp(props: (TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadA
  * @param initialScope The initial scope to start from
  * @returns  The static value of the given JSX attribute
  */
-declare function getPropValue(attribute: TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute, initialScope: Scope): O.None<{
-    value: unknown;
-} | null> | O.Some<{
-    value: unknown;
-} | null>;
+declare function getPropValue(attribute: TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute, initialScope: Scope): O.None<unknown> | O.Some<unknown>;
 /**
  * @param properties The properties to search in
  * @param initialScope The initial scope to start from
@@ -408,4 +400,4 @@ declare const xhtmlEntities: birecord.BiRecord<{
     readonly zwnj: "‌";
 }>;
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getElementType, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp, unescapeStringLiteralText, xhtmlEntities };
+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 };

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { TSESTree } from '@typescript-eslint/types';
-import { Scope } from '@typescript-eslint/scope-manager';
 import { O } from '@eslint-react/tools';
+import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import * as birecord from 'birecord';
 
@@ -11,10 +11,6 @@ import * as birecord from 'birecord';
  */
 declare function getElementName(node: TSESTree.JSXOpeningElement | TSESTree.JSXOpeningFragment): string;
 
-declare function getElementType(jsxCtx: {
-    getScope: (node: TSESTree.Node) => Scope;
-}, components?: Map<string, string>, polymorphicPropName?: string): (node: TSESTree.JSXOpeningElement) => string;
-
 /**
  * Get the name of a JSX attribute with namespace
  * @param node The JSX attribute node
@@ -28,11 +24,7 @@ declare function getProp(props: (TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadA
  * @param initialScope The initial scope to start from
  * @returns  The static value of the given JSX attribute
  */
-declare function getPropValue(attribute: TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute, initialScope: Scope): O.None<{
-    value: unknown;
-} | null> | O.Some<{
-    value: unknown;
-} | null>;
+declare function getPropValue(attribute: TSESTree$1.JSXAttribute | TSESTree$1.JSXSpreadAttribute, initialScope: Scope): O.None<unknown> | O.Some<unknown>;
 /**
  * @param properties The properties to search in
  * @param initialScope The initial scope to start from
@@ -408,4 +400,4 @@ declare const xhtmlEntities: birecord.BiRecord<{
     readonly zwnj: "‌";
 }>;
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getElementType, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp, unescapeStringLiteralText, xhtmlEntities };
+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 };

package/dist/index.js

@@ -1,10 +1,9 @@
 '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 VAR = require('@eslint-react/var');
-var astUtils = require('@typescript-eslint/utils/ast-utils');
 var tsPattern = require('ts-pattern');
 var birecord = require('birecord');
 
@@ -71,14 +70,14 @@ 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.type === types.AST_NODE_TYPES.Literal) return tools.O.some(astUtils.getStaticValue(value, initialScope));
+    if (value.type === types.AST_NODE_TYPES.Literal) return VAR__namespace.getStaticValue(value, initialScope);
     if (value.type === types.AST_NODE_TYPES.JSXExpressionContainer) {
-      return tools.O.some(astUtils.getStaticValue(value.expression, initialScope));
+      return VAR__namespace.getStaticValue(value.expression, initialScope);
     }
     return tools.O.none();
   }
   const { argument } = attribute;
-  return tools.O.some(astUtils.getStaticValue(argument, initialScope));
+  return VAR__namespace.getStaticValue(argument, initialScope);
 }
 function findPropInProperties(properties, initialScope, seenProps = []) {
   return (propName) => {
@@ -157,25 +156,6 @@ function findPropInAttributes(attributes, initialScope) {
     );
   };
 }
-
-// src/get-element-type.ts
-function getElementType(jsxCtx, components, polymorphicPropName) {
-  return (node) => {
-    const elementName = getElementName(node);
-    if (elementName === elementName.toLowerCase()) return elementName;
-    const asElementName = components?.get(elementName);
-    if (tools.isString(asElementName)) return asElementName;
-    const initialScope = jsxCtx.getScope(node);
-    return tools.F.pipe(
-      tools.O.fromNullable(polymorphicPropName),
-      tools.O.flatMap(findPropInAttributes(node.attributes, initialScope)),
-      tools.O.flatMap((attr) => getPropValue(attr, jsxCtx.getScope(attr))),
-      tools.O.flatMapNullable((v) => v?.value),
-      tools.O.filter(tools.isString),
-      tools.O.getOrElse(() => elementName)
-    );
-  };
-}
 function hasProp(attributes, propName, initialScope) {
   return tools.O.isSome(findPropInAttributes(attributes, initialScope)(propName));
 }
@@ -545,7 +525,6 @@ exports.JSXValueHint = JSXValueHint;
 exports.findPropInAttributes = findPropInAttributes;
 exports.findPropInProperties = findPropInProperties;
 exports.getElementName = getElementName;
-exports.getElementType = getElementType;
 exports.getProp = getProp;
 exports.getPropName = getPropName;
 exports.getPropValue = getPropValue;

package/dist/index.mjs

@@ -1,8 +1,7 @@
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
-import { O, isString, F } from '@eslint-react/tools';
 import * as AST from '@eslint-react/ast';
+import { O, F, isString } from '@eslint-react/tools';
 import * as VAR from '@eslint-react/var';
-import { getStaticValue } from '@typescript-eslint/utils/ast-utils';
 import { match, P } from 'ts-pattern';
 import birecord from 'birecord';
 
@@ -45,14 +44,14 @@ function getPropValue(attribute, initialScope) {
   if (attribute.type === AST_NODE_TYPES.JSXAttribute && "value" in attribute) {
     const { value } = attribute;
     if (value === null) return O.none();
-    if (value.type === AST_NODE_TYPES.Literal) return O.some(getStaticValue(value, initialScope));
+    if (value.type === AST_NODE_TYPES.Literal) return VAR.getStaticValue(value, initialScope);
     if (value.type === AST_NODE_TYPES.JSXExpressionContainer) {
-      return O.some(getStaticValue(value.expression, initialScope));
+      return VAR.getStaticValue(value.expression, initialScope);
     }
     return O.none();
   }
   const { argument } = attribute;
-  return O.some(getStaticValue(argument, initialScope));
+  return VAR.getStaticValue(argument, initialScope);
 }
 function findPropInProperties(properties, initialScope, seenProps = []) {
   return (propName) => {
@@ -131,25 +130,6 @@ function findPropInAttributes(attributes, initialScope) {
     );
   };
 }
-
-// src/get-element-type.ts
-function getElementType(jsxCtx, components, polymorphicPropName) {
-  return (node) => {
-    const elementName = getElementName(node);
-    if (elementName === elementName.toLowerCase()) return elementName;
-    const asElementName = components?.get(elementName);
-    if (isString(asElementName)) return asElementName;
-    const initialScope = jsxCtx.getScope(node);
-    return F.pipe(
-      O.fromNullable(polymorphicPropName),
-      O.flatMap(findPropInAttributes(node.attributes, initialScope)),
-      O.flatMap((attr) => getPropValue(attr, jsxCtx.getScope(attr))),
-      O.flatMapNullable((v) => v?.value),
-      O.filter(isString),
-      O.getOrElse(() => elementName)
-    );
-  };
-}
 function hasProp(attributes, propName, initialScope) {
   return O.isSome(findPropInAttributes(attributes, initialScope)(propName));
 }
@@ -514,4 +494,4 @@ function unescapeStringLiteralText(text) {
   });
 }
 
-export { DEFAULT_JSX_VALUE_HINT, JSXValueHint, findPropInAttributes, findPropInProperties, getElementName, getElementType, getProp, getPropName, getPropValue, hasAnyProp, hasEveryProp, hasProp, isBuiltInElement, isJSXValue, isKeyedElement, isLineBreak, isLiteral, isPaddingSpaces, isUserDefinedElement, isWhiteSpace, traverseUpProp, unescapeStringLiteralText, xhtmlEntities };
+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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "1.17.4-beta.0",
+  "version": "1.17.4-beta.12",
   "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.17.0",
     "birecord": "^0.1.1",
     "ts-pattern": "^5.5.0",
-    "@eslint-react/ast": "1.17.4-beta.0",
-    "@eslint-react/tools": "1.17.4-beta.0",
-    "@eslint-react/types": "1.17.4-beta.0",
-    "@eslint-react/var": "1.17.4-beta.0"
+    "@eslint-react/ast": "1.17.4-beta.12",
+    "@eslint-react/tools": "1.17.4-beta.12",
+    "@eslint-react/var": "1.17.4-beta.12",
+    "@eslint-react/types": "1.17.4-beta.12"
   },
   "devDependencies": {
     "tsup": "^8.3.5"