@sarj/eslint-plugin 2.3.2 → 2.3.3

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -2627,6 +2637,7 @@ var no_secret_in_log_default = import_utils24.ESLintUtils.RuleCreator(
 
 // src/rules/prefer-string-literal-union.ts
 var import_utils25 = require("@typescript-eslint/utils");
+var ts = __toESM(require("typescript"), 1);
 var CHOICE_TOKENS = /* @__PURE__ */ new Set([
   "status",
   "state",
@@ -2685,80 +2696,9 @@ function isStringLiteralUnion(node) {
   }
   return node.types.filter(isStringLiteralMember).length >= MIN_CLUSTER_SIZE;
 }
-function isLikelyClosedUnion(node) {
-  return node?.type === import_utils25.AST_NODE_TYPES.TSUnionType && node.types.some(isStringLiteralMember);
-}
-function unionMemberNames(typeNode, out) {
-  if (typeNode === void 0) {
-    return;
-  }
-  if (typeNode.type === import_utils25.AST_NODE_TYPES.TSIntersectionType || typeNode.type === import_utils25.AST_NODE_TYPES.TSUnionType) {
-    for (const t of typeNode.types) {
-      unionMemberNames(t, out);
-    }
-    return;
-  }
-  if (typeNode.type !== import_utils25.AST_NODE_TYPES.TSTypeLiteral) {
-    return;
-  }
-  for (const member of typeNode.members) {
-    if (member.type === import_utils25.AST_NODE_TYPES.TSPropertySignature && isLikelyClosedUnion(member.typeAnnotation?.typeAnnotation)) {
-      const propName2 = keyName(member.key);
-      if (propName2 !== null) {
-        out.add(propName2);
-      }
-    }
-  }
-}
-function bindingName(node) {
-  const id = node.type === import_utils25.AST_NODE_TYPES.AssignmentPattern ? node.left : node;
-  return id.type === import_utils25.AST_NODE_TYPES.Identifier ? id.name : null;
-}
-function addUnionRefsFromBinding(param, out) {
-  const binding = param.type === import_utils25.AST_NODE_TYPES.AssignmentPattern ? param.left : param;
-  if (binding.type === import_utils25.AST_NODE_TYPES.ObjectPattern) {
-    const members = /* @__PURE__ */ new Set();
-    unionMemberNames(binding.typeAnnotation?.typeAnnotation, members);
-    if (members.size === 0) {
-      return;
-    }
-    for (const prop of binding.properties) {
-      if (prop.type !== import_utils25.AST_NODE_TYPES.Property) {
-        continue;
-      }
-      const propKey = keyName(prop.key);
-      const local = bindingName(prop.value);
-      if (propKey !== null && local !== null && members.has(propKey)) {
-        out.add(local);
-      }
-    }
-    return;
-  }
-  if (binding.type !== import_utils25.AST_NODE_TYPES.Identifier) {
-    return;
-  }
-  const typeNode = binding.typeAnnotation?.typeAnnotation;
-  if (isLikelyClosedUnion(typeNode)) {
-    out.add(binding.name);
-    return;
-  }
-  if (typeNode?.type === import_utils25.AST_NODE_TYPES.TSTypeLiteral) {
-    for (const member of typeNode.members) {
-      if (member.type === import_utils25.AST_NODE_TYPES.TSPropertySignature && isLikelyClosedUnion(member.typeAnnotation?.typeAnnotation)) {
-        const propName2 = keyName(member.key);
-        if (propName2 !== null) {
-          out.add(`${binding.name}.${propName2}`);
-        }
-      }
-    }
-  }
-}
-function unionRefsFromParams(fn) {
-  const out = /* @__PURE__ */ new Set();
-  for (const param of fn.params) {
-    addUnionRefsFromBinding(param, out);
-  }
-  return out;
+function typeHasRawString(type) {
+  const parts = type.isUnion() ? type.types : [type];
+  return parts.some((t) => (t.flags & ts.TypeFlags.String) !== 0);
 }
 function refKey(node) {
   if (node.type === import_utils25.AST_NODE_TYPES.Identifier) {
@@ -2801,29 +2741,32 @@ var prefer_string_literal_union_default = import_utils25.ESLintUtils.RuleCreator
     if (isIgnoredFile(filename, sourceText)) {
       return {};
     }
+    let services;
+    try {
+      services = import_utils25.ESLintUtils.getParserServices(context);
+    } catch {
+      services = null;
+    }
     const scopeStack = [];
     const validClusters = [];
     const bareChoiceProps = [];
     const containersWithUnion = /* @__PURE__ */ new Set();
-    function pushScope(fn) {
-      scopeStack.push({
-        clusters: /* @__PURE__ */ new Map(),
-        unionRefs: unionRefsFromParams(fn)
-      });
-    }
-    function isUnionTypedRef(key, current) {
-      if (current.has(key)) {
-        return true;
+    function operandIsRawString(node) {
+      if (services === null) {
+        return false;
       }
-      return scopeStack.some((s) => s.unionRefs.has(key));
+      return typeHasRawString(services.getTypeAtLocation(node));
+    }
+    function pushScope() {
+      scopeStack.push({ clusters: /* @__PURE__ */ new Map() });
     }
     function popScope() {
       const scope = scopeStack.pop();
       if (scope === void 0) {
         return;
       }
-      for (const [key, entry] of scope.clusters) {
-        if (entry.allTokens && entry.literals.size >= MIN_CLUSTER_SIZE && !isUnionTypedRef(key, scope.unionRefs)) {
+      for (const entry of scope.clusters.values()) {
+        if (entry.allTokens && entry.literals.size >= MIN_CLUSTER_SIZE) {
           validClusters.push(entry.node);
         }
       }
@@ -2869,15 +2812,6 @@ var prefer_string_literal_union_default = import_utils25.ESLintUtils.RuleCreator
       "FunctionExpression:exit": popScope,
       ArrowFunctionExpression: pushScope,
       "ArrowFunctionExpression:exit": popScope,
-      VariableDeclarator(node) {
-        const scope = scopeStack[scopeStack.length - 1];
-        if (scope === void 0 || node.id.type !== import_utils25.AST_NODE_TYPES.Identifier) {
-          return;
-        }
-        if (isLikelyClosedUnion(node.id.typeAnnotation?.typeAnnotation)) {
-          scope.unionRefs.add(node.id.name);
-        }
-      },
       BinaryExpression(node) {
         if (node.operator !== "===" && node.operator !== "!==" && node.operator !== "==" && node.operator !== "!=") {
           return;
@@ -2887,14 +2821,18 @@ var prefer_string_literal_union_default = import_utils25.ESLintUtils.RuleCreator
         const rightKey = refKey(node.right);
         const leftLit = strLiteral(node.left);
         if (leftKey !== null && rightLit !== null) {
-          accumulate(leftKey, [rightLit], node);
+          if (operandIsRawString(node.left)) {
+            accumulate(leftKey, [rightLit], node);
+          }
         } else if (rightKey !== null && leftLit !== null) {
-          accumulate(rightKey, [leftLit], node);
+          if (operandIsRawString(node.right)) {
+            accumulate(rightKey, [leftLit], node);
+          }
         }
       },
       SwitchStatement(node) {
         const key = refKey(node.discriminant);
-        if (key === null) {
+        if (key === null || !operandIsRawString(node.discriminant)) {
           return;
         }
         const literals = [];
@@ -3133,7 +3071,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "@sarj/eslint-plugin",
-    version: "2.3.2"
+    version: "2.3.3"
   },
   rules,
   configs: {