@voltro/sql-sqlite 0.33.0 → 0.35.0

package/dist/index.d.ts

@@ -70,6 +70,10 @@ export declare class SqliteStore implements DataStore {
     private readonly wrapTransaction;
     private readonly emitter;
     private inflightTxns;
+    /** PERF-23 — counts EVERY eager JSON-agg → walker degradation and logs a
+     *  rate-limited line. Instance-scoped so a second store in one process cannot
+     *  silence this one's first warning. */
+    private readonly reportEagerFallback;
     constructor(sql: SqlClient.SqlClient, runtime: ManagedRuntime.ManagedRuntime<SqlClient.SqlClient, never>, namespace?: QueryNamespace, sharedEmitter?: EventEmitter, isRetryable?: (e: unknown) => boolean, systemName?: string, wrapTransaction?: <A, E, R>(e: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>);
     /**
      * Bind a per-request tenant namespace, returning a view that qualifies
@@ -119,6 +123,19 @@ export declare class SqliteStore implements DataStore {
     }): Promise<ReadonlyArray<T>>;
     private runWithEager;
     getInternalRunWithEager(): (d: QueryDescriptor, txn: TxnContext | null) => Promise<ReadonlyArray<Row>>;
+    /**
+     * Bracket a NON-transactional write: the attribution capture every public
+     * write already did, plus the ONE metrics funnel for this dialect's writes
+     * (`voltro_db_queries_total{op}`).
+     *
+     * Named to match postgres' and mysql's `localWrite` on purpose. Those two
+     * additionally hold the table's transport echoes for the write's duration —
+     * a CDC-only concern this dialect does not have (sqlite emits inline, one
+     * process) — so this one is the attribution + metrics half only. One name for
+     * the write funnel across four stores is what makes the parity test able to
+     * ask the question at all.
+     */
+    private localWrite;
     insert(table: string, row: Row): Promise<Row>;
     insertMany(table: string, rows: ReadonlyArray<Row>): Promise<ReadonlyArray<Row>>;
     patchJson(table: string, primaryKey: string, path: string, value: unknown): Promise<Row | null>;
@@ -163,6 +180,18 @@ export declare class SqliteStore implements DataStore {
      * retry — the whole point of `BEGIN CONCURRENT` — would never fire.
      */
     transactional<T>(work: (tx: DataStore) => Promise<T>): Promise<T>;
+    /**
+     * The DIALECT half of the shared transaction bracket
+     * (`runStoreTransaction` in `@voltro/database`).
+     *
+     * sqlite/turso own four things: the client's `withTransaction`, the runtime,
+     * the injected `isRetryable` predicate, and `wrapTransaction` — the fiber flag
+     * that upgrades turso's `BEGIN` to `BEGIN CONCURRENT`. Retry, commit-defect
+     * promotion, attribution threading and exit settling are shared; the
+     * 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`.
+     */
+    private txnSpec;
     onChange(listener: (event: ChangeEvent) => void): () => void;
     /** Cross-instance reactivity seam — emit an externally-sourced event to
      *  local subscribers without re-persisting. sqlite is single-process so

package/dist/index.js

@@ -1,14 +1,14 @@
 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, Schedule as s } from "effect";
-import { EventEmitter as c } from "node:events";
-import { createLogger as l } from "@voltro/logger";
-import { SqlClient as u, TransactionConnection as d } from "@effect/sql/SqlClient";
-import { EagerCardinalityError as f, attachEagerLoads as p, attributionFields as m, compileEagerJson as h, compilePredicate as g, compileRawFragment as _, compileSelect as v, currentWriteAttribution as y, decodeRowsFromSchema as b, hasEagerLoads as x, isTableReactive as S, qualifyTable as C, raiseChangeListenerCeiling as w, recordsTable as T, requireTable as E, runWithWriteAttribution as D, runWriteRecorders as O, settleTransactionExit as k, stampGeneratedId as A, stampGeneratedIds as j, withCapturedAttribution as M } from "@voltro/database";
+import { Config as t, Context as n, Effect as r, Layer as i, ManagedRuntime as a } from "effect";
+import { EventEmitter as o } from "node:events";
+import { createLogger as s } from "@voltro/logger";
+import { SqlClient as c, TransactionConnection as l } from "@effect/sql/SqlClient";
+import { EagerCardinalityError as u, attachEagerLoads as d, attributionFields as f, bulkInsertLimitsFor as p, chunkRowsForInsert as m, compileEagerJson as h, compilePredicate as g, compileRawFragment as _, compileSelect as v, decodeRowsFromSchema as y, externalChangeEvent as b, hasEagerLoads as x, isTableReactive as S, makeEagerFallbackReporter as C, observeDbOp as w, qualifyTable as T, raiseChangeListenerCeiling as E, recordsTable as D, requireTable as O, runStoreTransaction as k, runWriteRecorders as A, stampGeneratedId as j, stampGeneratedIds as M, withCapturedAttribution as N } from "@voltro/database";
 //#region src/sqlLayer.ts
-var N = (r) => e.layerConfig({
+var P = (r) => e.layerConfig({
 	filename: t.succeed(r.filename),
 	...r.readonly === void 0 ? {} : { readonly: t.succeed(r.readonly) }
-}).pipe(i.tap((t) => n.get(t, e.SqliteClient)`PRAGMA foreign_keys = ON`)), P = (e) => {
+}).pipe(i.tap((t) => n.get(t, e.SqliteClient)`PRAGMA foreign_keys = ON`)), F = (e) => {
 	if (e.url) {
 		if (e.url === ":memory:") return { filename: ":memory:" };
 		if (e.url.startsWith("file:")) return { filename: e.url.slice(5) };
@@ -16,12 +16,12 @@ var N = (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.");
-}, F = (e) => N(P(e)), I = /* @__PURE__ */ new Set([
+}, I = (e) => P(F(e)), L = /* @__PURE__ */ new Set([
 	"SQLITE_BUSY",
 	"SQLITE_LOCKED",
 	"5",
 	"6"
-]), L = (e) => {
+]), R = (e) => {
 	let t = e;
 	for (let e = 0; e < 5 && typeof t == "object" && t; e++) {
 		let e = t.code;
@@ -29,20 +29,17 @@ var N = (r) => e.layerConfig({
 		if (typeof e == "number") return String(e);
 		t = t.cause;
 	}
-}, R = (e) => {
-	let t = L(e);
-	return t !== void 0 && I.has(t);
-}, z = (e) => R(e) ? "retry" : "noRetry", B = l({ scope: "voltro:sqlite" }), V = async (e) => {
+}, z = (e) => {
+	let t = R(e);
+	return t !== void 0 && L.has(t);
+}, B = (e) => z(e) ? "retry" : "noRetry", V = s({ scope: "voltro:sqlite" }), H = async (e) => {
 	let t = e.tracerLayer ? i.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, n = a.make(t);
-	return new G(await n.runPromise(u), n, null, void 0, e.isRetryable ?? R, e.systemName ?? "sqlite", e.wrapTransaction);
-}, H = (e) => e, U = (e) => {
+	return new G(await n.runPromise(c), n, null, void 0, e.isRetryable ?? z, e.systemName ?? "sqlite", e.wrapTransaction);
+}, U = (e) => e, W = (e) => {
 	if (typeof e != "object" || !e) return e;
 	let t = {};
 	for (let [n, r] of Object.entries(e)) r instanceof Date ? t[n] = r.toISOString() : typeof r == "boolean" ? t[n] = +!!r : t[n] = r;
 	return t;
-}, W = () => {
-	let e = y();
-	return e === void 0 ? (e) => e() : (t) => D(e, t);
 }, G = class e {
 	sql;
 	runtime;
@@ -52,46 +49,55 @@ var N = (r) => e.layerConfig({
 	wrapTransaction;
 	emitter;
 	inflightTxns = 0;
-	constructor(e, t, n = null, r, i = R, a = "sqlite", o = H) {
-		this.sql = e, this.runtime = t, this.namespace = n, this.isRetryable = i, this.systemName = a, this.wrapTransaction = o, this.emitter = r ?? new c(), w(this.emitter);
+	reportEagerFallback;
+	constructor(e, t, n = null, r, i = z, a = "sqlite", s = U) {
+		this.sql = e, this.runtime = t, this.namespace = n, this.isRetryable = i, this.systemName = a, this.wrapTransaction = s, this.emitter = r ?? new o(), E(this.emitter), this.reportEagerFallback = C(V);
 	}
 	withNamespace(t) {
 		return t === this.namespace ? this : new e(this.sql, this.runtime, t, this.emitter, this.isRetryable, this.systemName, this.wrapTransaction);
 	}
 	nsT(e) {
-		return C(this.namespace, e);
+		return T(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 = v(e, this.sql, this.namespace), a = t ? r.provideService(i, d, t) : i;
-		return b(await this.runtime.runPromise(a), e.table, "sqlite");
+		let i = v(e, this.sql, this.namespace), a = t ? r.provideService(i, l, t) : i;
+		return y(await w(this.systemName, "select", () => this.runtime.runPromise(a)), e.table, "sqlite");
 	}
 	async executeInsert(e, t, n, i, a) {
-		t = A(e, t);
-		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(U(t))} RETURNING *`, c = n ? r.provideService(s, d, n) : s, l = (await this.runtime.runPromise(c))[0];
-		if (!l) throw Error(`SqliteStore.insert: no row returned for table '${e}'`);
+		t = j(e, t);
+		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(W(t))} RETURNING *`, c = n ? r.provideService(s, l, n) : s, u = (await this.runtime.runPromise(c))[0];
+		if (!u) throw Error(`SqliteStore.insert: no row returned for table '${e}'`);
 		return await this.routeEvent({
 			table: e,
 			op: "insert",
 			old: null,
-			new: l
-		}, i, n, a), l;
+			new: u
+		}, 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(U(n))} WHERE ${s("id")} = ${t} RETURNING *`, l = i ? r.provideService(c, d, i) : c, u = (await this.runtime.runPromise(l))[0];
-		return u ? (await this.routeEvent({
+		let s = this.sql, c = s`UPDATE ${s(this.nsT(e))} SET ${s.update(W(n))} WHERE ${s("id")} = ${t} RETURNING *`, u = i ? r.provideService(c, l, i) : c, d = (await this.runtime.runPromise(u))[0];
+		return d ? (await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
-			new: u
-		}, a, i, o), u) : null;
+			new: d
+		}, a, i, o), d) : null;
 	}
 	async executeInsertMany(e, t, n, i, a) {
-		if (t = j(e, t), t.length === 0) return [];
-		let o = this.sql, s = t.map((e) => U(e)), c = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(s)} RETURNING *`, l = n ? r.provideService(c, d, n) : c, u = await this.runtime.runPromise(l);
+		if (t = M(e, t), t.length === 0) return [];
+		let o = this.sql, s = m(t.map((e) => W(e)), p("sqlite")), c = (t) => o`INSERT INTO ${o(this.nsT(e))} ${o.insert(t)} RETURNING *`, u;
+		if (s.length === 1) {
+			let e = c(s[0]), t = n ? r.provideService(e, l, n) : e;
+			u = await this.runtime.runPromise(t);
+		} else if (n) {
+			let e = [];
+			for (let t of s) e.push(...await this.runtime.runPromise(r.provideService(c(t), l, n)));
+			u = e;
+		} else u = await this.runtime.runPromise(o.withTransaction(r.map(r.forEach(s, c, { concurrency: 1 }), (e) => e.flat())));
 		for (let t of u) await this.routeEvent({
 			table: e,
 			op: "insert",
@@ -101,7 +107,7 @@ var N = (r) => e.layerConfig({
 		return u;
 	}
 	async executePatchJson(e, t, n, i, a, o, s) {
-		let c = this.sql, l = n.split("."), u = l[0], f = l.slice(1), p = JSON.stringify(i ?? null), m = f.length === 0 ? c`${c(u)} = json_patch(COALESCE(${c(u)}, '{}'), json(${p}))` : c`${c(u)} = json_set(COALESCE(${c(u)}, '{}'), ${`$.${f.join(".")}`}, json(${p}))`, h = c`UPDATE ${c(this.nsT(e))} SET ${m} WHERE ${c("id")} = ${t} RETURNING *`, g = a ? r.provideService(h, d, a) : h, _ = (await this.runtime.runPromise(g))[0];
+		let c = this.sql, u = n.split("."), d = u[0], f = u.slice(1), p = JSON.stringify(i ?? null), m = f.length === 0 ? c`${c(d)} = json_patch(COALESCE(${c(d)}, '{}'), json(${p}))` : c`${c(d)} = json_set(COALESCE(${c(d)}, '{}'), ${`$.${f.join(".")}`}, json(${p}))`, h = c`UPDATE ${c(this.nsT(e))} SET ${m} WHERE ${c("id")} = ${t} RETURNING *`, g = a ? r.provideService(h, l, a) : h, _ = (await this.runtime.runPromise(g))[0];
 		return _ ? (await this.routeEvent({
 			table: e,
 			op: "update",
@@ -110,27 +116,27 @@ var N = (r) => e.layerConfig({
 		}, o, a, s), _) : null;
 	}
 	async executeDelete(e, t, n, i, a) {
-		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} WHERE ${o("id")} = ${t} RETURNING *`, c = n ? r.provideService(s, d, n) : s, l = (await this.runtime.runPromise(c))[0];
-		return l ? (await this.routeEvent({
+		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} WHERE ${o("id")} = ${t} RETURNING *`, c = n ? r.provideService(s, l, n) : s, u = (await this.runtime.runPromise(c))[0];
+		return u ? (await this.routeEvent({
 			table: e,
 			op: "delete",
-			old: l,
+			old: u,
 			new: null
 		}, i, n, a), !0) : !1;
 	}
 	async appendInTxn(e, t, n) {
-		let i = this.sql, a = i`INSERT INTO ${i(this.nsT(e))} ${i.insert(U(t))}`;
-		await this.runtime.runPromise(n ? r.provideService(a, d, n) : a);
+		let i = this.sql, a = i`INSERT INTO ${i(this.nsT(e))} ${i.insert(W(t))}`;
+		await this.runtime.runPromise(n ? r.provideService(a, l, 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, d, 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, l, i) : s))[0]?.m;
 		return c == null ? null : Number(c);
 	}
 	async routeEvent(e, t, n = null, r) {
 		e = {
-			...m(r),
+			...f(r),
 			...e
-		}, T(e.table) && await O({
+		}, D(e.table) && await A({
 			append: (e, t) => this.appendInTxn(e, t, n),
 			maxOf: (e, t, r) => this.maxInTxn(e, t, r, n)
 		}, {
@@ -147,7 +153,7 @@ var N = (r) => e.layerConfig({
 			let r = await this.findByConflict(e, t, n.conflictColumns, i);
 			return r ? await this.executeUpdate(e, r.id, n.update(r), i, a) ?? r : this.executeInsert(e, t, i, a);
 		}
-		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(e)}`), l = Object.keys(t).filter((e) => t[e] !== void 0), u = n.update === void 0 ? l.filter((e) => e !== "id" && !n.conflictColumns.includes(e)) : n.update, f = u.length > 0 ? s.csv(u.map((e) => s`${s(e)} = excluded.${s(e)}`)) : s`${s(n.conflictColumns[0])} = excluded.${s(n.conflictColumns[0])}`, p = s`INSERT INTO ${s(this.nsT(e))} ${s.insert(U(t))} ON CONFLICT (${s.csv(c)}) DO UPDATE SET ${f} RETURNING *`, m = i ? r.provideService(p, d, i) : p, h = (await this.runtime.runPromise(m))[0];
+		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(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 = d.length > 0 ? s.csv(d.map((e) => s`${s(e)} = excluded.${s(e)}`)) : s`${s(n.conflictColumns[0])} = excluded.${s(n.conflictColumns[0])}`, p = s`INSERT INTO ${s(this.nsT(e))} ${s.insert(W(t))} ON CONFLICT (${s.csv(c)}) DO UPDATE SET ${f} RETURNING *`, m = i ? r.provideService(p, l, i) : p, h = (await this.runtime.runPromise(m))[0];
 		if (!h) throw Error(`SqliteStore.upsert: no row returned for table '${e}'`);
 		let g = t.id !== void 0 && t.id === h.id ? "insert" : "update";
 		return await this.routeEvent({
@@ -158,8 +164,8 @@ var N = (r) => e.layerConfig({
 		}, a, i, o), h;
 	}
 	async executeInsertIgnore(e, t, n, i, a, o) {
-		t = A(e, t);
-		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(e)}`), l = s`INSERT INTO ${s(this.nsT(e))} ${s.insert(U(t))} ON CONFLICT (${s.csv(c)}) DO NOTHING RETURNING *`, u = i ? r.provideService(l, d, i) : l, f = (await this.runtime.runPromise(u))[0];
+		t = j(e, t);
+		let s = this.sql, c = n.conflictColumns.map((e) => s`${s(e)}`), u = s`INSERT INTO ${s(this.nsT(e))} ${s.insert(W(t))} ON CONFLICT (${s.csv(c)}) DO NOTHING RETURNING *`, d = i ? r.provideService(u, l, i) : u, f = (await this.runtime.runPromise(d))[0];
 		if (f) return await this.routeEvent({
 			table: e,
 			op: "insert",
@@ -172,7 +178,7 @@ var N = (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 * FROM ${a(this.nsT(e))} WHERE ${a.and(o)} LIMIT 1`, c = i ? r.provideService(s, d, i) : s;
+		let a = this.sql, o = n.map((e) => a`${a(e)} = ${t[e]}`), s = a`SELECT * FROM ${a(this.nsT(e))} WHERE ${a.and(o)} LIMIT 1`, c = i ? r.provideService(s, l, i) : s;
 		return (await this.runtime.runPromise(c))[0];
 	}
 	query(e) {
@@ -180,40 +186,53 @@ var N = (r) => e.layerConfig({
 	}
 	raw(e, t) {
 		let n = _(e, this.sql);
-		return this.runtime.runPromise(n);
+		return w(this.systemName, "raw", () => this.runtime.runPromise(n));
 	}
 	async runWithEager(e, t) {
 		if (!x(e)) return this.executeQuery(e, t);
 		let n = this.namespace === null ? h(e, this.sql, "sqlite") : null;
 		if (n !== null) try {
-			let e = t ? r.provideService(n.fragment, d, t) : n.fragment, i = await this.runtime.runPromise(e);
+			let e = t ? r.provideService(n.fragment, l, t) : n.fragment, i = await w(this.systemName, "select", () => this.runtime.runPromise(e));
 			return n.decode(i);
-		} catch (e) {
-			if (e instanceof f) throw e;
-			B.warn("sqlite JSON-agg eager-load failed; falling back to walker", { err: e });
+		} catch (t) {
+			if (t instanceof u) throw t;
+			this.reportEagerFallback({
+				dialect: this.systemName,
+				table: e.table,
+				reason: "execute-failed",
+				error: t
+			});
 		}
-		return p(await this.executeQuery(e, t), e.eager, e.sourceTable ?? E(e.table), (e) => this.executeQuery(e, t));
+		else this.reportEagerFallback({
+			dialect: this.systemName,
+			table: e.table,
+			reason: "not-compilable"
+		});
+		return d(await this.executeQuery(e, t), e.eager, e.sourceTable ?? O(e.table), (e) => this.executeQuery(e, t));
 	}
 	getInternalRunWithEager() {
 		return (e, t) => this.runWithEager(e, t);
 	}
+	localWrite(e, t) {
+		return w(this.systemName, e, () => N(t));
+	}
 	insert(e, t) {
-		return M((n) => this.executeInsert(e, t, null, null, n));
+		return this.localWrite("insert", (n) => this.executeInsert(e, t, null, null, n));
 	}
 	insertMany(e, t) {
-		return M((n) => this.executeInsertMany(e, t, null, null, n));
+		return this.localWrite("insert", (n) => this.executeInsertMany(e, t, null, null, n));
 	}
 	patchJson(e, t, n, r) {
-		return M((i) => this.executePatchJson(e, t, n, r, null, null, i));
+		return this.localWrite("update", (i) => this.executePatchJson(e, t, n, r, null, null, i));
 	}
 	update(e, t, n) {
-		return M((r) => this.executeUpdate(e, t, n, null, null, r));
+		return this.localWrite("update", (r) => this.executeUpdate(e, t, n, null, null, r));
 	}
 	delete(e, t) {
-		return M((n) => this.executeDelete(e, t, null, null, n));
+		return this.localWrite("delete", (n) => this.executeDelete(e, t, null, null, n));
 	}
 	async updateMany(e, t, n) {
-		let r = this.sql, i = g(n.where, r, this.namespace), a = r`UPDATE ${r(this.nsT(e))} SET ${r.update(U(t))} WHERE ${i} RETURNING *`, o = await this.runtime.runPromise(a);
+		let r = this.sql, i = g(n.where, r, this.namespace), a = r`UPDATE ${r(this.nsT(e))} SET ${r.update(W(t))} WHERE ${i} RETURNING *`, o = await w(this.systemName, "update", () => this.runtime.runPromise(a));
 		for (let t of o) await this.routeEvent({
 			table: e,
 			op: "update",
@@ -223,7 +242,7 @@ var N = (r) => e.layerConfig({
 		return o.length;
 	}
 	async deleteMany(e, t) {
-		let n = this.sql, r = g(t.where, n, this.namespace), i = n`DELETE FROM ${n(this.nsT(e))} WHERE ${r} RETURNING *`, a = await this.runtime.runPromise(i);
+		let n = this.sql, r = g(t.where, n, this.namespace), i = n`DELETE FROM ${n(this.nsT(e))} WHERE ${r} RETURNING *`, a = await w(this.systemName, "delete", () => this.runtime.runPromise(i));
 		for (let t of a) await this.routeEvent({
 			table: e,
 			op: "delete",
@@ -233,10 +252,10 @@ var N = (r) => e.layerConfig({
 		return a.length;
 	}
 	upsert(e, t, n) {
-		return M((r) => this.executeUpsert(e, t, n, null, null, r));
+		return this.localWrite("upsert", (r) => this.executeUpsert(e, t, n, null, null, r));
 	}
 	insertIgnore(e, t, n) {
-		return M((r) => this.executeInsertIgnore(e, t, n, null, null, r));
+		return this.localWrite("upsert", (r) => this.executeInsertIgnore(e, t, n, null, null, r));
 	}
 	emitChange(e) {
 		this.emitter.emit("change", e);
@@ -267,41 +286,40 @@ var N = (r) => e.layerConfig({
 	}
 	async transactional(e) {
 		this.inflightTxns++;
-		let t = y(), n = W(), i = 0, a = r.suspend(() => {
-			let a = ++i;
-			return this.sql.withTransaction(r.flatMap(r.serviceOption(d), (i) => {
-				if (o.isNone(i)) return r.fail(/* @__PURE__ */ Error("SqliteStore.transactional: TransactionConnection unexpectedly missing."));
-				let s = new K(this, i.value, t);
-				return r.tryPromise({
-					try: () => n(() => e(s)).then((e) => ({
-						result: e,
-						view: s,
-						attempt: a
-					})),
-					catch: (e) => e
-				});
-			})).pipe(r.catchAllDefect((e) => this.isRetryable(e) ? r.fail(e) : r.die(e)));
-		}), c = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(this.isRetryable)), l = a.pipe(r.retry(c), r.withSpan("store.transactional", { attributes: {
-			"db.system": this.systemName,
-			"db.operation": "transaction"
-		} }));
 		try {
-			let e = k(await this.runtime.runPromiseExit(this.wrapTransaction(l)));
-			return e.view.commitEvents(), e.result;
+			return await k({
+				...this.txnSpec("SqliteStore.transactional"),
+				work: e,
+				makeView: (e, t) => new K(this, e, t)
+			});
 		} finally {
 			this.inflightTxns--;
 		}
 	}
+	txnSpec(e) {
+		return {
+			label: e,
+			dialect: this.systemName === "turso" ? "turso" : "sqlite",
+			withTransaction: (e) => this.sql.withTransaction(e),
+			runPromiseExit: (e) => this.runtime.runPromiseExit(e),
+			isRetryable: this.isRetryable,
+			wrapProgram: (e) => this.wrapTransaction(e),
+			span: {
+				name: "store.transactional",
+				attributes: {
+					"db.system": this.systemName,
+					"db.operation": "transaction"
+				}
+			}
+		};
+	}
 	onChange(e) {
 		return this.emitter.on("change", e), () => {
 			this.emitter.off("change", e);
 		};
 	}
 	injectExternalChange(e) {
-		S(e.table) && this.emitter.emit("change", {
-			...e,
-			origin: "injected"
-		});
+		S(e.table) && this.emitter.emit("change", b(e));
 	}
 	run(e) {
 		return this.runtime.runPromise(e);
@@ -310,7 +328,7 @@ var N = (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 && B.warn("close: grace period expired with in-flight transactions", {
+			this.inflightTxns > 0 && V.warn("close: grace period expired with in-flight transactions", {
 				gracePeriodMs: e,
 				inflight: this.inflightTxns
 			});
@@ -395,10 +413,10 @@ var N = (r) => e.layerConfig({
 	}
 }, q = {
 	id: "sqlite",
-	makeSqlLayer: (e) => F(e),
-	makeStore: (e) => V(e),
+	makeSqlLayer: (e) => I(e),
+	makeStore: (e) => H(e),
 	compileContains: (e, t, n) => n`${e} LIKE ${`%${t.replace(/[\\%_]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
-	retryFilter: z
+	retryFilter: B
 };
 //#endregion
-export { e as SqliteClient, P as connectionFromConfig, N as makeSqliteSqlLayer, F as makeSqliteSqlLayerFromConfig, V as makeSqliteStore, q as sqliteDialect, z as sqliteRetryFilter };
+export { e as SqliteClient, F as connectionFromConfig, P as makeSqliteSqlLayer, I as makeSqliteSqlLayerFromConfig, H as makeSqliteStore, q as sqliteDialect, B as sqliteRetryFilter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/sql-sqlite",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "description": "SQLite dialect adapter for Voltro's cross-dialect DataStore (single-process; in-process change events).",
   "keywords": [
     "voltro",
@@ -35,8 +35,8 @@
   "dependencies": {
     "@effect/sql": "^0.52.0",
     "@effect/sql-sqlite-node": "^0.53.0",
-    "@voltro/database": "0.33.0",
-    "@voltro/logger": "0.33.0"
+    "@voltro/database": "0.35.0",
+    "@voltro/logger": "0.35.0"
   },
   "peerDependencies": {
     "effect": "^3.22.0"