@orkestrel/scaffold 0.0.73 → 0.0.74

package/dist/bin/main.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { align, renderTable, strip, stripControls, width } from "@orkestrel/console";
 import { attempt, isArray, isError, isInstance, isRecord, isString, parseJSON } from "@orkestrel/contract";
-import { BIN_ENTRY_PATH, CATALOG_AGENT_PATH, CONFORMANCE_TEST_PATH, Compiler, DEPENDENCY_NAME_PATTERN, ENVIRONMENTS, GLOBAL_SETUP_PATH, GROUPS, GUIDES_TEST_PATH, HOST_PATHS, INTEGRATION_TEST_PATH, MAX_MANIFEST_BYTES, MAX_PATH_LENGTH, SERVICE_SETUP_PATH, SHOWCASE_CONFIG_PATH, ScaffoldError, blueprintToDevDependencies, blueprintToRootVite, blueprintToScripts, blueprintToTestArtifacts, blueprintToWritableScripts, compareVersions, createBlueprint, extractRangeMajor, extractVersion, isFloorPath, isScaffoldError, manifestToDependencies, manifestToName, nameToGuide, replaceManifestScripts, replacePlanRanges } from "../src/core/index.js";
+import { BIN_ENTRY_PATH, CATALOG_AGENT_PATH, CONFORMANCE_TEST_PATH, Compiler, DEPENDENCY_NAME_PATTERN, ENVIRONMENTS, GLOBAL_SETUP_PATH, GROUPS, GUIDES_TEST_PATH, HOST_PATHS, INTEGRATION_TEST_PATH, JOURNEY_CONFIG_PATH, MAX_MANIFEST_BYTES, MAX_PATH_LENGTH, SERVICE_SETUP_PATH, SHOWCASE_CONFIG_PATH, ScaffoldError, blueprintToConfigArtifacts, blueprintToDevDependencies, blueprintToRootVite, blueprintToScripts, blueprintToTestArtifacts, blueprintToWritableScripts, compareVersions, createBlueprint, extractRangeMajor, extractVersion, isFloorPath, isScaffoldError, manifestToDependencies, manifestToName, nameToGuide, replaceManifestScripts, replacePlanRanges } from "../src/core/index.js";
 import { MAX_INVENTORY_PATHS, Materializer, Upstream, filesToHost, isExactCaseFile, isPhysicalDirectory, isWorktree, listFiles, readFileText, readHostFloor, readHostManifest, readSnapshot, resolveContainedPath } from "../src/server/index.js";
 import { createMarkdown, flattenText, isTableNode } from "@orkestrel/markdown";
 import { createSession } from "@orkestrel/process/server";
@@ -836,16 +836,17 @@ function releasesToPins(releases, declared) {
 	};
 }
 /**
-* Reads the literal Vitest projects and npm run scripts one shell command invokes.
+* Reads the literal Vitest projects, configuration paths, and npm run scripts a shell command names.
 *
 * @param script - The manifest script text to read.
-* @returns The invoked projects and scripts, or `undefined` when the command
+* @returns The named projects, configurations, and scripts, or `undefined` when the command
 * cannot be read literally.
 *
 * @remarks
 * Quotes group a token but do not hide the option, while shell expansions make
 * its value unresolved and therefore refuse the write that asked the question.
-* An unterminated quote, a trailing escape, and an unresolved `--project` value
+* Configuration paths use `-c <path>`, `--config <path>`, or `--config=<path>`.
+* An unterminated quote, a trailing escape, and an unresolved `--project`, `--config`, or `-c` value
 * all answer `undefined` rather than a partial reading.
 *
 * @example
@@ -853,7 +854,7 @@ function releasesToPins(releases, declared) {
 * import { scriptToInvocations } from './helpers.js'
 *
 * scriptToInvocations('vitest run --project src:core')
-* // { projects: ['src:core'], scripts: [] }
+* // { projects: ['src:core'], configs: [], scripts: [] }
 * ```
 */
 function scriptToInvocations(script) {
@@ -931,6 +932,7 @@ function scriptToInvocations(script) {
 		resolved
 	});
 	const projects = [];
+	const configs = [];
 	const scripts = [];
 	for (let index = 0; index < tokens.length; index += 1) {
 		const token = tokens[index];
@@ -950,7 +952,7 @@ function scriptToInvocations(script) {
 			index += 2;
 			continue;
 		}
-		if (token.value === "--project") {
+		if (token.value === "--project" || token.value === "--config" || token.value === "-c") {
 			const project = tokens[index + 1];
 			if (project === void 0 || !project.resolved || project.value.length === 0 || [
 				"&&",
@@ -961,20 +963,21 @@ function scriptToInvocations(script) {
 				"(",
 				")"
 			].includes(project.value)) return void 0;
-			projects.push(project.value);
+			(token.value === "--project" ? projects : configs).push(project.value);
 			index += 1;
 			continue;
 		}
-		if (token.value.startsWith("--project=")) {
-			const project = token.value.slice(10);
+		if (token.value.startsWith("--project=") || token.value.startsWith("--config=")) {
+			const project = token.value.slice(token.value.indexOf("=") + 1);
 			if (!token.resolved || project.length === 0) return void 0;
-			projects.push(project);
+			(token.value.startsWith("--project=") ? projects : configs).push(project);
 			continue;
 		}
-		if (!token.resolved && token.value.includes("--project")) return void 0;
+		if (!token.resolved && /--project|--config/.test(token.value)) return void 0;
 	}
 	return {
 		projects,
+		configs,
 		scripts
 	};
 }
@@ -1343,11 +1346,13 @@ var CLI = class {
 	}
 	async #create(command) {
 		const target = command.target ?? command.name;
+		const app = selectionToEnvironments(command.app, "app");
 		const blueprint = createBlueprint(command.name, {
 			src: selectionToEnvironments(command.src, "src"),
-			app: selectionToEnvironments(command.app, "app"),
+			app,
+			journey: app.includes("browser"),
 			bin: command.bin === true,
-			setup: false,
+			setup: [],
 			dependencies: selectionToPackages(command.dependencies).map((name) => ({
 				name,
 				range: "^0.0.0"
@@ -1847,22 +1852,26 @@ var CLI = class {
 		const service = resolveContainedPath(target, SERVICE_SETUP_PATH);
 		const global = resolveContainedPath(target, GLOBAL_SETUP_PATH);
 		const showcase = resolveContainedPath(target, SHOWCASE_CONFIG_PATH);
+		const journey = resolveContainedPath(target, JOURNEY_CONFIG_PATH);
+		const setup = /* @__PURE__ */ new Set();
+		if (tests !== void 0) for (const path of listFiles(tests)) {
+			if (path.includes("/") || !path.startsWith("setup") || !path.endsWith(".test.ts")) continue;
+			const proof = resolveContainedPath(tests, path);
+			if (proof !== void 0 && isExactCaseFile(proof)) setup.add(path === "setupBrowser.test.ts" ? "browser" : "node");
+		}
 		return createBlueprint(declared.slice(declared.lastIndexOf("/") + 1), {
 			src: targetToEnvironments(target, "src"),
 			app: targetToEnvironments(target, "app"),
 			dependencies: manifestToDependencies(manifest).runtime,
 			bin: bin !== void 0 && isExactCaseFile(bin),
-			setup: tests !== void 0 && listFiles(tests).some((path) => {
-				if (path.includes("/") || !path.startsWith("setup") || !path.endsWith(".test.ts")) return false;
-				const proof = resolveContainedPath(tests, path);
-				return proof !== void 0 && isExactCaseFile(proof);
-			}),
+			setup: [...setup],
 			guides: guides !== void 0 && isExactCaseFile(guides),
 			integration: integration !== void 0 && isExactCaseFile(integration),
 			conformance: conformance !== void 0 && isExactCaseFile(conformance),
 			service: service !== void 0 && isExactCaseFile(service),
 			global: global !== void 0 && isExactCaseFile(global),
-			showcase: showcase !== void 0 && isExactCaseFile(showcase)
+			showcase: showcase !== void 0 && isExactCaseFile(showcase),
+			journey: journey !== void 0 && isExactCaseFile(journey)
 		});
 	}
 	#projectQuestion(target, blueprint, writing = false) {
@@ -1897,6 +1906,26 @@ var CLI = class {
 			blocking: false,
 			groups: ["configs"]
 		};
+		if (!writing) {
+			const paths = new Set(blueprintToConfigArtifacts(blueprint).map((artifact) => resolveContainedPath(target, artifact.path)));
+			const configurations = [];
+			for (const [name, script] of Object.entries(scripts)) {
+				if (!name.startsWith("test:") || !isString(script) || !script.includes("vitest")) continue;
+				const invoked = scriptToInvocations(script);
+				if (invoked === void 0) continue;
+				for (const config of invoked.configs) {
+					const path = resolveContainedPath(target, config);
+					if (path !== void 0 && (paths.has(path) || isExactCaseFile(path))) continue;
+					configurations.push(`${name} --config ${config}`);
+				}
+			}
+			if (configurations.length > 0) return {
+				field: "projects",
+				message: `The manifest at ${target} names a Vitest configuration the plan does not emit and the target does not hold: ${configurations.join(", ")}. Add the configuration, or remove the script that names it and its invocation from the test chain.`,
+				blocking: false,
+				groups: ["configs"]
+			};
+		}
 		const expected = blueprintToScripts(blueprint);
 		const expectedLines = /* @__PURE__ */ new Map();
 		for (const [name, script] of Object.entries(expected)) {
@@ -1911,21 +1940,25 @@ var CLI = class {
 			}
 		}
 		const reachable = /* @__PURE__ */ new Set();
-		const visited = /* @__PURE__ */ new Set();
-		const pending = [...gates];
-		while (pending.length > 0) {
-			const name = pending.shift();
-			if (name === void 0 || visited.has(name)) continue;
-			visited.add(name);
-			const script = scripts[name];
-			if (!isString(script)) continue;
-			const invoked = scriptToInvocations(script);
-			if (invoked === void 0) {
-				unresolved = true;
-				continue;
+		const chains = /* @__PURE__ */ new Map();
+		for (const gate of gates) {
+			const visited = /* @__PURE__ */ new Set();
+			chains.set(gate, visited);
+			const pending = [gate];
+			while (pending.length > 0) {
+				const name = pending.shift();
+				if (name === void 0 || visited.has(name)) continue;
+				visited.add(name);
+				const script = scripts[name];
+				if (!isString(script)) continue;
+				const invoked = scriptToInvocations(script);
+				if (invoked === void 0) {
+					unresolved = true;
+					continue;
+				}
+				for (const project of invoked.projects) reachable.add(project);
+				for (const called of invoked.scripts) if (!visited.has(called)) pending.push(called);
 			}
-			for (const project of invoked.projects) reachable.add(project);
-			for (const called of invoked.scripts) if (!visited.has(called)) pending.push(called);
 		}
 		if (unresolved) return {
 			field: "projects",
@@ -1934,7 +1967,15 @@ var CLI = class {
 			groups: ["configs"]
 		};
 		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;
+		if (ungated.length === 0) {
+			if (!writing && expected["test:journey"] !== void 0 && !chains.get("test")?.has("test:journey")) return {
+				field: "projects",
+				message: `The manifest at ${target} does not invoke npm run test:journey from its test chain. Add npm run test:journey after npm run test:app.`,
+				blocking: false,
+				groups: ["configs"]
+			};
+			return;
+		}
 		const names = ungated.map(([project]) => project);
 		const disk = parseJSON(text);
 		const written = isRecord(disk) && isRecord(disk.scripts) ? disk.scripts : {};