bejamas 0.2.11 → 0.2.12

package/dist/index.js

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
-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 { _ 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-BfJTJvcy.js";
 import { Command } from "commander";
 import { createRequire } from "module";
-import { promises } from "fs";
 import path from "path";
-import fsExtra from "fs-extra";
+import fs from "fs-extra";
 import os from "os";
 import dotenv from "dotenv";
 import { detect } from "@antfu/ni";
@@ -14,8 +13,8 @@ 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 as existsSync$1, readFileSync, readdirSync } from "node:fs";
-import fs from "node:fs/promises";
+import { existsSync, readFileSync, readdirSync } from "node:fs";
+import fs$1 from "node:fs/promises";
 
 //#region src/utils/errors.ts
 const MISSING_DIR_OR_EMPTY_PROJECT = "1";
@@ -24,7 +23,7 @@ const MISSING_DIR_OR_EMPTY_PROJECT = "1";
 //#region src/preflights/preflight-init.ts
 async function preFlightInit(options) {
 	const errors = {};
-	if (!fsExtra.existsSync(options.cwd) || !fsExtra.existsSync(path.resolve(options.cwd, "package.json"))) {
+	if (!fs.existsSync(options.cwd) || !fs.existsSync(path.resolve(options.cwd, "package.json"))) {
 		errors[MISSING_DIR_OR_EMPTY_PROJECT] = true;
 		return {
 			errors,
@@ -62,12 +61,6 @@ async function getPackageManager(targetDir, { withFallback } = { withFallback: f
 	if (userAgent.startsWith("bun")) return "bun";
 	return "npm";
 }
-async function getPackageRunner(cwd) {
-	const packageManager = await getPackageManager(cwd);
-	if (packageManager === "pnpm") return "pnpm dlx";
-	if (packageManager === "bun") return "bunx";
-	return "npx";
-}
 
 //#endregion
 //#region src/registry/errors.ts
@@ -206,7 +199,7 @@ async function createProject(options) {
 	const packageManager = await getPackageManager(options.cwd, { withFallback: true });
 	const projectPath = `${options.cwd}/${projectName}`;
 	try {
-		await fsExtra.access(options.cwd, fsExtra.constants.W_OK);
+		await fs.access(options.cwd, fs.constants.W_OK);
 	} catch (error) {
 		logger.break();
 		logger.error(`The path ${highlighter.info(options.cwd)} is not writable.`);
@@ -214,7 +207,7 @@ async function createProject(options) {
 		logger.break();
 		process.exit(1);
 	}
-	if (fsExtra.existsSync(path.resolve(options.cwd, projectName, "package.json"))) {
+	if (fs.existsSync(path.resolve(options.cwd, projectName, "package.json"))) {
 		logger.break();
 		logger.error(`A project with the name ${highlighter.info(projectName)} already exists.`);
 		logger.error(`Please choose a different name and try again.`);
@@ -242,7 +235,7 @@ async function createProjectFromTemplate(projectPath, options) {
 	try {
 		dotenv.config({ quiet: true });
 		const templatePath = path.join(os.tmpdir(), `bejamas-template-${Date.now()}`);
-		await fsExtra.ensureDir(templatePath);
+		await fs.ensureDir(templatePath);
 		const authToken = process.env.GITHUB_TOKEN || process.env.GH_TOKEN;
 		const usedAuth = Boolean(authToken);
 		const headers = { "User-Agent": "bejamas-cli" };
@@ -254,7 +247,7 @@ async function createProjectFromTemplate(projectPath, options) {
 			throw new Error(`Failed to download template: ${response.status} ${response.statusText}`);
 		}
 		const tarPath = path.resolve(templatePath, "template.tar.gz");
-		await fsExtra.writeFile(tarPath, Buffer.from(await response.arrayBuffer()));
+		await fs.writeFile(tarPath, Buffer.from(await response.arrayBuffer()));
 		const tarSubpath = TEMPLATE_TAR_SUBPATH[options.templateKey];
 		const leafName = tarSubpath.split("/").pop();
 		await execa("tar", [
@@ -266,8 +259,8 @@ async function createProjectFromTemplate(projectPath, options) {
 			tarSubpath
 		]);
 		const extractedPath = path.resolve(templatePath, leafName);
-		await fsExtra.move(extractedPath, projectPath);
-		await fsExtra.remove(templatePath);
+		await fs.move(extractedPath, projectPath);
+		await fs.remove(templatePath);
 		await execa(options.packageManager, ["install"], { cwd: projectPath });
 		try {
 			const { stdout } = await execa("git", ["rev-parse", "--is-inside-work-tree"], { cwd: projectPath });
@@ -288,11 +281,39 @@ async function createProjectFromTemplate(projectPath, options) {
 	}
 }
 
+//#endregion
+//#region src/utils/shadcn-cli.ts
+const require = createRequire(import.meta.url);
+const PINNED_SHADCN_VERSION = "3.8.5";
+const PINNED_SHADCN_PACKAGE = `shadcn@${PINNED_SHADCN_VERSION}`;
+function resolveBundledShadcnEntrypoint() {
+	try {
+		return require.resolve("shadcn");
+	} catch {
+		return null;
+	}
+}
+function buildPinnedShadcnInvocation(shadcnArgs, bundledEntrypoint = resolveBundledShadcnEntrypoint()) {
+	if (bundledEntrypoint) return {
+		cmd: process.execPath,
+		args: [bundledEntrypoint, ...shadcnArgs],
+		source: "bundled"
+	};
+	return {
+		cmd: "npx",
+		args: [
+			"-y",
+			PINNED_SHADCN_PACKAGE,
+			...shadcnArgs
+		],
+		source: "fallback"
+	};
+}
+
 //#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(),
@@ -310,79 +331,14 @@ const initOptionsSchema = z.object({
 	baseColor: z.string().optional(),
 	baseStyle: z.boolean()
 });
-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;
+function buildShadcnInitArgs(baseColor = DEFAULT_COMPONENTS_BASE_COLOR) {
 	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;
+		"init",
+		"--base-color",
+		baseColor
+	];
 }
-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) => {
+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) => {
 	try {
 		await runInit(opts);
 	} catch (error) {
@@ -393,8 +349,6 @@ 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) {
 		if ((await preFlightInit(options)).errors[MISSING_DIR_OR_EMPTY_PROJECT]) {
@@ -414,15 +368,12 @@ async function runInit(options) {
 		logger.log(`${highlighter.success("Success!")} Project initialization completed.\nYou may now add components.`);
 		return await getConfig(options.cwd);
 	}
-	const shadcnBin = process.platform === "win32" ? "shadcn.cmd" : "shadcn";
-	const localShadcnPath = path.resolve(options.cwd, "node_modules", ".bin", shadcnBin);
 	try {
 		const env = {
 			...process.env,
 			REGISTRY_URL: process.env.REGISTRY_URL || DEFAULT_REGISTRY_URL$1
 		};
-		const hasLocalShadcn = await fsExtra.pathExists(localShadcnPath);
-		const invocation = buildShadcnInitInvocation(localShadcnPath, hasLocalShadcn, hasLocalShadcn ? await getLocalShadcnVersion(options.cwd) : null);
+		const invocation = buildPinnedShadcnInvocation(buildShadcnInitArgs(options.baseColor ?? DEFAULT_COMPONENTS_BASE_COLOR));
 		await execa(invocation.cmd, invocation.args, {
 			stdio: "inherit",
 			cwd: options.cwd,
@@ -431,7 +382,6 @@ async function runInit(options) {
 	} catch (err) {
 		process.exit(1);
 	}
-	await normalizeComponentsBaseColor(options.cwd);
 }
 
 //#endregion
@@ -442,7 +392,7 @@ async function runInit(options) {
 function readTsConfig(projectRoot) {
 	try {
 		const tsconfigPath = resolve(projectRoot, "tsconfig.json");
-		if (!existsSync$1(tsconfigPath)) return null;
+		if (!existsSync(tsconfigPath)) return null;
 		const raw = readFileSync(tsconfigPath, "utf-8");
 		return JSON.parse(raw);
 	} catch {
@@ -480,7 +430,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$1(candidate)) {
+			if (existsSync(candidate)) {
 				projectRoot = probe;
 				try {
 					const raw = readFileSync(candidate, "utf-8");
@@ -534,7 +484,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 				initial: (() => {
 					let current = shellCwd;
 					for (let i = 0; i < 6; i += 1) {
-						if (existsSync$1(resolve(current, "packages/ui/package.json"))) {
+						if (existsSync(resolve(current, "packages/ui/package.json"))) {
 							const abs = resolve(current, "packages/ui");
 							return relative$1(shellCwd, abs) || abs;
 						}
@@ -542,7 +492,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 						if (parent === current) break;
 						current = parent;
 					}
-					if (existsSync$1(resolve(shellCwd, "node_modules/@bejamas/ui/package.json"))) {
+					if (existsSync(resolve(shellCwd, "node_modules/@bejamas/ui/package.json"))) {
 						const abs = resolve(shellCwd, "node_modules/@bejamas/ui");
 						return relative$1(shellCwd, abs) || abs;
 					}
@@ -550,7 +500,7 @@ async function generateDocs({ cwd, outDir, verbose }) {
 				})(),
 				validate: (val) => {
 					const p = resolve(shellCwd, val);
-					return existsSync$1(resolve(p, "package.json")) ? true : `No package.json found in ${p}`;
+					return existsSync(resolve(p, "package.json")) ? true : `No package.json found in ${p}`;
 				}
 			});
 			if (!uiRoot) {
@@ -583,7 +533,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-C8gXBOHp.js");
+		const mod = await import("./generate-mdx-BejBMCLk.js");
 		if (typeof mod.runDocsGenerator === "function") await mod.runDocsGenerator();
 		else throw new Error("Failed to load docs generator. Export 'runDocsGenerator' not found.");
 	} catch (err) {
@@ -651,7 +601,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$1(candidate)) {
+			if (existsSync(candidate)) {
 				projectRoot = probe;
 				try {
 					const raw = readFileSync(candidate, "utf-8");
@@ -690,7 +640,7 @@ async function checkDocs({ cwd, json }) {
 			process.exit(1);
 		}
 		const componentsDir = join$1(uiRoot, "src", "components");
-		if (!existsSync$1(componentsDir)) {
+		if (!existsSync(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);
 		}
@@ -814,10 +764,10 @@ async function fixAstroImports(cwd, isVerbose) {
 			dot: false
 		});
 		for (const filePath of astroFiles) {
-			const original = await fs.readFile(filePath, "utf8");
+			const original = await fs$1.readFile(filePath, "utf8");
 			const rewritten = rewriteAstroImports(original, config);
 			if (rewritten === original) continue;
-			await fs.writeFile(filePath, rewritten, "utf8");
+			await fs$1.writeFile(filePath, rewritten, "utf8");
 			if (isVerbose) logger.info(`[bejamas-ui] fixed imports in ${path$1.relative(cwd, filePath)}`);
 		}
 	}
@@ -870,7 +820,7 @@ function getSubfolderFromPaths(files) {
 */
 async function pathExists(filePath) {
 	try {
-		await fs.access(filePath);
+		await fs$1.access(filePath);
 		return true;
 	} catch {
 		return false;
@@ -911,7 +861,7 @@ async function reorganizeComponents(components, uiDir, registryUrl, verbose) {
 			if (!await pathExists(flatPath)) continue;
 			if (await pathExists(targetPath)) {
 				try {
-					await fs.unlink(flatPath);
+					await fs$1.unlink(flatPath);
 					result.skippedFiles.push(`${subfolder}/${filename}`);
 					if (verbose) logger.info(`[bejamas-ui] Removed flat duplicate: ${filename} (${subfolder}/${filename} exists)`);
 				} catch {
@@ -919,8 +869,8 @@ async function reorganizeComponents(components, uiDir, registryUrl, verbose) {
 				}
 				continue;
 			}
-			await fs.mkdir(targetDir, { recursive: true });
-			await fs.rename(flatPath, targetPath);
+			await fs$1.mkdir(targetDir, { recursive: true });
+			await fs$1.rename(flatPath, targetPath);
 			movedCount++;
 			result.totalMoved++;
 			result.movedFiles.push(`${subfolder}/${filename}`);
@@ -1129,37 +1079,16 @@ function parseShadcnOutput(stdout, stderr) {
 	return result;
 }
 async function addComponents(packages, forwardedOptions, isVerbose, isSilent, subfolderMapResult) {
-	const runner = await getPackageRunner(process.cwd());
 	const env = {
 		...process.env,
 		REGISTRY_URL: process.env.REGISTRY_URL || DEFAULT_REGISTRY_URL
 	};
-	const autoFlags = [];
-	if (!forwardedOptions.includes("--yes")) autoFlags.push("--yes");
-	const baseArgs = [
-		"shadcn@latest",
-		"add",
-		...packages,
-		...autoFlags,
-		...forwardedOptions
-	];
-	let cmd = "npx";
-	let args = ["-y", ...baseArgs];
-	if (runner === "bunx") {
-		cmd = "bunx";
-		args = baseArgs;
-	} else if (runner === "pnpm dlx") {
-		cmd = "pnpm";
-		args = ["dlx", ...baseArgs];
-	} else if (runner === "npx") {
-		cmd = "npx";
-		args = ["-y", ...baseArgs];
-	}
-	if (isVerbose) logger.info(`[bejamas-ui] ${cmd} ${args.join(" ")}`);
+	const invocation = buildPinnedShadcnInvocation(buildShadcnAddArgs(packages, forwardedOptions));
+	if (isVerbose) logger.info(`[bejamas-ui] ${invocation.cmd} ${invocation.args.join(" ")}`);
 	const registrySpinner = spinner("Checking registry.", { silent: isSilent });
 	registrySpinner.start();
 	try {
-		const result = await execa(cmd, args, {
+		const result = await execa(invocation.cmd, invocation.args, {
 			env,
 			input: "n\nn\nn\nn\nn\nn\nn\nn\nn\nn\n",
 			stdout: "pipe",
@@ -1186,7 +1115,17 @@ async function addComponents(packages, forwardedOptions, isVerbose, isSilent, su
 		process.exit(1);
 	}
 }
-const add = new Command().name("add").description("Add components via shadcn@latest using registry URLs").argument("[components...]", "Component package names to add").option("-y, --yes", "skip confirmation prompt.", false).option("-o, --overwrite", "overwrite existing files.", false).option("-c, --cwd <cwd>", "the working directory. defaults to the current directory.", process.cwd()).option("-a, --all", "add all available components", false).option("-p, --path <path>", "the path to add the component to.").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.").action(async function action(packages, _opts, cmd) {
+function buildShadcnAddArgs(packages, forwardedOptions) {
+	const autoFlags = [];
+	if (!forwardedOptions.includes("--yes")) autoFlags.push("--yes");
+	return [
+		"add",
+		...packages,
+		...autoFlags,
+		...forwardedOptions
+	];
+}
+const add = new Command().name("add").description("Add components via the pinned shadcn registry flow").argument("[components...]", "Component package names to add").option("-y, --yes", "skip confirmation prompt.", false).option("-o, --overwrite", "overwrite existing files.", false).option("-c, --cwd <cwd>", "the working directory. defaults to the current directory.", process.cwd()).option("-a, --all", "add all available components", false).option("-p, --path <path>", "the path to add the component to.").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.").action(async function action(packages, _opts, cmd) {
 	const root = cmd?.parent;
 	const verbose = Boolean(root?.opts?.().verbose);
 	const forwardedOptions = extractOptionsForShadcn(process.argv.slice(2), cmd);