@eslint-react/jsx 1.17.4-beta.2 → 1.17.4-beta.7

package/dist/index.d.mts

@@ -28,11 +28,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

package/dist/index.d.ts

@@ -28,11 +28,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

package/dist/index.js

@@ -4,7 +4,6 @@ var types = require('@typescript-eslint/types');
 var tools = require('@eslint-react/tools');
 var AST = require('@eslint-react/ast');
 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) => {
@@ -170,7 +169,6 @@ function getElementType(jsxCtx, components, polymorphicPropName) {
       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)
     );

package/dist/index.mjs

@@ -2,7 +2,6 @@ import { AST_NODE_TYPES } from '@typescript-eslint/types';
 import { O, isString, F } from '@eslint-react/tools';
 import * as AST from '@eslint-react/ast';
 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) => {
@@ -144,7 +143,6 @@ function getElementType(jsxCtx, components, polymorphicPropName) {
       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)
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "1.17.4-beta.2",
+  "version": "1.17.4-beta.7",
   "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.2",
-    "@eslint-react/tools": "1.17.4-beta.2",
-    "@eslint-react/var": "1.17.4-beta.2",
-    "@eslint-react/types": "1.17.4-beta.2"
+    "@eslint-react/ast": "1.17.4-beta.7",
+    "@eslint-react/types": "1.17.4-beta.7",
+    "@eslint-react/var": "1.17.4-beta.7",
+    "@eslint-react/tools": "1.17.4-beta.7"
   },
   "devDependencies": {
     "tsup": "^8.3.5"