create-better-fullstack 2.1.7 → 2.1.8

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-492OkjcS.mjs").then((m) => m.startMcpServer());
-else import("./run-buK4aZS8.mjs").then((m) => m.createBtsCli().run());
+else import("./run-CD8f7PHh.mjs").then((m) => m.createBtsCli().run());
 
 //#endregion
 export {  };

package/dist/index.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import "./bts-config-DQVWvPDs.mjs";
-import { a as createBtsCli, c as history, d as telemetry, f as update, i as create, l as router, n as builder, o as docs, r as check, s as doctor, t as add, u as sponsors } from "./run-D9I7NdES.mjs";
+import { a as createBtsCli, c as history, d as telemetry, f as update, i as create, l as router, n as builder, o as docs, r as check, s as doctor, t as add, u as sponsors } from "./run-T6g1jkfy.mjs";
 import "./render-title-zvyKC1ej.mjs";
 import "./errors-ns_o2OKg.mjs";
 import "./prompt-environment-BR0Kkw2W.mjs";

package/dist/{run-buK4aZS8.mjs → run-CD8f7PHh.mjs}

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import "./bts-config-DQVWvPDs.mjs";
-import { a as createBtsCli, c as history, d as telemetry, f as update, i as create, l as router, n as builder, o as docs, r as check, s as doctor, t as add, u as sponsors } from "./run-D9I7NdES.mjs";
+import { a as createBtsCli, c as history, d as telemetry, f as update, i as create, l as router, n as builder, o as docs, r as check, s as doctor, t as add, u as sponsors } from "./run-T6g1jkfy.mjs";
 import "./render-title-zvyKC1ej.mjs";
 import "./errors-ns_o2OKg.mjs";
 import "./prompt-environment-BR0Kkw2W.mjs";

package/dist/{run-D9I7NdES.mjs → run-T6g1jkfy.mjs}

@@ -3698,11 +3698,11 @@ async function getJavaLanguageChoice(javaLanguage) {
 	if (isCancel$1(response)) return exitCancelled("Operation cancelled");
 	return response;
 }
-function resolveJavaBuildToolPrompt(javaBuildTool) {
-	return createStaticSinglePromptResolution(JAVA_BUILD_TOOL_PROMPT_OPTIONS, "maven", javaBuildTool);
+function resolveJavaBuildToolPrompt(javaBuildTool, javaLanguage) {
+	return createStaticSinglePromptResolution(javaLanguage === "kotlin" ? JAVA_BUILD_TOOL_PROMPT_OPTIONS.filter((option) => option.value !== "none") : JAVA_BUILD_TOOL_PROMPT_OPTIONS, "maven", javaBuildTool);
 }
-async function getJavaBuildToolChoice(javaBuildTool) {
-	const resolution = resolveJavaBuildToolPrompt(javaBuildTool);
+async function getJavaBuildToolChoice(javaBuildTool, javaLanguage) {
+	const resolution = resolveJavaBuildToolPrompt(javaBuildTool, javaLanguage);
 	if (!resolution.shouldPrompt) return resolution.autoValue ?? "none";
 	const response = await navigableSelect({
 		message: "Select Java build tool",
@@ -3712,11 +3712,11 @@ async function getJavaBuildToolChoice(javaBuildTool) {
 	if (isCancel$1(response)) return exitCancelled("Operation cancelled");
 	return response;
 }
-function resolveJavaOrmPrompt(javaOrm) {
-	return createStaticSinglePromptResolution(JAVA_ORM_PROMPT_OPTIONS, "none", javaOrm);
+function resolveJavaOrmPrompt(javaOrm, javaLanguage) {
+	return createStaticSinglePromptResolution(javaLanguage === "kotlin" ? JAVA_ORM_PROMPT_OPTIONS.filter((option) => option.value !== "jooq" && option.value !== "mybatis") : JAVA_ORM_PROMPT_OPTIONS, "none", javaOrm);
 }
-async function getJavaOrmChoice(javaOrm) {
-	const resolution = resolveJavaOrmPrompt(javaOrm);
+async function getJavaOrmChoice(javaOrm, javaLanguage) {
+	const resolution = resolveJavaOrmPrompt(javaOrm, javaLanguage);
 	if (!resolution.shouldPrompt) return resolution.autoValue ?? "none";
 	const response = await navigableSelect({
 		message: "Select Java ORM/database layer",
@@ -3740,11 +3740,11 @@ async function getJavaAuthChoice(javaAuth) {
 	if (isCancel$1(response)) return exitCancelled("Operation cancelled");
 	return response;
 }
-function resolveJavaLibrariesPrompt(javaLibraries) {
-	return createStaticMultiPromptResolution(JAVA_LIBRARY_PROMPT_OPTIONS, [], javaLibraries);
+function resolveJavaLibrariesPrompt(javaLibraries, javaLanguage) {
+	return createStaticMultiPromptResolution(javaLanguage === "kotlin" ? JAVA_LIBRARY_PROMPT_OPTIONS.filter((option) => !types_exports.KOTLIN_DROPPED_JAVA_LIBRARIES.has(option.value)) : JAVA_LIBRARY_PROMPT_OPTIONS, [], javaLibraries);
 }
-async function getJavaLibrariesChoice(javaLibraries) {
-	const resolution = resolveJavaLibrariesPrompt(javaLibraries);
+async function getJavaLibrariesChoice(javaLibraries, javaLanguage) {
+	const resolution = resolveJavaLibrariesPrompt(javaLibraries, javaLanguage);
 	if (!resolution.shouldPrompt) return resolution.autoValue ?? [];
 	const response = await navigableMultiselect({
 		message: "Select Java application libraries",
@@ -3756,11 +3756,11 @@ async function getJavaLibrariesChoice(javaLibraries) {
 	if (response.includes("none")) return [];
 	return response;
 }
-function resolveJavaTestingLibrariesPrompt(javaTestingLibraries) {
-	return createStaticMultiPromptResolution(JAVA_TESTING_LIBRARY_PROMPT_OPTIONS, ["junit5"], javaTestingLibraries);
+function resolveJavaTestingLibrariesPrompt(javaTestingLibraries, javaLanguage) {
+	return createStaticMultiPromptResolution(javaLanguage === "kotlin" ? JAVA_TESTING_LIBRARY_PROMPT_OPTIONS.filter((option) => !types_exports.KOTLIN_UNSUPPORTED_JAVA_TESTING_LIBRARIES.has(option.value)) : JAVA_TESTING_LIBRARY_PROMPT_OPTIONS, ["junit5"], javaTestingLibraries);
 }
-async function getJavaTestingLibrariesChoice(javaTestingLibraries) {
-	const resolution = resolveJavaTestingLibrariesPrompt(javaTestingLibraries);
+async function getJavaTestingLibrariesChoice(javaTestingLibraries, javaLanguage) {
+	const resolution = resolveJavaTestingLibrariesPrompt(javaTestingLibraries, javaLanguage);
 	if (!resolution.shouldPrompt) return resolution.autoValue ?? [];
 	const response = await navigableMultiselect({
 		message: "Select Java testing libraries",
@@ -3811,11 +3811,11 @@ const JAVA_LOGGING_PROMPT_OPTIONS = [
 		hint: "Spring Boot logging defaults"
 	}
 ];
-function resolveJavaApiPrompt(javaApi) {
-	return createStaticSinglePromptResolution(JAVA_API_PROMPT_OPTIONS, "none", javaApi);
+function resolveJavaApiPrompt(javaApi, javaLanguage) {
+	return createStaticSinglePromptResolution(javaLanguage === "kotlin" ? JAVA_API_PROMPT_OPTIONS.filter((option) => option.value !== "grpc" && option.value !== "openapi-generator") : JAVA_API_PROMPT_OPTIONS, "none", javaApi);
 }
-async function getJavaApiChoice(javaApi) {
-	const resolution = resolveJavaApiPrompt(javaApi);
+async function getJavaApiChoice(javaApi, javaLanguage) {
+	const resolution = resolveJavaApiPrompt(javaApi, javaLanguage);
 	if (!resolution.shouldPrompt) return resolution.autoValue ?? "none";
 	const response = await navigableSelect({
 		message: "Select Java API layer",
@@ -6016,17 +6016,17 @@ async function gatherMultiEcosystemConfig(flags, projectName, projectDir, relati
 	if (backendEcosystem === "java") {
 		const javaWebFramework = promptValue(await getJavaWebFrameworkChoice(flags.javaWebFramework));
 		const javaLanguage = javaWebFramework !== "spring-boot" ? "java" : flags.javaLanguage !== void 0 ? promptValue(await getJavaLanguageChoice(flags.javaLanguage)) : flags.javaWebFramework !== void 0 ? "java" : promptValue(await getJavaLanguageChoice(flags.javaLanguage));
-		const javaBuildTool = promptValue(await getJavaBuildToolChoice(flags.javaBuildTool));
+		const javaBuildTool = promptValue(await getJavaBuildToolChoice(flags.javaBuildTool, javaLanguage));
 		if (javaWebFramework !== "none" && javaBuildTool !== "none") {
 			const databaseConfig = await selectDatabaseConfig(flags);
 			database = databaseConfig.database;
 			dbSetup = databaseConfig.dbSetup;
 		}
-		const javaOrm = database === "none" || javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? "none" : promptValue(await getJavaOrmChoice(flags.javaOrm));
+		const javaOrm = database === "none" || javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? "none" : promptValue(await getJavaOrmChoice(flags.javaOrm, javaLanguage));
 		const javaAuth = javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? "none" : promptValue(await getJavaAuthChoice(flags.javaAuth));
-		const javaLibraries = javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? [] : await scopedPromptValue("java", "javaLibraries", configScope, backendSections, () => getJavaLibrariesChoice(flags.javaLibraries));
-		const javaTestingLibraries = await scopedPromptValue("java", "javaTestingLibraries", configScope, backendSections, () => getJavaTestingLibrariesChoice(flags.javaTestingLibraries));
-		const javaApi = javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? "none" : promptValue(await getJavaApiChoice(flags.javaApi));
+		const javaLibraries = javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? [] : await scopedPromptValue("java", "javaLibraries", configScope, backendSections, () => getJavaLibrariesChoice(flags.javaLibraries, javaLanguage));
+		const javaTestingLibraries = await scopedPromptValue("java", "javaTestingLibraries", configScope, backendSections, () => getJavaTestingLibrariesChoice(flags.javaTestingLibraries, javaLanguage));
+		const javaApi = javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? "none" : promptValue(await getJavaApiChoice(flags.javaApi, javaLanguage));
 		const javaLogging = javaWebFramework !== "spring-boot" || javaBuildTool === "none" ? "none" : await scopedPromptValue("java", "javaLogging", configScope, backendSections, () => getJavaLoggingChoice(flags.javaLogging));
 		Object.assign(backendChoices, {
 			javaLanguage,
@@ -8351,18 +8351,31 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		javaLanguage: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve("java");
 			if (results.javaWebFramework !== "spring-boot") return Promise.resolve("java");
+			const kotlinBlocker = (0, types_exports.getKotlinJavaIncompatibilityReason)({
+				javaWebFramework: results.javaWebFramework,
+				javaBuildTool: "maven",
+				email: results.email,
+				search: results.search,
+				caching: results.caching,
+				observability: results.observability
+			});
+			if (kotlinBlocker) {
+				if (flags.javaLanguage === "kotlin") log.warn(`JVM language set to Java: ${kotlinBlocker}`);
+				else if (flags.javaLanguage === void 0 && flags.javaWebFramework === void 0) log.info(`Kotlin not offered: ${kotlinBlocker}`);
+				return Promise.resolve("java");
+			}
 			if (flags.javaLanguage !== void 0) return getJavaLanguageChoice(flags.javaLanguage);
 			if (flags.javaWebFramework !== void 0) return Promise.resolve("java");
 			return getJavaLanguageChoice(flags.javaLanguage);
 		},
 		javaBuildTool: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve("none");
-			return getJavaBuildToolChoice(flags.javaBuildTool);
+			return getJavaBuildToolChoice(flags.javaBuildTool, results.javaLanguage);
 		},
 		javaOrm: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve("none");
 			if (results.javaWebFramework !== "spring-boot" || results.javaBuildTool === "none") return Promise.resolve("none");
-			return getJavaOrmChoice(flags.javaOrm);
+			return getJavaOrmChoice(flags.javaOrm, results.javaLanguage);
 		},
 		javaAuth: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve("none");
@@ -8372,7 +8385,7 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		javaApi: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve("none");
 			if (results.javaWebFramework !== "spring-boot") return Promise.resolve("none");
-			return getJavaApiChoice(flags.javaApi);
+			return getJavaApiChoice(flags.javaApi, results.javaLanguage);
 		},
 		javaLogging: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve("none");
@@ -8382,12 +8395,12 @@ async function gatherConfig(flags, projectName, projectDir, relativePath) {
 		javaLibraries: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve([]);
 			if (results.javaWebFramework !== "spring-boot" || results.javaBuildTool === "none") return Promise.resolve([]);
-			return getJavaLibrariesChoice(flags.javaLibraries);
+			return getJavaLibrariesChoice(flags.javaLibraries, results.javaLanguage);
 		},
 		javaTestingLibraries: ({ results }) => {
 			if (results.ecosystem !== "java") return Promise.resolve([]);
 			if (results.javaBuildTool === "none") return Promise.resolve([]);
-			return getJavaTestingLibrariesChoice(flags.javaTestingLibraries);
+			return getJavaTestingLibrariesChoice(flags.javaTestingLibraries, results.javaLanguage);
 		},
 		dotnetWebFramework: ({ results }) => {
 			if (results.ecosystem !== "dotnet") return Promise.resolve("none");
@@ -8945,6 +8958,17 @@ function displayConfig(config) {
 	return configDisplay.join("\n");
 }
 
+//#endregion
+//#region src/utils/open-url.ts
+async function openUrl(url) {
+	const platform = process.platform;
+	if (platform === "darwin") await $({ stdio: "ignore" })`open ${url}`;
+	else if (platform === "win32") {
+		const escapedUrl = url.replace(/&/g, "^&");
+		await $({ stdio: "ignore" })`cmd /c start "" ${escapedUrl}`;
+	} else await $({ stdio: "ignore" })`xdg-open ${url}`;
+}
+
 //#endregion
 //#region src/utils/preflight-display.ts
 function displayPreflightWarnings({ warnings }) {
@@ -9048,17 +9072,6 @@ async function setupProjectDirectory(finalPathInput, shouldClearDirectory) {
 	};
 }
 
-//#endregion
-//#region src/utils/open-url.ts
-async function openUrl(url) {
-	const platform = process.platform;
-	if (platform === "darwin") await $({ stdio: "ignore" })`open ${url}`;
-	else if (platform === "win32") {
-		const escapedUrl = url.replace(/&/g, "^&");
-		await $({ stdio: "ignore" })`cmd /c start "" ${escapedUrl}`;
-	} else await $({ stdio: "ignore" })`xdg-open ${url}`;
-}
-
 //#endregion
 //#region src/validation.ts
 const CORE_STACK_FLAGS = new Set([
@@ -11262,6 +11275,14 @@ function shouldPromptForVersionChannel(input, hasConfigBase) {
 	if (input.yes || input.part?.length || hasConfigBase || input.versionChannel !== void 0 || isSilent()) return false;
 	return canPromptInteractively();
 }
+function normalizeKotlinJavaSelection(config) {
+	if (!config.stackParts?.some((part) => part.role === "backend" && part.ecosystem === "java" && !part.ownerPartId && part.source !== "provided") && config.ecosystem !== "java" || config.javaLanguage !== "kotlin") return;
+	const kotlinBlocker = (0, types_exports.getKotlinJavaIncompatibilityReason)(config);
+	if (!kotlinBlocker) return;
+	config.javaLanguage = "java";
+	if (config.stackParts) config.stackParts = config.stackParts.filter((part) => !(part.role === "language" && part.ecosystem === "java" && part.toolId === "kotlin" && part.source !== "provided"));
+	if (!isSilent()) log.warn(pc.yellow(`JVM language set to Java: ${kotlinBlocker}`));
+}
 async function createProjectHandler(input, options = {}) {
 	const { silent = false } = options;
 	return runWithContextAsync({ silent }, async () => {
@@ -11529,6 +11550,7 @@ async function createProjectHandler(input, options = {}) {
 				};
 				validateConfigCompatibility(config, providedFlags, cliInput);
 			}
+			normalizeKotlinJavaSelection(config);
 			const preflight = validatePreflightConfig(config);
 			if (preflight.hasWarnings && !isSilent()) displayPreflightWarnings(preflight);
 			if (input.dryRun) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-better-fullstack",
-  "version": "2.1.7",
+  "version": "2.1.8",
   "description": "Scaffold production-ready fullstack apps in seconds. Pick your stack from 425 options — the CLI wires everything together.",
   "keywords": [
     "algolia",
@@ -128,8 +128,8 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@better-fullstack/template-generator": "^2.1.7",
-    "@better-fullstack/types": "^2.1.7",
+    "@better-fullstack/template-generator": "^2.1.8",
+    "@better-fullstack/types": "^2.1.8",
     "@clack/core": "^0.5.0",
     "@clack/prompts": "^1.6.0",
     "@orpc/server": "^1.14.6",