@voltro/runtime 0.86.0 → 0.87.0

package/dist/dataStore.js

@@ -1,24 +1,25 @@
 import { memoryQueryJoins as e } from "./memoryQueryJoins.js";
-import { applyMemoryColumnDefaults as t } from "./memoryColumnDefaults.js";
-import { Effect as n } from "effect";
-import { applyJsonPatch as r, attachEagerLoads as i, attributionFields as a, collectSubqueries as o, compareDecimal as s, emitCommittedChanges as c, evaluatePredicate as l, externalChangeEvent as u, getTable as d, hasEagerLoads as f, isTableReactive as p, jsonPatchAssignments as m, preparePredicate as h, raiseChangeListenerCeiling as g, requireTable as _, rowKeyColumns as v, settleTransactionExit as y, stampGeneratedId as b, transactionRetrySchedule as x, upsertUpdatePatch as S, upsertUpdateValues as C } from "@voltro/database";
-import { EventEmitter as w } from "node:events";
+import { memoryOutputColumns as t, memoryRowKey as n, memorySetRows as r } from "./memorySetOperations.js";
+import { applyMemoryColumnDefaults as i } from "./memoryColumnDefaults.js";
+import { Effect as a } from "effect";
+import { applyJsonPatch as o, attachEagerLoads as s, attributionFields as c, collectSubqueries as l, compareDecimal as u, emitCommittedChanges as d, evaluatePredicate as f, externalChangeEvent as p, getTable as m, hasEagerLoads as h, isTableReactive as g, jsonPatchAssignments as _, preparePredicate as v, raiseChangeListenerCeiling as y, requireTable as b, rowKeyColumns as x, settleTransactionExit as S, stampGeneratedId as C, transactionRetrySchedule as w, upsertUpdatePatch as T, upsertUpdateValues as E } from "@voltro/database";
+import { EventEmitter as D } from "node:events";
 //#region src/dataStore.ts
-var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) => {
+var O = (e, t, n, r = m(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) => {
 	for (let i of t) {
 		let t = e[i.column], a = n[i.column];
 		if (t === a || t instanceof Date && a instanceof Date && t.getTime() === a.getTime()) continue;
 		if (t == null) return i.direction === "asc" ? -1 : 1;
 		if (a == null) return i.direction === "asc" ? 1 : -1;
-		let o = r?.[i.column]?.type === "decimal" ? s(t, a) ?? 0 : t < a ? -1 : 1;
+		let o = r?.[i.column]?.type === "decimal" ? u(t, a) ?? 0 : t < a ? -1 : 1;
 		if (o !== 0) return i.direction === "asc" ? o : -o;
 	}
 	return 0;
-}), E = (e, t, n, r) => !e || l(e, t, n, r ? d(r)?.fields : void 0), D = (e, t) => {
+}), k = (e, t, n, r) => !e || f(e, t, n, r ? m(r)?.fields : void 0), A = (e, t) => {
 	let n = /* @__PURE__ */ new Map();
 	if (!e) return n;
-	for (let r of o(e)) {
-		let e = t.get(r.descriptor.table) ?? /* @__PURE__ */ new Map(), i = D(r.descriptor.predicate, t), a = N(r.descriptor, e, t, i);
+	for (let r of l(e)) {
+		let e = t.get(r.descriptor.table) ?? /* @__PURE__ */ new Map(), i = A(r.descriptor.predicate, t), a = I(r.descriptor, e, t, i);
 		if (r.kind === "exists") n.set(r.descriptor, a.length);
 		else {
 			let e = r.descriptor.projection, t = /* @__PURE__ */ new Set();
@@ -33,12 +34,12 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		}
 	}
 	return n;
-}, O = {
+}, j = {
 	A: 4,
 	B: 2,
 	C: 1,
 	D: .5
-}, k = (e) => (typeof e == "string" ? e : e == null ? "" : JSON.stringify(e)).toLowerCase().match(/[\p{L}\p{N}]+/gu) ?? [], A = (e) => {
+}, M = (e) => (typeof e == "string" ? e : e == null ? "" : JSON.stringify(e)).toLowerCase().match(/[\p{L}\p{N}]+/gu) ?? [], N = (e) => {
 	let t = {
 		children: /* @__PURE__ */ new Map(),
 		terms: []
@@ -55,23 +56,23 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		r.terms.push(n);
 	}
 	return t;
-}, j = (e, t, n) => {
+}, P = (e, t, n) => {
 	let r = Array(n).fill(0);
 	for (let n of t) {
 		let t = e;
 		for (let e = 0; e < n.length && (t = t.children.get(n[e]), t !== void 0); e++) for (let e of t.terms) r[e] = r[e] + 1;
 	}
 	return r;
-}, M = (e, t) => {
-	let n = k(t.query);
+}, F = (e, t) => {
+	let n = M(t.query);
 	if (n.length === 0) return [];
 	let r = [], i;
 	for (let a of e) {
 		let e = 0, o = /* @__PURE__ */ new Set();
 		for (let r of t.columns) {
-			let s = k(a[r]), c = O[t.weights?.[r] ?? ""] ?? 1;
-			i === void 0 && n.length >= 16 && s.length >= 512 && (i = A(n));
-			let l = i === void 0 ? void 0 : j(i, s, n.length);
+			let s = M(a[r]), c = j[t.weights?.[r] ?? ""] ?? 1;
+			i === void 0 && n.length >= 16 && s.length >= 512 && (i = N(n));
+			let l = i === void 0 ? void 0 : P(i, s, n.length);
 			for (let t = 0; t < n.length; t++) {
 				let r = n[t], i = l?.[t];
 				if (i === void 0) {
@@ -87,24 +88,33 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		});
 	}
 	return r;
-}, N = (t, n, r = /* @__PURE__ */ new Map(), i = null) => {
-	let a = i ?? D(t.predicate, r), o = t.alias !== void 0 || (t.joins?.length ?? 0) > 0 || t.joinedProjection !== void 0 ? e(t, [...n.values()], r, (e) => D(e, r)) : void 0, s = t.predicate === void 0 ? void 0 : h(t.predicate, a, o?.columns ?? d(t.table)?.fields), c = o?.rows ?? [...n.values()], l = s === void 0 ? c : c.filter((e) => s(e) ?? !0);
-	if (t.aggregations && t.aggregations.length > 0) {
-		let e = P(l, t.aggregations, t.groupBy, t.table, o?.columns);
-		if (!t.having) return e;
-		let n = D(t.having, r);
-		return e.filter((e) => E(t.having, e, n));
-	}
-	let u = T(t.fullTextSearch === void 0 ? l : M(l, t.fullTextSearch), t.order, t.table, o?.columns), f = t.fullTextSearch?.rank, p = f?.order === !0 ? u.sort((e, t) => Number(t[f.alias] ?? 0) - Number(e[f.alias] ?? 0)) : u, m = t.skip ? p.slice(t.skip) : p, g = t.take === void 0 ? m : m.slice(0, t.take);
-	if (o) return g.map(o.project);
-	if (!t.projection) return g;
-	let _ = t.projection;
-	return g.map((e) => {
-		let t = {};
-		for (let n of _) t[n] = e[n];
-		return t;
-	});
-}, P = (e, t, n, r, i = d(r)?.fields) => {
+}, I = (i, a, o = /* @__PURE__ */ new Map(), s = null) => {
+	for (let e of [i.take, i.skip]) if (e !== void 0 && (!Number.isSafeInteger(e) || e < 0)) throw Error("Query limit and offset must be non-negative safe integers");
+	if (i.setOp && i.setOp.queries.length >= 2) {
+		let e = r(i, (e) => I(e, o.get(e.table) ?? /* @__PURE__ */ new Map(), o)), n = O(e, i.order, i.table, t(i, e)), a = i.skip === void 0 ? n : n.slice(i.skip);
+		return i.take === void 0 ? a : a.slice(0, i.take);
+	}
+	let c = s ?? A(i.predicate, o), l = i.alias !== void 0 || (i.joins?.length ?? 0) > 0 || i.joinedProjection !== void 0 ? e(i, [...a.values()], o, (e) => A(e, o)) : void 0, u = i.predicate === void 0 ? void 0 : v(i.predicate, c, l?.columns ?? m(i.table)?.fields), d = l?.rows ?? [...a.values()], f = u === void 0 ? d : d.filter((e) => u(e) ?? !0);
+	if (i.aggregations && i.aggregations.length > 0) {
+		let e = L(f, i.aggregations, i.groupBy, i.table, l?.columns);
+		if (!i.having) return e;
+		let t = A(i.having, o);
+		return e.filter((e) => k(i.having, e, t));
+	}
+	let p = O(i.fullTextSearch === void 0 ? f : F(f, i.fullTextSearch), i.order.map((e) => ({
+		...e,
+		column: i.joinedProjection?.find((t) => t.outputKey === e.column)?.source ?? e.column
+	})), i.table, l?.columns), h = i.fullTextSearch?.rank, g = h?.order === !0 ? p.sort((e, t) => Number(t[h.alias] ?? 0) - Number(e[h.alias] ?? 0)) : p, _ = l?.project ?? (i.projection ? (e) => Object.fromEntries(i.projection.map((t) => [t, e[t]])) : (e) => e), y = g;
+	if (i.distinct) {
+		let e = t(i, g), r = Object.keys(e), a = /* @__PURE__ */ new Set();
+		y = g.filter((t) => {
+			let i = n(_(t), r, e);
+			return !a.has(i) && (a.add(i), !0);
+		});
+	}
+	let b = i.skip ? y.slice(i.skip) : y;
+	return (i.take === void 0 ? b : b.slice(0, i.take)).map(_);
+}, L = (e, t, n, r, i = m(r)?.fields) => {
 	let a = /* @__PURE__ */ new Map();
 	for (let t of e) {
 		let e = {};
@@ -122,22 +132,32 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	let o = [];
 	for (let e of a.values()) {
 		let n = { ...e.keyVals };
-		for (let r of t) n[r.alias] = L(r, e.rows, r.column === void 0 ? void 0 : i?.[r.column]?.type);
+		for (let r of t) n[r.alias] = B(r, e.rows, r.column === void 0 ? void 0 : i?.[r.column]?.type, r.column === void 0 ? void 0 : i?.[r.column]?.scale);
 		o.push(n);
 	}
 	return o;
-}, F = /^-?\d+$/, I = (e, t) => {
+}, R = /^-?\d+$/, z = (e, t) => {
 	let n = !1;
 	for (let r of e) {
 		let e = r[t];
 		if (e != null) {
-			if (typeof e != "string" || !F.test(e)) return !1;
+			if (typeof e != "string" || !R.test(e)) return !1;
 			n = !0;
 		}
 	}
 	return n;
-}, L = (e, t, n) => {
-	if (n === void 0 && (e.op === "sum" || e.op === "avg") && e.column !== void 0 && I(t, e.column) && (n = "bigint"), n === "bigint" && (e.op === "sum" || e.op === "avg")) {
+}, B = (e, t, n, r) => {
+	if (n === void 0 && (e.op === "sum" || e.op === "avg") && e.column !== void 0 && z(t, e.column) && (n = "bigint"), n === "decimal" && (e.op === "sum" || e.op === "avg")) {
+		let n = t.map((t) => t[e.column]).filter((e) => e != null).map(String);
+		if (n.length === 0) return null;
+		if (e.op === "avg") return n.reduce((e, t) => e + Number(t), 0) / n.length;
+		let i = r ?? Math.max(0, ...n.map((e) => (e.split(".")[1] ?? "").length)), a = n.reduce((e, t) => {
+			let n = t.startsWith("-"), [r = "0", a = ""] = t.replace(/^[-+]/, "").split("."), o = BigInt((r || "0") + a.slice(0, i).padEnd(i, "0"));
+			return e + (n ? -o : o);
+		}, 0n), o = (a < 0n ? -a : a).toString().padStart(i + 1, "0");
+		return (a < 0n ? "-" : "") + (i === 0 ? o : `${o.slice(0, -i)}.${o.slice(-i)}`);
+	}
+	if (n === "bigint" && (e.op === "sum" || e.op === "avg")) {
 		let n = 0n, r = 0;
 		for (let i of t) {
 			let t = i[e.column];
@@ -186,18 +206,18 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 					continue;
 				}
 				if (n === "decimal" || n === "bigint") {
-					let n = s(t, r);
+					let n = u(t, r);
 					n !== null && (e.op === "min" && n < 0 || e.op === "max" && n > 0) && (r = t);
 					continue;
 				}
-				let a = t instanceof Date ? t.getTime() : t, o = r instanceof Date ? r.getTime() : r, c = e.op === "min";
-				(c && a < o || !c && a > o) && (r = t);
+				let a = t instanceof Date ? t.getTime() : t, o = r instanceof Date ? r.getTime() : r, s = e.op === "min";
+				(s && a < o || !s && a > o) && (r = t);
 			}
 			return r;
 		}
 		default: throw Error(`computeAggregates: unknown op '${e.op}'`);
 	}
-}, R = (e, t) => {
+}, V = (e, t) => {
 	let n = /* @__PURE__ */ new Set();
 	for (let e of t.values()) for (let t of Object.keys(e)) n.add(t);
 	return {
@@ -205,31 +225,31 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		columns: [...n],
 		rowCount: t.size
 	};
-}, z = "\0", B = (e, t) => e === null ? t : `${e}${z}${t}`, V = class extends Error {
+}, H = "\0", U = (e, t) => e === null ? t : `${e}${H}${t}`, W = class extends Error {
 	constructor() {
 		super("InMemoryDataStore.transactional: concurrent table change; transaction attempt was discarded."), this.name = "MemoryTransactionConflict";
 	}
-}, H = (e, t) => {
+}, G = (e, t) => {
 	if (typeof t == "string" || typeof t == "number") return e.has(String(t)) ? String(t) : void 0;
-	let n = v(t);
+	let n = x(t);
 	for (let [t, r] of e) if (n.every(([e, t]) => r[e] === t)) return t;
-}, U = /* @__PURE__ */ new WeakSet(), W = class e {
+}, K = /* @__PURE__ */ new WeakSet(), q = class e {
 	#e;
 	#t;
 	#n;
 	#r(e, t = !0) {
-		t && this.#l(this.#c(e.table)), p(e.table) && this.#n.emit("change", {
-			...a(),
+		t && this.#l(this.#c(e.table)), g(e.table) && this.#n.emit("change", {
+			...c(),
 			...e
 		});
 	}
 	#i(e, t = !1) {
 		if (t) for (let t of e) this.#l(this.#c(t.table));
-		let n = e.filter((e) => p(e.table)).map((e) => ({
-			...a(),
+		let n = e.filter((e) => g(e.table)).map((e) => ({
+			...c(),
 			...e
 		}));
-		c(n, (e) => this.#n.emit("change", e));
+		d(n, (e) => this.#n.emit("change", e));
 	}
 	#a;
 	#o;
@@ -238,7 +258,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		return r.#e = t.tables, r.#t = t.revisions, r.#n = t.emitter, r.#a = t.numericCounters, r;
 	}
 	constructor(e, t = null) {
-		if (this.#o = t, this.#e = /* @__PURE__ */ new Map(), this.#t = /* @__PURE__ */ new Map(), this.#n = new w(), g(this.#n), this.#a = /* @__PURE__ */ new Map(), e) for (let [n, r] of Object.entries(e)) {
+		if (this.#o = t, this.#e = /* @__PURE__ */ new Map(), this.#t = /* @__PURE__ */ new Map(), this.#n = new D(), y(this.#n), this.#a = /* @__PURE__ */ new Map(), e) for (let [n, r] of Object.entries(e)) {
 			let e = /* @__PURE__ */ new Map(), i = 0n;
 			for (let [t, n] of r.entries()) {
 				let r = n.id, a = r == null ? `__voltro_seed_${t}` : String(r);
@@ -247,7 +267,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 					e > i && (i = e);
 				} catch {}
 			}
-			let a = B(t, n);
+			let a = U(t, n);
 			this.#e.set(a, e), i > 0n && this.#a.set(a, i);
 		}
 	}
@@ -260,35 +280,38 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		}, t);
 	}
 	#c(e) {
-		return B(this.#o, e);
+		return U(this.#o, e);
 	}
 	#l(e) {
 		this.#t.set(e, (this.#t.get(e) ?? 0n) + 1n);
 	}
 	#u(e = this.#e) {
-		let t = /* @__PURE__ */ new Map(), n = this.#o === null ? null : `${this.#o}${z}`;
-		for (let [r, i] of e) n === null ? r.includes(z) || t.set(r, i) : r.startsWith(n) && t.set(r.slice(n.length), i);
+		let t = /* @__PURE__ */ new Map(), n = this.#o === null ? null : `${this.#o}${H}`;
+		for (let [r, i] of e) n === null ? r.includes(H) || t.set(r, i) : r.startsWith(n) && t.set(r.slice(n.length), i);
 		return t;
 	}
 	#d(e) {
 		let t = this.#c(e), n = this.#e.get(t);
-		return n || (n = /* @__PURE__ */ new Map(), this.#e.set(t, n)), U.has(n) && (n = new Map(n), this.#e.set(t, n)), n;
+		return n || (n = /* @__PURE__ */ new Map(), this.#e.set(t, n)), K.has(n) && (n = new Map(n), this.#e.set(t, n)), n;
 	}
 	storedTables() {
-		return [...this.#u()].map(([e, t]) => R(e, t));
+		return [...this.#u()].map(([e, t]) => V(e, t));
+	}
+	integrityQuery(e) {
+		return this.query(e);
 	}
 	async query(e) {
-		let t = N(e, this.#e.get(this.#c(e.table)) ?? /* @__PURE__ */ new Map(), this.#u());
-		return f(e) ? i(t, e.eager, _(e.table), (e) => this.query(e)) : t;
-	}
-	async insert(e, n) {
-		n = t(e, b(e, n));
-		let r = d(e), i = (r?.fields)?.id?.idScheme, a = n;
-		if (a.id === void 0 && (r === void 0 || i !== void 0)) {
-			let t = this.#f(e);
+		let t = I(e, this.#e.get(this.#c(e.table)) ?? /* @__PURE__ */ new Map(), this.#u());
+		return h(e) ? s(t, e.eager, b(e.table), (e) => this.query(e)) : t;
+	}
+	async insert(e, t) {
+		t = i(e, C(e, t));
+		let n = m(e), r = (n?.fields)?.id?.idScheme, a = t;
+		if (a.id === void 0 && (n === void 0 || r !== void 0)) {
+			let n = this.#f(e);
 			a = {
-				...n,
-				id: t
+				...t,
+				id: n
 			};
 		}
 		let o = a.id === void 0 ? `__voltro_row_${this.#f(e)}` : String(a.id);
@@ -299,19 +322,19 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 			new: a
 		}), a;
 	}
-	async insertMany(e, t) {
-		let n = [];
-		for (let r of t) n.push(await this.insert(e, r));
-		return n;
+	async insertMany(e, t, n) {
+		let r = [];
+		for (let n of t) r.push(await this.insert(e, n));
+		return n?.returning === "none" ? [] : r;
 	}
-	async patchJson(e, t, n, i, a) {
-		let o = m(t, n, a), s = this.#e.get(this.#c(e));
+	async patchJson(e, t, n, r, i) {
+		let a = _(t, n, i), s = this.#e.get(this.#c(e));
 		if (!s) return null;
-		let c = H(s, t), l = c === void 0 ? void 0 : s.get(c);
+		let c = G(s, t), l = c === void 0 ? void 0 : s.get(c);
 		if (!l || c === void 0) return null;
 		let u = {
-			...r(l, n, i),
-			...o
+			...o(l, n, r),
+			...a
 		};
 		return this.#d(e).set(c, u), this.#r({
 			table: e,
@@ -328,7 +351,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	async update(e, t, n) {
 		let r = this.#e.get(this.#c(e));
 		if (!r) return null;
-		let i = H(r, t), a = i === void 0 ? void 0 : r.get(i);
+		let i = G(r, t), a = i === void 0 ? void 0 : r.get(i);
 		if (!a || i === void 0) return null;
 		let o = {
 			...a,
@@ -344,7 +367,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	async delete(e, t) {
 		let n = this.#e.get(this.#c(e));
 		if (!n) return !1;
-		let r = H(n, t), i = r === void 0 ? void 0 : n.get(r);
+		let r = G(n, t), i = r === void 0 ? void 0 : n.get(r);
 		return !i || r === void 0 ? !1 : (this.#d(e).delete(r), this.#r({
 			table: e,
 			op: "delete",
@@ -355,7 +378,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	async updateMany(e, t, n) {
 		let r = this.#e.get(this.#c(e));
 		if (!r) return 0;
-		let i = D(n.where, this.#u()), a = h(n.where, i, d(e)?.fields), o = 0, s = [];
+		let i = A(n.where, this.#u()), a = v(n.where, i, m(e)?.fields), o = 0, s = [];
 		for (let [n, i] of r) {
 			if (!a(i)) continue;
 			let r = {
@@ -374,7 +397,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	async deleteMany(e, t) {
 		let n = this.#e.get(this.#c(e));
 		if (!n) return 0;
-		let r = D(t.where, this.#u()), i = h(t.where, r, d(e)?.fields), a = [];
+		let r = A(t.where, this.#u()), i = v(t.where, r, m(e)?.fields), a = [];
 		for (let [e, t] of n) i(t) && a.push([e, t]);
 		for (let [t, n] of a) this.#d(e).delete(t);
 		return this.#i(a.map(([, t]) => ({
@@ -385,10 +408,10 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		})), !0), a.length;
 	}
 	async upsert(e, t, n) {
-		C(n);
+		E(n);
 		let r = this.#p(e, t, n.conflictColumns);
 		if (r) {
-			let i = S(t, r, n), a = Object.fromEntries(n.conflictColumns.map((e) => [e, r[e]]));
+			let i = T(t, r, n), a = Object.fromEntries(n.conflictColumns.map((e) => [e, r[e]]));
 			return await this.update(e, a, i) ?? r;
 		}
 		return this.insert(e, t);
@@ -409,14 +432,17 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	#p(e, t, n) {
 		let r = this.#e.get(this.#c(e));
 		if (r && n.length !== 0) outer: for (let e of r.values()) {
-			for (let r of n) if (e[r] !== t[r]) continue outer;
+			for (let r of n) {
+				let n = e[r], i = t[r];
+				if (n !== i && !(n instanceof Date && i instanceof Date && n.getTime() === i.getTime())) continue outer;
+			}
 			return e;
 		}
 	}
 	async transactional(e) {
-		let t = n.tryPromise({
+		let t = a.tryPromise({
 			try: async () => {
-				let t = new G(this.#m());
+				let t = new J(this.#m());
 				try {
 					let n = await e(t);
 					return t.commit(), n;
@@ -426,7 +452,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 			},
 			catch: (e) => e
 		});
-		return y(await n.runPromiseExit(t.pipe(n.retry(x((e) => e instanceof V)))));
+		return S(await a.runPromiseExit(t.pipe(a.retry(w((e) => e instanceof W)))));
 	}
 	onChange(e) {
 		return this.#n.on("change", e), () => {
@@ -434,11 +460,11 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		};
 	}
 	injectExternalChange(e) {
-		this.#r(u(e), !1);
+		this.#r(p(e), !1);
 	}
 	#m() {
 		let e = new Map(this.#e);
-		for (let t of e.values()) U.add(t);
+		for (let t of e.values()) K.add(t);
 		let t = new Map(this.#t), n = /* @__PURE__ */ new Set();
 		return {
 			readTable: (t) => {
@@ -452,7 +478,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 				for (let e of r.keys()) i.add(this.#c(e));
 				let a = new Set(n);
 				for (let e of i) a.add(e);
-				for (let e of a) if ((t.get(e) ?? 0n) !== (this.#t.get(e) ?? 0n)) throw new V();
+				for (let e of a) if ((t.get(e) ?? 0n) !== (this.#t.get(e) ?? 0n)) throw new W();
 				for (let [e, t] of r) {
 					if (!this.#e.get(this.#c(e))) continue;
 					let n = this.#d(e);
@@ -468,7 +494,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 			allocateNumericId: (e) => this.#f(e)
 		};
 	}
-}, G = class {
+}, J = class {
 	parent;
 	overlay = /* @__PURE__ */ new Map();
 	tombstones = /* @__PURE__ */ new Map();
@@ -512,11 +538,12 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	buildTablesView(e) {
 		let t = /* @__PURE__ */ new Set([e.table]), n = (e) => {
 			t.add(e.table);
+			for (let t of e.setOp?.queries ?? []) n(t);
 			for (let r of e.joins ?? []) {
 				t.add(r.table);
-				for (let e of o(r.on)) n(e.descriptor);
+				for (let e of l(r.on)) n(e.descriptor);
 			}
-			if (e.predicate) for (let t of o(e.predicate)) n(t.descriptor);
+			if (e.predicate) for (let t of l(e.predicate)) n(t.descriptor);
 		};
 		n(e);
 		let r = /* @__PURE__ */ new Map();
@@ -524,22 +551,25 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		return r;
 	}
 	storedTables() {
-		return [.../* @__PURE__ */ new Set([...this.parent.listTables(), ...this.overlay.keys()])].map((e) => R(e, this.materialise(e)));
+		return [.../* @__PURE__ */ new Set([...this.parent.listTables(), ...this.overlay.keys()])].map((e) => V(e, this.materialise(e)));
 	}
 	getOrCreateOverlay(e) {
 		this.assertActive();
 		let t = this.overlay.get(e);
 		return t || (t = /* @__PURE__ */ new Map(), this.overlay.set(e, t)), t;
 	}
+	integrityQuery(e) {
+		return this.query(e);
+	}
 	async query(e) {
-		let t = this.buildTablesView(e), n = N(e, this.materialise(e.table), t);
-		return f(e) ? i(n, e.eager, _(e.table), (e) => this.query(e)) : n;
-	}
-	async insert(e, n) {
-		n = t(e, b(e, n));
-		let r = d(e), i = (r?.fields)?.id?.idScheme, a = n;
-		a.id === void 0 && (r === void 0 || i !== void 0) && (a = {
-			...n,
+		let t = this.buildTablesView(e), n = I(e, this.materialise(e.table), t);
+		return h(e) ? s(n, e.eager, b(e.table), (e) => this.query(e)) : n;
+	}
+	async insert(e, t) {
+		t = i(e, C(e, t));
+		let n = m(e), r = (n?.fields)?.id?.idScheme, a = t;
+		a.id === void 0 && (n === void 0 || r !== void 0) && (a = {
+			...t,
 			id: this.parent.allocateNumericId(e)
 		});
 		let o = a.id === void 0 ? `__voltro_row_${this.parent.allocateNumericId(e)}` : String(a.id);
@@ -550,13 +580,13 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 			new: a
 		}), a;
 	}
-	async insertMany(e, t) {
-		let n = [];
-		for (let r of t) n.push(await this.insert(e, r));
-		return n;
+	async insertMany(e, t, n) {
+		let r = [];
+		for (let n of t) r.push(await this.insert(e, n));
+		return n?.returning === "none" ? [] : r;
 	}
 	async update(e, t, n) {
-		let r = this.materialise(e), i = H(r, t), a = i === void 0 ? void 0 : r.get(i);
+		let r = this.materialise(e), i = G(r, t), a = i === void 0 ? void 0 : r.get(i);
 		if (!a || i === void 0) return null;
 		let o = {
 			...a,
@@ -569,12 +599,12 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 			new: o
 		}), o;
 	}
-	async patchJson(e, t, n, i, a) {
-		let o = m(t, n, a), s = this.materialise(e), c = H(s, t), l = c === void 0 ? void 0 : s.get(c);
+	async patchJson(e, t, n, r, i) {
+		let a = _(t, n, i), s = this.materialise(e), c = G(s, t), l = c === void 0 ? void 0 : s.get(c);
 		if (!l || c === void 0) return null;
 		let u = {
-			...r(l, n, i),
-			...o
+			...o(l, n, r),
+			...a
 		};
 		return this.getOrCreateOverlay(e).set(c, u), this.events.push({
 			table: e,
@@ -584,7 +614,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		}), u;
 	}
 	async delete(e, t) {
-		let n = this.materialise(e), r = H(n, t), i = r === void 0 ? void 0 : n.get(r);
+		let n = this.materialise(e), r = G(n, t), i = r === void 0 ? void 0 : n.get(r);
 		if (!i || r === void 0) return !1;
 		this.overlay.get(e)?.delete(r);
 		let a = this.tombstones.get(e);
@@ -596,7 +626,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		}), !0;
 	}
 	async updateMany(e, t, n) {
-		let r = this.materialise(e), i = D(n.where, this.buildTablesViewForPred(n.where)), a = h(n.where, i, d(e)?.fields), o = 0;
+		let r = this.materialise(e), i = A(n.where, this.buildTablesViewForPred(n.where)), a = v(n.where, i, m(e)?.fields), o = 0;
 		for (let [n, i] of r) {
 			if (!a(i)) continue;
 			let r = {
@@ -613,7 +643,7 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		return o;
 	}
 	async deleteMany(e, t) {
-		let n = this.materialise(e), r = D(t.where, this.buildTablesViewForPred(t.where)), i = h(t.where, r, d(e)?.fields), a = 0, o = this.tombstones.get(e);
+		let n = this.materialise(e), r = A(t.where, this.buildTablesViewForPred(t.where)), i = v(t.where, r, m(e)?.fields), a = 0, o = this.tombstones.get(e);
 		for (let [t, r] of n) i(r) && (this.overlay.get(e)?.delete(t), o || (o = /* @__PURE__ */ new Set(), this.tombstones.set(e, o)), o.add(t), this.events.push({
 			table: e,
 			op: "delete",
@@ -624,16 +654,16 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	}
 	buildTablesViewForPred(e) {
 		let t = /* @__PURE__ */ new Set();
-		for (let n of o(e)) t.add(n.descriptor.table);
+		for (let n of l(e)) t.add(n.descriptor.table);
 		let n = /* @__PURE__ */ new Map();
 		for (let e of t) n.set(e, this.materialise(e));
 		return n;
 	}
 	async upsert(e, t, n) {
-		C(n);
+		E(n);
 		let r = this.findByConflictColumns(e, t, n.conflictColumns);
 		if (r) {
-			let i = S(t, r, n), a = Object.fromEntries(n.conflictColumns.map((e) => [e, r[e]]));
+			let i = T(t, r, n), a = Object.fromEntries(n.conflictColumns.map((e) => [e, r[e]]));
 			return await this.update(e, a, i) ?? r;
 		}
 		return this.insert(e, t);
@@ -655,7 +685,10 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 		if (n.length === 0) return;
 		let r = this.materialise(e);
 		outer: for (let e of r.values()) {
-			for (let r of n) if (e[r] !== t[r]) continue outer;
+			for (let r of n) {
+				let n = e[r], i = t[r];
+				if (n !== i && !(n instanceof Date && i instanceof Date && n.getTime() === i.getTime())) continue outer;
+			}
 			return e;
 		}
 	}
@@ -676,4 +709,4 @@ var T = (e, t, n, r = d(n)?.fields) => t.length === 0 ? e : [...e].sort((e, n) =
 	}
 };
 //#endregion
-export { W as InMemoryDataStore };
+export { q as InMemoryDataStore };

package/dist/declaredTablesGuard.js

@@ -14,8 +14,9 @@ var e = class extends Error {
 	};
 	return {
 		query: async (e) => (i(e.table, "query"), n.query(e)),
+		...n.integrityQuery === void 0 ? {} : { integrityQuery: async (e) => (i(e.table, "integrityQuery"), n.integrityQuery(e)) },
 		insert: async (e, t) => (i(e, "insert"), n.insert(e, t)),
-		insertMany: async (e, t) => (i(e, "insertMany"), n.insertMany(e, t)),
+		insertMany: async (e, t, r) => (i(e, "insertMany"), n.insertMany(e, t, r)),
 		patchJson: async (e, t, r, a, o) => (i(e, "patchJson"), n.patchJson(e, t, r, a, o)),
 		update: async (e, t, r) => (i(e, "update"), n.update(e, t, r)),
 		updateMany: async (e, t, r) => (i(e, "updateMany"), n.updateMany(e, t, r)),