@sarj/eslint-plugin 2.3.1 → 2.3.2

package/dist/index.cjs

@@ -2235,7 +2235,15 @@ var PURE_CONSTRUCTORS = /* @__PURE__ */ new Set([
   "Object",
   "Headers",
   "URLSearchParams",
-  "FormData"
+  "FormData",
+  "TextEncoder",
+  "TextDecoder",
+  "Blob",
+  "ReadableStream",
+  "WritableStream",
+  "TransformStream",
+  "Response",
+  "AbortController"
 ]);
 function isNode3(value) {
   return typeof value === "object" && value !== null && typeof value.type === "string";
@@ -2425,7 +2433,49 @@ var INNOCUOUS_WORDS = /* @__PURE__ */ new Set([
   "invalid",
   "exists",
   "type",
-  "types"
+  "types",
+  "name",
+  "names",
+  "label",
+  "labels",
+  "title",
+  "expiry",
+  "expiration",
+  "expires",
+  "ttl",
+  "version",
+  "versions",
+  "policy",
+  "rotation",
+  "arn",
+  "path",
+  "paths",
+  "issuer",
+  "audience",
+  "strength",
+  "manager",
+  "service",
+  "services",
+  "repository",
+  "provider",
+  "providers",
+  "store",
+  "factory",
+  "handler",
+  "controller",
+  "bucket",
+  "url",
+  "uri",
+  "endpoint",
+  "endpoints",
+  "scope",
+  "scopes",
+  "event",
+  "events",
+  "format",
+  "at",
+  "len",
+  "length"
 ]);
 var REDACTION_RE = /prefix|suffix|redact|mask|hash|hint|_len|length/i;
 var WHOLE_TOKEN_REDACTION_MARKERS = /* @__PURE__ */ new Set(["tag"]);
@@ -2500,6 +2550,12 @@ function isLoggerExpr(expr) {
       return false;
   }
 }
+function isRawSecretValue(prop) {
+  if (prop.shorthand) {
+    return true;
+  }
+  return prop.value.type === "Identifier" || prop.value.type === "MemberExpression";
+}
 function propertyKeyName2(prop) {
   if (prop.computed) {
     return null;
@@ -2554,7 +2610,7 @@ var no_secret_in_log_default = import_utils24.ESLintUtils.RuleCreator(
                 continue;
               }
               const keyName2 = propertyKeyName2(prop);
-              if (keyName2 !== null && isSecretKeyword(keyName2)) {
+              if (keyName2 !== null && isSecretKeyword(keyName2) && isRawSecretValue(prop)) {
                 context.report({
                   node: prop,
                   messageId: "noSecretInLog",
@@ -2587,6 +2643,10 @@ var CHOICE_TOKENS = /* @__PURE__ */ new Set([
 ]);
 var LOWER_TOKEN_RE = /^[a-z][a-z0-9_-]{0,30}$/;
 var MIN_CLUSTER_SIZE = 2;
+var BOOLEANISH = /* @__PURE__ */ new Set(["true", "false"]);
+function isEnumToken(lit) {
+  return LOWER_TOKEN_RE.test(lit) && lit.length >= 2 && !BOOLEANISH.has(lit);
+}
 var IGNORE_PATTERNS = [
   /[\\/]generated[\\/]/,
   /\.gen\.tsx?$/,
@@ -2616,14 +2676,89 @@ function keyName(key) {
   }
   return null;
 }
+function isStringLiteralMember(t) {
+  return t.type === import_utils25.AST_NODE_TYPES.TSLiteralType && t.literal.type === import_utils25.AST_NODE_TYPES.Literal && typeof t.literal.value === "string";
+}
 function isStringLiteralUnion(node) {
   if (node?.type !== import_utils25.AST_NODE_TYPES.TSUnionType) {
     return false;
   }
-  const stringMembers = node.types.filter(
-    (t) => t.type === import_utils25.AST_NODE_TYPES.TSLiteralType && t.literal.type === import_utils25.AST_NODE_TYPES.Literal && typeof t.literal.value === "string"
-  );
-  return stringMembers.length >= MIN_CLUSTER_SIZE;
+  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 refKey(node) {
   if (node.type === import_utils25.AST_NODE_TYPES.Identifier) {
@@ -2670,16 +2805,25 @@ var prefer_string_literal_union_default = import_utils25.ESLintUtils.RuleCreator
     const validClusters = [];
     const bareChoiceProps = [];
     const containersWithUnion = /* @__PURE__ */ new Set();
-    function pushScope() {
-      scopeStack.push(/* @__PURE__ */ new Map());
+    function pushScope(fn) {
+      scopeStack.push({
+        clusters: /* @__PURE__ */ new Map(),
+        unionRefs: unionRefsFromParams(fn)
+      });
+    }
+    function isUnionTypedRef(key, current) {
+      if (current.has(key)) {
+        return true;
+      }
+      return scopeStack.some((s) => s.unionRefs.has(key));
     }
     function popScope() {
-      const clusters = scopeStack.pop();
-      if (clusters === void 0) {
+      const scope = scopeStack.pop();
+      if (scope === void 0) {
         return;
       }
-      for (const entry of clusters.values()) {
-        if (entry.allTokens && entry.literals.size >= MIN_CLUSTER_SIZE) {
+      for (const [key, entry] of scope.clusters) {
+        if (entry.allTokens && entry.literals.size >= MIN_CLUSTER_SIZE && !isUnionTypedRef(key, scope.unionRefs)) {
           validClusters.push(entry.node);
         }
       }
@@ -2689,10 +2833,10 @@ var prefer_string_literal_union_default = import_utils25.ESLintUtils.RuleCreator
       if (scope === void 0) {
         return;
       }
-      const allTokens = literals.every((lit) => LOWER_TOKEN_RE.test(lit));
-      const existing = scope.get(key);
+      const allTokens = literals.every((lit) => isEnumToken(lit));
+      const existing = scope.clusters.get(key);
       if (existing === void 0) {
-        scope.set(key, {
+        scope.clusters.set(key, {
           node,
           literals: new Set(literals),
           allTokens
@@ -2725,6 +2869,15 @@ 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;
@@ -2980,7 +3133,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "@sarj/eslint-plugin",
-    version: "2.3.1"
+    version: "2.3.2"
   },
   rules,
   configs: {