@duraflows/kysely 5.2.0 → 5.2.1

package/README.md

@@ -144,6 +144,8 @@ Both are applied transaction-locally via `set_config(name, value, true)` — the
 
 Convenience factory for short-lived runtimes pre-bound to an existing transaction. Each workflow call runs in a savepoint on `trx`, so a failed call leaves no partial writes behind even if you catch its error. Observers fire when the call resolves, before your transaction commits, and duraflows calls they make join `trx`. For strictly post-commit observers, use `KyselyTransactionContext.transaction(db, …)` with the long-lived providers instead.
 
+Don't mix these providers with the long-lived `kyselyWorkflowProviders(db)` (or `KyselyTransactionContext.transaction(db, …)`) inside one transaction. The two track their active transaction separately, one per `trx` and the other per `db`, so a call through one doesn't see a transaction opened through the other. It starts a second transaction on another connection instead, which can wait on row locks the first one holds. Use one style per transaction.
+
 ### `KyselyTransactionContext`
 
 The context is scoped per Kysely instance:

package/dist/cjs/index.js

@@ -49,7 +49,7 @@ function kyselyWorkflowProvidersFromTransaction(trx) {
             // provider must never supersede it.
             const scope = kysely_transaction_context_js_1.kyselyTransactionScopes.current(narrowed);
             if (scope) {
-                return kysely_transaction_context_js_1.kyselyTransactionScopes.runInSavepoint(narrowed, scope, callback, (sql) => (0, kysely_transaction_context_js_1.executeRawStatement)(scope.connection, sql));
+                return (0, kysely_transaction_context_js_1.runInKyselySavepoint)(narrowed, scope, callback);
             }
             // The caller owns `trx`, so even this outermost call is nested in their
             // transaction: run it in a savepoint so a failure leaves no partial
@@ -58,7 +58,7 @@ function kyselyWorkflowProvidersFromTransaction(trx) {
             // duraflows call they make joins `trx` as a savepoint, and the
             // callbacks it queues drain in the same pass.
             const root = kysely_transaction_context_js_1.kyselyTransactionScopes.createRoot(boundTrx);
-            const result = await kysely_transaction_context_js_1.kyselyTransactionScopes.run(narrowed, root, () => kysely_transaction_context_js_1.kyselyTransactionScopes.runInSavepoint(narrowed, root, callback, (sql) => (0, kysely_transaction_context_js_1.executeRawStatement)(boundTrx, sql)));
+            const result = await kysely_transaction_context_js_1.kyselyTransactionScopes.run(narrowed, root, () => (0, kysely_transaction_context_js_1.runInKyselySavepoint)(narrowed, root, callback));
             await kysely_transaction_context_js_1.kyselyTransactionScopes.run(narrowed, root, () => (0, core_1.runAfterCommitCallbacks)(root.callbacks));
             return result;
         },

package/dist/cjs/kysely-transaction-context.d.ts

@@ -1,20 +1,15 @@
 import type { Kysely, Transaction } from "kysely";
-import { ScopedTransactionContext } from "@duraflows/core";
+import { ScopedTransactionContext, type TransactionScope } from "@duraflows/core";
 import type { WorkflowDatabase } from "./kysely-database.js";
 type WorkflowTransaction = Transaction<WorkflowDatabase>;
 /** @internal Shared with the runners; not part of the public API. */
 export declare const kyselyTransactionScopes: ScopedTransactionContext<Kysely<WorkflowDatabase>, WorkflowTransaction>;
 /**
- * @internal Runs one fixed SQL statement (a savepoint command) on `trx`.
- *
- * `Transaction` has no savepoint API in kysely 0.29 (only `ControlledTransaction`
- * does), and this package imports kysely for types only, since kysely is
- * ESM-only and a runtime import would break the CommonJS build. So the
- * statement is handed to `executeQuery` as a compiled query built by hand,
- * shaped exactly like `CompiledQuery.raw(sql)`. `sql` is always an internally
- * generated `SAVEPOINT` / `RELEASE` / `ROLLBACK TO` statement, never user input.
+ * @internal Runs `callback` in a savepoint nested in `scope`, issuing the
+ * savepoint statements on that scope's own transaction. Every kysely entry
+ * point that nests (the runners and `transaction()`) goes through here.
  */
-export declare function executeRawStatement(trx: WorkflowTransaction, sql: string): Promise<unknown>;
+export declare function runInKyselySavepoint<T>(owner: Kysely<WorkflowDatabase>, scope: TransactionScope<WorkflowTransaction>, callback: () => Promise<T>): Promise<T>;
 /**
  * @internal Runs `callback` as the root of a new kysely transaction on `db`
  * (after `setup`, e.g. transaction-local timeouts), and only once kysely has

package/dist/cjs/kysely-transaction-context.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KyselyTransactionContext = exports.kyselyTransactionScopes = void 0;
-exports.executeRawStatement = executeRawStatement;
+exports.runInKyselySavepoint = runInKyselySavepoint;
 exports.runOwnedKyselyTransaction = runOwnedKyselyTransaction;
 const node_crypto_1 = require("node:crypto");
 const core_1 = require("@duraflows/core");
@@ -10,7 +10,7 @@ const core_1 = require("@duraflows/core");
 /** @internal Shared with the runners; not part of the public API. */
 exports.kyselyTransactionScopes = new core_1.ScopedTransactionContext();
 /**
- * @internal Runs one fixed SQL statement (a savepoint command) on `trx`.
+ * Runs one fixed SQL statement (a savepoint command) on `trx`.
  *
  * `Transaction` has no savepoint API in kysely 0.29 (only `ControlledTransaction`
  * does), and this package imports kysely for types only, since kysely is
@@ -28,6 +28,14 @@ function executeRawStatement(trx, sql) {
     };
     return trx.executeQuery(query);
 }
+/**
+ * @internal Runs `callback` in a savepoint nested in `scope`, issuing the
+ * savepoint statements on that scope's own transaction. Every kysely entry
+ * point that nests (the runners and `transaction()`) goes through here.
+ */
+function runInKyselySavepoint(owner, scope, callback) {
+    return exports.kyselyTransactionScopes.runInSavepoint(owner, scope, callback, (sql) => executeRawStatement(scope.connection, sql));
+}
 /**
  * @internal Runs `callback` as the root of a new kysely transaction on `db`
  * (after `setup`, e.g. transaction-local timeouts), and only once kysely has
@@ -84,7 +92,7 @@ exports.KyselyTransactionContext = {
         const owner = db;
         const scope = exports.kyselyTransactionScopes.current(owner);
         if (scope) {
-            return exports.kyselyTransactionScopes.runInSavepoint(owner, scope, () => callback(scope.connection), (sql) => executeRawStatement(scope.connection, sql));
+            return runInKyselySavepoint(owner, scope, () => callback(scope.connection));
         }
         return runOwnedKyselyTransaction(owner, async () => { }, (trx) => callback(trx));
     },

package/dist/cjs/kysely-transaction-runner.js

@@ -40,7 +40,7 @@ class KyselyTransactionRunner {
         if (scope) {
             // Nested: a savepoint on the outer transaction, so a failure rolls back
             // only this call. The outer transaction's timeouts stay in force.
-            return kysely_transaction_context_js_1.kyselyTransactionScopes.runInSavepoint(this.db, scope, callback, (sql) => (0, kysely_transaction_context_js_1.executeRawStatement)(scope.connection, sql));
+            return (0, kysely_transaction_context_js_1.runInKyselySavepoint)(this.db, scope, callback);
         }
         return (0, kysely_transaction_context_js_1.runOwnedKyselyTransaction)(this.db, (trx) => this.applyTimeouts(trx), () => callback());
     }

package/dist/index.js

@@ -3,7 +3,7 @@ import { KyselyWorkflowInstanceStore } from "./kysely-instance-store.js";
 import { KyselyWorkflowHistoryStore } from "./kysely-history-store.js";
 import { KyselyWorkflowDefinitionStore } from "./kysely-definition-store.js";
 import { KyselyTransactionRunner } from "./kysely-transaction-runner.js";
-import { executeRawStatement, kyselyTransactionScopes } from "./kysely-transaction-context.js";
+import { kyselyTransactionScopes, runInKyselySavepoint } from "./kysely-transaction-context.js";
 export { KyselyTransactionContext } from "./kysely-transaction-context.js";
 export { KyselyTransactionRunner } from "./kysely-transaction-runner.js";
 export { KyselyWorkflowInstanceStore } from "./kysely-instance-store.js";
@@ -39,7 +39,7 @@ export function kyselyWorkflowProvidersFromTransaction(trx) {
             // provider must never supersede it.
             const scope = kyselyTransactionScopes.current(narrowed);
             if (scope) {
-                return kyselyTransactionScopes.runInSavepoint(narrowed, scope, callback, (sql) => executeRawStatement(scope.connection, sql));
+                return runInKyselySavepoint(narrowed, scope, callback);
             }
             // The caller owns `trx`, so even this outermost call is nested in their
             // transaction: run it in a savepoint so a failure leaves no partial
@@ -48,7 +48,7 @@ export function kyselyWorkflowProvidersFromTransaction(trx) {
             // duraflows call they make joins `trx` as a savepoint, and the
             // callbacks it queues drain in the same pass.
             const root = kyselyTransactionScopes.createRoot(boundTrx);
-            const result = await kyselyTransactionScopes.run(narrowed, root, () => kyselyTransactionScopes.runInSavepoint(narrowed, root, callback, (sql) => executeRawStatement(boundTrx, sql)));
+            const result = await kyselyTransactionScopes.run(narrowed, root, () => runInKyselySavepoint(narrowed, root, callback));
             await kyselyTransactionScopes.run(narrowed, root, () => runAfterCommitCallbacks(root.callbacks));
             return result;
         },

package/dist/kysely-transaction-context.d.ts

@@ -1,20 +1,15 @@
 import type { Kysely, Transaction } from "kysely";
-import { ScopedTransactionContext } from "@duraflows/core";
+import { ScopedTransactionContext, type TransactionScope } from "@duraflows/core";
 import type { WorkflowDatabase } from "./kysely-database.js";
 type WorkflowTransaction = Transaction<WorkflowDatabase>;
 /** @internal Shared with the runners; not part of the public API. */
 export declare const kyselyTransactionScopes: ScopedTransactionContext<Kysely<WorkflowDatabase>, WorkflowTransaction>;
 /**
- * @internal Runs one fixed SQL statement (a savepoint command) on `trx`.
- *
- * `Transaction` has no savepoint API in kysely 0.29 (only `ControlledTransaction`
- * does), and this package imports kysely for types only, since kysely is
- * ESM-only and a runtime import would break the CommonJS build. So the
- * statement is handed to `executeQuery` as a compiled query built by hand,
- * shaped exactly like `CompiledQuery.raw(sql)`. `sql` is always an internally
- * generated `SAVEPOINT` / `RELEASE` / `ROLLBACK TO` statement, never user input.
+ * @internal Runs `callback` in a savepoint nested in `scope`, issuing the
+ * savepoint statements on that scope's own transaction. Every kysely entry
+ * point that nests (the runners and `transaction()`) goes through here.
  */
-export declare function executeRawStatement(trx: WorkflowTransaction, sql: string): Promise<unknown>;
+export declare function runInKyselySavepoint<T>(owner: Kysely<WorkflowDatabase>, scope: TransactionScope<WorkflowTransaction>, callback: () => Promise<T>): Promise<T>;
 /**
  * @internal Runs `callback` as the root of a new kysely transaction on `db`
  * (after `setup`, e.g. transaction-local timeouts), and only once kysely has

package/dist/kysely-transaction-context.js

@@ -5,7 +5,7 @@ import { ScopedTransactionContext, runAfterCommitCallbacks } from "@duraflows/co
 /** @internal Shared with the runners; not part of the public API. */
 export const kyselyTransactionScopes = new ScopedTransactionContext();
 /**
- * @internal Runs one fixed SQL statement (a savepoint command) on `trx`.
+ * Runs one fixed SQL statement (a savepoint command) on `trx`.
  *
  * `Transaction` has no savepoint API in kysely 0.29 (only `ControlledTransaction`
  * does), and this package imports kysely for types only, since kysely is
@@ -14,7 +14,7 @@ export const kyselyTransactionScopes = new ScopedTransactionContext();
  * shaped exactly like `CompiledQuery.raw(sql)`. `sql` is always an internally
  * generated `SAVEPOINT` / `RELEASE` / `ROLLBACK TO` statement, never user input.
  */
-export function executeRawStatement(trx, sql) {
+function executeRawStatement(trx, sql) {
     const query = {
         sql,
         parameters: [],
@@ -23,6 +23,14 @@ export function executeRawStatement(trx, sql) {
     };
     return trx.executeQuery(query);
 }
+/**
+ * @internal Runs `callback` in a savepoint nested in `scope`, issuing the
+ * savepoint statements on that scope's own transaction. Every kysely entry
+ * point that nests (the runners and `transaction()`) goes through here.
+ */
+export function runInKyselySavepoint(owner, scope, callback) {
+    return kyselyTransactionScopes.runInSavepoint(owner, scope, callback, (sql) => executeRawStatement(scope.connection, sql));
+}
 /**
  * @internal Runs `callback` as the root of a new kysely transaction on `db`
  * (after `setup`, e.g. transaction-local timeouts), and only once kysely has
@@ -79,7 +87,7 @@ export const KyselyTransactionContext = {
         const owner = db;
         const scope = kyselyTransactionScopes.current(owner);
         if (scope) {
-            return kyselyTransactionScopes.runInSavepoint(owner, scope, () => callback(scope.connection), (sql) => executeRawStatement(scope.connection, sql));
+            return runInKyselySavepoint(owner, scope, () => callback(scope.connection));
         }
         return runOwnedKyselyTransaction(owner, async () => { }, (trx) => callback(trx));
     },

package/dist/kysely-transaction-runner.js

@@ -1,5 +1,5 @@
 import { WorkflowError } from "@duraflows/core";
-import { executeRawStatement, kyselyTransactionScopes, runOwnedKyselyTransaction, } from "./kysely-transaction-context.js";
+import { kyselyTransactionScopes, runInKyselySavepoint, runOwnedKyselyTransaction, } from "./kysely-transaction-context.js";
 /**
  * Rejects anything that is not a finite, non-negative integer. Called at
  * construction time so an invalid value can never reach the database.
@@ -37,7 +37,7 @@ export class KyselyTransactionRunner {
         if (scope) {
             // Nested: a savepoint on the outer transaction, so a failure rolls back
             // only this call. The outer transaction's timeouts stay in force.
-            return kyselyTransactionScopes.runInSavepoint(this.db, scope, callback, (sql) => executeRawStatement(scope.connection, sql));
+            return runInKyselySavepoint(this.db, scope, callback);
         }
         return runOwnedKyselyTransaction(this.db, (trx) => this.applyTimeouts(trx), () => callback());
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duraflows/kysely",
-  "version": "5.2.0",
+  "version": "5.2.1",
   "description": "PostgreSQL persistence adapter for duraflows using `kysely`. Integrates with kysely's type-safe query builder and AsyncLocalStorage-based transaction context.",
   "keywords": [
     "duraflows",
@@ -51,15 +51,15 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@duraflows/core": "^5.2.0",
+    "@duraflows/core": "^5.2.1",
     "kysely": "^0.29.6"
   },
   "devDependencies": {
     "@types/pg": "^8.23.1",
     "kysely": "^0.29.6",
     "pg": "^8.23.0",
-    "@duraflows/core": "5.2.0",
-    "@duraflows/pg": "5.2.0"
+    "@duraflows/core": "5.2.1",
+    "@duraflows/pg": "5.2.1"
   },
   "scripts": {
     "build": "tsc --build"