bejamas 0.3.0 → 0.3.2

package/dist/index.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { A as renderSemanticIconSvgWithAttributeString, B as normalizeDesignSystemConfig, C as buildUiUrl, D as SEMANTIC_ICON_NAMES, E as ICON_LIBRARY_COLLECTIONS, F as getDocumentLanguage, H as encodePreset, I as getFontPackageName, L as getFontValue, M as RTL_LANGUAGE_VALUES, N as designSystemConfigSchema, O as getSemanticIconNameFromLucideExport, P as getDocumentDirection, R as getHeadingFontValue, S as BASE_COLORS, T as buildRegistryTheme, U as isPresetCode, V as decodePreset, W as fonts, _ as getConfig, b as highlighter, d as parseJsDocMetadata, g as spinner, j as DEFAULT_DESIGN_SYSTEM_CONFIG, k as getSemanticIconNameFromLucidePath, o as extractFrontmatter, p as resolveUiRoot, v as getWorkspaceConfig, w as resolveRegistryUrl, x as BEJAMAS_COMPONENTS_SCHEMA_URL, y as logger, z as getStyleId } from "./utils-BCEkpKMO.js";
+import { A as getSemanticIconNameFromLucidePath, B as getStyleId, C as buildUiUrl, D as ICON_LIBRARY_COLLECTIONS, E as buildRegistryTheme, F as getDocumentDirection, G as fonts, H as decodePreset, I as getDocumentLanguage, L as getFontPackageName, M as DEFAULT_DESIGN_SYSTEM_CONFIG, N as RTL_LANGUAGE_VALUES, O as SEMANTIC_ICON_NAMES, P as designSystemConfigSchema, R as getFontValue, S as BASE_COLORS, T as ICON_LIBRARIES, U as encodePreset, V as normalizeDesignSystemConfig, W as isPresetCode, _ as getConfig, b as highlighter, d as parseJsDocMetadata, g as spinner, j as renderSemanticIconSvgWithAttributeString, k as getSemanticIconNameFromLucideExport, o as extractFrontmatter, p as resolveUiRoot, v as getWorkspaceConfig, w as resolveRegistryUrl, x as BEJAMAS_COMPONENTS_SCHEMA_URL, y as logger, z as getHeadingFontValue } from "./utils-B0HWwl6F.js";
 import { Command } from "commander";
 import { createRequire } from "module";
 import path, { extname, isAbsolute, join, relative, resolve } from "node:path";
@@ -16,6 +16,7 @@ import dotenv from "dotenv";
 import { detect } from "@antfu/ni";
 import { execa } from "execa";
 import prompts from "prompts";
+import * as tar from "tar";
 import os$1 from "node:os";
 
 //#region src/registry/context.ts
@@ -324,6 +325,8 @@ const CREATE_BLOCK_END = "/* bejamas:create:end */";
 const SHADCN_TAILWIND_IMPORT = "@import \"shadcn/tailwind.css\";";
 const BEJAMAS_TAILWIND_IMPORT = "@import \"bejamas/tailwind.css\";";
 const MANAGED_TAILWIND_IMPORTS = new Set([SHADCN_TAILWIND_IMPORT, BEJAMAS_TAILWIND_IMPORT]);
+const MANAGED_ICON_PACKAGES = new Set(ICON_LIBRARIES.map((library) => library.packageName));
+const FALLBACK_ICON_PACKAGE_VERSION = "latest";
 const TEMPLATE_APP_UI_IMPORT = "import { appUi } from \"@/i18n/ui\";";
 const TEMPLATE_I18N_SOURCES = {
 	astro: `const RTL_LANGUAGES = ["ar", "fa", "he"] as const;
@@ -754,6 +757,46 @@ async function patchCssFileManagedTailwindImport(filepath) {
 	const next = transformManagedTailwindImportCss(await fs.readFile(filepath, "utf8"));
 	await fs.writeFile(filepath, next, "utf8");
 }
+function getSelectedIconPackageName(config) {
+	return ICON_LIBRARIES.find((library) => library.name === config.iconLibrary)?.packageName;
+}
+async function patchPackageJsonIconDependency(filepath, config) {
+	const selectedIconPackage = getSelectedIconPackageName(config);
+	if (!selectedIconPackage) return;
+	const packageJson = await fs.readJson(filepath);
+	let targetField = null;
+	let changed = false;
+	for (const field of ["dependencies", "devDependencies"]) {
+		const dependencies = packageJson[field];
+		if (!dependencies) continue;
+		for (const iconPackage of MANAGED_ICON_PACKAGES) {
+			if (!dependencies[iconPackage]) continue;
+			targetField ??= field;
+			if (iconPackage === selectedIconPackage) continue;
+			delete dependencies[iconPackage];
+			changed = true;
+		}
+	}
+	if (!targetField) return;
+	if (!(packageJson.dependencies?.[selectedIconPackage] || packageJson.devDependencies?.[selectedIconPackage])) {
+		packageJson[targetField] ??= {};
+		packageJson[targetField][selectedIconPackage] = FALLBACK_ICON_PACKAGE_VERSION;
+		changed = true;
+	}
+	if (changed) await fs.writeJson(filepath, packageJson, { spaces: 2 });
+}
+async function syncPackageIconDependencies(projectPath, config) {
+	const packageJsonFiles = await fg("**/package.json", {
+		cwd: projectPath,
+		absolute: true,
+		ignore: [
+			"**/node_modules/**",
+			"**/dist/**",
+			"**/.astro/**"
+		]
+	});
+	await Promise.all(packageJsonFiles.map((filepath) => patchPackageJsonIconDependency(filepath, config)));
+}
 async function syncManagedTailwindCss(projectPath) {
 	const componentJsonFiles = await fg("**/components.json", {
 		cwd: projectPath,
@@ -839,6 +882,7 @@ async function applyDesignSystemToProject(projectPath, config, options = {}) {
 		}
 	}
 	await Promise.all(Array.from(cssFiles).map((filepath) => patchCssFileWithTheme(filepath, config, options.themeVars)));
+	await syncPackageIconDependencies(projectPath, config);
 	await Promise.all([path.resolve(projectPath, "src/i18n/ui.ts"), path.resolve(projectPath, "apps/web/src/i18n/ui.ts")].map((filepath) => patchTemplateI18nFile(filepath, config)));
 	await Promise.all([path.resolve(projectPath, "src/layouts/Layout.astro"), path.resolve(projectPath, "apps/web/src/layouts/Layout.astro")].map((filepath) => patchLayoutFile(filepath, config)));
 	await Promise.all([path.resolve(projectPath, "src/pages/index.astro"), path.resolve(projectPath, "apps/web/src/pages/index.astro")].map((filepath) => patchStarterPageFile(filepath, config)));
@@ -1141,7 +1185,17 @@ const TEMPLATES = {
 };
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path$1.dirname(__filename);
-function resolveLocalTemplatesDir() {
+const TEMPLATE_DIRNAME = {
+	astro: "astro",
+	"astro-monorepo": "monorepo-astro",
+	"astro-with-component-docs-monorepo": "monorepo-astro-with-docs"
+};
+const TEMPLATE_EXCLUDED_BASENAMES = new Set(["node_modules", ".astro"]);
+const DEFAULT_TEMPLATE_REPOSITORY = "bejamas/ui";
+const DEFAULT_TEMPLATE_REF = "main";
+function resolveLocalTemplatesDir(env = process.env) {
+	const override = env.BEJAMAS_LOCAL_TEMPLATES_DIR?.trim();
+	if (override) return path$1.resolve(override);
 	for (const relativePath of [
 		"../../../../templates",
 		"../../../templates",
@@ -1153,6 +1207,87 @@ function resolveLocalTemplatesDir() {
 	return path$1.resolve(__dirname, "../../../../templates");
 }
 const LOCAL_TEMPLATES_DIR = resolveLocalTemplatesDir();
+function resolvePackageMetadataPath() {
+	for (const relativePath of ["../package.json", "../../package.json"]) {
+		const candidate = path$1.resolve(__dirname, relativePath);
+		if (fs.existsSync(candidate)) return candidate;
+	}
+	return path$1.resolve(__dirname, "../package.json");
+}
+function readPackageMetadata() {
+	try {
+		return fs.readJsonSync(resolvePackageMetadataPath());
+	} catch {
+		return {};
+	}
+}
+const BEJAMAS_PACKAGE_METADATA = readPackageMetadata();
+function shouldCopyTemplateEntry(source) {
+	return !TEMPLATE_EXCLUDED_BASENAMES.has(path$1.basename(source));
+}
+async function copyTemplateIntoProject(templateSource, projectPath) {
+	await fs.copy(templateSource, projectPath, { filter: shouldCopyTemplateEntry });
+}
+function resolveRemoteTemplateRefs(metadata = BEJAMAS_PACKAGE_METADATA, env = process.env) {
+	const refs = [
+		env.BEJAMAS_TEMPLATE_REF?.trim(),
+		metadata.gitHead?.trim(),
+		metadata.version && !metadata.version.includes("-") ? `bejamas@${metadata.version}` : void 0,
+		DEFAULT_TEMPLATE_REF
+	].filter((ref) => Boolean(ref));
+	return [...new Set(refs)];
+}
+function buildTemplateArchiveUrl(ref, repository = DEFAULT_TEMPLATE_REPOSITORY) {
+	return `https://api.github.com/repos/${repository}/tarball/${encodeURIComponent(ref)}`;
+}
+function getGitHubRequestHeaders(env = process.env) {
+	const headers = { "User-Agent": `bejamas/${BEJAMAS_PACKAGE_METADATA.version ?? "dev"}` };
+	const token = env.BEJAMAS_GITHUB_TOKEN?.trim() || env.GITHUB_TOKEN?.trim();
+	if (token) headers.Authorization = `Bearer ${token}`;
+	return headers;
+}
+async function downloadTemplateArchive(ref, targetDir) {
+	const archiveUrl = buildTemplateArchiveUrl(ref);
+	const archivePath = path$1.join(targetDir, "repo.tar.gz");
+	const response = await fetch(archiveUrl, {
+		headers: getGitHubRequestHeaders(),
+		signal: AbortSignal.timeout(3e4)
+	});
+	if (!response.ok) throw new Error(`GitHub returned ${response.status} ${response.statusText} for ${ref}.`);
+	await fs.ensureDir(targetDir);
+	await fs.outputFile(archivePath, Buffer.from(await response.arrayBuffer()));
+	await tar.x({
+		cwd: targetDir,
+		file: archivePath,
+		strict: true
+	});
+	const extractedRoot = (await fs.readdir(targetDir)).filter((entry) => entry !== "repo.tar.gz").find((entry) => fs.statSync(path$1.join(targetDir, entry)).isDirectory());
+	if (!extractedRoot) throw new Error(`Downloaded archive for ${ref} did not extract correctly.`);
+	return path$1.join(targetDir, extractedRoot);
+}
+async function copyTemplateFromGitHub(templateDirName, projectPath) {
+	const refs = resolveRemoteTemplateRefs();
+	const failures = [];
+	for (const ref of refs) {
+		const tempDir = path$1.join(os.tmpdir(), `bejamas-template-${Date.now()}-${Math.random().toString(36).slice(2, 10)}`);
+		try {
+			const extractedRoot = await downloadTemplateArchive(ref, tempDir);
+			const templateSource = path$1.join(extractedRoot, "templates", templateDirName);
+			if (!await fs.pathExists(templateSource)) throw new Error(`Template templates/${templateDirName} was not found.`);
+			await copyTemplateIntoProject(templateSource, projectPath);
+			return ref;
+		} catch (error) {
+			failures.push(`${ref}: ${error instanceof Error ? error.message : String(error)}`);
+		} finally {
+			await fs.remove(tempDir);
+		}
+	}
+	throw new Error([
+		`Unable to download templates/${templateDirName} from GitHub.`,
+		`Tried refs: ${refs.join(", ")}.`,
+		failures.join("\n")
+	].join("\n"));
+}
 async function applyLocalPackageOverrides(projectPath) {
 	const bejamasPackageOverride = process.env.BEJAMAS_PACKAGE_OVERRIDE;
 	if (!bejamasPackageOverride) return;
@@ -1244,23 +1379,17 @@ async function createProject(options) {
 }
 async function createProjectFromTemplate(projectPath, options) {
 	const createSpinner = spinner(`Creating a new project from template. This may take a few minutes.`).start();
-	const TEMPLATE_DIRNAME = {
-		astro: "astro",
-		"astro-monorepo": "monorepo-astro",
-		"astro-with-component-docs-monorepo": "monorepo-astro-with-docs"
-	};
 	try {
 		dotenv.config({ quiet: true });
-		const templatePath = path$1.join(os.tmpdir(), `bejamas-template-${Date.now()}`);
-		const templateSource = path$1.resolve(LOCAL_TEMPLATES_DIR, TEMPLATE_DIRNAME[options.templateKey]);
-		if (!await fs.pathExists(templateSource)) throw new Error(`Local template not found: ${templateSource}`);
-		await fs.copy(templateSource, projectPath, { filter: (source) => {
-			const basename = path$1.basename(source);
-			return basename !== "node_modules" && basename !== ".astro";
-		} });
+		const templateDirName = TEMPLATE_DIRNAME[options.templateKey];
+		const templateSource = path$1.resolve(LOCAL_TEMPLATES_DIR, templateDirName);
+		if (await fs.pathExists(templateSource)) await copyTemplateIntoProject(templateSource, projectPath);
+		else {
+			createSpinner.text = `Downloading the ${highlighter.info(options.templateKey)} template from GitHub.`;
+			await copyTemplateFromGitHub(templateDirName, projectPath);
+		}
 		await removeEmptyTemplateI18nDirs(projectPath);
 		await applyLocalPackageOverrides(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 });
@@ -1705,6 +1834,7 @@ async function runInit(options) {
 			REGISTRY_URL: resolveRegistryUrl()
 		};
 		const initUrl = buildInitUrl(designConfig, options.themeRef);
+		const themeVars = options.themeRef ? await fetchInitThemeVars(initUrl) ?? void 0 : void 0;
 		const shouldReinstall = shouldReinstallExistingComponents(options);
 		const reinstallComponents = shouldReinstall ? await getInstalledUiComponents(options.cwd) : [];
 		const forwardedOptions = ensureShadcnReinstallFlag(options.forwardedOptions ?? [], shouldReinstall);
@@ -1726,6 +1856,7 @@ async function runInit(options) {
 			await syncAstroManagedFontCss(options.cwd, managedFont.cssVariable);
 			await cleanupAstroFontPackages(options.cwd);
 		}
+		await applyDesignSystemToProject(options.cwd, designConfig, { themeVars });
 		if (reinstallComponents.length > 0) {
 			const config = await getConfig(options.cwd);
 			const uiDir = config?.resolvedPaths.ui ?? "";
@@ -1912,7 +2043,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-PPNpe9_J.js");
+		const mod = await import("./generate-mdx-_F9W0nYJ.js");
 		if (typeof mod.runDocsGenerator === "function") await mod.runDocsGenerator();
 		else throw new Error("Failed to load docs generator. Export 'runDocsGenerator' not found.");
 	} catch (err) {
@@ -2184,6 +2315,13 @@ function formatSkippedFilesHeading(count, overwriteUsed) {
 	if (overwriteUsed) return `Skipped ${count} ${noun}: (files might be identical)`;
 	return `Skipped ${count} ${noun}: (files might be identical, use --overwrite to overwrite)`;
 }
+function ensureTrailingNewline(output) {
+	return output.endsWith("\n") ? output : `${output}\n`;
+}
+function writeCapturedShadcnOutput(stdout, stderr) {
+	if (stdout) process.stdout.write(ensureTrailingNewline(stdout));
+	if (stderr) process.stderr.write(ensureTrailingNewline(stderr));
+}
 async function buildSubfolderMap(components, uiDir, registryUrl, style) {
 	const filenameToSubfolders = /* @__PURE__ */ new Map();
 	let requiresReorganization = false;
@@ -2335,17 +2473,14 @@ async function addComponents(cwd, packages, forwardedOptions, isVerbose, isSilen
 			logger.info(`[bejamas-ui] Raw stdout: ${stdout}`);
 			logger.info(`[bejamas-ui] Raw stderr: ${stderr}`);
 		}
-		if (inspectionMode) {
-			if (stdout) process.stdout.write(stdout.endsWith("\n") ? stdout : `${stdout}\n`);
-			if (stderr) process.stderr.write(stderr.endsWith("\n") ? stderr : `${stderr}\n`);
-		}
+		if (inspectionMode) writeCapturedShadcnOutput(stdout, stderr);
 		const parsed = inspectionMode ? {
 			created: [],
 			updated: [],
 			skipped: []
 		} : parseShadcnOutput(stdout, stderr);
 		if (result.exitCode !== 0) {
-			if (result.stderr) logger.error(result.stderr);
+			if (!inspectionMode) writeCapturedShadcnOutput(stdout, stderr);
 			process.exit(result.exitCode);
 		}
 		return parsed;