@geekmidas/cli 10.0.0-alpha.42 → 10.0.0-alpha.44

package/dist/{workspace-CPVcs6r_.cjs → workspace-dV6f-3vv.cjs}

@@ -4,7 +4,7 @@ const require_config = require("./config-CJ-PAb7M.cjs");
 const require_workspace = require("./workspace-RYSYtHP7.cjs");
 const require_storage = require("./storage-CSGoC3bK.cjs");
 const require_store = require("./store-DQgxT_WR.cjs");
-const require_ready = require("./ready-DXqKVRYN.cjs");
+const require_ready = require("./ready-3RfHxdA0.cjs");
 let node_fs = require("node:fs");
 let node_fs_promises = require("node:fs/promises");
 let node_os = require("node:os");
@@ -2155,6 +2155,27 @@ async function allocate(project, containers, existing = {}, probe = isPortFree)
 	}
 	return assignments;
 }
+/**
+* The ports to keep: what running containers are observed on, then what was
+* saved — minus any saved entry whose port something else already holds.
+*
+* Spreading one over the other let an observed port override its own key and
+* leave a *different* key still saved on the same number: two services on one
+* port, and whichever answered first won. Saved keys for containers the plan no
+* longer has — a backend switched and back — were the usual source. Observed
+* wins because it is what is actually bound; a dropped entry is simply
+* allocated again.
+*/
+function keptPorts(saved = {}, observed = {}) {
+	const kept = { ...observed };
+	const taken = new Set(Object.values(observed));
+	for (const [key, port] of Object.entries(saved).sort(([a], [b]) => a < b ? -1 : 1)) {
+		if (key in kept || taken.has(port)) continue;
+		kept[key] = port;
+		taken.add(port);
+	}
+	return kept;
+}
 /** The window was exhausted. */
 var NoPortAvailable = class extends Error {
 	/** Where the search started. */
@@ -2471,6 +2492,25 @@ async function applyCarriers(client, carriers) {
 	}
 	return applied;
 }
+/** The Postgres databases the plan creates — each is a `CREATE DATABASE`. */
+function postgresDatabaseNames(plan) {
+	return plan.resources.filter((resource) => resource.kind === "database" && resource.provisions && resource.container === "postgres").map((resource) => resource.name);
+}
+/**
+* Whether every one of these databases exists. A database dropped behind the
+* recorded state's back — by another checkout's test teardown, against the
+* same container — makes the state a lie, and only asking Postgres finds out.
+* Unreachable counts as missing: applying again is what finds out why.
+*/
+async function databasesExist(client, names) {
+	if (names.length === 0) return true;
+	try {
+		const rows = await client.query(void 0, "SELECT datname FROM pg_catalog.pg_database WHERE datname = ANY($1)", [names]);
+		return new Set(rows.map((row) => row.datname)).size === names.length;
+	} catch {
+		return false;
+	}
+}
 /**
 * Apply each served bucket's open-path policy, skipping those already correct.
 *
@@ -2667,10 +2707,7 @@ async function reconcile(options) {
 	});
 	const composePath = (0, node_path.join)(root, COMPOSE_PATH);
 	const observed = await observedPorts(docker, composePath, plan.containers, plan.fakes);
-	const ports = await allocate(project, portKeys(plan.containers, plan.fakes), {
-		...options.saved,
-		...observed
-	}, probe);
+	const ports = await allocate(project, portKeys(plan.containers, plan.fakes), keptPorts(options.saved, observed), probe);
 	const compose = composeFor(plan, {
 		project,
 		ports,
@@ -2704,7 +2741,9 @@ async function reconcile(options) {
 		hash,
 		changed: false
 	};
-	if ((await loadState(root, stage))?.hash === hash && (0, node_fs.existsSync)(composePath) && (!start || await docker.healthy(composePath, plan.containers))) return result;
+	const recorded = await loadState(root, stage);
+	const postgresPort = ports[primaryPortKey("postgres")];
+	if (recorded?.hash === hash && (0, node_fs.existsSync)(composePath) && (!start || await docker.healthy(composePath, plan.containers)) && (!start || !provision || postgresPort === void 0 || await databasesExist(sql(postgresPort), postgresDatabaseNames(plan)))) return result;
 	await write(composePath, toYaml(compose));
 	if (plan.containers.includes("caddy")) {
 		await write((0, node_path.join)(root, CADDYFILE_PATH), caddyfileRoot());
@@ -3061,6 +3100,12 @@ Object.defineProperty(exports, "pgClient", {
 		return pgClient;
 	}
 });
+Object.defineProperty(exports, "postgresDatabaseNames", {
+	enumerable: true,
+	get: function() {
+		return postgresDatabaseNames;
+	}
+});
 Object.defineProperty(exports, "prepareEntryCredentials", {
 	enumerable: true,
 	get: function() {
@@ -3116,4 +3161,4 @@ Object.defineProperty(exports, "workspace_exports", {
 	}
 });
 
-//# sourceMappingURL=workspace-CPVcs6r_.cjs.map
+//# sourceMappingURL=workspace-dV6f-3vv.cjs.map