@sarj/eslint-plugin 16.4.6 → 16.4.7

package/dist/index.cjs

@@ -262,6 +262,7 @@ function deepFreeze(value) {
 }
 
 // src/rules/_paths.ts
+var LINE_TERMINATOR_RE = /[\n\r\u2028\u2029]/u;
 var SCRIPT_FILE_RE = /(?:^|[\\/])scripts[\\/]|\.mjs$/;
 var STORY_FILE_RE = /\.stories\.[cm]?[jt]sx?$/i;
 var STORY_TREE_RE = /(^|\/)stories(?:[_-][^/]*)?\//i;
@@ -311,8 +312,8 @@ function leadingCommentBodies(sourceText) {
   const bodies = [];
   let index = 0;
   if (sourceText.startsWith("#!")) {
-    const shebangEnd = sourceText.indexOf("\n");
-    index = shebangEnd === -1 ? sourceText.length : shebangEnd + 1;
+    const shebangEnd = commentLineEnd(sourceText, 2);
+    index = shebangEnd === sourceText.length ? sourceText.length : shebangEnd + 1;
   }
   while (index < sourceText.length) {
     while (/\s/u.test(sourceText[index] ?? "")) index++;
@@ -326,7 +327,7 @@ function leadingCommentBodies(sourceText) {
       const end = sourceText.indexOf("*/", index + 2);
       if (end === -1) break;
       bodies.push(
-        ...sourceText.slice(index + 2, end).split("\n").map((line) => line.replace(/^\s*\*?\s?/u, "").trim()).filter((line) => line.length > 0)
+        ...sourceText.slice(index + 2, end).split(LINE_TERMINATOR_RE).map((line) => line.replace(/^\s*\*?\s?/u, "").trim()).filter((line) => line.length > 0)
       );
       index = end + 2;
       continue;
@@ -345,8 +346,8 @@ function isScriptFile(filename) {
   return SCRIPT_FILE_RE.test(filename);
 }
 function commentLineEnd(sourceText, start) {
-  const end = sourceText.indexOf("\n", start);
-  return end === -1 ? sourceText.length : end;
+  const end = sourceText.slice(start).search(LINE_TERMINATOR_RE);
+  return end === -1 ? sourceText.length : start + end;
 }
 
 // src/rules/require-explicit-contract-implementation.ts
@@ -5473,7 +5474,9 @@ var NO_ENUM_DOCUMENTATION = {
       focusPath: "src/status.ts",
       expectedCount: 1,
       public: true
-    }
+    },
+    { id: "authored-after-comment", scenarioId: "native-header-boundary", title: "Keep executable authored code in scope", outcome: "match", files: [{ path: "src/status.ts", source: '// ordinary header\u2028const marker="auto-generated file"; enum Mode {Start} console.log(Mode.Start, marker);' }], focusPath: "src/status.ts", expectedCount: 1, public: true },
+    { id: "generated-header", scenarioId: "native-header-boundary", title: "Respect a native generated banner", outcome: "no-match", files: [{ path: "src/status.ts", source: '// auto-generated file\u2028const marker="auto-generated file"; enum Mode {Start} console.log(Mode.Start, marker);' }], focusPath: "src/status.ts", expectedCount: 0, public: true }
   ]
 };
 function matchesAnyPattern(filename, patterns) {
@@ -6833,7 +6836,9 @@ var NO_JSON_STRINGIFY_ERROR_DOCUMENTATION = {
   limitations: ["The rule uses stable local catch bindings and unshadowed built-in constructors, not runtime type information. Custom replacers are left to their serializer contract; a catch value is not guaranteed to be an Error."],
   examples: [
     { id: "explicit-error-message", title: "Narrow an unknown catch value before selecting fields", outcome: "no-match", files: [{ path: "src/report.ts", source: "try { f(); } catch (err) { JSON.stringify({ error: err instanceof Error ? err.message : String(err) }); }" }], focusPath: "src/report.ts", expectedCount: 0, public: true },
-    { id: "stringified-error", title: "Do not stringify an Error object", outcome: "match", files: [{ path: "src/report.ts", source: "try { f(); } catch (err) { JSON.stringify({ error: err }); }" }], focusPath: "src/report.ts", expectedCount: 1, public: true }
+    { id: "stringified-error", title: "Do not stringify an Error object", outcome: "match", files: [{ path: "src/report.ts", source: "try { f(); } catch (err) { JSON.stringify({ error: err }); }" }], focusPath: "src/report.ts", expectedCount: 1, public: true },
+    { id: "shadowed-error-binding", scenarioId: "binding-provenance", title: "Keep native binding provenance", outcome: "match", files: [{ path: "src/error.ts", source: 'function probe(){try{throw {id:1};}catch(err){if(err instanceof Error)return err.message;{const err=new Error("lost");return JSON.stringify(err);}}}\nconsole.log(probe());' }], focusPath: "src/error.ts", expectedCount: 1, public: true },
+    { id: "escaped-fallback-binding", scenarioId: "binding-provenance", title: "Keep native binding provenance", outcome: "no-match", files: [{ path: "src/error.ts", source: "function probe(){try{throw {id:1};}catch(err){if(err instanceof Error)return err.message;return JSON.stringify(\\u0065rr);}}\nconsole.log(probe());" }], focusPath: "src/error.ts", expectedCount: 0, public: true }
   ]
 };
 var SAFE_STRING_PROPS = /* @__PURE__ */ new Set(["message", "stack", "name"]);
@@ -6863,25 +6868,25 @@ var BUILTIN_ERROR_CONSTRUCTORS = /* @__PURE__ */ new Set([
   "TypeError",
   "URIError"
 ]);
-function identifierIsProvenError(identifier, scope) {
-  const variable = import_utils41.ASTUtils.findVariable(scope, identifier.name);
+function identifierIsProvenError(identifier, sourceCode) {
+  const variable = import_utils41.ASTUtils.findVariable(sourceCode.getScope(identifier), identifier.name);
   if (variable === null || variable.defs.length !== 1 || variable.references.some((reference) => reference.isWrite() && reference.init !== true)) return false;
   const definition = variable.defs[0];
   if (definition?.type === "CatchClause") return true;
   if (definition?.type !== "Variable") return false;
   const initializer = definition.node.init;
-  return initializer?.type === "NewExpression" && initializer.callee.type === "Identifier" && BUILTIN_ERROR_CONSTRUCTORS.has(initializer.callee.name) && isGlobalIdentifier(initializer.callee.name, scope);
+  return initializer?.type === "NewExpression" && initializer.callee.type === "Identifier" && BUILTIN_ERROR_CONSTRUCTORS.has(initializer.callee.name) && isGlobalIdentifier(initializer.callee.name, sourceCode.getScope(initializer.callee));
 }
 function isGlobalIdentifier(name, scope) {
   const binding = import_utils41.ASTUtils.findVariable(scope, name);
   return binding === null || binding.defs.length === 0;
 }
-function positiveErrorSubject(test) {
-  return instanceofErrorSubject(test) ?? typeGuardSubject(test);
+function positiveErrorSubject(test, sourceCode) {
+  return instanceofErrorSubject(test, sourceCode) ?? typeGuardSubject(test);
 }
 var TYPE_GUARD_PATTERN = /^(is|has)[A-Z]/;
-function instanceofErrorSubject(test) {
-  if (test.type === "BinaryExpression" && test.operator === "instanceof" && test.right.type === "Identifier" && test.right.name === "Error") {
+function instanceofErrorSubject(test, sourceCode) {
+  if (test.type === "BinaryExpression" && test.operator === "instanceof" && test.right.type === "Identifier" && test.right.name === "Error" && isGlobalIdentifier("Error", sourceCode.getScope(test.right))) {
     return test.left;
   }
   return null;
@@ -6895,36 +6900,34 @@ function typeGuardSubject(test) {
   return null;
 }
 function isNarrowedByEarlyReturn(node, argExpr, sourceCode) {
-  const argText = sourceCode.getText(argExpr);
   let current = node.parent;
   while (current) {
     if (current.type === "BlockStatement" || current.type === "Program") {
-      if (hasEarlierErrorGuard(current.body, node, argText, sourceCode)) return true;
+      if (hasEarlierErrorGuard(current.body, node, argExpr, sourceCode)) return true;
     }
     current = current.parent;
   }
   return false;
 }
 function isGuardedByInstanceofError(node, argExpr, sourceCode) {
-  const argText = sourceCode.getText(argExpr);
-  const sameSubject = (subject) => sourceCode.getText(subject) === argText;
+  const sameSubject = (subject) => sameSubjectBinding(subject, argExpr, sourceCode);
   let current = node.parent;
   while (current) {
     if (current.type === "ConditionalExpression") {
-      const subject = positiveErrorSubject(current.test);
+      const subject = positiveErrorSubject(current.test, sourceCode);
       if (subject && sameSubject(subject) && nodeWithin(node, current.alternate)) {
         return true;
       }
-      const negated = negatedInstanceofErrorSubject(current.test);
+      const negated = negatedInstanceofErrorSubject(current.test, sourceCode);
       if (negated && sameSubject(negated) && nodeWithin(node, current.consequent)) {
         return true;
       }
     } else if (current.type === "IfStatement") {
-      const subject = positiveErrorSubject(current.test);
+      const subject = positiveErrorSubject(current.test, sourceCode);
       if (subject && sameSubject(subject) && nodeWithin(node, current.alternate)) {
         return true;
       }
-      const negated = negatedInstanceofErrorSubject(current.test);
+      const negated = negatedInstanceofErrorSubject(current.test, sourceCode);
       if (negated && sameSubject(negated) && nodeWithin(node, current.consequent)) {
         return true;
       }
@@ -6933,12 +6936,21 @@ function isGuardedByInstanceofError(node, argExpr, sourceCode) {
   }
   return false;
 }
-function negatedInstanceofErrorSubject(test) {
+function negatedInstanceofErrorSubject(test, sourceCode) {
   if (test.type === "UnaryExpression" && test.operator === "!") {
-    return positiveErrorSubject(test.argument);
+    return positiveErrorSubject(test.argument, sourceCode);
   }
   return null;
 }
+function sameSubjectBinding(subject, value, sourceCode) {
+  const left = unwrapExpression(subject);
+  const right = unwrapExpression(value);
+  if (left.type === "Identifier" && right.type === "Identifier") {
+    const binding = import_utils41.ASTUtils.findVariable(sourceCode.getScope(left), left.name);
+    return binding !== null && binding === import_utils41.ASTUtils.findVariable(sourceCode.getScope(right), right.name);
+  }
+  return sourceCode.getText(subject) === sourceCode.getText(value);
+}
 function nodeWithin(node, container) {
   return container !== null && node.range[0] >= container.range[0] && node.range[1] <= container.range[1];
 }
@@ -6966,21 +6978,21 @@ function directLiteralValues(argument) {
   }
   return argument.type === "SpreadElement" ? [] : [argument];
 }
-function expressionSuggestsError(expression, scope) {
+function expressionSuggestsError(expression, sourceCode) {
   expression = unwrapExpression(expression);
   const unwrappedExpressionCallee = expression.type === "CallExpression" || expression.type === "NewExpression" ? unwrapExpression(expression.callee) : null;
   if (expression.type === "Identifier") {
-    return identifierIsProvenError(expression, scope);
+    return identifierIsProvenError(expression, sourceCode);
   }
   if (expression.type === "NewExpression" && unwrappedExpressionCallee?.type === "Identifier") {
-    return BUILTIN_ERROR_CONSTRUCTORS.has(unwrappedExpressionCallee.name) && isGlobalIdentifier(unwrappedExpressionCallee.name, scope);
+    return BUILTIN_ERROR_CONSTRUCTORS.has(unwrappedExpressionCallee.name) && isGlobalIdentifier(unwrappedExpressionCallee.name, sourceCode.getScope(unwrappedExpressionCallee));
   }
-  return expression.type === "MemberExpression" && memberSuggestsError(expression, scope);
+  return expression.type === "MemberExpression" && memberSuggestsError(expression, sourceCode);
 }
-function memberSuggestsError(member, scope) {
+function memberSuggestsError(member, sourceCode) {
   const propName2 = import_utils41.ASTUtils.getPropertyName(member);
   const base = member.object;
-  const baseSuggestsError = base.type === "Identifier" && identifierIsProvenError(base, scope);
+  const baseSuggestsError = base.type === "Identifier" && identifierIsProvenError(base, sourceCode);
   if (baseSuggestsError) {
     if (propName2 === null) {
       return true;
@@ -7020,7 +7032,7 @@ var no_json_stringify_error_default = createRule({
         const replacer = node.arguments[1] === void 0 ? void 0 : unwrapExpression(node.arguments[1]);
         if (replacer !== void 0 && !(replacer.type === "Literal" && replacer.value === null) && !(replacer.type === "Identifier" && replacer.name === "undefined" && isGlobalIdentifier("undefined", scope))) return;
         const unsafeValue = directLiteralValues(firstArg).find(
-          (value) => expressionSuggestsError(value, scope) && !isGuardedByInstanceofError(node, value, context.sourceCode) && !isNarrowedByEarlyReturn(node, value, context.sourceCode)
+          (value) => expressionSuggestsError(value, context.sourceCode) && !isGuardedByInstanceofError(node, value, context.sourceCode) && !isNarrowedByEarlyReturn(node, value, context.sourceCode)
         );
         if (unsafeValue === void 0) {
           return;
@@ -7033,14 +7045,14 @@ var no_json_stringify_error_default = createRule({
     };
   }
 });
-function hasEarlierErrorGuard(statements, node, argText, sourceCode) {
+function hasEarlierErrorGuard(statements, node, argExpr, sourceCode) {
   for (const stmt of statements) {
     if (stmt.range[0] >= node.range[0]) {
       break;
     }
     if (stmt.type === "IfStatement" && stmt.alternate === null && branchTerminates(stmt.consequent)) {
-      const subject = positiveErrorSubject(stmt.test);
-      if (subject && sourceCode.getText(subject) === argText) {
+      const subject = positiveErrorSubject(stmt.test, sourceCode);
+      if (subject && sameSubjectBinding(subject, argExpr, sourceCode)) {
         return true;
       }
     }
@@ -8840,11 +8852,12 @@ var NO_OFFSET_PAGINATION_DOCUMENTATION = {
   limitations: ["A SELECT/FROM query shape or adjacent LIMIT/OFFSET fragment is required. Isolated OFFSET fragments and test files are excluded; this lexical context does not prove a database execution sink. Performance and concurrent-write behavior depend on indexes, ordering, isolation, and dialect; bounded pages and random page access can justify OFFSET."],
   examples: [
     { id: "keyset-pagination", title: "Page from a stable cursor", outcome: "no-match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT id FROM runs WHERE id > ? ORDER BY id LIMIT ?`).all();" }], focusPath: "src/runs.ts", expectedCount: 0, public: true },
-    { id: "offset-pagination", title: "Do not page by offset", outcome: "match", files: [{ path: "src/runs.ts", source: "db.query(`SELECT id FROM runs ORDER BY id LIMIT ? OFFSET ?`);" }], focusPath: "src/runs.ts", expectedCount: 1, public: true }
+    { id: "offset-pagination", title: "Do not page by offset", outcome: "match", files: [{ path: "src/runs.ts", source: "db.query(`SELECT id FROM runs ORDER BY id LIMIT ? OFFSET ?`);" }], focusPath: "src/runs.ts", expectedCount: 1, public: true },
+    { id: "decoded-query", scenarioId: "native-decoded-sql", title: "Inspect native-decoded query text", outcome: "match", files: [{ path: "src/page.ts", source: 'db.query("SELECT id FROM runs ORDER BY id LIMIT 1 OFF\\u0053ET 1");' }], focusPath: "src/page.ts", expectedCount: 1, public: true },
+    { id: "decoded-comment-data", scenarioId: "native-decoded-sql", title: "Ignore native-decoded comment data", outcome: "no-match", files: [{ path: "src/page.ts", source: 'db.query("SELECT id FROM runs /* OFF\\x53ET 1 */");' }], focusPath: "src/page.ts", expectedCount: 0, public: true }
   ]
 };
 var OFFSET_PAGINATION = /\bOFFSET\s+(?:%s|%\(\w+\)s|\?\d*|:\w+|@\w+|\$\d+|\d+)/i;
-var OFFSET_GATE = /offset/i;
 var PAGINATION_CONTEXT = /\bSELECT\b[\s\S]*\bFROM\b[\s\S]*\bOFFSET\b|\bLIMIT\s+(?:%s|%\(\w+\)s|\?\d*|:\w+|@\w+|\$\d+|\d+)\s+OFFSET\b/i;
 var no_offset_pagination_default = createRule({
   name: "no-offset-pagination",
@@ -8861,7 +8874,7 @@ var no_offset_pagination_default = createRule({
   },
   defaultOptions: [],
   create(context) {
-    if (isTestFile(context.filename) || !OFFSET_GATE.test(context.sourceCode.text)) {
+    if (isTestFile(context.filename)) {
       return {};
     }
     return createSqlListener((sql, node) => {
@@ -10978,7 +10991,9 @@ var NO_SELECT_STAR_DOCUMENTATION = {
   limitations: ["Only statically visible embedded SQL is checked; quoted strings (including PostgreSQL dollar strings), comments, function arguments such as COUNT(*), and stars inside EXISTS are excluded. This is a bounded lexical scan, not a complete SQL parser."],
   examples: [
     { id: "explicit-projection", title: "Select the required columns", outcome: "no-match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT id, status FROM runs`).all();" }], focusPath: "src/runs.ts", expectedCount: 0, public: true },
-    { id: "wildcard-projection", title: "Do not select every column", outcome: "match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT * FROM runs`).all();" }], focusPath: "src/runs.ts", expectedCount: 1, public: true }
+    { id: "wildcard-projection", title: "Do not select every column", outcome: "match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT * FROM runs`).all();" }], focusPath: "src/runs.ts", expectedCount: 1, public: true },
+    { id: "decoded-query", scenarioId: "native-decoded-sql", title: "Inspect native-decoded query text", outcome: "match", files: [{ path: "src/page.ts", source: 'db.query("SEL\\u0045CT * FROM runs");' }], focusPath: "src/page.ts", expectedCount: 1, public: true },
+    { id: "decoded-comment-data", scenarioId: "native-decoded-sql", title: "Ignore native-decoded comment data", outcome: "no-match", files: [{ path: "src/page.ts", source: 'db.query("SEL\\x45CT id FROM runs /* SELECT * FROM runs */");' }], focusPath: "src/page.ts", expectedCount: 0, public: true }
   ]
 };
 var QUERY_SHAPE = /\bSELECT\b[\s\S]*?\bFROM\b/i;
@@ -10986,7 +11001,6 @@ var SELECT_KEYWORD = /\bSELECT\b/gi;
 var FROM_KEYWORD = /^FROM\b/i;
 var EXISTS_BEFORE = /\bEXISTS\s*\(\s*$/i;
 var QUALIFIED_PREFIX = /\w\.$/;
-var SELECT_GATE = /select/i;
 function hasRealSelectStar(sql) {
   const selects = [...sql.matchAll(SELECT_KEYWORD)].map((m) => m.index);
   for (let pos = 0; pos < sql.length; pos++) {
@@ -11035,7 +11049,7 @@ var no_select_star_default = createRule({
   },
   defaultOptions: [],
   create(context) {
-    if (isTestFile(context.filename) || !SELECT_GATE.test(context.sourceCode.text)) {
+    if (isTestFile(context.filename)) {
       return {};
     }
     return createSqlListener((sql, node) => {
@@ -18959,16 +18973,20 @@ var PREFER_SWITCH_FOR_REPEATED_EQUALITY_DOCUMENTATION = {
   ],
   examples: [
     { id: "switch-dispatch", title: "Make finite dispatch explicit", outcome: "no-match", files: [{ path: "src/render.ts", source: "switch (kind) { case 'a': return a(); case 'b': return b(); case 'c': return c(); default: return fallback(); }" }], focusPath: "src/render.ts", expectedCount: 0, public: true },
-    { id: "repeated-equality", title: "Avoid repeating the discriminant", outcome: "match", files: [{ path: "src/render.ts", source: "if (kind === 'a') return a(); else if (kind === 'b') return b(); else if (kind === 'c') return c();" }], focusPath: "src/render.ts", expectedCount: 1, public: true }
+    { id: "repeated-equality", title: "Avoid repeating the discriminant", outcome: "match", files: [{ path: "src/render.ts", source: "if (kind === 'a') return a(); else if (kind === 'b') return b(); else if (kind === 'c') return c();" }], focusPath: "src/render.ts", expectedCount: 1, public: true },
+    { id: "escaped-middle", scenarioId: "native-discriminant", title: "Use native identifier identity", outcome: "match", files: [{ path: "src/dispatch.ts", source: `function probe(kind){if(kind==='a')return 1;else if(\\u006bind==='b')return 2;else if(kind==='c')return 3;return 0;}
+console.log(JSON.stringify(["a","b","c","d"].map(probe)));` }], focusPath: "src/dispatch.ts", expectedCount: 1, public: true },
+    { id: "different-discriminants", scenarioId: "native-discriminant", title: "Use native identifier identity", outcome: "no-match", files: [{ path: "src/dispatch.ts", source: `function probe(kind){const other="other";if(kind==='a')return 1;else if(other==='b')return 2;else if(kind==='c')return 3;return 0;}
+console.log(JSON.stringify(["a","b","c","d"].map(probe)));` }], focusPath: "src/dispatch.ts", expectedCount: 0, public: true }
   ]
 };
-function discriminantText(sourceCode, test) {
+function discriminantName(test) {
   if (test.type !== import_utils110.AST_NODE_TYPES.BinaryExpression || test.operator !== "===") return null;
   const leftIsCase = isCaseValue(test.left);
   const rightIsCase = isCaseValue(test.right);
   if (leftIsCase === rightIsCase) return null;
   const discriminant = leftIsCase ? test.right : test.left;
-  return discriminant.type === import_utils110.AST_NODE_TYPES.Identifier ? sourceCode.getText(discriminant) : null;
+  return discriminant.type === import_utils110.AST_NODE_TYPES.Identifier ? discriminant.name : null;
 }
 function isCaseValue(node) {
   if (node.type === import_utils110.AST_NODE_TYPES.Literal) return true;
@@ -18992,12 +19010,12 @@ var prefer_switch_for_repeated_equality_default = createRule({
     return {
       IfStatement(node) {
         if (node.parent.type === import_utils110.AST_NODE_TYPES.IfStatement && node.parent.alternate === node) return;
-        const first = discriminantText(context.sourceCode, node.test);
+        const first = discriminantName(node.test);
         if (first === null) return;
         let count = 1;
         let current = node.alternate;
         while (current?.type === import_utils110.AST_NODE_TYPES.IfStatement) {
-          if (discriminantText(context.sourceCode, current.test) !== first) return;
+          if (discriminantName(current.test) !== first) return;
           count += 1;
           current = current.alternate;
         }
@@ -22725,7 +22743,9 @@ var STORE_INSERT_REQUIRES_ON_CONFLICT_DOCUMENTATION = {
   limitations: ["Only the nearest statically named callable is considered; top-level inserts and anonymous callbacks are excluded. Recognized conflict syntax does not prove idempotence or concurrency safety: WHERE NOT EXISTS can race, and INSERT OR REPLACE can delete an existing row. Review unique constraints and dialect semantics manually."],
   examples: [
     { id: "conflict-safe-insert", title: "Review the conflict policy for a replayed insert", outcome: "no-match", files: [{ path: "src/store.ts", source: "function seed() { db.prepare(`INSERT INTO runs (id) VALUES (?) ON CONFLICT(id) DO NOTHING`).run(); }" }], focusPath: "src/store.ts", expectedCount: 0, public: true },
-    { id: "bare-insert", title: "Review a bare insert in a replay-named callable", outcome: "match", files: [{ path: "src/store.ts", source: "function seed() { db.prepare(`INSERT INTO runs (id) VALUES (?)`).run(); }" }], focusPath: "src/store.ts", expectedCount: 1, public: true }
+    { id: "bare-insert", title: "Review a bare insert in a replay-named callable", outcome: "match", files: [{ path: "src/store.ts", source: "function seed() { db.prepare(`INSERT INTO runs (id) VALUES (?)`).run(); }" }], focusPath: "src/store.ts", expectedCount: 1, public: true },
+    { id: "decoded-query", scenarioId: "native-decoded-sql", title: "Inspect native-decoded query text", outcome: "match", files: [{ path: "src/page.ts", source: `function seed(){db.query("INS\\u0045RT INTO runs(id,note) VALUES(4,'new')");}` }], focusPath: "src/page.ts", expectedCount: 1, public: true },
+    { id: "decoded-comment-data", scenarioId: "native-decoded-sql", title: "Ignore native-decoded comment data", outcome: "no-match", files: [{ path: "src/page.ts", source: `function seed(){db.query("SELECT id FROM runs /* INS\\x45RT INTO runs(id,note) VALUES(4,'new') */");}` }], focusPath: "src/page.ts", expectedCount: 0, public: true }
   ]
 };
 var INSERT_WRITE = /\bINSERT\s+(?:OR\s+\w+\s+)?INTO\s+[\w."'`?$:@-]+\s*(?:\([^)]*\)\s*)?(?:VALUES|SELECT|DEFAULT\s+VALUES)\b/i;
@@ -22745,7 +22765,6 @@ function owningCallableName(node) {
   }
   return null;
 }
-var INSERT_GATE = /insert/i;
 var store_insert_requires_on_conflict_default = createRule({
   name: "store-insert-requires-on-conflict",
   documentation: STORE_INSERT_REQUIRES_ON_CONFLICT_DOCUMENTATION,
@@ -22761,7 +22780,7 @@ var store_insert_requires_on_conflict_default = createRule({
   },
   defaultOptions: [],
   create(context) {
-    if (isTestFile(context.filename) || !INSERT_GATE.test(context.sourceCode.text)) {
+    if (isTestFile(context.filename)) {
       return {};
     }
     return createSqlListener((sql, node) => {
@@ -24314,7 +24333,7 @@ var RULES = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "16.4.6"
+  version: "16.4.7"
 };
 var APPLICATION_ONLY_RULES = [];
 var LIBRARY_IMPORT_POLICY = ["error", {

package/dist/index.d.cts

@@ -927,7 +927,7 @@ type FlatPreset = {
 declare const PLUGIN: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "16.4.6";
+        readonly version: "16.4.7";
     };
     readonly rules: {
         readonly "require-explicit-contract-implementation": DocumentedRule<readonly [], "declareActualContract">;

package/dist/index.d.ts

@@ -927,7 +927,7 @@ type FlatPreset = {
 declare const PLUGIN: {
     readonly meta: {
         readonly name: "@sarj/eslint-plugin";
-        readonly version: "16.4.6";
+        readonly version: "16.4.7";
     };
     readonly rules: {
         readonly "require-explicit-contract-implementation": DocumentedRule<readonly [], "declareActualContract">;

package/dist/index.js

@@ -211,6 +211,7 @@ function deepFreeze(value) {
 }
 
 // src/rules/_paths.ts
+var LINE_TERMINATOR_RE = /[\n\r\u2028\u2029]/u;
 var SCRIPT_FILE_RE = /(?:^|[\\/])scripts[\\/]|\.mjs$/;
 var STORY_FILE_RE = /\.stories\.[cm]?[jt]sx?$/i;
 var STORY_TREE_RE = /(^|\/)stories(?:[_-][^/]*)?\//i;
@@ -260,8 +261,8 @@ function leadingCommentBodies(sourceText) {
   const bodies = [];
   let index = 0;
   if (sourceText.startsWith("#!")) {
-    const shebangEnd = sourceText.indexOf("\n");
-    index = shebangEnd === -1 ? sourceText.length : shebangEnd + 1;
+    const shebangEnd = commentLineEnd(sourceText, 2);
+    index = shebangEnd === sourceText.length ? sourceText.length : shebangEnd + 1;
   }
   while (index < sourceText.length) {
     while (/\s/u.test(sourceText[index] ?? "")) index++;
@@ -275,7 +276,7 @@ function leadingCommentBodies(sourceText) {
       const end = sourceText.indexOf("*/", index + 2);
       if (end === -1) break;
       bodies.push(
-        ...sourceText.slice(index + 2, end).split("\n").map((line) => line.replace(/^\s*\*?\s?/u, "").trim()).filter((line) => line.length > 0)
+        ...sourceText.slice(index + 2, end).split(LINE_TERMINATOR_RE).map((line) => line.replace(/^\s*\*?\s?/u, "").trim()).filter((line) => line.length > 0)
       );
       index = end + 2;
       continue;
@@ -294,8 +295,8 @@ function isScriptFile(filename) {
   return SCRIPT_FILE_RE.test(filename);
 }
 function commentLineEnd(sourceText, start) {
-  const end = sourceText.indexOf("\n", start);
-  return end === -1 ? sourceText.length : end;
+  const end = sourceText.slice(start).search(LINE_TERMINATOR_RE);
+  return end === -1 ? sourceText.length : start + end;
 }
 
 // src/rules/require-explicit-contract-implementation.ts
@@ -5437,7 +5438,9 @@ var NO_ENUM_DOCUMENTATION = {
       focusPath: "src/status.ts",
       expectedCount: 1,
       public: true
-    }
+    },
+    { id: "authored-after-comment", scenarioId: "native-header-boundary", title: "Keep executable authored code in scope", outcome: "match", files: [{ path: "src/status.ts", source: '// ordinary header\u2028const marker="auto-generated file"; enum Mode {Start} console.log(Mode.Start, marker);' }], focusPath: "src/status.ts", expectedCount: 1, public: true },
+    { id: "generated-header", scenarioId: "native-header-boundary", title: "Respect a native generated banner", outcome: "no-match", files: [{ path: "src/status.ts", source: '// auto-generated file\u2028const marker="auto-generated file"; enum Mode {Start} console.log(Mode.Start, marker);' }], focusPath: "src/status.ts", expectedCount: 0, public: true }
   ]
 };
 function matchesAnyPattern(filename, patterns) {
@@ -6800,7 +6803,9 @@ var NO_JSON_STRINGIFY_ERROR_DOCUMENTATION = {
   limitations: ["The rule uses stable local catch bindings and unshadowed built-in constructors, not runtime type information. Custom replacers are left to their serializer contract; a catch value is not guaranteed to be an Error."],
   examples: [
     { id: "explicit-error-message", title: "Narrow an unknown catch value before selecting fields", outcome: "no-match", files: [{ path: "src/report.ts", source: "try { f(); } catch (err) { JSON.stringify({ error: err instanceof Error ? err.message : String(err) }); }" }], focusPath: "src/report.ts", expectedCount: 0, public: true },
-    { id: "stringified-error", title: "Do not stringify an Error object", outcome: "match", files: [{ path: "src/report.ts", source: "try { f(); } catch (err) { JSON.stringify({ error: err }); }" }], focusPath: "src/report.ts", expectedCount: 1, public: true }
+    { id: "stringified-error", title: "Do not stringify an Error object", outcome: "match", files: [{ path: "src/report.ts", source: "try { f(); } catch (err) { JSON.stringify({ error: err }); }" }], focusPath: "src/report.ts", expectedCount: 1, public: true },
+    { id: "shadowed-error-binding", scenarioId: "binding-provenance", title: "Keep native binding provenance", outcome: "match", files: [{ path: "src/error.ts", source: 'function probe(){try{throw {id:1};}catch(err){if(err instanceof Error)return err.message;{const err=new Error("lost");return JSON.stringify(err);}}}\nconsole.log(probe());' }], focusPath: "src/error.ts", expectedCount: 1, public: true },
+    { id: "escaped-fallback-binding", scenarioId: "binding-provenance", title: "Keep native binding provenance", outcome: "no-match", files: [{ path: "src/error.ts", source: "function probe(){try{throw {id:1};}catch(err){if(err instanceof Error)return err.message;return JSON.stringify(\\u0065rr);}}\nconsole.log(probe());" }], focusPath: "src/error.ts", expectedCount: 0, public: true }
   ]
 };
 var SAFE_STRING_PROPS = /* @__PURE__ */ new Set(["message", "stack", "name"]);
@@ -6830,25 +6835,25 @@ var BUILTIN_ERROR_CONSTRUCTORS = /* @__PURE__ */ new Set([
   "TypeError",
   "URIError"
 ]);
-function identifierIsProvenError(identifier, scope) {
-  const variable = ASTUtils14.findVariable(scope, identifier.name);
+function identifierIsProvenError(identifier, sourceCode) {
+  const variable = ASTUtils14.findVariable(sourceCode.getScope(identifier), identifier.name);
   if (variable === null || variable.defs.length !== 1 || variable.references.some((reference) => reference.isWrite() && reference.init !== true)) return false;
   const definition = variable.defs[0];
   if (definition?.type === "CatchClause") return true;
   if (definition?.type !== "Variable") return false;
   const initializer = definition.node.init;
-  return initializer?.type === "NewExpression" && initializer.callee.type === "Identifier" && BUILTIN_ERROR_CONSTRUCTORS.has(initializer.callee.name) && isGlobalIdentifier(initializer.callee.name, scope);
+  return initializer?.type === "NewExpression" && initializer.callee.type === "Identifier" && BUILTIN_ERROR_CONSTRUCTORS.has(initializer.callee.name) && isGlobalIdentifier(initializer.callee.name, sourceCode.getScope(initializer.callee));
 }
 function isGlobalIdentifier(name, scope) {
   const binding = ASTUtils14.findVariable(scope, name);
   return binding === null || binding.defs.length === 0;
 }
-function positiveErrorSubject(test) {
-  return instanceofErrorSubject(test) ?? typeGuardSubject(test);
+function positiveErrorSubject(test, sourceCode) {
+  return instanceofErrorSubject(test, sourceCode) ?? typeGuardSubject(test);
 }
 var TYPE_GUARD_PATTERN = /^(is|has)[A-Z]/;
-function instanceofErrorSubject(test) {
-  if (test.type === "BinaryExpression" && test.operator === "instanceof" && test.right.type === "Identifier" && test.right.name === "Error") {
+function instanceofErrorSubject(test, sourceCode) {
+  if (test.type === "BinaryExpression" && test.operator === "instanceof" && test.right.type === "Identifier" && test.right.name === "Error" && isGlobalIdentifier("Error", sourceCode.getScope(test.right))) {
     return test.left;
   }
   return null;
@@ -6862,36 +6867,34 @@ function typeGuardSubject(test) {
   return null;
 }
 function isNarrowedByEarlyReturn(node, argExpr, sourceCode) {
-  const argText = sourceCode.getText(argExpr);
   let current = node.parent;
   while (current) {
     if (current.type === "BlockStatement" || current.type === "Program") {
-      if (hasEarlierErrorGuard(current.body, node, argText, sourceCode)) return true;
+      if (hasEarlierErrorGuard(current.body, node, argExpr, sourceCode)) return true;
     }
     current = current.parent;
   }
   return false;
 }
 function isGuardedByInstanceofError(node, argExpr, sourceCode) {
-  const argText = sourceCode.getText(argExpr);
-  const sameSubject = (subject) => sourceCode.getText(subject) === argText;
+  const sameSubject = (subject) => sameSubjectBinding(subject, argExpr, sourceCode);
   let current = node.parent;
   while (current) {
     if (current.type === "ConditionalExpression") {
-      const subject = positiveErrorSubject(current.test);
+      const subject = positiveErrorSubject(current.test, sourceCode);
       if (subject && sameSubject(subject) && nodeWithin(node, current.alternate)) {
         return true;
       }
-      const negated = negatedInstanceofErrorSubject(current.test);
+      const negated = negatedInstanceofErrorSubject(current.test, sourceCode);
       if (negated && sameSubject(negated) && nodeWithin(node, current.consequent)) {
         return true;
       }
     } else if (current.type === "IfStatement") {
-      const subject = positiveErrorSubject(current.test);
+      const subject = positiveErrorSubject(current.test, sourceCode);
       if (subject && sameSubject(subject) && nodeWithin(node, current.alternate)) {
         return true;
       }
-      const negated = negatedInstanceofErrorSubject(current.test);
+      const negated = negatedInstanceofErrorSubject(current.test, sourceCode);
       if (negated && sameSubject(negated) && nodeWithin(node, current.consequent)) {
         return true;
       }
@@ -6900,12 +6903,21 @@ function isGuardedByInstanceofError(node, argExpr, sourceCode) {
   }
   return false;
 }
-function negatedInstanceofErrorSubject(test) {
+function negatedInstanceofErrorSubject(test, sourceCode) {
   if (test.type === "UnaryExpression" && test.operator === "!") {
-    return positiveErrorSubject(test.argument);
+    return positiveErrorSubject(test.argument, sourceCode);
   }
   return null;
 }
+function sameSubjectBinding(subject, value, sourceCode) {
+  const left = unwrapExpression(subject);
+  const right = unwrapExpression(value);
+  if (left.type === "Identifier" && right.type === "Identifier") {
+    const binding = ASTUtils14.findVariable(sourceCode.getScope(left), left.name);
+    return binding !== null && binding === ASTUtils14.findVariable(sourceCode.getScope(right), right.name);
+  }
+  return sourceCode.getText(subject) === sourceCode.getText(value);
+}
 function nodeWithin(node, container) {
   return container !== null && node.range[0] >= container.range[0] && node.range[1] <= container.range[1];
 }
@@ -6933,21 +6945,21 @@ function directLiteralValues(argument) {
   }
   return argument.type === "SpreadElement" ? [] : [argument];
 }
-function expressionSuggestsError(expression, scope) {
+function expressionSuggestsError(expression, sourceCode) {
   expression = unwrapExpression(expression);
   const unwrappedExpressionCallee = expression.type === "CallExpression" || expression.type === "NewExpression" ? unwrapExpression(expression.callee) : null;
   if (expression.type === "Identifier") {
-    return identifierIsProvenError(expression, scope);
+    return identifierIsProvenError(expression, sourceCode);
   }
   if (expression.type === "NewExpression" && unwrappedExpressionCallee?.type === "Identifier") {
-    return BUILTIN_ERROR_CONSTRUCTORS.has(unwrappedExpressionCallee.name) && isGlobalIdentifier(unwrappedExpressionCallee.name, scope);
+    return BUILTIN_ERROR_CONSTRUCTORS.has(unwrappedExpressionCallee.name) && isGlobalIdentifier(unwrappedExpressionCallee.name, sourceCode.getScope(unwrappedExpressionCallee));
   }
-  return expression.type === "MemberExpression" && memberSuggestsError(expression, scope);
+  return expression.type === "MemberExpression" && memberSuggestsError(expression, sourceCode);
 }
-function memberSuggestsError(member, scope) {
+function memberSuggestsError(member, sourceCode) {
   const propName2 = ASTUtils14.getPropertyName(member);
   const base = member.object;
-  const baseSuggestsError = base.type === "Identifier" && identifierIsProvenError(base, scope);
+  const baseSuggestsError = base.type === "Identifier" && identifierIsProvenError(base, sourceCode);
   if (baseSuggestsError) {
     if (propName2 === null) {
       return true;
@@ -6987,7 +6999,7 @@ var no_json_stringify_error_default = createRule({
         const replacer = node.arguments[1] === void 0 ? void 0 : unwrapExpression(node.arguments[1]);
         if (replacer !== void 0 && !(replacer.type === "Literal" && replacer.value === null) && !(replacer.type === "Identifier" && replacer.name === "undefined" && isGlobalIdentifier("undefined", scope))) return;
         const unsafeValue = directLiteralValues(firstArg).find(
-          (value) => expressionSuggestsError(value, scope) && !isGuardedByInstanceofError(node, value, context.sourceCode) && !isNarrowedByEarlyReturn(node, value, context.sourceCode)
+          (value) => expressionSuggestsError(value, context.sourceCode) && !isGuardedByInstanceofError(node, value, context.sourceCode) && !isNarrowedByEarlyReturn(node, value, context.sourceCode)
         );
         if (unsafeValue === void 0) {
           return;
@@ -7000,14 +7012,14 @@ var no_json_stringify_error_default = createRule({
     };
   }
 });
-function hasEarlierErrorGuard(statements, node, argText, sourceCode) {
+function hasEarlierErrorGuard(statements, node, argExpr, sourceCode) {
   for (const stmt of statements) {
     if (stmt.range[0] >= node.range[0]) {
       break;
     }
     if (stmt.type === "IfStatement" && stmt.alternate === null && branchTerminates(stmt.consequent)) {
-      const subject = positiveErrorSubject(stmt.test);
-      if (subject && sourceCode.getText(subject) === argText) {
+      const subject = positiveErrorSubject(stmt.test, sourceCode);
+      if (subject && sameSubjectBinding(subject, argExpr, sourceCode)) {
         return true;
       }
     }
@@ -8824,11 +8836,12 @@ var NO_OFFSET_PAGINATION_DOCUMENTATION = {
   limitations: ["A SELECT/FROM query shape or adjacent LIMIT/OFFSET fragment is required. Isolated OFFSET fragments and test files are excluded; this lexical context does not prove a database execution sink. Performance and concurrent-write behavior depend on indexes, ordering, isolation, and dialect; bounded pages and random page access can justify OFFSET."],
   examples: [
     { id: "keyset-pagination", title: "Page from a stable cursor", outcome: "no-match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT id FROM runs WHERE id > ? ORDER BY id LIMIT ?`).all();" }], focusPath: "src/runs.ts", expectedCount: 0, public: true },
-    { id: "offset-pagination", title: "Do not page by offset", outcome: "match", files: [{ path: "src/runs.ts", source: "db.query(`SELECT id FROM runs ORDER BY id LIMIT ? OFFSET ?`);" }], focusPath: "src/runs.ts", expectedCount: 1, public: true }
+    { id: "offset-pagination", title: "Do not page by offset", outcome: "match", files: [{ path: "src/runs.ts", source: "db.query(`SELECT id FROM runs ORDER BY id LIMIT ? OFFSET ?`);" }], focusPath: "src/runs.ts", expectedCount: 1, public: true },
+    { id: "decoded-query", scenarioId: "native-decoded-sql", title: "Inspect native-decoded query text", outcome: "match", files: [{ path: "src/page.ts", source: 'db.query("SELECT id FROM runs ORDER BY id LIMIT 1 OFF\\u0053ET 1");' }], focusPath: "src/page.ts", expectedCount: 1, public: true },
+    { id: "decoded-comment-data", scenarioId: "native-decoded-sql", title: "Ignore native-decoded comment data", outcome: "no-match", files: [{ path: "src/page.ts", source: 'db.query("SELECT id FROM runs /* OFF\\x53ET 1 */");' }], focusPath: "src/page.ts", expectedCount: 0, public: true }
   ]
 };
 var OFFSET_PAGINATION = /\bOFFSET\s+(?:%s|%\(\w+\)s|\?\d*|:\w+|@\w+|\$\d+|\d+)/i;
-var OFFSET_GATE = /offset/i;
 var PAGINATION_CONTEXT = /\bSELECT\b[\s\S]*\bFROM\b[\s\S]*\bOFFSET\b|\bLIMIT\s+(?:%s|%\(\w+\)s|\?\d*|:\w+|@\w+|\$\d+|\d+)\s+OFFSET\b/i;
 var no_offset_pagination_default = createRule({
   name: "no-offset-pagination",
@@ -8845,7 +8858,7 @@ var no_offset_pagination_default = createRule({
   },
   defaultOptions: [],
   create(context) {
-    if (isTestFile(context.filename) || !OFFSET_GATE.test(context.sourceCode.text)) {
+    if (isTestFile(context.filename)) {
       return {};
     }
     return createSqlListener((sql, node) => {
@@ -10962,7 +10975,9 @@ var NO_SELECT_STAR_DOCUMENTATION = {
   limitations: ["Only statically visible embedded SQL is checked; quoted strings (including PostgreSQL dollar strings), comments, function arguments such as COUNT(*), and stars inside EXISTS are excluded. This is a bounded lexical scan, not a complete SQL parser."],
   examples: [
     { id: "explicit-projection", title: "Select the required columns", outcome: "no-match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT id, status FROM runs`).all();" }], focusPath: "src/runs.ts", expectedCount: 0, public: true },
-    { id: "wildcard-projection", title: "Do not select every column", outcome: "match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT * FROM runs`).all();" }], focusPath: "src/runs.ts", expectedCount: 1, public: true }
+    { id: "wildcard-projection", title: "Do not select every column", outcome: "match", files: [{ path: "src/runs.ts", source: "db.prepare(`SELECT * FROM runs`).all();" }], focusPath: "src/runs.ts", expectedCount: 1, public: true },
+    { id: "decoded-query", scenarioId: "native-decoded-sql", title: "Inspect native-decoded query text", outcome: "match", files: [{ path: "src/page.ts", source: 'db.query("SEL\\u0045CT * FROM runs");' }], focusPath: "src/page.ts", expectedCount: 1, public: true },
+    { id: "decoded-comment-data", scenarioId: "native-decoded-sql", title: "Ignore native-decoded comment data", outcome: "no-match", files: [{ path: "src/page.ts", source: 'db.query("SEL\\x45CT id FROM runs /* SELECT * FROM runs */");' }], focusPath: "src/page.ts", expectedCount: 0, public: true }
   ]
 };
 var QUERY_SHAPE = /\bSELECT\b[\s\S]*?\bFROM\b/i;
@@ -10970,7 +10985,6 @@ var SELECT_KEYWORD = /\bSELECT\b/gi;
 var FROM_KEYWORD = /^FROM\b/i;
 var EXISTS_BEFORE = /\bEXISTS\s*\(\s*$/i;
 var QUALIFIED_PREFIX = /\w\.$/;
-var SELECT_GATE = /select/i;
 function hasRealSelectStar(sql) {
   const selects = [...sql.matchAll(SELECT_KEYWORD)].map((m) => m.index);
   for (let pos = 0; pos < sql.length; pos++) {
@@ -11019,7 +11033,7 @@ var no_select_star_default = createRule({
   },
   defaultOptions: [],
   create(context) {
-    if (isTestFile(context.filename) || !SELECT_GATE.test(context.sourceCode.text)) {
+    if (isTestFile(context.filename)) {
       return {};
     }
     return createSqlListener((sql, node) => {
@@ -18970,16 +18984,20 @@ var PREFER_SWITCH_FOR_REPEATED_EQUALITY_DOCUMENTATION = {
   ],
   examples: [
     { id: "switch-dispatch", title: "Make finite dispatch explicit", outcome: "no-match", files: [{ path: "src/render.ts", source: "switch (kind) { case 'a': return a(); case 'b': return b(); case 'c': return c(); default: return fallback(); }" }], focusPath: "src/render.ts", expectedCount: 0, public: true },
-    { id: "repeated-equality", title: "Avoid repeating the discriminant", outcome: "match", files: [{ path: "src/render.ts", source: "if (kind === 'a') return a(); else if (kind === 'b') return b(); else if (kind === 'c') return c();" }], focusPath: "src/render.ts", expectedCount: 1, public: true }
+    { id: "repeated-equality", title: "Avoid repeating the discriminant", outcome: "match", files: [{ path: "src/render.ts", source: "if (kind === 'a') return a(); else if (kind === 'b') return b(); else if (kind === 'c') return c();" }], focusPath: "src/render.ts", expectedCount: 1, public: true },
+    { id: "escaped-middle", scenarioId: "native-discriminant", title: "Use native identifier identity", outcome: "match", files: [{ path: "src/dispatch.ts", source: `function probe(kind){if(kind==='a')return 1;else if(\\u006bind==='b')return 2;else if(kind==='c')return 3;return 0;}
+console.log(JSON.stringify(["a","b","c","d"].map(probe)));` }], focusPath: "src/dispatch.ts", expectedCount: 1, public: true },
+    { id: "different-discriminants", scenarioId: "native-discriminant", title: "Use native identifier identity", outcome: "no-match", files: [{ path: "src/dispatch.ts", source: `function probe(kind){const other="other";if(kind==='a')return 1;else if(other==='b')return 2;else if(kind==='c')return 3;return 0;}
+console.log(JSON.stringify(["a","b","c","d"].map(probe)));` }], focusPath: "src/dispatch.ts", expectedCount: 0, public: true }
   ]
 };
-function discriminantText(sourceCode, test) {
+function discriminantName(test) {
   if (test.type !== AST_NODE_TYPES95.BinaryExpression || test.operator !== "===") return null;
   const leftIsCase = isCaseValue(test.left);
   const rightIsCase = isCaseValue(test.right);
   if (leftIsCase === rightIsCase) return null;
   const discriminant = leftIsCase ? test.right : test.left;
-  return discriminant.type === AST_NODE_TYPES95.Identifier ? sourceCode.getText(discriminant) : null;
+  return discriminant.type === AST_NODE_TYPES95.Identifier ? discriminant.name : null;
 }
 function isCaseValue(node) {
   if (node.type === AST_NODE_TYPES95.Literal) return true;
@@ -19003,12 +19021,12 @@ var prefer_switch_for_repeated_equality_default = createRule({
     return {
       IfStatement(node) {
         if (node.parent.type === AST_NODE_TYPES95.IfStatement && node.parent.alternate === node) return;
-        const first = discriminantText(context.sourceCode, node.test);
+        const first = discriminantName(node.test);
         if (first === null) return;
         let count = 1;
         let current = node.alternate;
         while (current?.type === AST_NODE_TYPES95.IfStatement) {
-          if (discriminantText(context.sourceCode, current.test) !== first) return;
+          if (discriminantName(current.test) !== first) return;
           count += 1;
           current = current.alternate;
         }
@@ -22746,7 +22764,9 @@ var STORE_INSERT_REQUIRES_ON_CONFLICT_DOCUMENTATION = {
   limitations: ["Only the nearest statically named callable is considered; top-level inserts and anonymous callbacks are excluded. Recognized conflict syntax does not prove idempotence or concurrency safety: WHERE NOT EXISTS can race, and INSERT OR REPLACE can delete an existing row. Review unique constraints and dialect semantics manually."],
   examples: [
     { id: "conflict-safe-insert", title: "Review the conflict policy for a replayed insert", outcome: "no-match", files: [{ path: "src/store.ts", source: "function seed() { db.prepare(`INSERT INTO runs (id) VALUES (?) ON CONFLICT(id) DO NOTHING`).run(); }" }], focusPath: "src/store.ts", expectedCount: 0, public: true },
-    { id: "bare-insert", title: "Review a bare insert in a replay-named callable", outcome: "match", files: [{ path: "src/store.ts", source: "function seed() { db.prepare(`INSERT INTO runs (id) VALUES (?)`).run(); }" }], focusPath: "src/store.ts", expectedCount: 1, public: true }
+    { id: "bare-insert", title: "Review a bare insert in a replay-named callable", outcome: "match", files: [{ path: "src/store.ts", source: "function seed() { db.prepare(`INSERT INTO runs (id) VALUES (?)`).run(); }" }], focusPath: "src/store.ts", expectedCount: 1, public: true },
+    { id: "decoded-query", scenarioId: "native-decoded-sql", title: "Inspect native-decoded query text", outcome: "match", files: [{ path: "src/page.ts", source: `function seed(){db.query("INS\\u0045RT INTO runs(id,note) VALUES(4,'new')");}` }], focusPath: "src/page.ts", expectedCount: 1, public: true },
+    { id: "decoded-comment-data", scenarioId: "native-decoded-sql", title: "Ignore native-decoded comment data", outcome: "no-match", files: [{ path: "src/page.ts", source: `function seed(){db.query("SELECT id FROM runs /* INS\\x45RT INTO runs(id,note) VALUES(4,'new') */");}` }], focusPath: "src/page.ts", expectedCount: 0, public: true }
   ]
 };
 var INSERT_WRITE = /\bINSERT\s+(?:OR\s+\w+\s+)?INTO\s+[\w."'`?$:@-]+\s*(?:\([^)]*\)\s*)?(?:VALUES|SELECT|DEFAULT\s+VALUES)\b/i;
@@ -22766,7 +22786,6 @@ function owningCallableName(node) {
   }
   return null;
 }
-var INSERT_GATE = /insert/i;
 var store_insert_requires_on_conflict_default = createRule({
   name: "store-insert-requires-on-conflict",
   documentation: STORE_INSERT_REQUIRES_ON_CONFLICT_DOCUMENTATION,
@@ -22782,7 +22801,7 @@ var store_insert_requires_on_conflict_default = createRule({
   },
   defaultOptions: [],
   create(context) {
-    if (isTestFile(context.filename) || !INSERT_GATE.test(context.sourceCode.text)) {
+    if (isTestFile(context.filename)) {
       return {};
     }
     return createSqlListener((sql, node) => {
@@ -24338,7 +24357,7 @@ var RULES = {
 };
 var meta = {
   name: "@sarj/eslint-plugin",
-  version: "16.4.6"
+  version: "16.4.7"
 };
 var APPLICATION_ONLY_RULES = [];
 var LIBRARY_IMPORT_POLICY = ["error", {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sarj/eslint-plugin",
-  "version": "16.4.6",
+  "version": "16.4.7",
   "packageManager": "npm@12.1.0",
   "description": "Custom ESLint rules for hypermodern TypeScript / React / Next.js projects",
   "type": "module",