@devdogsuga/devtools 0.1.51-next.547 → 0.1.51-next.549

package/dist/{cli-CJtevyVy.js → cli-Doy2BzCQ.js}

@@ -7058,7 +7058,7 @@ function commandLine(command, args) {
 function cliLine(cli, args) {
 	return commandLine(cli.command, [...cli.prefix, ...args]);
 }
-function versionOf$1(output) {
+function versionOf(output) {
 	return /\b(\d+\.\d+\.\d+)\b/.exec(output)?.[1] ?? null;
 }
 async function resolveSupabaseCli(root, pin, run, fileExists = existsSync) {
@@ -7076,7 +7076,7 @@ async function resolveSupabaseCli(root, pin, run, fileExists = existsSync) {
 	});
 	for (const candidate of candidates) try {
 		const result = await run(candidate.command, ["--version"], { cwd: root });
-		if (result.code === 0 && versionOf$1(result.stdout) === pin) return candidate;
+		if (result.code === 0 && versionOf(result.stdout) === pin) return candidate;
 	} catch {}
 	try {
 		if ((await run("pnpm", ["--version"], { cwd: root })).code === 0) return {
@@ -7236,9 +7236,18 @@ var DevDataError = class extends Error {
 		this.name = "DevDataError";
 	}
 };
-/** A Postgres SQLSTATE: five characters, digits and capitals. Connection errors (`ECONNREFUSED`) are not. */
-function isSqlState(code) {
-	return typeof code === "string" && /^[0-9A-Z]{5}$/.test(code);
+/**
+* Whether `err` is the product's own SQL being wrong: a Postgres error whose
+* SQLSTATE class is a cardinality violation (21), data exception (22),
+* integrity constraint violation (23) or syntax error or access rule
+* violation (42). Everything else is not the file's fault and reports as a
+* normal failure: a refused or dropped connection (class 08 and
+* `ECONNREFUSED`), an operator shutdown (57, `admin_shutdown`), a server out
+* of resources (53), a transaction that was rolled back (40), and so on.
+*/
+function isSqlFileError(err) {
+	const code = err?.code;
+	return typeof code === "string" && /^(21|22|23|42)[0-9A-Z]{3}$/.test(code);
 }
 /**
 * The line of `text` a Postgres error points at, from the error's 1-based
@@ -7294,6 +7303,11 @@ function postgresSession(dbUrl) {
 			const present = new Set(rows.map((r) => r.nspname));
 			return schemas.filter((name) => !present.has(name));
 		},
+		async exec(text) {
+			await sql.begin(async (tx) => {
+				await tx.unsafe(text);
+			});
+		},
 		async runAs(memberId, text) {
 			await sql.begin(async (tx) => {
 				await tx`select set_config('devtools.member_id', ${memberId}, true)`;
@@ -7335,7 +7349,7 @@ async function seed(session, file, text, options, log) {
 	try {
 		await session.runAs(member.id, text);
 	} catch (err) {
-		if (!isSqlState(err?.code)) throw err;
+		if (!isSqlFileError(err)) throw err;
 		const line = errorLine(err, text);
 		throw new DevDataError(`${file}${line === null ? "" : `:${line}`}: ${err.message}. This is a problem in the product's dev-data SQL, not in devtools; nothing was seeded (the file runs in one transaction).`);
 	}
@@ -7646,7 +7660,6 @@ async function dbSync(product, cli, target, run, options) {
 		const restored = migrationFiles(migrationsDir).length;
 		if (fetched.code === 0 && restored > 0) log(`Restored ${restored} applied migration${restored === 1 ? "" : "s"} from the project's history.`);
 	}
-	await reconcileRecord(product, cli, target, run, options, log);
 	const before = new Set(migrationFiles(migrationsDir));
 	let generated = await run(cli.command, generateArgs, { cwd: product.root });
 	if (generated.code !== 0 && isContainerFailure(generated)) {
@@ -7697,70 +7710,6 @@ async function dbSync(product, cli, target, run, options) {
 		destructive
 	};
 }
-/** `20261011120000` from `20261011120000_devtools_sync.sql`. */
-function versionOf(file) {
-	return file.split("_")[0] ?? file;
-}
-/**
-* Makes the local record agree with the database. The declarative diff only
-* compares `supabase/schemas` with `supabase/migrations`, so a database that
-* lost its contents behind the record's back (a hosted project reset from the
-* dashboard, a checkout switched from the local stack to a hosted project)
-* would read as "already matches". This asks the target:
-*
-*   - a migration in the record that is not in the database's ledger was never
-*     applied there: it is dropped from the record, so the diff re-creates it;
-*   - a configured schema that does not exist means the ledger is stale too:
-*     its entries are reverted and the whole record dropped, so the diff
-*     writes the full schema again.
-*
-* Nothing is reset or dropped in the database; only ledger rows of schemas
-* that are already gone are removed. A database that cannot be reached is
-* left to the apply step to report.
-*/
-async function reconcileRecord(product, cli, target, run, options, log) {
-	if (!options.open) return;
-	const { migrationsDir } = product.paths;
-	const files = migrationFiles(migrationsDir);
-	let ledger;
-	let missing;
-	let session;
-	try {
-		session = options.open(target.dbUrl);
-		ledger = await session.appliedMigrations();
-		missing = await session.missingSchemas(product.config.supabase.schemas);
-	} catch (err) {
-		log(`Could not check what the database has applied (${err.message}); trusting the local record.`);
-		return;
-	} finally {
-		await session?.close().catch(() => void 0);
-	}
-	if (missing.length > 0) {
-		const stale = ledger ?? [];
-		log(`The database is missing ${missing.length === 1 ? "schema" : "schemas"} ${missing.join(", ")}, so the record of applied migrations is out of date; rebuilding it from supabase/schemas.`);
-		if (stale.length > 0) {
-			const reverted = await run(cli.command, [
-				...cli.prefix,
-				"migration",
-				"repair",
-				"--status",
-				"reverted",
-				"--db-url",
-				target.dbUrl,
-				...stale
-			], { cwd: product.root });
-			if (reverted.code !== 0) throw new SyncError("The database lost its schema but its migration history still lists migrations as applied, and clearing that history failed.", reverted.stderr || reverted.stdout);
-		}
-		for (const file of files) rmSync(join(migrationsDir, file));
-		return;
-	}
-	const applied = new Set(ledger ?? []);
-	const unapplied = files.filter((file) => !applied.has(versionOf(file)));
-	if (unapplied.length > 0) {
-		log(`${unapplied.length} migration${unapplied.length === 1 ? "" : "s"} in the local record ${unapplied.length === 1 ? "is" : "are"} not in this database's history (it was reset, or this checkout switched databases); re-applying ${unapplied.length === 1 ? "it" : "them"}.`);
-		for (const file of unapplied) rmSync(join(migrationsDir, file));
-	}
-}
 function isContainerFailure(result) {
 	return /docker|container|image/i.test(result.stderr + result.stdout);
 }
@@ -8023,8 +7972,7 @@ async function runSync(product, deps, rest) {
 		yes: hasYes(rest),
 		confirmDestructive: deps.interactive() ? confirmDestructive : void 0,
 		dryRun,
-		log: (line) => log.info(line),
-		open: deps.openSql
+		log: (line) => log.info(line)
 	});
 	if (rest.includes("--rebuild") && !dryRun) try {
 		const row = await reRegisterSavedProvider(product.paths.toolingFile, target);
@@ -8325,8 +8273,7 @@ async function runSetup(product, deps, rest) {
 	const result = await dbSync(product, cli, target, deps.run, {
 		yes: hasYes(rest),
 		confirmDestructive: deps.interactive() ? confirmDestructive : void 0,
-		log: (line) => log.info(line),
-		open: deps.openSql
+		log: (line) => log.info(line)
 	});
 	log.success(result.migration ? "Applied supabase/schemas to your database." : "Your database already matched supabase/schemas.");
 	if (target.kind === "local") await waitForRest(target, deps, product);

package/dist/launch.js

@@ -183,7 +183,7 @@ async function startStack() {
 * post-tier-resolution path.
 */
 async function dispatch(argv) {
-	const { main } = await import("./cli-CJtevyVy.js");
+	const { main } = await import("./cli-Doy2BzCQ.js");
 	try {
 		await main(argv);
 	} catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devdogsuga/devtools",
-  "version": "0.1.51-next.547",
+  "version": "0.1.51-next.549",
   "private": false,
   "type": "module",
   "description": "Contributor CLI for DevDogs repositories (the platform monorepo, DogDays, DogPack): the real tools with the session's tier filled in, `setup`, `db sync`, `db types`, `dev-data`, a menu over them, the checks CI runs, and the `with-env` launcher. Ships built JS; run via `pnpm devtools` in a product repo, `pnpm dlx @devdogsuga/devtools` (or the `devtools` bin once installed) from inside a clone.",
@@ -47,8 +47,8 @@
     "tsdown": "^0.23.0",
     "vitest": "^4.1.11",
     "@devdogsuga/cli-core": "0.0.0",
-    "@devdogsuga/sdk": "0.1.0",
-    "@devdogsuga/config": "0.1.4-next.526"
+    "@devdogsuga/config": "0.1.4-next.526",
+    "@devdogsuga/sdk": "0.1.0"
   },
   "scripts": {
     "build": "tsdown && node scripts/write-build-info.mjs && node ../../scripts/check-bundle-imports.mjs",