@shivaedev/effect-changes-prisma 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,58 @@
 # Changelog
 
+## 0.2.0 - 2026-09-26
+
+### Added
+
+- `tableWrites(client)` reads the current transaction's per-table write counts
+  as a baseline for `writtenTables`.
+
+### Changed
+
+- **Breaking:** `transaction` can fail with the new `TransactionExpired`, so its
+  error type is now `E | TransactionExpired | PrismaError`. A transaction that
+  outlives its timeout, and a savepoint start, `RELEASE` or `COMMIT` that
+  Prisma refuses with `P2028` because the transaction is closed, used to fail
+  with `PrismaError` and now fail with `TransactionExpired`. A transaction that
+  cannot start at all, such as one waiting past `maxWait` for a connection,
+  still fails with `PrismaError`, although Prisma also reports it as `P2028`.
+  Migrate by adding `TransactionExpired` wherever the error type is written
+  out: `Effect.Effect<A, PrismaError>` becomes
+  `Effect.Effect<A, TransactionExpired | PrismaError>`.
+
+### Fixed
+
+- `writtenTables` reported tables that earlier transactions wrote on the same
+  pooled connection, because PostgreSQL keeps `pg_stat_xact_user_tables`
+  counters per connection until it flushes them. Take a baseline with
+  `tableWrites` when the test transaction starts and pass it as
+  `writtenTables(client, since)` to report only the tables written after it.
+  A `TRUNCATE` inside the test transaction resets its counts to the baseline,
+  so `writtenTables` does not see it.
+- A `transaction` body kept running after Prisma expired the transaction,
+  keeping the caller waiting and free to make HTTP calls or publish while its
+  queries were refused. The body is now interrupted when the transaction's
+  timeout passes, or when one of its queries or nested `transaction`s fails
+  with `P2028` because the transaction is closed. The call then fails with
+  `TransactionExpired`, and nothing publishes. The timeout is the `timeout`
+  option, else the `transactionOptions.timeout` Prisma applies to the current
+  client, extended or not, 5 seconds unless the client sets another. It is
+  timed from the start of the transaction on the wall clock. When the client's
+  timeout cannot be read, `transaction` sets no deadline of its own, and the
+  body stops at its first query after Prisma closes the transaction. A
+  `transaction` on a transaction client is a savepoint and has no timeout of
+  its own; on any other client it is a separate transaction whose expiry does
+  not stop the body it runs in.
+- Two copies of the package with bindings of the same name shared their
+  `Client` and expiry signal. Each binding is now keyed by a random id.
+
+## 0.1.1 - 2026-09-26
+
+### Changed
+
+- Pin the `@prisma/client` peer dependency to exactly 7.9.1, the version the
+  package is tested against, instead of `^7.9.1`.
+
 ## 0.1.0 - 2026-09-26
 
 ### Added

package/README.md

@@ -52,7 +52,7 @@ interface PrismaChanges<Tx, A, R> {
   readonly channel: Channel<A, R>;
   readonly Client: Context.Reference<Tx>;
   readonly use: <X>(query: (client: Tx) => PromiseLike<X>) => Effect<X, PrismaError, R>;
-  readonly transaction: <X, E, R2>(body: Effect<X, E, R2>, options?: TransactionOptions) => Effect<X, E | PrismaError, R | R2>;
+  readonly transaction: <X, E, R2>(body: Effect<X, E, R2>, options?: TransactionOptions) => Effect<X, E | TransactionExpired | PrismaError, R | R2>;
   readonly recordWrite: (write: Write) => Effect<void, never, R>;
   readonly Unnamed: Context.Reference<(write: UnnamedWrite) => Effect<void>>;
 }
@@ -63,9 +63,11 @@ type UnnamedWrite =
   | { readonly model: string; readonly operation: string; readonly reason: "countOnly" }
   | { readonly model: string; readonly operation: string; readonly reason: "narrowed"; readonly field: string };
 class PrismaError { readonly _tag: "PrismaError"; readonly cause: unknown }
+class TransactionExpired { readonly _tag: "TransactionExpired"; readonly message: string; readonly cause?: unknown }
 
 tablesOf(schema: string): ReadonlyMap<string, string>
-writtenTables(client: RawQueryClient): Effect<ReadonlyArray<string>, PrismaError>
+tableWrites(client: RawQueryClient): Effect<TableWrites, PrismaError>
+writtenTables(client: RawQueryClient, since?: TableWrites): Effect<ReadonlyArray<string>, PrismaError>
 checkCoverage<A>(coverage: Coverage<A>): ReadonlyArray<CoverageViolation>
 ```
 
@@ -82,12 +84,18 @@ checkCoverage<A>(coverage: Coverage<A>): ReadonlyArray<CoverageViolation>
 
 | Situation | Result |
 | --- | --- |
+| `$transaction` cannot start, for example because no connection frees up within `maxWait` | The body never runs; fail with `PrismaError`, even though Prisma reports it as `P2028` |
 | The body succeeds and `$transaction` resolves | Publish once, before `transaction` returns; a savepoint merges into its parent |
 | The body fails, dies or is interrupted | Prisma rolls back; discard; the body's failure is returned unchanged |
-| The body succeeds but `COMMIT` fails or the transaction times out | Discard; fail with `PrismaError` |
+| The body is still running when the transaction's timeout passes | The body is interrupted at its next step; a query already in flight completes first. Prisma rolls back; discard; fail with `TransactionExpired` |
+| A query or a nested `transaction` in the body fails because the transaction is already closed | The body is stopped, whatever it does with the error; discard; fail with `TransactionExpired` |
+| The body succeeds but `COMMIT` finds the transaction closed | Discard; fail with `TransactionExpired` |
+| The body succeeds but `COMMIT` fails for another reason | Discard; fail with `PrismaError` |
 | The caller is interrupted while the body runs | The body is interrupted, Prisma rolls back, nothing publishes |
 | The caller is interrupted while `COMMIT` is in flight | Keep waiting; publish if the database committed; the caller still sees the interruption |
 
+The timeout is the `timeout` option, otherwise the one Prisma applies to the current client, extended or not: its `transactionOptions.timeout`, 5 seconds unless the client was constructed with another. Like Prisma's, the clock starts once the transaction has begun, and it reads wall-clock time, so a `TestClock` does not move it. A `transaction` running on a transaction client, which Prisma makes a savepoint, has no timeout of its own; the outer transaction's applies. On any other client, such as a per-request extended client or the base client provided inside a body, `transaction` starts a separate transaction with its own timeout, and that transaction closing does not stop the body it runs in. Prisma reports a closed transaction as `P2028`, for example when a test harness's own transaction, which `transaction` does not time, has expired.
+
 A frame is a root when there is no frame for the client further out, not when the current client is the base client. A test harness can therefore run each test inside a Prisma transaction that always rolls back, provide its transaction client as `Client` without opening a frame, and the application's first `transaction` inside it publishes when its savepoint is released.
 
 ## Recording
@@ -99,15 +107,17 @@ A frame is a root when there is no frame for the client further out, not when th
 
 ## Coverage check
 
-The check runs in tests. Read the tables the test transaction wrote from `pg_stat_xact_user_tables` just before it rolls back, then compare them with the changes the channel observed:
+The check runs in tests. Take a baseline from `pg_stat_xact_user_tables` when the test transaction starts, read the tables written since just before it rolls back, then compare them with the changes the channel observed:
 
 ```ts
 const tables = tablesOf(await readFile("prisma/schema.prisma", "utf8"));
 const observations: Array<Observation<Change>> = [];
 const unnamed: Array<UnnamedWrite> = [];
+// first, as the test transaction starts:
+const since = yield* tableWrites(testTransaction);
 // run the test with changes.channel.Observer and changes.Unnamed pushing into those arrays,
 // and changes.Client set to the test's transaction client; then, before rolling back:
-const written = yield* writtenTables(testTransaction);
+const written = yield* writtenTables(testTransaction, since);
 const violations = checkCoverage({
   written,
   tables,
@@ -119,7 +129,7 @@ const violations = checkCoverage({
 ```
 
 - `tablesOf` reads the table of every model from Prisma schema text, honouring `@@map`; a model without it uses its name. Pass an explicit `Map` instead if your tables come from elsewhere.
-- `writtenTables(client)` must run on the test's own transaction: PostgreSQL counts inserted, updated and deleted rows per transaction, including rows written in savepoints that rolled back.
+- `tableWrites(client)` and `writtenTables(client, since)` must run on the test's own transaction. PostgreSQL counts inserted, updated and deleted rows, including rows written in savepoints that rolled back, but it keeps those counters per connection until it flushes them, at most once a second. On a pooled connection they still hold the writes of earlier transactions, so `writtenTables` reports only the tables whose counters grew past the `since` baseline. Without `since` it reports every table with an unflushed count. The binding cannot take the baseline for you: the test transaction is the harness's own `$transaction`, which it never sees begin.
 - `checkCoverage` is a pure function and throws only if `covers` throws. It reports each written table whose model is not mapped to `null` and for which no `Recorded` observation satisfies `covers`, as `Unrecorded` (with `model: undefined` when no model owns the table), and each distinct unnamed write as `Unnamed`. `Recorded` includes changes whose frame was later discarded, matching the statistics.
 - Raw SQL, relation writes nested in `data`, cascades and triggers write tables that nothing records; the check is how they surface. Filter the result if a table is written legitimately without a change.
 
@@ -127,8 +137,10 @@ const violations = checkCoverage({
 
 - The client handed to `use` wraps write methods of mapped models, so their results are plain promises: pass them to `transaction`, not to the array form of `$transaction`, and do not chain fluent relation calls on them. Calling `$transaction` on that client runs outside the binding; use `transaction`.
 - A relation write nested in `data` records only the top-level model.
-- Prisma's interactive transaction timeout (5 seconds by default) still applies; pass `{ timeout }` to `transaction`.
+- Prisma's interactive transaction timeout (5 seconds by default) still applies; pass `{ timeout }` to `transaction` for a longer one.
+- The client's timeout is read from Prisma's internal client configuration, which Prisma `7.9.1` keeps on the client. If a later Prisma moves it, `transaction` sets no deadline of its own, and a body that outlives Prisma's timeout stops at its first query after the transaction closes; pass `{ timeout }` to have it interrupted on time.
 - `checkCoverage` matches tables by name, not by schema.
+- `writtenTables` does not see a `TRUNCATE` inside the test transaction: `TRUNCATE` resets the transaction's insert, update and delete counts in `pg_stat_xact_user_tables`, so they fall back to the baseline, and a table that was written and then truncated counts as unwritten.
 - Delivery is in-process, as for every effect-changes channel.
 
 Tested with Prisma `7.9.1` and `@prisma/adapter-pg` on PostgreSQL 18, and Effect `4.0.0-rc.112`.

package/dist/changes.d.ts

@@ -1,6 +1,6 @@
 import { type Channel, type ChannelOptions } from "@shivaedev/effect-changes";
 import { Context, Effect } from "effect";
-import { PrismaError } from "./error.ts";
+import { PrismaError, type TransactionExpired } from "./error.ts";
 import type { ChangeMap, Transactional, TransactionOptions } from "./model.ts";
 import { type UnnamedWrite, type Write } from "./write.ts";
 export type UnnamedObserver = (write: UnnamedWrite) => Effect.Effect<void>;
@@ -12,7 +12,7 @@ export interface PrismaChanges<Tx, A, R> {
     readonly channel: Channel<A, R>;
     readonly Client: Context.Reference<Tx>;
     readonly use: <X>(query: (client: Tx) => PromiseLike<X>) => Effect.Effect<X, PrismaError, R>;
-    readonly transaction: <X, E, R2>(body: Effect.Effect<X, E, R2>, options?: TransactionOptions) => Effect.Effect<X, E | PrismaError, R | R2>;
+    readonly transaction: <X, E, R2>(body: Effect.Effect<X, E, R2>, options?: TransactionOptions) => Effect.Effect<X, E | TransactionExpired | PrismaError, R | R2>;
     readonly recordWrite: (write: Write) => Effect.Effect<void, never, R>;
     readonly Unnamed: Context.Reference<UnnamedObserver>;
 }

package/dist/changes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"changes.d.ts","sourceRoot":"","sources":["../src/changes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,cAAc,EAAe,MAAM,2BAA2B,CAAC;AAC3F,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAG/E,OAAO,EAA4B,KAAK,YAAY,EAAE,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAErF,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAE3E,MAAM,WAAW,oBAAoB,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAE,SAAQ,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtG,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAC7F,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,kBAAkB,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3I,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;CACrD;AAMD,eAAO,MAAM,iBAAiB,GAAI,EAAE,SAAS,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,SAAS,oBAAoB,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAmC7I,CAAC"}
+{"version":3,"file":"changes.d.ts","sourceRoot":"","sources":["../src/changes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,cAAc,EAAe,MAAM,2BAA2B,CAAC;AAC3F,OAAO,EAAS,OAAO,EAAE,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,KAAK,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAElE,OAAO,KAAK,EAAE,SAAS,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAG/E,OAAO,EAA4B,KAAK,YAAY,EAAE,KAAK,KAAK,EAAE,MAAM,YAAY,CAAC;AAErF,MAAM,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAE3E,MAAM,WAAW,oBAAoB,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAE,SAAQ,IAAI,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACtG,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC;CAC3C;AAED,MAAM,WAAW,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;IACtC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;IACvC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,WAAW,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;IAC7F,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAC9B,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAC7B,OAAO,CAAC,EAAE,kBAAkB,KACxB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,kBAAkB,GAAG,WAAW,EAAE,CAAC,GAAG,EAAE,CAAC,CAAC;IACpE,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACtE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;CACrD;AAUD,eAAO,MAAM,iBAAiB,GAAI,EAAE,SAAS,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,KAAK,EAAE,SAAS,oBAAoB,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,KAAG,aAAa,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CA0C7I,CAAC"}

package/dist/changes.js

@@ -1,18 +1,23 @@
 import { makeChannel } from "@shivaedev/effect-changes";
-import { Context, Effect } from "effect";
+import { Cause, Context, Effect, Exit, Option } from "effect";
 import { PrismaError } from "./error.js";
+import { configuredTimeout, isTransactionClient, isTransactionClosed, makeExpiry, unlinked } from "./expiry.js";
 import { delegatesOf, recordingClient } from "./recording.js";
 import { runTransaction } from "./transaction.js";
 import { interpret } from "./write.js";
-let bindings = 0;
 const ignoreUnnamed = () => Effect.void;
+const expireOnClosed = (Expiry, exit) => Option.match(Exit.isFailure(exit) ? Cause.findErrorOption(exit.cause) : Option.none(), {
+    onNone: () => Effect.void,
+    onSome: ({ cause }) => (isTransactionClosed(cause) ? Effect.flatMap(Effect.service(Expiry), (expire) => expire(cause)) : Effect.void),
+});
 export const makePrismaChanges = (options) => {
     const { client, models: typed, ...channelOptions } = options;
     const models = typed;
-    const prefix = `@shivaedev/effect-changes-prisma/${options.name}/${bindings++}`;
+    const prefix = `@shivaedev/effect-changes-prisma/${options.name}/${crypto.randomUUID()}`;
     const channel = makeChannel({ ...channelOptions, owner: Effect.succeed(client) });
     const Client = Context.Reference(`${prefix}/Client`, { defaultValue: () => client });
     const Unnamed = Context.Reference(`${prefix}/Unnamed`, { defaultValue: () => ignoreUnnamed });
+    const Expiry = makeExpiry(`${prefix}/Expiry`);
     const delegates = delegatesOf(models);
     const recordWrite = Effect.fn("PrismaChanges.recordWrite")(function* (write) {
         const { changes, unnamed } = interpret(models, write);
@@ -27,14 +32,22 @@ export const makePrismaChanges = (options) => {
         const recording = recordingClient(current, delegates, (write) => writes.push(write));
         const exit = yield* Effect.exit(Effect.tryPromise({ try: () => query(recording), catch: (cause) => new PrismaError({ cause }) }));
         yield* Effect.forEach(writes, recordWrite, { discard: true });
+        yield* expireOnClosed(Expiry, exit);
         return yield* exit;
     }, Effect.uninterruptible);
-    const transaction = (body, transactionOptions) => Effect.flatMap(Effect.service(Client), (current) => runTransaction({
-        client: current,
-        open: channel.open,
-        body: (tx) => Effect.provideService(body, Client, tx),
-        transaction: transactionOptions,
-    })).pipe(Effect.withSpan("PrismaChanges.transaction"));
+    const transaction = (body, transactionOptions) => Effect.flatMap(Effect.service(Client), (current) => {
+        const savepoint = isTransactionClient(current);
+        const run = runTransaction({
+            client: current,
+            open: channel.open,
+            body: (tx) => Effect.provideService(body, Client, tx),
+            transaction: transactionOptions,
+            savepoint,
+            deadline: savepoint ? undefined : (transactionOptions?.timeout ?? configuredTimeout(current)),
+            Expiry,
+        });
+        return savepoint ? run : Effect.provideService(run, Expiry, unlinked);
+    }).pipe(Effect.withSpan("PrismaChanges.transaction"));
     return { channel, Client, use, transaction, recordWrite, Unnamed };
 };
 //# sourceMappingURL=changes.js.map

package/dist/changes.js.map

@@ -1 +1 @@
-{"version":3,"file":"changes.js","sourceRoot":"","sources":["../src/changes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"changes.js","sourceRoot":"","sources":["../src/changes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqC,WAAW,EAAE,MAAM,2BAA2B,CAAC;AAC3F,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,WAAW,EAA2B,MAAM,YAAY,CAAC;AAClE,OAAO,EAAE,iBAAiB,EAAe,mBAAmB,EAAE,mBAAmB,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE7H,OAAO,EAAE,WAAW,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAgD,MAAM,YAAY,CAAC;AAqBrF,MAAM,aAAa,GAAoB,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC;AAEzD,MAAM,cAAc,GAAG,CAAC,MAAiC,EAAE,IAAqC,EAAuB,EAAE,CACxH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE;IACtF,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;IACzB,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;CACrI,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAA6C,OAAuC,EAA2B,EAAE;IACjJ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,CAAC;IAC7D,MAAM,MAAM,GAAgB,KAAK,CAAC;IAClC,MAAM,MAAM,GAAG,oCAAoC,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC;IACzF,MAAM,OAAO,GAAG,WAAW,CAAO,EAAE,GAAG,cAAc,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACxF,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,CAAK,GAAG,MAAM,SAAS,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IACzF,MAAM,OAAO,GAAG,OAAO,CAAC,SAAS,CAAkB,GAAG,MAAM,UAAU,EAAE,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC;IAC/G,MAAM,MAAM,GAAG,UAAU,CAAC,GAAG,MAAM,SAAS,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IAEtC,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAY;QACjF,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACtD,IAAI,OAAO,KAAK,SAAS;YAAE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACzG,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;YAAE,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAK,KAAqC;QAC7F,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;QAC9B,MAAM,MAAM,GAAiB,EAAE,CAAC;QAChC,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACrF,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAClI,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9D,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC;IACpB,CAAC,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAE3B,MAAM,WAAW,GAAG,CAAW,IAA6B,EAAE,kBAAuC,EAAE,EAAE,CACxG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE;QAClD,MAAM,SAAS,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,GAAG,GAAG,cAAc,CAAC;YAC1B,MAAM,EAAE,OAAO;YACf,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,IAAI,EAAE,CAAC,EAAM,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;YACzD,WAAW,EAAE,kBAAkB;YAC/B,SAAS;YACT,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,kBAAkB,EAAE,OAAO,IAAI,iBAAiB,CAAC,OAAO,CAAC,CAAC;YAC7F,MAAM;SACN,CAAC,CAAC;QACH,OAAO,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,2BAA2B,CAAC,CAAC,CAAC;IAEvD,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC;AACpE,CAAC,CAAC"}

package/dist/error.d.ts

@@ -5,5 +5,13 @@ export declare class PrismaError extends PrismaError_base<{
     readonly cause: unknown;
 }> {
 }
+declare const TransactionExpired_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
+    readonly _tag: "TransactionExpired";
+} & Readonly<A>;
+export declare class TransactionExpired extends TransactionExpired_base<{
+    readonly message: string;
+    readonly cause?: unknown;
+}> {
+}
 export {};
 //# sourceMappingURL=error.d.ts.map

package/dist/error.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":";;;AAEA,qBAAa,WAAY,SAAQ,iBAAgC;IAChE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACxB,CAAC;CAAG"}
+{"version":3,"file":"error.d.ts","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":";;;AAEA,qBAAa,WAAY,SAAQ,iBAAgC;IAChE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;CACxB,CAAC;CAAG;;;;AAEL,qBAAa,kBAAmB,SAAQ,wBAAuC;IAC9E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;CAAG"}

package/dist/error.js

@@ -1,4 +1,6 @@
 import { Data } from "effect";
 export class PrismaError extends Data.TaggedError("PrismaError") {
 }
+export class TransactionExpired extends Data.TaggedError("TransactionExpired") {
+}
 //# sourceMappingURL=error.js.map

package/dist/error.js.map

@@ -1 +1 @@
-{"version":3,"file":"error.js","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,OAAO,WAAY,SAAQ,IAAI,CAAC,WAAW,CAAC,aAAa,CAE7D;CAAG"}
+{"version":3,"file":"error.js","sourceRoot":"","sources":["../src/error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,OAAO,WAAY,SAAQ,IAAI,CAAC,WAAW,CAAC,aAAa,CAE7D;CAAG;AAEL,MAAM,OAAO,kBAAmB,SAAQ,IAAI,CAAC,WAAW,CAAC,oBAAoB,CAG3E;CAAG"}

package/dist/expiry.d.ts

@@ -0,0 +1,10 @@
+import { Context, Effect } from "effect";
+import { TransactionExpired } from "./error.ts";
+export type Expire = (cause: unknown) => Effect.Effect<void>;
+export declare const unlinked: Expire;
+export declare const makeExpiry: (key: string) => Context.Reference<Expire>;
+export declare const isTransactionClient: (client: object) => boolean;
+export declare const isTransactionClosed: (cause: unknown) => boolean;
+export declare const configuredTimeout: (client: object) => number | undefined;
+export declare const expiring: <X, E, R>(body: Effect.Effect<X, E, R>, timeout: number | undefined, Expiry: Context.Reference<Expire>) => Effect.Effect<X, E | TransactionExpired, R>;
+//# sourceMappingURL=expiry.d.ts.map

package/dist/expiry.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"expiry.d.ts","sourceRoot":"","sources":["../src/expiry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAY,MAAM,EAA6B,MAAM,QAAQ,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAEhD,MAAM,MAAM,MAAM,GAAG,CAAC,KAAK,EAAE,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAE7D,eAAO,MAAM,QAAQ,EAAE,MAA0B,CAAC;AAElD,eAAO,MAAM,UAAU,GAAI,KAAK,MAAM,8BAAqE,CAAC;AAE5G,eAAO,MAAM,mBAAmB,GAAI,QAAQ,MAAM,KAAG,OAAqD,CAAC;AAE3G,eAAO,MAAM,mBAAmB,GAAI,OAAO,OAAO,KAAG,OAAyE,CAAC;AAM/H,eAAO,MAAM,iBAAiB,GAAI,QAAQ,MAAM,KAAG,MAAM,GAAG,SAG/C,CAAC;AAId,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAC/B,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC5B,SAAS,MAAM,GAAG,SAAS,EAC3B,QAAQ,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,KAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,kBAAkB,EAAE,CAAC,CAoB1C,CAAC"}

package/dist/expiry.js

@@ -0,0 +1,23 @@
+import { Clock, Context, Deferred, Effect, Option, Predicate, Schema } from "effect";
+import { TransactionExpired } from "./error.js";
+export const unlinked = () => Effect.void;
+export const makeExpiry = (key) => Context.Reference(key, { defaultValue: () => unlinked });
+export const isTransactionClient = (client) => !Predicate.hasProperty(client, "$connect");
+export const isTransactionClosed = (cause) => Predicate.hasProperty(cause, "code") && cause.code === "P2028";
+const EngineConfig = Schema.Struct({ transactionOptions: Schema.Struct({ timeout: Schema.Number }) });
+const decodeEngineConfig = Schema.decodeUnknownOption(EngineConfig);
+export const configuredTimeout = (client) => Predicate.hasProperty(client, "_engineConfig")
+    ? Option.getOrUndefined(Option.map(decodeEngineConfig(client._engineConfig), (config) => config.transactionOptions.timeout))
+    : undefined;
+const wallClock = Clock.Clock.defaultValue();
+export const expiring = (body, timeout, Expiry) => Effect.gen(function* () {
+    const outer = yield* Expiry;
+    const expired = yield* Deferred.make();
+    const closed = (cause) => Effect.andThen(Deferred.fail(expired, new TransactionExpired({ message: "The transaction was closed before its body finished", cause })), outer(cause));
+    const deadline = timeout === undefined
+        ? Effect.never
+        : Effect.andThen(Effect.provideService(Effect.sleep(timeout), Clock.Clock, wallClock), Deferred.fail(expired, new TransactionExpired({ message: `The transaction expired after its ${timeout} ms timeout` })));
+    const guard = Effect.andThen(Effect.raceFirst(deadline, Deferred.await(expired)), Deferred.await(expired));
+    return yield* Effect.raceFirst(Effect.provideService(body, Expiry, closed), guard).pipe(Effect.catchCause((cause) => Effect.flatMap(Deferred.isDone(expired), (done) => (done ? Deferred.await(expired) : Effect.failCause(cause)))));
+});
+//# sourceMappingURL=expiry.js.map

package/dist/expiry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"expiry.js","sourceRoot":"","sources":["../src/expiry.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 export { makePrismaChanges, type PrismaChanges, type PrismaChangesOptions, type UnnamedObserver } from "./changes.ts";
 export { type Coverage, type CoverageViolation, checkCoverage } from "./coverage.ts";
-export { PrismaError } from "./error.ts";
+export { PrismaError, TransactionExpired } from "./error.ts";
 export type { ChangeMap, CountOperation, ModelChanges, ModelName, ModelRow, RowOperation, Transactional, TransactionOptions, } from "./model.ts";
-export { type RawQueryClient, tablesOf, writtenTables } from "./tables.ts";
+export { type RawQueryClient, type TableWrites, tablesOf, tableWrites, writtenTables } from "./tables.ts";
 export type { UnnamedWrite, Write } from "./write.ts";
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACtH,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,YAAY,EACX,SAAS,EACT,cAAc,EACd,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,kBAAkB,GAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3E,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,KAAK,aAAa,EAAE,KAAK,oBAAoB,EAAE,KAAK,eAAe,EAAE,MAAM,cAAc,CAAC;AACtH,OAAO,EAAE,KAAK,QAAQ,EAAE,KAAK,iBAAiB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7D,YAAY,EACX,SAAS,EACT,cAAc,EACd,YAAY,EACZ,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,aAAa,EACb,kBAAkB,GAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC1G,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,5 +1,5 @@
 export { makePrismaChanges } from "./changes.js";
 export { checkCoverage } from "./coverage.js";
-export { PrismaError } from "./error.js";
-export { tablesOf, writtenTables } from "./tables.js";
+export { PrismaError, TransactionExpired } from "./error.js";
+export { tablesOf, tableWrites, writtenTables } from "./tables.js";
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuE,MAAM,cAAc,CAAC;AACtH,OAAO,EAAyC,aAAa,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAWzC,OAAO,EAAuB,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAuE,MAAM,cAAc,CAAC;AACtH,OAAO,EAAyC,aAAa,EAAE,MAAM,eAAe,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAW7D,OAAO,EAAyC,QAAQ,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC"}

package/dist/tables.d.ts

@@ -4,5 +4,7 @@ export declare const tablesOf: (schema: string) => ReadonlyMap<string, string>;
 export interface RawQueryClient {
     $queryRawUnsafe(query: string): PromiseLike<unknown>;
 }
-export declare const writtenTables: (client: RawQueryClient) => Effect.Effect<string[], PrismaError, never>;
+export type TableWrites = ReadonlyMap<string, bigint>;
+export declare const tableWrites: (client: RawQueryClient) => Effect.Effect<Map<string, bigint>, PrismaError, never>;
+export declare const writtenTables: (client: RawQueryClient, since?: TableWrites | undefined) => Effect.Effect<string[], PrismaError, never>;
 //# sourceMappingURL=tables.d.ts.map

package/dist/tables.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzC,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,KAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAC4E,CAAC;AAEjJ,MAAM,WAAW,cAAc;IAC9B,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;CACrD;AAMD,eAAO,MAAM,aAAa,yEAIxB,CAAC"}
+{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAMzC,eAAO,MAAM,QAAQ,GAAI,QAAQ,MAAM,KAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAC4E,CAAC;AAEjJ,MAAM,WAAW,cAAc;IAC9B,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC;CACrD;AAED,MAAM,MAAM,WAAW,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAStD,eAAO,MAAM,WAAW,oFAMtB,CAAC;AAEH,eAAO,MAAM,aAAa,0GAGxB,CAAC"}

package/dist/tables.js

@@ -4,11 +4,19 @@ const MODEL = /^[ \t]*model[ \t]+(\w+)[ \t]*\{([\s\S]*?)^[ \t]*\}/gm;
 const MAPPED = /@@map\(\s*(?:name\s*:\s*)?"([^"]+)"/;
 const COMMENT = /\/\/.*$/gm;
 export const tablesOf = (schema) => new Map([...schema.replace(COMMENT, "").matchAll(MODEL)].map(([, model = "", body = ""]) => [MAPPED.exec(body)?.[1] ?? model, model]));
-const Written = Schema.Array(Schema.Struct({ relname: Schema.String }));
-const WRITTEN = "select relname from pg_stat_xact_user_tables where n_tup_ins + n_tup_upd + n_tup_del > 0 order by relname";
-export const writtenTables = Effect.fn("PrismaChanges.writtenTables")(function* (client) {
-    const rows = yield* Effect.tryPromise({ try: () => client.$queryRawUnsafe(WRITTEN), catch: (cause) => new PrismaError({ cause }) });
-    const decoded = yield* Effect.mapError(Schema.decodeUnknownEffect(Written)(rows), (cause) => new PrismaError({ cause }));
-    return decoded.map((row) => row.relname);
+const Counted = Schema.Array(Schema.Struct({ relname: Schema.String, writes: Schema.BigInt }));
+const COUNTED = "select relname, n_tup_ins + n_tup_upd + n_tup_del as writes from pg_stat_xact_user_tables where n_tup_ins + n_tup_upd + n_tup_del > 0 order by relname";
+const none = new Map();
+export const tableWrites = Effect.fn("PrismaChanges.tableWrites")(function* (client) {
+    const rows = yield* Effect.tryPromise({ try: () => client.$queryRawUnsafe(COUNTED), catch: (cause) => new PrismaError({ cause }) });
+    const decoded = yield* Effect.mapError(Schema.decodeUnknownEffect(Counted)(rows), (cause) => new PrismaError({ cause }));
+    const counts = new Map();
+    for (const { relname, writes } of decoded)
+        counts.set(relname, (counts.get(relname) ?? 0n) + writes);
+    return counts;
+});
+export const writtenTables = Effect.fn("PrismaChanges.writtenTables")(function* (client, since = none) {
+    const counts = yield* tableWrites(client);
+    return [...counts].flatMap(([table, writes]) => (writes > (since.get(table) ?? 0n) ? [table] : []));
 });
 //# sourceMappingURL=tables.js.map

package/dist/tables.js.map

@@ -1 +1 @@
-{"version":3,"file":"tables.js","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,KAAK,GAAG,sDAAsD,CAAC;AACrE,MAAM,MAAM,GAAG,qCAAqC,CAAC;AACrD,MAAM,OAAO,GAAG,WAAW,CAAC;AAE5B,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAA+B,EAAE,CACvE,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,KAAK,CAAU,CAAC,CAAC,CAAC;AAMjJ,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAExE,MAAM,OAAO,GAAG,2GAA2G,CAAC;AAE5H,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,6BAA6B,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAsB;IACtG,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACpI,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACzH,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC"}
+{"version":3,"file":"tables.js","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,KAAK,GAAG,sDAAsD,CAAC;AACrE,MAAM,MAAM,GAAG,qCAAqC,CAAC;AACrD,MAAM,OAAO,GAAG,WAAW,CAAC;AAE5B,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,MAAc,EAA+B,EAAE,CACvE,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,GAAG,EAAE,EAAE,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,EAAE,KAAK,CAAU,CAAC,CAAC,CAAC;AAQjJ,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;AAE/F,MAAM,OAAO,GACZ,wJAAwJ,CAAC;AAE1J,MAAM,IAAI,GAAgB,IAAI,GAAG,EAAE,CAAC;AAEpC,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAsB;IAClG,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;IACpI,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACzH,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAC;IACzC,KAAK,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,OAAO;QAAE,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,MAAM,CAAC,CAAC;IACrG,OAAO,MAA4B,CAAC;AACrC,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,6BAA6B,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAsB,EAAE,QAAqB,IAAI;IACjI,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1C,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACrG,CAAC,CAAC,CAAC"}

package/dist/transaction.d.ts

@@ -1,11 +1,15 @@
 import type { Frame } from "@shivaedev/effect-changes";
-import { Effect } from "effect";
-import { PrismaError } from "./error.ts";
+import { type Context, Effect } from "effect";
+import { PrismaError, TransactionExpired } from "./error.ts";
+import { type Expire } from "./expiry.ts";
 import type { Transactional, TransactionOptions } from "./model.ts";
 export declare const runTransaction: <Tx extends Transactional<Tx>, X, E, R, RO>(options: {
     readonly client: Tx;
     readonly open: Effect.Effect<Frame, never, RO>;
     readonly body: (tx: Tx) => Effect.Effect<X, E, R>;
     readonly transaction: TransactionOptions | undefined;
-}) => Effect.Effect<X, E | PrismaError, R | RO>;
+    readonly savepoint: boolean;
+    readonly deadline: number | undefined;
+    readonly Expiry: Context.Reference<Expire>;
+}) => Effect.Effect<X, E | TransactionExpired | PrismaError, R | RO>;
 //# sourceMappingURL=transaction.d.ts.map

package/dist/transaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAgB,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AA6BpE,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS;IAClF,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,GAAG,SAAS,CAAC;CACrD,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,WAAW,EAAE,CAAC,GAAG,EAAE,CAsB1C,CAAC"}
+{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAC7D,OAAO,EAAE,KAAK,MAAM,EAAiC,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AAuCpE,eAAO,MAAM,cAAc,GAAI,EAAE,SAAS,aAAa,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS;IAClF,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,WAAW,EAAE,kBAAkB,GAAG,SAAS,CAAC;IACrD,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;CAC3C,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,kBAAkB,GAAG,WAAW,EAAE,CAAC,GAAG,EAAE,CA4B/D,CAAC"}

package/dist/transaction.js

@@ -1,25 +1,38 @@
 import { Effect, Exit } from "effect";
-import { PrismaError } from "./error.js";
+import { PrismaError, TransactionExpired } from "./error.js";
+import { expiring, isTransactionClosed } from "./expiry.js";
 class BodyFailed {
 }
-const commit = (client, options, body, context, signal) => {
+const commit = (client, options, savepoint, body, context, signal) => {
+    let started = false;
     let failed;
     const run = async (tx) => {
+        started = true;
         const exit = await Effect.runPromiseExitWith(context)(body(tx), { signal });
         if (Exit.isSuccess(exit))
             return exit.value;
         failed = exit;
         throw new BodyFailed();
     };
-    return Promise.resolve(client.$transaction(run, options)).then((value) => ({ committed: true, exit: Exit.succeed(value) }), (cause) => ({ committed: false, exit: failed ?? Exit.fail(new PrismaError({ cause })) }));
+    const rejected = (cause) => {
+        if (failed !== undefined)
+            return { committed: false, exit: failed };
+        if (!isTransactionClosed(cause) || !(started || savepoint))
+            return { committed: false, exit: Exit.fail(new PrismaError({ cause })) };
+        const closed = new TransactionExpired({ message: "The transaction was closed before it could finish", cause });
+        return { committed: false, exit: Exit.fail(closed), closed };
+    };
+    return Promise.resolve(client.$transaction(run, options)).then((value) => ({ committed: true, exit: Exit.succeed(value) }), rejected);
 };
 export const runTransaction = (options) => Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
-    const { client, body } = options;
+    const { client, savepoint, body, deadline, Expiry } = options;
     const frame = yield* options.open;
     const context = yield* Effect.context();
     const abort = new AbortController();
-    const outcome = commit(client, options.transaction, (tx) => frame.provide(body(tx)), context, abort.signal);
-    const settle = (settled) => Effect.as(frame.settle(settled.committed ? "committed" : "rolledBack"), settled.exit);
+    const guarded = (tx) => expiring(frame.provide(body(tx)), deadline, Expiry);
+    const outcome = commit(client, options.transaction, savepoint, guarded, context, abort.signal);
+    const expire = yield* Expiry;
+    const settle = (settled) => Effect.andThen(settled.closed === undefined ? Effect.void : expire(settled.closed.cause), Effect.as(frame.settle(settled.committed ? "committed" : "rolledBack"), settled.exit));
     const settled = yield* restore(Effect.promise(() => outcome)).pipe(Effect.onInterrupt(() => Effect.andThen(Effect.sync(() => abort.abort()), Effect.flatMap(Effect.promise(() => outcome), settle))));
     return yield* Effect.flatten(settle(settled));
 }));

package/dist/transaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAQzC,MAAM,UAAU;CAAG;AAEnB,MAAM,MAAM,GAAG,CACd,MAAU,EACV,OAAuC,EACvC,IAAwC,EACxC,OAA2B,EAC3B,MAAmB,EACM,EAAE;IAC3B,IAAI,MAAmC,CAAC;IACxC,MAAM,GAAG,GAAG,KAAK,EAAE,EAAM,EAAE,EAAE;QAC5B,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;QAC5E,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,KAAK,CAAC;QAC5C,MAAM,GAAG,IAAI,CAAC;QACd,MAAM,IAAI,UAAU,EAAE,CAAC;IACxB,CAAC,CAAC;IACF,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAC7D,CAAC,KAAK,EAAiB,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,EAC1E,CAAC,KAAc,EAAiB,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC,CAChH,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAA4C,OAKzE,EAA6C,EAAE,CAC/C,MAAM,CAAC,mBAAmB,CAAC,CAAC,OAAO,EAAE,EAAE,CACtC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IAClC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC;IAC3C,MAAM,KAAK,GAAG,IAAI,eAAe,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC5G,MAAM,MAAM,GAAG,CAAC,OAAsB,EAAE,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACjI,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CACjE,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,CACvB,MAAM,CAAC,OAAO,CACb,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,EAChC,MAAM,CAAC,OAAO,CACb,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,EAC7B,MAAM,CACN,CACD,CACD,CACD,CAAC;IACF,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC,CACF,CAAC"}
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../src/transaction.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/effect-changes-prisma",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Commit-bound change channels for Prisma Classic: automatic change recording, publish after $transaction commits, and a test-time coverage check",
   "type": "module",
   "license": "MIT",
@@ -40,7 +40,7 @@
     "@shivaedev/effect-changes": "0.1.0"
   },
   "peerDependencies": {
-    "@prisma/client": "^7.9.1",
+    "@prisma/client": "7.9.1",
     "effect": "4.0.0-rc.112"
   },
   "devDependencies": {

package/src/changes.ts

@@ -1,6 +1,7 @@
 import { type Channel, type ChannelOptions, makeChannel } from "@shivaedev/effect-changes";
-import { Context, Effect } from "effect";
-import { PrismaError } from "./error.ts";
+import { Cause, Context, Effect, Exit, Option } from "effect";
+import { PrismaError, type TransactionExpired } from "./error.ts";
+import { configuredTimeout, type Expire, isTransactionClient, isTransactionClosed, makeExpiry, unlinked } from "./expiry.ts";
 import type { ChangeMap, Transactional, TransactionOptions } from "./model.ts";
 import { delegatesOf, recordingClient } from "./recording.ts";
 import { runTransaction } from "./transaction.ts";
@@ -17,22 +18,30 @@ export interface PrismaChanges<Tx, A, R> {
 	readonly channel: Channel<A, R>;
 	readonly Client: Context.Reference<Tx>;
 	readonly use: <X>(query: (client: Tx) => PromiseLike<X>) => Effect.Effect<X, PrismaError, R>;
-	readonly transaction: <X, E, R2>(body: Effect.Effect<X, E, R2>, options?: TransactionOptions) => Effect.Effect<X, E | PrismaError, R | R2>;
+	readonly transaction: <X, E, R2>(
+		body: Effect.Effect<X, E, R2>,
+		options?: TransactionOptions,
+	) => Effect.Effect<X, E | TransactionExpired | PrismaError, R | R2>;
 	readonly recordWrite: (write: Write) => Effect.Effect<void, never, R>;
 	readonly Unnamed: Context.Reference<UnnamedObserver>;
 }
 
-let bindings = 0;
-
 const ignoreUnnamed: UnnamedObserver = () => Effect.void;
 
+const expireOnClosed = (Expiry: Context.Reference<Expire>, exit: Exit.Exit<unknown, PrismaError>): Effect.Effect<void> =>
+	Option.match(Exit.isFailure(exit) ? Cause.findErrorOption(exit.cause) : Option.none(), {
+		onNone: () => Effect.void,
+		onSome: ({ cause }) => (isTransactionClosed(cause) ? Effect.flatMap(Effect.service(Expiry), (expire) => expire(cause)) : Effect.void),
+	});
+
 export const makePrismaChanges = <Tx extends Transactional<Tx>, A, R = never>(options: PrismaChangesOptions<Tx, A, R>): PrismaChanges<Tx, A, R> => {
 	const { client, models: typed, ...channelOptions } = options;
 	const models: LooseMap<A> = typed;
-	const prefix = `@shivaedev/effect-changes-prisma/${options.name}/${bindings++}`;
+	const prefix = `@shivaedev/effect-changes-prisma/${options.name}/${crypto.randomUUID()}`;
 	const channel = makeChannel<A, R>({ ...channelOptions, owner: Effect.succeed(client) });
 	const Client = Context.Reference<Tx>(`${prefix}/Client`, { defaultValue: () => client });
 	const Unnamed = Context.Reference<UnnamedObserver>(`${prefix}/Unnamed`, { defaultValue: () => ignoreUnnamed });
+	const Expiry = makeExpiry(`${prefix}/Expiry`);
 	const delegates = delegatesOf(models);
 
 	const recordWrite = Effect.fn("PrismaChanges.recordWrite")(function* (write: Write) {
@@ -47,18 +56,24 @@ export const makePrismaChanges = <Tx extends Transactional<Tx>, A, R = never>(op
 		const recording = recordingClient(current, delegates, (write) => writes.push(write));
 		const exit = yield* Effect.exit(Effect.tryPromise({ try: () => query(recording), catch: (cause) => new PrismaError({ cause }) }));
 		yield* Effect.forEach(writes, recordWrite, { discard: true });
+		yield* expireOnClosed(Expiry, exit);
 		return yield* exit;
 	}, Effect.uninterruptible);
 
 	const transaction = <X, E, R2>(body: Effect.Effect<X, E, R2>, transactionOptions?: TransactionOptions) =>
-		Effect.flatMap(Effect.service(Client), (current) =>
-			runTransaction({
+		Effect.flatMap(Effect.service(Client), (current) => {
+			const savepoint = isTransactionClient(current);
+			const run = runTransaction({
 				client: current,
 				open: channel.open,
 				body: (tx: Tx) => Effect.provideService(body, Client, tx),
 				transaction: transactionOptions,
-			}),
-		).pipe(Effect.withSpan("PrismaChanges.transaction"));
+				savepoint,
+				deadline: savepoint ? undefined : (transactionOptions?.timeout ?? configuredTimeout(current)),
+				Expiry,
+			});
+			return savepoint ? run : Effect.provideService(run, Expiry, unlinked);
+		}).pipe(Effect.withSpan("PrismaChanges.transaction"));
 
 	return { channel, Client, use, transaction, recordWrite, Unnamed };
 };

package/src/error.ts

@@ -3,3 +3,8 @@ import { Data } from "effect";
 export class PrismaError extends Data.TaggedError("PrismaError")<{
 	readonly cause: unknown;
 }> {}
+
+export class TransactionExpired extends Data.TaggedError("TransactionExpired")<{
+	readonly message: string;
+	readonly cause?: unknown;
+}> {}

package/src/expiry.ts

@@ -0,0 +1,49 @@
+import { Clock, Context, Deferred, Effect, Option, Predicate, Schema } from "effect";
+import { TransactionExpired } from "./error.ts";
+
+export type Expire = (cause: unknown) => Effect.Effect<void>;
+
+export const unlinked: Expire = () => Effect.void;
+
+export const makeExpiry = (key: string) => Context.Reference<Expire>(key, { defaultValue: () => unlinked });
+
+export const isTransactionClient = (client: object): boolean => !Predicate.hasProperty(client, "$connect");
+
+export const isTransactionClosed = (cause: unknown): boolean => Predicate.hasProperty(cause, "code") && cause.code === "P2028";
+
+const EngineConfig = Schema.Struct({ transactionOptions: Schema.Struct({ timeout: Schema.Number }) });
+
+const decodeEngineConfig = Schema.decodeUnknownOption(EngineConfig);
+
+export const configuredTimeout = (client: object): number | undefined =>
+	Predicate.hasProperty(client, "_engineConfig")
+		? Option.getOrUndefined(Option.map(decodeEngineConfig(client._engineConfig), (config) => config.transactionOptions.timeout))
+		: undefined;
+
+const wallClock = Clock.Clock.defaultValue();
+
+export const expiring = <X, E, R>(
+	body: Effect.Effect<X, E, R>,
+	timeout: number | undefined,
+	Expiry: Context.Reference<Expire>,
+): Effect.Effect<X, E | TransactionExpired, R> =>
+	Effect.gen(function* () {
+		const outer = yield* Expiry;
+		const expired = yield* Deferred.make<never, TransactionExpired>();
+		const closed: Expire = (cause) =>
+			Effect.andThen(
+				Deferred.fail(expired, new TransactionExpired({ message: "The transaction was closed before its body finished", cause })),
+				outer(cause),
+			);
+		const deadline =
+			timeout === undefined
+				? Effect.never
+				: Effect.andThen(
+						Effect.provideService(Effect.sleep(timeout), Clock.Clock, wallClock),
+						Deferred.fail(expired, new TransactionExpired({ message: `The transaction expired after its ${timeout} ms timeout` })),
+					);
+		const guard = Effect.andThen(Effect.raceFirst(deadline, Deferred.await(expired)), Deferred.await(expired));
+		return yield* Effect.raceFirst(Effect.provideService(body, Expiry, closed), guard).pipe(
+			Effect.catchCause((cause) => Effect.flatMap(Deferred.isDone(expired), (done) => (done ? Deferred.await(expired) : Effect.failCause(cause)))),
+		);
+	});

package/src/index.ts

@@ -1,6 +1,6 @@
 export { makePrismaChanges, type PrismaChanges, type PrismaChangesOptions, type UnnamedObserver } from "./changes.ts";
 export { type Coverage, type CoverageViolation, checkCoverage } from "./coverage.ts";
-export { PrismaError } from "./error.ts";
+export { PrismaError, TransactionExpired } from "./error.ts";
 export type {
 	ChangeMap,
 	CountOperation,
@@ -11,5 +11,5 @@ export type {
 	Transactional,
 	TransactionOptions,
 } from "./model.ts";
-export { type RawQueryClient, tablesOf, writtenTables } from "./tables.ts";
+export { type RawQueryClient, type TableWrites, tablesOf, tableWrites, writtenTables } from "./tables.ts";
 export type { UnnamedWrite, Write } from "./write.ts";

package/src/tables.ts

@@ -12,12 +12,24 @@ export interface RawQueryClient {
 	$queryRawUnsafe(query: string): PromiseLike<unknown>;
 }
 
-const Written = Schema.Array(Schema.Struct({ relname: Schema.String }));
+export type TableWrites = ReadonlyMap<string, bigint>;
 
-const WRITTEN = "select relname from pg_stat_xact_user_tables where n_tup_ins + n_tup_upd + n_tup_del > 0 order by relname";
+const Counted = Schema.Array(Schema.Struct({ relname: Schema.String, writes: Schema.BigInt }));
 
-export const writtenTables = Effect.fn("PrismaChanges.writtenTables")(function* (client: RawQueryClient) {
-	const rows = yield* Effect.tryPromise({ try: () => client.$queryRawUnsafe(WRITTEN), catch: (cause) => new PrismaError({ cause }) });
-	const decoded = yield* Effect.mapError(Schema.decodeUnknownEffect(Written)(rows), (cause) => new PrismaError({ cause }));
-	return decoded.map((row) => row.relname);
+const COUNTED =
+	"select relname, n_tup_ins + n_tup_upd + n_tup_del as writes from pg_stat_xact_user_tables where n_tup_ins + n_tup_upd + n_tup_del > 0 order by relname";
+
+const none: TableWrites = new Map();
+
+export const tableWrites = Effect.fn("PrismaChanges.tableWrites")(function* (client: RawQueryClient) {
+	const rows = yield* Effect.tryPromise({ try: () => client.$queryRawUnsafe(COUNTED), catch: (cause) => new PrismaError({ cause }) });
+	const decoded = yield* Effect.mapError(Schema.decodeUnknownEffect(Counted)(rows), (cause) => new PrismaError({ cause }));
+	const counts = new Map<string, bigint>();
+	for (const { relname, writes } of decoded) counts.set(relname, (counts.get(relname) ?? 0n) + writes);
+	return counts satisfies TableWrites;
+});
+
+export const writtenTables = Effect.fn("PrismaChanges.writtenTables")(function* (client: RawQueryClient, since: TableWrites = none) {
+	const counts = yield* tableWrites(client);
+	return [...counts].flatMap(([table, writes]) => (writes > (since.get(table) ?? 0n) ? [table] : []));
 });

package/src/transaction.ts

@@ -1,11 +1,13 @@
 import type { Frame } from "@shivaedev/effect-changes";
 import { type Context, Effect, Exit } from "effect";
-import { PrismaError } from "./error.ts";
+import { PrismaError, TransactionExpired } from "./error.ts";
+import { type Expire, expiring, isTransactionClosed } from "./expiry.ts";
 import type { Transactional, TransactionOptions } from "./model.ts";
 
 interface Settled<X, E> {
 	readonly committed: boolean;
-	readonly exit: Exit.Exit<X, E | PrismaError>;
+	readonly exit: Exit.Exit<X, E | TransactionExpired | PrismaError>;
+	readonly closed?: TransactionExpired;
 }
 
 class BodyFailed {}
@@ -13,20 +15,29 @@ class BodyFailed {}
 const commit = <Tx extends Transactional<Tx>, X, E, R>(
 	client: Tx,
 	options: TransactionOptions | undefined,
+	savepoint: boolean,
 	body: (tx: Tx) => Effect.Effect<X, E, R>,
 	context: Context.Context<R>,
 	signal: AbortSignal,
 ): Promise<Settled<X, E>> => {
+	let started = false;
 	let failed: Exit.Exit<X, E> | undefined;
 	const run = async (tx: Tx) => {
+		started = true;
 		const exit = await Effect.runPromiseExitWith(context)(body(tx), { signal });
 		if (Exit.isSuccess(exit)) return exit.value;
 		failed = exit;
 		throw new BodyFailed();
 	};
+	const rejected = (cause: unknown): Settled<X, E> => {
+		if (failed !== undefined) return { committed: false, exit: failed };
+		if (!isTransactionClosed(cause) || !(started || savepoint)) return { committed: false, exit: Exit.fail(new PrismaError({ cause })) };
+		const closed = new TransactionExpired({ message: "The transaction was closed before it could finish", cause });
+		return { committed: false, exit: Exit.fail(closed), closed };
+	};
 	return Promise.resolve(client.$transaction(run, options)).then(
 		(value): Settled<X, E> => ({ committed: true, exit: Exit.succeed(value) }),
-		(cause: unknown): Settled<X, E> => ({ committed: false, exit: failed ?? Exit.fail(new PrismaError({ cause })) }),
+		rejected,
 	);
 };
 
@@ -35,15 +46,24 @@ export const runTransaction = <Tx extends Transactional<Tx>, X, E, R, RO>(option
 	readonly open: Effect.Effect<Frame, never, RO>;
 	readonly body: (tx: Tx) => Effect.Effect<X, E, R>;
 	readonly transaction: TransactionOptions | undefined;
-}): Effect.Effect<X, E | PrismaError, R | RO> =>
+	readonly savepoint: boolean;
+	readonly deadline: number | undefined;
+	readonly Expiry: Context.Reference<Expire>;
+}): Effect.Effect<X, E | TransactionExpired | PrismaError, R | RO> =>
 	Effect.uninterruptibleMask((restore) =>
 		Effect.gen(function* () {
-			const { client, body } = options;
+			const { client, savepoint, body, deadline, Expiry } = options;
 			const frame = yield* options.open;
 			const context = yield* Effect.context<R>();
 			const abort = new AbortController();
-			const outcome = commit(client, options.transaction, (tx) => frame.provide(body(tx)), context, abort.signal);
-			const settle = (settled: Settled<X, E>) => Effect.as(frame.settle(settled.committed ? "committed" : "rolledBack"), settled.exit);
+			const guarded = (tx: Tx) => expiring(frame.provide(body(tx)), deadline, Expiry);
+			const outcome = commit(client, options.transaction, savepoint, guarded, context, abort.signal);
+			const expire = yield* Expiry;
+			const settle = (settled: Settled<X, E | TransactionExpired>) =>
+				Effect.andThen(
+					settled.closed === undefined ? Effect.void : expire(settled.closed.cause),
+					Effect.as(frame.settle(settled.committed ? "committed" : "rolledBack"), settled.exit),
+				);
 			const settled = yield* restore(Effect.promise(() => outcome)).pipe(
 				Effect.onInterrupt(() =>
 					Effect.andThen(