@sarj/eslint-plugin 2.3.2 → 2.3.3

package/dist/index.js

@@ -2618,6 +2618,7 @@ import {
   ESLintUtils as ESLintUtils24,
   AST_NODE_TYPES as AST_NODE_TYPES12
 } from "@typescript-eslint/utils";
+import * as ts from "typescript";
 var CHOICE_TOKENS = /* @__PURE__ */ new Set([
   "status",
   "state",
@@ -2676,80 +2677,9 @@ function isStringLiteralUnion(node) {
   }
   return node.types.filter(isStringLiteralMember).length >= MIN_CLUSTER_SIZE;
 }
-function isLikelyClosedUnion(node) {
-  return node?.type === AST_NODE_TYPES12.TSUnionType && node.types.some(isStringLiteralMember);
-}
-function unionMemberNames(typeNode, out) {
-  if (typeNode === void 0) {
-    return;
-  }
-  if (typeNode.type === AST_NODE_TYPES12.TSIntersectionType || typeNode.type === AST_NODE_TYPES12.TSUnionType) {
-    for (const t of typeNode.types) {
-      unionMemberNames(t, out);
-    }
-    return;
-  }
-  if (typeNode.type !== AST_NODE_TYPES12.TSTypeLiteral) {
-    return;
-  }
-  for (const member of typeNode.members) {
-    if (member.type === AST_NODE_TYPES12.TSPropertySignature && isLikelyClosedUnion(member.typeAnnotation?.typeAnnotation)) {
-      const propName2 = keyName(member.key);
-      if (propName2 !== null) {
-        out.add(propName2);
-      }
-    }
-  }
-}
-function bindingName(node) {
-  const id = node.type === AST_NODE_TYPES12.AssignmentPattern ? node.left : node;
-  return id.type === AST_NODE_TYPES12.Identifier ? id.name : null;
-}
-function addUnionRefsFromBinding(param, out) {
-  const binding = param.type === AST_NODE_TYPES12.AssignmentPattern ? param.left : param;
-  if (binding.type === AST_NODE_TYPES12.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 !== AST_NODE_TYPES12.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 !== AST_NODE_TYPES12.Identifier) {
-    return;
-  }
-  const typeNode = binding.typeAnnotation?.typeAnnotation;
-  if (isLikelyClosedUnion(typeNode)) {
-    out.add(binding.name);
-    return;
-  }
-  if (typeNode?.type === AST_NODE_TYPES12.TSTypeLiteral) {
-    for (const member of typeNode.members) {
-      if (member.type === AST_NODE_TYPES12.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 === AST_NODE_TYPES12.Identifier) {
@@ -2792,29 +2722,32 @@ var prefer_string_literal_union_default = ESLintUtils24.RuleCreator(
     if (isIgnoredFile(filename, sourceText)) {
       return {};
     }
+    let services;
+    try {
+      services = ESLintUtils24.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);
         }
       }
@@ -2860,15 +2793,6 @@ var prefer_string_literal_union_default = ESLintUtils24.RuleCreator(
       "FunctionExpression:exit": popScope,
       ArrowFunctionExpression: pushScope,
       "ArrowFunctionExpression:exit": popScope,
-      VariableDeclarator(node) {
-        const scope = scopeStack[scopeStack.length - 1];
-        if (scope === void 0 || node.id.type !== AST_NODE_TYPES12.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;
@@ -2878,14 +2802,18 @@ var prefer_string_literal_union_default = ESLintUtils24.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 = [];
@@ -3124,7 +3052,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "@sarj/eslint-plugin",
-    version: "2.3.2"
+    version: "2.3.3"
   },
   rules,
   configs: {