eslint-plugin-no-mistakes 0.74.0 → 0.76.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-no-mistakes",
-  "version": "0.74.0",
+  "version": "0.76.0",
   "description": "ESLint and Oxlint rules that keep code static enough for no-mistakes analyzers and coding agents",
   "license": "MIT",
   "repository": {

package/src/rules/postgres-cursor-call-contract.js

@@ -94,6 +94,18 @@ module.exports = rule(
           includeFiles: { type: "array", items: { type: "string" } },
           annotation: { type: "string" },
           sqlTagModules: { type: "array", items: { type: "string" } },
+          trustedSqlTags: {
+            type: "array",
+            items: {
+              type: "object",
+              additionalProperties: false,
+              required: ["module", "name"],
+              properties: {
+                module: { type: "string" },
+                name: { type: "string" },
+              },
+            },
+          },
         },
       },
     ],

package/src/rules/postgres-cursor-options.js

@@ -34,6 +34,27 @@ function optionalStringArray(value, present) {
   return Array.isArray(value) && value.every((entry) => typeof entry === "string") ? value : null;
 }
 
+function trustedSqlTagEntry(entry) {
+  return (
+    entry !== null &&
+    typeof entry === "object" &&
+    !Array.isArray(entry) &&
+    typeof entry.module === "string" &&
+    typeof entry.name === "string"
+  );
+}
+
+function parseTrustedSqlTags(value, present) {
+  if (!present) return undefined;
+  if (!Array.isArray(value)) return null;
+  const tags = [];
+  for (const entry of value) {
+    if (!trustedSqlTagEntry(entry)) return null;
+    tags.push({ module: entry.module, name: entry.name });
+  }
+  return tags;
+}
+
 function resolveCursorContractOptions(raw) {
   if (raw === null || typeof raw !== "object" || Array.isArray(raw)) return null;
   const modules = stringArray(raw.modules);
@@ -44,7 +65,14 @@ function resolveCursorContractOptions(raw) {
   const exclude = optionalStringArray(raw.exclude, raw.exclude !== undefined);
   const includeFiles = optionalStringArray(raw.includeFiles, raw.includeFiles !== undefined);
   const sqlTagModules = optionalStringArray(raw.sqlTagModules, raw.sqlTagModules !== undefined);
-  if (include === null || exclude === null || includeFiles === null || sqlTagModules === null) {
+  const trustedSqlTags = parseTrustedSqlTags(raw.trustedSqlTags, raw.trustedSqlTags !== undefined);
+  if (
+    include === null ||
+    exclude === null ||
+    includeFiles === null ||
+    sqlTagModules === null ||
+    trustedSqlTags === null
+  ) {
     return null;
   }
   let annotation;
@@ -64,6 +92,7 @@ function resolveCursorContractOptions(raw) {
     exclude: exclude ?? [],
     includeFiles: (includeFiles ?? []).map((file) => file.replace(/^(?:\.\/)+/, "")),
     sqlTagModules: new Set(sqlTagModules ?? DEFAULT_SQL_TAG_MODULES),
+    trustedSqlTags: trustedSqlTags ?? [],
     annotation,
   };
 }

package/src/rules/postgres-cursor-query.js

@@ -38,6 +38,37 @@ function firstQuasiText(template, allowRaw) {
   return quasi.value?.cooked ?? (allowRaw ? (quasi.value?.raw ?? null) : null);
 }
 
+function importedBindingName(specifier) {
+  const imported = specifier?.imported;
+  if (!imported) return null;
+  return imported.type === "Literal" ? String(imported.value) : imported.name;
+}
+
+// Named opt-in only. An empty module must not match every import.
+function matchesTrustedSqlTag(source, imported, tag) {
+  if (!tag.module || !tag.name || tag.name !== imported) return false;
+  return source === tag.module || String(source).startsWith(`${tag.module}/`);
+}
+
+function trustedNamedSqlImport(specifier, declaration, source, config) {
+  if (specifier?.type !== "ImportSpecifier") return false;
+  if (specifier.importKind === "type" || declaration?.importKind === "type") return false;
+  if (declaration?.type !== "ImportDeclaration" || typeof source !== "string") return false;
+  const imported = importedBindingName(specifier);
+  return (config.trustedSqlTags ?? []).some((tag) => matchesTrustedSqlTag(source, imported, tag));
+}
+
+function defaultSqlTagImport(specifier, declaration, source, config) {
+  return (
+    specifier.type === "ImportDefaultSpecifier" &&
+    specifier.importKind !== "type" &&
+    declaration?.type === "ImportDeclaration" &&
+    declaration.importKind !== "type" &&
+    typeof source === "string" &&
+    config.sqlTagModules.has(source)
+  );
+}
+
 function exactSqlTag(context, tag, helpers, config) {
   const identifier = helpers.unwrap(tag);
   if (identifier?.type !== "Identifier") return false;
@@ -46,14 +77,10 @@ function exactSqlTag(context, tag, helpers, config) {
     const specifier = candidate.node;
     const declaration = candidate.parent || specifier.parent;
     const source = declaration?.source?.value;
+    if (candidate.type !== "ImportBinding") return false;
     return (
-      candidate.type === "ImportBinding" &&
-      specifier.type === "ImportDefaultSpecifier" &&
-      specifier.importKind !== "type" &&
-      declaration?.type === "ImportDeclaration" &&
-      declaration.importKind !== "type" &&
-      typeof source === "string" &&
-      config.sqlTagModules.has(source)
+      trustedNamedSqlImport(specifier, declaration, source, config) ||
+      defaultSqlTagImport(specifier, declaration, source, config)
     );
   });
   return Boolean(

package/src/rules/postgres-executor.js

@@ -21,6 +21,7 @@ function executorOptionDefaults(options = {}) {
     executorNames: options.executorNames ?? (options.importSpecifier ? DEFAULT_EXECUTOR_NAMES : []),
     executorFactoryNames: options.executorFactoryNames ?? [],
     executorTypeNames: options.executorTypeNames ?? [],
+    trustedSqlTags: options.trustedSqlTags ?? [],
     owners: options.owners ?? [],
     chunkFunctionNames: options.chunkFunctionNames ?? DEFAULT_CHUNK_FUNCTION_NAMES,
   };
@@ -34,6 +35,18 @@ function executorOptionSchema(extraProperties = {}) {
       executorNames: { type: "array", items: { type: "string" } },
       executorFactoryNames: { type: "array", items: { type: "string" } },
       executorTypeNames: { type: "array", items: { type: "string" } },
+      trustedSqlTags: {
+        type: "array",
+        items: {
+          type: "object",
+          additionalProperties: false,
+          required: ["module", "name"],
+          properties: {
+            module: { type: "string" },
+            name: { type: "string" },
+          },
+        },
+      },
       ...extraProperties,
     },
     additionalProperties: false,