@voltro/sql-mysql 0.1.6 → 0.2.1

package/CHANGELOG.md

@@ -39,6 +39,22 @@ _Changes staged for the next release accumulate here (rolled up from
 
 ---
 
+## [0.2.1] — 2026-07-17
+
+### Fixed
+
+- **@voltro/cli, @voltro/database** — `voltro codegen` / `dev` / `serve` / `build` no longer crash with `Cannot find package '@voltro/sql-mysql'` on an app that doesn't declare that driver (e.g. a memory-store app, or a postgres app for the mysql/mssql drivers). The CLI's framework-table assembly statically imported the CDC-offsets table schema from `@voltro/sql-mysql` / `@voltro/sql-mssql` (`import { _voltroCdcOffsetsTable } from '@voltro/sql-mysql'`), so merely LOADING the CLI resolved those driver packages — failing whenever one wasn't installed. This surfaced only in a production install where the drivers aren't present (0.2.0's app-declared-driver change), not in the workspace where all drivers are devDependencies. The two CDC-offsets table schemas (pure schema, no driver runtime) move to `@voltro/database` — the driver-agnostic package both the CLI and the drivers already depend on; the drivers re-export them so their public API + CDC readers are unchanged. The CLI now references a SQL driver only through the runtime `importDriver()` lookup (lazy, and only for the dialect actually in use). The lazily-imported driver modules are also typed with local structural interfaces instead of `typeof import('@voltro/sql-*')`, so no driver package is referenced in a type position either.
+
+---
+
+## [0.2.0] — 2026-07-17
+
+### ⚠ BREAKING
+
+- **@voltro/cli** — The SQL dialect drivers (`@voltro/sql-postgres`, `@voltro/sql-mysql`, `@voltro/sql-mssql`, `@voltro/sql-sqlite`, `@voltro/sql-turso`) are no longer dependencies of `@voltro/cli`. Each app now declares the driver for its own DB dialect as a dependency, and `voltro dev`/`serve`/`migrate` resolve it from the app root. This keeps every driver — including turso's ~90 MB native binary — out of the production image of an app that doesn't use it: a `store: 'memory'` app ships no SQL driver at all, and a postgres app ships only `@voltro/sql-postgres`. Combined with a `pnpm --prod deploy`-based Dockerfile (the standalone/template Dockerfiles now do this), a memory-API image drops its `node_modules` from ~477 MB to ~330 MB. **Migration:** add the driver for your dialect to the app that uses it — `pnpm add @voltro/sql-postgres` (or `-mysql` for mysql/mariadb, `-mssql`, `-sqlite`, `-turso`). A memory store needs none. Scaffolded projects already declare it, and `voltro add mssql` adds `@voltro/sql-mssql` automatically. If the driver is missing at boot, `voltro serve` now fails with a message naming the exact package to install instead of an opaque module-not-found.
+
+---
+
 ## [0.1.6] — 2026-07-17
 
 ### Added

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+import { CDC_OFFSETS_TABLE } from '@voltro/database';
 import { CdcConfig } from '@voltro/database';
 import { ChangeEvent } from '@voltro/database';
 import { ChangeStrategy } from '@voltro/database';
@@ -22,8 +23,8 @@ 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 { TableLike } from '@voltro/database';
 import { TransactionConnection } from '@effect/sql/SqlClient';
+import { _voltroCdcOffsetsTable } from '@voltro/database';
 
 export declare interface BinlogCdcHandle {
     readonly stop: () => Promise<void>;
@@ -99,7 +100,7 @@ export declare interface BinlogPosition {
     readonly position: number;
 }
 
-export declare const CDC_OFFSETS_TABLE = "_voltro_cdc_offsets";
+export { CDC_OFFSETS_TABLE }
 
 declare class CdcDeliveryGate {
     private readonly variant;
@@ -368,6 +369,6 @@ export declare const startBinlogCdc: (opts: BinlogCdcOptions) => Promise<BinlogC
 
 declare type TxnContext = Context.Tag.Service<typeof TransactionConnection>;
 
-export declare const _voltroCdcOffsetsTable: TableLike;
+export { _voltroCdcOffsetsTable }
 
 export { }

package/dist/index.js

@@ -3,16 +3,16 @@ import { Config as t, Effect as n, Layer as r, ManagedRuntime as i, Option as a,
 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 { attachEagerLoads as f, compileEagerJson as p, compilePredicate as m, compileRawFragment as h, compileSelect as g, decodeRowsFromSchema as _, encodeRowForSchema as v, hasEagerLoads as y, id as b, qualifyTable as x, requireTable as S, table as C, text as w, timestamp as T } from "@voltro/database";
+import { CDC_OFFSETS_TABLE as f, _voltroCdcOffsetsTable as p, attachEagerLoads as m, compileEagerJson as h, compilePredicate as g, compileRawFragment as _, compileSelect as v, decodeRowsFromSchema as y, encodeRowForSchema as b, hasEagerLoads as x, qualifyTable as S, requireTable as C } from "@voltro/database";
 //#region src/sqlLayer.ts
-var E = (n) => e.layerConfig({
+var w = (n) => e.layerConfig({
 	host: t.succeed(n.host),
 	port: t.succeed(n.port),
 	username: t.succeed(n.username),
 	password: t.succeed(o.make(n.password)),
 	database: t.succeed(n.database),
 	...n.maxConnections === void 0 ? {} : { maxConnections: t.succeed(n.maxConnections) }
-}), D = (e) => {
+}), T = (e) => {
 	if (e.url) {
 		let t = new URL(e.url);
 		return {
@@ -32,34 +32,34 @@ var E = (n) => e.layerConfig({
 		database: e.database ?? "app",
 		...e.maxConnections === void 0 ? {} : { maxConnections: e.maxConnections }
 	};
-}, O = (e) => E(D(e)), k = (e, t) => e === null ? !1 : t === null ? !0 : e.filename === t.filename ? e.position > t.position : e.filename > t.filename, A = (e) => e.msSinceProgress < e.stallThresholdMs ? "healthy" : e.primary !== null && !k(e.primary, e.reader) ? "idle-caught-up" : "reconnect", j = (e) => (e instanceof Error ? e.message : String(e ?? "")).includes("schema changed between binlog event and metadata fetch"), M = /* @__PURE__ */ new Set([
+}, E = (e) => w(T(e)), D = (e, t) => e === null ? !1 : t === null ? !0 : e.filename === t.filename ? e.position > t.position : e.filename > t.filename, O = (e) => e.msSinceProgress < e.stallThresholdMs ? "healthy" : e.primary !== null && !D(e.primary, e.reader) ? "idle-caught-up" : "reconnect", k = (e) => (e instanceof Error ? e.message : String(e ?? "")).includes("schema changed between binlog event and metadata fetch"), A = /* @__PURE__ */ new Set([
 	"writerows",
 	"updaterows",
 	"deleterows"
-]), N = /\b(alter|rename|drop|create)\s+(table|column)?/i, P = (e) => new Promise((t) => setTimeout(t, e)), F = async (e) => {
+]), j = /\b(alter|rename|drop|create)\s+(table|column)?/i, M = (e) => new Promise((t) => setTimeout(t, e)), N = async (e) => {
 	let t = l({ scope: `voltro:${e.variant}:cdc` }), n;
 	try {
 		n = (await import("@vlasky/zongji")).default;
 	} catch (t) {
 		throw Error(`changeStrategy='cdc' on ${e.variant} requires the '@vlasky/zongji' optional dependency. Install it (it ships as an optionalDependency of @voltro/sql-mysql) to enable binlog CDC.`, { cause: t });
 	}
-	let r = e.includeTables ? new Set(e.includeTables) : null, i = e.connection.database, a = e.startPosition?.filename ?? null, o = e.startPosition ?? null, s = (t, n) => _([n], t, e.variant)[0], c = null, u = !1, d = 0, f = Date.now(), p = !1, m = null, h = e.stallThresholdMs ?? 25e3, g = e.watchdogIntervalMs ?? 15e3, v = () => {
+	let r = e.includeTables ? new Set(e.includeTables) : null, i = e.connection.database, a = e.startPosition?.filename ?? null, o = e.startPosition ?? null, s = (t, n) => y([n], t, e.variant)[0], c = null, u = !1, d = 0, f = Date.now(), p = !1, m = null, h = e.stallThresholdMs ?? 25e3, g = e.watchdogIntervalMs ?? 15e3, _ = () => {
 		f = Date.now();
-	}, y = (n) => {
-		v();
+	}, v = (n) => {
+		_();
 		let l = n.getEventName();
 		if (l === "rotate" && n.binlogName) {
 			a = n.binlogName;
 			return;
 		}
-		if (l === "query" && n.query && N.test(n.query)) {
+		if (l === "query" && n.query && j.test(n.query)) {
 			c && (c.tableMap = {});
 			return;
 		}
 		if (n.nextPosition && a && (o = {
 			filename: a,
 			position: n.nextPosition
-		}, e.onPosition?.(o)), !M.has(l)) return;
+		}, e.onPosition?.(o)), !A.has(l)) return;
 		let u = n.tableMap[n.tableId];
 		if (!u || u.parentSchema !== i) return;
 		let d = u.tableName;
@@ -116,8 +116,8 @@ var E = (n) => e.layerConfig({
 		});
 		c = o;
 		let s = !1;
-		o.on("binlog", y), o.on("ready", () => {
-			v(), !s && (s = !0, d = 0, t.info("cdc: binlog reader attached", {
+		o.on("binlog", v), o.on("ready", () => {
+			_(), !s && (s = !0, d = 0, t.info("cdc: binlog reader attached", {
 				serverId: e.serverId,
 				from: r ?? "current-end"
 			}), i());
@@ -137,11 +137,11 @@ var E = (n) => e.layerConfig({
 					try {
 						c?.stop();
 					} catch {}
-					if (d++, await P(Math.min(3e4, 500 * 2 ** Math.min(d, 6))), u) return;
-					let r = o, i = x(n), s = !i && j(n);
+					if (d++, await M(Math.min(3e4, 500 * 2 ** Math.min(d, 6))), u) return;
+					let r = o, i = x(n), s = !i && k(n);
 					(i || s) && (t.warn(s ? "cdc: un-replayable backlog event (schema moved past it) — jumping to current end + self-heal" : "cdc: binlog gap (purged/failover) — jumping to current end + self-heal"), r = e.resolveStartPosition ? await e.resolveStartPosition().catch(() => null) : null, a = r?.filename ?? null, e.onResync?.());
 					try {
-						await S(r), d = 0, v();
+						await S(r), d = 0, _();
 						return;
 					} catch (e) {
 						n = e;
@@ -161,21 +161,21 @@ var E = (n) => e.layerConfig({
 				c?.stop();
 			} catch {}
 			let n = e.resolveStartPosition ? await e.resolveStartPosition().catch(() => null) : null;
-			a = n?.filename ?? null, e.onResync?.(), await P(500), await S(n);
+			a = n?.filename ?? null, e.onResync?.(), await M(500), await S(n);
 		} else throw n;
 	}
 	let w = async () => {
 		if (u || p || Date.now() - f < h) return;
 		let n = null;
 		if (e.resolveStartPosition && (n = await e.resolveStartPosition().catch(() => null)), u || p) return;
-		let r = A({
+		let r = O({
 			msSinceProgress: Date.now() - f,
 			stallThresholdMs: h,
 			primary: n,
 			reader: o
 		});
 		if (r !== "reconnect") {
-			r === "idle-caught-up" && v();
+			r === "idle-caught-up" && _();
 			return;
 		}
 		t.warn("cdc: watchdog detected a stalled reader — forcing reconnect", {
@@ -197,14 +197,7 @@ var E = (n) => e.layerConfig({
 		},
 		currentPosition: () => o
 	};
-}, I = "_voltro_cdc_offsets", L = C(I, {
-	id: b({ prefix: "cdcoff" }),
-	replicaId: w(),
-	streamName: w(),
-	binlogFile: w(),
-	binlogPosition: w(),
-	updatedAt: T()
-}).index(["replicaId"]), R = /* @__PURE__ */ new Set(["1213", "1205"]), z = (e) => {
+}, P = /* @__PURE__ */ new Set(["1213", "1205"]), F = (e) => {
 	let t = e;
 	for (let e = 0; e < 5 && typeof t == "object" && t; e++) {
 		let e = t.errno;
@@ -213,31 +206,31 @@ var E = (n) => e.layerConfig({
 		if (typeof n == "string") return n;
 		t = t.cause;
 	}
-}, B = (e) => {
-	let t = z(e);
-	return t !== void 0 && R.has(t);
-}, V = (e) => B(e) ? "retry" : "noRetry", H = (e) => {
+}, I = (e) => {
+	let t = F(e);
+	return t !== void 0 && P.has(t);
+}, L = (e) => I(e) ? "retry" : "noRetry", R = (e) => {
 	if (e == null) return "null";
 	let t = typeof e;
 	if (t === "bigint") return `${e}n`;
 	if (t !== "object") return JSON.stringify(e);
 	if (e instanceof Date) return `"${e.toISOString()}"`;
-	if (Array.isArray(e)) return `[${e.map(H).join(",")}]`;
+	if (Array.isArray(e)) return `[${e.map(R).join(",")}]`;
 	let n = e;
-	return `{${Object.keys(n).sort().map((e) => `${JSON.stringify(e)}:${H(n[e])}`).join(",")}}`;
-}, U = (e) => {
-	let t = H(e), n = 2166136261;
+	return `{${Object.keys(n).sort().map((e) => `${JSON.stringify(e)}:${R(n[e])}`).join(",")}}`;
+}, z = (e) => {
+	let t = R(e), n = 2166136261;
 	for (let e = 0; e < t.length; e++) n ^= t.charCodeAt(e), n = Math.imul(n, 16777619);
 	return (n >>> 0).toString(36);
-}, W = (e, t) => {
+}, B = (e, t) => {
 	let n = setTimeout(e, t);
 	typeof n.unref == "function" && n.unref();
-}, G = class {
+}, V = class {
 	variant;
 	ttlMs;
 	schedule;
 	seen = /* @__PURE__ */ new Map();
-	constructor(e, t = 6e4, n = W) {
+	constructor(e, t = 6e4, n = B) {
 		this.variant = e, this.ttlMs = t, this.schedule = n;
 	}
 	key(e) {
@@ -247,11 +240,11 @@ var E = (n) => e.layerConfig({
 		if (n == null) return null;
 		let r = t;
 		try {
-			r = _([t], e.table, this.variant)[0] ?? t;
+			r = y([t], e.table, this.variant)[0] ?? t;
 		} catch {
 			r = t;
 		}
-		return `${e.table} ${e.op} ${String(n)} ${U(r)}`;
+		return `${e.table} ${e.op} ${String(n)} ${z(r)}`;
 	}
 	admit(e) {
 		let t = this.key(e);
@@ -266,12 +259,12 @@ var E = (n) => e.layerConfig({
 	get pending() {
 		return this.seen.size;
 	}
-}, K = async (e) => {
+}, H = async (e) => {
 	let t = e.variant ?? "mysql", n = l({ scope: `voltro:${t}` }), a = e.changeStrategy ?? "inline", o = a;
 	a === "cdc" && !e.cdcConfig && (n.warn("changeStrategy='cdc' requires cdcConfig (serverId + connection); falling back to 'inline'."), o = "inline");
-	let s = e.tracerLayer ? r.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, c = i.make(s), d = new q(await c.runPromise(u), c, t, o);
+	let s = e.tracerLayer ? r.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, c = i.make(s), d = new U(await c.runPromise(u), c, t, o);
 	return o === "cdc" && e.cdcConfig && await d.startCdcConsumer(e.cdcConfig), d;
-}, q = class e {
+}, U = class e {
 	sql;
 	runtime;
 	variant;
@@ -287,13 +280,13 @@ var E = (n) => e.layerConfig({
 	cdcStreamName = "default";
 	cdcGate;
 	constructor(e, t, n, r = "inline", i = null, a, o) {
-		this.sql = e, this.runtime = t, this.variant = n, this.changeStrategy = r, this.namespace = i, this.log = l({ scope: `voltro:${n}` }), this.emitter = a ?? new c(), this.cdcGate = o ?? new G(n);
+		this.sql = e, this.runtime = t, this.variant = n, this.changeStrategy = r, this.namespace = i, this.log = l({ scope: `voltro:${n}` }), this.emitter = a ?? new c(), this.cdcGate = o ?? new V(n);
 	}
 	withNamespace(t) {
 		return t === this.namespace ? this : new e(this.sql, this.runtime, this.variant, this.changeStrategy, t, this.emitter, this.cdcGate);
 	}
 	nsT(e) {
-		return x(this.namespace, e);
+		return S(this.namespace, e);
 	}
 	get dialectId() {
 		return this.variant;
@@ -305,8 +298,8 @@ var E = (n) => e.layerConfig({
 		};
 	}
 	async executeQuery(e, t) {
-		let r = g(e, this.sql, this.namespace), i = t ? n.provideService(r, d, t) : r;
-		return _(await this.runtime.runPromise(i), e.table, this.variant);
+		let r = v(e, this.sql, this.namespace), i = t ? n.provideService(r, d, t) : r;
+		return y(await this.runtime.runPromise(i), e.table, this.variant);
 	}
 	get supportsInsertReturning() {
 		return this.variant === "mariadb";
@@ -320,7 +313,7 @@ var E = (n) => e.layerConfig({
 	async executeInsert(e, t, r, i) {
 		let a = this.sql;
 		if (this.supportsInsertReturning) {
-			let o = a`INSERT INTO ${a(this.nsT(e))} ${a.insert(v(t, e))} RETURNING *`, s = r ? n.provideService(o, d, r) : o, c = (await this.runtime.runPromise(s))[0];
+			let o = a`INSERT INTO ${a(this.nsT(e))} ${a.insert(b(t, e))} RETURNING *`, s = r ? n.provideService(o, d, r) : o, c = (await this.runtime.runPromise(s))[0];
 			if (!c) throw Error(`MysqlStore.insert: no row returned for table '${e}'`);
 			return this.routeEvent({
 				table: e,
@@ -329,7 +322,7 @@ var E = (n) => e.layerConfig({
 				new: c
 			}, i), c;
 		}
-		let o = v(t, e), s = t.id;
+		let o = b(t, e), s = t.id;
 		if (s === void 0) {
 			let t = await this.insertRecoverAutoId(e, o, r);
 			return this.routeEvent({
@@ -363,7 +356,7 @@ var E = (n) => e.layerConfig({
 		if (e) return this.runtime.runPromise(t(e));
 		this.inflightTxns++;
 		try {
-			let e = n.suspend(() => this.sql.withTransaction(n.flatMap(n.serviceOption(d), (e) => a.isNone(e) ? n.fail(/* @__PURE__ */ Error("MysqlStore.insert: TransactionConnection missing.")) : t(e.value)))), i = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(B)), o = e.pipe(n.retry(i), n.withSpan("store.insert", { attributes: {
+			let e = n.suspend(() => this.sql.withTransaction(n.flatMap(n.serviceOption(d), (e) => a.isNone(e) ? n.fail(/* @__PURE__ */ Error("MysqlStore.insert: TransactionConnection missing.")) : t(e.value)))), i = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(I)), o = e.pipe(n.retry(i), n.withSpan("store.insert", { attributes: {
 				"db.system": this.variant,
 				"db.operation": r
 			} }));
@@ -374,7 +367,7 @@ var E = (n) => e.layerConfig({
 	}
 	async executeInsertMany(e, t, r, i) {
 		if (t.length === 0) return [];
-		let a = this.sql, o = t.map((t) => v(t, e));
+		let a = this.sql, o = t.map((t) => b(t, e));
 		if (this.supportsInsertReturning) {
 			let t = a`INSERT INTO ${a(this.nsT(e))} ${a.insert(o)} RETURNING *`, s = r ? n.provideService(t, d, r) : t, c = await this.runtime.runPromise(s);
 			for (let t of c) this.routeEvent({
@@ -433,7 +426,7 @@ var E = (n) => e.layerConfig({
 	async executeUpdate(e, t, r, i, a) {
 		let o = this.sql;
 		if (this.supportsUpdateReturning) {
-			let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(v(r, e))} WHERE ${o("id")} = ${t} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
+			let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(b(r, e))} WHERE ${o("id")} = ${t} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
 			return l ? (this.routeEvent({
 				table: e,
 				op: "update",
@@ -441,7 +434,7 @@ var E = (n) => e.layerConfig({
 				new: l
 			}, a), l) : null;
 		}
-		let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(v(r, e))} WHERE ${o("id")} = ${t}`, c = i ? n.provideService(s, d, i) : s, l = await this.runtime.runPromise(c);
+		let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(b(r, e))} WHERE ${o("id")} = ${t}`, c = i ? n.provideService(s, d, i) : s, l = await this.runtime.runPromise(c);
 		if (l && typeof l.affectedRows == "number" && l.affectedRows === 0) return null;
 		let u = o`SELECT * FROM ${o(this.nsT(e))} WHERE ${o("id")} = ${t}`, f = i ? n.provideService(u, d, i) : u, p = (await this.runtime.runPromise(f))[0];
 		return p ? (this.routeEvent({
@@ -502,7 +495,7 @@ var E = (n) => e.layerConfig({
 		return this.executeInsert(e, t, r, i);
 	}
 	async executeMariadbUpsert(e, t, r, i, a) {
-		let o = this.sql, s = v(t, e), c = Object.keys(s).filter((e) => s[e] !== void 0), l = r.update === void 0 ? c.filter((e) => e !== "id" && !r.conflictColumns.includes(e)) : r.update, u = l.length > 0 ? o.csv(l.map((e) => o`${o(e)} = VALUES(${o(e)})`)) : o`${o(r.conflictColumns[0])} = VALUES(${o(r.conflictColumns[0])})`, f = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(s)} ON DUPLICATE KEY UPDATE ${u} RETURNING *`, p = i ? n.provideService(f, d, i) : f, m = (await this.runtime.runPromise(p))[0];
+		let o = this.sql, s = b(t, e), c = Object.keys(s).filter((e) => s[e] !== void 0), l = r.update === void 0 ? c.filter((e) => e !== "id" && !r.conflictColumns.includes(e)) : r.update, u = l.length > 0 ? o.csv(l.map((e) => o`${o(e)} = VALUES(${o(e)})`)) : o`${o(r.conflictColumns[0])} = VALUES(${o(r.conflictColumns[0])})`, f = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(s)} ON DUPLICATE KEY UPDATE ${u} RETURNING *`, p = i ? n.provideService(f, d, i) : f, m = (await this.runtime.runPromise(p))[0];
 		if (!m) throw Error(`MysqlStore.upsert: no row returned for table '${e}'`);
 		let h = t.id !== void 0 && t.id === m.id ? "insert" : "update";
 		return this.routeEvent({
@@ -514,7 +507,7 @@ var E = (n) => e.layerConfig({
 	}
 	async executeInsertIgnore(e, t, r, i, a) {
 		if (this.variant === "mariadb") {
-			let o = this.sql, s = o`INSERT IGNORE INTO ${o(this.nsT(e))} ${o.insert(v(t, e))} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
+			let o = this.sql, s = o`INSERT IGNORE INTO ${o(this.nsT(e))} ${o.insert(b(t, e))} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
 			if (l) return this.routeEvent({
 				table: e,
 				op: "insert",
@@ -536,19 +529,19 @@ var E = (n) => e.layerConfig({
 		return this.runWithEager(e, null);
 	}
 	raw(e, t) {
-		let n = h(e, this.sql);
+		let n = _(e, this.sql);
 		return this.runtime.runPromise(n);
 	}
 	async runWithEager(e, t) {
-		if (!y(e)) return this.executeQuery(e, t);
-		let r = this.variant === "mariadb" ? "mariadb" : "mysql", i = this.namespace === null ? p(e, this.sql, r) : null;
+		if (!x(e)) return this.executeQuery(e, t);
+		let r = this.variant === "mariadb" ? "mariadb" : "mysql", i = this.namespace === null ? h(e, this.sql, r) : null;
 		if (i !== null) try {
 			let e = t ? n.provideService(i.fragment, d, t) : i.fragment, r = await this.runtime.runPromise(e);
 			return i.decode(r);
 		} catch (e) {
 			this.log.warn(`${this.variant} JSON-agg eager-load failed; falling back to walker`, { err: e });
 		}
-		return f(await this.executeQuery(e, t), e.eager, e.sourceTable ?? S(e.table), (e) => this.executeQuery(e, t));
+		return m(await this.executeQuery(e, t), e.eager, e.sourceTable ?? C(e.table), (e) => this.executeQuery(e, t));
 	}
 	getInternalRunWithEager() {
 		return this.runWithEager.bind(this);
@@ -576,7 +569,7 @@ var E = (n) => e.layerConfig({
 	}
 	async updateMany(e, t, r) {
 		if (this.supportsUpdateReturning) {
-			let n = this.sql, i = m(r.where, n, this.namespace), a = n`UPDATE ${n(this.nsT(e))} SET ${n.update(v(t, e))} WHERE ${i} RETURNING *`, o = await this.runtime.runPromise(a);
+			let n = this.sql, i = g(r.where, n, this.namespace), a = n`UPDATE ${n(this.nsT(e))} SET ${n.update(b(t, e))} WHERE ${i} RETURNING *`, o = await this.runtime.runPromise(a);
 			for (let t of o) this.routeEvent({
 				table: e,
 				op: "update",
@@ -585,23 +578,23 @@ var E = (n) => e.layerConfig({
 			}, null);
 			return o.length;
 		}
-		let i = this.sql, o = m(r.where, i, this.namespace);
+		let i = this.sql, o = g(r.where, i, this.namespace);
 		this.inflightTxns++;
 		try {
 			let r = n.suspend(() => this.sql.withTransaction(n.flatMap(n.serviceOption(d), (r) => {
 				if (a.isNone(r)) return n.fail(/* @__PURE__ */ Error("MysqlStore.updateMany: TransactionConnection missing."));
-				let s = r.value, c = i`SELECT id FROM ${i(this.nsT(e))} WHERE ${o} FOR UPDATE`, l = i`UPDATE ${i(this.nsT(e))} SET ${i.update(v(t, e))} WHERE ${o}`;
+				let s = r.value, c = i`SELECT id FROM ${i(this.nsT(e))} WHERE ${o} FOR UPDATE`, l = i`UPDATE ${i(this.nsT(e))} SET ${i.update(b(t, e))} WHERE ${o}`;
 				return n.flatMap(n.provideService(c, d, s), (t) => {
 					if (t.length === 0) return n.succeed([]);
 					let r = t.map((e) => e.id), a = i`SELECT * FROM ${i(this.nsT(e))} WHERE ${i("id")} IN ${i.in(r)}`;
 					return n.flatMap(n.provideService(l, d, s), () => n.provideService(a, d, s));
 				});
-			}))), c = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(B)), l = r.pipe(n.retry(c), n.withSpan("store.updateMany", { attributes: {
+			}))), c = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(I)), l = r.pipe(n.retry(c), n.withSpan("store.updateMany", { attributes: {
 				"db.system": this.variant,
 				"db.operation": "update"
 			} })), u = await this.runtime.runPromise(l);
 			if (u.length === 0) return 0;
-			let f = _(u, e, this.variant);
+			let f = y(u, e, this.variant);
 			for (let t of f) this.routeEvent({
 				table: e,
 				op: "update",
@@ -614,9 +607,9 @@ var E = (n) => e.layerConfig({
 		}
 	}
 	async deleteMany(e, t) {
-		let r = this.sql, i = m(t.where, r, this.namespace);
+		let r = this.sql, i = g(t.where, r, this.namespace);
 		if (this.supportsDeleteReturning) {
-			let t = r`DELETE FROM ${r(this.nsT(e))} WHERE ${i} RETURNING *`, n = _(await this.runtime.runPromise(t), e, this.variant);
+			let t = r`DELETE FROM ${r(this.nsT(e))} WHERE ${i} RETURNING *`, n = y(await this.runtime.runPromise(t), e, this.variant);
 			for (let t of n) this.routeEvent({
 				table: e,
 				op: "delete",
@@ -631,12 +624,12 @@ var E = (n) => e.layerConfig({
 				if (a.isNone(t)) return n.fail(/* @__PURE__ */ Error("MysqlStore.deleteMany: TransactionConnection missing."));
 				let o = t.value, s = r`SELECT * FROM ${r(this.nsT(e))} WHERE ${i} FOR UPDATE`, c = r`DELETE FROM ${r(this.nsT(e))} WHERE ${i}`;
 				return n.flatMap(n.provideService(s, d, o), (e) => e.length === 0 ? n.succeed(e) : n.as(n.provideService(c, d, o), e));
-			}))), o = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(B)), c = t.pipe(n.retry(o), n.withSpan("store.deleteMany", { attributes: {
+			}))), o = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(I)), c = t.pipe(n.retry(o), n.withSpan("store.deleteMany", { attributes: {
 				"db.system": this.variant,
 				"db.operation": "delete"
 			} })), l = await this.runtime.runPromise(c);
 			if (l.length === 0) return 0;
-			let u = _(l, e, this.variant);
+			let u = y(l, e, this.variant);
 			for (let t of u) this.routeEvent({
 				table: e,
 				op: "delete",
@@ -655,7 +648,7 @@ var E = (n) => e.layerConfig({
 		if (this.cdcHandle) return;
 		await this.assertBinlogConfig(), this.cdcReplicaId = e.replicaId;
 		let t = await this.readCdcOffset(e.replicaId) ?? await this.resolveBinlogEnd();
-		this.cdcHandle = await F({
+		this.cdcHandle = await N({
 			connection: e.connection,
 			serverId: e.serverId,
 			variant: this.variant,
@@ -706,7 +699,7 @@ var E = (n) => e.layerConfig({
 		try {
 			let t = this.sql, n = (await this.runtime.runPromise(t`
           SELECT ${t("binlogFile")}, ${t("binlogPosition")}
-          FROM ${t(I)}
+          FROM ${t(f)}
           WHERE ${t("id")} = ${e} LIMIT 1`))[0];
 			if (!n) return null;
 			let r = Number(n.binlogPosition);
@@ -728,7 +721,7 @@ var E = (n) => e.layerConfig({
 			this.cdcPendingPosition = null;
 			try {
 				let t = this.sql, n = this.cdcReplicaId;
-				await this.runtime.runPromise(t`INSERT INTO ${t(I)} ${t.insert({
+				await this.runtime.runPromise(t`INSERT INTO ${t(f)} ${t.insert({
 					id: n,
 					replicaId: n,
 					streamName: this.cdcStreamName,
@@ -775,7 +768,7 @@ var E = (n) => e.layerConfig({
 			let r = ++t;
 			return this.sql.withTransaction(n.flatMap(n.serviceOption(d), (t) => {
 				if (a.isNone(t)) return n.fail(/* @__PURE__ */ Error("MysqlStore.transactional: TransactionConnection missing."));
-				let i = new J(this, t.value);
+				let i = new W(this, t.value);
 				return n.tryPromise({
 					try: () => e(i).then((e) => ({
 						result: e,
@@ -785,7 +778,7 @@ var E = (n) => e.layerConfig({
 					catch: (e) => e
 				});
 			}));
-		}), i = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(B)), o = r.pipe(n.retry(i), n.withSpan("store.transactional", { attributes: {
+		}), i = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(I)), o = r.pipe(n.retry(i), n.withSpan("store.transactional", { attributes: {
 			"db.system": this.variant,
 			"db.operation": "transaction"
 		} }));
@@ -831,7 +824,7 @@ var E = (n) => e.layerConfig({
 	async ping() {
 		await this.runtime.runPromise(this.sql`SELECT 1`);
 	}
-}, J = class {
+}, W = class {
 	parent;
 	txn;
 	events = [];
@@ -903,9 +896,9 @@ var E = (n) => e.layerConfig({
 			this.events.length = 0;
 		}
 	}
-}, Y = (e) => e.__mysqlReplicationFriend ?? null, X = () => ({
+}, G = (e) => e.__mysqlReplicationFriend ?? null, K = () => ({
 	async capturePrimaryPosition(e) {
-		let t = Y(e);
+		let t = G(e);
 		if (t === null) throw Error("mysqlReplicationAdapter: primary is not a MysqlStore (missing __mysqlReplicationFriend).");
 		return t.runEffect(n.gen(function* () {
 			let e = yield* u, r = (t.variant === "mariadb" ? yield* e`SELECT @@global.gtid_current_pos AS gtid` : yield* e`SELECT @@global.gtid_executed AS gtid`)[0]?.gtid;
@@ -913,7 +906,7 @@ var E = (n) => e.layerConfig({
 		}));
 	},
 	async probeReplicaPosition(e) {
-		let t = Y(e);
+		let t = G(e);
 		if (t === null) throw Error("mysqlReplicationAdapter: replica is not a MysqlStore.");
 		return t.runEffect(n.gen(function* () {
 			let e = yield* u, r = (t.variant === "mariadb" ? yield* e`SELECT @@global.gtid_current_pos AS gtid` : yield* e`SELECT @@global.gtid_executed AS gtid`)[0]?.gtid;
@@ -923,24 +916,24 @@ var E = (n) => e.layerConfig({
 	compare(e, t) {
 		return "behind";
 	}
-}), Z = {
+}), q = {
 	id: "mysql",
-	makeSqlLayer: (e) => O(e),
-	makeStore: (e) => K({
+	makeSqlLayer: (e) => E(e),
+	makeStore: (e) => H({
 		...e,
 		variant: "mysql"
 	}),
 	compileContains: (e, t, n) => n`${e} LIKE ${`%${t.replace(/[\\%_]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
-	retryFilter: V
-}, Q = {
+	retryFilter: L
+}, J = {
 	id: "mariadb",
-	makeSqlLayer: (e) => O(e),
-	makeStore: (e) => K({
+	makeSqlLayer: (e) => E(e),
+	makeStore: (e) => H({
 		...e,
 		variant: "mariadb"
 	}),
 	compileContains: (e, t, n) => n`${e} LIKE ${`%${t.replace(/[\\%_]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
-	retryFilter: V
+	retryFilter: L
 };
 //#endregion
-export { I as CDC_OFFSETS_TABLE, e as MysqlClient, L as _voltroCdcOffsetsTable, D as connectionFromConfig, E as makeMysqlSqlLayer, O as makeMysqlSqlLayerFromConfig, K as makeMysqlStore, Q as mariadbDialect, Z as mysqlDialect, X as mysqlReplicationAdapter, V as mysqlRetryFilter, F as startBinlogCdc };
+export { f as CDC_OFFSETS_TABLE, e as MysqlClient, p as _voltroCdcOffsetsTable, T as connectionFromConfig, w as makeMysqlSqlLayer, E as makeMysqlSqlLayerFromConfig, H as makeMysqlStore, J as mariadbDialect, q as mysqlDialect, K as mysqlReplicationAdapter, L as mysqlRetryFilter, N as startBinlogCdc };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/sql-mysql",
-  "version": "0.1.6",
+  "version": "0.2.1",
   "description": "MySQL/MariaDB dialect adapter for Voltro's cross-dialect DataStore (mariadb binlog CDC; mysql inline reactivity).",
   "keywords": [
     "voltro",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@effect/sql": "^0.51.1",
     "@effect/sql-mysql2": "^0.52.0",
-    "@voltro/database": "0.1.6",
-    "@voltro/logger": "0.1.6"
+    "@voltro/database": "0.2.1",
+    "@voltro/logger": "0.2.1"
   },
   "optionalDependencies": {
     "@vlasky/zongji": "^0.9.0"