create-better-fullstack 1.6.0 → 1.6.1

package/dist/{addons-setup--oB72n29.mjs → addons-setup-Cgup_RHm.mjs}

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { s as dependencyVersionMap, t as readBtsConfig } from "./bts-config-snHxP_EH.mjs";
+import { s as dependencyVersionMap, t as readBtsConfig } from "./bts-config-B_rZ4_sj.mjs";
 import { autocompleteMultiselect, cancel, group, isCancel, log, multiselect, select, spinner } from "@clack/prompts";
 import pc from "picocolors";
 import fs from "fs-extra";
@@ -178,6 +178,48 @@ function getPackageRunnerPrefix(packageManager) {
 	}
 }
 
+//#endregion
+//#region src/utils/prompt-environment.ts
+function hasOwnProperty(value, property) {
+	return Object.prototype.hasOwnProperty.call(value, property);
+}
+function resolveCiValue(environment) {
+	if (environment && hasOwnProperty(environment, "ci")) return environment.ci;
+	return process.env.CI;
+}
+function isCiEnvironment(value) {
+	if (!value) return false;
+	const normalizedValue = value.trim().toLowerCase();
+	return normalizedValue !== "" && normalizedValue !== "0" && normalizedValue !== "false";
+}
+function canPromptInteractively(environment = {}) {
+	const silent = environment.silent ?? isSilent();
+	const stdinIsTTY = environment.stdinIsTTY ?? process.stdin.isTTY === true;
+	const stdoutIsTTY = environment.stdoutIsTTY ?? process.stdout.isTTY === true;
+	const ci = resolveCiValue(environment);
+	return !silent && stdinIsTTY && stdoutIsTTY && !isCiEnvironment(ci);
+}
+
+//#endregion
+//#region src/helpers/addons/interactive-selection.ts
+function shouldPromptForAddonSelection(environment = {}) {
+	return canPromptInteractively(environment);
+}
+async function selectAddonOptionOrDefault({ addonName, message, options, defaultValue }) {
+	if (!shouldPromptForAddonSelection()) {
+		const fallback = options.find((option) => option.value === defaultValue);
+		if (!isSilent() && fallback) log.info(`Using default ${addonName} template: ${fallback.label}`);
+		return defaultValue;
+	}
+	const selection = await select({
+		message,
+		options,
+		initialValue: defaultValue
+	});
+	if (isCancel(selection)) return exitCancelled("Operation cancelled");
+	return selection;
+}
+
 //#endregion
 //#region src/helpers/addons/fumadocs-setup.ts
 const TEMPLATES$2 = {
@@ -211,17 +253,16 @@ async function setupFumadocs(config) {
 	const { packageManager, projectDir } = config;
 	try {
 		log.info("Setting up Fumadocs...");
-		const template = await select({
+		const args = getPackageExecutionArgs(packageManager, `create-fumadocs-app@latest fumadocs --template ${TEMPLATES$2[await selectAddonOptionOrDefault({
+			addonName: "Fumadocs",
 			message: "Choose a template",
-			options: Object.entries(TEMPLATES$2).map(([key, template$1]) => ({
+			options: Object.entries(TEMPLATES$2).map(([key, template]) => ({
 				value: key,
-				label: template$1.label,
-				hint: template$1.hint
+				label: template.label,
+				hint: template.hint
 			})),
-			initialValue: "next-mdx"
-		});
-		if (isCancel(template)) return exitCancelled("Operation cancelled");
-		const args = getPackageExecutionArgs(packageManager, `create-fumadocs-app@latest fumadocs --template ${TEMPLATES$2[template].value} --src --pm ${packageManager} --no-git`);
+			defaultValue: "next-mdx"
+		})].value} --src --pm ${packageManager} --no-git`);
 		const appsDir = path.join(projectDir, "apps");
 		await fs.ensureDir(appsDir);
 		const s = spinner();
@@ -445,51 +486,63 @@ function filterAgentsForScope(scope) {
 	return MCP_AGENTS.filter((a) => a.scope === "both" || a.scope === scope);
 }
 async function setupMcp(config) {
-	if (shouldSkipExternalCommands()) return;
 	const { packageManager, projectDir } = config;
 	log.info("Setting up MCP servers...");
-	const scope = await select({
-		message: "Where should MCP servers be installed?",
-		options: [{
-			value: "project",
-			label: "Project",
-			hint: "Writes to project config files (recommended for teams)"
-		}, {
-			value: "global",
-			label: "Global",
-			hint: "Writes to user-level config files (personal machine)"
-		}],
-		initialValue: "project"
-	});
-	if (isCancel(scope)) return;
+	const skipExternalCommands = shouldSkipExternalCommands();
+	const canPrompt = canPromptInteractively() && !skipExternalCommands;
 	const recommendedServers = getRecommendedMcpServers(config);
 	if (recommendedServers.length === 0) return;
-	const selectedServerKeys = await multiselect({
-		message: "Select MCP servers to install",
-		options: recommendedServers.map((server) => ({
-			value: server.key,
-			label: server.label,
-			hint: server.target
-		})),
-		required: false,
-		initialValues: recommendedServers.map((server) => server.key)
-	});
-	if (isCancel(selectedServerKeys) || selectedServerKeys.length === 0) return;
+	let scope = "project";
+	let selectedServerKeys = recommendedServers.map((server) => server.key);
+	if (canPrompt) {
+		const promptedScope = await select({
+			message: "Where should MCP servers be installed?",
+			options: [{
+				value: "project",
+				label: "Project",
+				hint: "Writes to project config files (recommended for teams)"
+			}, {
+				value: "global",
+				label: "Global",
+				hint: "Writes to user-level config files (personal machine)"
+			}],
+			initialValue: "project"
+		});
+		if (isCancel(promptedScope)) return;
+		scope = promptedScope;
+		const promptedServerKeys = await multiselect({
+			message: "Select MCP servers to install",
+			options: recommendedServers.map((server) => ({
+				value: server.key,
+				label: server.label,
+				hint: server.target
+			})),
+			required: false,
+			initialValues: selectedServerKeys
+		});
+		if (isCancel(promptedServerKeys) || promptedServerKeys.length === 0) return;
+		selectedServerKeys = [...promptedServerKeys];
+	}
 	const agentOptions = filterAgentsForScope(scope).map((a) => ({
 		value: a.value,
 		label: a.label
 	}));
-	const selectedAgents = await multiselect({
-		message: "Select agents to install MCP servers to",
-		options: agentOptions,
-		required: false,
-		initialValues: uniqueValues$1([
-			"cursor",
-			"claude-code",
-			"vscode"
-		].filter((agent) => agentOptions.some((option) => option.value === agent)))
-	});
-	if (isCancel(selectedAgents) || selectedAgents.length === 0) return;
+	const defaultAgents = uniqueValues$1([
+		"cursor",
+		"claude-code",
+		"vscode"
+	].filter((agent) => agentOptions.some((option) => option.value === agent)));
+	let selectedAgents = defaultAgents;
+	if (canPrompt) {
+		const promptedAgents = await multiselect({
+			message: "Select agents to install MCP servers to",
+			options: agentOptions,
+			required: false,
+			initialValues: defaultAgents
+		});
+		if (isCancel(promptedAgents) || promptedAgents.length === 0) return;
+		selectedAgents = [...promptedAgents];
+	}
 	const serversByKey = new Map(recommendedServers.map((server) => [server.key, server]));
 	const selectedServers = [];
 	for (const key of selectedServerKeys) {
@@ -497,6 +550,7 @@ async function setupMcp(config) {
 		if (server) selectedServers.push(server);
 	}
 	if (selectedServers.length === 0) return;
+	if (skipExternalCommands) return;
 	const installSpinner = spinner();
 	installSpinner.start("Installing MCP servers...");
 	const runner = getPackageRunnerPrefix(packageManager);
@@ -1017,17 +1071,16 @@ async function setupTui(config) {
 	const { packageManager, projectDir } = config;
 	try {
 		log.info("Setting up OpenTUI...");
-		const template = await select({
+		const args = getPackageExecutionArgs(packageManager, `create-tui@latest --template ${await selectAddonOptionOrDefault({
+			addonName: "OpenTUI",
 			message: "Choose a template",
-			options: Object.entries(TEMPLATES$1).map(([key, template$1]) => ({
+			options: Object.entries(TEMPLATES$1).map(([key, template]) => ({
 				value: key,
-				label: template$1.label,
-				hint: template$1.hint
+				label: template.label,
+				hint: template.hint
 			})),
-			initialValue: "core"
-		});
-		if (isCancel(template)) return exitCancelled("Operation cancelled");
-		const args = getPackageExecutionArgs(packageManager, `create-tui@latest --template ${template} --no-git --no-install tui`);
+			defaultValue: "core"
+		})} --no-git --no-install tui`);
 		const appsDir = path.join(projectDir, "apps");
 		await fs.ensureDir(appsDir);
 		const s = spinner();
@@ -1123,7 +1176,9 @@ async function setupUltracite(config, gitHooks) {
 	const { packageManager, projectDir, frontend } = config;
 	try {
 		log.info("Setting up Ultracite...");
-		const result = await group({
+		const skipExternalCommands = shouldSkipExternalCommands();
+		const canPrompt = canPromptInteractively() && !skipExternalCommands;
+		const result = canPrompt ? await group({
 			linter: () => select({
 				message: "Choose linter/formatter",
 				options: Object.entries(LINTERS).map(([key, linter$1]) => ({
@@ -1158,7 +1213,12 @@ async function setupUltracite(config, gitHooks) {
 			})
 		}, { onCancel: () => {
 			exitCancelled("Operation cancelled");
-		} });
+		} }) : {
+			linter: "biome",
+			editors: [],
+			agents: [],
+			hooks: []
+		};
 		const linter = result.linter;
 		const editors = result.editors;
 		const agents = result.agents;
@@ -1171,6 +1231,7 @@ async function setupUltracite(config, gitHooks) {
 			"--linter",
 			linter
 		];
+		if (!canPrompt) ultraciteArgs.push("--quiet");
 		if (frameworks.length > 0) ultraciteArgs.push("--frameworks", ...frameworks);
 		if (editors.length > 0) ultraciteArgs.push("--editors", ...editors);
 		if (agents.length > 0) ultraciteArgs.push("--agents", ...agents);
@@ -1180,6 +1241,7 @@ async function setupUltracite(config, gitHooks) {
 			if (gitHooks.includes("husky")) integrations.push("lint-staged");
 			ultraciteArgs.push("--integrations", ...integrations);
 		}
+		if (skipExternalCommands) return;
 		const args = getPackageExecutionArgs(packageManager, `ultracite@latest ${ultraciteArgs.join(" ")} --skip-install`);
 		const s = spinner();
 		s.start("Running Ultracite init command...");
@@ -1222,17 +1284,16 @@ async function setupWxt(config) {
 	const { packageManager, projectDir } = config;
 	try {
 		log.info("Setting up WXT...");
-		const template = await select({
+		const args = getPackageExecutionArgs(packageManager, `wxt@latest init extension --template ${await selectAddonOptionOrDefault({
+			addonName: "WXT",
 			message: "Choose a template",
-			options: Object.entries(TEMPLATES).map(([key, template$1]) => ({
+			options: Object.entries(TEMPLATES).map(([key, template]) => ({
 				value: key,
-				label: template$1.label,
-				hint: template$1.hint
+				label: template.label,
+				hint: template.hint
 			})),
-			initialValue: "react"
-		});
-		if (isCancel(template)) return exitCancelled("Operation cancelled");
-		const args = getPackageExecutionArgs(packageManager, `wxt@latest init extension --template ${template} --pm ${packageManager}`);
+			defaultValue: "react"
+		})} --pm ${packageManager}`);
 		const appsDir = path.join(projectDir, "apps");
 		await fs.ensureDir(appsDir);
 		const s = spinner();
@@ -1346,4 +1407,4 @@ async function setupLefthook(projectDir) {
 }
 
 //#endregion
-export { setLastPromptShownUI as _, getPackageExecutionArgs as a, UserCancelledError as c, handleError as d, didLastPromptShowUI as f, setIsFirstPrompt as g, runWithContextAsync as h, setupLefthook as i, exitCancelled as l, isSilent as m, setupBiome as n, addPackageDependency as o, isFirstPrompt as p, setupHusky as r, CLIError as s, setupAddons as t, exitWithError as u };
+export { setIsFirstPrompt as _, canPromptInteractively as a, CLIError as c, exitWithError as d, handleError as f, runWithContextAsync as g, isSilent as h, setupLefthook as i, UserCancelledError as l, isFirstPrompt as m, setupBiome as n, getPackageExecutionArgs as o, didLastPromptShowUI as p, setupHusky as r, addPackageDependency as s, setupAddons as t, exitCancelled as u, setLastPromptShownUI as v };

package/dist/addons-setup-Cx9DU_sr.mjs

@@ -0,0 +1,5 @@
+#!/usr/bin/env node
+import "./bts-config-B_rZ4_sj.mjs";
+import { i as setupLefthook, n as setupBiome, r as setupHusky, t as setupAddons } from "./addons-setup-Cgup_RHm.mjs";
+
+export { setupAddons };

package/dist/{bts-config-snHxP_EH.mjs → bts-config-B_rZ4_sj.mjs}

@@ -2,6 +2,7 @@
 import fs from "fs-extra";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
+import { createCliDefaultProjectConfigBase } from "@better-fullstack/types";
 import { dependencyVersionMap } from "@better-fullstack/template-generator";
 import * as JSONC from "jsonc-parser";
 
@@ -10,6 +11,7 @@ const getUserPkgManager = () => {
 	const userAgent = process.env.npm_config_user_agent;
 	if (userAgent?.startsWith("pnpm")) return "pnpm";
 	if (userAgent?.startsWith("bun")) return "bun";
+	if (userAgent?.startsWith("yarn")) return "yarn";
 	return "npm";
 };
 
@@ -18,79 +20,7 @@ const getUserPkgManager = () => {
 const __filename = fileURLToPath(import.meta.url);
 const distPath = path.dirname(__filename);
 const PKG_ROOT = path.join(distPath, "../");
-const DEFAULT_CONFIG_BASE = {
-	projectName: "my-app",
-	relativePath: "my-app",
-	ecosystem: "typescript",
-	frontend: ["tanstack-router"],
-	database: "sqlite",
-	orm: "drizzle",
-	auth: "better-auth",
-	payments: "none",
-	email: "none",
-	fileUpload: "none",
-	effect: "none",
-	stateManagement: "none",
-	validation: "zod",
-	forms: "react-hook-form",
-	testing: "vitest",
-	ai: "none",
-	realtime: "none",
-	jobQueue: "none",
-	caching: "none",
-	i18n: "none",
-	search: "none",
-	fileStorage: "none",
-	animation: "none",
-	logging: "none",
-	observability: "none",
-	featureFlags: "none",
-	analytics: "none",
-	cms: "none",
-	addons: ["turborepo"],
-	examples: [],
-	git: true,
-	install: true,
-	versionChannel: "stable",
-	dbSetup: "none",
-	backend: "hono",
-	runtime: "bun",
-	api: "trpc",
-	webDeploy: "none",
-	serverDeploy: "none",
-	cssFramework: "tailwind",
-	uiLibrary: "shadcn-ui",
-	shadcnBase: "radix",
-	shadcnStyle: "nova",
-	shadcnIconLibrary: "lucide",
-	shadcnColorTheme: "neutral",
-	shadcnBaseColor: "neutral",
-	shadcnFont: "inter",
-	shadcnRadius: "default",
-	rustWebFramework: "none",
-	rustFrontend: "none",
-	rustOrm: "none",
-	rustApi: "none",
-	rustCli: "none",
-	rustLibraries: [],
-	rustLogging: "tracing",
-	rustErrorHandling: "anyhow-thiserror",
-	rustCaching: "none",
-	pythonWebFramework: "fastapi",
-	pythonOrm: "sqlalchemy",
-	pythonValidation: "pydantic",
-	pythonAi: [],
-	pythonAuth: "none",
-	pythonTaskQueue: "none",
-	pythonGraphql: "none",
-	pythonQuality: "ruff",
-	goWebFramework: "gin",
-	goOrm: "gorm",
-	goApi: "none",
-	goCli: "none",
-	goLogging: "zap",
-	aiDocs: ["claude-md"]
-};
+const DEFAULT_CONFIG_BASE = createCliDefaultProjectConfigBase(getUserPkgManager());
 function getDefaultConfig() {
 	return {
 		...DEFAULT_CONFIG_BASE,
@@ -101,6 +31,8 @@ function getDefaultConfig() {
 		examples: [...DEFAULT_CONFIG_BASE.examples],
 		rustLibraries: [...DEFAULT_CONFIG_BASE.rustLibraries],
 		pythonAi: [...DEFAULT_CONFIG_BASE.pythonAi],
+		javaLibraries: [...DEFAULT_CONFIG_BASE.javaLibraries],
+		javaTestingLibraries: [...DEFAULT_CONFIG_BASE.javaTestingLibraries],
 		aiDocs: [...DEFAULT_CONFIG_BASE.aiDocs]
 	};
 }
@@ -191,6 +123,7 @@ async function writeBtsConfig(projectConfig) {
 		rustLogging: projectConfig.rustLogging,
 		rustErrorHandling: projectConfig.rustErrorHandling,
 		rustCaching: projectConfig.rustCaching,
+		rustAuth: projectConfig.rustAuth,
 		pythonWebFramework: projectConfig.pythonWebFramework,
 		pythonOrm: projectConfig.pythonOrm,
 		pythonValidation: projectConfig.pythonValidation,
@@ -204,6 +137,13 @@ async function writeBtsConfig(projectConfig) {
 		goApi: projectConfig.goApi,
 		goCli: projectConfig.goCli,
 		goLogging: projectConfig.goLogging,
+		goAuth: projectConfig.goAuth,
+		javaWebFramework: projectConfig.javaWebFramework,
+		javaBuildTool: projectConfig.javaBuildTool,
+		javaOrm: projectConfig.javaOrm,
+		javaAuth: projectConfig.javaAuth,
+		javaLibraries: projectConfig.javaLibraries,
+		javaTestingLibraries: projectConfig.javaTestingLibraries,
 		aiDocs: projectConfig.aiDocs
 	};
 	const baseContent = {
@@ -257,6 +197,7 @@ async function writeBtsConfig(projectConfig) {
 		rustLogging: btsConfig.rustLogging,
 		rustErrorHandling: btsConfig.rustErrorHandling,
 		rustCaching: btsConfig.rustCaching,
+		rustAuth: btsConfig.rustAuth,
 		pythonWebFramework: btsConfig.pythonWebFramework,
 		pythonOrm: btsConfig.pythonOrm,
 		pythonValidation: btsConfig.pythonValidation,
@@ -269,6 +210,13 @@ async function writeBtsConfig(projectConfig) {
 		goApi: btsConfig.goApi,
 		goCli: btsConfig.goCli,
 		goLogging: btsConfig.goLogging,
+		goAuth: btsConfig.goAuth,
+		javaWebFramework: btsConfig.javaWebFramework,
+		javaBuildTool: btsConfig.javaBuildTool,
+		javaOrm: btsConfig.javaOrm,
+		javaAuth: btsConfig.javaAuth,
+		javaLibraries: btsConfig.javaLibraries,
+		javaTestingLibraries: btsConfig.javaTestingLibraries,
 		aiDocs: btsConfig.aiDocs
 	};
 	let configContent = JSON.stringify(baseContent);

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 //#region src/cli.ts
-if (process.argv[2] === "mcp" && process.argv.length === 3) import("./mcp-Bx_Esljk.mjs").then((m) => m.startMcpServer());
+if (process.argv[2] === "mcp" && process.argv.length === 3) import("./mcp-CuEEG8e5.mjs").then((m) => m.startMcpServer());
 else import("./index.mjs").then((m) => m.createBtsCli().run());
 
 //#endregion