@orkestrel/scaffold 0.0.50 → 0.0.52

package/dist/bin/main.js

@@ -832,7 +832,9 @@ var CLI = class CLI {
 				pins: versions.pins,
 				scripts: blueprintToWritableScripts(blueprint)
 			}, target));
-			const [terminal] = this.#survey(host.materializer, this.#derive(target), target, groups);
+			const terminalBlueprint = this.#derive(target);
+			const [measured] = this.#survey(host.materializer, terminalBlueprint, target, groups);
+			const terminal = this.#appendQuestions(measured, target, terminalBlueprint, groups);
 			const outcome = {
 				...result,
 				audit: terminal,
@@ -927,7 +929,8 @@ var CLI = class CLI {
 			} : worktree, target);
 			const offline = this.#merge(repaired, removed);
 			const online = command.offline === true ? await this.#offline(host.materializer, target, declared, host.baseline) : await this.#reconcile(host.materializer, target, declared, host.baseline, host.forced);
-			const [terminal] = this.#survey(host.materializer, blueprint, target, groups);
+			const [measured] = this.#survey(host.materializer, blueprint, target, groups);
+			const terminal = this.#appendQuestions(measured, target, blueprint, groups);
 			const outcome = {
 				...online,
 				...this.#merge(offline, online),
@@ -1463,27 +1466,42 @@ var CLI = class CLI {
 			blocking: false,
 			groups: ["configs"]
 		};
-		const missing = [...expectedLines].filter(([project]) => !reachable.has(project)).sort(([left], [right]) => left.localeCompare(right));
-		if (missing.length === 0) return void 0;
-		const names = missing.map(([project]) => project);
-		const unscripted = missing.filter(([project]) => !isString(scripts[`test:${project}`]));
-		const ungated = missing.filter(([project]) => isString(scripts[`test:${project}`]));
-		const remedies = [];
-		if (ungated.length > 0) {
-			const declared = ungated.map(([project]) => `test:${project}`);
-			remedies.push(`${declared.join(", ")} ${declared.length === 1 ? "is" : "are"} already declared, so the gate is missing rather than the script: invoke ${declared.length === 1 ? "it" : "each of them"} by name from the ${gateNames} chain.`);
-		}
-		if (unscripted.length > 0) {
-			const lines = unscripted.map(([, line]) => line);
-			remedies.push(`${writing ? "To continue, add" : "Add"} ${lines.length === 1 ? "this exact script line" : "these exact script lines"} to package.json: ${lines.join(" ")}`);
-		}
+		const ungated = [...expectedLines].filter(([project]) => !reachable.has(project)).sort(([left], [right]) => left.localeCompare(right)).filter(([project]) => isString(scripts[`test:${project}`]));
+		if (ungated.length === 0) return void 0;
+		const names = ungated.map(([project]) => project);
+		const declared = ungated.map(([project]) => `test:${project}`);
 		return {
 			field: "projects",
-			message: `${writing ? "The configs group is blocked because " : ""}the manifest at ${target} does not reach ${names.length === 1 ? "a Vitest project" : "Vitest projects"} the planned configuration registers: ${names.join(", ")}. No chain from ${gateNames} invokes ${names.length === 1 ? "it" : "them"}. ${remedies.join(" ")}${writing ? " Exclude configs from --groups to write another group." : ""}`,
+			message: `${writing ? "The configs group is blocked because " : ""}the manifest at ${target} does not reach ${names.length === 1 ? "a Vitest project" : "Vitest projects"} the planned configuration registers: ${names.join(", ")}. No chain from ${gateNames} invokes ${names.length === 1 ? "it" : "them"}. ${declared.join(", ")} ${declared.length === 1 ? "is" : "are"} already declared, so the gate is missing rather than the script: invoke ${declared.length === 1 ? "it" : "each of them"} by name from the ${gateNames} chain.${writing ? " Exclude configs from --groups to write another group." : ""}`,
 			blocking: false,
 			groups: ["configs"]
 		};
 	}
+	#scriptQuestion(target, blueprint) {
+		const text = this.#manifest(target);
+		const writable = blueprintToWritableScripts(blueprint);
+		const parsed = parseJSON(text);
+		const scripts = isRecord(parsed) && isRecord(parsed.scripts) ? parsed.scripts : {};
+		const missing = writable.filter((script) => !Object.hasOwn(scripts, script.name));
+		const differing = writable.filter((script) => {
+			const value = scripts[script.name];
+			return isString(value) && value !== script.command && !script.accepted.includes(value);
+		});
+		if (missing.length === 0 && differing.length === 0) return void 0;
+		const missingNames = missing.map((script) => script.name);
+		const missingLines = missing.map((script) => `${JSON.stringify(script.name)}: ${JSON.stringify(script.command)},`);
+		const differingNames = differing.map((script) => script.name);
+		const differingLines = differing.map((script) => {
+			const value = scripts[script.name];
+			return `${JSON.stringify(script.name)} declares ${JSON.stringify(value)}; planned ${JSON.stringify(script.command)}.`;
+		});
+		return {
+			field: "scripts",
+			message: [missing.length === 0 ? "" : `The manifest at ${target} does not declare ${missingNames.length === 1 ? "a planned script" : "planned scripts"}: ${missingNames.join(", ")}. Add ${missingLines.length === 1 ? "this exact script line" : "these exact script lines"} to package.json: ${missingLines.join(" ")}`, differing.length === 0 ? "" : `The manifest at ${target} declares ${differingNames.length === 1 ? "a planned script" : "planned scripts"} with ${differingNames.length === 1 ? "a differing value" : "differing values"}: ${differingNames.join(", ")}. Keep ${differingNames.length === 1 ? "the declared value" : "each declared value"} unchanged or replace ${differingNames.length === 1 ? "it" : "them"} with the planned ${differingNames.length === 1 ? "value" : "values"}: ${differingLines.join(" ")}`].filter((message) => message !== "").join(" "),
+			blocking: false,
+			groups: ["manifest"]
+		};
+	}
 	#dependencyQuestion(target, blueprint, writing = false) {
 		const parsed = parseJSON(this.#manifest(target));
 		if (!isRecord(parsed)) return void 0;
@@ -1535,6 +1553,10 @@ var CLI = class CLI {
 	}
 	#targetQuestions(target, blueprint, groups, writing = false) {
 		const questions = [];
+		if (!writing) {
+			const script = this.#scriptQuestion(target, blueprint);
+			if (script !== void 0) questions.push(script);
+		}
 		const project = this.#projectQuestion(target, blueprint, writing);
 		if (project !== void 0) questions.push(project);
 		const dependency = this.#dependencyQuestion(target, blueprint, writing);
@@ -1550,6 +1572,13 @@ var CLI = class CLI {
 			...candidates === void 0 ? {} : { candidates }
 		}));
 	}
+	#appendQuestions(audit, target, blueprint, groups) {
+		const questions = this.#targetQuestions(target, blueprint, groups);
+		return questions.length === 0 ? audit : {
+			...audit,
+			questions: [...audit.questions, ...questions]
+		};
+	}
 	#assertTarget(target, blueprint, groups) {
 		const questions = this.#targetQuestions(target, blueprint, groups, true);
 		if (questions.length === 0) return;