create-better-fullstack 2.1.3 → 2.1.5

package/dist/add-handler-BNSL6HdM.mjs

@@ -0,0 +1,257 @@
+#!/usr/bin/env node
+import { c as isSilent, g as updateBtsConfig, l as runWithContextAsync, m as readBtsConfig, n as UserCancelledError, t as CLIError, x as getDefaultConfig } from "./errors-Cyol8zbN.mjs";
+import { t as renderTitle } from "./render-title-zvyKC1ej.mjs";
+import { t as setupAddons } from "./addons-setup-CyrP1IV-.mjs";
+import "./file-formatter-B3dsev2l.mjs";
+import { c as applyDependencyVersionChannel, t as installDependencies, u as getAddonsToAdd } from "./install-dependencies-CgNh-aOy.mjs";
+import { a as applyStackUpdate, o as planStackUpdate } from "./mcp-entry.mjs";
+import { intro, log, outro } from "@clack/prompts";
+import pc from "picocolors";
+import fs from "fs-extra";
+import path from "node:path";
+import { EMBEDDED_TEMPLATES, VirtualFileSystem, processAddonTemplates, processAddonsDeps } from "@better-fullstack/template-generator";
+import { writeTreeToFilesystem } from "@better-fullstack/template-generator/fs-writer";
+
+//#region src/helpers/core/add-handler.ts
+const ADD_CONTROL_KEYS = new Set([
+	"projectDir",
+	"install",
+	"dryRun"
+]);
+function buildStackUpdateRequest(input) {
+	const request = {};
+	for (const [key, value] of Object.entries(input)) {
+		if (ADD_CONTROL_KEYS.has(key)) continue;
+		if (value === void 0 || value === false) continue;
+		if (Array.isArray(value) && value.length === 0) continue;
+		request[key] = value;
+	}
+	return request;
+}
+function getNewAddons(input, currentConfig) {
+	const requestedAddons = (input.addons ?? []).filter((addon) => addon !== "none");
+	const existingAddons = new Set(currentConfig.addons ?? []);
+	return requestedAddons.filter((addon) => !existingAddons.has(addon));
+}
+function formatCount(count, noun) {
+	return `${count} ${noun}${count === 1 ? "" : "s"}`;
+}
+function countDependencyChanges(plan) {
+	return Object.values(plan.dependencyChanges).reduce((count, deps) => count + Object.keys(deps).length, 0);
+}
+function countEnvChanges(plan) {
+	return Object.values(plan.envChanges).reduce((count, keys) => count + keys.length, 0);
+}
+function logStackUpdateSummary(plan, dryRun) {
+	if (isSilent()) return;
+	log.info(pc.cyan(dryRun ? "Stack update plan:" : "Stack update result:"));
+	const requestedFields = Object.keys(plan.requestedChanges);
+	if (requestedFields.length > 0) log.info(pc.dim(`Requested: ${requestedFields.sort().join(", ")}`));
+	if (plan.graphSummary) log.info(pc.dim(`Stack: ${plan.graphSummary}`));
+	if (plan.filesToAdd.length + plan.filesToPatch.length === 0 && plan.manualReviewBlockers.length === 0) log.info(pc.dim("No stack changes to apply."));
+	else log.info(pc.dim(`Files: ${formatCount(plan.filesToAdd.length, "file add")}, ${formatCount(plan.filesToPatch.length, "file update")}, ${formatCount(plan.filesUnchanged.length, "unchanged file")}`));
+	const dependencyCount = countDependencyChanges(plan);
+	if (dependencyCount > 0) log.info(pc.dim(`Dependencies: ${formatCount(dependencyCount, "change")}`));
+	const envCount = countEnvChanges(plan);
+	if (envCount > 0) log.info(pc.dim(`Env vars: ${formatCount(envCount, "addition")}`));
+	for (const adjustment of plan.compatibilityAdjustments) log.info(pc.dim(`Adjusted: ${adjustment}`));
+	for (const blocker of plan.manualReviewBlockers) log.warn(pc.yellow(`Manual review: ${blocker}`));
+}
+function buildAddonSetupConfig(projectDir, projectName, currentConfig, plan, addonsToSetup) {
+	const baseConfig = getDefaultConfig();
+	return {
+		...baseConfig,
+		...currentConfig,
+		...plan.proposedConfig,
+		projectName,
+		projectDir,
+		relativePath: ".",
+		packageManager: plan.proposedConfig.packageManager || currentConfig.packageManager || baseConfig.packageManager,
+		addons: addonsToSetup,
+		frontend: plan.proposedConfig.frontend || currentConfig.frontend || baseConfig.frontend,
+		examples: plan.proposedConfig.examples || currentConfig.examples || [],
+		rustLibraries: plan.proposedConfig.rustLibraries || currentConfig.rustLibraries || [],
+		pythonAi: plan.proposedConfig.pythonAi || currentConfig.pythonAi || [],
+		aiDocs: plan.proposedConfig.aiDocs || currentConfig.aiDocs || []
+	};
+}
+async function runStackUpdateAdd(input, projectDir, projectName, currentConfig, request) {
+	const dryRun = input.dryRun ?? false;
+	const result = dryRun ? await planStackUpdate(projectDir, request) : await applyStackUpdate(projectDir, request);
+	if (!result.success) throw new CLIError(result.error);
+	logStackUpdateSummary(result, dryRun);
+	if (dryRun) {
+		if (!isSilent()) outro(pc.magenta("Dry run complete. No files were written."));
+		return {
+			success: true,
+			addedAddons: [],
+			projectDir
+		};
+	}
+	const addonsToSetup = getNewAddons(input, currentConfig);
+	const setupConfig = buildAddonSetupConfig(projectDir, projectName, currentConfig, result, addonsToSetup);
+	const setupWarnings = addonsToSetup.length > 0 ? await setupAddons(setupConfig) : [];
+	await applyDependencyVersionChannel(projectDir, result.proposedConfig.versionChannel);
+	let installFailed = false;
+	if (input.install) {
+		if (result.proposedConfig.ecosystem === "typescript" || result.proposedConfig.ecosystem === "react-native") installFailed = !(await installDependencies({
+			projectDir,
+			packageManager: setupConfig.packageManager
+		})).success;
+		else if (!isSilent()) log.warn(pc.yellow(`Automatic --install is only supported for JavaScript package-manager installs. Run '${result.installCommand}' instead.`));
+	}
+	if (!isSilent()) {
+		if (addonsToSetup.length > 0) log.success(pc.green(`Successfully added: ${addonsToSetup.join(", ")}`));
+		else if ((input.addons ?? []).some((addon) => addon !== "none")) log.info(pc.dim("No new addons selected."));
+		log.success(pc.green("Stack update applied."));
+		for (const warning of setupWarnings) log.warn(pc.yellow(warning));
+		if (!input.install) log.info(pc.yellow(`Run '${result.installCommand}' to install new dependencies.`));
+		else if (installFailed) log.warn(pc.yellow(`Dependency installation failed. Run '${result.installCommand}' after resolving the error above.`));
+		outro(pc.magenta("Project updated successfully!"));
+	}
+	return {
+		success: true,
+		addedAddons: addonsToSetup,
+		projectDir,
+		setupWarnings: setupWarnings.length > 0 ? setupWarnings : void 0
+	};
+}
+async function addHandler(input, options = {}) {
+	const { silent = false } = options;
+	return runWithContextAsync({ silent }, async () => {
+		try {
+			return await addHandlerInternal(input);
+		} catch (error) {
+			if (error instanceof UserCancelledError) {
+				if (isSilent()) return {
+					success: false,
+					addedAddons: [],
+					projectDir: "",
+					error: error.message
+				};
+				return;
+			}
+			if (error instanceof CLIError) {
+				if (isSilent()) return {
+					success: false,
+					addedAddons: [],
+					projectDir: "",
+					error: error.message
+				};
+				throw error;
+			}
+			if (isSilent()) return {
+				success: false,
+				addedAddons: [],
+				projectDir: "",
+				error: error instanceof Error ? error.message : String(error)
+			};
+			throw error;
+		}
+	});
+}
+async function addHandlerInternal(input) {
+	const projectDir = path.resolve(input.projectDir || process.cwd());
+	if (!isSilent()) {
+		renderTitle();
+		intro(pc.magenta("Update your Better Fullstack project"));
+	}
+	const btsConfig = await readBtsConfig(projectDir);
+	if (!btsConfig) throw new CLIError(`No Better Fullstack project found in ${projectDir}. Make sure bts.jsonc exists.`);
+	const projectName = path.basename(projectDir);
+	if (!isSilent()) log.info(pc.dim(`Detected project: ${projectName}`));
+	const stackUpdateRequest = buildStackUpdateRequest(input);
+	if (Object.keys(stackUpdateRequest).length > 0 || input.dryRun) return runStackUpdateAdd(input, projectDir, projectName, btsConfig, stackUpdateRequest);
+	const existingAddons = btsConfig.addons || [];
+	let addonsToAdd = [];
+	if (input.addons && input.addons.length > 0) addonsToAdd = input.addons.filter((addon) => addon !== "none" && !existingAddons.includes(addon));
+	else addonsToAdd = (await getAddonsToAdd(btsConfig.frontend || [], existingAddons, btsConfig.auth)).filter((addon) => addon !== "none");
+	if (addonsToAdd.length === 0) {
+		if (!isSilent()) {
+			log.info(pc.dim("No new addons selected."));
+			outro(pc.magenta("Nothing to add."));
+		}
+		return {
+			success: true,
+			addedAddons: [],
+			projectDir
+		};
+	}
+	if (!isSilent()) log.info(pc.cyan(`Adding addons: ${addonsToAdd.join(", ")}`));
+	const baseConfig = getDefaultConfig();
+	const config = {
+		...baseConfig,
+		...btsConfig,
+		projectName,
+		projectDir,
+		relativePath: ".",
+		packageManager: input.packageManager || btsConfig.packageManager || baseConfig.packageManager,
+		addons: addonsToAdd,
+		frontend: btsConfig.frontend || baseConfig.frontend,
+		examples: btsConfig.examples || [],
+		rustLibraries: btsConfig.rustLibraries || [],
+		pythonAi: btsConfig.pythonAi || [],
+		aiDocs: btsConfig.aiDocs || []
+	};
+	const vfs = new VirtualFileSystem();
+	const packageJsonPaths = await collectPackageJsonPaths(projectDir);
+	for (const pkgPath of packageJsonPaths) {
+		const fullPath = path.join(projectDir, pkgPath);
+		const content = await fs.readFile(fullPath, "utf-8");
+		vfs.writeFile(pkgPath, content);
+	}
+	await processAddonTemplates(vfs, EMBEDDED_TEMPLATES, config);
+	processAddonsDeps(vfs, config);
+	await writeTreeToFilesystem({
+		root: vfs.toTree(projectName),
+		fileCount: vfs.getFileCount(),
+		directoryCount: vfs.getDirectoryCount(),
+		config
+	}, projectDir);
+	const setupWarnings = await setupAddons(config);
+	await applyDependencyVersionChannel(projectDir, config.versionChannel);
+	const configUpdates = { addons: [...new Set([...existingAddons, ...addonsToAdd])] };
+	if (input.webDeploy !== void 0) configUpdates.webDeploy = input.webDeploy;
+	if (input.serverDeploy !== void 0) configUpdates.serverDeploy = input.serverDeploy;
+	await updateBtsConfig(projectDir, configUpdates);
+	let addonInstallFailed = false;
+	if (input.install) addonInstallFailed = !(await installDependencies({
+		projectDir,
+		packageManager: config.packageManager
+	})).success;
+	if (!isSilent()) {
+		log.success(pc.green(`Successfully added: ${addonsToAdd.join(", ")}`));
+		for (const warning of setupWarnings) log.warn(pc.yellow(warning));
+		const installCmd = config.packageManager === "npm" ? "npm install" : `${config.packageManager} install`;
+		if (!input.install) log.info(pc.yellow(`Run '${installCmd}' to install new dependencies.`));
+		else if (addonInstallFailed) log.warn(pc.yellow(`Dependency installation failed. Run '${installCmd}' after resolving the error above.`));
+		outro(pc.magenta("Addons added successfully!"));
+	}
+	return {
+		success: true,
+		addedAddons: addonsToAdd,
+		projectDir,
+		setupWarnings: setupWarnings.length > 0 ? setupWarnings : void 0
+	};
+}
+async function collectPackageJsonPaths(projectDir) {
+	const results = [];
+	async function walk(currentDir) {
+		const entries = await fs.readdir(currentDir, { withFileTypes: true });
+		for (const entry of entries) {
+			if (entry.name === "node_modules" || entry.name === ".git" || entry.name === ".turbo") continue;
+			const fullPath = path.join(currentDir, entry.name);
+			if (entry.isDirectory()) {
+				await walk(fullPath);
+				continue;
+			}
+			if (entry.isFile() && entry.name === "package.json") results.push(path.relative(projectDir, fullPath).replaceAll(path.sep, "/"));
+		}
+	}
+	await walk(projectDir);
+	if (!results.includes("package.json") && await fs.pathExists(path.join(projectDir, "package.json"))) results.push("package.json");
+	return results;
+}
+
+//#endregion
+export { addHandler };

package/dist/{addons-setup-C_xrNtkL.mjs → addons-setup-CyrP1IV-.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { c as isSilent, m as readBtsConfig, r as exitCancelled } from "./errors-D9yiiGVq.mjs";
+import { c as isSilent, m as readBtsConfig, r as exitCancelled } from "./errors-Cyol8zbN.mjs";
 import { autocompleteMultiselect, group, isCancel, log, multiselect, select, spinner } from "@clack/prompts";
 import pc from "picocolors";
 import fs from "fs-extra";

package/dist/addons-setup-DyMm42a5.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import "./errors-Cyol8zbN.mjs";
+import { t as setupAddons } from "./addons-setup-CyrP1IV-.mjs";
+
+export { setupAddons };

package/dist/cli.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 //#region src/cli.ts
-if (process.argv[2] === "mcp" && process.argv.length === 3) import("./mcp-BXLhb7wW.mjs").then((m) => m.startMcpServer());
-else import("./run-BmRKR2wG.mjs").then((m) => m.createBtsCli().run());
+if (process.argv[2] === "mcp" && process.argv.length === 3) import("./mcp-CsW3i66c.mjs").then((m) => m.startMcpServer());
+else import("./run-_cf_sFwM.mjs").then((m) => m.createBtsCli().run());
 
 //#endregion
 export {  };

package/dist/{doctor-BFSSbS-U.mjs → doctor-DBoq7bZ9.mjs}

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { a as handleError, m as readBtsConfig } from "./errors-D9yiiGVq.mjs";
+import { a as handleError, m as readBtsConfig } from "./errors-Cyol8zbN.mjs";
 import { t as renderTitle } from "./render-title-zvyKC1ej.mjs";
-import { t as runGeneratedChecks } from "./generated-checks-DUvVXWId.mjs";
+import { t as runGeneratedChecks } from "./generated-checks-C8hn9w2i.mjs";
 import { intro, log, spinner } from "@clack/prompts";
 import pc from "picocolors";
 import fs from "fs-extra";

package/dist/{errors-D9yiiGVq.mjs → errors-Cyol8zbN.mjs}

@@ -73,7 +73,7 @@ const TOOL_LABELS = {
 	"spring-data-jpa": "Spring Data JPA"
 };
 function getSelectedGraphParts(config) {
-	return (config.stackParts ?? []).filter((part) => part.source !== "provided");
+	return (config.stackParts ?? []).filter((part) => part.source !== "provided" && part.toolId !== "none");
 }
 function getGraphPart(config, role, ecosystem) {
 	return getSelectedGraphParts(config).find((part) => part.role === role && (!ecosystem || part.ecosystem === ecosystem));
@@ -244,6 +244,22 @@ const MOBILE_CONFIG_FIELDS = [
 	"mobileOTA",
 	"mobileDeepLinking"
 ];
+const MOBILE_CONFIG_FIELD_ROLES = {
+	mobileNavigation: "navigation",
+	mobileUI: "ui",
+	mobileStorage: "storage",
+	mobileTesting: "testing",
+	mobilePush: "push",
+	mobileOTA: "ota",
+	mobileDeepLinking: "deepLinking"
+};
+function hasExplicitMobileGraphField(stackParts, field) {
+	const role = MOBILE_CONFIG_FIELD_ROLES[field];
+	return stackParts.some((part) => {
+		if (part.source === "provided" || part.role !== role || part.ecosystem !== "react-native") return false;
+		return (part.ownerPartId ? stackParts.find((candidate) => candidate.id === part.ownerPartId) : void 0)?.role === "mobile";
+	});
+}
 function normalizeGraphConfigForPersistence(projectConfig, stackParts) {
 	if (!stackParts) return projectConfig;
 	const legacyConfig = (0, types_exports.stackPartsToLegacyProjectConfigPartial)(stackParts);
@@ -349,7 +365,7 @@ function normalizeGraphConfigForPersistence(projectConfig, stackParts) {
 	if (hasNativeFrontend) for (const field of MOBILE_CONFIG_FIELDS) {
 		const projectValue = projectConfig[field];
 		const legacyValue = legacyConfig[field];
-		if (projectValue !== void 0 && projectValue !== "none" && legacyValue === "none") normalized[field] = projectValue;
+		if (projectValue !== void 0 && projectValue !== "none" && legacyValue === "none" && !hasExplicitMobileGraphField(stackParts, field)) normalized[field] = projectValue;
 	}
 	if (!selectedEcosystems.has("react-native") && !hasNativeFrontend) {
 		normalized.mobileNavigation = "none";