@orkestrel/scaffold 0.0.4 → 0.0.6

package/dist/bin/scaffold.js

@@ -2,8 +2,8 @@
 import { existsSync, mkdirSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
 import * as tls from "node:tls";
-import { DEPENDENCY_NAME_PATTERN, ENVIRONMENTS, GROUPS, MAX_ARTIFACT_BYTES, NAME_PATTERN, ScaffoldError, blueprint, blueprintToPlan, catalogNames, catalogToBlock, createCompiler, dependency, diffPlan, isScaffoldError, manifestToDependencies, planToSummary } from "../src/core/index.js";
-import { WriteTransaction, catalogPackages, commitWriteTransaction, createMaterializer, createSync, deriveBlueprint, digestFile, digestText, discardWriteTransaction, discoverPackages, hostRoot, hydratePlan, isFilesystemPath, isRealDirectory, isTerminalText, isVacant, locateHostSource, pruneTargets, readFileText, readHostManifest, readManifest, readTarget, resolvePhysicalPath, validateWriteDirectories } from "../src/server/index.js";
+import { DEPENDENCY_NAME_PATTERN, ENVIRONMENTS, GROUPS, MAX_ARTIFACT_BYTES, NAME_PATTERN, ScaffoldError, blueprint, catalogNames, catalogToBlock, createCompiler, dependency, diffPlan, isScaffoldError, manifestToDependencies, manifestToName, planToSummary } from "../src/core/index.js";
+import { WriteTransaction, catalogPackages, commitWriteTransaction, createMaterializer, createSync, deriveBlueprint, digestFile, digestText, discardWriteTransaction, discoverPackages, hostRoot, hydratePlan, isFilesystemPath, isRealDirectory, isTerminalText, isVacant, locateHostSource, parseSyncOptions, pruneTargets, readFileText, readHostManifest, readManifest, readTarget, resolvePhysicalPath, validateWriteDirectories } from "../src/server/index.js";
 import { createReporter, createSpinner, createStyler } from "@orkestrel/console";
 import { createServerSink } from "@orkestrel/console/server";
 import { attempt } from "@orkestrel/contract";
@@ -660,6 +660,7 @@ function isVerb(value) {
 //#region src/bin/CLI.ts
 /** Stateful command-line orchestration and its process boundary. */
 var CLI = class {
+	#sync;
 	#sink = createServerSink();
 	#tty = process.stdout.isTTY === true;
 	#styler = createStyler({ enabled: process.env.NO_COLOR === void 0 && this.#tty });
@@ -669,6 +670,14 @@ var CLI = class {
 		styler: this.#styler
 	});
 	#json = false;
+	/**
+	* Create command-line orchestration with optional upstream endpoint settings.
+	*
+	* @param sync - Sync settings used by every live dependency operation.
+	*/
+	constructor(sync) {
+		this.#sync = parseSyncOptions(sync);
+	}
 	/** Execute one command-line argument vector. */
 	async run(argv) {
 		this.#trust();
@@ -743,15 +752,16 @@ var CLI = class {
 		this.#error(contained.error, json);
 	}
 	/** Compile a spec and report unresolved blocking questions through the shared CLI error path. */
-	#compile(spec, json) {
+	#compile(spec, json, groups) {
 		const compiler = createCompiler();
 		try {
-			const scaffolding = compiler.compile(spec);
+			const scaffolding = compiler.compile(spec, groups);
 			if (!scaffolding.plan) {
-				const message = scaffolding.questions.map((question) => question.text).join("; ");
+				const blocking = scaffolding.questions.filter((question) => question.blocking);
+				const message = (blocking.length > 0 ? blocking : scaffolding.questions).map((question) => question.text).join("; ");
 				this.#fail(message, json);
 			}
-			return scaffolding.plan;
+			return [scaffolding.plan, scaffolding.questions];
 		} finally {
 			compiler.destroy();
 		}
@@ -966,7 +976,7 @@ var CLI = class {
 			if (catalog === void 0) this.#reporter.line(CATALOG_UNRESOLVED_NOTE);
 			depNames = await this.#prompt(terminal, catalog);
 		}
-		const sync = createSync();
+		const sync = createSync(this.#sync);
 		let versions;
 		try {
 			versions = await sync.versions(depNames.map((depName) => dependency(depName, "*")));
@@ -976,7 +986,7 @@ var CLI = class {
 		const unresolved = versions.filter((version) => version.freshness !== "current" && version.freshness !== "behind" || version.latest === "").map((version) => version.name);
 		if (unresolved.length > 0) this.#fail(unresolvedVersion(unresolved), json);
 		const deps = versions.map((version) => dependency(version.name, `^${version.latest}`));
-		const plan = this.#compile(blueprint(name, {
+		const [plan] = this.#compile(blueprint(name, {
 			src,
 			app,
 			dependencies: deps
@@ -1012,7 +1022,10 @@ var CLI = class {
 	/** `scaffold pull` — refresh vendored dependency mirrors and report range drift. */
 	async #pull(values, json) {
 		const target = this.#contain(values.target ?? ".", json);
-		const sync = createSync(values.strict === void 0 ? void 0 : { strict: values.strict });
+		const sync = createSync(values.strict === void 0 ? this.#sync : {
+			...this.#sync,
+			strict: values.strict
+		});
 		try {
 			let report;
 			try {
@@ -1067,7 +1080,7 @@ var CLI = class {
 			if (unrecognized.length > 0) this.#usage(`Group "${unrecognized.join("\", \"")}" is not recognized`, json);
 			groups = GROUPS.filter((group) => groupsInput.includes(group));
 		}
-		const compiled = blueprintToPlan(spec, groups);
+		const [compiled, questions] = this.#compile(spec, json, groups);
 		const host = values.from?.[0] ?? hostRoot();
 		let plan;
 		try {
@@ -1076,15 +1089,20 @@ var CLI = class {
 			this.#error(error, json);
 		}
 		const artifactPaths = plan.artifacts.map((artifact) => artifact.path);
-		const rawAudit = diffPlan(plan, readTarget(target, artifactPaths));
+		const rawAudit = {
+			...diffPlan(plan, readTarget(target, artifactPaths)),
+			questions
+		};
 		const scanned = this.#scanSafe(rawAudit, target, host);
 		const audit = scanned.audit;
 		let drifted = !audit.clean;
 		let live;
 		if (values.live) {
-			const sync = createSync();
+			const sync = createSync(this.#sync);
 			try {
-				const guides = await sync.guides(deps);
+				const manifestName = manifestToName(readManifest(target));
+				const guideDependencies = deps.filter((entry) => entry.name !== manifestName);
+				const guides = await sync.guides(guideDependencies);
 				const versions = await sync.versions(deps);
 				const entries = [...guides, ...versions];
 				drifted ||= entries.some((entry) => entry.freshness !== "current");
@@ -1108,6 +1126,7 @@ var CLI = class {
 			return;
 		}
 		if (scanned.skipped) this.#reporter.line(SCAN_SKIPPED);
+		for (const question of audit.questions) if (!question.blocking) this.#reporter.line(`warning: ${question.text}`);
 		this.#reporter.line(comparisonLine(true));
 		this.#reporter.table(auditTable(audit, plan));
 		this.#reporter.line(auditVerdict(audit, plan));
@@ -1150,9 +1169,13 @@ var CLI = class {
 		} catch (error) {
 			this.#error(error, json);
 		}
-		const compiled = this.#compile(spec, json);
+		const [compiled] = this.#compile(spec, json);
 		const scoped = {
 			...compiled,
+			blueprint: {
+				...compiled.blueprint,
+				overrides: []
+			},
 			artifacts: compiled.artifacts.filter((artifact) => artifact.origin === "host")
 		};
 		const host = values.from?.[0] ?? hostRoot();
@@ -1228,19 +1251,28 @@ var CLI = class {
 			try {
 				const compiler = createCompiler();
 				let scoped;
+				let questions;
 				try {
 					const spec = deriveBlueprint(directory);
 					const scaffolding = compiler.compile(spec);
 					if (!scaffolding.plan) throw new ScaffoldError("INVALID", scaffolding.questions.map((question) => question.text).join("; "));
 					scoped = {
 						...scaffolding.plan,
+						blueprint: {
+							...scaffolding.plan.blueprint,
+							overrides: []
+						},
 						artifacts: scaffolding.plan.artifacts.filter((artifact) => artifact.origin === "host")
 					};
+					questions = scaffolding.questions;
 				} finally {
 					compiler.destroy();
 				}
 				const plan = hydratePlan(scoped, host);
-				const rawAudit = diffPlan(plan, readTarget(directory, plan.artifacts.map((artifact) => artifact.path)));
+				const rawAudit = {
+					...diffPlan(plan, readTarget(directory, plan.artifacts.map((artifact) => artifact.path))),
+					questions
+				};
 				const audit = this.#scan(rawAudit, directory, host);
 				repos.push({
 					name,
@@ -1256,12 +1288,15 @@ var CLI = class {
 			}
 		}
 		if (!json) {
-			for (const repo of repos) this.#reporter.line(fleetRepoLine(repo.name, repo.audit.clean ? { state: "clean" } : {
-				state: "drifted",
-				drifted: repo.audit.drifted,
-				missing: repo.audit.missing,
-				foreign: repo.audit.foreign
-			}));
+			for (const repo of repos) {
+				this.#reporter.line(fleetRepoLine(repo.name, repo.audit.clean ? { state: "clean" } : {
+					state: "drifted",
+					drifted: repo.audit.drifted,
+					missing: repo.audit.missing,
+					foreign: repo.audit.foreign
+				}));
+				for (const question of repo.audit.questions) if (!question.blocking) this.#reporter.line(`${repo.name}: warning: ${question.text}`);
+			}
 			for (const failure of failures) this.#reporter.line(fleetRepoLine(failure.name, {
 				state: "failed",
 				message: failure.message
@@ -1339,7 +1374,7 @@ var CLI = class {
 				this.#error(error, json);
 			}
 		} else {
-			const sync = createSync();
+			const sync = createSync(this.#sync);
 			sync.emitter.on("package", (name, note) => {
 				if (note !== "") notes.set(name, note);
 			});