@voltro/sql-sqlite 0.83.1 → 0.85.0

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 import { ChangeEvent } from '@voltro/database';
 import { ChangeStrategy } from '@voltro/database';
-import { ConfigError } from 'effect';
-import { ConfigError as ConfigError_2 } from 'effect/ConfigError';
+import { Config } from 'effect';
 import { ConnectionConfig } from '@voltro/database';
 import { Context } from 'effect';
 import { DataStore } from '@voltro/database';
@@ -17,13 +16,13 @@ import { RawSqlFragment } from '@voltro/database/sql';
 import { RetryDecision } from '@voltro/database';
 import { Row } from '@voltro/database';
 import { RowKey } from '@voltro/database';
-import { SqlClient } from '@effect/sql';
-import { SqlClient as SqlClient_2 } from '@effect/sql/SqlClient';
+import { SqlClient } from 'effect/sql';
+import { SqlClient as SqlClient_2 } from 'effect/sql/SqlClient';
 import { SqlDialect } from '@voltro/database';
-import { SqlError } from '@effect/sql';
-import { SqlError as SqlError_2 } from '@effect/sql/SqlError';
+import { SqlError } from 'effect/sql';
+import { SqlError as SqlError_2 } from 'effect/sql/SqlError';
 import { SqliteClient } from '@effect/sql-sqlite-node';
-import { TransactionConnection } from '@effect/sql/SqlClient';
+import { TransactionConnection } from 'effect/sql/SqlClient';
 import { UpsertOptions } from '@voltro/database';
 import { WriteAttribution } from '@voltro/database';
 
@@ -62,7 +61,7 @@ export declare const sqliteRetryFilter: (err: unknown) => RetryDecision;
  * to the error channel — matching the cross-dialect `sqlLayer` shape in
  * `@voltro/database`).
  */
-declare type SqliteSqlLayer = Layer.Layer<SqliteClient.SqliteClient | SqlClient_2, ConfigError_2 | SqlError_2>;
+declare type SqliteSqlLayer = Layer.Layer<SqliteClient.SqliteClient | SqlClient_2, Config.ConfigError | SqlError_2>;
 
 export declare class SqliteStore implements DataStore {
     private readonly sql;
@@ -100,6 +99,8 @@ export declare class SqliteStore implements DataStore {
      */
     attachNamespace(namespace: string, file?: string): Promise<void>;
     private executeQuery;
+    /** Key values use the same schema codec as inserted values. */
+    private keyWhere;
     private executeInsert;
     private executeUpdate;
     private executeInsertMany;
@@ -197,7 +198,7 @@ export declare class SqliteStore implements DataStore {
      * Retry uses the injected `isRetryable` predicate — sqlite's
      * `SQLITE_BUSY` / `SQLITE_LOCKED`, or (Turso dialect) the MVCC
      * `"Write-write conflict"` from `BEGIN CONCURRENT`. A conflict can
-     * surface from the COMMIT, which `@effect/sql` runs as `Effect.orDie`
+     * surface from the COMMIT, which `effect/sql` runs as `Effect.orDie`
      * → it arrives as a DEFECT, not a typed failure, and `Effect.retry`
      * does not retry defects. So we promote a retryable defect back to a
      * typed failure before the schedule sees it (and re-die on a genuine
@@ -241,6 +242,9 @@ export declare class SqliteStore implements DataStore {
      * defect-promotion in particular lived HERE and only here for a release, which
      * is why it is no longer a per-store decision. See `transactionOutcome.ts`.
      */
+    /** The key under which this client's transactions provide their pinned
+     *  connection (per client in Effect 4). Views reach it through the parent. */
+    get transactionService(): Context.Service<TransactionConnection, TransactionConnection.Service>;
     private txnSpec;
     onChange(listener: (event: ChangeEvent) => void): () => void;
     /** Cross-instance reactivity seam — emit an externally-sourced event to
@@ -255,7 +259,7 @@ export declare class SqliteStore implements DataStore {
 }
 
 export declare interface SqliteStoreOptions {
-    readonly sqlLayer: Layer.Layer<SqlClient.SqlClient, ConfigError.ConfigError | SqlError.SqlError, never>;
+    readonly sqlLayer: Layer.Layer<SqlClient.SqlClient, Config.ConfigError | SqlError.SqlError, never>;
     readonly tracerLayer?: Layer.Layer<never, never, never>;
     /** Accepted for cross-dialect symmetry; ignored (always in-process). */
     readonly changeStrategy?: ChangeStrategy;
@@ -283,6 +287,6 @@ export declare interface SqliteStoreOptions {
     readonly fullText?: 'fts5' | 'like';
 }
 
-declare type TxnContext = Context.Tag.Service<typeof TransactionConnection>;
+declare type TxnContext = TransactionConnection.Service;
 
 export { }

package/dist/index.js

@@ -1,14 +1,17 @@
 import { SqliteClient as e } from "@effect/sql-sqlite-node";
 import { Config as t, Context as n, Effect as r, Layer as i, ManagedRuntime as a, Option as o } from "effect";
-import { EagerCardinalityError as s, SQLITE_TRANSIENT_CODES as c, attachEagerLoads as l, attributionFields as u, bulkInsertLimitsFor as d, causeBranches as f, chunkRowsForInsert as p, coercePredicateForSqlite as m, compileEagerJson as h, compileJsonPatch as g, compilePredicate as _, compileRawFragment as v, compileRowProjection as y, compileSelect as b, decodeRowsFromSchema as x, encodeRowForSchema as S, externalChangeEvent as C, hasEagerLoads as w, isTableReactive as T, jsonPatchAssignments as ee, makeEagerFallbackReporter as te, makeTransactionAbortTracker as E, observeDbOp as D, qualifyTable as O, quoteIdent as k, raiseChangeListenerCeiling as A, recordsTable as j, requireTable as M, rowKeyColumns as N, runSavepoint as ne, runStoreTransaction as re, runWriteRecorders as ie, stampGeneratedId as P, stampGeneratedIds as F, upsertUpdatePatch as I, upsertUpdateValues as L, withCapturedAttribution as R } from "@voltro/database";
+import { EagerCardinalityError as s, SHARED_TRANSACTION_SERVICE as c, SQLITE_TRANSIENT_CODES as l, attachEagerLoads as u, attributionFields as d, bulkInsertLimitsFor as f, causeBranches as p, chunkRowsForInsert as m, coercePredicateForSqlite as h, compileEagerJson as g, compileJsonPatch as _, compilePredicate as v, compileRawFragment as y, compileRowProjection as b, compileSelect as x, decodeRowsFromSchema as S, encodeRowForSchema as ee, externalChangeEvent as te, hasEagerLoads as C, isTableReactive as w, jsonPatchAssignments as T, makeEagerFallbackReporter as E, makeTransactionAbortTracker as D, observeDbOp as O, onTransaction as ne, qualifyTable as re, quoteIdent as ie, raiseChangeListenerCeiling as ae, recordsTable as k, requireTable as oe, rowKeyColumns as A, runSavepoint as j, runStoreTransaction as M, runWriteRecorders as N, stampGeneratedId as P, stampGeneratedIds as F, upsertUpdatePatch as I, upsertUpdateValues as L, withCapturedAttribution as R } from "@voltro/database";
 import { EventEmitter as z } from "node:events";
 import { createLogger as B } from "@voltro/logger";
-import { SqlClient as V, TransactionConnection as H } from "@effect/sql/SqlClient";
+import { SqlClient as V } from "effect/sql/SqlClient";
 //#region src/sqlLayer.ts
-var U = (r) => e.layerConfig({
+var H = (r) => e.layerConfig({
+	transactionService: t.succeed(c),
 	filename: t.succeed(r.filename),
+	prepareCacheSize: t.succeed(0),
+	transactionMode: t.succeed("deferred"),
 	...r.readonly === void 0 ? {} : { readonly: t.succeed(r.readonly) }
-}).pipe(i.tap((t) => n.get(t, e.SqliteClient)`PRAGMA foreign_keys = ON`)), W = (e) => {
+}).pipe(i.tap((t) => n.get(t, e.SqliteClient)`PRAGMA foreign_keys = ON`)), U = (e) => {
 	if (e.url) {
 		if (e.url === ":memory:") return { filename: ":memory:" };
 		if (e.url.startsWith("file:")) return { filename: e.url.slice(5) };
@@ -16,28 +19,33 @@ var U = (r) => e.layerConfig({
 	}
 	if (e.database) return { filename: e.database };
 	throw Error("@voltro/sql-sqlite: no filename supplied. Set DB_URL=file:./db.sqlite or DB_DATABASE=path/to/db.sqlite.");
-}, G = (e) => U(W(e)), K = c, q = (e) => {
+}, W = (e) => H(U(e)), G = l, K = (e) => {
 	let t = e;
 	for (let e = 0; e < 5 && typeof t == "object" && t; e++) {
-		let e = t.code;
-		if (typeof e == "string") return e;
+		let { code: e, errcode: n } = t;
+		if (typeof n == "number") return String(n);
+		if (typeof e == "string" && e !== "ERR_SQLITE_ERROR") return e;
 		if (typeof e == "number") return String(e);
 		t = t.cause;
 	}
-}, J = (e) => f(e).some((e) => {
-	let t = q(e);
-	return t !== void 0 && K.has(t);
-}), Y = (e) => J(e) ? "retry" : "noRetry", X = B({ scope: "voltro:sqlite" }), Z = async (e) => {
+}, q = (e) => p(e).some((e) => {
+	let t = K(e);
+	return t !== void 0 && G.has(t);
+}), J = (e) => q(e) ? "retry" : "noRetry", Y = B({ scope: "voltro:sqlite" }), X = async (e) => {
 	let t = e.tracerLayer ? i.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, n = a.make(t);
-	return new se(await n.runPromise(V), n, null, void 0, e.isRetryable ?? J, e.systemName ?? "sqlite", e.wrapTransaction, e.fullText ?? "fts5");
-}, ae = (e) => e, Q = (e) => m(e), oe = (e) => e.predicate === void 0 || e.predicate === null ? e : {
+	return new le(await n.runPromise(V), n, null, void 0, e.isRetryable ?? q, e.systemName ?? "sqlite", e.wrapTransaction, e.fullText ?? "fts5");
+}, se = (e) => e, Z = (e) => h(e), ce = (e) => e.predicate === void 0 || e.predicate === null ? e : {
 	...e,
-	predicate: Q(e.predicate)
-}, $ = (e, t) => {
-	let n = S(e, t), r = {};
+	predicate: Z(e.predicate)
+}, Q = (e, t) => {
+	let n = ee(e, t, [
+		"json",
+		"array",
+		"decimal"
+	]), r = {};
 	for (let [e, t] of Object.entries(n)) r[e] = t instanceof Date ? t.toISOString() : typeof t == "boolean" ? +!!t : t;
 	return r;
-}, se = class e {
+}, le = class e {
 	sql;
 	runtime;
 	namespace;
@@ -48,8 +56,8 @@ var U = (r) => e.layerConfig({
 	emitter;
 	inflightTxns = 0;
 	reportEagerFallback;
-	constructor(e, t, n = null, r, i = J, a = "sqlite", o = ae, s = "fts5") {
-		this.sql = e, this.runtime = t, this.namespace = n, this.isRetryable = i, this.systemName = a, this.wrapTransaction = o, this.fullText = s, this.emitter = r ?? new z(), A(this.emitter), this.reportEagerFallback = te(X);
+	constructor(e, t, n = null, r, i = q, a = "sqlite", o = se, s = "fts5") {
+		this.sql = e, this.runtime = t, this.namespace = n, this.isRetryable = i, this.systemName = a, this.wrapTransaction = o, this.fullText = s, this.emitter = r ?? new z(), ae(this.emitter), this.reportEagerFallback = E(Y);
 	}
 	withNamespace(t) {
 		return t === this.namespace ? this : new e(this.sql, this.runtime, t, this.emitter, this.isRetryable, this.systemName, this.wrapTransaction, this.fullText);
@@ -64,19 +72,23 @@ var U = (r) => e.layerConfig({
 		} : e;
 	}
 	nsT(e) {
-		return O(this.namespace, e);
+		return re(this.namespace, e);
 	}
 	async attachNamespace(e, t) {
 		let n = this.sql, r = t ?? `${e}.db`;
 		await this.runtime.runPromise(n`ATTACH DATABASE ${r} AS ${n(e)}`);
 	}
 	async executeQuery(e, t, n) {
-		let i = b(oe(this.withFullTextMode(e)), this.sql, this.namespace), a = t ? r.provideService(i, H, t) : i, o = await D(this.systemName, "select", () => this.runtime.runPromise(a));
-		return x(o, e.table, "sqlite");
+		let i = x(ce(this.withFullTextMode(e)), this.sql, this.namespace), a = t ? r.provideService(i, this.sql.transactionService, t) : i, o = await O(this.systemName, "select", () => this.runtime.runPromise(a));
+		return S(o, e.table, "sqlite", e);
+	}
+	keyWhere(e, t) {
+		let n = this.sql, r = Q(Object.fromEntries(A(t)), e);
+		return n.and(Object.entries(r).map(([e, t]) => n`${n(e)} = ${t}`));
 	}
 	async executeInsert(e, t, n, i, a) {
 		t = P(e, t);
-		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert($(t, e))} RETURNING ${y(e, o)}`, c = n ? r.provideService(s, H, n) : s, l = await this.runtime.runPromise(c), u = x(l, e, "sqlite")[0];
+		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(Q(t, e))} RETURNING ${b(e, o)}`, c = n ? r.provideService(s, this.sql.transactionService, n) : s, l = await this.runtime.runPromise(c), u = S(l, e, "sqlite")[0];
 		if (!u) throw Error(`SqliteStore.insert: no row returned for table '${e}'`);
 		return await this.routeEvent({
 			table: e,
@@ -86,7 +98,7 @@ var U = (r) => e.layerConfig({
 		}, i, n, a), u;
 	}
 	async executeUpdate(e, t, n, i, a, o) {
-		let s = this.sql, c = s`UPDATE ${s(this.nsT(e))} SET ${s.update($(n, e))} WHERE ${s.and(N(t).map(([e, t]) => s`${s(e)} = ${t}`))} RETURNING ${y(e, s)}`, l = i ? r.provideService(c, H, i) : c, u = await this.runtime.runPromise(l), d = x(u, e, "sqlite")[0];
+		let s = this.sql, c = s`UPDATE ${s(this.nsT(e))} SET ${s.update(Q(n, e))} WHERE ${this.keyWhere(e, t)} RETURNING ${b(e, s)}`, l = i ? r.provideService(c, this.sql.transactionService, i) : c, u = await this.runtime.runPromise(l), d = S(u, e, "sqlite")[0];
 		return d ? (await this.routeEvent({
 			table: e,
 			op: "update",
@@ -96,26 +108,26 @@ var U = (r) => e.layerConfig({
 	}
 	async executeInsertMany(e, t, n, i, a) {
 		if (t = F(e, t), t.length === 0) return [];
-		let o = this.sql, s = t.map((t) => $(t, e)), c = p(s, d("sqlite")), l = (t) => o`INSERT INTO ${o(this.nsT(e))} ${o.insert(t)} RETURNING ${y(e, o)}`, u;
+		let o = this.sql, s = t.map((t) => Q(t, e)), c = m(s, f("sqlite")), l = (t) => o`INSERT INTO ${o(this.nsT(e))} ${o.insert(t)} RETURNING ${b(e, o)}`, u;
 		if (c.length === 1) {
-			let e = l(c[0]), t = n ? r.provideService(e, H, n) : e;
+			let e = l(c[0]), t = n ? r.provideService(e, this.sql.transactionService, n) : e;
 			u = await this.runtime.runPromise(t);
 		} else if (n) {
 			let e = [];
-			for (let t of c) e.push(...await this.runtime.runPromise(r.provideService(l(t), H, n)));
+			for (let t of c) e.push(...await this.runtime.runPromise(r.provideService(l(t), this.sql.transactionService, n)));
 			u = e;
 		} else u = await this.runtime.runPromise(o.withTransaction(r.map(r.forEach(c, l, { concurrency: 1 }), (e) => e.flat())));
-		let f = x(u, e, "sqlite");
-		for (let t of f) await this.routeEvent({
+		let d = S(u, e, "sqlite");
+		for (let t of d) await this.routeEvent({
 			table: e,
 			op: "insert",
 			old: null,
 			new: t
 		}, i, n, a);
-		return f;
+		return d;
 	}
 	async executePatchJson(e, t, n, i, a, o, s, c) {
-		let l = this.sql, u = $(ee(t, n, c), e), d = l.csv([g(l, "sqlite", n, i, l`${l(this.nsT(e))}.${l(n.split(".")[0])}`), ...Object.entries(u).map(([e, t]) => l`${l(e)} = ${t}`)]), f = l`UPDATE ${l(this.nsT(e))} SET ${d} WHERE ${l.and(N(t).map(([e, t]) => l`${l(e)} = ${t}`))} RETURNING ${y(e, l)}`, p = a ? r.provideService(f, H, a) : f, m = await this.runtime.runPromise(p), h = x(m, e, "sqlite")[0];
+		let l = this.sql, u = Q(T(t, n, c), e), d = l.csv([_(l, "sqlite", n, i, l`${l(this.nsT(e))}.${l(n.split(".")[0])}`), ...Object.entries(u).map(([e, t]) => l`${l(e)} = ${t}`)]), f = l`UPDATE ${l(this.nsT(e))} SET ${d} WHERE ${this.keyWhere(e, t)} RETURNING ${b(e, l)}`, p = a ? r.provideService(f, this.sql.transactionService, a) : f, m = await this.runtime.runPromise(p), h = S(m, e, "sqlite")[0];
 		return h ? (await this.routeEvent({
 			table: e,
 			op: "update",
@@ -124,7 +136,7 @@ var U = (r) => e.layerConfig({
 		}, o, a, s), h) : null;
 	}
 	async executeDelete(e, t, n, i, a) {
-		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} WHERE ${o.and(N(t).map(([e, t]) => o`${o(e)} = ${t}`))} RETURNING ${y(e, o)}`, c = n ? r.provideService(s, H, n) : s, l = await this.runtime.runPromise(c), u = x(l, e, "sqlite")[0];
+		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} WHERE ${this.keyWhere(e, t)} RETURNING ${b(e, o)}`, c = n ? r.provideService(s, this.sql.transactionService, n) : s, l = await this.runtime.runPromise(c), u = S(l, e, "sqlite")[0];
 		return u ? (await this.routeEvent({
 			table: e,
 			op: "delete",
@@ -133,18 +145,18 @@ var U = (r) => e.layerConfig({
 		}, i, n, a), !0) : !1;
 	}
 	async appendInTxn(e, t, n) {
-		let i = this.sql, a = i`INSERT INTO ${i(this.nsT(e))} ${i.insert($(t, e))}`;
-		await this.runtime.runPromise(n ? r.provideService(a, H, n) : a);
+		let i = this.sql, a = i`INSERT INTO ${i(this.nsT(e))} ${i.insert(Q(t, e))}`;
+		await this.runtime.runPromise(n ? r.provideService(a, this.sql.transactionService, n) : a);
 	}
 	async maxInTxn(e, t, n, i) {
-		let a = this.sql, o = Object.entries(n).map(([e, t]) => a`${a(e)} = ${t}`), s = a`SELECT MAX(${a(t)}) AS ${a("m")} FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = (await this.runtime.runPromise(i ? r.provideService(s, H, i) : s))[0]?.m;
+		let a = this.sql, o = Object.entries(n).map(([e, t]) => a`${a(e)} = ${t}`), s = a`SELECT MAX(${a(t)}) AS ${a("m")} FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = (await this.runtime.runPromise(i ? r.provideService(s, this.sql.transactionService, i) : s))[0]?.m;
 		return c == null ? null : Number(c);
 	}
 	async routeEvent(e, t, n = null, r) {
 		e = {
-			...u(r),
+			...d(r),
 			...e
-		}, j(e.table) && await ie({
+		}, k(e.table) && await N({
 			append: (e, t) => this.appendInTxn(e, t, n),
 			maxOf: (e, t, r) => this.maxInTxn(e, t, r, n)
 		}, {
@@ -154,27 +166,31 @@ var U = (r) => e.layerConfig({
 			prev: e.old,
 			traceId: e.traceId,
 			subjectId: e.subjectId
-		}), T(e.table) && (t === null ? this.emitter.emit("change", e) : t.push(e));
+		}), w(e.table) && (t === null ? this.emitter.emit("change", e) : t.push(e));
 	}
 	async executeUpsert(e, t, n, i, a, o) {
 		let s = L(n);
 		if (t = P(e, t), typeof n.update == "function") {
 			let r = await this.findByConflict(e, t, n.conflictColumns, i);
-			return r ? await this.executeUpdate(e, r.id, I(t, r, n), i, a, o) ?? r : this.executeInsert(e, t, i, a, o);
+			if (r) {
+				let s = Object.fromEntries(n.conflictColumns.map((e) => [e, r[e]]));
+				return await this.executeUpdate(e, s, I(t, r, n), i, a, o) ?? r;
+			}
+			return this.executeInsert(e, t, i, a, o);
 		}
-		let c = this.sql, l = n.conflictColumns.map((e) => c`${c(e)}`), u = Object.keys(t).filter((e) => t[e] !== void 0), d = n.update === void 0 ? u.filter((e) => e !== "id" && !n.conflictColumns.includes(e)) : n.update, f = $(s, e), p = [...d.filter((e) => !Object.hasOwn(s, e)).map((e) => c`${c(e)} = excluded.${c(e)}`), ...Object.entries(f).map(([e, t]) => c`${c(e)} = ${t}`)], m = p.length > 0 ? c.csv(p) : c`${c(n.conflictColumns[0])} = excluded.${c(n.conflictColumns[0])}`, h = c`INSERT INTO ${c(this.nsT(e))} ${c.insert($(t, e))} ON CONFLICT (${c.csv(l)}) DO UPDATE SET ${m} RETURNING ${y(e, c)}`, g = i ? r.provideService(h, H, i) : h, _ = await this.runtime.runPromise(g), v = x(_, e, "sqlite")[0];
+		let c = this.sql, l = n.conflictColumns.map((e) => c`${c(e)}`), u = Object.keys(t).filter((e) => t[e] !== void 0), d = n.update === void 0 ? u.filter((e) => e !== "id" && !n.conflictColumns.includes(e)) : n.update, f = Q(s, e), p = [...d.filter((e) => !Object.hasOwn(s, e)).map((e) => c`${c(e)} = excluded.${c(e)}`), ...Object.entries(f).map(([e, t]) => c`${c(e)} = ${t}`)], m = p.length > 0 ? c.csv(p) : c`${c(n.conflictColumns[0])} = excluded.${c(n.conflictColumns[0])}`, h = c`INSERT INTO ${c(this.nsT(e))} ${c.insert(Q(t, e))} ON CONFLICT (${c.csv(l)}) DO UPDATE SET ${m} RETURNING ${b(e, c)}`, g = i ? r.provideService(h, this.sql.transactionService, i) : h, _ = await this.runtime.runPromise(g), v = S(_, e, "sqlite")[0];
 		if (!v) throw Error(`SqliteStore.upsert: no row returned for table '${e}'`);
-		let b = t.id !== void 0 && t.id === v.id ? "insert" : "update";
+		let y = t.id !== void 0 && t.id === v.id ? "insert" : "update";
 		return await this.routeEvent({
 			table: e,
-			op: b,
+			op: y,
 			old: null,
 			new: v
 		}, a, i, o), v;
 	}
 	async executeInsertIgnore(e, t, n, i, a, o) {
 		t = P(e, t);
-		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(e)}`), l = s`INSERT INTO ${s(this.nsT(e))} ${s.insert($(t, e))} ON CONFLICT (${s.csv(c)}) DO NOTHING RETURNING ${y(e, s)}`, u = i ? r.provideService(l, H, i) : l, d = await this.runtime.runPromise(u), f = x(d, e, "sqlite")[0];
+		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(e)}`), l = s`INSERT INTO ${s(this.nsT(e))} ${s.insert(Q(t, e))} ON CONFLICT (${s.csv(c)}) DO NOTHING RETURNING ${b(e, s)}`, u = i ? r.provideService(l, this.sql.transactionService, i) : l, d = await this.runtime.runPromise(u), f = S(d, e, "sqlite")[0];
 		if (f) return await this.routeEvent({
 			table: e,
 			op: "insert",
@@ -193,8 +209,8 @@ var U = (r) => e.layerConfig({
 	}
 	async findByConflict(e, t, n, i) {
 		if (n.length === 0) return;
-		let a = this.sql, o = n.map((e) => a`${a(e)} = ${t[e]}`), s = a`SELECT ${y(e, a)} FROM ${a(this.nsT(e))} WHERE ${a.and(o)} LIMIT 1`, c = i ? r.provideService(s, H, i) : s, l = await this.runtime.runPromise(c);
-		return x(l, e, "sqlite")[0];
+		let a = this.sql, o = Q(Object.fromEntries(n.map((e) => [e, t[e]])), e), s = n.map((e) => a`${a(e)} = ${o[e]}`), c = a`SELECT ${b(e, a)} FROM ${a(this.nsT(e))} WHERE ${a.and(s)} LIMIT 1`, l = i ? r.provideService(c, this.sql.transactionService, i) : c, u = await this.runtime.runPromise(l);
+		return S(u, e, "sqlite")[0];
 	}
 	query(e) {
 		return this.runWithEager(e, null);
@@ -203,14 +219,14 @@ var U = (r) => e.layerConfig({
 		return this.rawOn(e, null);
 	}
 	rawOn(e, t) {
-		let n = v(e, this.sql), i = t ? r.provideService(n, H, t) : n;
-		return D(this.systemName, "raw", () => this.runtime.runPromise(i));
+		let n = y(e, this.sql), i = t ? r.provideService(n, this.sql.transactionService, t) : n;
+		return O(this.systemName, "raw", () => this.runtime.runPromise(i));
 	}
 	async runWithEager(e, t) {
-		if (!w(e)) return this.executeQuery(e, t);
-		let n = this.namespace === null ? h(e, this.sql, "sqlite") : null;
+		if (!C(e)) return this.executeQuery(e, t);
+		let n = this.namespace === null ? g(e, this.sql, "sqlite") : null;
 		if (n !== null) try {
-			let e = t ? r.provideService(n.fragment, H, t) : n.fragment, i = await D(this.systemName, "select", () => this.runtime.runPromise(e));
+			let e = t ? r.provideService(n.fragment, this.sql.transactionService, t) : n.fragment, i = await O(this.systemName, "select", () => this.runtime.runPromise(e));
 			return n.decode(i);
 		} catch (t) {
 			if (t instanceof s) throw t;
@@ -227,17 +243,17 @@ var U = (r) => e.layerConfig({
 			reason: "not-compilable"
 		});
 		let i = await this.executeQuery(e, t);
-		return l(i, e.eager, e.sourceTable ?? M(e.table), (e) => this.executeQuery(e, t));
+		return u(i, e.eager, e.sourceTable ?? oe(e.table), (e) => this.executeQuery(e, t));
 	}
 	getInternalRunWithEager() {
 		return (e, t) => this.runWithEager(e, t);
 	}
 	localWrite(e, t, n) {
-		let r = (e) => j(t) ? this.writeWithRecorders(n, e) : n(e, null, null);
-		return D(this.systemName, e, () => R(r));
+		let r = (e) => k(t) ? this.writeWithRecorders(n, e) : n(e, null, null);
+		return O(this.systemName, e, () => R(r));
 	}
 	async writeWithRecorders(e, t) {
-		let n = [], i = this.sql, a = await this.runtime.runPromise(i.withTransaction(r.flatMap(r.serviceOption(H), (i) => o.isNone(i) ? r.fail(/* @__PURE__ */ Error("SqliteStore.write: TransactionConnection missing.")) : r.tryPromise({
+		let n = [], i = this.sql, a = await this.runtime.runPromise(i.withTransaction(r.flatMap(r.serviceOption(this.sql.transactionService), (i) => o.isNone(i) ? r.fail(/* @__PURE__ */ Error("SqliteStore.write: TransactionConnection missing.")) : r.tryPromise({
 			try: () => e(t, i.value, n),
 			catch: (e) => e
 		}))));
@@ -266,8 +282,8 @@ var U = (r) => e.layerConfig({
 		return this.executeDeleteMany(e, t, null, null);
 	}
 	async executeUpdateMany(e, t, n, i, a, o) {
-		let s = this.sql, c = _(Q(n.where), s, this.namespace), l = s`UPDATE ${s(this.nsT(e))} SET ${s.update($(t, e))} WHERE ${c} RETURNING ${y(e, s)}`, u = i ? r.provideService(l, H, i) : l, d = await D(this.systemName, "update", () => this.runtime.runPromise(u));
-		for (let t of x(d, e, "sqlite")) await this.routeEvent({
+		let s = this.sql, c = v(Z(n.where), s, this.namespace, e), l = s`UPDATE ${s(this.nsT(e))} SET ${s.update(Q(t, e))} WHERE ${c} RETURNING ${b(e, s)}`, u = i ? r.provideService(l, this.sql.transactionService, i) : l, d = await O(this.systemName, "update", () => this.runtime.runPromise(u));
+		for (let t of S(d, e, "sqlite")) await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
@@ -276,8 +292,8 @@ var U = (r) => e.layerConfig({
 		return d.length;
 	}
 	async executeDeleteMany(e, t, n, i, a) {
-		let o = this.sql, s = _(Q(t.where), o, this.namespace), c = o`DELETE FROM ${o(this.nsT(e))} WHERE ${s} RETURNING ${y(e, o)}`, l = n ? r.provideService(c, H, n) : c, u = await D(this.systemName, "delete", () => this.runtime.runPromise(l));
-		for (let t of x(u, e, "sqlite")) await this.routeEvent({
+		let o = this.sql, s = v(Z(t.where), o, this.namespace, e), c = o`DELETE FROM ${o(this.nsT(e))} WHERE ${s} RETURNING ${b(e, o)}`, l = n ? r.provideService(c, this.sql.transactionService, n) : c, u = await O(this.systemName, "delete", () => this.runtime.runPromise(l));
+		for (let t of S(u, e, "sqlite")) await this.routeEvent({
 			table: e,
 			op: "delete",
 			old: t,
@@ -335,7 +351,7 @@ var U = (r) => e.layerConfig({
 		let t = this.sql, n = new Set(e), r = await this.runtime.runPromise(t`SELECT name FROM sqlite_master WHERE type = 'table' AND name NOT LIKE 'sqlite_%'`), i = [];
 		for (let e of r) {
 			if (n.has(e.name)) continue;
-			let r = await this.runtime.runPromise(t`${t.unsafe(`PRAGMA foreign_key_list(${k(e.name, "sqlite")})`)}`).catch(() => []);
+			let r = await this.runtime.runPromise(t`${t.unsafe(`PRAGMA foreign_key_list(${ie(e.name, "sqlite")})`)}`).catch(() => []);
 			for (let t of r) n.has(t.table) && i.push({
 				from: e.name,
 				column: t.from,
@@ -346,7 +362,7 @@ var U = (r) => e.layerConfig({
 	}
 	async emptyTablesOn(e, t) {
 		if (e.length === 0) return;
-		let n = this.sql, i = (e) => this.nsT(e), a = r.acquireUseRelease(n.unsafe("PRAGMA defer_foreign_keys = ON"), () => r.forEach(e, (e) => n`DELETE FROM ${n(i(e))}`, { discard: !0 }), () => r.orDie(r.ignore(n.unsafe("PRAGMA defer_foreign_keys = OFF")))), o = t === null ? n.withTransaction(a) : r.provideService(a, H, t);
+		let n = this.sql, i = (e) => this.nsT(e), a = r.acquireUseRelease(n.unsafe("PRAGMA defer_foreign_keys = ON"), () => r.forEach(e, (e) => n`DELETE FROM ${n(i(e))}`, { discard: !0 }), () => r.orDie(r.ignore(n.unsafe("PRAGMA defer_foreign_keys = OFF")))), o = t === null ? n.withTransaction(a) : r.provideService(a, this.sql.transactionService, t);
 		await this.runtime.runPromise(o);
 	}
 	transactionEndingFailure(e) {
@@ -355,20 +371,24 @@ var U = (r) => e.layerConfig({
 	async transactional(e) {
 		this.inflightTxns++;
 		try {
-			return await re({
+			return await M({
 				...this.txnSpec("SqliteStore.transactional"),
 				work: e,
-				makeView: (e, t) => new ce(this, e, t)
+				makeView: (e, t) => new $(this, e, t)
 			});
 		} finally {
 			this.inflightTxns--;
 		}
 	}
+	get transactionService() {
+		return this.sql.transactionService;
+	}
 	txnSpec(e) {
 		return {
 			label: e,
 			dialect: this.systemName === "turso" ? "turso" : "sqlite",
 			withTransaction: (e) => this.sql.withTransaction(e),
+			transactionService: this.sql.transactionService,
 			runPromiseExit: (e) => this.runtime.runPromiseExit(e),
 			isRetryable: this.isRetryable,
 			wrapProgram: (e) => this.wrapTransaction(e),
@@ -387,7 +407,7 @@ var U = (r) => e.layerConfig({
 		};
 	}
 	injectExternalChange(e) {
-		T(e.table) && this.emitter.emit("change", C(e));
+		w(e.table) && this.emitter.emit("change", te(e));
 	}
 	run(e) {
 		return this.runtime.runPromise(e);
@@ -396,7 +416,7 @@ var U = (r) => e.layerConfig({
 		if (this.inflightTxns > 0) {
 			let t = Date.now() + e;
 			for (; this.inflightTxns > 0 && Date.now() < t;) await new Promise((e) => setTimeout(e, 25));
-			this.inflightTxns > 0 && X.warn("close: grace period expired with in-flight transactions", {
+			this.inflightTxns > 0 && Y.warn("close: grace period expired with in-flight transactions", {
 				gracePeriodMs: e,
 				inflight: this.inflightTxns
 			});
@@ -406,27 +426,27 @@ var U = (r) => e.layerConfig({
 	async ping() {
 		await this.runtime.runPromise(this.sql`SELECT 1`);
 	}
-}, ce = class {
+}, $ = class {
 	parent;
 	txn;
 	attr;
 	events = [];
-	aborts = E((e) => this.parent.transactionEndingFailure(e));
+	aborts = D((e) => this.parent.transactionEndingFailure(e));
 	committed = !1;
 	constructor(e, t, n = void 0) {
 		this.parent = e, this.txn = t, this.attr = n;
 	}
 	savepoint(e) {
-		return ne({
+		return j({
 			tracker: this.aborts,
 			name: `voltro_sp_${++this.savepointCounter}`,
 			spelling: "standard",
-			exec: (e) => this.parent.run(r.provideService(V.pipe(r.flatMap((t) => t.unsafe(e))), H, this.txn))
+			exec: (e) => this.parent.run(r.provideService(V.pipe(r.flatMap((t) => t.unsafe(e))), this.parent.transactionService, this.txn))
 		}, e);
 	}
 	savepointCounter = 0;
 	run(e) {
-		return this.aborts.track(() => this.parent.run(r.provideService(e, H, this.txn)));
+		return this.aborts.track(() => this.parent.run(ne(e, this.parent.transactionService, this.txn)));
 	}
 	abortedBy() {
 		return this.aborts.abortedBy();
@@ -486,12 +506,12 @@ var U = (r) => e.layerConfig({
 			this.events.length = 0;
 		}
 	}
-}, le = {
+}, ue = {
 	id: "sqlite",
-	makeSqlLayer: (e) => G(e),
-	makeStore: (e) => Z(e),
+	makeSqlLayer: (e) => W(e),
+	makeStore: (e) => X(e),
 	compileContains: (e, t, n) => n`${e} LIKE ${`%${t.replace(/[\\%_]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
-	retryFilter: Y
+	retryFilter: J
 };
 //#endregion
-export { e as SqliteClient, W as connectionFromConfig, U as makeSqliteSqlLayer, G as makeSqliteSqlLayerFromConfig, Z as makeSqliteStore, le as sqliteDialect, Y as sqliteRetryFilter };
+export { e as SqliteClient, U as connectionFromConfig, H as makeSqliteSqlLayer, W as makeSqliteSqlLayerFromConfig, X as makeSqliteStore, ue as sqliteDialect, J as sqliteRetryFilter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/sql-sqlite",
-  "version": "0.83.1",
+  "version": "0.85.0",
   "description": "SQLite dialect adapter for Voltro's cross-dialect DataStore (single-process; in-process change events).",
   "keywords": [
     "voltro",
@@ -33,13 +33,12 @@
     "node": ">=24.0.0"
   },
   "dependencies": {
-    "@effect/sql": "^0.52.1",
-    "@effect/sql-sqlite-node": "^0.53.0",
-    "@voltro/database": "0.83.1",
-    "@voltro/logger": "0.83.1"
+    "@effect/sql-sqlite-node": "4.0.1",
+    "@voltro/database": "0.85.0",
+    "@voltro/logger": "0.85.0"
   },
   "peerDependencies": {
-    "effect": "^3.22.2"
+    "effect": "4.0.1"
   },
   "publishConfig": {
     "access": "public"