sqlstack 3.4.0 → 3.5.0

package/dist/cjs/sql.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlFragment = void 0;
+exports.isSqlFragment = isSqlFragment;
+exports.compileFragment = compileFragment;
 exports.sql = sql;
 /**
  * Tagged template literal for SQL queries with `?` placeholders.
@@ -11,45 +13,82 @@ exports.sql = sql;
  *   sql`UPDATE users SET :update(${data}) WHERE id = ${id}`
  *   sql`SELECT * FROM users WHERE :filter(${criteria})`
  *   sql`INSERT INTO users :batch_insert(${rows})`
+ *
+ * Execute a fragment with `run(db, fragment)` (or `run(fragment)` inside a
+ * @Query method): run binds it for the target dialect (`?` for SQLite/MySQL,
+ * `$1..` for Postgres) and wraps failures in DatabaseError.
  */
 const MACRO_OPEN = /:(insert|update|filter|batch_insert)\s*\(\s*$/i;
 const MACRO_CLOSE = /^\s*\)/;
+// Cross-copy identity for fragments: duplicated module instances (npm link,
+// dual ESM/CJS loads) each define their own SqlFragment class, so `instanceof`
+// alone would misclassify a fragment built by another copy.
+const FRAGMENT_BRAND = Symbol.for('noego.sqlstack.SqlFragment');
 class SqlFragment {
     constructor(strings, values) {
         this.strings = strings;
         this.values = values;
     }
+    /**
+     * Compile to SQL with `?` placeholders and the matching parameter list.
+     *
+     * @throws {Error} When a binder macro (`:insert`, `:update`, `:filter`,
+     * `:batch_insert`) receives invalid input. `run(...)` wraps this in
+     * DatabaseError with the original error in `.cause`.
+     */
     toSQL() {
-        const segments = [...this.strings];
-        const sqlParts = [];
-        const params = [];
-        for (let i = 0; i < segments.length; i++) {
-            if (i < this.values.length) {
-                const openMatch = segments[i].match(MACRO_OPEN);
-                const closeMatch = segments[i + 1]?.match(MACRO_CLOSE);
-                if (openMatch && closeMatch) {
-                    // Binder macro: trim the macro syntax and expand
-                    sqlParts.push(segments[i].slice(0, -openMatch[0].length));
-                    segments[i + 1] = segments[i + 1].slice(closeMatch[0].length);
-                    const { text, params: expanded } = expandMacro(openMatch[1].toLowerCase(), this.values[i]);
-                    sqlParts.push(text);
-                    params.push(...expanded);
-                }
-                else {
-                    sqlParts.push(segments[i]);
-                    sqlParts.push('?');
-                    params.push(this.values[i]);
-                }
+        return compileParts(this.strings, this.values, () => '?');
+    }
+}
+exports.SqlFragment = SqlFragment;
+Object.defineProperty(SqlFragment.prototype, FRAGMENT_BRAND, { value: true });
+/** @internal True for a SqlFragment from this or any other sqlstack copy. */
+function isSqlFragment(value) {
+    if (value instanceof SqlFragment)
+        return true;
+    return (typeof value === 'object' &&
+        value !== null &&
+        value[FRAGMENT_BRAND] === true);
+}
+/**
+ * @internal Compile a fragment for a dialect: `$1, $2, ...` for Postgres,
+ * `?` for SQLite and MySQL. Throws plain Error on invalid macro input
+ * (callers in run() wrap it).
+ */
+function compileFragment(fragment, dialect) {
+    let next = 0;
+    const placeholder = dialect === 'postgres' ? () => `$${++next}` : () => '?';
+    return compileParts(fragment.strings, fragment.values, placeholder);
+}
+function compileParts(strings, values, placeholder) {
+    const segments = [...strings];
+    const sqlParts = [];
+    const params = [];
+    for (let i = 0; i < segments.length; i++) {
+        if (i < values.length) {
+            const openMatch = segments[i].match(MACRO_OPEN);
+            const closeMatch = segments[i + 1]?.match(MACRO_CLOSE);
+            if (openMatch && closeMatch) {
+                // Binder macro: trim the macro syntax and expand
+                sqlParts.push(segments[i].slice(0, -openMatch[0].length));
+                segments[i + 1] = segments[i + 1].slice(closeMatch[0].length);
+                const { text, params: expanded } = expandMacro(openMatch[1].toLowerCase(), values[i], placeholder);
+                sqlParts.push(text);
+                params.push(...expanded);
             }
             else {
                 sqlParts.push(segments[i]);
+                sqlParts.push(placeholder());
+                params.push(values[i]);
             }
         }
-        return { sql: sqlParts.join(''), params };
+        else {
+            sqlParts.push(segments[i]);
+        }
     }
+    return { sql: sqlParts.join(''), params };
 }
-exports.SqlFragment = SqlFragment;
-function expandMacro(type, value) {
+function expandMacro(type, value, placeholder) {
     switch (type) {
         case 'insert': {
             assertPlainObject(value, ':insert()');
@@ -58,7 +97,7 @@ function expandMacro(type, value) {
             if (keys.length === 0)
                 throw new Error(':insert() requires at least one column');
             const cols = keys.join(', ');
-            const placeholders = keys.map(() => '?').join(', ');
+            const placeholders = keys.map(() => placeholder()).join(', ');
             return { text: `(${cols}) VALUES (${placeholders})`, params: keys.map(k => obj[k]) };
         }
         case 'update': {
@@ -67,7 +106,7 @@ function expandMacro(type, value) {
             if (entries.length === 0)
                 throw new Error(':update() requires at least one defined column');
             return {
-                text: entries.map(([k]) => `${k} = ?`).join(', '),
+                text: entries.map(([k]) => `${k} = ${placeholder()}`).join(', '),
                 params: entries.map(([, v]) => v),
             };
         }
@@ -77,7 +116,7 @@ function expandMacro(type, value) {
             if (entries.length === 0)
                 throw new Error(':filter() requires at least one defined condition');
             return {
-                text: entries.map(([k]) => `${k} = ?`).join(' AND '),
+                text: entries.map(([k]) => `${k} = ${placeholder()}`).join(' AND '),
                 params: entries.map(([, v]) => v),
             };
         }
@@ -89,8 +128,7 @@ function expandMacro(type, value) {
             if (keys.length === 0)
                 throw new Error(':batch_insert() requires at least one column');
             const cols = keys.join(', ');
-            const rowPlaceholder = `(${keys.map(() => '?').join(', ')})`;
-            const allPlaceholders = value.map(() => rowPlaceholder).join(', ');
+            const allPlaceholders = value.map(() => `(${keys.map(() => placeholder()).join(', ')})`).join(', ');
             return {
                 text: `(${cols}) VALUES ${allPlaceholders}`,
                 params: value.flatMap(row => keys.map(k => row[k])),

package/dist/cjs/sql.js.map

@@ -1 +1 @@
-{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../src/sql.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Tagged template literal for SQL queries with `?` placeholders.\n *\n * Usage:\n *   sql`SELECT * FROM users WHERE id = ${userId} AND status = ${status}`\n *   sql`INSERT INTO users :insert(${data})`\n *   sql`UPDATE users SET :update(${data}) WHERE id = ${id}`\n *   sql`SELECT * FROM users WHERE :filter(${criteria})`\n *   sql`INSERT INTO users :batch_insert(${rows})`\n */\nconst MACRO_OPEN = /:(insert|update|filter|batch_insert)\\s*\\(\\s*$/i;\nconst MACRO_CLOSE = /^\\s*\\)/;\n\nexport class SqlFragment {\n  constructor(\n    public readonly strings: readonly string[],\n    public readonly values: readonly unknown[],\n  ) {}\n\n  toSQL(): { sql: string; params: unknown[] } {\n    const segments = [...this.strings];\n    const sqlParts: string[] = [];\n    const params: unknown[] = [];\n\n    for (let i = 0; i < segments.length; i++) {\n      if (i < this.values.length) {\n        const openMatch = segments[i].match(MACRO_OPEN);\n        const closeMatch = segments[i + 1]?.match(MACRO_CLOSE);\n\n        if (openMatch && closeMatch) {\n          // Binder macro: trim the macro syntax and expand\n          sqlParts.push(segments[i].slice(0, -openMatch[0].length));\n          segments[i + 1] = segments[i + 1].slice(closeMatch[0].length);\n\n          const { text, params: expanded } = expandMacro(openMatch[1].toLowerCase(), this.values[i]);\n          sqlParts.push(text);\n          params.push(...expanded);\n        } else {\n          sqlParts.push(segments[i]);\n          sqlParts.push('?');\n          params.push(this.values[i]);\n        }\n      } else {\n        sqlParts.push(segments[i]);\n      }\n    }\n\n    return { sql: sqlParts.join(''), params };\n  }\n}\n\nfunction expandMacro(type: string, value: unknown): { text: string; params: unknown[] } {\n  switch (type) {\n    case 'insert': {\n      assertPlainObject(value, ':insert()');\n      const obj = value as Record<string, unknown>;\n      const keys = Object.keys(obj);\n      if (keys.length === 0) throw new Error(':insert() requires at least one column');\n      const cols = keys.join(', ');\n      const placeholders = keys.map(() => '?').join(', ');\n      return { text: `(${cols}) VALUES (${placeholders})`, params: keys.map(k => obj[k]) };\n    }\n    case 'update': {\n      assertPlainObject(value, ':update()');\n      const entries = Object.entries(value as Record<string, unknown>).filter(([, v]) => v !== undefined);\n      if (entries.length === 0) throw new Error(':update() requires at least one defined column');\n      return {\n        text: entries.map(([k]) => `${k} = ?`).join(', '),\n        params: entries.map(([, v]) => v),\n      };\n    }\n    case 'filter': {\n      assertPlainObject(value, ':filter()');\n      const entries = Object.entries(value as Record<string, unknown>).filter(([, v]) => v !== undefined);\n      if (entries.length === 0) throw new Error(':filter() requires at least one defined condition');\n      return {\n        text: entries.map(([k]) => `${k} = ?`).join(' AND '),\n        params: entries.map(([, v]) => v),\n      };\n    }\n    case 'batch_insert': {\n      if (!Array.isArray(value) || value.length === 0) {\n        throw new Error(':batch_insert() requires a non-empty array of objects');\n      }\n      const keys = Object.keys(value[0]);\n      if (keys.length === 0) throw new Error(':batch_insert() requires at least one column');\n      const cols = keys.join(', ');\n      const rowPlaceholder = `(${keys.map(() => '?').join(', ')})`;\n      const allPlaceholders = value.map(() => rowPlaceholder).join(', ');\n      return {\n        text: `(${cols}) VALUES ${allPlaceholders}`,\n        params: value.flatMap(row => keys.map(k => (row as Record<string, unknown>)[k])),\n      };\n    }\n    default:\n      throw new Error(`Unknown binder macro :${type}()`);\n  }\n}\n\nfunction assertPlainObject(value: unknown, label: string): asserts value is Record<string, unknown> {\n  if (!value || typeof value !== 'object' || Array.isArray(value)) {\n    throw new Error(`${label} in sql\\`\\` template requires a plain object`);\n  }\n}\n\nexport function sql(strings: TemplateStringsArray, ...values: unknown[]): SqlFragment {\n  return new SqlFragment(strings, values);\n}\n"]}
+{"version":3,"file":"sql.js","sourceRoot":"","sources":["../../src/sql.ts"],"names":[],"mappings":"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","sourcesContent":["import type { Dialect } from './registry';\n\n/**\n * Tagged template literal for SQL queries with `?` placeholders.\n *\n * Usage:\n *   sql`SELECT * FROM users WHERE id = ${userId} AND status = ${status}`\n *   sql`INSERT INTO users :insert(${data})`\n *   sql`UPDATE users SET :update(${data}) WHERE id = ${id}`\n *   sql`SELECT * FROM users WHERE :filter(${criteria})`\n *   sql`INSERT INTO users :batch_insert(${rows})`\n *\n * Execute a fragment with `run(db, fragment)` (or `run(fragment)` inside a\n * @Query method): run binds it for the target dialect (`?` for SQLite/MySQL,\n * `$1..` for Postgres) and wraps failures in DatabaseError.\n */\nconst MACRO_OPEN = /:(insert|update|filter|batch_insert)\\s*\\(\\s*$/i;\nconst MACRO_CLOSE = /^\\s*\\)/;\n\n// Cross-copy identity for fragments: duplicated module instances (npm link,\n// dual ESM/CJS loads) each define their own SqlFragment class, so `instanceof`\n// alone would misclassify a fragment built by another copy.\nconst FRAGMENT_BRAND = Symbol.for('noego.sqlstack.SqlFragment');\n\nexport class SqlFragment {\n  constructor(\n    public readonly strings: readonly string[],\n    public readonly values: readonly unknown[],\n  ) {}\n\n  /**\n   * Compile to SQL with `?` placeholders and the matching parameter list.\n   *\n   * @throws {Error} When a binder macro (`:insert`, `:update`, `:filter`,\n   * `:batch_insert`) receives invalid input. `run(...)` wraps this in\n   * DatabaseError with the original error in `.cause`.\n   */\n  toSQL(): { sql: string; params: unknown[] } {\n    return compileParts(this.strings, this.values, () => '?');\n  }\n}\n\nObject.defineProperty(SqlFragment.prototype, FRAGMENT_BRAND, { value: true });\n\n/** @internal True for a SqlFragment from this or any other sqlstack copy. */\nexport function isSqlFragment(value: unknown): value is SqlFragment {\n  if (value instanceof SqlFragment) return true;\n  return (\n    typeof value === 'object' &&\n    value !== null &&\n    (value as { [FRAGMENT_BRAND]?: unknown })[FRAGMENT_BRAND] === true\n  );\n}\n\n/**\n * @internal Compile a fragment for a dialect: `$1, $2, ...` for Postgres,\n * `?` for SQLite and MySQL. Throws plain Error on invalid macro input\n * (callers in run() wrap it).\n */\nexport function compileFragment(fragment: SqlFragment, dialect: Dialect): { sql: string; params: unknown[] } {\n  let next = 0;\n  const placeholder = dialect === 'postgres' ? () => `$${++next}` : () => '?';\n  return compileParts(fragment.strings, fragment.values, placeholder);\n}\n\nfunction compileParts(\n  strings: readonly string[],\n  values: readonly unknown[],\n  placeholder: () => string,\n): { sql: string; params: unknown[] } {\n  const segments = [...strings];\n  const sqlParts: string[] = [];\n  const params: unknown[] = [];\n\n  for (let i = 0; i < segments.length; i++) {\n    if (i < values.length) {\n      const openMatch = segments[i].match(MACRO_OPEN);\n      const closeMatch = segments[i + 1]?.match(MACRO_CLOSE);\n\n      if (openMatch && closeMatch) {\n        // Binder macro: trim the macro syntax and expand\n        sqlParts.push(segments[i].slice(0, -openMatch[0].length));\n        segments[i + 1] = segments[i + 1].slice(closeMatch[0].length);\n\n        const { text, params: expanded } = expandMacro(openMatch[1].toLowerCase(), values[i], placeholder);\n        sqlParts.push(text);\n        params.push(...expanded);\n      } else {\n        sqlParts.push(segments[i]);\n        sqlParts.push(placeholder());\n        params.push(values[i]);\n      }\n    } else {\n      sqlParts.push(segments[i]);\n    }\n  }\n\n  return { sql: sqlParts.join(''), params };\n}\n\nfunction expandMacro(type: string, value: unknown, placeholder: () => string): { text: string; params: unknown[] } {\n  switch (type) {\n    case 'insert': {\n      assertPlainObject(value, ':insert()');\n      const obj = value as Record<string, unknown>;\n      const keys = Object.keys(obj);\n      if (keys.length === 0) throw new Error(':insert() requires at least one column');\n      const cols = keys.join(', ');\n      const placeholders = keys.map(() => placeholder()).join(', ');\n      return { text: `(${cols}) VALUES (${placeholders})`, params: keys.map(k => obj[k]) };\n    }\n    case 'update': {\n      assertPlainObject(value, ':update()');\n      const entries = Object.entries(value as Record<string, unknown>).filter(([, v]) => v !== undefined);\n      if (entries.length === 0) throw new Error(':update() requires at least one defined column');\n      return {\n        text: entries.map(([k]) => `${k} = ${placeholder()}`).join(', '),\n        params: entries.map(([, v]) => v),\n      };\n    }\n    case 'filter': {\n      assertPlainObject(value, ':filter()');\n      const entries = Object.entries(value as Record<string, unknown>).filter(([, v]) => v !== undefined);\n      if (entries.length === 0) throw new Error(':filter() requires at least one defined condition');\n      return {\n        text: entries.map(([k]) => `${k} = ${placeholder()}`).join(' AND '),\n        params: entries.map(([, v]) => v),\n      };\n    }\n    case 'batch_insert': {\n      if (!Array.isArray(value) || value.length === 0) {\n        throw new Error(':batch_insert() requires a non-empty array of objects');\n      }\n      const keys = Object.keys(value[0]);\n      if (keys.length === 0) throw new Error(':batch_insert() requires at least one column');\n      const cols = keys.join(', ');\n      const allPlaceholders = value.map(() => `(${keys.map(() => placeholder()).join(', ')})`).join(', ');\n      return {\n        text: `(${cols}) VALUES ${allPlaceholders}`,\n        params: value.flatMap(row => keys.map(k => (row as Record<string, unknown>)[k])),\n      };\n    }\n    default:\n      throw new Error(`Unknown binder macro :${type}()`);\n  }\n}\n\nfunction assertPlainObject(value: unknown, label: string): asserts value is Record<string, unknown> {\n  if (!value || typeof value !== 'object' || Array.isArray(value)) {\n    throw new Error(`${label} in sql\\`\\` template requires a plain object`);\n  }\n}\n\nexport function sql(strings: TemplateStringsArray, ...values: unknown[]): SqlFragment {\n  return new SqlFragment(strings, values);\n}\n"]}

package/dist/cjs/transactions.d.ts

@@ -63,5 +63,13 @@ export type ActiveTransaction = {
     query(sql: string, params: unknown[]): Promise<QueryResult>;
 };
 export declare function getActiveTransaction(entry: DatabaseEntry): ActiveTransaction | undefined;
+/**
+ * Active transaction whose registered database is exactly `db` (object
+ * identity), if any. `run(db, ...)` uses this so a handle passed at call time
+ * joins a transaction opened on the same database (by `@transaction` or
+ * `withTransaction`) instead of bypassing it. A handle that was never
+ * registered with a SqlStack (or the legacy registry) never matches.
+ */
+export declare function getActiveTransactionForDatabase(db: object): ActiveTransaction | undefined;
 export {};
 //# sourceMappingURL=transactions.d.ts.map

package/dist/cjs/transactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.d.ts","sourceRoot":"","sources":["../../src/transactions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGxD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAG7C,MAAM,MAAM,kBAAkB,GAAG;IAC/B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AA6BF,qBAAa,iBAAiB;;IAC5B,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;gBAKlB,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO;IAMhE,IAAI,MAAM,IAAI,MAAM,CAEnB;IAEK,aAAa;IAInB,YAAY,CAAC,YAAY,CAAC,EAAE,OAAO;IAO7B,MAAM;IAKN,QAAQ;IAKR,OAAO;IAKP,eAAe;IAMf,aAAa,CAAC,GAAG,EAAE,OAAO;CAKjC;AAED,cAAM,OAAO;IACX,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;IAC9B,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC,GAAG,IAAI,CAAC,kBAAkB,EAAE,QAAQ,CAAC,CAAC;IAClG,KAAK,SAAK;IACV,OAAO,UAAS;IAChB,SAAS,UAAS;IAClB,YAAY,UAAS;IACrB,aAAa,EAAE,OAAO,GAAG,SAAS,CAAC;IAEnC,OAAO,CAAC,IAAI,CAAuB;IACnC,OAAO,CAAC,SAAS,CAAoC;gBAEzC,KAAK,EAAE,aAAa,EAAE,OAAO,EAAE,kBAAkB,GAAG,SAAS;IASzE,IAAI,QAAQ,IAAI,QAAQ,CAEvB;IAEK,aAAa;IAuCb,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;IAK3D,eAAe;IAUf,iBAAiB;IAUjB,OAAO;IASP,eAAe;IAaf,aAAa,CAAC,GAAG,EAAE,OAAO;CAWjC;AAuBD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,EAAE,CAAC,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS,CAO7E;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C;AAED,uEAAuE;AACvE,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,aAAa,GAAG,iBAAiB,GAAG,SAAS,CAKzF;AAED,wBAAsB,eAAe,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,CAAC,CAAC,CAkBvG;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,kBAAkB,GAAG,IAAI,CAAC;IACrE,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,IAAI,EAAE,kBAAkB,KAAK,IAAI,CAAC;CACxG,CAAC;AAEF,eAAO,MAAM,WAAW,EAAE,oBAYlB,CAAC;AAST,MAAM,MAAM,iBAAiB,GAAG;IAC9B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CAC7D,CAAC;AAEF,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,aAAa,GAAG,iBAAiB,GAAG,SAAS,CAGxF"}
+{"version":3,"file":"transactions.d.ts","sourceRoot":"","sources":["../../src/transactions.ts"],"names":[],"mappings":"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"}

package/dist/cjs/transactions.js

@@ -18,6 +18,7 @@ exports.hasTransactionContext = hasTransactionContext;
 exports.currentTransactionFor = currentTransactionFor;
 exports.withTransaction = withTransaction;
 exports.getActiveTransaction = getActiveTransaction;
+exports.getActiveTransactionForDatabase = getActiveTransactionForDatabase;
 const node_async_hooks_1 = require("node:async_hooks");
 const adapters_1 = require("./adapters");
 const errors_1 = require("./core/errors");
@@ -297,4 +298,21 @@ function getActiveTransaction(entry) {
     const store = getStore();
     return store?.txByDb.get(entry);
 }
+/**
+ * Active transaction whose registered database is exactly `db` (object
+ * identity), if any. `run(db, ...)` uses this so a handle passed at call time
+ * joins a transaction opened on the same database (by `@transaction` or
+ * `withTransaction`) instead of bypassing it. A handle that was never
+ * registered with a SqlStack (or the legacy registry) never matches.
+ */
+function getActiveTransactionForDatabase(db) {
+    const store = getStore();
+    if (!store)
+        return undefined;
+    for (const state of store.txByDb.values()) {
+        if (state.db === db)
+            return state;
+    }
+    return undefined;
+}
 //# sourceMappingURL=transactions.js.map

package/dist/cjs/transactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.js","sourceRoot":"","sources":["../../src/transactions.ts"],"names":[],"mappings":"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","sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { Database, QueryResult } from './registry';\nimport { createPgDb, createMysqlDb } from './adapters';\nimport { RollbackTransactionError, SqlStackError } from './core/errors';\nimport type { DatabaseEntry } from './stack';\nimport { resolveExecution, legacyEntry } from './runtime';\n\nexport type TransactionOptions = {\n  db?: string;\n  lazy?: boolean;\n  nested?: 'join';\n};\n\n// Keyed by concrete DatabaseEntry identity (owning stack + registration), so\n// two roots transacting on the same name (\"primary\") can never collide\n// (spec 16 §20, spec 17 §14).\ntype TxStore = {\n  txByDb: Map<DatabaseEntry, TxState>;\n};\n\nconst als = new AsyncLocalStorage<TxStore>();\n\nfunction getStore(): TxStore | undefined {\n  return als.getStore();\n}\n\nfunction getOrCreateStore(): { store: TxStore; isNew: boolean } {\n  const existing = getStore();\n  if (existing) return { store: existing, isNew: false };\n  return { store: { txByDb: new Map() }, isNew: true };\n}\n\nfunction isRollbackTransactionError(err: unknown): err is RollbackTransactionError {\n  return err instanceof RollbackTransactionError;\n}\n\nfunction unwrapRollbackCause(err: RollbackTransactionError): unknown {\n  return typeof err.cause === 'undefined' ? err : err.cause;\n}\n\nexport class TransactionHandle {\n  readonly entry: DatabaseEntry;\n  #state: TxState;\n  #owned: boolean;\n  #finished = false;\n\n  constructor(entry: DatabaseEntry, state: TxState, owned: boolean) {\n    this.entry = entry;\n    this.#state = state;\n    this.#owned = owned;\n  }\n\n  get dbName(): string {\n    return this.entry.name;\n  }\n\n  async ensureStarted() {\n    await this.#state.ensureStarted();\n  }\n\n  rollbackOnly(errorToThrow?: unknown) {\n    this.#state.rollbackOnly = true;\n    if (typeof errorToThrow !== 'undefined') {\n      this.#state.rollbackError = errorToThrow;\n    }\n  }\n\n  async commit() {\n    if (!this.#owned) return;\n    await this.#state.commitIfStarted();\n  }\n\n  async rollback() {\n    if (!this.#owned) return;\n    await this.#state.rollbackIfStarted();\n  }\n\n  async release() {\n    if (!this.#owned) return;\n    await this.#state.release();\n  }\n\n  async finishOnSuccess() {\n    if (!this.#owned || this.#finished) return;\n    this.#finished = true;\n    await this.#state.finishOnSuccess();\n  }\n\n  async finishOnError(err: unknown) {\n    if (!this.#owned || this.#finished) return;\n    this.#finished = true;\n    await this.#state.finishOnError(err);\n  }\n}\n\nclass TxState {\n  readonly entry: DatabaseEntry;\n  readonly db: Database;\n  readonly options: Required<Pick<TransactionOptions, 'lazy'>> & Pick<TransactionOptions, 'nested'>;\n  depth = 1;\n  started = false;\n  completed = false;\n  rollbackOnly = false;\n  rollbackError: unknown | undefined;\n\n  private txDb: Database | undefined;\n  private releaseFn: (() => Promise<void>) | undefined;\n\n  constructor(entry: DatabaseEntry, options: TransactionOptions | undefined) {\n    this.entry = entry;\n    this.db = entry.db;\n    this.options = {\n      lazy: options?.lazy ?? true,\n      nested: options?.nested ?? 'join',\n    };\n  }\n\n  get activeDb(): Database {\n    return this.txDb ?? this.db;\n  }\n\n  async ensureStarted() {\n    if (this.started) return;\n\n    const dialect = this.db.dialect ?? 'sqlite';\n    if (dialect === 'postgres') {\n      const pool: any = this.db.conn;\n      if (!pool || typeof pool.connect !== 'function') {\n        throw new SqlStackError('Postgres transactions require a pg Pool with .connect() as Database.conn');\n      }\n      const client = await pool.connect();\n      this.txDb = createPgDb(client);\n      this.releaseFn = async () => {\n        if (typeof client.release === 'function') client.release();\n      };\n      await this.txDb.query('BEGIN', []);\n      this.started = true;\n      return;\n    }\n\n    if (dialect === 'mysql') {\n      const pool: any = this.db.conn;\n      if (!pool || typeof pool.getConnection !== 'function') {\n        throw new SqlStackError('MySQL transactions require a mysql2 Pool with .getConnection() as Database.conn');\n      }\n      const conn = await pool.getConnection();\n      this.txDb = createMysqlDb(conn);\n      this.releaseFn = async () => {\n        if (typeof conn.release === 'function') conn.release();\n      };\n      await this.txDb.query('START TRANSACTION', []);\n      this.started = true;\n      return;\n    }\n\n    // sqlite: existing connection is already bound\n    await this.db.query('BEGIN', []);\n    this.started = true;\n  }\n\n  async query(sql: string, params: unknown[]): Promise<QueryResult> {\n    await this.ensureStarted();\n    return await this.activeDb.query(sql, params);\n  }\n\n  async commitIfStarted() {\n    if (this.completed) return;\n    if (!this.started) {\n      this.completed = true;\n      return;\n    }\n    await this.activeDb.query('COMMIT', []);\n    this.completed = true;\n  }\n\n  async rollbackIfStarted() {\n    if (this.completed) return;\n    if (!this.started) {\n      this.completed = true;\n      return;\n    }\n    await this.activeDb.query('ROLLBACK', []);\n    this.completed = true;\n  }\n\n  async release() {\n    try {\n      if (this.releaseFn) await this.releaseFn();\n    } finally {\n      this.txDb = undefined;\n      this.releaseFn = undefined;\n    }\n  }\n\n  async finishOnSuccess() {\n    try {\n      if (this.rollbackOnly) {\n        await this.rollbackIfStarted();\n        if (typeof this.rollbackError !== 'undefined') throw this.rollbackError;\n        throw new RollbackTransactionError();\n      }\n      await this.commitIfStarted();\n    } finally {\n      await this.release();\n    }\n  }\n\n  async finishOnError(err: unknown) {\n    try {\n      await this.rollbackIfStarted();\n    } finally {\n      await this.release();\n    }\n    if (isRollbackTransactionError(err)) {\n      throw unwrapRollbackCause(err);\n    }\n    throw err;\n  }\n}\n\nfunction enterTx(entry: DatabaseEntry, options?: TransactionOptions): { handle: TransactionHandle; store: TxStore; isNewStore: boolean } {\n  const { store, isNew } = getOrCreateStore();\n  const existing = store.txByDb.get(entry);\n  if (existing) {\n    existing.depth++;\n    return { handle: new TransactionHandle(entry, existing, false), store, isNewStore: isNew };\n  }\n  const state = new TxState(entry, options);\n  store.txByDb.set(entry, state);\n  return { handle: new TransactionHandle(entry, state, true), store, isNewStore: isNew };\n}\n\nasync function exitTx(entry: DatabaseEntry, store: TxStore) {\n  const state = store.txByDb.get(entry);\n  if (!state) return;\n  state.depth = Math.max(0, state.depth - 1);\n  if (state.depth === 0) {\n    store.txByDb.delete(entry);\n  }\n}\n\n/**\n * @deprecated Synchronous lookup against the legacy global registry only.\n * Under an active IoC root, use `currentTransactionFor(entry)` with an entry\n * from the root's SqlStack (`stack.getEntry(name)`).\n */\nexport function currentTransaction(db?: string): TransactionHandle | undefined {\n  const store = getStore();\n  if (!store) return undefined;\n  const entry = legacyEntry(db);\n  const state = store.txByDb.get(entry);\n  if (!state) return undefined;\n  return new TransactionHandle(entry, state, false);\n}\n\n/**\n * Whether this async call carries any transaction records. This observation\n * never resolves a database, opens a connection, or consults legacy defaults.\n * It does not choose an owner: use currentTransactionFor(entry) for that.\n */\nexport function hasTransactionContext(): boolean {\n  return (getStore()?.txByDb.size ?? 0) > 0;\n}\n\n/** Active transaction handle for a concrete database entry, if any. */\nexport function currentTransactionFor(entry: DatabaseEntry): TransactionHandle | undefined {\n  const store = getStore();\n  const state = store?.txByDb.get(entry);\n  if (!state) return undefined;\n  return new TransactionHandle(entry, state, false);\n}\n\nexport async function withTransaction<T>(fn: () => Promise<T>, options?: TransactionOptions): Promise<T> {\n  const { entry } = await resolveExecution(options?.db);\n  const { handle, store, isNewStore } = enterTx(entry, options);\n\n  const run = async () => {\n    try {\n      const out = await fn();\n      await handle.finishOnSuccess();\n      return out;\n    } catch (err) {\n      await handle.finishOnError(err);\n      throw err;\n    } finally {\n      await exitTx(entry, store);\n    }\n  };\n\n  return isNewStore ? await als.run(store, run) : await run();\n}\n\nexport type TransactionDecorator = {\n  (target: any, prop: string | symbol, desc: PropertyDescriptor): void;\n  (options?: TransactionOptions): (target: any, prop: string | symbol, desc: PropertyDescriptor) => void;\n};\n\nexport const transaction: TransactionDecorator = function (...args: any[]) {\n  // @transaction\n  if (args.length === 3 && typeof args[2]?.value === 'function') {\n    const [target, prop, desc] = args as [any, string | symbol, PropertyDescriptor];\n    wrapMethod(target, prop, desc, undefined);\n    return;\n  }\n  // @transaction() or @transaction({ ... })\n  const options: TransactionOptions | undefined = args.length > 0 ? args[0] : undefined;\n  return function (target: any, prop: string | symbol, desc: PropertyDescriptor) {\n    wrapMethod(target, prop, desc, options);\n  };\n} as any;\n\nfunction wrapMethod(_target: any, _prop: string | symbol, desc: PropertyDescriptor, options?: TransactionOptions) {\n  const original = desc.value;\n  desc.value = async function (...callArgs: any[]) {\n    return await withTransaction(() => original.apply(this, callArgs), options);\n  };\n}\n\nexport type ActiveTransaction = {\n  query(sql: string, params: unknown[]): Promise<QueryResult>;\n};\n\nexport function getActiveTransaction(entry: DatabaseEntry): ActiveTransaction | undefined {\n  const store = getStore();\n  return store?.txByDb.get(entry);\n}\n"]}
+{"version":3,"file":"transactions.js","sourceRoot":"","sources":["../../src/transactions.ts"],"names":[],"mappings":"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","sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { Database, QueryResult } from './registry';\nimport { createPgDb, createMysqlDb } from './adapters';\nimport { RollbackTransactionError, SqlStackError } from './core/errors';\nimport type { DatabaseEntry } from './stack';\nimport { resolveExecution, legacyEntry } from './runtime';\n\nexport type TransactionOptions = {\n  db?: string;\n  lazy?: boolean;\n  nested?: 'join';\n};\n\n// Keyed by concrete DatabaseEntry identity (owning stack + registration), so\n// two roots transacting on the same name (\"primary\") can never collide\n// (spec 16 §20, spec 17 §14).\ntype TxStore = {\n  txByDb: Map<DatabaseEntry, TxState>;\n};\n\nconst als = new AsyncLocalStorage<TxStore>();\n\nfunction getStore(): TxStore | undefined {\n  return als.getStore();\n}\n\nfunction getOrCreateStore(): { store: TxStore; isNew: boolean } {\n  const existing = getStore();\n  if (existing) return { store: existing, isNew: false };\n  return { store: { txByDb: new Map() }, isNew: true };\n}\n\nfunction isRollbackTransactionError(err: unknown): err is RollbackTransactionError {\n  return err instanceof RollbackTransactionError;\n}\n\nfunction unwrapRollbackCause(err: RollbackTransactionError): unknown {\n  return typeof err.cause === 'undefined' ? err : err.cause;\n}\n\nexport class TransactionHandle {\n  readonly entry: DatabaseEntry;\n  #state: TxState;\n  #owned: boolean;\n  #finished = false;\n\n  constructor(entry: DatabaseEntry, state: TxState, owned: boolean) {\n    this.entry = entry;\n    this.#state = state;\n    this.#owned = owned;\n  }\n\n  get dbName(): string {\n    return this.entry.name;\n  }\n\n  async ensureStarted() {\n    await this.#state.ensureStarted();\n  }\n\n  rollbackOnly(errorToThrow?: unknown) {\n    this.#state.rollbackOnly = true;\n    if (typeof errorToThrow !== 'undefined') {\n      this.#state.rollbackError = errorToThrow;\n    }\n  }\n\n  async commit() {\n    if (!this.#owned) return;\n    await this.#state.commitIfStarted();\n  }\n\n  async rollback() {\n    if (!this.#owned) return;\n    await this.#state.rollbackIfStarted();\n  }\n\n  async release() {\n    if (!this.#owned) return;\n    await this.#state.release();\n  }\n\n  async finishOnSuccess() {\n    if (!this.#owned || this.#finished) return;\n    this.#finished = true;\n    await this.#state.finishOnSuccess();\n  }\n\n  async finishOnError(err: unknown) {\n    if (!this.#owned || this.#finished) return;\n    this.#finished = true;\n    await this.#state.finishOnError(err);\n  }\n}\n\nclass TxState {\n  readonly entry: DatabaseEntry;\n  readonly db: Database;\n  readonly options: Required<Pick<TransactionOptions, 'lazy'>> & Pick<TransactionOptions, 'nested'>;\n  depth = 1;\n  started = false;\n  completed = false;\n  rollbackOnly = false;\n  rollbackError: unknown | undefined;\n\n  private txDb: Database | undefined;\n  private releaseFn: (() => Promise<void>) | undefined;\n\n  constructor(entry: DatabaseEntry, options: TransactionOptions | undefined) {\n    this.entry = entry;\n    this.db = entry.db;\n    this.options = {\n      lazy: options?.lazy ?? true,\n      nested: options?.nested ?? 'join',\n    };\n  }\n\n  get activeDb(): Database {\n    return this.txDb ?? this.db;\n  }\n\n  async ensureStarted() {\n    if (this.started) return;\n\n    const dialect = this.db.dialect ?? 'sqlite';\n    if (dialect === 'postgres') {\n      const pool: any = this.db.conn;\n      if (!pool || typeof pool.connect !== 'function') {\n        throw new SqlStackError('Postgres transactions require a pg Pool with .connect() as Database.conn');\n      }\n      const client = await pool.connect();\n      this.txDb = createPgDb(client);\n      this.releaseFn = async () => {\n        if (typeof client.release === 'function') client.release();\n      };\n      await this.txDb.query('BEGIN', []);\n      this.started = true;\n      return;\n    }\n\n    if (dialect === 'mysql') {\n      const pool: any = this.db.conn;\n      if (!pool || typeof pool.getConnection !== 'function') {\n        throw new SqlStackError('MySQL transactions require a mysql2 Pool with .getConnection() as Database.conn');\n      }\n      const conn = await pool.getConnection();\n      this.txDb = createMysqlDb(conn);\n      this.releaseFn = async () => {\n        if (typeof conn.release === 'function') conn.release();\n      };\n      await this.txDb.query('START TRANSACTION', []);\n      this.started = true;\n      return;\n    }\n\n    // sqlite: existing connection is already bound\n    await this.db.query('BEGIN', []);\n    this.started = true;\n  }\n\n  async query(sql: string, params: unknown[]): Promise<QueryResult> {\n    await this.ensureStarted();\n    return await this.activeDb.query(sql, params);\n  }\n\n  async commitIfStarted() {\n    if (this.completed) return;\n    if (!this.started) {\n      this.completed = true;\n      return;\n    }\n    await this.activeDb.query('COMMIT', []);\n    this.completed = true;\n  }\n\n  async rollbackIfStarted() {\n    if (this.completed) return;\n    if (!this.started) {\n      this.completed = true;\n      return;\n    }\n    await this.activeDb.query('ROLLBACK', []);\n    this.completed = true;\n  }\n\n  async release() {\n    try {\n      if (this.releaseFn) await this.releaseFn();\n    } finally {\n      this.txDb = undefined;\n      this.releaseFn = undefined;\n    }\n  }\n\n  async finishOnSuccess() {\n    try {\n      if (this.rollbackOnly) {\n        await this.rollbackIfStarted();\n        if (typeof this.rollbackError !== 'undefined') throw this.rollbackError;\n        throw new RollbackTransactionError();\n      }\n      await this.commitIfStarted();\n    } finally {\n      await this.release();\n    }\n  }\n\n  async finishOnError(err: unknown) {\n    try {\n      await this.rollbackIfStarted();\n    } finally {\n      await this.release();\n    }\n    if (isRollbackTransactionError(err)) {\n      throw unwrapRollbackCause(err);\n    }\n    throw err;\n  }\n}\n\nfunction enterTx(entry: DatabaseEntry, options?: TransactionOptions): { handle: TransactionHandle; store: TxStore; isNewStore: boolean } {\n  const { store, isNew } = getOrCreateStore();\n  const existing = store.txByDb.get(entry);\n  if (existing) {\n    existing.depth++;\n    return { handle: new TransactionHandle(entry, existing, false), store, isNewStore: isNew };\n  }\n  const state = new TxState(entry, options);\n  store.txByDb.set(entry, state);\n  return { handle: new TransactionHandle(entry, state, true), store, isNewStore: isNew };\n}\n\nasync function exitTx(entry: DatabaseEntry, store: TxStore) {\n  const state = store.txByDb.get(entry);\n  if (!state) return;\n  state.depth = Math.max(0, state.depth - 1);\n  if (state.depth === 0) {\n    store.txByDb.delete(entry);\n  }\n}\n\n/**\n * @deprecated Synchronous lookup against the legacy global registry only.\n * Under an active IoC root, use `currentTransactionFor(entry)` with an entry\n * from the root's SqlStack (`stack.getEntry(name)`).\n */\nexport function currentTransaction(db?: string): TransactionHandle | undefined {\n  const store = getStore();\n  if (!store) return undefined;\n  const entry = legacyEntry(db);\n  const state = store.txByDb.get(entry);\n  if (!state) return undefined;\n  return new TransactionHandle(entry, state, false);\n}\n\n/**\n * Whether this async call carries any transaction records. This observation\n * never resolves a database, opens a connection, or consults legacy defaults.\n * It does not choose an owner: use currentTransactionFor(entry) for that.\n */\nexport function hasTransactionContext(): boolean {\n  return (getStore()?.txByDb.size ?? 0) > 0;\n}\n\n/** Active transaction handle for a concrete database entry, if any. */\nexport function currentTransactionFor(entry: DatabaseEntry): TransactionHandle | undefined {\n  const store = getStore();\n  const state = store?.txByDb.get(entry);\n  if (!state) return undefined;\n  return new TransactionHandle(entry, state, false);\n}\n\nexport async function withTransaction<T>(fn: () => Promise<T>, options?: TransactionOptions): Promise<T> {\n  const { entry } = await resolveExecution(options?.db);\n  const { handle, store, isNewStore } = enterTx(entry, options);\n\n  const run = async () => {\n    try {\n      const out = await fn();\n      await handle.finishOnSuccess();\n      return out;\n    } catch (err) {\n      await handle.finishOnError(err);\n      throw err;\n    } finally {\n      await exitTx(entry, store);\n    }\n  };\n\n  return isNewStore ? await als.run(store, run) : await run();\n}\n\nexport type TransactionDecorator = {\n  (target: any, prop: string | symbol, desc: PropertyDescriptor): void;\n  (options?: TransactionOptions): (target: any, prop: string | symbol, desc: PropertyDescriptor) => void;\n};\n\nexport const transaction: TransactionDecorator = function (...args: any[]) {\n  // @transaction\n  if (args.length === 3 && typeof args[2]?.value === 'function') {\n    const [target, prop, desc] = args as [any, string | symbol, PropertyDescriptor];\n    wrapMethod(target, prop, desc, undefined);\n    return;\n  }\n  // @transaction() or @transaction({ ... })\n  const options: TransactionOptions | undefined = args.length > 0 ? args[0] : undefined;\n  return function (target: any, prop: string | symbol, desc: PropertyDescriptor) {\n    wrapMethod(target, prop, desc, options);\n  };\n} as any;\n\nfunction wrapMethod(_target: any, _prop: string | symbol, desc: PropertyDescriptor, options?: TransactionOptions) {\n  const original = desc.value;\n  desc.value = async function (...callArgs: any[]) {\n    return await withTransaction(() => original.apply(this, callArgs), options);\n  };\n}\n\nexport type ActiveTransaction = {\n  query(sql: string, params: unknown[]): Promise<QueryResult>;\n};\n\nexport function getActiveTransaction(entry: DatabaseEntry): ActiveTransaction | undefined {\n  const store = getStore();\n  return store?.txByDb.get(entry);\n}\n\n/**\n * Active transaction whose registered database is exactly `db` (object\n * identity), if any. `run(db, ...)` uses this so a handle passed at call time\n * joins a transaction opened on the same database (by `@transaction` or\n * `withTransaction`) instead of bypassing it. A handle that was never\n * registered with a SqlStack (or the legacy registry) never matches.\n */\nexport function getActiveTransactionForDatabase(db: object): ActiveTransaction | undefined {\n  const store = getStore();\n  if (!store) return undefined;\n  for (const state of store.txByDb.values()) {\n    if (state.db === db) return state;\n  }\n  return undefined;\n}\n"]}

package/dist/esm/core/errors.js

@@ -42,11 +42,21 @@ export class ValidationError extends SqlStackError {
         this.name = 'ValidationError';
     }
 }
+/**
+ * A statement failed: the driver rejected it, or (for the `run(...)` forms
+ * that take arguments) the SQL could not be compiled, bound, or routed to a
+ * database. The original error is kept in `.cause`; when the cause carries a
+ * string driver code (`SQLITE_CONSTRAINT_UNIQUE`, `23505`, `ER_DUP_ENTRY`)
+ * it is copied to `.code` so existing `err.code` checks keep working.
+ */
 export class DatabaseError extends SqlStackError {
     constructor(message, sql, cause) {
         super(`${message}\nSQL: ${sql}`);
         this.sql = sql;
         this.cause = cause;
+        const code = cause?.code;
+        if (typeof code === 'string')
+            this.code = code;
         this.name = 'DatabaseError';
     }
 }

package/dist/esm/core/errors.js.map

@@ -1 +1 @@
-{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,YAAY,OAAgB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,aAAa;IACnD,YAAY,WAAmB;QAC7B,KAAK,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,aAAa;IAC5C;QACE,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,YAAY,WAAmB;QAC7B,KAAK,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAC/B,CAAC;CACF;AAED,yEAAyE;AACzE,wEAAwE;AACxE,2DAA2D;AAC3D,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAClD,YAAY,MAAc,EAAE,KAAa;QACvC,MAAM,SAAS,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CACH,GAAG,SAAS,OAAO,MAAM,oEAAoE;YAC3F,2EAA2E,CAC9E,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CAGF;AAED,MAAM,OAAO,eAAgB,SAAQ,aAAa;IAChD,YAAY,OAAe;QACzB,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CAEF;AAED,MAAM,OAAO,aAAc,SAAQ,aAAa;IAC9C,YAAY,OAAe,EAAE,GAAW,EAAE,KAAa;QACrD,KAAK,CAAC,GAAG,OAAO,UAAU,GAAG,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CAGF;AAED,8DAA8D;AAC9D,kEAAkE;AAClE,MAAM,OAAO,wBAAyB,SAAQ,aAAa;IACzD,YAAY,OAAO,GAAG,yBAAyB,EAAE,KAAe;QAC9D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACzC,CAAC;CAEF","sourcesContent":["export class SqlStackError extends Error {\n  constructor(message?: string) {\n    super(message);\n    this.name = 'SqlStackError';\n  }\n}\n\nexport class ExactlyOneRowError extends SqlStackError {\n  constructor(actualCount: number) {\n    super(`Expected exactly one row, got ${actualCount}`);\n    this.name = 'ExactlyOneRowError';\n  }\n}\n\nexport class NoRowsError extends SqlStackError {\n  constructor() {\n    super('Expected at least one row, got 0');\n    this.name = 'NoRowsError';\n  }\n}\n\nexport class RowsExistError extends SqlStackError {\n  constructor(actualCount: number) {\n    super(`Expected no rows, got ${actualCount}`);\n    this.name = 'RowsExistError';\n  }\n}\n\n// A result-shape decorator (@Single/@Only/@Exist/@None) was applied to a\n// method whose statement produced no result set (a plain write). Shapes\n// require rows; use `... RETURNING` or drop the decorator.\nexport class ExpectedRowsError extends SqlStackError {\n  constructor(method: string, shape: string) {\n    const decorator = '@' + shape.charAt(0).toUpperCase() + shape.slice(1);\n    super(\n      `${decorator} on ${method} requires a result set, but the statement produced a write result ` +\n        `({ rowsAffected }). Add a RETURNING clause or remove the shape decorator.`\n    );\n    this.method = method;\n    this.shape = shape;\n    this.name = 'ExpectedRowsError';\n  }\n  method: string;\n  shape: string;\n}\n\nexport class ValidationError extends SqlStackError {\n  constructor(details: string) {\n    super(`Validation failed: ${details}`);\n    this.details = details;\n    this.name = 'ValidationError';\n  }\n  details: string;\n}\n\nexport class DatabaseError extends SqlStackError {\n  constructor(message: string, sql: string, cause?: Error) {\n    super(`${message}\\nSQL: ${sql}`);\n    this.sql = sql;\n    this.cause = cause;\n    this.name = 'DatabaseError';\n  }\n  sql: string;\n  cause?: Error;\n}\n\n// Signals that the current transaction should be rolled back.\n// If `cause` is provided, wrappers may rethrow it after rollback.\nexport class RollbackTransactionError extends SqlStackError {\n  constructor(message = 'Transaction rolled back', cause?: unknown) {\n    super(message);\n    this.cause = cause;\n    this.name = 'RollbackTransactionError';\n  }\n  cause?: unknown;\n}\n"]}
+{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../../src/core/errors.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,YAAY,OAAgB;QAC1B,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CACF;AAED,MAAM,OAAO,kBAAmB,SAAQ,aAAa;IACnD,YAAY,WAAmB;QAC7B,KAAK,CAAC,iCAAiC,WAAW,EAAE,CAAC,CAAC;QACtD,IAAI,CAAC,IAAI,GAAG,oBAAoB,CAAC;IACnC,CAAC;CACF;AAED,MAAM,OAAO,WAAY,SAAQ,aAAa;IAC5C;QACE,KAAK,CAAC,kCAAkC,CAAC,CAAC;QAC1C,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;IAC5B,CAAC;CACF;AAED,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,YAAY,WAAmB;QAC7B,KAAK,CAAC,yBAAyB,WAAW,EAAE,CAAC,CAAC;QAC9C,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;IAC/B,CAAC;CACF;AAED,yEAAyE;AACzE,wEAAwE;AACxE,2DAA2D;AAC3D,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAClD,YAAY,MAAc,EAAE,KAAa;QACvC,MAAM,SAAS,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACvE,KAAK,CACH,GAAG,SAAS,OAAO,MAAM,oEAAoE;YAC3F,2EAA2E,CAC9E,CAAC;QACF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,mBAAmB,CAAC;IAClC,CAAC;CAGF;AAED,MAAM,OAAO,eAAgB,SAAQ,aAAa;IAChD,YAAY,OAAe;QACzB,KAAK,CAAC,sBAAsB,OAAO,EAAE,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,IAAI,GAAG,iBAAiB,CAAC;IAChC,CAAC;CAEF;AAED;;;;;;GAMG;AACH,MAAM,OAAO,aAAc,SAAQ,aAAa;IAC9C,YAAY,OAAe,EAAE,GAAW,EAAE,KAAa;QACrD,KAAK,CAAC,GAAG,OAAO,UAAU,GAAG,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,MAAM,IAAI,GAAI,KAAwC,EAAE,IAAI,CAAC;QAC7D,IAAI,OAAO,IAAI,KAAK,QAAQ;YAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QAC/C,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;IAC9B,CAAC;CAKF;AAED,8DAA8D;AAC9D,kEAAkE;AAClE,MAAM,OAAO,wBAAyB,SAAQ,aAAa;IACzD,YAAY,OAAO,GAAG,yBAAyB,EAAE,KAAe;QAC9D,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,IAAI,GAAG,0BAA0B,CAAC;IACzC,CAAC;CAEF","sourcesContent":["export class SqlStackError extends Error {\n  constructor(message?: string) {\n    super(message);\n    this.name = 'SqlStackError';\n  }\n}\n\nexport class ExactlyOneRowError extends SqlStackError {\n  constructor(actualCount: number) {\n    super(`Expected exactly one row, got ${actualCount}`);\n    this.name = 'ExactlyOneRowError';\n  }\n}\n\nexport class NoRowsError extends SqlStackError {\n  constructor() {\n    super('Expected at least one row, got 0');\n    this.name = 'NoRowsError';\n  }\n}\n\nexport class RowsExistError extends SqlStackError {\n  constructor(actualCount: number) {\n    super(`Expected no rows, got ${actualCount}`);\n    this.name = 'RowsExistError';\n  }\n}\n\n// A result-shape decorator (@Single/@Only/@Exist/@None) was applied to a\n// method whose statement produced no result set (a plain write). Shapes\n// require rows; use `... RETURNING` or drop the decorator.\nexport class ExpectedRowsError extends SqlStackError {\n  constructor(method: string, shape: string) {\n    const decorator = '@' + shape.charAt(0).toUpperCase() + shape.slice(1);\n    super(\n      `${decorator} on ${method} requires a result set, but the statement produced a write result ` +\n        `({ rowsAffected }). Add a RETURNING clause or remove the shape decorator.`\n    );\n    this.method = method;\n    this.shape = shape;\n    this.name = 'ExpectedRowsError';\n  }\n  method: string;\n  shape: string;\n}\n\nexport class ValidationError extends SqlStackError {\n  constructor(details: string) {\n    super(`Validation failed: ${details}`);\n    this.details = details;\n    this.name = 'ValidationError';\n  }\n  details: string;\n}\n\n/**\n * A statement failed: the driver rejected it, or (for the `run(...)` forms\n * that take arguments) the SQL could not be compiled, bound, or routed to a\n * database. The original error is kept in `.cause`; when the cause carries a\n * string driver code (`SQLITE_CONSTRAINT_UNIQUE`, `23505`, `ER_DUP_ENTRY`)\n * it is copied to `.code` so existing `err.code` checks keep working.\n */\nexport class DatabaseError extends SqlStackError {\n  constructor(message: string, sql: string, cause?: Error) {\n    super(`${message}\\nSQL: ${sql}`);\n    this.sql = sql;\n    this.cause = cause;\n    const code = (cause as { code?: unknown } | undefined)?.code;\n    if (typeof code === 'string') this.code = code;\n    this.name = 'DatabaseError';\n  }\n  sql: string;\n  cause?: Error;\n  /** Driver error code copied from `cause` when it is a string. */\n  code?: string;\n}\n\n// Signals that the current transaction should be rolled back.\n// If `cause` is provided, wrappers may rethrow it after rollback.\nexport class RollbackTransactionError extends SqlStackError {\n  constructor(message = 'Transaction rolled back', cause?: unknown) {\n    super(message);\n    this.cause = cause;\n    this.name = 'RollbackTransactionError';\n  }\n  cause?: unknown;\n}\n"]}

package/dist/esm/decorators/query.js

@@ -1,14 +1,28 @@
 import { getClassLabels, getMethodLabels, setMethodLabels } from '../core/metadata.js';
 import { SqlStackError, ExactlyOneRowError, NoRowsError, RowsExistError, DatabaseError, ExpectedRowsError } from '../core/errors.js';
 import { isValidationDisabled, validateOutput } from '../core/validator.js';
-import { resolveExecution } from '../runtime.js';
+import { resolveExecution, resolveSqlResolver } from '../runtime.js';
 import { createSqliteBinder, createMysqlBinder, createPostgresBinder } from '../binders/sqlBinder.js';
 import { coerceRootPath, resolveSqlFromFs } from '../core/fileResolution.js';
 import { registerDecoratedMethod, recordQueryMethodOnClass } from '../core/resolver.js';
 import { defaultSourceScanResolver } from '../core/sourceScanResolver.js';
 import { getActiveTransaction } from '../transactions.js';
-import { SqlFragment } from '../sql.js';
-import { runStorage } from '../run.js';
+import { SqlFragment, compileFragment } from '../sql.js';
+import { runStorage, resolveRunTarget, executeOnTarget, toRunError, fragmentText, } from '../run.js';
+/**
+ * Turn a method into a database query. The body calls `run(...)` (see `run`
+ * for its forms); the wrapper resolves SQL, binds, executes, and applies the
+ * shape/transform/validation decorators. A string argument is the root
+ * directory holding the method's `.sql` file; `{ sql }` gives inline SQL,
+ * `{ db }` pins a registered database, `{ dialect }` overrides binding style.
+ *
+ * The decorated method's promise rejects with:
+ * @throws {DatabaseError} When the driver rejects the statement (original
+ * error in `.cause`).
+ * @throws {SqlStackError} For missing SQL sources, unresolvable databases,
+ * and shape/validation failures (ExpectedRowsError, ExactlyOneRowError,
+ * NoRowsError, RowsExistError, ValidationError).
+ */
 export function Query(arg) {
     return function (_target, prop, desc) {
         const options = typeof arg === 'string' ? undefined : arg;
@@ -45,16 +59,26 @@ export function Query(arg) {
         desc.value = async function (...callArgs) {
             const labels = getMethodLabels(this, prop);
             const classLabels = getClassLabels(this);
-            // The full file/inline pipeline (resolve source, bind, execute,
-            // shape/transform/validate). Invoked either by run() from inside the
-            // method body, or directly as the legacy fallback when the body throws.
-            const pipeline = async () => {
+            // Resolve, bind, and execute the method's own SQL (inline, resolver,
+            // or file) and return the adapter's raw result. `callArgs` is the
+            // binding input: the method's own arguments for run() and the legacy
+            // fallback, or the params given to run(db, params). `explicit` carries
+            // the database chosen by run(db, params).
+            const executeMethodSql = async (callArgs, explicit, onSql) => {
                 // 1) prepare args with defaults
                 const rawInput = callArgs.length === 1 ? callArgs[0] : callArgs; // object or positional array
-                // 2) choose database and dialect via the active environment
-                const dbName = labels.db ?? options?.db ?? classLabels?.db;
-                const { entry, resolver: activeResolver } = await resolveExecution(dbName);
-                const db = entry.db;
+                // 2) choose database and dialect via the active environment (or run's explicit database)
+                let target;
+                let activeResolver;
+                if (explicit) {
+                    target = explicit.target;
+                    activeResolver = explicit.resolver;
+                }
+                else {
+                    target = await contextTarget();
+                    activeResolver = target.resolver;
+                }
+                const db = target.db;
                 const dialect = options?.dialect ?? db.dialect ?? 'sqlite';
                 // 3) load SQL source (inline, environment resolver, v1 fs fallback,
                 //    or the zero-config source scan — bare @Query() with nothing installed)
@@ -77,6 +101,7 @@ export function Query(arg) {
                 if (!sql) {
                     throw new SqlStackError(`No SQL source provided for method ${String(prop)}. Use @Query() with a file/folder path or inline sql.`);
                 }
+                onSql(sql);
                 // 4) bind placeholders
                 // Decide argument mode: positional if SQL contains :argN
                 let workingSql = sql;
@@ -257,28 +282,96 @@ export function Query(arg) {
                     }
                 }
                 const binder = dialect === 'postgres' ? createPostgresBinder() : dialect === 'mysql' ? createMysqlBinder() : createSqliteBinder();
-                const { sql: boundSql, params } = binder.bind(workingSql, args);
-                // 5) execute query via registry DB
+                // Binding failures (missing :name, bad array value) surface as DatabaseError like every
+                // other run() failure; the original error stays in `.cause`.
+                let bound;
+                try {
+                    bound = binder.bind(workingSql, args);
+                }
+                catch (bindError) {
+                    throw toRunError(bindError, workingSql);
+                }
+                const { sql: boundSql, params } = bound;
+                onSql(boundSql);
+                // 5) execute query (inside the active transaction on that database, if any)
                 let out;
                 try {
-                    const tx = getActiveTransaction(entry);
-                    out = tx ? await tx.query(boundSql, params) : await db.query(boundSql, params);
+                    out = target.tx ? await target.tx.query(boundSql, params) : await db.query(boundSql, params);
                 }
                 catch (dbError) {
                     // Attach SQL query (with placeholders) to error for debugging
                     throw new DatabaseError(dbError?.message || String(dbError), boundSql, dbError instanceof Error ? dbError : undefined);
                 }
-                // 6) If rows were returned (SELECT/CTE/RETURNING), shape + transform + validate;
-                //    otherwise return the write result as-is (or fail if a shape was requested)
+                return out;
+            };
+            // Database from the decorator context: @Query({ db }), @QueryBinder({ db }),
+            // or the environment default.
+            const contextTarget = async () => {
+                const dbName = labels.db ?? options?.db ?? classLabels?.db;
+                const resolved = await resolveExecution(dbName);
+                return {
+                    db: resolved.entry.db,
+                    tx: getActiveTransaction(resolved.entry),
+                    resolver: resolved.resolver,
+                    byName: true,
+                };
+            };
+            // run's argument-taking forms: return the adapter's raw result.
+            const executeInvocation = async (invocation, onSql) => {
+                if (invocation.kind === 'fragment') {
+                    // run(query) / run(db, query): the fragment replaces the method's SQL;
+                    // the method's arguments are not bound.
+                    const target = invocation.db !== undefined ? await resolveRunTarget(invocation.db) : await contextTarget();
+                    const dialect = options?.dialect ?? target.db.dialect ?? 'sqlite';
+                    const { sql: boundSql, params } = compileFragment(invocation.fragment, dialect);
+                    onSql(boundSql);
+                    return executeOnTarget(target, boundSql, params);
+                }
+                // run(db, params): the method's own SQL against db, bound from params
+                // only (an object for :named, an array for :argN).
+                const target = await resolveRunTarget(invocation.db);
+                // Inline SQL needs no resolver; only look one up for file-based SQL.
+                const resolver = target.byName
+                    ? target.resolver
+                    : labels?.source?.kind === 'inline'
+                        ? undefined
+                        : await resolveSqlResolver();
+                const bindArgs = Array.isArray(invocation.params) ? [...invocation.params] : [invocation.params];
+                return executeMethodSql(bindArgs, { target, resolver }, onSql);
+            };
+            // The full pipeline: execute, then — if rows were returned
+            // (SELECT/CTE/RETURNING) — shape + transform + validate; a write result
+            // is returned as-is (or fails if a shape was requested). Invoked by
+            // run() from inside the method body, or directly as the legacy fallback
+            // when the body throws. The zero-argument path is unchanged; run's
+            // argument-taking forms get the unified error contract: any failure
+            // before shaping that is not already a SqlStackError becomes a
+            // DatabaseError with the original error in `.cause`.
+            const pipeline = async (invocation) => {
+                if (invocation === undefined || invocation.kind === 'default') {
+                    const out = await executeMethodSql(callArgs, undefined, () => { });
+                    return finishResult(out, labels, this, prop);
+                }
+                let sqlText = invocation.kind === 'fragment' ? fragmentText(invocation.fragment) : '';
+                let out;
+                try {
+                    out = await executeInvocation(invocation, (s) => {
+                        sqlText = s;
+                    });
+                }
+                catch (err) {
+                    throw toRunError(err, sqlText);
+                }
                 return finishResult(out, labels, this, prop);
             };
             // 0) Invoke the method body inside a run() context. Three outcomes:
-            //    - body calls run(): the pipeline executed inside the body; return
+            //    - body calls run(...): the pipeline executed inside the body; return
             //      the body's result verbatim (it may have caught/transformed it).
-            //    - body returns a SqlFragment (template literal path): execute it.
+            //    - body returns a SqlFragment (deprecated template literal path):
+            //      execute it.
             //    - body throws without calling run() (legacy placeholder throw):
             //      fall through to the pipeline.
-            const runCtx = { ran: false, execute: pipeline };
+            const runCtx = { ran: false, execute: pipeline, invocations: true };
             let fragmentResult;
             try {
                 fragmentResult = await runStorage.run(runCtx, () => original.apply(this, callArgs));
@@ -293,6 +386,7 @@ export function Query(arg) {
             if (runCtx.ran)
                 return fragmentResult;
             if (fragmentResult instanceof SqlFragment) {
+                warnFragmentBodyDeprecated(this, prop);
                 const { sql: boundSql, params } = fragmentResult.toSQL();
                 const dbName = labels.db ?? options?.db ?? classLabels?.db;
                 const { entry } = await resolveExecution(dbName);
@@ -312,6 +406,19 @@ export function Query(arg) {
         return desc;
     };
 }
+// Deprecated (removal in the next major version): a @Query body that RETURNS
+// an sql`` fragment. It only type-checks when the method's declared return
+// type is bent to admit SqlFragment (an `as any`-style hole). One warning per
+// class.method per process.
+const warnedFragmentBodies = new Set();
+function warnFragmentBodyDeprecated(self, prop) {
+    const key = `${self?.constructor?.name ?? '<anonymous>'}.${String(prop)}`;
+    if (warnedFragmentBodies.has(key))
+        return;
+    warnedFragmentBodies.add(key);
+    process.emitWarning(`@Query method ${key} returns an sql\`\` fragment from its body. This form is deprecated and will be ` +
+        'removed in the next major version. Use `return run(sql`...`)` (or `return run(db, sql`...`)`) instead.', { type: 'DeprecationWarning', code: 'SQLSTACK_FRAGMENT_BODY' });
+}
 function applyDefaults(defaults, input) {
     if (!defaults)
         return input;