@sarj/eslint-plugin 2.3.0 → 2.3.2

package/dist/index.d.cts

@@ -72,9 +72,6 @@ declare const rules: {
     "no-secret-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noSecretInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
         name: string;
     };
-    "no-template-literal-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noTemplateLiteralInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
-        name: string;
-    };
     "prefer-string-literal-union": _typescript_eslint_utils_ts_eslint.RuleModule<"bareChoiceField" | "comparisonCluster", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
         name: string;
     };
@@ -159,9 +156,6 @@ declare const plugin: {
         "no-secret-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noSecretInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
             name: string;
         };
-        "no-template-literal-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noTemplateLiteralInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
-            name: string;
-        };
         "prefer-string-literal-union": _typescript_eslint_utils_ts_eslint.RuleModule<"bareChoiceField" | "comparisonCluster", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
             name: string;
         };
@@ -192,7 +186,6 @@ declare const plugin: {
                 "@sarj/prefer-semantic-colors": string;
                 "@sarj/no-fat-try-blocks": string;
                 "@sarj/no-cors-wildcard-with-credentials": string;
-                "@sarj/no-template-literal-in-log": string;
                 "@sarj/no-secret-in-log": string;
                 "@sarj/single-public-export": string;
                 "@sarj/prefer-string-literal-union": string;
@@ -223,7 +216,6 @@ declare const plugin: {
                 "@sarj/prefer-semantic-colors": string;
                 "@sarj/no-fat-try-blocks": string;
                 "@sarj/no-cors-wildcard-with-credentials": string;
-                "@sarj/no-template-literal-in-log": string;
                 "@sarj/no-secret-in-log": string;
                 "@sarj/single-public-export": string;
                 "@sarj/prefer-string-literal-union": string;

package/dist/index.d.ts

@@ -72,9 +72,6 @@ declare const rules: {
     "no-secret-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noSecretInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
         name: string;
     };
-    "no-template-literal-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noTemplateLiteralInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
-        name: string;
-    };
     "prefer-string-literal-union": _typescript_eslint_utils_ts_eslint.RuleModule<"bareChoiceField" | "comparisonCluster", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
         name: string;
     };
@@ -159,9 +156,6 @@ declare const plugin: {
         "no-secret-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noSecretInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
             name: string;
         };
-        "no-template-literal-in-log": _typescript_eslint_utils_ts_eslint.RuleModule<"noTemplateLiteralInLog", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
-            name: string;
-        };
         "prefer-string-literal-union": _typescript_eslint_utils_ts_eslint.RuleModule<"bareChoiceField" | "comparisonCluster", readonly [], unknown, _typescript_eslint_utils_ts_eslint.RuleListener> & {
             name: string;
         };
@@ -192,7 +186,6 @@ declare const plugin: {
                 "@sarj/prefer-semantic-colors": string;
                 "@sarj/no-fat-try-blocks": string;
                 "@sarj/no-cors-wildcard-with-credentials": string;
-                "@sarj/no-template-literal-in-log": string;
                 "@sarj/no-secret-in-log": string;
                 "@sarj/single-public-export": string;
                 "@sarj/prefer-string-literal-union": string;
@@ -223,7 +216,6 @@ declare const plugin: {
                 "@sarj/prefer-semantic-colors": string;
                 "@sarj/no-fat-try-blocks": string;
                 "@sarj/no-cors-wildcard-with-credentials": string;
-                "@sarj/no-template-literal-in-log": string;
                 "@sarj/no-secret-in-log": string;
                 "@sarj/single-public-export": string;
                 "@sarj/prefer-string-literal-union": string;

package/dist/index.js

@@ -2223,7 +2223,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";
@@ -2413,7 +2421,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"]);
@@ -2488,6 +2538,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;
@@ -2542,7 +2598,7 @@ var no_secret_in_log_default = ESLintUtils23.RuleCreator(
                 continue;
               }
               const keyName2 = propertyKeyName2(prop);
-              if (keyName2 !== null && isSecretKeyword(keyName2)) {
+              if (keyName2 !== null && isSecretKeyword(keyName2) && isRawSecretValue(prop)) {
                 context.report({
                   node: prop,
                   messageId: "noSecretInLog",
@@ -2557,120 +2613,9 @@ var no_secret_in_log_default = ESLintUtils23.RuleCreator(
   }
 });
 
-// src/rules/no-template-literal-in-log.ts
-import { ESLintUtils as ESLintUtils24 } from "@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 = ESLintUtils24.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
 import {
-  ESLintUtils as ESLintUtils25,
+  ESLintUtils as ESLintUtils24,
   AST_NODE_TYPES as AST_NODE_TYPES12
 } from "@typescript-eslint/utils";
 var CHOICE_TOKENS = /* @__PURE__ */ new Set([
@@ -2689,6 +2634,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?$/,
@@ -2718,14 +2667,89 @@ function keyName(key) {
   }
   return null;
 }
+function isStringLiteralMember(t) {
+  return t.type === AST_NODE_TYPES12.TSLiteralType && t.literal.type === AST_NODE_TYPES12.Literal && typeof t.literal.value === "string";
+}
 function isStringLiteralUnion(node) {
   if (node?.type !== AST_NODE_TYPES12.TSUnionType) {
     return false;
   }
-  const stringMembers = node.types.filter(
-    (t) => t.type === AST_NODE_TYPES12.TSLiteralType && t.literal.type === AST_NODE_TYPES12.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 === 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 refKey(node) {
   if (node.type === AST_NODE_TYPES12.Identifier) {
@@ -2746,7 +2770,7 @@ function strLiteral(node) {
   }
   return null;
 }
-var prefer_string_literal_union_default = ESLintUtils25.RuleCreator(
+var prefer_string_literal_union_default = ESLintUtils24.RuleCreator(
   (name) => `https://github.com/sarj-ai/linting/blob/main/packages/typescript/src/rules/${name}.ts`
 )({
   name: "prefer-string-literal-union",
@@ -2772,16 +2796,25 @@ var prefer_string_literal_union_default = ESLintUtils25.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);
         }
       }
@@ -2791,10 +2824,10 @@ var prefer_string_literal_union_default = ESLintUtils25.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
@@ -2827,6 +2860,15 @@ var prefer_string_literal_union_default = ESLintUtils25.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;
@@ -2907,7 +2949,7 @@ var prefer_string_literal_union_default = ESLintUtils25.RuleCreator(
 });
 
 // src/rules/single-public-export.ts
-import { ESLintUtils as ESLintUtils26, AST_NODE_TYPES as AST_NODE_TYPES13 } from "@typescript-eslint/utils";
+import { ESLintUtils as ESLintUtils25, AST_NODE_TYPES as AST_NODE_TYPES13 } from "@typescript-eslint/utils";
 var JUNK_DRAWER_STEMS = /* @__PURE__ */ new Set([
   "util",
   "utils",
@@ -3012,7 +3054,7 @@ var summarizeExports = (body) => {
   }
   return { names, hasReExport, candidate };
 };
-var single_public_export_default = ESLintUtils26.RuleCreator(
+var single_public_export_default = ESLintUtils25.RuleCreator(
   (name) => `https://github.com/sarj-ai/standards/blob/main/packages/typescript/src/rules/${name}.ts`
 )({
   name: "single-public-export",
@@ -3076,14 +3118,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: {
@@ -3112,7 +3153,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"
@@ -3147,7 +3187,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.