@duraflows/kysely 3.1.0 → 4.0.1

package/README.md

@@ -51,7 +51,7 @@ import { KyselyTransactionContext } from "@duraflows/kysely";
 
 // Seed the transaction context so Duraflows participates in your transaction
 await db.transaction().execute(async (trx) => {
-  await KyselyTransactionContext.run(trx, async () => {
+  await KyselyTransactionContext.run(db, trx, async () => {
     // Your own writes -- uses trx
     await trx.insertInto("orders").values({ id: "ORD-1", status: "paid" }).execute();
 
@@ -117,8 +117,10 @@ Convenience factory for short-lived runtimes pre-bound to an existing transactio
 
 ### `KyselyTransactionContext`
 
-- `getTransaction()` -- Returns the active `Transaction<WorkflowDatabase>` or `undefined`
-- `run(trx, callback)` -- Executes `callback` with `trx` as the active transaction context
+The context is scoped per Kysely instance:
+
+- `getTransaction(db)` -- Returns the active `Transaction<WorkflowDatabase>` for the given `db` instance, or `undefined`
+- `run(db, trx, callback)` -- Executes `callback` with `trx` as the active transaction context for the given `db` instance
 
 ## Documentation
 

package/dist/cjs/index.js

@@ -39,11 +39,12 @@ function kyselyWorkflowProvidersFromTransaction(trx) {
     const narrowed = trx;
     const transactionRunner = {
         async runInTransaction(callback) {
-            const existing = kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction();
-            if (existing) {
+            // Nested calls reuse the bound transaction; an unrelated ambient
+            // transaction from another provider must never supersede it.
+            if (kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction(narrowed)) {
                 return callback();
             }
-            return kysely_transaction_context_js_1.KyselyTransactionContext.run(trx, callback);
+            return kysely_transaction_context_js_1.KyselyTransactionContext.run(narrowed, trx, callback);
         },
     };
     const instanceStore = new kysely_instance_store_js_1.KyselyWorkflowInstanceStore(narrowed);

package/dist/cjs/kysely-history-store.js

@@ -8,7 +8,7 @@ class KyselyWorkflowHistoryStore {
         this.db = db;
     }
     getExecutor() {
-        return kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction() ?? this.db;
+        return kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction(this.db) ?? this.db;
     }
     async append(entry) {
         const executor = this.getExecutor();

package/dist/cjs/kysely-instance-store.js

@@ -9,7 +9,7 @@ class KyselyWorkflowInstanceStore {
         this.db = db;
     }
     getExecutor() {
-        return kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction() ?? this.db;
+        return kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction(this.db) ?? this.db;
     }
     async create(instance) {
         const executor = this.getExecutor();
@@ -37,9 +37,9 @@ class KyselyWorkflowInstanceStore {
         return this.mapRow(row);
     }
     async lockByUuid(uuid) {
-        const trx = kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction();
+        const trx = kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction(this.db);
         if (!trx) {
-            throw new Error("lockByUuid requires an active transaction");
+            throw new core_1.WorkflowError("lockByUuid requires an active transaction");
         }
         const row = await trx
             .selectFrom("workflow_instances")
@@ -73,9 +73,9 @@ class KyselyWorkflowInstanceStore {
         }
     }
     async findExpired(limit, now) {
-        const trx = kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction();
+        const trx = kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction(this.db);
         if (!trx) {
-            throw new Error("findExpired requires an active transaction");
+            throw new core_1.WorkflowError("findExpired requires an active transaction");
         }
         const rows = await trx
             .selectFrom("workflow_instances")

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

@@ -1,9 +1,9 @@
-import type { Transaction } from "kysely";
+import type { Kysely, Transaction } from "kysely";
 import type { WorkflowDatabase } from "./kysely-database.js";
 export declare const KyselyTransactionContext: {
-    getTransaction(): Transaction<WorkflowDatabase> | undefined;
+    getTransaction(owner: Kysely<WorkflowDatabase>): Transaction<WorkflowDatabase> | undefined;
     /**
-     * Executes callback with `trx` as the active transaction context.
+     * Executes callback with `trx` as the active transaction for `owner`.
      *
      * Generic so callers can pass `Transaction<MyDb & WorkflowDatabase>`
      * (Kysely is invariant in DB, so a non-generic signature would reject
@@ -11,6 +11,6 @@ export declare const KyselyTransactionContext: {
      * `Transaction<WorkflowDatabase>` which is safe — stores only access
      * workflow tables.
      */
-    run<T, DB extends WorkflowDatabase = WorkflowDatabase>(trx: Transaction<DB>, callback: () => T): T;
+    run<T, DB extends WorkflowDatabase = WorkflowDatabase>(owner: Kysely<WorkflowDatabase>, trx: Transaction<DB>, callback: () => T): T;
 };
 //# sourceMappingURL=kysely-transaction-context.d.ts.map

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

@@ -2,13 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.KyselyTransactionContext = void 0;
 const node_async_hooks_1 = require("node:async_hooks");
-const storage = new node_async_hooks_1.AsyncLocalStorage();
+// One context per Kysely instance (or per pre-bound Transaction): a
+// transaction on db A is invisible to stores and runners bound to db B.
+const storages = new WeakMap();
+function storageFor(owner) {
+    let storage = storages.get(owner);
+    if (!storage) {
+        storage = new node_async_hooks_1.AsyncLocalStorage();
+        storages.set(owner, storage);
+    }
+    return storage;
+}
 exports.KyselyTransactionContext = {
-    getTransaction() {
-        return storage.getStore();
+    getTransaction(owner) {
+        return storages.get(owner)?.getStore();
     },
     /**
-     * Executes callback with `trx` as the active transaction context.
+     * Executes callback with `trx` as the active transaction for `owner`.
      *
      * Generic so callers can pass `Transaction<MyDb & WorkflowDatabase>`
      * (Kysely is invariant in DB, so a non-generic signature would reject
@@ -16,8 +26,8 @@ exports.KyselyTransactionContext = {
      * `Transaction<WorkflowDatabase>` which is safe — stores only access
      * workflow tables.
      */
-    run(trx, callback) {
-        return storage.run(trx, callback);
+    run(owner, trx, callback) {
+        return storageFor(owner).run(trx, callback);
     },
 };
 //# sourceMappingURL=kysely-transaction-context.js.map

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

@@ -8,12 +8,12 @@ class KyselyTransactionRunner {
         this.db = db;
     }
     async runInTransaction(callback) {
-        const existing = kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction();
+        const existing = kysely_transaction_context_js_1.KyselyTransactionContext.getTransaction(this.db);
         if (existing) {
             return callback();
         }
         return this.db.transaction().execute(async (trx) => {
-            return kysely_transaction_context_js_1.KyselyTransactionContext.run(trx, callback);
+            return kysely_transaction_context_js_1.KyselyTransactionContext.run(this.db, trx, callback);
         });
     }
 }

package/dist/index.js

@@ -30,11 +30,12 @@ export function kyselyWorkflowProvidersFromTransaction(trx) {
     const narrowed = trx;
     const transactionRunner = {
         async runInTransaction(callback) {
-            const existing = KyselyTransactionContext.getTransaction();
-            if (existing) {
+            // Nested calls reuse the bound transaction; an unrelated ambient
+            // transaction from another provider must never supersede it.
+            if (KyselyTransactionContext.getTransaction(narrowed)) {
                 return callback();
             }
-            return KyselyTransactionContext.run(trx, callback);
+            return KyselyTransactionContext.run(narrowed, trx, callback);
         },
     };
     const instanceStore = new KyselyWorkflowInstanceStore(narrowed);

package/dist/kysely-history-store.js

@@ -5,7 +5,7 @@ export class KyselyWorkflowHistoryStore {
         this.db = db;
     }
     getExecutor() {
-        return KyselyTransactionContext.getTransaction() ?? this.db;
+        return KyselyTransactionContext.getTransaction(this.db) ?? this.db;
     }
     async append(entry) {
         const executor = this.getExecutor();

package/dist/kysely-instance-store.js

@@ -6,7 +6,7 @@ export class KyselyWorkflowInstanceStore {
         this.db = db;
     }
     getExecutor() {
-        return KyselyTransactionContext.getTransaction() ?? this.db;
+        return KyselyTransactionContext.getTransaction(this.db) ?? this.db;
     }
     async create(instance) {
         const executor = this.getExecutor();
@@ -34,9 +34,9 @@ export class KyselyWorkflowInstanceStore {
         return this.mapRow(row);
     }
     async lockByUuid(uuid) {
-        const trx = KyselyTransactionContext.getTransaction();
+        const trx = KyselyTransactionContext.getTransaction(this.db);
         if (!trx) {
-            throw new Error("lockByUuid requires an active transaction");
+            throw new WorkflowError("lockByUuid requires an active transaction");
         }
         const row = await trx
             .selectFrom("workflow_instances")
@@ -70,9 +70,9 @@ export class KyselyWorkflowInstanceStore {
         }
     }
     async findExpired(limit, now) {
-        const trx = KyselyTransactionContext.getTransaction();
+        const trx = KyselyTransactionContext.getTransaction(this.db);
         if (!trx) {
-            throw new Error("findExpired requires an active transaction");
+            throw new WorkflowError("findExpired requires an active transaction");
         }
         const rows = await trx
             .selectFrom("workflow_instances")

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

@@ -1,9 +1,9 @@
-import type { Transaction } from "kysely";
+import type { Kysely, Transaction } from "kysely";
 import type { WorkflowDatabase } from "./kysely-database.js";
 export declare const KyselyTransactionContext: {
-    getTransaction(): Transaction<WorkflowDatabase> | undefined;
+    getTransaction(owner: Kysely<WorkflowDatabase>): Transaction<WorkflowDatabase> | undefined;
     /**
-     * Executes callback with `trx` as the active transaction context.
+     * Executes callback with `trx` as the active transaction for `owner`.
      *
      * Generic so callers can pass `Transaction<MyDb & WorkflowDatabase>`
      * (Kysely is invariant in DB, so a non-generic signature would reject
@@ -11,6 +11,6 @@ export declare const KyselyTransactionContext: {
      * `Transaction<WorkflowDatabase>` which is safe — stores only access
      * workflow tables.
      */
-    run<T, DB extends WorkflowDatabase = WorkflowDatabase>(trx: Transaction<DB>, callback: () => T): T;
+    run<T, DB extends WorkflowDatabase = WorkflowDatabase>(owner: Kysely<WorkflowDatabase>, trx: Transaction<DB>, callback: () => T): T;
 };
 //# sourceMappingURL=kysely-transaction-context.d.ts.map

package/dist/kysely-transaction-context.js

@@ -1,11 +1,21 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-const storage = new AsyncLocalStorage();
+// One context per Kysely instance (or per pre-bound Transaction): a
+// transaction on db A is invisible to stores and runners bound to db B.
+const storages = new WeakMap();
+function storageFor(owner) {
+    let storage = storages.get(owner);
+    if (!storage) {
+        storage = new AsyncLocalStorage();
+        storages.set(owner, storage);
+    }
+    return storage;
+}
 export const KyselyTransactionContext = {
-    getTransaction() {
-        return storage.getStore();
+    getTransaction(owner) {
+        return storages.get(owner)?.getStore();
     },
     /**
-     * Executes callback with `trx` as the active transaction context.
+     * Executes callback with `trx` as the active transaction for `owner`.
      *
      * Generic so callers can pass `Transaction<MyDb & WorkflowDatabase>`
      * (Kysely is invariant in DB, so a non-generic signature would reject
@@ -13,8 +23,8 @@ export const KyselyTransactionContext = {
      * `Transaction<WorkflowDatabase>` which is safe — stores only access
      * workflow tables.
      */
-    run(trx, callback) {
-        return storage.run(trx, callback);
+    run(owner, trx, callback) {
+        return storageFor(owner).run(trx, callback);
     },
 };
 //# sourceMappingURL=kysely-transaction-context.js.map

package/dist/kysely-transaction-runner.js

@@ -5,12 +5,12 @@ export class KyselyTransactionRunner {
         this.db = db;
     }
     async runInTransaction(callback) {
-        const existing = KyselyTransactionContext.getTransaction();
+        const existing = KyselyTransactionContext.getTransaction(this.db);
         if (existing) {
             return callback();
         }
         return this.db.transaction().execute(async (trx) => {
-            return KyselyTransactionContext.run(trx, callback);
+            return KyselyTransactionContext.run(this.db, trx, callback);
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duraflows/kysely",
-  "version": "3.1.0",
+  "version": "4.0.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": "^3.1.0",
-    "kysely": "^0.29.2"
+    "@duraflows/core": "^4.0.1",
+    "kysely": "^0.29.4"
   },
   "devDependencies": {
-    "@types/pg": "^8.11.0",
-    "kysely": "^0.29.2",
-    "pg": "^8.21.0",
-    "@duraflows/core": "3.1.0",
-    "@duraflows/pg": "3.1.0"
+    "@types/pg": "^8.20.4",
+    "kysely": "^0.29.4",
+    "pg": "^8.22.0",
+    "@duraflows/core": "4.0.1",
+    "@duraflows/pg": "4.0.1"
   },
   "scripts": {
     "build": "tsc --build"