eslint-plugin-no-mistakes 0.70.0 → 0.72.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-no-mistakes",
-  "version": "0.70.0",
+  "version": "0.72.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-executor.js

@@ -2,7 +2,7 @@
 
 const { quasiText, sqlText, unwrapTs } = require("./postgres-query-text");
 
-const DEFAULT_IMPORT_SPECIFIER = "@data-stores/psql";
+const DEFAULT_IMPORT_SPECIFIER = "";
 const DEFAULT_EXECUTOR_NAMES = ["query", "read", "write"];
 const DEFAULT_CHUNK_FUNCTION_NAMES = ["chunkArray"];
 const TRANSACTION_IMPORTS = new Set(["withTransaction", "withTransactionOptions"]);
@@ -10,9 +10,14 @@ const QUERY_PROPERTY = "query";
 const TRANSACTION_COMMAND = /^\s*(?:BEGIN|COMMIT|ROLLBACK)\b/i;
 
 function executorOptionDefaults(options = {}) {
+  if (!options.importSpecifier && !Array.isArray(options.executorNames)) {
+    throw new Error(
+      "PostgreSQL option importSpecifier: set importSpecifier (or executorNames) to select executor calls; set executorNames: [] to select no executor calls (see docs/migrations/explicit-postgres-executors.md)",
+    );
+  }
   return {
     importSpecifier: options.importSpecifier ?? DEFAULT_IMPORT_SPECIFIER,
-    executorNames: options.executorNames ?? DEFAULT_EXECUTOR_NAMES,
+    executorNames: options.executorNames ?? (options.importSpecifier ? DEFAULT_EXECUTOR_NAMES : []),
     owners: options.owners ?? [],
     chunkFunctionNames: options.chunkFunctionNames ?? DEFAULT_CHUNK_FUNCTION_NAMES,
   };
@@ -39,15 +44,16 @@ function importedName(specifier) {
 function executorBindings(program, options = {}) {
   const bindings = new Set();
   const { importSpecifier, executorNames } = executorOptionDefaults(options);
+  bindings.queryMembers = Boolean(importSpecifier) || executorNames.includes(QUERY_PROPERTY);
   for (const statement of program?.body ?? []) {
     if (statement.type !== "ImportDeclaration") continue;
     if (statement.importKind === "type") continue;
-    if (statement.source?.value !== importSpecifier) continue;
+    if (importSpecifier && statement.source?.value !== importSpecifier) continue;
     for (const specifier of statement.specifiers ?? []) {
       if (specifier.type !== "ImportSpecifier") continue;
       if (specifier.importKind === "type") continue;
       const imported = importedName(specifier);
-      if (TRANSACTION_IMPORTS.has(imported)) bindings.add(QUERY_PROPERTY);
+      if (importSpecifier && TRANSACTION_IMPORTS.has(imported)) bindings.add(QUERY_PROPERTY);
       if (imported && executorNames.includes(imported)) bindings.add(specifier.local.name);
     }
   }
@@ -75,7 +81,11 @@ function calleeName(call, bindings) {
   const callee = unwrapTs(call?.callee);
   if (!callee) return null;
   if (callee.type === "Identifier" && bindings?.has(callee.name)) return callee.name;
-  if (callee.type === "MemberExpression" && memberPropertyName(callee) === QUERY_PROPERTY) {
+  if (
+    bindings?.queryMembers !== false &&
+    callee.type === "MemberExpression" &&
+    memberPropertyName(callee) === QUERY_PROPERTY
+  ) {
     return QUERY_PROPERTY;
   }
   return null;