sprawlify 0.0.115 → 0.1.0

package/dist/index.mjs

@@ -7,8 +7,10 @@ import { z } from "zod";
 import { existsSync } from "fs";
 import prompts from "prompts";
 import { faker } from "@faker-js/faker";
+import { cosmiconfig } from "cosmiconfig";
+import { createMatchPath, loadConfig } from "tsconfig-paths";
 //#region package.json
-var version = "0.0.115";
+var version = "0.1.0";
 //#endregion
 //#region src/utils/file-helper.ts
 const FILE_BACKUP_SUFFIX = ".bak";
@@ -2873,7 +2875,7 @@ function toKebabCase(value) {
 const generateProjectName = () => toKebabCase(`${faker.hacker.adjective()} ${faker.hacker.noun()}`);
 //#endregion
 //#region src/commands/init/prompts.ts
-async function promptForMissingSelections(options) {
+async function promptForMissingSelections$1(options) {
 	if (!options.name) {
 		const { name } = await prompts({
 			type: "text",
@@ -3886,7 +3888,7 @@ function tailwindCssPathPrefix(cwd) {
 function resolveTailwindCssFilePath(cwd, prefix, cssPath) {
 	return path.resolve(cwd, prefix, cssPath);
 }
-function resolveItemsToApply(presetItems, requestedComponents) {
+function resolveItemsToApply$1(presetItems, requestedComponents) {
 	const presetItemsByName = new Map(presetItems.map((item) => [item.name, item]));
 	const itemNamesToApply = /* @__PURE__ */ new Set();
 	const packageNames = /* @__PURE__ */ new Set();
@@ -3920,7 +3922,7 @@ function resolveItemsToApply(presetItems, requestedComponents) {
 		unresolvedNames
 	};
 }
-async function applyPresetPackageDependencies(cwd, frameworkPreset, packageNames) {
+async function applyPresetPackageDependencies$1(cwd, frameworkPreset, packageNames) {
 	if (!frameworkPreset || packageNames.size === 0) return;
 	const packageJsonPath = path.resolve(cwd, "package.json");
 	if (!fsExtra.existsSync(packageJsonPath)) {
@@ -3979,11 +3981,18 @@ async function runInit(options) {
 		css: "globals.css"
 	};
 	const config = {
-		$schema: "https://ui.primitives.com/schema.json",
+		$schema: "https://ui.sprawlify.com/schema.json",
 		framework: options.framework,
 		preset: options.preset,
 		metaframework: options.metaframework,
-		tailwindcss: { css: `${tailwindcss.cwd}/${tailwindcss.css}` }
+		tsx: true,
+		tailwindcss: { css: `${tailwindcss.cwd}/${tailwindcss.css}` },
+		aliases: {
+			components: "@/components",
+			utils: "@/lib/utils",
+			ui: "@/components/ui",
+			lib: "@/lib"
+		}
 	};
 	let backupPath = null;
 	if (fsExtra.existsSync(componentsJsonPath)) {
@@ -4007,13 +4016,13 @@ async function runInit(options) {
 		}
 		throw error;
 	}
-	const { itemsToApply, packageNames, unresolvedNames } = resolveItemsToApply(getPresetItems(options.preset, options.framework), new Set(options.components ?? []));
+	const { itemsToApply, packageNames, unresolvedNames } = resolveItemsToApply$1(getPresetItems(options.preset, options.framework), new Set(options.components ?? []));
 	if (unresolvedNames.size > 0) logger.warn(`Skipping unknown preset component options: ${[...unresolvedNames].map((componentName) => highlighter.info(componentName)).join(", ")}.`);
 	if (itemsToApply.length === 0) {
-		await applyPresetPackageDependencies(cwd, frameworkPreset, packageNames);
+		await applyPresetPackageDependencies$1(cwd, frameworkPreset, packageNames);
 		return;
 	}
-	await applyPresetPackageDependencies(cwd, frameworkPreset, packageNames);
+	await applyPresetPackageDependencies$1(cwd, frameworkPreset, packageNames);
 	for (const item of itemsToApply) for (const file of item.files ?? []) {
 		const targetPath = resolvePresetFilePath(cwd, file);
 		if (fsExtra.existsSync(targetPath) && !options.override) {
@@ -4023,6 +4032,7 @@ async function runInit(options) {
 		await fsExtra.ensureDir(path.dirname(targetPath));
 		await fsExtra.writeFile(targetPath, file.content, "utf8");
 	}
+	return config;
 }
 //#endregion
 //#region src/commands/init/done.ts
@@ -4036,12 +4046,12 @@ async function doneInit(options) {
 }
 //#endregion
 //#region src/commands/init/index.ts
-const init = new Command().name("init").alias("create").description("initialize your project and install dependencies").argument("[components...]", "names, url or local path to component").option("-p, --preset <preset>", "the preset to use. (monochrome, clay)").option("-f, --framework <framework>", "the framework to use. (react, solid, svelte, vue)").option("--metaframework <metaframework>", "the metaframework to use. (next, react-router, nuxt, sveltekit)").option("-y, --yes", "skip confirmation prompt.", true).option("-d, --defaults", "use default configuration: --preset=monochrome --framework=react --metaframework=none", false).option("-o, --override", "override existing configuration.", false).option("-c, --cwd <cwd>", "the working directory. defaults to the current directory.", process.cwd()).option("-n, --name <name>", "the name for the new project.").option("-s, --silent", "mute output.", false).option("--reinstall", "re-install existing UI components.").option("--no-reinstall", "do not re-install existing UI components.").action(async (components, opts) => {
+const init = new Command().name("init").alias("create").description("initialize your project and install dependencies").argument("[components...]", "names of components").option("-p, --preset <preset>", "the preset to use. (monochrome, clay)").option("-f, --framework <framework>", "the framework to use. (react, solid, svelte, vue)").option("--metaframework <metaframework>", "the metaframework to use. (next, react-router, nuxt, sveltekit)").option("-y, --yes", "skip confirmation prompt.", true).option("-d, --defaults", "use default configuration: --preset=monochrome --framework=react --metaframework=none", false).option("-o, --override", "override existing configuration.", false).option("-c, --cwd <cwd>", "the working directory. defaults to the current directory.", process.cwd()).option("-n, --name <name>", "the name for the new project.").option("--reinstall", "re-install existing UI components.").option("--no-reinstall", "do not re-install existing UI components.").action(async (components, opts) => {
 	try {
 		const options = parseInitOptions(opts);
 		applyDefaultInitOptions(options);
 		validateExplicitOptions(options);
-		await promptForMissingSelections(options);
+		await promptForMissingSelections$1(options);
 		await ensureOverwriteAllowed(options);
 		options.components = components;
 		await loadEnvFiles(options.cwd);
@@ -4057,12 +4067,255 @@ const init = new Command().name("init").alias("create").description("initialize
 	}
 });
 //#endregion
+//#region src/commands/add/options.ts
+const addOptionsSchema = z.object({
+	components: z.array(z.string()).optional(),
+	yes: z.boolean(),
+	overwrite: z.boolean(),
+	cwd: z.string(),
+	all: z.boolean(),
+	path: z.string().optional()
+});
+function parseAddOptions(opts, components) {
+	const parsed = opts;
+	return addOptionsSchema.parse({
+		components,
+		...parsed,
+		cwd: path.resolve(String(parsed.cwd ?? process.cwd()))
+	});
+}
+//#endregion
+//#region src/commands/add/run.ts
+function resolvePresetFilePathFromConfig(config, file) {
+	if (file.type === "registry:utils") return path.resolve(config.resolvedPaths.utils, file.path);
+	if (file.type === "registry:ui") return path.resolve(config.resolvedPaths.ui, file.path);
+	return path.resolve(config.resolvedPaths.cwd, file.path);
+}
+function resolveItemsToApply(presetItems, requestedComponents) {
+	const presetItemsByName = new Map(presetItems.map((item) => [item.name, item]));
+	const itemNamesToApply = /* @__PURE__ */ new Set();
+	const packageNames = /* @__PURE__ */ new Set();
+	const unresolvedNames = /* @__PURE__ */ new Set();
+	const queue = [...requestedComponents];
+	while (queue.length > 0) {
+		const dependencyName = queue.shift();
+		if (!dependencyName) continue;
+		const matchingItem = presetItemsByName.get(dependencyName);
+		if (matchingItem) {
+			if (itemNamesToApply.has(matchingItem.name)) continue;
+			itemNamesToApply.add(matchingItem.name);
+			for (const nestedDependency of matchingItem.dependencies ?? []) queue.push(nestedDependency);
+			continue;
+		}
+		if (dependencyName.startsWith("@/")) {
+			const extractedName = dependencyName.split("/").pop();
+			if (extractedName && presetItemsByName.has(extractedName)) {
+				queue.push(extractedName);
+				continue;
+			}
+		}
+		packageNames.add(dependencyName);
+	}
+	for (const componentName of requestedComponents) if (!presetItemsByName.has(componentName)) unresolvedNames.add(componentName);
+	return {
+		itemsToApply: [...itemNamesToApply].map((itemName) => presetItemsByName.get(itemName)).filter((item) => Boolean(item)),
+		packageNames,
+		unresolvedNames
+	};
+}
+async function applyPresetPackageDependencies(cwd, frameworkPreset, packageNames) {
+	if (!frameworkPreset || packageNames.size === 0) return;
+	const packageJsonPath = path.resolve(cwd, "package.json");
+	if (!fsExtra.existsSync(packageJsonPath)) {
+		logger.warn("Skipping preset package dependencies because package.json was not found.");
+		return;
+	}
+	const packageJson = await fsExtra.readJson(packageJsonPath);
+	let didChange = false;
+	packageJson.dependencies ??= {};
+	packageJson.devDependencies ??= {};
+	for (const packageName of packageNames) {
+		const dependencyVersion = frameworkPreset.dependencies?.[packageName];
+		if (dependencyVersion) {
+			if (!packageJson.dependencies[packageName]) {
+				packageJson.dependencies[packageName] = dependencyVersion;
+				didChange = true;
+			}
+			continue;
+		}
+	}
+	if (frameworkPreset.devDependencies) {
+		for (const [devDependencyName, devDependencyVersion] of Object.entries(frameworkPreset.devDependencies)) if (!packageJson.devDependencies[devDependencyName]) {
+			packageJson.devDependencies[devDependencyName] = devDependencyVersion;
+			didChange = true;
+		}
+	}
+	if (didChange) {
+		if (packageJson.dependencies && Object.keys(packageJson.dependencies).length > 0) packageJson.dependencies = Object.keys(packageJson.dependencies).sort().reduce((sorted, key) => {
+			sorted[key] = packageJson.dependencies[key];
+			return sorted;
+		}, {});
+		if (packageJson.devDependencies && Object.keys(packageJson.devDependencies).length > 0) packageJson.devDependencies = Object.keys(packageJson.devDependencies).sort().reduce((sorted, key) => {
+			sorted[key] = packageJson.devDependencies[key];
+			return sorted;
+		}, {});
+		await fsExtra.writeJson(packageJsonPath, packageJson, { spaces: 2 });
+	}
+}
+async function runAdd(options, config) {
+	const { components, overwrite, cwd } = options;
+	if (!components || components.length === 0) {
+		logger.info("No components specified to add.");
+		return;
+	}
+	const { itemsToApply, packageNames, unresolvedNames } = resolveItemsToApply(getPresetItems(config.preset, config.framework), new Set(components));
+	if (unresolvedNames.size > 0) logger.warn(`Skipping unknown components: ${[...unresolvedNames].map((componentName) => highlighter.info(componentName)).join(", ")}.`);
+	if (itemsToApply.length === 0) {
+		logger.info("No valid components to add.");
+		return;
+	}
+	await applyPresetPackageDependencies(cwd, getFrameworkPreset(config.preset, config.framework), packageNames);
+	for (const item of itemsToApply) for (const file of item.files ?? []) {
+		const targetPath = resolvePresetFilePathFromConfig(config, file);
+		if (fsExtra.existsSync(targetPath) && !overwrite) {
+			logger.warn(`Skipping ${highlighter.info(path.relative(cwd, targetPath))} because it already exists. Use ${highlighter.info("--overwrite")} to replace it.`);
+			continue;
+		}
+		await fsExtra.ensureDir(path.dirname(targetPath));
+		await fsExtra.writeFile(targetPath, file.content, "utf8");
+		logger.info(`Added ${highlighter.info(path.relative(cwd, targetPath))}`);
+	}
+	logger.info(`Successfully added ${itemsToApply.length} component(s).`);
+}
+//#endregion
+//#region src/commands/add/prompts.ts
+async function promptForMissingSelections(options, config) {
+	if (!options.components || options.components.length === 0) {
+		const frameworkPreset = getFrameworkPreset(config.preset, config.framework);
+		if (!frameworkPreset) throw new Error(`No preset found for framework ${config.framework} and preset ${config.preset}`);
+		const { components } = await prompts({
+			type: "multiselect",
+			name: "components",
+			message: "Which components would you like to add?",
+			hint: "Space to select. A to toggle all. Enter to submit.",
+			instructions: false,
+			choices: frameworkPreset.items?.map((item) => ({
+				title: item,
+				value: item,
+				selected: options.all ? true : options.components?.includes(item.name) || false
+			})) || []
+		});
+		if (!components?.length) {
+			logger.warn("No components selected. Exiting.");
+			logger.info("");
+			process.exit(1);
+		}
+		options.components = components;
+	}
+}
+//#endregion
+//#region src/registry/schema.ts
+const rawConfigSchema = z.object({
+	preset: z.string(),
+	framework: z.string(),
+	tsx: z.coerce.boolean().default(true),
+	tailwind: z.object({
+		config: z.string().optional(),
+		css: z.string()
+	}),
+	aliases: z.object({
+		components: z.string(),
+		utils: z.string(),
+		ui: z.string().optional(),
+		lib: z.string().optional()
+	})
+});
+const configSchema = rawConfigSchema.extend({ resolvedPaths: z.object({
+	cwd: z.string(),
+	tailwindconfig: z.string(),
+	tailwindcss: z.string(),
+	utils: z.string(),
+	components: z.string(),
+	lib: z.string(),
+	hooks: z.string(),
+	ui: z.string()
+}) });
+//#endregion
+//#region src/utils/resolve-import.ts
+function resolveImport(importPath, config) {
+	return createMatchPath(config.absoluteBaseUrl, config.paths)(importPath, void 0, () => true, [
+		".ts",
+		".tsx",
+		".jsx",
+		".js",
+		".css",
+		".svelte",
+		".vue"
+	]);
+}
+//#endregion
+//#region src/utils/config.ts
+const explorer = cosmiconfig("components", { searchPlaces: ["components.json"] });
+function resolveConfigPaths(cwd, config) {
+	const tsConfig = loadConfig(cwd);
+	if (tsConfig.resultType === "failed") throw new Error(`Failed to load ${config.tsx ? "tsconfig" : "jsconfig"}.json. ${tsConfig.message ?? ""}`.trim());
+	return configSchema.parse({
+		...config,
+		resolvedPaths: {
+			cwd,
+			tailwindconfig: config.tailwind.config ? path.resolve(cwd, config.tailwind.config) : "",
+			tailwindcss: path.resolve(cwd, config.tailwind.css),
+			utils: resolveImport(config.aliases["utils"], tsConfig),
+			components: resolveImport(config.aliases["components"], tsConfig),
+			ui: config.aliases["ui"] ? resolveImport(config.aliases["ui"], tsConfig) : path.resolve(resolveImport(config.aliases["components"], tsConfig) ?? cwd, "ui"),
+			lib: config.aliases["lib"] ? resolveImport(config.aliases["lib"], tsConfig) : path.resolve(resolveImport(config.aliases["utils"], tsConfig) ?? cwd, "..")
+		}
+	});
+}
+async function getRawConfig(cwd) {
+	try {
+		const configResult = await explorer.search(cwd);
+		if (!configResult) return null;
+		return rawConfigSchema.parse(configResult.config);
+	} catch (error) {
+		const componentPath = `${cwd}/components.json`;
+		if (error instanceof Error && error.message.includes("reserved registry")) throw error;
+		throw new Error(`Invalid configuration found in ${highlighter.info(componentPath)}.`);
+	}
+}
+async function getConfig(cwd) {
+	const config = await getRawConfig(cwd);
+	if (!config) return null;
+	return resolveConfigPaths(cwd, config);
+}
+//#endregion
+//#region src/commands/add/index.ts
+const add = new Command().name("add").description("add a component to your project").argument("[components...]", "names or urls or to component").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.").action(async (components, opts) => {
+	try {
+		const options = parseAddOptions(opts, components);
+		await loadEnvFiles(options.cwd);
+		const config = await getConfig(options.cwd);
+		if (!config) {
+			logger.error(`No components.json found in ${options.cwd}. Please run ${highlighter.info("npx sprawlify@latest init")} first to create a components.json before adding components.`);
+			return;
+		}
+		await promptForMissingSelections(options, config);
+		await runAdd(options, config);
+		logger.break();
+	} catch (error) {
+		logger.break();
+		handleError(error);
+	} finally {
+		clearRegistryContext();
+	}
+});
+//#endregion
 //#region src/index.ts
 process.on("SIGINT", () => process.exit(0));
 process.on("SIGTERM", () => process.exit(0));
 async function main() {
 	const program = new Command().name("sprawlify").description("add items from registries to your project").version(version || "1.0.0", "-v, --version", "display the version number");
-	program.addCommand(init);
+	program.addCommand(init).addCommand(add);
 	program.parse();
 }
 main();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sprawlify",
-  "version": "0.0.115",
+  "version": "0.1.0",
   "description": "A command-line interface for Sprawlify.",
   "license": "MIT",
   "author": "sprawlify <npm@sprawlify.com>",
@@ -18,13 +18,15 @@
     "access": "public"
   },
   "dependencies": {
-    "@dotenvx/dotenvx": "^1.55.1",
-    "@faker-js/faker": "^10.3.0",
+    "@dotenvx/dotenvx": "^1.59.1",
+    "@faker-js/faker": "^10.4.0",
     "commander": "^14.0.3",
+    "cosmiconfig": "^9.0.1",
     "dedent": "^1.7.2",
     "fs-extra": "^11.3.4",
     "kleur": "^4.1.5",
     "prompts": "^2.4.2",
+    "tsconfig-paths": "^4.2.0",
     "zod": "^4.3.6"
   },
   "engines": {