@voltro/cli 0.34.0 → 0.36.0

package/dist/{dataCommand-qL0r7fPO.js → dataCommand-DnCm0B2C.js}

@@ -1,10 +1,10 @@
 import { t as e } from "./cliError-BmdYnghb.js";
-import { c as t, i as n, o as r } from "./dev-CerMd0mW.js";
+import { c as t, i as n, o as r } from "./dev-Dc4cpmRl.js";
 import { n as i, t as a } from "./cliArgs-D4p8n7EE.js";
 import { r as o } from "./dialectDriver-CgXnDfec.js";
 import { t as s } from "./dataProfile-dW-PsfLB.js";
-import { o as c, t as l } from "./inspectFetch-Cm8_wVvp.js";
-import { r as u } from "./dbCommand-B6X0FZbq.js";
+import { o as c, t as l } from "./inspectFetch-EMuhTG_9.js";
+import { r as u } from "./dbCommand-O8HA63s2.js";
 import { createLogger as d } from "@voltro/logger";
 import { Effect as f, Stream as p } from "effect";
 import { SqlClient as m } from "@effect/sql";
@@ -331,32 +331,32 @@ var P = "voltro-backup-stamp.json", le = (e) => ({
 		...x.masking ? { maskedColumns: x.masking.transformed.length } : {}
 	}), 0;
 }, Ce = async (e) => {
-	let t = H(e, "--target") === "api", n = H(e, "--bundle-key"), r = U(e);
-	if (!r && !(t && n)) return L.error("usage: voltro data import <bundleDir> [--target direct|api] [--api-url <url>] [--token <secret>] [--bundle-key <storage-key>] [--mode upsert|append|replace] [--on-conflict skip|fail] [--atomic] [--assets] [--no-verify] [--force] [--allow-live]  (--force: import despite schema drift AND cross-dialect warnings)"), 1;
-	let i = H(e, "--mode") ?? "upsert", a = H(e, "--on-conflict") ?? "skip";
+	let t = H(e, "--target") === "api", n = H(e, "--bundle-key"), i = U(e);
+	if (!i && !(t && n)) return L.error("usage: voltro data import <bundleDir> [--target direct|api] [--api-url <url>] [--token <secret>] [--bundle-key <storage-key>] [--mode upsert|append|replace] [--on-conflict skip|fail] [--atomic] [--assets] [--no-verify] [--force] [--allow-live]  (--force: import despite schema drift AND cross-dialect warnings)"), 1;
+	let a = H(e, "--mode") ?? "upsert", o = H(e, "--on-conflict") ?? "skip";
 	if (t) {
 		let t = H(e, "--api-url");
 		if (!t) return L.error("--target api requires --api-url <url> (the running instance)"), 1;
-		let o = H(e, "--token") ?? process.env.VOLTRO_DATA_TRANSFER_SECRET;
-		if (!o) return L.error("--target api requires --token <secret> (or VOLTRO_DATA_TRANSFER_SECRET) matching the instance secret"), 1;
+		let r = H(e, "--token") ?? process.env.VOLTRO_DATA_TRANSFER_SECRET;
+		if (!r) return L.error("--target api requires --token <secret> (or VOLTRO_DATA_TRANSFER_SECRET) matching the instance secret"), 1;
 		let s = {
-			authorization: `Bearer ${o}`,
-			"x-import-mode": i,
-			"x-import-on-conflict": a,
+			authorization: `Bearer ${r}`,
+			"x-import-mode": a,
+			"x-import-on-conflict": o,
 			...e.includes("--atomic") ? { "x-import-atomic": "1" } : {},
 			...e.includes("--force") ? { "x-import-force": "1" } : {}
 		}, { resolve: c } = await import("node:path"), l;
 		if (n) s["content-type"] = "application/json", l = JSON.stringify({ bundleKey: n });
-		else if (Y(r)) {
-			let t = Z(c(process.cwd(), r)), n = X(e);
+		else if (Y(i)) {
+			let t = Z(c(process.cwd(), i)), n = X(e);
 			n && (t = T(t, n));
-			let i = [];
-			for await (let e of t) i.push(Buffer.from(e));
-			s["content-type"] = "application/octet-stream", l = Buffer.concat(i);
+			let r = [];
+			for await (let e of t) r.push(Buffer.from(e));
+			s["content-type"] = "application/octet-stream", l = Buffer.concat(r);
 		} else {
-			await (await import("node:fs/promises")).access(c(process.cwd(), r, "assets", "index.ndjson")).then(() => !0, () => !1) && L.warn("this directory bundle has assets; --target api uploads DATA ONLY. Pack a single-file `.vbundle` (voltro data export <name>.vbundle --assets) to transfer assets over the API.");
+			await (await import("node:fs/promises")).access(c(process.cwd(), i, "assets", "index.ndjson")).then(() => !0, () => !1) && L.warn("this directory bundle has assets; --target api uploads DATA ONLY. Pack a single-file `.vbundle` (voltro data export <name>.vbundle --assets) to transfer assets over the API.");
 			let e = [];
-			for await (let t of E({ dir: c(process.cwd(), r) })) e.push(Buffer.from(t));
+			for await (let t of E({ dir: c(process.cwd(), i) })) e.push(Buffer.from(t));
 			s["content-type"] = "application/octet-stream", l = Buffer.concat(e);
 		}
 		let u = await fetch(`${t.replace(/\/+$/, "")}/_voltro/admin/import`, {
@@ -369,64 +369,66 @@ var P = "voltro-backup-stamp.json", le = (e) => ({
 			...await u.json()
 		}), 0) : (L.error(`api import failed: HTTP ${u.status} — ${await u.text()}`), 1);
 	}
-	if (!r) return L.error("a <bundleDir> is required for a direct import"), 1;
+	if (!i) return L.error("a <bundleDir> is required for a direct import"), 1;
 	if (!await V(e)) return 1;
-	let { store: o, snapshot: s } = await q(), c = e.includes("--force"), l = (e) => L.warn(e), u = e.includes("--assets") ? C({}) : void 0;
-	if (Y(r)) {
-		let t = await import("node:os"), n = await import("node:fs/promises"), { resolve: d, join: p } = await import("node:path"), m = await n.mkdtemp(p(t.tmpdir(), "voltro-import-"));
+	let { store: s, snapshot: c } = await q(), l = e.includes("--force"), u = (e) => L.warn(e), d = e.includes("--assets") ? C({}) : void 0, p = W() === "postgres" ? (await import("@voltro/sql-postgres")).makePgCopySession(r()) : void 0;
+	if (Y(i)) {
+		let t = await import("node:os"), n = await import("node:fs/promises"), { resolve: r, join: m } = await import("node:path"), h = await n.mkdtemp(m(t.tmpdir(), "voltro-import-"));
 		try {
-			let t = Z(d(process.cwd(), r)), n = X(e);
+			let t = Z(r(process.cwd(), i)), n = X(e);
 			n && (t = T(t, n)), await ce(t, {
-				dir: m,
-				blobs: oe(u ?? C({}))
+				dir: h,
+				blobs: oe(d ?? C({}))
 			});
-			let p = await f.runPromise(A({
-				store: o,
-				bundleDir: m,
-				mode: i,
-				onConflict: a,
+			let m = await f.runPromise(A({
+				store: s,
+				bundleDir: h,
+				mode: a,
+				onConflict: o,
 				atomic: e.includes("--atomic"),
 				verify: !e.includes("--no-verify"),
 				targetDialect: W(),
-				allowIncompatible: c,
-				targetSnapshot: s,
-				force: c,
-				onWarn: l,
+				allowIncompatible: l,
+				targetSnapshot: c,
+				force: l,
+				onWarn: u,
 				onProgress: z,
-				assetsAlreadyRestored: !0
+				assetsAlreadyRestored: !0,
+				...p ? { copyLoader: p } : {}
 			}));
 			return L.info("import complete (single file)", {
-				file: r,
-				tables: p.tables.length,
-				rows: p.tables.reduce((e, t) => e + t.rowCount, 0)
+				file: i,
+				tables: m.tables.length,
+				rows: m.tables.reduce((e, t) => e + t.rowCount, 0)
 			}), 0;
 		} finally {
-			await n.rm(m, {
+			await p?.close(), await n.rm(h, {
 				recursive: !0,
 				force: !0
 			});
 		}
 	}
-	let d = await f.runPromise(A({
-		store: o,
-		bundleDir: r,
-		mode: i,
-		onConflict: a,
+	let m = await f.runPromise(A({
+		store: s,
+		bundleDir: i,
+		mode: a,
+		onConflict: o,
 		atomic: e.includes("--atomic"),
 		verify: !e.includes("--no-verify"),
 		targetDialect: W(),
-		allowIncompatible: c,
-		targetSnapshot: s,
-		force: c,
-		onWarn: l,
+		allowIncompatible: l,
+		targetSnapshot: c,
+		force: l,
+		onWarn: u,
 		onProgress: z,
-		...u ? { assets: M(u) } : {}
-	}));
+		...d ? { assets: M(d) } : {},
+		...p ? { copyLoader: p } : {}
+	})).finally(() => p?.close());
 	return L.info("import complete", {
-		bundleDir: r,
-		tables: d.tables.length,
-		rows: d.tables.reduce((e, t) => e + t.rowCount, 0),
-		assets: d.assets.count
+		bundleDir: i,
+		tables: m.tables.length,
+		rows: m.tables.reduce((e, t) => e + t.rowCount, 0),
+		assets: m.assets.count
 	}), 0;
 }, $ = () => {
 	let e = r();

package/dist/dbCommand-DS4b97Is.js

@@ -0,0 +1,2 @@
+import { s as e } from "./dbCommand-O8HA63s2.js";
+export { e as runDbCommand };

package/dist/{dbCommand-B6X0FZbq.js → dbCommand-O8HA63s2.js}

@@ -4,8 +4,8 @@ import { n as r } from "./appModuleLoader-C9r9mxZt.js";
 import { a as i, i as a, n as o, t as s } from "./cliArgs-D4p8n7EE.js";
 import { r as c } from "./dialectDriver-CgXnDfec.js";
 import { a as l } from "./connectionConfig-UFlIEiys.js";
-import { i as u, n as d, r as f, s as p, t as m } from "./seedRunner-TFHHiToI.js";
-import { n as h, o as g, y as _ } from "./frameworkTableAssembly-DkkP6BgC.js";
+import { i as u, n as d, r as f, s as p, t as m } from "./seedRunner-ZmLSqNe2.js";
+import { n as h, s as g, y as _ } from "./frameworkTableAssembly-oMPBKqlE.js";
 import { b as v, x as y } from "./fileConventions-Cof68_BL.js";
 import { basename as b, join as x, relative as S, resolve as C } from "node:path";
 import { promises as w, writeSync as ee } from "node:fs";
@@ -339,9 +339,9 @@ var ke = (e) => typeof e != "string", Ae = (e, t, n, r) => {
 		});
 	}
 	return [...n].sort((e, t) => e.definition.id < t.definition.id ? -1 : 1);
-}, et = (e) => {
-	let t = (process.env.DB_DIALECT ?? "postgres").toLowerCase(), n = t === "memory" ? "postgres" : t;
-	return E.runPromise(O(P, n).pipe(E.provide(e)));
+}, et = async (e) => {
+	let t = (process.env.DB_DIALECT ?? "postgres").toLowerCase(), n = t === "memory" ? "postgres" : t, r = n, i = t === "memory" ? void 0 : await c(n).then((e) => e.retryFilter, () => void 0);
+	return E.runPromise(O(P, r, void 0, i === void 0 ? {} : { retryFilter: i }).pipe(E.provide(e)));
 }, tt = (e) => E.runPromise(E.gen(function* () {
 	let e = yield* (yield* D.SqlClient)`SELECT id, status, hash, "appliedAt" FROM "_voltro_migrations"`.pipe(E.orElseSucceed(() => []));
 	return new Map(e.map((e) => [e.id, e]));
@@ -1414,7 +1414,7 @@ var ke = (e) => typeof e != "string", Ae = (e, t, n, r) => {
 	}
 }, an = async (e) => {
 	let t = H(e), n = await q(), r = $();
-	await J(n, O(P, W()));
+	await J(n, O(P, W(), void 0, { retryFilter: (await c(W())).retryFilter }));
 	let i = await J(n, D.SqlClient.pipe(E.flatMap((e) => me(e, {
 		projectRoot: t,
 		env: r,

package/dist/{dev-CoG-ZPx8.js → dev-BSFTgCQ5.js}

@@ -1,3 +1,3 @@
-import { c as e, d as t, f as n, i as r, u as i } from "./dev-CerMd0mW.js";
+import { c as e, d as t, f as n, i as r, u as i } from "./dev-Dc4cpmRl.js";
 import "./dialectDriver-CgXnDfec.js";
 export { r as buildStore, e as loadApiConfig, i as loadDiscovered, t as runDev, n as walk };