@voltro/sql-sqlite 0.70.0 → 0.71.1

package/dist/index.d.ts

@@ -7,6 +7,7 @@ import { Context } from 'effect';
 import { DataStore } from '@voltro/database';
 import { Effect } from 'effect';
 import { EventEmitter } from 'node:events';
+import { InsertIgnoreResult } from '@voltro/database';
 import { Layer } from 'effect';
 import { ManagedRuntime } from 'effect';
 import { Predicate } from '@voltro/database';
@@ -166,6 +167,9 @@ export declare class SqliteStore implements DataStore {
     insertIgnore(table: string, row: Row, options: {
         conflictColumns: ReadonlyArray<string>;
     }): Promise<Row>;
+    insertIgnoreWithOutcome(table: string, row: Row, options: {
+        conflictColumns: ReadonlyArray<string>;
+    }): Promise<InsertIgnoreResult>;
     /* Excluded from this release type: emitChange */
     /* Excluded from this release type: getInternalExecuteQuery */
     /* Excluded from this release type: getInternalExecuteInsert */

package/dist/index.js

@@ -1,6 +1,6 @@
 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, compileSelect as y, decodeRowsFromSchema as b, encodeRowForSchema as x, externalChangeEvent as ee, hasEagerLoads as S, isTableReactive as C, jsonPatchAssignments as w, makeEagerFallbackReporter as T, observeDbOp as E, qualifyTable as D, quoteIdent as O, raiseChangeListenerCeiling as k, recordsTable as A, requireTable as j, rowKeyColumns as M, runStoreTransaction as te, runWriteRecorders as N, stampGeneratedId as P, stampGeneratedIds as F, upsertUpdatePatch as I, upsertUpdateValues as L, withCapturedAttribution as R } from "@voltro/database";
+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, compileSelect as y, decodeRowsFromSchema as b, encodeRowForSchema as x, externalChangeEvent as S, hasEagerLoads as C, isTableReactive as w, jsonPatchAssignments as ee, makeEagerFallbackReporter as T, observeDbOp as E, qualifyTable as D, quoteIdent as O, raiseChangeListenerCeiling as k, recordsTable as A, requireTable as j, rowKeyColumns as M, runStoreTransaction as N, runWriteRecorders as te, 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";
@@ -66,23 +66,23 @@ var U = (r) => e.layerConfig({
 	}
 	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 *`, c = n ? r.provideService(s, H, n) : s, l = (await this.runtime.runPromise(c))[0];
-		if (!l) throw Error(`SqliteStore.insert: no row returned for table '${e}'`);
+		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert($(t, e))} RETURNING *`, c = n ? r.provideService(s, H, n) : s, l = await this.runtime.runPromise(c), u = b(l, e, "sqlite")[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($(n, e))} WHERE ${s.and(M(t).map(([e, t]) => s`${s(e)} = ${t}`))} RETURNING *`, l = i ? r.provideService(c, H, 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($(n, e))} WHERE ${s.and(M(t).map(([e, t]) => s`${s(e)} = ${t}`))} RETURNING *`, l = i ? r.provideService(c, H, i) : c, u = await this.runtime.runPromise(l), d = b(u, e, "sqlite")[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 = F(e, t), t.length === 0) return [];
@@ -95,29 +95,30 @@ var U = (r) => e.layerConfig({
 			for (let t of c) e.push(...await this.runtime.runPromise(r.provideService(l(t), H, n)));
 			u = e;
 		} else u = await this.runtime.runPromise(o.withTransaction(r.map(r.forEach(c, l, { concurrency: 1 }), (e) => e.flat())));
-		for (let t of u) await this.routeEvent({
+		let f = b(u, e, "sqlite");
+		for (let t of f) await this.routeEvent({
 			table: e,
 			op: "insert",
 			old: null,
 			new: t
 		}, i, n, a);
-		return u;
+		return f;
 	}
 	async executePatchJson(e, t, n, i, a, o, s, c) {
-		let l = this.sql, u = $(w(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(M(t).map(([e, t]) => l`${l(e)} = ${t}`))} RETURNING *`, p = a ? r.provideService(f, H, a) : f, m = (await this.runtime.runPromise(p))[0];
-		return m ? (await this.routeEvent({
+		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(M(t).map(([e, t]) => l`${l(e)} = ${t}`))} RETURNING *`, p = a ? r.provideService(f, H, a) : f, m = await this.runtime.runPromise(p), h = b(m, e, "sqlite")[0];
+		return h ? (await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
-			new: m
-		}, o, a, s), m) : null;
+			new: h
+		}, 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(M(t).map(([e, t]) => o`${o(e)} = ${t}`))} RETURNING *`, c = n ? r.provideService(s, H, 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.and(M(t).map(([e, t]) => o`${o(e)} = ${t}`))} RETURNING *`, c = n ? r.provideService(s, H, n) : s, l = await this.runtime.runPromise(c), u = b(l, e, "sqlite")[0];
+		return u ? (await this.routeEvent({
 			table: e,
 			op: "delete",
-			old: l,
+			old: u,
 			new: null
 		}, i, n, a), !0) : !1;
 	}
@@ -133,7 +134,7 @@ var U = (r) => e.layerConfig({
 		e = {
 			...u(r),
 			...e
-		}, A(e.table) && await N({
+		}, A(e.table) && await te({
 			append: (e, t) => this.appendInTxn(e, t, n),
 			maxOf: (e, t, r) => this.maxInTxn(e, t, r, n)
 		}, {
@@ -143,41 +144,47 @@ var U = (r) => e.layerConfig({
 			prev: e.old,
 			traceId: e.traceId,
 			subjectId: e.subjectId
-		}), C(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) ?? r : this.executeInsert(e, t, i, a);
+			return r ? await this.executeUpdate(e, r.id, I(t, r, n), i, a, o) ?? r : 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 *`, g = i ? r.provideService(h, H, i) : h, _ = (await this.runtime.runPromise(g))[0];
-		if (!_) throw Error(`SqliteStore.upsert: no row returned for table '${e}'`);
-		let v = t.id !== void 0 && t.id === _.id ? "insert" : "update";
+		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 *`, g = i ? r.provideService(h, H, i) : h, _ = await this.runtime.runPromise(g), v = b(_, e, "sqlite")[0];
+		if (!v) throw Error(`SqliteStore.upsert: no row returned for table '${e}'`);
+		let y = t.id !== void 0 && t.id === v.id ? "insert" : "update";
 		return await this.routeEvent({
 			table: e,
-			op: v,
+			op: y,
 			old: null,
-			new: _
-		}, a, i, o), _;
+			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 *`, u = i ? r.provideService(l, H, i) : l, d = (await this.runtime.runPromise(u))[0];
-		if (d) return await this.routeEvent({
+		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 *`, u = i ? r.provideService(l, H, i) : l, d = await this.runtime.runPromise(u), f = b(d, e, "sqlite")[0];
+		if (f) return await this.routeEvent({
 			table: e,
 			op: "insert",
 			old: null,
-			new: d
-		}, a, i, o), d;
-		let f = await this.findByConflict(e, t, n.conflictColumns, i);
-		if (!f) throw Error(`SqliteStore.insertIgnore: conflict fired but no existing row found in '${e}'`);
-		return f;
+			new: f
+		}, a, i, o), {
+			row: f,
+			outcome: "inserted"
+		};
+		let p = await this.findByConflict(e, t, n.conflictColumns, i);
+		if (!p) throw Error(`SqliteStore.insertIgnore: conflict fired but no existing row found in '${e}'`);
+		return {
+			row: p,
+			outcome: "ignored"
+		};
 	}
 	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, H, i) : s;
-		return (await this.runtime.runPromise(c))[0];
+		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, H, i) : s, l = await this.runtime.runPromise(c);
+		return b(l, e, "sqlite")[0];
 	}
 	query(e) {
 		return this.runWithEager(e, null);
@@ -190,7 +197,7 @@ var U = (r) => e.layerConfig({
 		return E(this.systemName, "raw", () => this.runtime.runPromise(i));
 	}
 	async runWithEager(e, t) {
-		if (!S(e)) return this.executeQuery(e, t);
+		if (!C(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, H, t) : n.fragment, i = await E(this.systemName, "select", () => this.runtime.runPromise(e));
@@ -250,7 +257,7 @@ var U = (r) => e.layerConfig({
 	}
 	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 *`, u = i ? r.provideService(l, H, i) : l, d = await E(this.systemName, "update", () => this.runtime.runPromise(u));
-		for (let t of d) await this.routeEvent({
+		for (let t of b(d, e, "sqlite")) await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
@@ -260,7 +267,7 @@ var U = (r) => e.layerConfig({
 	}
 	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 *`, l = n ? r.provideService(c, H, n) : c, u = await E(this.systemName, "delete", () => this.runtime.runPromise(l));
-		for (let t of u) await this.routeEvent({
+		for (let t of b(u, e, "sqlite")) await this.routeEvent({
 			table: e,
 			op: "delete",
 			old: t,
@@ -272,6 +279,9 @@ var U = (r) => e.layerConfig({
 		return this.localWrite("upsert", e, (r, i, a) => this.executeUpsert(e, t, n, i, a, r));
 	}
 	insertIgnore(e, t, n) {
+		return this.insertIgnoreWithOutcome(e, t, n).then((e) => e.row);
+	}
+	insertIgnoreWithOutcome(e, t, n) {
 		return this.localWrite("upsert", e, (r, i, a) => this.executeInsertIgnore(e, t, n, i, a, r));
 	}
 	emitChange(e) {
@@ -332,7 +342,7 @@ var U = (r) => e.layerConfig({
 	async transactional(e) {
 		this.inflightTxns++;
 		try {
-			return await te({
+			return await N({
 				...this.txnSpec("SqliteStore.transactional"),
 				work: e,
 				makeView: (e, t) => new ae(this, e, t)
@@ -364,7 +374,7 @@ var U = (r) => e.layerConfig({
 		};
 	}
 	injectExternalChange(e) {
-		C(e.table) && this.emitter.emit("change", ee(e));
+		w(e.table) && this.emitter.emit("change", S(e));
 	}
 	run(e) {
 		return this.runtime.runPromise(e);
@@ -426,6 +436,9 @@ var U = (r) => e.layerConfig({
 		return this.parent.getInternalExecuteUpsert()(e, t, n, this.txn, this.events, this.attr);
 	}
 	insertIgnore(e, t, n) {
+		return this.insertIgnoreWithOutcome(e, t, n).then((e) => e.row);
+	}
+	insertIgnoreWithOutcome(e, t, n) {
 		return this.parent.getInternalExecuteInsertIgnore()(e, t, n, this.txn, this.events, this.attr);
 	}
 	transactional(e) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/sql-sqlite",
-  "version": "0.70.0",
+  "version": "0.71.1",
   "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.1",
     "@effect/sql-sqlite-node": "^0.53.0",
-    "@voltro/database": "0.70.0",
-    "@voltro/logger": "0.70.0"
+    "@voltro/database": "0.71.1",
+    "@voltro/logger": "0.71.1"
   },
   "peerDependencies": {
     "effect": "^3.22.1"