eslint-plugin-react-x 1.17.0 → 1.17.1-next.0

package/dist/index.js

@@ -11,6 +11,7 @@ var VAR = require('@eslint-react/var');
 var typeUtils = require('@typescript-eslint/type-utils');
 var utils = require('@typescript-eslint/utils');
 var astUtils = require('@typescript-eslint/utils/ast-utils');
+var compareVersions = require('compare-versions');
 var ts25 = require('typescript');
 var isImmutableType = require('is-immutable-type');
 
@@ -41,7 +42,7 @@ var ts25__default = /*#__PURE__*/_interopDefault(ts25);
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.17.0";
+var version = "1.17.1-next.0";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1704,21 +1705,21 @@ var require_prerelease = __commonJS({
 var require_compare = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/compare.js"(exports, module) {
     var SemVer = require_semver();
-    var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
-    module.exports = compare;
+    var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
+    module.exports = compare2;
   }
 });
 var require_rcompare = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/rcompare.js"(exports, module) {
-    var compare = require_compare();
-    var rcompare = (a, b, loose) => compare(b, a, loose);
+    var compare2 = require_compare();
+    var rcompare = (a, b, loose) => compare2(b, a, loose);
     module.exports = rcompare;
   }
 });
 var require_compare_loose = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/compare-loose.js"(exports, module) {
-    var compare = require_compare();
-    var compareLoose = (a, b) => compare(a, b, true);
+    var compare2 = require_compare();
+    var compareLoose = (a, b) => compare2(a, b, true);
     module.exports = compareLoose;
   }
 });
@@ -1749,43 +1750,43 @@ var require_rsort = __commonJS({
 });
 var require_gt = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/gt.js"(exports, module) {
-    var compare = require_compare();
-    var gt = (a, b, loose) => compare(a, b, loose) > 0;
+    var compare2 = require_compare();
+    var gt = (a, b, loose) => compare2(a, b, loose) > 0;
     module.exports = gt;
   }
 });
 var require_lt = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/lt.js"(exports, module) {
-    var compare = require_compare();
-    var lt = (a, b, loose) => compare(a, b, loose) < 0;
+    var compare2 = require_compare();
+    var lt = (a, b, loose) => compare2(a, b, loose) < 0;
     module.exports = lt;
   }
 });
 var require_eq = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/eq.js"(exports, module) {
-    var compare = require_compare();
-    var eq = (a, b, loose) => compare(a, b, loose) === 0;
+    var compare2 = require_compare();
+    var eq = (a, b, loose) => compare2(a, b, loose) === 0;
     module.exports = eq;
   }
 });
 var require_neq = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/neq.js"(exports, module) {
-    var compare = require_compare();
-    var neq = (a, b, loose) => compare(a, b, loose) !== 0;
+    var compare2 = require_compare();
+    var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
     module.exports = neq;
   }
 });
 var require_gte = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/gte.js"(exports, module) {
-    var compare = require_compare();
-    var gte = (a, b, loose) => compare(a, b, loose) >= 0;
+    var compare2 = require_compare();
+    var gte = (a, b, loose) => compare2(a, b, loose) >= 0;
     module.exports = gte;
   }
 });
 var require_lte = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/lte.js"(exports, module) {
-    var compare = require_compare();
-    var lte = (a, b, loose) => compare(a, b, loose) <= 0;
+    var compare2 = require_compare();
+    var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
     module.exports = lte;
   }
 });
@@ -2613,12 +2614,12 @@ var require_intersects = __commonJS({
 var require_simplify = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/ranges/simplify.js"(exports, module) {
     var satisfies = require_satisfies();
-    var compare = require_compare();
+    var compare2 = require_compare();
     module.exports = (versions, range, options) => {
       const set = [];
       let first = null;
       let prev = null;
-      const v = versions.sort((a, b) => compare(a, b, options));
+      const v = versions.sort((a, b) => compare2(a, b, options));
       for (const version2 of v) {
         const included = satisfies(version2, range, options);
         if (included) {
@@ -2663,7 +2664,7 @@ var require_subset = __commonJS({
     var Comparator = require_comparator();
     var { ANY } = Comparator;
     var satisfies = require_satisfies();
-    var compare = require_compare();
+    var compare2 = require_compare();
     var subset = (sub, dom, options = {}) => {
       if (sub === dom) {
         return true;
@@ -2724,7 +2725,7 @@ var require_subset = __commonJS({
       }
       let gtltComp;
       if (gt && lt) {
-        gtltComp = compare(gt.semver, lt.semver, options);
+        gtltComp = compare2(gt.semver, lt.semver, options);
         if (gtltComp > 0) {
           return null;
         } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
@@ -2804,14 +2805,14 @@ var require_subset = __commonJS({
       if (!a) {
         return b;
       }
-      const comp = compare(a.semver, b.semver, options);
+      const comp = compare2(a.semver, b.semver, options);
       return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
     };
     var lowerLT = (a, b, options) => {
       if (!a) {
         return b;
       }
-      const comp = compare(a.semver, b.semver, options);
+      const comp = compare2(a.semver, b.semver, options);
       return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
     };
     module.exports = subset;
@@ -2832,7 +2833,7 @@ var require_semver2 = __commonJS({
     var minor = require_minor();
     var patch = require_patch();
     var prerelease = require_prerelease();
-    var compare = require_compare();
+    var compare2 = require_compare();
     var rcompare = require_rcompare();
     var compareLoose = require_compare_loose();
     var compareBuild = require_compare_build();
@@ -2870,7 +2871,7 @@ var require_semver2 = __commonJS({
       minor,
       patch,
       prerelease,
-      compare,
+      compare: compare2,
       rcompare,
       compareLoose,
       compareBuild,
@@ -2935,18 +2936,6 @@ function unionTypeParts(type) {
   return isUnionType(type) ? type.types : [type];
 }
 var RULE_NAME26 = "no-leaked-conditional-rendering";
-var allowedVariants = [
-  "any",
-  "boolean",
-  "nullish",
-  "object",
-  "string",
-  "falsy boolean",
-  "truthy bigint",
-  "truthy boolean",
-  "truthy number",
-  "truthy string"
-];
 var tsHelpers = {
   isAnyType: (type) => isTypeFlagSet(type, ts25__default.default.TypeFlags.TypeParameter | ts25__default.default.TypeFlags.Any),
   isBigIntType: (type) => isTypeFlagSet(type, ts25__default.default.TypeFlags.BigIntLike),
@@ -3053,6 +3042,19 @@ var no_leaked_conditional_rendering_default = createRule({
   name: RULE_NAME26,
   create(context) {
     if (!context.sourceCode.text.includes("&&") && !context.sourceCode.text.includes("?")) return {};
+    const { version: version2 } = shared.normalizeSettings(shared.decodeSettings(context.settings));
+    const allowedVariants = [
+      "any",
+      "boolean",
+      "nullish",
+      "object",
+      "falsy boolean",
+      "truthy bigint",
+      "truthy boolean",
+      "truthy number",
+      "truthy string",
+      ...compareVersions.compare(version2, "18.0.0", "<") ? [] : ["string", "falsy string"]
+    ];
     const services = utils.ESLintUtils.getParserServices(context, false);
     function getReportDescriptor(node) {
       return tsPattern.match(node).when(AST11__namespace.isJSX, tools.O.none).with({ type: types.AST_NODE_TYPES.LogicalExpression, operator: "&&" }, ({ left, right }) => {

package/dist/index.mjs

@@ -1,6 +1,6 @@
 import * as JSX7 from '@eslint-react/jsx';
 import { F, O, isString, MutRef, isNullable } from '@eslint-react/tools';
-import { createRuleForPlugin, decodeSettings, unsafeReadSettings } from '@eslint-react/shared';
+import { createRuleForPlugin, normalizeSettings, decodeSettings, unsafeReadSettings } from '@eslint-react/shared';
 import * as AST11 from '@eslint-react/ast';
 import { isForwardRefCall, isThisSetState, isClassComponent, isChildrenCount, isChildrenForEach, isChildrenMap, isChildrenOnly, isChildrenToArray, useComponentCollectorLegacy, isCloneElementCall, isCreateRefCall, isComponentName, isChildrenToArrayCall, useComponentCollector, ERFunctionComponentFlag, ERComponentHint, isDirectValueOfRenderPropertyLoose, isDeclaredInRenderPropLoose, isInsideCreateElementProps, isInsideRenderMethod, ERClassComponentFlag, isFragmentElement, isCreateElementCall, isInitializedFromReact } from '@eslint-react/core';
 import { AST_NODE_TYPES } from '@typescript-eslint/types';
@@ -9,12 +9,13 @@ import * as VAR from '@eslint-react/var';
 import { getConstrainedTypeAtLocation, isTypeReadonly } from '@typescript-eslint/type-utils';
 import { ESLintUtils } from '@typescript-eslint/utils';
 import { getStaticValue } from '@typescript-eslint/utils/ast-utils';
+import { compare } from 'compare-versions';
 import ts25 from 'typescript';
 import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReadonlyDeep } from 'is-immutable-type';
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.17.0";
+var version = "1.17.1-next.0";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -1677,21 +1678,21 @@ var require_prerelease = __commonJS({
 var require_compare = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/compare.js"(exports, module) {
     var SemVer = require_semver();
-    var compare = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
-    module.exports = compare;
+    var compare2 = (a, b, loose) => new SemVer(a, loose).compare(new SemVer(b, loose));
+    module.exports = compare2;
   }
 });
 var require_rcompare = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/rcompare.js"(exports, module) {
-    var compare = require_compare();
-    var rcompare = (a, b, loose) => compare(b, a, loose);
+    var compare2 = require_compare();
+    var rcompare = (a, b, loose) => compare2(b, a, loose);
     module.exports = rcompare;
   }
 });
 var require_compare_loose = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/compare-loose.js"(exports, module) {
-    var compare = require_compare();
-    var compareLoose = (a, b) => compare(a, b, true);
+    var compare2 = require_compare();
+    var compareLoose = (a, b) => compare2(a, b, true);
     module.exports = compareLoose;
   }
 });
@@ -1722,43 +1723,43 @@ var require_rsort = __commonJS({
 });
 var require_gt = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/gt.js"(exports, module) {
-    var compare = require_compare();
-    var gt = (a, b, loose) => compare(a, b, loose) > 0;
+    var compare2 = require_compare();
+    var gt = (a, b, loose) => compare2(a, b, loose) > 0;
     module.exports = gt;
   }
 });
 var require_lt = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/lt.js"(exports, module) {
-    var compare = require_compare();
-    var lt = (a, b, loose) => compare(a, b, loose) < 0;
+    var compare2 = require_compare();
+    var lt = (a, b, loose) => compare2(a, b, loose) < 0;
     module.exports = lt;
   }
 });
 var require_eq = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/eq.js"(exports, module) {
-    var compare = require_compare();
-    var eq = (a, b, loose) => compare(a, b, loose) === 0;
+    var compare2 = require_compare();
+    var eq = (a, b, loose) => compare2(a, b, loose) === 0;
     module.exports = eq;
   }
 });
 var require_neq = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/neq.js"(exports, module) {
-    var compare = require_compare();
-    var neq = (a, b, loose) => compare(a, b, loose) !== 0;
+    var compare2 = require_compare();
+    var neq = (a, b, loose) => compare2(a, b, loose) !== 0;
     module.exports = neq;
   }
 });
 var require_gte = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/gte.js"(exports, module) {
-    var compare = require_compare();
-    var gte = (a, b, loose) => compare(a, b, loose) >= 0;
+    var compare2 = require_compare();
+    var gte = (a, b, loose) => compare2(a, b, loose) >= 0;
     module.exports = gte;
   }
 });
 var require_lte = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/functions/lte.js"(exports, module) {
-    var compare = require_compare();
-    var lte = (a, b, loose) => compare(a, b, loose) <= 0;
+    var compare2 = require_compare();
+    var lte = (a, b, loose) => compare2(a, b, loose) <= 0;
     module.exports = lte;
   }
 });
@@ -2586,12 +2587,12 @@ var require_intersects = __commonJS({
 var require_simplify = __commonJS({
   "node_modules/.pnpm/semver@7.6.2/node_modules/semver/ranges/simplify.js"(exports, module) {
     var satisfies = require_satisfies();
-    var compare = require_compare();
+    var compare2 = require_compare();
     module.exports = (versions, range, options) => {
       const set = [];
       let first = null;
       let prev = null;
-      const v = versions.sort((a, b) => compare(a, b, options));
+      const v = versions.sort((a, b) => compare2(a, b, options));
       for (const version2 of v) {
         const included = satisfies(version2, range, options);
         if (included) {
@@ -2636,7 +2637,7 @@ var require_subset = __commonJS({
     var Comparator = require_comparator();
     var { ANY } = Comparator;
     var satisfies = require_satisfies();
-    var compare = require_compare();
+    var compare2 = require_compare();
     var subset = (sub, dom, options = {}) => {
       if (sub === dom) {
         return true;
@@ -2697,7 +2698,7 @@ var require_subset = __commonJS({
       }
       let gtltComp;
       if (gt && lt) {
-        gtltComp = compare(gt.semver, lt.semver, options);
+        gtltComp = compare2(gt.semver, lt.semver, options);
         if (gtltComp > 0) {
           return null;
         } else if (gtltComp === 0 && (gt.operator !== ">=" || lt.operator !== "<=")) {
@@ -2777,14 +2778,14 @@ var require_subset = __commonJS({
       if (!a) {
         return b;
       }
-      const comp = compare(a.semver, b.semver, options);
+      const comp = compare2(a.semver, b.semver, options);
       return comp > 0 ? a : comp < 0 ? b : b.operator === ">" && a.operator === ">=" ? b : a;
     };
     var lowerLT = (a, b, options) => {
       if (!a) {
         return b;
       }
-      const comp = compare(a.semver, b.semver, options);
+      const comp = compare2(a.semver, b.semver, options);
       return comp < 0 ? a : comp > 0 ? b : b.operator === "<" && a.operator === "<=" ? b : a;
     };
     module.exports = subset;
@@ -2805,7 +2806,7 @@ var require_semver2 = __commonJS({
     var minor = require_minor();
     var patch = require_patch();
     var prerelease = require_prerelease();
-    var compare = require_compare();
+    var compare2 = require_compare();
     var rcompare = require_rcompare();
     var compareLoose = require_compare_loose();
     var compareBuild = require_compare_build();
@@ -2843,7 +2844,7 @@ var require_semver2 = __commonJS({
       minor,
       patch,
       prerelease,
-      compare,
+      compare: compare2,
       rcompare,
       compareLoose,
       compareBuild,
@@ -2908,18 +2909,6 @@ function unionTypeParts(type) {
   return isUnionType(type) ? type.types : [type];
 }
 var RULE_NAME26 = "no-leaked-conditional-rendering";
-var allowedVariants = [
-  "any",
-  "boolean",
-  "nullish",
-  "object",
-  "string",
-  "falsy boolean",
-  "truthy bigint",
-  "truthy boolean",
-  "truthy number",
-  "truthy string"
-];
 var tsHelpers = {
   isAnyType: (type) => isTypeFlagSet(type, ts25.TypeFlags.TypeParameter | ts25.TypeFlags.Any),
   isBigIntType: (type) => isTypeFlagSet(type, ts25.TypeFlags.BigIntLike),
@@ -3026,6 +3015,19 @@ var no_leaked_conditional_rendering_default = createRule({
   name: RULE_NAME26,
   create(context) {
     if (!context.sourceCode.text.includes("&&") && !context.sourceCode.text.includes("?")) return {};
+    const { version: version2 } = normalizeSettings(decodeSettings(context.settings));
+    const allowedVariants = [
+      "any",
+      "boolean",
+      "nullish",
+      "object",
+      "falsy boolean",
+      "truthy bigint",
+      "truthy boolean",
+      "truthy number",
+      "truthy string",
+      ...compare(version2, "18.0.0", "<") ? [] : ["string", "falsy string"]
+    ];
     const services = ESLintUtils.getParserServices(context, false);
     function getReportDescriptor(node) {
       return match(node).when(AST11.isJSX, O.none).with({ type: AST_NODE_TYPES.LogicalExpression, operator: "&&" }, ({ left, right }) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.17.0",
+  "version": "1.17.1-next.0",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "eslint",
@@ -46,15 +46,16 @@
     "@typescript-eslint/type-utils": "^8.15.0",
     "@typescript-eslint/types": "^8.15.0",
     "@typescript-eslint/utils": "^8.15.0",
+    "compare-versions": "^6.1.1",
     "is-immutable-type": "5.0.0",
     "ts-pattern": "^5.5.0",
-    "@eslint-react/ast": "1.17.0",
-    "@eslint-react/core": "1.17.0",
-    "@eslint-react/jsx": "1.17.0",
-    "@eslint-react/shared": "1.17.0",
-    "@eslint-react/types": "1.17.0",
-    "@eslint-react/tools": "1.17.0",
-    "@eslint-react/var": "1.17.0"
+    "@eslint-react/ast": "1.17.1-next.0",
+    "@eslint-react/core": "1.17.1-next.0",
+    "@eslint-react/jsx": "1.17.1-next.0",
+    "@eslint-react/shared": "1.17.1-next.0",
+    "@eslint-react/tools": "1.17.1-next.0",
+    "@eslint-react/types": "1.17.1-next.0",
+    "@eslint-react/var": "1.17.1-next.0"
   },
   "devDependencies": {
     "@types/react": "^18.3.12",