bejamas 0.2.10 → 0.2.11

package/dist/index.js

@@ -1,7 +1,8 @@
 #!/usr/bin/env node
-import { S as BASE_COLORS, _ as getWorkspaceConfig, b as logger, d as parseJsDocMetadata, g as getConfig, o as extractFrontmatter, p as resolveUiRoot, v as getProjectInfo, x as highlighter, y as spinner } from "./utils-gYZJgF4G.js";
+import { _ as getWorkspaceConfig, b as highlighter, d as parseJsDocMetadata, g as getConfig, o as extractFrontmatter, p as resolveUiRoot, v as spinner, y as logger } from "./utils-Dr0kJLcx.js";
 import { Command } from "commander";
 import { createRequire } from "module";
+import { promises } from "fs";
 import path from "path";
 import fsExtra from "fs-extra";
 import os from "os";
@@ -13,7 +14,7 @@ import { execa } from "execa";
 import prompts from "prompts";
 import fg from "fast-glob";
 import path$1, { extname as extname$1, isAbsolute, join as join$1, relative as relative$1, resolve } from "node:path";
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { existsSync as existsSync$1, readFileSync, readdirSync } from "node:fs";
 import fs from "node:fs/promises";
 
 //#region src/utils/errors.ts
@@ -290,6 +291,8 @@ async function createProjectFromTemplate(projectPath, options) {
 //#endregion
 //#region src/commands/init.ts
 const DEFAULT_REGISTRY_URL$1 = "https://ui.bejamas.com/r";
+const DEFAULT_COMPONENTS_BASE_COLOR = "neutral";
+const SHADCN_INIT_ARGS = ["init"];
 const initOptionsSchema = z.object({
 	cwd: z.string(),
 	components: z.array(z.string()).optional(),
@@ -304,13 +307,82 @@ const initOptionsSchema = z.object({
 		if (val) return TEMPLATES[val];
 		return true;
 	}, { message: "Invalid template. Please use 'next' or 'next-monorepo'." }),
-	baseColor: z.string().optional().refine((val) => {
-		if (val) return BASE_COLORS.find((color) => color.name === val);
-		return true;
-	}, { message: `Invalid base color. Please use '${BASE_COLORS.map((color) => color.name).join("', '")}'` }),
+	baseColor: z.string().optional(),
 	baseStyle: z.boolean()
 });
-const init = new Command().name("init").description("initialize your project and install dependencies").argument("[components...]", "names, url or local path to component").option("-t, --template <template>", "the template to use. (next, next-monorepo)").option("-b, --base-color <base-color>", "the base color to use. (neutral, gray, zinc, stone, slate)", void 0).option("-y, --yes", "skip confirmation prompt.", true).option("-d, --defaults,", "use default configuration.", false).option("-f, --force", "force overwrite of existing configuration.", false).option("-c, --cwd <cwd>", "the working directory. defaults to the current directory.", process.cwd()).option("-s, --silent", "mute output.", false).option("--src-dir", "use the src directory when creating a new project.", false).option("--no-src-dir", "do not use the src directory when creating a new project.").option("--css-variables", "use css variables for theming.", true).option("--no-css-variables", "do not use css variables for theming.").option("--no-base-style", "do not install the base shadcn style.").action(async (_components, opts) => {
+function buildShadcnInitInvocation(localShadcnPath, hasLocalShadcn, localShadcnVersion) {
+	if (hasLocalShadcn) {
+		const args = [...SHADCN_INIT_ARGS];
+		if (usesLegacyBaseColorFlag(localShadcnVersion)) args.push("--base-color", DEFAULT_COMPONENTS_BASE_COLOR);
+		return {
+			cmd: localShadcnPath,
+			args
+		};
+	}
+	return {
+		cmd: "npx",
+		args: [
+			"-y",
+			"shadcn@latest",
+			...SHADCN_INIT_ARGS
+		]
+	};
+}
+function usesLegacyBaseColorFlag(version) {
+	if (!version) return false;
+	const major = Number.parseInt(version.split(".")[0] ?? "", 10);
+	return Number.isFinite(major) && major > 0 && major < 4;
+}
+async function getLocalShadcnVersion(cwd) {
+	const filePath = path.resolve(cwd, "node_modules", "shadcn", "package.json");
+	try {
+		const contents = await promises.readFile(filePath, "utf8");
+		const parsed = JSON.parse(contents);
+		return typeof parsed.version === "string" ? parsed.version : null;
+	} catch {
+		return null;
+	}
+}
+function getDeprecatedBaseColorWarning(baseColor) {
+	if (!baseColor) return null;
+	return [
+		"The --base-color option is deprecated and ignored.",
+		"Bejamas now aligns with shadcn CLI v4.",
+		`Edit ${highlighter.info("components.json")} to change`,
+		`${highlighter.info("tailwind.baseColor")} after init.`
+	].join(" ");
+}
+async function normalizeComponentsBaseColor(cwd, baseColor = DEFAULT_COMPONENTS_BASE_COLOR) {
+	const filePath = path.resolve(cwd, "components.json");
+	let originalContents;
+	try {
+		originalContents = await promises.readFile(filePath, "utf8");
+	} catch {
+		throw new Error(`Failed to read ${highlighter.info(filePath)} after shadcn init. Make sure the command completed successfully and created a valid components.json file.`);
+	}
+	let parsedConfig;
+	try {
+		const parsed = JSON.parse(originalContents);
+		if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) throw new Error("Expected a JSON object.");
+		parsedConfig = parsed;
+	} catch {
+		throw new Error(`Failed to parse ${highlighter.info(filePath)} after shadcn init. Expected a valid JSON object with a tailwind configuration.`);
+	}
+	const tailwind = parsedConfig.tailwind;
+	if (!tailwind || typeof tailwind !== "object" || Array.isArray(tailwind)) throw new Error(`Invalid ${highlighter.info(filePath)} generated by shadcn init. Expected a ${highlighter.info("tailwind")} object so Bejamas can normalize ${highlighter.info("baseColor")}.`);
+	const normalizedConfig = {
+		...parsedConfig,
+		tailwind: {
+			...tailwind,
+			baseColor
+		}
+	};
+	const normalizedContents = `${JSON.stringify(normalizedConfig, null, 2)}\n`;
+	if (normalizedContents === originalContents) return false;
+	await promises.writeFile(filePath, normalizedContents, "utf8");
+	return true;
+}
+const init = new Command().name("init").description("initialize your project and install dependencies").argument("[components...]", "names, url or local path to component").option("-t, --template <template>", "the template to use. (next, next-monorepo)").option("-b, --base-color <base-color>", "deprecated: accepted for compatibility but ignored. Edit components.json to change tailwind.baseColor.", void 0).option("-y, --yes", "skip confirmation prompt.", true).option("-d, --defaults,", "use default configuration.", false).option("-f, --force", "force overwrite of existing configuration.", false).option("-c, --cwd <cwd>", "the working directory. defaults to the current directory.", process.cwd()).option("-s, --silent", "mute output.", false).option("--src-dir", "use the src directory when creating a new project.", false).option("--no-src-dir", "do not use the src directory when creating a new project.").option("--css-variables", "use css variables for theming.", true).option("--no-css-variables", "do not use css variables for theming.").option("--no-base-style", "do not install the base shadcn style.").action(async (_components, opts) => {
 	try {
 		await runInit(opts);
 	} catch (error) {
@@ -321,18 +393,18 @@ const init = new Command().name("init").description("initialize your project and
 	}
 });
 async function runInit(options) {
+	const baseColorWarning = getDeprecatedBaseColorWarning(options.baseColor);
+	if (baseColorWarning && !options.silent) logger.warn(baseColorWarning);
 	let newProjectTemplate;
 	if (!options.skipPreflight) {
-		const preflight = await preFlightInit(options);
-		if (preflight.errors[MISSING_DIR_OR_EMPTY_PROJECT]) {
+		if ((await preFlightInit(options)).errors[MISSING_DIR_OR_EMPTY_PROJECT]) {
 			const { projectPath, template } = await createProject(options);
 			if (!projectPath) process.exit(1);
 			options.cwd = projectPath;
 			options.isNewProject = true;
 			newProjectTemplate = template;
 		}
-		preflight.projectInfo;
-	} else await getProjectInfo(options.cwd);
+	}
 	if (newProjectTemplate) {
 		options.cwd = path.resolve(options.cwd, {
 			"astro-monorepo": "apps/web",
@@ -349,22 +421,9 @@ async function runInit(options) {
 			...process.env,
 			REGISTRY_URL: process.env.REGISTRY_URL || DEFAULT_REGISTRY_URL$1
 		};
-		if (await fsExtra.pathExists(localShadcnPath)) await execa(localShadcnPath, [
-			"init",
-			"--base-color",
-			"neutral"
-		], {
-			stdio: "inherit",
-			cwd: options.cwd,
-			env
-		});
-		else await execa("npx", [
-			"-y",
-			"shadcn@latest",
-			"init",
-			"--base-color",
-			"neutral"
-		], {
+		const hasLocalShadcn = await fsExtra.pathExists(localShadcnPath);
+		const invocation = buildShadcnInitInvocation(localShadcnPath, hasLocalShadcn, hasLocalShadcn ? await getLocalShadcnVersion(options.cwd) : null);
+		await execa(invocation.cmd, invocation.args, {
 			stdio: "inherit",
 			cwd: options.cwd,
 			env
@@ -372,6 +431,7 @@ async function runInit(options) {
 	} catch (err) {
 		process.exit(1);
 	}
+	await normalizeComponentsBaseColor(options.cwd);
 }
 
 //#endregion
@@ -382,7 +442,7 @@ async function runInit(options) {
 function readTsConfig(projectRoot) {
 	try {
 		const tsconfigPath = resolve(projectRoot, "tsconfig.json");
-		if (!existsSync(tsconfigPath)) return null;
+		if (!existsSync$1(tsconfigPath)) return null;
 		const raw = readFileSync(tsconfigPath, "utf-8");
 		return JSON.parse(raw);
 	} catch {
@@ -420,7 +480,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 		let probe = shellCwd;
 		for (let i = 0; i < 6 && probe; i += 1) {
 			const candidate = resolve(probe, "components.json");
-			if (existsSync(candidate)) {
+			if (existsSync$1(candidate)) {
 				projectRoot = probe;
 				try {
 					const raw = readFileSync(candidate, "utf-8");
@@ -474,7 +534,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 				initial: (() => {
 					let current = shellCwd;
 					for (let i = 0; i < 6; i += 1) {
-						if (existsSync(resolve(current, "packages/ui/package.json"))) {
+						if (existsSync$1(resolve(current, "packages/ui/package.json"))) {
 							const abs = resolve(current, "packages/ui");
 							return relative$1(shellCwd, abs) || abs;
 						}
@@ -482,7 +542,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 						if (parent === current) break;
 						current = parent;
 					}
-					if (existsSync(resolve(shellCwd, "node_modules/@bejamas/ui/package.json"))) {
+					if (existsSync$1(resolve(shellCwd, "node_modules/@bejamas/ui/package.json"))) {
 						const abs = resolve(shellCwd, "node_modules/@bejamas/ui");
 						return relative$1(shellCwd, abs) || abs;
 					}
@@ -490,7 +550,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 				})(),
 				validate: (val) => {
 					const p = resolve(shellCwd, val);
-					return existsSync(resolve(p, "package.json")) ? true : `No package.json found in ${p}`;
+					return existsSync$1(resolve(p, "package.json")) ? true : `No package.json found in ${p}`;
 				}
 			});
 			if (!uiRoot) {
@@ -523,7 +583,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 			if (process.env.BEJAMAS_DOCS_CWD) logger.info(`Docs CWD: ${process.env.BEJAMAS_DOCS_CWD}`);
 			if (process.env.BEJAMAS_DOCS_OUT_DIR) logger.info(`Docs out: ${process.env.BEJAMAS_DOCS_OUT_DIR}`);
 		}
-		const mod = await import("./generate-mdx-C1y987mC.js");
+		const mod = await import("./generate-mdx-C8gXBOHp.js");
 		if (typeof mod.runDocsGenerator === "function") await mod.runDocsGenerator();
 		else throw new Error("Failed to load docs generator. Export 'runDocsGenerator' not found.");
 	} catch (err) {
@@ -591,7 +651,7 @@ async function checkDocs({ cwd, json }) {
 		let probe = shellCwd;
 		for (let i = 0; i < 6 && probe; i += 1) {
 			const candidate = resolve(probe, "components.json");
-			if (existsSync(candidate)) {
+			if (existsSync$1(candidate)) {
 				projectRoot = probe;
 				try {
 					const raw = readFileSync(candidate, "utf-8");
@@ -630,7 +690,7 @@ async function checkDocs({ cwd, json }) {
 			process.exit(1);
 		}
 		const componentsDir = join$1(uiRoot, "src", "components");
-		if (!existsSync(componentsDir)) {
+		if (!existsSync$1(componentsDir)) {
 			logger.error(`Components directory not found: ${componentsDir}\n\nExpected structure: <uiRoot>/src/components/*.astro\nUse --cwd to specify a different UI package root.`);
 			process.exit(1);
 		}