@eslint-react/jsx 1.5.7 → 1.5.8-beta.1

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
 import { RuleContext } from '@eslint-react/types';
 import { TSESTree } from '@typescript-eslint/types';
 import { TSESTreeFunction } from '@eslint-react/ast';
@@ -5,10 +6,9 @@ import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import { Option } from 'effect';
 
-type _ = (node: TSESTree.Identifier | TSESTree.MemberExpression, context: RuleContext) => boolean;
-declare const isCreateElement: _;
+declare const isCreateElement: (node: TSESTree.Identifier | TSESTree.MemberExpression, context: Readonly<_typescript_eslint_utils_ts_eslint.RuleContext<string, readonly unknown[]>>) => boolean;
 declare const isCreateElementCall: (node: TSESTree.CallExpression, context: RuleContext) => boolean;
-declare const isCloneElement: _;
+declare const isCloneElement: (node: TSESTree.Identifier | TSESTree.MemberExpression, context: Readonly<_typescript_eslint_utils_ts_eslint.RuleContext<string, readonly unknown[]>>) => boolean;
 declare const isCloneElementCall: (node: TSESTree.CallExpression, context: RuleContext) => boolean;
 
 /**

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import * as _typescript_eslint_utils_ts_eslint from '@typescript-eslint/utils/ts-eslint';
 import { RuleContext } from '@eslint-react/types';
 import { TSESTree } from '@typescript-eslint/types';
 import { TSESTreeFunction } from '@eslint-react/ast';
@@ -5,10 +6,9 @@ import { Scope } from '@typescript-eslint/scope-manager';
 import { TSESTree as TSESTree$1 } from '@typescript-eslint/utils';
 import { Option } from 'effect';
 
-type _ = (node: TSESTree.Identifier | TSESTree.MemberExpression, context: RuleContext) => boolean;
-declare const isCreateElement: _;
+declare const isCreateElement: (node: TSESTree.Identifier | TSESTree.MemberExpression, context: Readonly<_typescript_eslint_utils_ts_eslint.RuleContext<string, readonly unknown[]>>) => boolean;
 declare const isCreateElementCall: (node: TSESTree.CallExpression, context: RuleContext) => boolean;
-declare const isCloneElement: _;
+declare const isCloneElement: (node: TSESTree.Identifier | TSESTree.MemberExpression, context: Readonly<_typescript_eslint_utils_ts_eslint.RuleContext<string, readonly unknown[]>>) => boolean;
 declare const isCloneElementCall: (node: TSESTree.CallExpression, context: RuleContext) => boolean;
 
 /**

package/dist/index.js

@@ -1159,60 +1159,60 @@ var getPragmaFromContext = memo__default.default(
   }
 );
 
-// ../../../node_modules/.pnpm/ts-pattern@5.0.8/node_modules/ts-pattern/dist/index.js
+// ../../../node_modules/.pnpm/ts-pattern@5.1.0/node_modules/ts-pattern/dist/index.js
 var t = Symbol.for("@ts-pattern/matcher");
 var e = Symbol.for("@ts-pattern/isVariadic");
 var n = "@ts-pattern/anonymous-select-key";
 var r = (t2) => Boolean(t2 && "object" == typeof t2);
 var i = (e2) => e2 && !!e2[t];
-var s = (n2, o2, c2) => {
+var o = (n2, s2, c2) => {
   if (i(n2)) {
-    const e2 = n2[t](), { matched: r2, selections: i2 } = e2.match(o2);
+    const e2 = n2[t](), { matched: r2, selections: i2 } = e2.match(s2);
     return r2 && i2 && Object.keys(i2).forEach((t2) => c2(t2, i2[t2])), r2;
   }
   if (r(n2)) {
-    if (!r(o2))
+    if (!r(s2))
       return false;
     if (Array.isArray(n2)) {
-      if (!Array.isArray(o2))
+      if (!Array.isArray(s2))
         return false;
       let t2 = [], r2 = [], a2 = [];
-      for (const s2 of n2.keys()) {
-        const o3 = n2[s2];
-        i(o3) && o3[e] ? a2.push(o3) : a2.length ? r2.push(o3) : t2.push(o3);
+      for (const o2 of n2.keys()) {
+        const s3 = n2[o2];
+        i(s3) && s3[e] ? a2.push(s3) : a2.length ? r2.push(s3) : t2.push(s3);
       }
       if (a2.length) {
         if (a2.length > 1)
           throw new Error("Pattern error: Using `...P.array(...)` several times in a single pattern is not allowed.");
-        if (o2.length < t2.length + r2.length)
+        if (s2.length < t2.length + r2.length)
           return false;
-        const e2 = o2.slice(0, t2.length), n3 = 0 === r2.length ? [] : o2.slice(-r2.length), i2 = o2.slice(t2.length, 0 === r2.length ? Infinity : -r2.length);
-        return t2.every((t3, n4) => s(t3, e2[n4], c2)) && r2.every((t3, e3) => s(t3, n3[e3], c2)) && (0 === a2.length || s(a2[0], i2, c2));
+        const e2 = s2.slice(0, t2.length), n3 = 0 === r2.length ? [] : s2.slice(-r2.length), i2 = s2.slice(t2.length, 0 === r2.length ? Infinity : -r2.length);
+        return t2.every((t3, n4) => o(t3, e2[n4], c2)) && r2.every((t3, e3) => o(t3, n3[e3], c2)) && (0 === a2.length || o(a2[0], i2, c2));
       }
-      return n2.length === o2.length && n2.every((t3, e2) => s(t3, o2[e2], c2));
+      return n2.length === s2.length && n2.every((t3, e2) => o(t3, s2[e2], c2));
     }
     return Object.keys(n2).every((e2) => {
       const r2 = n2[e2];
-      return (e2 in o2 || i(a2 = r2) && "optional" === a2[t]().matcherType) && s(r2, o2[e2], c2);
+      return (e2 in s2 || i(a2 = r2) && "optional" === a2[t]().matcherType) && o(r2, s2[e2], c2);
       var a2;
     });
   }
-  return Object.is(o2, n2);
+  return Object.is(s2, n2);
 };
-var o = (e2) => {
-  var n2, s2, a2;
-  return r(e2) ? i(e2) ? null != (n2 = null == (s2 = (a2 = e2[t]()).getSelectionKeys) ? void 0 : s2.call(a2)) ? n2 : [] : Array.isArray(e2) ? c(e2, o) : c(Object.values(e2), o) : [];
+var s = (e2) => {
+  var n2, o2, a2;
+  return r(e2) ? i(e2) ? null != (n2 = null == (o2 = (a2 = e2[t]()).getSelectionKeys) ? void 0 : o2.call(a2)) ? n2 : [] : Array.isArray(e2) ? c(e2, s) : c(Object.values(e2), s) : [];
 };
 var c = (t2, e2) => t2.reduce((t3, n2) => t3.concat(e2(n2)), []);
 function a(...t2) {
   if (1 === t2.length) {
     const [e2] = t2;
-    return (t3) => s(e2, t3, () => {
+    return (t3) => o(e2, t3, () => {
     });
   }
   if (2 === t2.length) {
     const [e2, n2] = t2;
-    return s(e2, n2, () => {
+    return o(e2, n2, () => {
     });
   }
   throw new Error(`isMatching wasn't given the right number of arguments: expected 1 or 2, received ${t2.length}.`);
@@ -1236,8 +1236,8 @@ function l(e2) {
     const r2 = (t3, e3) => {
       n2[t3] = e3;
     };
-    return void 0 === t2 ? (o(e2).forEach((t3) => r2(t3, void 0)), { matched: true, selections: n2 }) : { matched: s(e2, t2, r2), selections: n2 };
-  }, getSelectionKeys: () => o(e2), matcherType: "optional" }) });
+    return void 0 === t2 ? (s(e2).forEach((t3) => r2(t3, void 0)), { matched: true, selections: n2 }) : { matched: o(e2, t2, r2), selections: n2 };
+  }, getSelectionKeys: () => s(e2), matcherType: "optional" }) });
 }
 var f = (t2, e2) => {
   for (const n2 of t2)
@@ -1257,8 +1257,8 @@ function m(...e2) {
     const r2 = (t3, e3) => {
       n2[t3] = e3;
     };
-    return { matched: e2.every((e3) => s(e3, t2, r2)), selections: n2 };
-  }, getSelectionKeys: () => c(e2, o), matcherType: "and" }) });
+    return { matched: e2.every((e3) => o(e3, t2, r2)), selections: n2 };
+  }, getSelectionKeys: () => c(e2, s), matcherType: "and" }) });
 }
 function d(...e2) {
   return u({ [t]: () => ({ match: (t2) => {
@@ -1266,8 +1266,8 @@ function d(...e2) {
     const r2 = (t3, e3) => {
       n2[t3] = e3;
     };
-    return c(e2, o).forEach((t3) => r2(t3, void 0)), { matched: e2.some((e3) => s(e3, t2, r2)), selections: n2 };
-  }, getSelectionKeys: () => c(e2, o), matcherType: "or" }) });
+    return c(e2, s).forEach((t3) => r2(t3, void 0)), { matched: e2.some((e3) => o(e3, t2, r2)), selections: n2 };
+  }, getSelectionKeys: () => c(e2, s), matcherType: "or" }) });
 }
 function y(e2) {
   return { [t]: () => ({ match: (t2) => ({ matched: Boolean(e2(t2)) }) }) };
@@ -1276,10 +1276,10 @@ function p(...e2) {
   const r2 = "string" == typeof e2[0] ? e2[0] : void 0, i2 = 2 === e2.length ? e2[1] : "string" == typeof e2[0] ? void 0 : e2[0];
   return u({ [t]: () => ({ match: (t2) => {
     let e3 = { [null != r2 ? r2 : n]: t2 };
-    return { matched: void 0 === i2 || s(i2, t2, (t3, n2) => {
+    return { matched: void 0 === i2 || o(i2, t2, (t3, n2) => {
       e3[t3] = n2;
     }), selections: e3 };
-  }, getSelectionKeys: () => [null != r2 ? r2 : n].concat(void 0 === i2 ? [] : o(i2)) }) });
+  }, getSelectionKeys: () => [null != r2 ? r2 : n].concat(void 0 === i2 ? [] : s(i2)) }) });
 }
 function v(t2) {
   return "number" == typeof t2;
@@ -1321,7 +1321,10 @@ var k = u(y(function(t2) {
 var B = u(y(function(t2) {
   return null == t2;
 }));
-var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
+var _ = u(y(function(t2) {
+  return null != t2;
+}));
+var N = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
   return h({ [t]: () => ({ match: (t2) => {
     if (!Array.isArray(t2))
       return { matched: false };
@@ -1330,14 +1333,14 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
     const n2 = e2[0];
     let r2 = {};
     if (0 === t2.length)
-      return o(n2).forEach((t3) => {
+      return s(n2).forEach((t3) => {
         r2[t3] = [];
       }), { matched: true, selections: r2 };
     const i2 = (t3, e3) => {
       r2[t3] = (r2[t3] || []).concat([e3]);
     };
-    return { matched: t2.every((t3) => s(n2, t3, i2)), selections: r2 };
-  }, getSelectionKeys: () => 0 === e2.length ? [] : o(e2[0]) }) });
+    return { matched: t2.every((t3) => o(n2, t3, i2)), selections: r2 };
+  }, getSelectionKeys: () => 0 === e2.length ? [] : s(e2[0]) }) });
 }, set: function(...e2) {
   return u({ [t]: () => ({ match: (t2) => {
     if (!(t2 instanceof Set))
@@ -1350,8 +1353,8 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
     const r2 = (t3, e3) => {
       n2[t3] = (n2[t3] || []).concat([e3]);
     }, i2 = e2[0];
-    return { matched: f(t2, (t3) => s(i2, t3, r2)), selections: n2 };
-  }, getSelectionKeys: () => 0 === e2.length ? [] : o(e2[0]) }) });
+    return { matched: f(t2, (t3) => o(i2, t3, r2)), selections: n2 };
+  }, getSelectionKeys: () => 0 === e2.length ? [] : s(e2[0]) }) });
 }, map: function(...e2) {
   return u({ [t]: () => ({ match: (t2) => {
     if (!(t2 instanceof Map))
@@ -1367,16 +1370,16 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
     var i2;
     if (1 === e2.length)
       throw new Error(`\`P.map\` wasn't given enough arguments. Expected (key, value), received ${null == (i2 = e2[0]) ? void 0 : i2.toString()}`);
-    const [o2, c2] = e2;
+    const [s2, c2] = e2;
     return { matched: g(t2, (t3, e3) => {
-      const n3 = s(o2, e3, r2), i3 = s(c2, t3, r2);
+      const n3 = o(s2, e3, r2), i3 = o(c2, t3, r2);
       return n3 && i3;
     }), selections: n2 };
-  }, getSelectionKeys: () => 0 === e2.length ? [] : [...o(e2[0]), ...o(e2[1])] }) });
+  }, getSelectionKeys: () => 0 === e2.length ? [] : [...s(e2[0]), ...s(e2[1])] }) });
 }, intersection: m, union: d, not: function(e2) {
-  return u({ [t]: () => ({ match: (t2) => ({ matched: !s(e2, t2, () => {
+  return u({ [t]: () => ({ match: (t2) => ({ matched: !o(e2, t2, () => {
   }) }), getSelectionKeys: () => [], matcherType: "not" }) });
-}, when: y, select: p, any: S, _: O, string: E, number: x, bigint: P, boolean: T, symbol: k, nullish: B, instanceOf: function(t2) {
+}, when: y, select: p, any: S, _: O, string: E, number: x, bigint: P, boolean: T, symbol: k, nullish: B, nonNullable: _, instanceOf: function(t2) {
   return u(y(/* @__PURE__ */ function(t3) {
     return (e2) => e2 instanceof t3;
   }(t2)));
@@ -1384,10 +1387,10 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
   return u(y(a(t2)));
 } };
 var W = { matched: false, value: void 0 };
-function N(t2) {
-  return new $(t2, W);
+function $(t2) {
+  return new z(t2, W);
 }
-var $ = class _$ {
+var z = class _z {
   constructor(t2, e2) {
     this.input = void 0, this.state = void 0, this.input = t2, this.state = e2;
   }
@@ -1397,17 +1400,17 @@ var $ = class _$ {
     const e2 = t2[t2.length - 1], r2 = [t2[0]];
     let i2;
     3 === t2.length && "function" == typeof t2[1] ? i2 = t2[1] : t2.length > 2 && r2.push(...t2.slice(1, t2.length - 1));
-    let o2 = false, c2 = {};
+    let s2 = false, c2 = {};
     const a2 = (t3, e3) => {
-      o2 = true, c2[t3] = e3;
-    }, u2 = !r2.some((t3) => s(t3, this.input, a2)) || i2 && !Boolean(i2(this.input)) ? W : { matched: true, value: e2(o2 ? n in c2 ? c2[n] : c2 : this.input, this.input) };
-    return new _$(this.input, u2);
+      s2 = true, c2[t3] = e3;
+    }, u2 = !r2.some((t3) => o(t3, this.input, a2)) || i2 && !Boolean(i2(this.input)) ? W : { matched: true, value: e2(s2 ? n in c2 ? c2[n] : c2 : this.input, this.input) };
+    return new _z(this.input, u2);
   }
   when(t2, e2) {
     if (this.state.matched)
       return this;
     const n2 = Boolean(t2(this.input));
-    return new _$(this.input, n2 ? { matched: true, value: e2(this.input, this.input) } : W);
+    return new _z(this.input, n2 ? { matched: true, value: e2(this.input, this.input) } : W);
   }
   otherwise(t2) {
     return this.state.matched ? this.state.value : t2(this.input);
@@ -1445,7 +1448,7 @@ function isInitializedFromPragma(variableName, context, initialScope, pragma = g
       return true;
     if (a({ type: "Identifier", name: pragma }, init))
       return true;
-    const maybeRequireExpression = N(init).with({
+    const maybeRequireExpression = $(init).with({
       type: ast.NodeType.CallExpression,
       callee: { type: ast.NodeType.Identifier, name: "require" }
     }, (exp) => Option_exports.some(exp)).with(
@@ -1618,8 +1621,8 @@ var DEFAULT_JSX_VALUE_HINT = JSXValueHint.SkipUndefinedLiteral | JSXValueHint.Sk
 function isJSXValue(node, context, hint = DEFAULT_JSX_VALUE_HINT) {
   if (!node)
     return false;
-  return N(node).with({ type: ast.NodeType.JSXElement }, Function_exports.constTrue).with({ type: ast.NodeType.JSXFragment }, Function_exports.constTrue).with({ type: ast.NodeType.JSXMemberExpression }, Function_exports.constTrue).with({ type: ast.NodeType.JSXNamespacedName }, Function_exports.constTrue).with({ type: ast.NodeType.Literal }, (node2) => {
-    return N(node2.value).with(null, () => !(hint & JSXValueHint.SkipNullLiteral)).with(_.boolean, () => !(hint & JSXValueHint.SkipBooleanLiteral)).with(_.string, () => !(hint & JSXValueHint.SkipStringLiteral)).with(_.number, () => !(hint & JSXValueHint.SkipNumberLiteral)).otherwise(Function_exports.constFalse);
+  return $(node).with({ type: ast.NodeType.JSXElement }, Function_exports.constTrue).with({ type: ast.NodeType.JSXFragment }, Function_exports.constTrue).with({ type: ast.NodeType.JSXMemberExpression }, Function_exports.constTrue).with({ type: ast.NodeType.JSXNamespacedName }, Function_exports.constTrue).with({ type: ast.NodeType.Literal }, (node2) => {
+    return $(node2.value).with(null, () => !(hint & JSXValueHint.SkipNullLiteral)).with(N.boolean, () => !(hint & JSXValueHint.SkipBooleanLiteral)).with(N.string, () => !(hint & JSXValueHint.SkipStringLiteral)).with(N.number, () => !(hint & JSXValueHint.SkipNumberLiteral)).otherwise(Function_exports.constFalse);
   }).with({ type: ast.NodeType.TemplateLiteral }, () => !(hint & JSXValueHint.SkipStringLiteral)).with({ type: ast.NodeType.ArrayExpression }, (node2) => {
     if (hint & JSXValueHint.StrictArray)
       return node2.elements.every((n2) => isJSXValue(n2, context, hint));
@@ -1676,7 +1679,7 @@ function isFunctionReturningJSXValue(node, context, hint = DEFAULT_JSX_VALUE_HIN
 }
 var { getStaticValue } = ast.ESLintCommunityESLintUtils;
 function getPropName(node) {
-  return N(node.name).when(ast.is(ast.NodeType.JSXIdentifier), (n2) => n2.name).when(ast.is(ast.NodeType.JSXNamespacedName), (n2) => `${n2.namespace.name}:${n2.name.name}`).exhaustive();
+  return $(node.name).when(ast.is(ast.NodeType.JSXIdentifier), (n2) => n2.name).when(ast.is(ast.NodeType.JSXNamespacedName), (n2) => `${n2.namespace.name}:${n2.name.name}`).exhaustive();
 }
 function getProp(props, propName, context, initialScope) {
   return findPropInAttributes(props, context, initialScope)(propName);
@@ -1700,10 +1703,10 @@ function findPropInProperties(properties, context, initialScope, seenProps = [])
   return (propName) => {
     return Option_exports.fromNullable(
       properties.find((prop) => {
-        return N(prop).when(ast.is(ast.NodeType.Property), (prop2) => {
+        return $(prop).when(ast.is(ast.NodeType.Property), (prop2) => {
           return "name" in prop2.key && prop2.key.name === propName;
         }).when(ast.is(ast.NodeType.SpreadElement), (prop2) => {
-          return N(prop2.argument).when(ast.is(ast.NodeType.Identifier), (argument) => {
+          return $(prop2.argument).when(ast.is(ast.NodeType.Identifier), (argument) => {
             const { name } = argument;
             const maybeInit = Option_exports.flatMap(
               _var.findVariable(name, initialScope),
@@ -1735,8 +1738,8 @@ function findPropInAttributes(attributes, context, initialScope) {
   return (propName) => {
     return Option_exports.fromNullable(
       attributes.find((attr) => {
-        return N(attr).when(ast.is(ast.NodeType.JSXAttribute), (attr2) => getPropName(attr2) === propName).when(ast.is(ast.NodeType.JSXSpreadAttribute), (attr2) => {
-          return N(attr2.argument).with({ type: ast.NodeType.Identifier }, (argument) => {
+        return $(attr).when(ast.is(ast.NodeType.JSXAttribute), (attr2) => getPropName(attr2) === propName).when(ast.is(ast.NodeType.JSXSpreadAttribute), (attr2) => {
+          return $(attr2.argument).with({ type: ast.NodeType.Identifier }, (argument) => {
             const { name } = argument;
             const maybeInit = Option_exports.flatMap(
               _var.findVariable(name, initialScope),

package/dist/index.mjs

@@ -1153,60 +1153,60 @@ var getPragmaFromContext = memo(
   }
 );
 
-// ../../../node_modules/.pnpm/ts-pattern@5.0.8/node_modules/ts-pattern/dist/index.js
+// ../../../node_modules/.pnpm/ts-pattern@5.1.0/node_modules/ts-pattern/dist/index.js
 var t = Symbol.for("@ts-pattern/matcher");
 var e = Symbol.for("@ts-pattern/isVariadic");
 var n = "@ts-pattern/anonymous-select-key";
 var r = (t2) => Boolean(t2 && "object" == typeof t2);
 var i = (e2) => e2 && !!e2[t];
-var s = (n2, o2, c2) => {
+var o = (n2, s2, c2) => {
   if (i(n2)) {
-    const e2 = n2[t](), { matched: r2, selections: i2 } = e2.match(o2);
+    const e2 = n2[t](), { matched: r2, selections: i2 } = e2.match(s2);
     return r2 && i2 && Object.keys(i2).forEach((t2) => c2(t2, i2[t2])), r2;
   }
   if (r(n2)) {
-    if (!r(o2))
+    if (!r(s2))
       return false;
     if (Array.isArray(n2)) {
-      if (!Array.isArray(o2))
+      if (!Array.isArray(s2))
         return false;
       let t2 = [], r2 = [], a2 = [];
-      for (const s2 of n2.keys()) {
-        const o3 = n2[s2];
-        i(o3) && o3[e] ? a2.push(o3) : a2.length ? r2.push(o3) : t2.push(o3);
+      for (const o2 of n2.keys()) {
+        const s3 = n2[o2];
+        i(s3) && s3[e] ? a2.push(s3) : a2.length ? r2.push(s3) : t2.push(s3);
       }
       if (a2.length) {
         if (a2.length > 1)
           throw new Error("Pattern error: Using `...P.array(...)` several times in a single pattern is not allowed.");
-        if (o2.length < t2.length + r2.length)
+        if (s2.length < t2.length + r2.length)
           return false;
-        const e2 = o2.slice(0, t2.length), n3 = 0 === r2.length ? [] : o2.slice(-r2.length), i2 = o2.slice(t2.length, 0 === r2.length ? Infinity : -r2.length);
-        return t2.every((t3, n4) => s(t3, e2[n4], c2)) && r2.every((t3, e3) => s(t3, n3[e3], c2)) && (0 === a2.length || s(a2[0], i2, c2));
+        const e2 = s2.slice(0, t2.length), n3 = 0 === r2.length ? [] : s2.slice(-r2.length), i2 = s2.slice(t2.length, 0 === r2.length ? Infinity : -r2.length);
+        return t2.every((t3, n4) => o(t3, e2[n4], c2)) && r2.every((t3, e3) => o(t3, n3[e3], c2)) && (0 === a2.length || o(a2[0], i2, c2));
       }
-      return n2.length === o2.length && n2.every((t3, e2) => s(t3, o2[e2], c2));
+      return n2.length === s2.length && n2.every((t3, e2) => o(t3, s2[e2], c2));
     }
     return Object.keys(n2).every((e2) => {
       const r2 = n2[e2];
-      return (e2 in o2 || i(a2 = r2) && "optional" === a2[t]().matcherType) && s(r2, o2[e2], c2);
+      return (e2 in s2 || i(a2 = r2) && "optional" === a2[t]().matcherType) && o(r2, s2[e2], c2);
       var a2;
     });
   }
-  return Object.is(o2, n2);
+  return Object.is(s2, n2);
 };
-var o = (e2) => {
-  var n2, s2, a2;
-  return r(e2) ? i(e2) ? null != (n2 = null == (s2 = (a2 = e2[t]()).getSelectionKeys) ? void 0 : s2.call(a2)) ? n2 : [] : Array.isArray(e2) ? c(e2, o) : c(Object.values(e2), o) : [];
+var s = (e2) => {
+  var n2, o2, a2;
+  return r(e2) ? i(e2) ? null != (n2 = null == (o2 = (a2 = e2[t]()).getSelectionKeys) ? void 0 : o2.call(a2)) ? n2 : [] : Array.isArray(e2) ? c(e2, s) : c(Object.values(e2), s) : [];
 };
 var c = (t2, e2) => t2.reduce((t3, n2) => t3.concat(e2(n2)), []);
 function a(...t2) {
   if (1 === t2.length) {
     const [e2] = t2;
-    return (t3) => s(e2, t3, () => {
+    return (t3) => o(e2, t3, () => {
     });
   }
   if (2 === t2.length) {
     const [e2, n2] = t2;
-    return s(e2, n2, () => {
+    return o(e2, n2, () => {
     });
   }
   throw new Error(`isMatching wasn't given the right number of arguments: expected 1 or 2, received ${t2.length}.`);
@@ -1230,8 +1230,8 @@ function l(e2) {
     const r2 = (t3, e3) => {
       n2[t3] = e3;
     };
-    return void 0 === t2 ? (o(e2).forEach((t3) => r2(t3, void 0)), { matched: true, selections: n2 }) : { matched: s(e2, t2, r2), selections: n2 };
-  }, getSelectionKeys: () => o(e2), matcherType: "optional" }) });
+    return void 0 === t2 ? (s(e2).forEach((t3) => r2(t3, void 0)), { matched: true, selections: n2 }) : { matched: o(e2, t2, r2), selections: n2 };
+  }, getSelectionKeys: () => s(e2), matcherType: "optional" }) });
 }
 var f = (t2, e2) => {
   for (const n2 of t2)
@@ -1251,8 +1251,8 @@ function m(...e2) {
     const r2 = (t3, e3) => {
       n2[t3] = e3;
     };
-    return { matched: e2.every((e3) => s(e3, t2, r2)), selections: n2 };
-  }, getSelectionKeys: () => c(e2, o), matcherType: "and" }) });
+    return { matched: e2.every((e3) => o(e3, t2, r2)), selections: n2 };
+  }, getSelectionKeys: () => c(e2, s), matcherType: "and" }) });
 }
 function d(...e2) {
   return u({ [t]: () => ({ match: (t2) => {
@@ -1260,8 +1260,8 @@ function d(...e2) {
     const r2 = (t3, e3) => {
       n2[t3] = e3;
     };
-    return c(e2, o).forEach((t3) => r2(t3, void 0)), { matched: e2.some((e3) => s(e3, t2, r2)), selections: n2 };
-  }, getSelectionKeys: () => c(e2, o), matcherType: "or" }) });
+    return c(e2, s).forEach((t3) => r2(t3, void 0)), { matched: e2.some((e3) => o(e3, t2, r2)), selections: n2 };
+  }, getSelectionKeys: () => c(e2, s), matcherType: "or" }) });
 }
 function y(e2) {
   return { [t]: () => ({ match: (t2) => ({ matched: Boolean(e2(t2)) }) }) };
@@ -1270,10 +1270,10 @@ function p(...e2) {
   const r2 = "string" == typeof e2[0] ? e2[0] : void 0, i2 = 2 === e2.length ? e2[1] : "string" == typeof e2[0] ? void 0 : e2[0];
   return u({ [t]: () => ({ match: (t2) => {
     let e3 = { [null != r2 ? r2 : n]: t2 };
-    return { matched: void 0 === i2 || s(i2, t2, (t3, n2) => {
+    return { matched: void 0 === i2 || o(i2, t2, (t3, n2) => {
       e3[t3] = n2;
     }), selections: e3 };
-  }, getSelectionKeys: () => [null != r2 ? r2 : n].concat(void 0 === i2 ? [] : o(i2)) }) });
+  }, getSelectionKeys: () => [null != r2 ? r2 : n].concat(void 0 === i2 ? [] : s(i2)) }) });
 }
 function v(t2) {
   return "number" == typeof t2;
@@ -1315,7 +1315,10 @@ var k = u(y(function(t2) {
 var B = u(y(function(t2) {
   return null == t2;
 }));
-var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
+var _ = u(y(function(t2) {
+  return null != t2;
+}));
+var N = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
   return h({ [t]: () => ({ match: (t2) => {
     if (!Array.isArray(t2))
       return { matched: false };
@@ -1324,14 +1327,14 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
     const n2 = e2[0];
     let r2 = {};
     if (0 === t2.length)
-      return o(n2).forEach((t3) => {
+      return s(n2).forEach((t3) => {
         r2[t3] = [];
       }), { matched: true, selections: r2 };
     const i2 = (t3, e3) => {
       r2[t3] = (r2[t3] || []).concat([e3]);
     };
-    return { matched: t2.every((t3) => s(n2, t3, i2)), selections: r2 };
-  }, getSelectionKeys: () => 0 === e2.length ? [] : o(e2[0]) }) });
+    return { matched: t2.every((t3) => o(n2, t3, i2)), selections: r2 };
+  }, getSelectionKeys: () => 0 === e2.length ? [] : s(e2[0]) }) });
 }, set: function(...e2) {
   return u({ [t]: () => ({ match: (t2) => {
     if (!(t2 instanceof Set))
@@ -1344,8 +1347,8 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
     const r2 = (t3, e3) => {
       n2[t3] = (n2[t3] || []).concat([e3]);
     }, i2 = e2[0];
-    return { matched: f(t2, (t3) => s(i2, t3, r2)), selections: n2 };
-  }, getSelectionKeys: () => 0 === e2.length ? [] : o(e2[0]) }) });
+    return { matched: f(t2, (t3) => o(i2, t3, r2)), selections: n2 };
+  }, getSelectionKeys: () => 0 === e2.length ? [] : s(e2[0]) }) });
 }, map: function(...e2) {
   return u({ [t]: () => ({ match: (t2) => {
     if (!(t2 instanceof Map))
@@ -1361,16 +1364,16 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
     var i2;
     if (1 === e2.length)
       throw new Error(`\`P.map\` wasn't given enough arguments. Expected (key, value), received ${null == (i2 = e2[0]) ? void 0 : i2.toString()}`);
-    const [o2, c2] = e2;
+    const [s2, c2] = e2;
     return { matched: g(t2, (t3, e3) => {
-      const n3 = s(o2, e3, r2), i3 = s(c2, t3, r2);
+      const n3 = o(s2, e3, r2), i3 = o(c2, t3, r2);
       return n3 && i3;
     }), selections: n2 };
-  }, getSelectionKeys: () => 0 === e2.length ? [] : [...o(e2[0]), ...o(e2[1])] }) });
+  }, getSelectionKeys: () => 0 === e2.length ? [] : [...s(e2[0]), ...s(e2[1])] }) });
 }, intersection: m, union: d, not: function(e2) {
-  return u({ [t]: () => ({ match: (t2) => ({ matched: !s(e2, t2, () => {
+  return u({ [t]: () => ({ match: (t2) => ({ matched: !o(e2, t2, () => {
   }) }), getSelectionKeys: () => [], matcherType: "not" }) });
-}, when: y, select: p, any: S, _: O, string: E, number: x, bigint: P, boolean: T, symbol: k, nullish: B, instanceOf: function(t2) {
+}, when: y, select: p, any: S, _: O, string: E, number: x, bigint: P, boolean: T, symbol: k, nullish: B, nonNullable: _, instanceOf: function(t2) {
   return u(y(/* @__PURE__ */ function(t3) {
     return (e2) => e2 instanceof t3;
   }(t2)));
@@ -1378,10 +1381,10 @@ var _ = { __proto__: null, matcher: t, optional: l, array: function(...e2) {
   return u(y(a(t2)));
 } };
 var W = { matched: false, value: void 0 };
-function N(t2) {
-  return new $(t2, W);
+function $(t2) {
+  return new z(t2, W);
 }
-var $ = class _$ {
+var z = class _z {
   constructor(t2, e2) {
     this.input = void 0, this.state = void 0, this.input = t2, this.state = e2;
   }
@@ -1391,17 +1394,17 @@ var $ = class _$ {
     const e2 = t2[t2.length - 1], r2 = [t2[0]];
     let i2;
     3 === t2.length && "function" == typeof t2[1] ? i2 = t2[1] : t2.length > 2 && r2.push(...t2.slice(1, t2.length - 1));
-    let o2 = false, c2 = {};
+    let s2 = false, c2 = {};
     const a2 = (t3, e3) => {
-      o2 = true, c2[t3] = e3;
-    }, u2 = !r2.some((t3) => s(t3, this.input, a2)) || i2 && !Boolean(i2(this.input)) ? W : { matched: true, value: e2(o2 ? n in c2 ? c2[n] : c2 : this.input, this.input) };
-    return new _$(this.input, u2);
+      s2 = true, c2[t3] = e3;
+    }, u2 = !r2.some((t3) => o(t3, this.input, a2)) || i2 && !Boolean(i2(this.input)) ? W : { matched: true, value: e2(s2 ? n in c2 ? c2[n] : c2 : this.input, this.input) };
+    return new _z(this.input, u2);
   }
   when(t2, e2) {
     if (this.state.matched)
       return this;
     const n2 = Boolean(t2(this.input));
-    return new _$(this.input, n2 ? { matched: true, value: e2(this.input, this.input) } : W);
+    return new _z(this.input, n2 ? { matched: true, value: e2(this.input, this.input) } : W);
   }
   otherwise(t2) {
     return this.state.matched ? this.state.value : t2(this.input);
@@ -1439,7 +1442,7 @@ function isInitializedFromPragma(variableName, context, initialScope, pragma = g
       return true;
     if (a({ type: "Identifier", name: pragma }, init))
       return true;
-    const maybeRequireExpression = N(init).with({
+    const maybeRequireExpression = $(init).with({
       type: NodeType.CallExpression,
       callee: { type: NodeType.Identifier, name: "require" }
     }, (exp) => Option_exports.some(exp)).with(
@@ -1612,8 +1615,8 @@ var DEFAULT_JSX_VALUE_HINT = JSXValueHint.SkipUndefinedLiteral | JSXValueHint.Sk
 function isJSXValue(node, context, hint = DEFAULT_JSX_VALUE_HINT) {
   if (!node)
     return false;
-  return N(node).with({ type: NodeType.JSXElement }, Function_exports.constTrue).with({ type: NodeType.JSXFragment }, Function_exports.constTrue).with({ type: NodeType.JSXMemberExpression }, Function_exports.constTrue).with({ type: NodeType.JSXNamespacedName }, Function_exports.constTrue).with({ type: NodeType.Literal }, (node2) => {
-    return N(node2.value).with(null, () => !(hint & JSXValueHint.SkipNullLiteral)).with(_.boolean, () => !(hint & JSXValueHint.SkipBooleanLiteral)).with(_.string, () => !(hint & JSXValueHint.SkipStringLiteral)).with(_.number, () => !(hint & JSXValueHint.SkipNumberLiteral)).otherwise(Function_exports.constFalse);
+  return $(node).with({ type: NodeType.JSXElement }, Function_exports.constTrue).with({ type: NodeType.JSXFragment }, Function_exports.constTrue).with({ type: NodeType.JSXMemberExpression }, Function_exports.constTrue).with({ type: NodeType.JSXNamespacedName }, Function_exports.constTrue).with({ type: NodeType.Literal }, (node2) => {
+    return $(node2.value).with(null, () => !(hint & JSXValueHint.SkipNullLiteral)).with(N.boolean, () => !(hint & JSXValueHint.SkipBooleanLiteral)).with(N.string, () => !(hint & JSXValueHint.SkipStringLiteral)).with(N.number, () => !(hint & JSXValueHint.SkipNumberLiteral)).otherwise(Function_exports.constFalse);
   }).with({ type: NodeType.TemplateLiteral }, () => !(hint & JSXValueHint.SkipStringLiteral)).with({ type: NodeType.ArrayExpression }, (node2) => {
     if (hint & JSXValueHint.StrictArray)
       return node2.elements.every((n2) => isJSXValue(n2, context, hint));
@@ -1670,7 +1673,7 @@ function isFunctionReturningJSXValue(node, context, hint = DEFAULT_JSX_VALUE_HIN
 }
 var { getStaticValue } = ESLintCommunityESLintUtils;
 function getPropName(node) {
-  return N(node.name).when(is(NodeType.JSXIdentifier), (n2) => n2.name).when(is(NodeType.JSXNamespacedName), (n2) => `${n2.namespace.name}:${n2.name.name}`).exhaustive();
+  return $(node.name).when(is(NodeType.JSXIdentifier), (n2) => n2.name).when(is(NodeType.JSXNamespacedName), (n2) => `${n2.namespace.name}:${n2.name.name}`).exhaustive();
 }
 function getProp(props, propName, context, initialScope) {
   return findPropInAttributes(props, context, initialScope)(propName);
@@ -1694,10 +1697,10 @@ function findPropInProperties(properties, context, initialScope, seenProps = [])
   return (propName) => {
     return Option_exports.fromNullable(
       properties.find((prop) => {
-        return N(prop).when(is(NodeType.Property), (prop2) => {
+        return $(prop).when(is(NodeType.Property), (prop2) => {
           return "name" in prop2.key && prop2.key.name === propName;
         }).when(is(NodeType.SpreadElement), (prop2) => {
-          return N(prop2.argument).when(is(NodeType.Identifier), (argument) => {
+          return $(prop2.argument).when(is(NodeType.Identifier), (argument) => {
             const { name } = argument;
             const maybeInit = Option_exports.flatMap(
               findVariable(name, initialScope),
@@ -1729,8 +1732,8 @@ function findPropInAttributes(attributes, context, initialScope) {
   return (propName) => {
     return Option_exports.fromNullable(
       attributes.find((attr) => {
-        return N(attr).when(is(NodeType.JSXAttribute), (attr2) => getPropName(attr2) === propName).when(is(NodeType.JSXSpreadAttribute), (attr2) => {
-          return N(attr2.argument).with({ type: NodeType.Identifier }, (argument) => {
+        return $(attr).when(is(NodeType.JSXAttribute), (attr2) => getPropName(attr2) === propName).when(is(NodeType.JSXSpreadAttribute), (attr2) => {
+          return $(attr2.argument).with({ type: NodeType.Identifier }, (argument) => {
             const { name } = argument;
             const maybeInit = Option_exports.flatMap(
               findVariable(name, initialScope),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-react/jsx",
-  "version": "1.5.7",
+  "version": "1.5.8-beta.1",
   "description": "ESLint React's TSESTree AST utility module for static analysis of JSX.",
   "homepage": "https://github.com/rel1cx/eslint-react",
   "bugs": {
@@ -35,15 +35,15 @@
     "./package.json"
   ],
   "dependencies": {
-    "@typescript-eslint/scope-manager": "7.4.0",
-    "@typescript-eslint/types": "7.4.0",
-    "@typescript-eslint/utils": "7.4.0",
+    "@typescript-eslint/scope-manager": "7.5.0",
+    "@typescript-eslint/types": "7.5.0",
+    "@typescript-eslint/utils": "7.5.0",
     "micro-memoize": "4.1.2",
-    "@eslint-react/ast": "1.5.7",
-    "@eslint-react/tools": "1.5.7",
-    "@eslint-react/shared": "1.5.7",
-    "@eslint-react/types": "1.5.7",
-    "@eslint-react/var": "1.5.7"
+    "@eslint-react/tools": "1.5.8-beta.1",
+    "@eslint-react/var": "1.5.8-beta.1",
+    "@eslint-react/ast": "1.5.8-beta.1",
+    "@eslint-react/shared": "1.5.8-beta.1",
+    "@eslint-react/types": "1.5.8-beta.1"
   },
   "devDependencies": {
     "effect": "2.4.15"