@sarj/eslint-plugin 2.3.1 → 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
@@ -2235,7 +2245,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 +2443,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 +2560,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 +2620,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",
@@ -2571,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",
@@ -2587,6 +2654,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 +2687,18 @@ 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 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) {
@@ -2666,19 +2741,31 @@ 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 operandIsRawString(node) {
+      if (services === null) {
+        return false;
+      }
+      return typeHasRawString(services.getTypeAtLocation(node));
+    }
     function pushScope() {
-      scopeStack.push(/* @__PURE__ */ new Map());
+      scopeStack.push({ clusters: /* @__PURE__ */ new Map() });
     }
     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()) {
+      for (const entry of scope.clusters.values()) {
         if (entry.allTokens && entry.literals.size >= MIN_CLUSTER_SIZE) {
           validClusters.push(entry.node);
         }
@@ -2689,10 +2776,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
@@ -2734,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 = [];
@@ -2980,7 +3071,7 @@ var rules = {
 var plugin = {
   meta: {
     name: "@sarj/eslint-plugin",
-    version: "2.3.1"
+    version: "2.3.3"
   },
   rules,
   configs: {