@prisma/composer 0.25.0-dev.2 → 0.25.0-dev.4

package/dist/{execute-dev-BLCK5wF7-CJvkj5wl.mjs → execute-dev-DAIUT0es-B3iBKmAS.mjs}

@@ -1,10 +1,10 @@
 import { t as CliStructuredError } from "./errors-0e8IVwzi.mjs";
 import { t as containerEnv } from "./container-transport-HcvNOGZL-twPi2TIv.mjs";
-import { t as DEV_DIR } from "./app-config-joXc-BKm-CdcXqNMD.mjs";
-import { n as ok, s as toStructured, t as notOk } from "./result-CQIOBgdW.mjs";
-import { n as resolveLocalTargets } from "./local-target-DnA2E8IN.mjs";
+import { t as DEV_DIR } from "./app-config-CGJHcFb--CIEFCG4V.mjs";
+import { n as ok, o as toStructured, t as notOk } from "./result-B1SzJJoE.mjs";
+import { n as resolveLocalTargets } from "./local-target-B4xoiDAV.mjs";
 import { n as spawnAlchemy, t as alchemyInvocation } from "./run-alchemy-pANK8XNX-CgCpXLkG.mjs";
-import { n as runPipeline } from "./pipeline-C7gNjMzJ-CzM8DNS_.mjs";
+import { n as runPipeline, r as noComposerExportMessage } from "./pipeline-DAYhea3J-B6PQu2QB.mjs";
 import { t as withEmulatorRetry } from "./emulator-retry-DGonap4g-S8BNrXFD.mjs";
 import * as fs$1 from "node:fs";
 import * as path$1 from "node:path";
@@ -15,7 +15,89 @@ import { Readable } from "node:stream";
 import { lstat, readdir, realpath, stat as stat$1 } from "node:fs/promises";
 import { type } from "os";
 import { EventEmitter } from "events";
+import { createHash } from "node:crypto";
 import { lstat as lstat$1, open, readdir as readdir$1, realpath as realpath$1, stat as stat$2 } from "fs/promises";
+//#region ../../0-framework/3-tooling/cli/dist/generate-dev-stack-CPpjJdTG.mjs
+/**
+* Local-dev spec § 6 `generate-dev-stack.ts`: like generate-stack.ts but at
+* `.prisma-composer/dev/alchemy.run.ts`, always Alchemy stage `dev`, using
+* Alchemy's own `localState()` and no `report` — dev prints its own front
+* door (run-dev.ts), so core's presentation-free lower() gets nothing to
+* call back into. The generated module IS the one orchestration point where
+* dev provenance is resolved (spec § 3 REVISED): it deserializes the
+* containers, top-level-awaits `resolveLocalTargets(config)` (the lazy
+* `localTarget` thunks, ADR-0041), and passes
+* `providers: localTargetProviders(...)` + `state: localState()` explicitly
+* — `lower()` learns nothing about dev.
+*/
+const DEV_GENERATED_DIR = ".prisma-composer/dev";
+const DEV_GENERATED_FILE = "alchemy.run.ts";
+/** A relative import specifier from `.prisma-composer/dev/alchemy.run.ts` to `target` (posix separators). */
+function relativeImportSpecifier(generatedDir, target) {
+	const rel = path$1.relative(generatedDir, target).split(path$1.sep).join("/");
+	return rel.startsWith(".") ? rel : `./${rel}`;
+}
+function quote(value) {
+	return JSON.stringify(value);
+}
+function renderBundle(bundle) {
+	return `{ dir: ${quote(bundle.dir)}, entry: ${quote(bundle.entry)} }`;
+}
+function renderOptions(input) {
+	const lines = [];
+	lines.push(`  name: ${quote(input.name)},`);
+	lines.push("  bundles: {");
+	for (const [id, bundle] of Object.entries(input.assembled.bundles)) lines.push(`    ${quote(id)}: ${renderBundle(bundle)},`);
+	lines.push("  },");
+	lines.push("  providers: localTargetProviders(resolved, containers, devDir),");
+	lines.push("  state: localState(),");
+	return lines.join("\n");
+}
+/** Renders the dev stack module's source (tests assert on it without touching disk). */
+function renderDevStackFile(input) {
+	const generatedDir = path$1.join(input.cwd, DEV_GENERATED_DIR);
+	const appImport = relativeImportSpecifier(generatedDir, input.entryPath);
+	const imports = [
+		"import * as path from 'node:path';",
+		"import { deserializeContainers } from '@prisma/composer/config';",
+		"import { lower } from '@prisma/composer/deploy';",
+		"import { DEV_DIR, localTargetProviders, resolveLocalTargets } from '@prisma/composer/local-target';",
+		"import { localState } from 'alchemy/State/LocalState';",
+		`import prismaConfig from ${quote(relativeImportSpecifier(generatedDir, input.configFile))};`,
+		`import app from ${quote(appImport)};`
+	].join("\n");
+	return `// Generated by \`prisma-composer dev\` — overwritten on every run; do not
+// edit by hand. Independently runnable from ${quote(input.cwd)}:
+//
+//   alchemy deploy ${DEV_GENERATED_DIR}/${DEV_GENERATED_FILE} --stage dev
+//
+// bisects a CLI bug from an Alchemy bug (deploy-cli.md § Implementation decisions).
+${imports}
+
+const config = prismaConfig.composer;
+if (config === undefined) {
+  throw new Error(${quote(noComposerExportMessage(input.configFile))});
+}
+
+const containers = deserializeContainers(config.extensions, process.env);
+const resolved = await resolveLocalTargets(config);
+const devDir = path.join(process.cwd(), DEV_DIR);
+
+export default lower(app, config, {
+${renderOptions(input)}
+});
+`;
+}
+/** Writes the dev stack file, returning its absolute path. */
+function writeDevStackFile(input) {
+	const generatedDir = path$1.join(input.cwd, DEV_GENERATED_DIR);
+	fs$1.mkdirSync(generatedDir, { recursive: true });
+	const filePath = path$1.join(generatedDir, DEV_GENERATED_FILE);
+	fs$1.writeFileSync(filePath, renderDevStackFile(input));
+	return filePath;
+}
+const DEV_STACK_RELATIVE_PATH = path$1.join(DEV_GENERATED_DIR, DEV_GENERATED_FILE);
+//#endregion
 //#region ../../0-framework/3-tooling/cli/node_modules/readdirp/esm/index.js
 const EntryTypes = {
 	FILE_TYPE: "files",
@@ -1564,79 +1646,7 @@ var esm_default = {
 	FSWatcher
 };
 //#endregion
-//#region ../../0-framework/3-tooling/cli/dist/execute-dev-BLCK5wF7.mjs
-/**
-* Local-dev spec § 6 `generate-dev-stack.ts`: like generate-stack.ts but at
-* `.prisma-composer/dev/alchemy.run.ts`, always Alchemy stage `dev`, using
-* Alchemy's own `localState()` and no `report` — dev prints its own front
-* door (run-dev.ts), so core's presentation-free lower() gets nothing to
-* call back into. The generated module IS the one orchestration point where
-* dev provenance is resolved (spec § 3 REVISED): it deserializes the
-* containers, top-level-awaits `resolveLocalTargets(config)` (the lazy
-* `localTarget` thunks, ADR-0041), and passes
-* `providers: localTargetProviders(...)` + `state: localState()` explicitly
-* — `lower()` learns nothing about dev.
-*/
-const DEV_GENERATED_DIR = ".prisma-composer/dev";
-const DEV_GENERATED_FILE = "alchemy.run.ts";
-/** A relative import specifier from `.prisma-composer/dev/alchemy.run.ts` to `target` (posix separators). */
-function relativeImportSpecifier(generatedDir, target) {
-	const rel = path$1.relative(generatedDir, target).split(path$1.sep).join("/");
-	return rel.startsWith(".") ? rel : `./${rel}`;
-}
-function quote(value) {
-	return JSON.stringify(value);
-}
-function renderBundle(bundle) {
-	return `{ dir: ${quote(bundle.dir)}, entry: ${quote(bundle.entry)} }`;
-}
-function renderOptions(input) {
-	const lines = [];
-	lines.push(`  name: ${quote(input.name)},`);
-	lines.push("  bundles: {");
-	for (const [id, bundle] of Object.entries(input.assembled.bundles)) lines.push(`    ${quote(id)}: ${renderBundle(bundle)},`);
-	lines.push("  },");
-	lines.push("  providers: localTargetProviders(resolved, containers, devDir),");
-	lines.push("  state: localState(),");
-	return lines.join("\n");
-}
-/** Renders the dev stack module's source (tests assert on it without touching disk). */
-function renderDevStackFile(input) {
-	const generatedDir = path$1.join(input.cwd, DEV_GENERATED_DIR);
-	const appImport = relativeImportSpecifier(generatedDir, input.entryPath);
-	const configImport = relativeImportSpecifier(generatedDir, input.configPath);
-	return `// Generated by \`prisma-composer dev\` — overwritten on every run; do not
-// edit by hand. Independently runnable from ${quote(input.cwd)}:
-//
-//   alchemy deploy ${DEV_GENERATED_DIR}/${DEV_GENERATED_FILE} --stage dev
-//
-// bisects a CLI bug from an Alchemy bug (deploy-cli.md § Implementation decisions).
-import * as path from 'node:path';
-import { deserializeContainers } from '@prisma/composer/config';
-import { lower } from '@prisma/composer/deploy';
-import { DEV_DIR, localTargetProviders, resolveLocalTargets } from '@prisma/composer/local-target';
-import { localState } from 'alchemy/State/LocalState';
-import config from ${quote(configImport)};
-import app from ${quote(appImport)};
-
-const containers = deserializeContainers(config.extensions, process.env);
-const resolved = await resolveLocalTargets(config);
-const devDir = path.join(process.cwd(), DEV_DIR);
-
-export default lower(app, config, {
-${renderOptions(input)}
-});
-`;
-}
-/** Writes the dev stack file, returning its absolute path. */
-function writeDevStackFile(input) {
-	const generatedDir = path$1.join(input.cwd, DEV_GENERATED_DIR);
-	fs$1.mkdirSync(generatedDir, { recursive: true });
-	const filePath = path$1.join(generatedDir, DEV_GENERATED_FILE);
-	fs$1.writeFileSync(filePath, renderDevStackFile(input));
-	return filePath;
-}
-const DEV_STACK_RELATIVE_PATH = path$1.join(DEV_GENERATED_DIR, DEV_GENERATED_FILE);
+//#region ../../0-framework/3-tooling/cli/dist/execute-dev-DAIUT0es.mjs
 /**
 * Local-dev spec § 6 `watch.ts`: watches each assembled bundle's declared
 * `watch` paths (a directory watched recursively, a file watched through
@@ -1761,6 +1771,14 @@ async function mergedEndpoints(attachments) {
 	return (await Promise.all(attachments.map((a) => withEmulatorRetry(() => a.endpoints())))).flat();
 }
 /** Runs the full dev pipeline; resolves to a running session or a structured failure. */
+/** The file's content hash; undefined when it cannot be read, which counts as a change. */
+function contentHash(file) {
+	try {
+		return createHash("sha256").update(fs$1.readFileSync(file)).digest("hex");
+	} catch {
+		return;
+	}
+}
 async function executeDev(input, deps, cwd) {
 	if (process.platform === "win32") return notOk(new CliStructuredError("DEV.PLATFORM_UNSUPPORTED", "local dev is not supported on Windows yet."));
 	const { onEvent } = input;
@@ -1769,13 +1787,10 @@ async function executeDev(input, deps, cwd) {
 	let resolved;
 	const containers = /* @__PURE__ */ new Map();
 	try {
-		const pipelineDeps = {
-			runAssembler: deps.runAssembler,
-			config: deps.config,
-			configPath: deps.configPath
-		};
-		pipeline = await runPipeline(input.entry, input.name, cwd, pipelineDeps);
-		const { config, graph, name } = pipeline;
+		const pipelineDeps = { runAssembler: deps.runAssembler };
+		pipeline = await runPipeline(input.entry, input.name, cwd, input.config, pipelineDeps);
+		const { graph, name } = pipeline;
+		const config = pipeline.configSource.value;
 		resolved = await resolveLocalTargets(config);
 		for (const [id, dev] of resolved) try {
 			containers.set(id, await dev.container.ensure({
@@ -1831,7 +1846,7 @@ async function executeDev(input, deps, cwd) {
 			stackPath = writeDevStackFile({
 				entryPath: pipeline.entryModule.path,
 				cwd,
-				configPath: pipeline.configPath,
+				configFile: pipeline.configSource.file,
 				name: pipeline.name,
 				assembled: pipeline.assembled
 			});
@@ -1890,6 +1905,7 @@ async function executeDev(input, deps, cwd) {
 	const attachments = [];
 	const started = [];
 	let watch;
+	let configWatch;
 	try {
 		for (const [id, dev] of resolved) try {
 			attachments.push(await dev.attach({
@@ -1922,55 +1938,86 @@ async function executeDev(input, deps, cwd) {
 			kind: "unwatchable",
 			address
 		});
-		const watchDeps = {
-			runAssembler: deps.runAssembler,
-			config: deps.config,
-			configPath: deps.configPath
+		const watchDeps = { runAssembler: deps.runAssembler };
+		const watchFiles = deps.watch ?? startWatch;
+		const onWatchError = (error) => emit({
+			kind: "watch-error",
+			message: failureMessage(error)
+		});
+		const configFile = pipeline.configSource.file;
+		const startedConfig = contentHash(configFile);
+		let configChanged = false;
+		const pausedForConfig = () => {
+			if (!configChanged && contentHash(configFile) === startedConfig) return false;
+			configChanged = true;
+			emit({
+				kind: "config-changed",
+				file: configFile
+			});
+			return true;
 		};
-		watch = startWatch(targets, () => {
-			(async () => {
-				try {
-					const rePipeline = await runPipeline(input.entry, input.name, cwd, watchDeps);
-					const stackPath = writeDevStackFile({
-						entryPath: rePipeline.entryModule.path,
-						cwd,
-						configPath: rePipeline.configPath,
-						name: rePipeline.name,
-						assembled: rePipeline.assembled
-					});
-					const outcome = await (deps.alchemy ?? spawnAlchemy)(alchemyInvocation({
-						command: "deploy",
-						stackFileRelativePath: DEV_STACK_RELATIVE_PATH,
-						cwd,
-						stage: "dev",
-						containerEnv: containerEnv(containers)
-					}));
-					if (outcome.signal !== null || outcome.exitCode !== 0) {
-						emit({
-							kind: "converge-failed",
-							stackFilePath: stackPath,
-							reproduceCommand,
-							cwd
-						});
-						return;
-					}
-					emit({
-						kind: "ready",
-						endpoints: await mergedEndpoints(attachments)
-					});
-				} catch (error) {
+		configWatch = watchFiles([{
+			address: configFile,
+			paths: [configFile]
+		}], () => void pausedForConfig(), onWatchError);
+		const rebuild = async () => {
+			try {
+				const rePipeline = await runPipeline(input.entry, input.name, cwd, input.config, watchDeps);
+				const stackPath = writeDevStackFile({
+					entryPath: rePipeline.entryModule.path,
+					cwd,
+					configFile: rePipeline.configSource.file,
+					name: rePipeline.name,
+					assembled: rePipeline.assembled
+				});
+				const outcome = await (deps.alchemy ?? spawnAlchemy)(alchemyInvocation({
+					command: "deploy",
+					stackFileRelativePath: DEV_STACK_RELATIVE_PATH,
+					cwd,
+					stage: "dev",
+					containerEnv: containerEnv(containers)
+				}));
+				if (outcome.signal !== null || outcome.exitCode !== 0) {
 					emit({
-						kind: "rebuild-failed",
-						message: failureMessage(error)
+						kind: "converge-failed",
+						stackFilePath: stackPath,
+						reproduceCommand,
+						cwd
 					});
+					return;
 				}
-			})();
-		}, (error) => emit({
-			kind: "watch-error",
-			message: failureMessage(error)
-		}));
+				emit({
+					kind: "ready",
+					endpoints: await mergedEndpoints(attachments)
+				});
+			} catch (error) {
+				emit({
+					kind: "rebuild-failed",
+					message: failureMessage(error)
+				});
+			}
+		};
+		let rebuilding = false;
+		let changedDuringRebuild = false;
+		const rebuildUntilSettled = async () => {
+			rebuilding = true;
+			do {
+				changedDuringRebuild = false;
+				await rebuild();
+			} while (changedDuringRebuild && !pausedForConfig());
+			rebuilding = false;
+		};
+		watch = watchFiles(targets, () => {
+			if (pausedForConfig()) return;
+			if (rebuilding) {
+				changedDuringRebuild = true;
+				return;
+			}
+			rebuildUntilSettled();
+		}, onWatchError);
 		const startedWatch = watch;
-		await watch.ready;
+		const startedConfigWatch = configWatch;
+		await Promise.all([watch.ready, configWatch.ready]);
 		let stopping = false;
 		let resolveClosed = () => void 0;
 		const closed = new Promise((resolve) => {
@@ -1981,6 +2028,7 @@ async function executeDev(input, deps, cwd) {
 				stopping = true;
 				emit({ kind: "stopping" });
 				startedWatch.stop();
+				startedConfigWatch.stop();
 				(async () => {
 					for (const attachment of attachments) try {
 						await attachment.stopServices();
@@ -2003,6 +2051,7 @@ async function executeDev(input, deps, cwd) {
 		});
 	} catch (error) {
 		watch?.stop();
+		configWatch?.stop();
 		await Promise.all(started.map((a) => a.stopServices().catch(() => void 0)));
 		if (CliStructuredError.is(error)) return notOk(error);
 		throw error;
@@ -2011,4 +2060,4 @@ async function executeDev(input, deps, cwd) {
 //#endregion
 export { executeDev };
 
-//# sourceMappingURL=execute-dev-BLCK5wF7-CJvkj5wl.mjs.map
+//# sourceMappingURL=execute-dev-DAIUT0es-B3iBKmAS.mjs.map