@percepta/create 3.1.5 → 3.2.0

package/dist/index.js

@@ -2,10 +2,10 @@
 import { program } from "commander";
 import { execFile, execSync, spawn } from "node:child_process";
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 import chalk from "chalk";
 import fs from "fs-extra";
 import ora from "ora";
+import { fileURLToPath } from "node:url";
 import { parse } from "yaml";
 import { randomBytes } from "node:crypto";
 import inquirer from "inquirer";
@@ -381,6 +381,7 @@ const PROCESSABLE_EXTENSIONS = new Set([
 	".tf",
 	".tfvars",
 	".sh",
+	".zed",
 	".mjs",
 	".cjs"
 ]);
@@ -520,6 +521,21 @@ async function resolvePerceptaVersionsInPackageJson(packageJsonPath, lookupLates
 	};
 }
 //#endregion
+//#region src/utils/template-versions.ts
+const FALLBACK_TEMPLATE_VERSION = "1.0.0";
+function readTemplateVersions() {
+	const currentDir = path.dirname(fileURLToPath(import.meta.url));
+	const candidates = [path.resolve(currentDir, "../template-versions.json"), path.resolve(currentDir, "../../template-versions.json")];
+	for (const versionsPath of candidates) try {
+		const content = fs.readFileSync(versionsPath, "utf-8");
+		return JSON.parse(content);
+	} catch {}
+	return {};
+}
+function getTemplateVersion(templateType) {
+	return readTemplateVersions()[templateType] ?? FALLBACK_TEMPLATE_VERSION;
+}
+//#endregion
 //#region src/commands/create.ts
 const PACKAGE_MANAGER = "pnpm";
 /** Paths in copy-paste shell commands (POSIX-style). */
@@ -541,14 +557,14 @@ function runPackageManagerInstall(packageManager, cwd, args = ["install"]) {
 	});
 }
 /**
-* Runs the `setup` script in the package directory (docker:up + db:setup-and-migrate + db:seed).
+* Runs the monorepo-root `setup` script (docker + access + db + seed).
 * Uses `pnpm run setup` (not `pnpm setup`) because `pnpm setup` is a pnpm builtin that configures
 * PNPM_HOME in the user's shell rc — it ignores the package.json script of the same name.
 */
-function runWebappSetup(packageManager, cwd) {
+function runWebappSetup(packageManager, monorepoRoot) {
 	return new Promise((resolve, reject) => {
 		const child = spawn(packageManager, ["run", "setup"], {
-			cwd,
+			cwd: monorepoRoot,
 			stdio: "inherit"
 		});
 		child.on("error", reject);
@@ -630,7 +646,7 @@ function openInBrowser(url) {
 	}
 }
 /**
-* Post-scaffold orchestration for webapps: run setup (docker + db + seed),
+* Post-scaffold orchestration for webapps: run root setup (docker + access + db + seed),
 * start the dev server, open the served URL in the user's browser, then hand
 * control to the dev server until the user exits with Ctrl+C.
 *
@@ -641,16 +657,16 @@ function openInBrowser(url) {
 * Callers should only invoke this when install actually succeeded —
 * starting setup without node_modules will leave an orphan Docker container.
 */
-async function autoRunWebapp(packageDir) {
+async function autoRunWebapp(packageDir, monorepoRoot) {
 	const packageManager = PACKAGE_MANAGER;
 	console.log();
-	console.log(chalk.bold("Running setup (docker, db, seed)..."));
+	console.log(chalk.bold("Running setup (docker, access, db, seed)..."));
 	console.log();
 	try {
-		await runWebappSetup(packageManager, packageDir);
+		await runWebappSetup(packageManager, monorepoRoot);
 	} catch (error) {
 		console.log();
-		console.log(chalk.yellow("!"), "Setup failed. You can re-run it manually:", chalk.cyan(`cd ${packageDir} && ${packageManager} run setup`));
+		console.log(chalk.yellow("!"), "Setup failed. You can re-run it manually:", chalk.cyan(`cd ${monorepoRoot} && ${packageManager} run setup`));
 		console.log(chalk.dim(error.message));
 		return false;
 	}
@@ -680,19 +696,10 @@ async function autoRunWebapp(packageDir) {
 	await closed;
 	return true;
 }
-function readTemplateVersions() {
-	const versionsPath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), "../template-versions.json");
-	try {
-		const content = fs.readFileSync(versionsPath, "utf-8");
-		return JSON.parse(content);
-	} catch {
-		return {};
-	}
-}
 async function writeMosaicFiles(packageDir, config, projectType) {
 	await writeManifest(packageDir, {
 		templateType: projectType,
-		templateVersion: readTemplateVersions()[projectType] || "1.0.0",
+		templateVersion: getTemplateVersion(projectType),
 		templateCommit: "npm",
 		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 		placeholders: derivePlaceholders(config.name, config.title, config.repoName),
@@ -824,9 +831,9 @@ async function installAtMonorepoRoot(monorepoRoot, installDeps) {
 * Gated on `installSucceeded` because starting setup without node_modules
 * leaves an orphan Docker container.
 */
-async function maybeAutoRunWebapp(packageDir, projectType, installSucceeded) {
+async function maybeAutoRunWebapp(packageDir, monorepoRoot, projectType, installSucceeded) {
 	if (!packageDir || projectType !== "webapp" || !installSucceeded) return false;
-	return autoRunWebapp(packageDir);
+	return autoRunWebapp(packageDir, monorepoRoot);
 }
 function getProjectTypeLabel(projectType) {
 	switch (projectType) {
@@ -946,7 +953,7 @@ async function createProject(options) {
 		console.log();
 		console.log(chalk.green("✔"), chalk.bold(`Created ${typeLabel} at`), chalk.cyan(path.relative(monorepoRoot, packageDir)));
 		console.log();
-		if (await maybeAutoRunWebapp(packageDir, answers.projectType, installSucceeded)) return;
+		if (await maybeAutoRunWebapp(packageDir, monorepoRoot, answers.projectType, installSucceeded)) return;
 		printNextStepsExisting(answers, packageDir);
 	} else {
 		const isBareMonorepo = answers.projectType === "monorepo";
@@ -986,7 +993,7 @@ async function createProject(options) {
 		console.log(chalk.green("✔"), chalk.bold(isBareMonorepo ? `Created ${typeLabel} at` : "Created monorepo at"), chalk.cyan(monorepoRoot));
 		if (!isBareMonorepo) console.log(chalk.green("✔"), chalk.bold(`Created ${typeLabel} at`), chalk.cyan(`packages/${answers.name}/`));
 		console.log();
-		if (await maybeAutoRunWebapp(packageDir, answers.projectType, installSucceeded)) return;
+		if (await maybeAutoRunWebapp(packageDir, monorepoRoot, answers.projectType, installSucceeded)) return;
 		printNextStepsNew(answers, monorepoRoot);
 	}
 }
@@ -1006,16 +1013,18 @@ async function resolveCreateCwd(cwdOption) {
 	return cwd;
 }
 function printWebappNextSteps(params) {
-	const { pm, answers, variant, monorepoRelativePath, packageRelativePath } = params;
+	const { pm, answers, variant, monorepoRelativePath, packageRelativePathFromRoot } = params;
 	const repoRel = shPath(monorepoRelativePath) || ".";
-	const pkgFromRoot = `packages/${answers.name}`;
-	const pnpmSteps = ["pnpm run setup", "pnpm dev"];
+	const pkgFromRoot = shPath(packageRelativePathFromRoot ?? `packages/${answers.name}`) || ".";
+	const setupStep = "pnpm run setup";
+	const devStep = "pnpm dev";
 	if (variant === "new") {
 		const oneLinerParts = [];
 		if (repoRel !== ".") oneLinerParts.push(`cd ${repoRel}`);
 		if (!answers.installDeps) oneLinerParts.push(`${pm} install`);
+		oneLinerParts.push(setupStep);
 		oneLinerParts.push(`cd ${pkgFromRoot}`);
-		oneLinerParts.push(...pnpmSteps);
+		oneLinerParts.push(devStep);
 		console.log(chalk.bold("Copy-paste (from your current directory):"));
 		console.log();
 		console.log(chalk.cyan(`  ${oneLinerParts.join(" && ")}`));
@@ -1025,17 +1034,15 @@ function printWebappNextSteps(params) {
 		let step = 1;
 		if (repoRel !== ".") console.log(chalk.dim(`  ${step++}.`), `cd ${repoRel}`);
 		if (!answers.installDeps) console.log(chalk.dim(`  ${step++}.`), `${pm} install`);
+		console.log(chalk.dim(`  ${step++}.`), setupStep);
 		console.log(chalk.dim(`  ${step++}.`), `cd ${pkgFromRoot}`);
-		for (const cmd of pnpmSteps) console.log(chalk.dim(`  ${step++}.`), cmd);
+		console.log(chalk.dim(`  ${step++}.`), devStep);
 		return;
 	}
-	const pkgRel = shPath(packageRelativePath ?? ".") || ".";
 	const oneLinerParts = [];
-	if (!answers.installDeps) {
-		if (repoRel !== ".") oneLinerParts.push(`cd ${repoRel}`);
-		oneLinerParts.push(`${pm} install`, `cd ${pkgFromRoot}`);
-	} else if (pkgRel !== ".") oneLinerParts.push(`cd ${pkgRel}`);
-	oneLinerParts.push(...pnpmSteps);
+	if (repoRel !== ".") oneLinerParts.push(`cd ${repoRel}`);
+	if (!answers.installDeps) oneLinerParts.push(`${pm} install`);
+	oneLinerParts.push(setupStep, `cd ${pkgFromRoot}`, devStep);
 	console.log(chalk.bold("Copy-paste (from your current directory):"));
 	console.log();
 	console.log(chalk.cyan(`  ${oneLinerParts.join(" && ")}`));
@@ -1043,12 +1050,11 @@ function printWebappNextSteps(params) {
 	console.log(chalk.bold("Or step by step:"));
 	console.log();
 	let step = 1;
-	if (!answers.installDeps) {
-		if (repoRel !== ".") console.log(chalk.dim(`  ${step++}.`), `cd ${repoRel}`);
-		console.log(chalk.dim(`  ${step++}.`), `${pm} install`);
-		console.log(chalk.dim(`  ${step++}.`), `cd ${pkgFromRoot}`);
-	} else if (pkgRel !== ".") console.log(chalk.dim(`  ${step++}.`), `cd ${pkgRel}`);
-	for (const cmd of pnpmSteps) console.log(chalk.dim(`  ${step++}.`), cmd);
+	if (repoRel !== ".") console.log(chalk.dim(`  ${step++}.`), `cd ${repoRel}`);
+	if (!answers.installDeps) console.log(chalk.dim(`  ${step++}.`), `${pm} install`);
+	console.log(chalk.dim(`  ${step++}.`), setupStep);
+	console.log(chalk.dim(`  ${step++}.`), `cd ${pkgFromRoot}`);
+	console.log(chalk.dim(`  ${step++}.`), devStep);
 }
 async function warnIfMissingRootNpmrc(rootDir) {
 	const rootNpmrc = path.join(rootDir, ".npmrc");
@@ -1106,6 +1112,7 @@ function printNextStepsExisting(answers, packageDir) {
 	const packageRelativePath = path.relative(process.cwd(), packageDir) || ".";
 	const monorepoRoot = path.dirname(path.dirname(packageDir));
 	const monorepoRelativePath = path.relative(process.cwd(), monorepoRoot) || ".";
+	const packageRelativePathFromRoot = path.relative(monorepoRoot, packageDir) || ".";
 	console.log("Next steps:");
 	console.log();
 	switch (answers.projectType) {
@@ -1115,7 +1122,7 @@ function printNextStepsExisting(answers, packageDir) {
 				answers,
 				variant: "existing",
 				monorepoRelativePath,
-				packageRelativePath
+				packageRelativePathFromRoot
 			});
 			break;
 		case "library": {
@@ -1139,23 +1146,23 @@ program.name("create").description("Scaffold and manage Mosaic packages").versio
 }.version);
 program.command("create", { isDefault: true }).description("Scaffold a new Mosaic package").option("-t, --type <type>", "Package type: monorepo, webapp, or library").option("--name <name>", "Package/app name").option("--repo-name <name>", "Repository name when creating a new monorepo").option("--cwd <dir>", "Run create as if started from this directory").option("--skip-install", "Skip dependency installation (also skips the auto-run setup + dev + browser)", false).option("-y, --yes", "Skip all prompts and use defaults", false).action(createProject);
 program.command("status").description("Show template sync status for current app").option("--mosaic-template-path <path>", "Path to local mosaic repo checkout").action(async (options) => {
-	const { statusCommand } = await import("./status-DC8mvHZj.js");
+	const { statusCommand } = await import("./status-CKe4aKso.js");
 	await statusCommand(options);
 });
 program.command("sync").description("Generate downstream sync context (template → app)").option("--mosaic-template-path <path>", "Path to local mosaic repo checkout").option("--to <version>", "Target template version (default: latest)").action(async (options) => {
-	const { syncCommand } = await import("./sync-C5Pd32VM.js");
+	const { syncCommand } = await import("./sync-D1vkoofl.js");
 	await syncCommand(options);
 });
 program.command("upstream").description("Generate upstream context (app → template)").option("--mosaic-template-path <path>", "Path to local mosaic repo checkout").option("--files <patterns...>", "Specific files to propose upstream").action(async (options) => {
-	const { upstreamCommand } = await import("./upstream-F6m8zRBQ.js");
+	const { upstreamCommand } = await import("./upstream-D-LH_1z4.js");
 	await upstreamCommand(options);
 });
 program.command("init").description("Add .mosaic-template.json to an existing app").option("-t, --type <type>", "Template type (e.g., webapp, library)").option("--template-version <version>", "Template version to set").action(async (options) => {
-	const { initCommand } = await import("./init-OeK4Yk6_.js");
+	const { initCommand } = await import("./init-CtCp7Tv2.js");
 	await initCommand(options);
 });
 program.parse();
 //#endregion
-export { readManifest as a, manifestExists as i, isValidProjectType as n, resolveMosaicTemplatePath as o, derivePlaceholders as r, writeManifest as s, VALID_PROJECT_TYPES as t };
+export { manifestExists as a, writeManifest as c, derivePlaceholders as i, VALID_PROJECT_TYPES as n, readManifest as o, isValidProjectType as r, resolveMosaicTemplatePath as s, getTemplateVersion as t };
 
 //# sourceMappingURL=index.js.map