eslint-plugin-react-x 1.22.1-beta.0 → 1.22.1-beta.2

package/dist/index.js

@@ -11,6 +11,7 @@ var compareVersions = require('compare-versions');
 var VAR = require('@eslint-react/var');
 var typeUtils = require('@typescript-eslint/type-utils');
 var utils = require('@typescript-eslint/utils');
+var tsApiUtils = require('ts-api-utils');
 var ts = require('typescript');
 var isImmutableType = require('is-immutable-type');
 
@@ -41,7 +42,7 @@ var ts__default = /*#__PURE__*/_interopDefault(ts);
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.22.1-beta.0";
+var version = "1.22.1-beta.2";
 var createRule = shared.createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -693,10 +694,10 @@ var no_comment_textnodes_default = createRule({
         node
       });
     };
-    const ruleFunction = eff.F.flow(getReportDescriptor, eff.O.map(context.report), eff.F.constVoid);
+    const visitorFunction = eff.F.flow(getReportDescriptor, eff.O.map(context.report), eff.F.constVoid);
     return {
-      JSXText: ruleFunction,
-      Literal: ruleFunction
+      JSXText: visitorFunction,
+      Literal: visitorFunction
     };
   },
   defaultOptions: []
@@ -728,13 +729,13 @@ var no_complex_conditional_rendering_default = createRule({
       if (!jsxExpContainer.parent.children.includes(jsxExpContainer)) return eff.O.none();
       return eff.O.some({ messageId: "noComplexConditionalRendering", node: jsxExpContainer });
     }
-    const ruleFunction = eff.F.flow(getReportDescriptor, eff.O.map(context.report), eff.F.constVoid);
+    const visitorFunction = eff.F.flow(getReportDescriptor, eff.O.map(context.report), eff.F.constVoid);
     return {
-      "JSXExpressionContainer > ConditionalExpression > ConditionalExpression": ruleFunction,
-      "JSXExpressionContainer > ConditionalExpression > LogicalExpression": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression > ConditionalExpression": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression[operator='&&'] > LogicalExpression[operator='||']": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression[operator='||'] > LogicalExpression[operator='&&']": ruleFunction
+      "JSXExpressionContainer > ConditionalExpression > ConditionalExpression": visitorFunction,
+      "JSXExpressionContainer > ConditionalExpression > LogicalExpression": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression > ConditionalExpression": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression[operator='&&'] > LogicalExpression[operator='||']": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression[operator='||'] > LogicalExpression[operator='&&']": visitorFunction
     };
   },
   defaultOptions: []
@@ -1369,58 +1370,34 @@ var no_implicit_key_default = createRule({
   },
   defaultOptions: []
 });
-function isFlagSet(allFlags, flag) {
-  return (allFlags & flag) !== 0;
-}
-function isFlagSetOnObject(obj, flag) {
-  return isFlagSet(obj.flags, flag);
-}
-var isTypeFlagSet = isFlagSetOnObject;
-ts__default.default.versionMajorMinor.split(".").map((raw) => Number.parseInt(raw, 10));
-ts__default.default.TypeFlags.Intrinsic ?? ts__default.default.TypeFlags.Any | ts__default.default.TypeFlags.Unknown | ts__default.default.TypeFlags.String | ts__default.default.TypeFlags.Number | ts__default.default.TypeFlags.BigInt | ts__default.default.TypeFlags.Boolean | ts__default.default.TypeFlags.BooleanLiteral | ts__default.default.TypeFlags.ESSymbol | ts__default.default.TypeFlags.Void | ts__default.default.TypeFlags.Undefined | ts__default.default.TypeFlags.Null | ts__default.default.TypeFlags.Never | ts__default.default.TypeFlags.NonPrimitive;
-function isUnionType(type) {
-  return isTypeFlagSet(type, ts__default.default.TypeFlags.Union);
-}
-function isBooleanLiteralType(type) {
-  return isTypeFlagSet(type, ts__default.default.TypeFlags.BooleanLiteral);
-}
-function isFalseLiteralType(type) {
-  return isBooleanLiteralType(type) && type.intrinsicName === "false";
-}
-function isTrueLiteralType(type) {
-  return isBooleanLiteralType(type) && type.intrinsicName === "true";
-}
-function unionTypeParts(type) {
-  return isUnionType(type) ? type.types : [type];
-}
 var RULE_NAME27 = "no-leaked-conditional-rendering";
 var RULE_FEATURES27 = [
   "CHK",
   "TSC"
 ];
 var tsHelpers = {
-  isAnyType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.TypeParameter | ts__default.default.TypeFlags.Any),
-  isBigIntType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.BigIntLike),
-  isBooleanType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.BooleanLike),
-  isEnumType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.EnumLike),
+  isAnyType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.TypeParameter | ts__default.default.TypeFlags.Any),
+  isBigIntType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.BigIntLike),
+  isBooleanType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.BooleanLike),
+  isEnumType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.EnumLike),
   isFalsyBigIntType: (type) => type.isLiteral() && tsPattern.isMatching({ value: { base10Value: "0" } }, type),
   isFalsyNumberType: (type) => type.isNumberLiteral() && type.value === 0,
   isFalsyStringType: (type) => type.isStringLiteral() && type.value === "",
-  isNeverType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.Never),
-  isNullishType: (type) => isTypeFlagSet(
+  isNeverType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.Never),
+  isNullishType: (type) => tsApiUtils.isTypeFlagSet(
     type,
     ts__default.default.TypeFlags.Null | ts__default.default.TypeFlags.Undefined | ts__default.default.TypeFlags.VoidLike
   ),
-  isNumberType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.NumberLike),
-  isObjectType: (type) => !isTypeFlagSet(
+  isNumberType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.NumberLike),
+  isObjectType: (type) => !tsApiUtils.isTypeFlagSet(
     type,
     ts__default.default.TypeFlags.Null | ts__default.default.TypeFlags.Undefined | ts__default.default.TypeFlags.VoidLike | ts__default.default.TypeFlags.BooleanLike | ts__default.default.TypeFlags.StringLike | ts__default.default.TypeFlags.NumberLike | ts__default.default.TypeFlags.BigIntLike | ts__default.default.TypeFlags.TypeParameter | ts__default.default.TypeFlags.Any | ts__default.default.TypeFlags.Unknown | ts__default.default.TypeFlags.Never
   ),
-  isStringType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.StringLike),
+  isStringType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.StringLike),
   isTruthyBigIntType: (type) => type.isLiteral() && tsPattern.isMatching({ value: { base10Value: tsPattern.P.not("0") } }, type),
   isTruthyNumberType: (type) => type.isNumberLiteral() && type.value !== 0,
   isTruthyStringType: (type) => type.isStringLiteral() && type.value !== "",
-  isUnknownType: (type) => isTypeFlagSet(type, ts__default.default.TypeFlags.Unknown)
+  isUnknownType: (type) => tsApiUtils.isTypeFlagSet(type, ts__default.default.TypeFlags.Unknown)
 };
 function inspectVariantTypes(types) {
   const variantTypes = /* @__PURE__ */ new Set();
@@ -1436,7 +1413,7 @@ function inspectVariantTypes(types) {
     case (booleans.length === 1 && !!booleans[0]): {
       const [first] = booleans;
       const evaluated = eff.F.pipe(
-        tsPattern.match(first).when(isTrueLiteralType, () => eff.O.some("truthy boolean")).when(isFalseLiteralType, () => eff.O.some("falsy boolean")).otherwise(eff.O.none)
+        tsPattern.match(first).when(tsApiUtils.isTrueLiteralType, () => eff.O.some("truthy boolean")).when(tsApiUtils.isFalseLiteralType, () => eff.O.some("falsy boolean")).otherwise(eff.O.none)
       );
       eff.O.map(evaluated, (v) => variantTypes.add(v));
       break;
@@ -1533,7 +1510,7 @@ var no_leaked_conditional_rendering_default = createRule({
           });
         }
         const leftType = typeUtils.getConstrainedTypeAtLocation(services, left);
-        const leftTypeVariants = inspectVariantTypes(unionTypeParts(leftType));
+        const leftTypeVariants = inspectVariantTypes(tsApiUtils.unionTypeParts(leftType));
         const isLeftValid = Array.from(leftTypeVariants.values()).every((type) => allowedVariants.some((allowed) => allowed === type));
         if (isLeftValid) return getReportDescriptor(right);
         return eff.O.some({
@@ -1551,10 +1528,10 @@ var no_leaked_conditional_rendering_default = createRule({
         );
       }).otherwise(eff.O.none);
     }
-    const ruleFunction = eff.F.flow(getReportDescriptor, eff.O.map(context.report), eff.F.constVoid);
+    const visitorFunction = eff.F.flow(getReportDescriptor, eff.O.map(context.report), eff.F.constVoid);
     return {
-      "JSXExpressionContainer > ConditionalExpression": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression": ruleFunction
+      "JSXExpressionContainer > ConditionalExpression": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression": visitorFunction
     };
   },
   defaultOptions: []

package/dist/index.mjs

@@ -9,12 +9,13 @@ import { compare } from 'compare-versions';
 import * as VAR from '@eslint-react/var';
 import { getConstrainedTypeAtLocation, isTypeReadonly } from '@typescript-eslint/type-utils';
 import { ESLintUtils } from '@typescript-eslint/utils';
+import { unionTypeParts, isTrueLiteralType, isFalseLiteralType, isTypeFlagSet } from 'ts-api-utils';
 import ts from 'typescript';
 import { getTypeImmutability, isUnknown, isImmutable, isReadonlyShallow, isReadonlyDeep } from 'is-immutable-type';
 
 // package.json
 var name = "eslint-plugin-react-x";
-var version = "1.22.1-beta.0";
+var version = "1.22.1-beta.2";
 var createRule = createRuleForPlugin("x");
 
 // src/rules/avoid-shorthand-boolean.ts
@@ -666,10 +667,10 @@ var no_comment_textnodes_default = createRule({
         node
       });
     };
-    const ruleFunction = F.flow(getReportDescriptor, O.map(context.report), F.constVoid);
+    const visitorFunction = F.flow(getReportDescriptor, O.map(context.report), F.constVoid);
     return {
-      JSXText: ruleFunction,
-      Literal: ruleFunction
+      JSXText: visitorFunction,
+      Literal: visitorFunction
     };
   },
   defaultOptions: []
@@ -701,13 +702,13 @@ var no_complex_conditional_rendering_default = createRule({
       if (!jsxExpContainer.parent.children.includes(jsxExpContainer)) return O.none();
       return O.some({ messageId: "noComplexConditionalRendering", node: jsxExpContainer });
     }
-    const ruleFunction = F.flow(getReportDescriptor, O.map(context.report), F.constVoid);
+    const visitorFunction = F.flow(getReportDescriptor, O.map(context.report), F.constVoid);
     return {
-      "JSXExpressionContainer > ConditionalExpression > ConditionalExpression": ruleFunction,
-      "JSXExpressionContainer > ConditionalExpression > LogicalExpression": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression > ConditionalExpression": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression[operator='&&'] > LogicalExpression[operator='||']": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression[operator='||'] > LogicalExpression[operator='&&']": ruleFunction
+      "JSXExpressionContainer > ConditionalExpression > ConditionalExpression": visitorFunction,
+      "JSXExpressionContainer > ConditionalExpression > LogicalExpression": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression > ConditionalExpression": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression[operator='&&'] > LogicalExpression[operator='||']": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression[operator='||'] > LogicalExpression[operator='&&']": visitorFunction
     };
   },
   defaultOptions: []
@@ -1342,30 +1343,6 @@ var no_implicit_key_default = createRule({
   },
   defaultOptions: []
 });
-function isFlagSet(allFlags, flag) {
-  return (allFlags & flag) !== 0;
-}
-function isFlagSetOnObject(obj, flag) {
-  return isFlagSet(obj.flags, flag);
-}
-var isTypeFlagSet = isFlagSetOnObject;
-ts.versionMajorMinor.split(".").map((raw) => Number.parseInt(raw, 10));
-ts.TypeFlags.Intrinsic ?? ts.TypeFlags.Any | ts.TypeFlags.Unknown | ts.TypeFlags.String | ts.TypeFlags.Number | ts.TypeFlags.BigInt | ts.TypeFlags.Boolean | ts.TypeFlags.BooleanLiteral | ts.TypeFlags.ESSymbol | ts.TypeFlags.Void | ts.TypeFlags.Undefined | ts.TypeFlags.Null | ts.TypeFlags.Never | ts.TypeFlags.NonPrimitive;
-function isUnionType(type) {
-  return isTypeFlagSet(type, ts.TypeFlags.Union);
-}
-function isBooleanLiteralType(type) {
-  return isTypeFlagSet(type, ts.TypeFlags.BooleanLiteral);
-}
-function isFalseLiteralType(type) {
-  return isBooleanLiteralType(type) && type.intrinsicName === "false";
-}
-function isTrueLiteralType(type) {
-  return isBooleanLiteralType(type) && type.intrinsicName === "true";
-}
-function unionTypeParts(type) {
-  return isUnionType(type) ? type.types : [type];
-}
 var RULE_NAME27 = "no-leaked-conditional-rendering";
 var RULE_FEATURES27 = [
   "CHK",
@@ -1524,10 +1501,10 @@ var no_leaked_conditional_rendering_default = createRule({
         );
       }).otherwise(O.none);
     }
-    const ruleFunction = F.flow(getReportDescriptor, O.map(context.report), F.constVoid);
+    const visitorFunction = F.flow(getReportDescriptor, O.map(context.report), F.constVoid);
     return {
-      "JSXExpressionContainer > ConditionalExpression": ruleFunction,
-      "JSXExpressionContainer > LogicalExpression": ruleFunction
+      "JSXExpressionContainer > ConditionalExpression": visitorFunction,
+      "JSXExpressionContainer > LogicalExpression": visitorFunction
     };
   },
   defaultOptions: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-react-x",
-  "version": "1.22.1-beta.0",
+  "version": "1.22.1-beta.2",
   "description": "A set of composable ESLint rules for libraries and frameworks that use React as a UI runtime.",
   "keywords": [
     "react",
@@ -48,20 +48,20 @@
     "@typescript-eslint/utils": "^8.18.1",
     "compare-versions": "^6.1.1",
     "is-immutable-type": "^5.0.0",
+    "string-ts": "^2.2.0",
+    "ts-api-utils": "^2.0.0",
     "ts-pattern": "^5.6.0",
-    "@eslint-react/ast": "1.22.1-beta.0",
-    "@eslint-react/core": "1.22.1-beta.0",
-    "@eslint-react/eff": "1.22.1-beta.0",
-    "@eslint-react/jsx": "1.22.1-beta.0",
-    "@eslint-react/shared": "1.22.1-beta.0",
-    "@eslint-react/types": "1.22.1-beta.0",
-    "@eslint-react/var": "1.22.1-beta.0"
+    "@eslint-react/ast": "1.22.1-beta.2",
+    "@eslint-react/eff": "1.22.1-beta.2",
+    "@eslint-react/core": "1.22.1-beta.2",
+    "@eslint-react/jsx": "1.22.1-beta.2",
+    "@eslint-react/shared": "1.22.1-beta.2",
+    "@eslint-react/var": "1.22.1-beta.2",
+    "@eslint-react/types": "1.22.1-beta.2"
   },
   "devDependencies": {
     "@types/react": "^19.0.2",
     "@types/react-dom": "^19.0.2",
-    "string-ts": "^2.2.0",
-    "ts-api-utils": "^2.0.0",
     "tsup": "^8.3.5",
     "@workspace/configs": "0.0.0"
   },