@sarj/eslint-plugin 2.3.0 → 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",
@@ -2569,119 +2625,8 @@ var no_secret_in_log_default = import_utils24.ESLintUtils.RuleCreator(
   }
 });
 
-// src/rules/no-template-literal-in-log.ts
-var import_utils25 = require("@typescript-eslint/utils");
-var LOG_METHODS2 = /* @__PURE__ */ new Set([
-  "debug",
-  "info",
-  "warn",
-  "warning",
-  "error",
-  "exception",
-  "critical",
-  "trace",
-  "log",
-  "fatal",
-  "success"
-]);
-var LOGGER_NAMES2 = /* @__PURE__ */ new Set([
-  "console",
-  "logger",
-  "log",
-  "_log",
-  "_logger"
-]);
-var LOGGER_FACTORIES2 = /* @__PURE__ */ new Set([
-  "getlogger",
-  "createlogger"
-]);
-function looksLikeLogger(node) {
-  switch (node.type) {
-    case "Identifier": {
-      const name = node.name.toLowerCase();
-      return LOGGER_NAMES2.has(name) || LOGGER_FACTORIES2.has(name);
-    }
-    case "MemberExpression": {
-      if (!node.computed && node.property.type === "Identifier") {
-        const prop = node.property.name.toLowerCase();
-        if (LOGGER_NAMES2.has(prop) || LOGGER_FACTORIES2.has(prop)) {
-          return true;
-        }
-      }
-      return looksLikeLogger(node.object);
-    }
-    case "CallExpression":
-      return looksLikeLogger(node.callee);
-    default:
-      return false;
-  }
-}
-function findInterpolatingTemplate(node) {
-  if (node.type === "TemplateLiteral") {
-    return node.expressions.length > 0 ? node : null;
-  }
-  if (node.type === "BinaryExpression" && node.operator === "+") {
-    return findInterpolatingTemplate(node.left) ?? findInterpolatingTemplate(node.right);
-  }
-  return null;
-}
-function messageArg(node, method, receiver) {
-  const levelFirst = method === "log" && !isConsoleReceiver(receiver);
-  const arg = node.arguments[levelFirst ? 1 : 0];
-  if (arg === void 0 || arg.type === "SpreadElement") {
-    return null;
-  }
-  return arg;
-}
-function isConsoleReceiver(node) {
-  return node.type === "Identifier" && node.name === "console";
-}
-var no_template_literal_in_log_default = import_utils25.ESLintUtils.RuleCreator(
-  (name) => `https://github.com/sarj-ai/standards/blob/main/packages/typescript/src/rules/${name}.ts`
-)({
-  name: "no-template-literal-in-log",
-  meta: {
-    type: "problem",
-    docs: {
-      description: "Disallow an interpolating template literal as a logging message \u2014 pass variables as structured fields so logs stay filterable and templates stay constant."
-    },
-    schema: [],
-    messages: {
-      noTemplateLiteralInLog: "Interpolating template literal as a logging message \u2014 pass variables as structured fields (logger.info('msg', { key })) instead."
-    }
-  },
-  defaultOptions: [],
-  create(context) {
-    return {
-      CallExpression(node) {
-        const callee = node.callee;
-        if (callee.type !== "MemberExpression" || callee.computed) {
-          return;
-        }
-        if (callee.property.type !== "Identifier") {
-          return;
-        }
-        const method = callee.property.name;
-        if (!LOG_METHODS2.has(method)) {
-          return;
-        }
-        if (!looksLikeLogger(callee.object)) {
-          return;
-        }
-        const arg = messageArg(node, method, callee.object);
-        if (arg === null) {
-          return;
-        }
-        if (findInterpolatingTemplate(arg) !== null) {
-          context.report({ node, messageId: "noTemplateLiteralInLog" });
-        }
-      }
-    };
-  }
-});
-
 // src/rules/prefer-string-literal-union.ts
-var import_utils26 = require("@typescript-eslint/utils");
+var import_utils25 = require("@typescript-eslint/utils");
 var CHOICE_TOKENS = /* @__PURE__ */ new Set([
   "status",
   "state",
@@ -2698,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?$/,
@@ -2719,30 +2668,105 @@ function isChoiceLikeName(name) {
   return CHOICE_TOKENS.has(lastWord(name));
 }
 function keyName(key) {
-  if (key.type === import_utils26.AST_NODE_TYPES.Identifier) {
+  if (key.type === import_utils25.AST_NODE_TYPES.Identifier) {
     return key.name;
   }
-  if (key.type === import_utils26.AST_NODE_TYPES.Literal && typeof key.value === "string") {
+  if (key.type === import_utils25.AST_NODE_TYPES.Literal && typeof key.value === "string") {
     return key.value;
   }
   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_utils26.AST_NODE_TYPES.TSUnionType) {
+  if (node?.type !== import_utils25.AST_NODE_TYPES.TSUnionType) {
     return false;
   }
-  const stringMembers = node.types.filter(
-    (t) => t.type === import_utils26.AST_NODE_TYPES.TSLiteralType && t.literal.type === import_utils26.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_utils26.AST_NODE_TYPES.Identifier) {
+  if (node.type === import_utils25.AST_NODE_TYPES.Identifier) {
     return node.name;
   }
-  if (node.type === import_utils26.AST_NODE_TYPES.MemberExpression && !node.computed) {
+  if (node.type === import_utils25.AST_NODE_TYPES.MemberExpression && !node.computed) {
     const inner = refKey(node.object);
-    if (inner === null || node.property.type !== import_utils26.AST_NODE_TYPES.Identifier) {
+    if (inner === null || node.property.type !== import_utils25.AST_NODE_TYPES.Identifier) {
       return null;
     }
     return `${inner}.${node.property.name}`;
@@ -2750,12 +2774,12 @@ function refKey(node) {
   return null;
 }
 function strLiteral(node) {
-  if (node.type === import_utils26.AST_NODE_TYPES.Literal && typeof node.value === "string") {
+  if (node.type === import_utils25.AST_NODE_TYPES.Literal && typeof node.value === "string") {
     return node.value;
   }
   return null;
 }
-var prefer_string_literal_union_default = import_utils26.ESLintUtils.RuleCreator(
+var prefer_string_literal_union_default = import_utils25.ESLintUtils.RuleCreator(
   (name) => `https://github.com/sarj-ai/linting/blob/main/packages/typescript/src/rules/${name}.ts`
 )({
   name: "prefer-string-literal-union",
@@ -2781,16 +2805,25 @@ var prefer_string_literal_union_default = import_utils26.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);
         }
       }
@@ -2800,10 +2833,10 @@ var prefer_string_literal_union_default = import_utils26.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
@@ -2820,7 +2853,7 @@ var prefer_string_literal_union_default = import_utils26.ESLintUtils.RuleCreator
         containersWithUnion.add(container);
         return;
       }
-      if (typeNode?.type !== import_utils26.AST_NODE_TYPES.TSStringKeyword) {
+      if (typeNode?.type !== import_utils25.AST_NODE_TYPES.TSStringKeyword) {
         return;
       }
       const name = keyName(key);
@@ -2836,6 +2869,15 @@ var prefer_string_literal_union_default = import_utils26.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;
@@ -2904,10 +2946,10 @@ var prefer_string_literal_union_default = import_utils26.ESLintUtils.RuleCreator
       }
     };
     function refKeyText(node) {
-      if (node.type === import_utils26.AST_NODE_TYPES.BinaryExpression) {
+      if (node.type === import_utils25.AST_NODE_TYPES.BinaryExpression) {
         return refKey(node.left) ?? refKey(node.right) ?? "value";
       }
-      if (node.type === import_utils26.AST_NODE_TYPES.SwitchStatement) {
+      if (node.type === import_utils25.AST_NODE_TYPES.SwitchStatement) {
         return refKey(node.discriminant) ?? "value";
       }
       return "value";
@@ -2916,7 +2958,7 @@ var prefer_string_literal_union_default = import_utils26.ESLintUtils.RuleCreator
 });
 
 // src/rules/single-public-export.ts
-var import_utils27 = require("@typescript-eslint/utils");
+var import_utils26 = require("@typescript-eslint/utils");
 var JUNK_DRAWER_STEMS = /* @__PURE__ */ new Set([
   "util",
   "utils",
@@ -2950,12 +2992,12 @@ var kebabCase = (name) => {
   }
   return normalized.replace(CAMEL_BOUNDARY_RE, "-").toLowerCase();
 };
-var isFunctionExpression2 = (node) => node !== null && (node.type === import_utils27.AST_NODE_TYPES.ArrowFunctionExpression || node.type === import_utils27.AST_NODE_TYPES.FunctionExpression);
+var isFunctionExpression2 = (node) => node !== null && (node.type === import_utils26.AST_NODE_TYPES.ArrowFunctionExpression || node.type === import_utils26.AST_NODE_TYPES.FunctionExpression);
 var functionConstName = (decl) => {
   if (decl.declarations.length !== 1) return null;
   const [declarator] = decl.declarations;
   if (declarator === void 0) return null;
-  if (declarator.id.type !== import_utils27.AST_NODE_TYPES.Identifier) return null;
+  if (declarator.id.type !== import_utils26.AST_NODE_TYPES.Identifier) return null;
   if (!isFunctionExpression2(declarator.init)) return null;
   return declarator.id.name;
 };
@@ -2969,20 +3011,20 @@ var summarizeExports = (body) => {
   };
   for (const statement of body) {
     switch (statement.type) {
-      case import_utils27.AST_NODE_TYPES.ExportAllDeclaration:
+      case import_utils26.AST_NODE_TYPES.ExportAllDeclaration:
         hasReExport = true;
         break;
-      case import_utils27.AST_NODE_TYPES.ExportDefaultDeclaration: {
+      case import_utils26.AST_NODE_TYPES.ExportDefaultDeclaration: {
         names += 1;
         const decl = statement.declaration;
-        if (decl.type === import_utils27.AST_NODE_TYPES.FunctionDeclaration && decl.id !== null) {
+        if (decl.type === import_utils26.AST_NODE_TYPES.FunctionDeclaration && decl.id !== null) {
           candidate = { name: decl.id.name, node: statement };
-        } else if (decl.type === import_utils27.AST_NODE_TYPES.ClassDeclaration && decl.id !== null) {
+        } else if (decl.type === import_utils26.AST_NODE_TYPES.ClassDeclaration && decl.id !== null) {
           candidate = { name: decl.id.name, node: statement };
         }
         break;
       }
-      case import_utils27.AST_NODE_TYPES.ExportNamedDeclaration: {
+      case import_utils26.AST_NODE_TYPES.ExportNamedDeclaration: {
         if (statement.source !== null) {
           hasReExport = true;
           break;
@@ -2993,15 +3035,15 @@ var summarizeExports = (body) => {
           break;
         }
         switch (decl.type) {
-          case import_utils27.AST_NODE_TYPES.FunctionDeclaration:
+          case import_utils26.AST_NODE_TYPES.FunctionDeclaration:
             if (decl.id !== null) addCandidate(decl.id.name, statement);
             else names += 1;
             break;
-          case import_utils27.AST_NODE_TYPES.ClassDeclaration:
+          case import_utils26.AST_NODE_TYPES.ClassDeclaration:
             if (decl.id !== null) addCandidate(decl.id.name, statement);
             else names += 1;
             break;
-          case import_utils27.AST_NODE_TYPES.VariableDeclaration: {
+          case import_utils26.AST_NODE_TYPES.VariableDeclaration: {
             const fnName = functionConstName(decl);
             if (fnName !== null && decl.declarations.length === 1) {
               addCandidate(fnName, statement);
@@ -3021,7 +3063,7 @@ var summarizeExports = (body) => {
   }
   return { names, hasReExport, candidate };
 };
-var single_public_export_default = import_utils27.ESLintUtils.RuleCreator(
+var single_public_export_default = import_utils26.ESLintUtils.RuleCreator(
   (name) => `https://github.com/sarj-ai/standards/blob/main/packages/typescript/src/rules/${name}.ts`
 )({
   name: "single-public-export",
@@ -3085,14 +3127,13 @@ var rules = {
   "no-cors-wildcard-with-credentials": no_cors_wildcard_with_credentials_default,
   "no-fat-try-blocks": no_fat_try_blocks_default,
   "no-secret-in-log": no_secret_in_log_default,
-  "no-template-literal-in-log": no_template_literal_in_log_default,
   "prefer-string-literal-union": prefer_string_literal_union_default,
   "single-public-export": single_public_export_default
 };
 var plugin = {
   meta: {
     name: "@sarj/eslint-plugin",
-    version: "2.3.0"
+    version: "2.3.2"
   },
   rules,
   configs: {
@@ -3121,7 +3162,6 @@ var plugin = {
         // Ported from sarj-python-lint (SARJ), corpus-validated FP~0.
         "@sarj/no-fat-try-blocks": "warn",
         "@sarj/no-cors-wildcard-with-credentials": "warn",
-        "@sarj/no-template-literal-in-log": "warn",
         "@sarj/no-secret-in-log": "warn",
         "@sarj/single-public-export": "warn",
         "@sarj/prefer-string-literal-union": "warn"
@@ -3156,7 +3196,6 @@ var plugin = {
         // Ported from sarj-python-lint (SARJ), corpus-validated FP~0.
         "@sarj/no-fat-try-blocks": "error",
         "@sarj/no-cors-wildcard-with-credentials": "error",
-        "@sarj/no-template-literal-in-log": "error",
         "@sarj/no-secret-in-log": "error",
         "@sarj/single-public-export": "error",
         // High-volume/stylistic — warn until rollout proves FP rate.