everything-dev 1.20.0 → 1.22.0

package/dist/cli/init.mjs

@@ -14,6 +14,13 @@ import { glob } from "glob";
 
 //#region src/cli/init.ts
 const require = createRequire(import.meta.url);
+const FRAMEWORK_PACKAGES = ["every-plugin", "everything-dev"];
+const OVERRIDE_WORKSPACE_MAP = {
+	ui: ["ui"],
+	api: ["api"],
+	host: ["host"],
+	plugins: []
+};
 async function resolveSourceDir(opts) {
 	if (opts.source) {
 		const sourceDir = resolve(opts.source);
@@ -79,6 +86,30 @@ async function resolveRepositoryViaExtendsChain(extendsAccount, extendsGateway,
 		return null;
 	}
 }
+async function detectGitRemoteUrl(directory) {
+	try {
+		const { stdout } = await execa("git", [
+			"remote",
+			"get-url",
+			"origin"
+		], {
+			cwd: directory,
+			stdio: "pipe"
+		});
+		const url = stdout.trim();
+		if (!url) return void 0;
+		return normalizeGitUrl(url);
+	} catch {
+		return;
+	}
+}
+function normalizeGitUrl(url) {
+	const sshMatch = url.match(/^git@github\.com:([^/]+)\/([^/]+?)(?:\.git)?$/);
+	if (sshMatch) return `https://github.com/${sshMatch[1]}/${sshMatch[2]}`;
+	const httpsMatch = url.match(/^https?:\/\/github\.com\/([^/]+)\/([^/]+?)(?:\.git)?(?:\/.*)?$/);
+	if (httpsMatch) return `https://github.com/${httpsMatch[1]}/${httpsMatch[2]}`;
+	return url.endsWith(".git") ? url.slice(0, -4) : url;
+}
 async function downloadTarball(repoUrl) {
 	const parsed = parseGitHubUrl(repoUrl);
 	if (!parsed) throw new Error(`Cannot parse repository URL: ${repoUrl}`);
@@ -152,9 +183,20 @@ function parseGitHubUrl(url) {
 	};
 	return null;
 }
+function filterPatternsByOverrides(patterns, overrides, _plugins) {
+	const has = (section) => overrides.includes(section);
+	let filtered = [...patterns];
+	if (!has("host")) filtered = filtered.filter((p) => !p.startsWith("host/") && p !== "host/**");
+	if (!has("ui")) filtered = filtered.filter((p) => !p.startsWith("ui/") && p !== "ui/**");
+	if (!has("api")) filtered = filtered.filter((p) => !p.startsWith("api/") && p !== "api/**");
+	if (!has("plugins")) filtered = filtered.filter((p) => !p.startsWith("plugins/") && p !== "plugins/**");
+	return filtered;
+}
 async function copyFilteredFiles(sourceDir, destination, patterns, options) {
 	if (patterns.length === 0) return 0;
-	const effectivePatterns = options.withHost ? [...patterns, "host/**"] : patterns.filter((p) => !p.startsWith("host/") && p !== "host/**");
+	const has = (section) => options.overrides.includes(section);
+	const effectivePatterns = filterPatternsByOverrides(patterns, options.overrides, options.plugins);
+	if (has("host") && !effectivePatterns.some((p) => p.startsWith("host/") || p === "host/**")) effectivePatterns.push("host/**");
 	const excludedRoutePatterns = [];
 	if (options.pluginRoutes) {
 		for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) if (!(options.plugins?.includes(pluginKey) ?? true)) excludedRoutePatterns.push(...routePatterns);
@@ -203,45 +245,52 @@ async function copyFilteredFiles(sourceDir, destination, patterns, options) {
 	}
 	return count;
 }
+function stripProductionFields(entry) {
+	delete entry.production;
+	delete entry.integrity;
+	delete entry.ssr;
+	delete entry.ssrIntegrity;
+}
 async function personalizeConfig(destination, opts) {
 	const isInit = opts.mode !== "sync";
+	const has = (section) => opts.overrides.includes(section);
 	const configPath = join(destination, "bos.config.json");
 	if (existsSync(configPath)) {
 		const config = JSON.parse(readFileSync(configPath, "utf-8"));
 		config.extends = `bos://${opts.extendsAccount}/${opts.extendsGateway}`;
 		if (opts.account) config.account = opts.account;
 		if (opts.domain) config.domain = opts.domain;
+		if (opts.repository) config.repository = opts.repository;
 		if (isInit && config.app && typeof config.app === "object") {
 			const app = config.app;
 			for (const entryKey of Object.keys(app)) {
-				const entry = app[entryKey];
-				if (entry && typeof entry === "object") {
-					const e = entry;
-					delete e.production;
-					delete e.integrity;
-					delete e.ssr;
-					delete e.ssrIntegrity;
+				if (!has(entryKey) && (entryKey === "host" || entryKey === "ui" || entryKey === "api" || entryKey === "auth")) {
+					delete app[entryKey];
+					continue;
 				}
+				const entry = app[entryKey];
+				if (entry && typeof entry === "object") stripProductionFields(entry);
 			}
 		}
-		if (config.plugins && typeof config.plugins === "object") {
-			const plugins = config.plugins;
-			if (opts.plugins !== void 0) {
-				for (const pluginKey of Object.keys(plugins)) if (!opts.plugins.includes(pluginKey)) delete plugins[pluginKey];
-			}
-			for (const pluginKey of Object.keys(plugins)) {
-				const plugin = plugins[pluginKey];
-				let pluginObj;
-				if (typeof plugin === "string") {
-					pluginObj = { extends: plugin };
-					plugins[pluginKey] = pluginObj;
-				} else if (plugin && typeof plugin === "object") pluginObj = { ...plugin };
-				else continue;
-				delete pluginObj.production;
-				delete pluginObj.integrity;
+		if (has("plugins")) {
+			if (config.plugins && typeof config.plugins === "object") {
+				const plugins = config.plugins;
+				if (opts.plugins !== void 0) {
+					for (const pluginKey of Object.keys(plugins)) if (!opts.plugins.includes(pluginKey)) delete plugins[pluginKey];
+				}
+				for (const pluginKey of Object.keys(plugins)) {
+					const plugin = plugins[pluginKey];
+					let pluginObj;
+					if (typeof plugin === "string") {
+						pluginObj = { extends: plugin };
+						plugins[pluginKey] = pluginObj;
+					} else if (plugin && typeof plugin === "object") pluginObj = { ...plugin };
+					else continue;
+					stripProductionFields(pluginObj);
+				}
+				if (Object.keys(plugins).length === 0) config.plugins = {};
 			}
-			if (Object.keys(plugins).length === 0) config.plugins = {};
-		}
+		} else delete config.plugins;
 		await saveBosConfig(destination, config);
 	}
 	const pkgPath = join(destination, "package.json");
@@ -251,10 +300,10 @@ async function personalizeConfig(destination, opts) {
 			const ws = pkg.workspaces;
 			if (Array.isArray(ws.packages)) ws.packages = ws.packages.filter((p) => {
 				if (p.startsWith("packages/")) return false;
-				if (p === "host") return opts.withHost ?? false;
-				if (p === "plugins/*") return (opts.plugins?.length ?? 0) > 0;
+				if (p === "host") return has("host");
+				if (p === "plugins/*") return has("plugins") && (opts.plugins?.length ?? 0) > 0;
 				const pluginMatch = p.match(/^plugins\/([^/]+)/);
-				if (pluginMatch) return opts.plugins?.includes(pluginMatch[1]) ?? true;
+				if (pluginMatch) return has("plugins") && (opts.plugins?.includes(pluginMatch[1]) ?? true);
 				return true;
 			});
 		}
@@ -275,7 +324,7 @@ async function personalizeConfig(destination, opts) {
 			scripts["types:gen"] = "node_modules/.bin/bos types gen";
 			if (scripts.typecheck) {
 				scripts.typecheck = scripts.typecheck.replace("bun run types:gen && ", "").replace(/bun run --cwd packages\/everything-dev typecheck & ?/, "");
-				if (!opts.withHost) scripts.typecheck = scripts.typecheck.replace(/bun run --cwd host tsc --noEmit & ?/, "");
+				if (!has("host")) scripts.typecheck = scripts.typecheck.replace(/bun run --cwd host tsc --noEmit & ?/, "");
 			}
 		}
 		if (pkg.devDependencies && typeof pkg.devDependencies === "object") {
@@ -313,19 +362,25 @@ async function personalizeConfig(destination, opts) {
 		}
 	}
 	await resolveWorkspaceRefs(destination, opts.workspaceOpts);
-	const genContractPath = join(destination, "ui", "src", "lib", "api-types.gen.ts");
-	if (!existsSync(genContractPath)) {
-		mkdirSync(dirname(genContractPath), { recursive: true });
-		writeFileSync(genContractPath, `export type ApiContract = Record<string, never>;\n`);
+	if (has("ui")) {
+		const genContractPath = join(destination, "ui", "src", "lib", "api-types.gen.ts");
+		if (!existsSync(genContractPath)) {
+			mkdirSync(dirname(genContractPath), { recursive: true });
+			writeFileSync(genContractPath, `export type ApiContract = Record<string, never>;\n`);
+		}
 	}
-	const pluginsClientGenPath = join(destination, "api", "src", "lib", "plugins-types.gen.ts");
-	if (!existsSync(pluginsClientGenPath)) {
-		mkdirSync(dirname(pluginsClientGenPath), { recursive: true });
-		writeFileSync(pluginsClientGenPath, `import type { ContractRouterClient, AnyContractRouter } from "@orpc/contract";\ntype ClientFactory<C extends AnyContractRouter> = (context?: Record<string, unknown>) => ContractRouterClient<C>;\nexport type PluginsClient = Record<string, never>;\n`);
+	if (has("api")) {
+		const pluginsClientGenPath = join(destination, "api", "src", "lib", "plugins-types.gen.ts");
+		if (!existsSync(pluginsClientGenPath)) {
+			mkdirSync(dirname(pluginsClientGenPath), { recursive: true });
+			writeFileSync(pluginsClientGenPath, `import type { ContractRouterClient, AnyContractRouter } from "@orpc/contract";\ntype ClientFactory<C extends AnyContractRouter> = (context?: Record<string, unknown>) => ContractRouterClient<C>;\nexport type PluginsClient = Record<string, never>;\n`);
+		}
 	}
 	const authTypesContent = generateAuthTypesTemplate();
-	const authTypesPaths = [join(destination, "ui", "src", "lib", "auth-types.gen.ts"), join(destination, "api", "src", "lib", "auth-types.gen.ts")];
-	if (existsSync(join(destination, "host", "src"))) authTypesPaths.push(join(destination, "host", "src", "lib", "auth-types.gen.ts"));
+	const authTypesPaths = [];
+	if (has("ui")) authTypesPaths.push(join(destination, "ui", "src", "lib", "auth-types.gen.ts"));
+	if (has("api")) authTypesPaths.push(join(destination, "api", "src", "lib", "auth-types.gen.ts"));
+	if (has("host") && existsSync(join(destination, "host", "src"))) authTypesPaths.push(join(destination, "host", "src", "lib", "auth-types.gen.ts"));
 	for (const authTypesGenPath of authTypesPaths) if (!existsSync(authTypesGenPath)) {
 		mkdirSync(dirname(authTypesGenPath), { recursive: true });
 		writeFileSync(authTypesGenPath, authTypesContent);
@@ -382,10 +437,10 @@ export interface AuthServices {
 `;
 }
 async function runBunInstall(destination) {
-	await execCommand("bun", ["install", "--ignore-scripts"], destination);
+	await execCommand("bun", ["install", "--ignore-scripts"], destination, { stdio: "inherit" });
 }
 async function runTypesGen(destination) {
-	await execCommand("node_modules/.bin/bos", ["types", "gen"], destination);
+	await execCommand("node_modules/.bin/bos", ["types", "gen"], destination, { stdio: "inherit" });
 }
 async function runDockerComposeUp(destination) {
 	await execCommand("docker", [
@@ -393,65 +448,69 @@ async function runDockerComposeUp(destination) {
 		"up",
 		"-d",
 		"--wait"
-	], destination);
+	], destination, { stdio: "inherit" });
 }
 const WORKSPACE_LOCAL_PATHS = {
 	"everything-dev": "packages/everything-dev",
 	"every-plugin": "packages/every-plugin"
 };
+function resolveFrameworkCatalog() {
+	const catalog = {};
+	for (const packageName of FRAMEWORK_PACKAGES) try {
+		const resolved = require.resolve(`${packageName}/package.json`);
+		const pkg = JSON.parse(readFileSync(resolved, "utf-8"));
+		if (pkg.version) catalog[packageName] = `^${pkg.version}`;
+	} catch {}
+	return catalog;
+}
 async function scaffoldMinimalProject(destination, parentConfig, opts) {
 	mkdirSync(destination, { recursive: true });
+	const has = (section) => opts.overrides.includes(section);
 	const config = {
 		extends: `bos://${opts.extendsAccount}/${opts.extendsGateway}`,
 		account: opts.account || opts.extendsAccount,
-		...opts.domain ? { domain: opts.domain } : {}
+		...opts.domain ? { domain: opts.domain } : {},
+		...opts.repository ? { repository: opts.repository } : {}
 	};
 	if (parentConfig.app && typeof parentConfig.app === "object") {
 		const app = {};
 		const parentApp = parentConfig.app;
-		if (parentApp.host) {
+		if (has("host") && parentApp.host) {
 			app.host = { ...parentApp.host };
-			const host = app.host;
-			delete host.production;
-			delete host.integrity;
+			stripProductionFields(app.host);
 		}
-		if (parentApp.ui) {
+		if (has("ui") && parentApp.ui) {
 			app.ui = { ...parentApp.ui };
-			const ui = app.ui;
-			delete ui.production;
-			delete ui.integrity;
-			delete ui.ssr;
-			delete ui.ssrIntegrity;
+			stripProductionFields(app.ui);
 		}
-		if (parentApp.api) {
+		if (has("api") && parentApp.api) {
 			app.api = { ...parentApp.api };
-			const api = app.api;
-			delete api.production;
-			delete api.integrity;
+			stripProductionFields(app.api);
 		}
-		if (parentApp.auth) {
+		if (has("plugins") && parentApp.auth) {
 			app.auth = { ...parentApp.auth };
-			const auth = app.auth;
-			delete auth.production;
-			delete auth.integrity;
+			stripProductionFields(app.auth);
 		}
-		config.app = app;
+		if (Object.keys(app).length > 0) config.app = app;
 	}
-	if (opts.plugins && opts.plugins.length > 0 && parentConfig.plugins) {
+	if (has("plugins") && opts.plugins && opts.plugins.length > 0 && parentConfig.plugins) {
 		const plugins = {};
 		for (const key of opts.plugins) {
 			const parentPlugin = parentConfig.plugins?.[key];
 			if (parentPlugin) if (typeof parentPlugin === "string") plugins[key] = { extends: parentPlugin };
 			else {
 				const pluginCopy = { ...parentPlugin };
-				delete pluginCopy.production;
-				delete pluginCopy.integrity;
+				stripProductionFields(pluginCopy);
 				plugins[key] = pluginCopy;
 			}
 		}
 		config.plugins = plugins;
 	}
 	await saveBosConfig(destination, config);
+	const workspacePackages = [];
+	for (const section of opts.overrides) workspacePackages.push(...OVERRIDE_WORKSPACE_MAP[section]);
+	if (has("plugins") && opts.plugins) for (const plugin of opts.plugins) workspacePackages.push(`plugins/${plugin}`);
+	const catalog = resolveFrameworkCatalog();
 	const pkg = {
 		name: opts.domain || opts.extendsGateway,
 		private: true,
@@ -474,12 +533,12 @@ async function scaffoldMinimalProject(destination, parentConfig, opts) {
 		},
 		devDependencies: {},
 		workspaces: {
-			packages: [],
-			catalog: {}
+			packages: workspacePackages,
+			catalog
 		}
 	};
 	writeFileSync(join(destination, "package.json"), `${JSON.stringify(pkg, null, 2)}\n`);
-	const envExample = generateEnvExample(parentConfig);
+	const envExample = generateEnvExample(parentConfig, opts.overrides);
 	if (envExample) writeFileSync(join(destination, ".env.example"), envExample);
 	writeFileSync(join(destination, ".gitignore"), generateGitignore());
 	return 4;
@@ -514,7 +573,9 @@ async function resolveWorkspaceRefs(destination, options) {
 	}
 }
 async function writeInitSnapshot(destination, extendsAccount, extendsGateway, sourceDir, patterns, options) {
-	const effectivePatterns = options.withHost ? [...patterns, "host/**"] : patterns.filter((p) => !p.startsWith("host/") && p !== "host/**");
+	const effectivePatterns = filterPatternsByOverrides(patterns, options.overrides, options.plugins);
+	const has = (section) => options.overrides.includes(section);
+	if (has("host") && !effectivePatterns.some((p) => p.startsWith("host/") || p === "host/**")) effectivePatterns.push("host/**");
 	const excludedRoutePatterns = [];
 	if (options.pluginRoutes) {
 		for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) if (!(options.plugins?.includes(pluginKey) ?? true)) excludedRoutePatterns.push(...routePatterns);
@@ -581,23 +642,44 @@ async function generateDatabaseMigrations(destination) {
 		await execCommand("bun", ["run", "db:generate"], join(destination, workspaceDir));
 	}
 }
-async function execCommand(command, args, cwd) {
+const COMMAND_TIMEOUTS = {
+	bun: 5 * 6e4,
+	docker: 5 * 6e4,
+	node_modules: 2 * 6e4,
+	tar: 6e4
+};
+async function execCommand(command, args, cwd, options) {
+	const timeout = COMMAND_TIMEOUTS[command] ?? 2 * 6e4;
 	await execa(command, args, {
 		cwd,
-		stdio: "pipe"
+		stdio: options?.stdio ?? "pipe",
+		timeout
 	});
 }
-function generateEnvExample(config) {
+function generateEnvExample(config, overrides) {
+	const has = (section) => overrides.includes(section);
 	const lines = ["# Environment variables"];
-	const collectSecrets = (obj, prefix = "") => {
-		for (const [key, value] of Object.entries(obj)) if (key === "secrets" && Array.isArray(value)) {
-			for (const secret of value) if (typeof secret === "string") lines.push(`${secret}=`);
-		} else if (key === "variables" && isPlainObject(value)) {
-			for (const [varKey, varVal] of Object.entries(value)) if (typeof varVal === "string") lines.push(`${varKey}=${varVal}`);
-		} else if (isPlainObject(value) && key !== "extends") collectSecrets(value, `${prefix}${key}.`);
+	const collectSecrets = (obj, includeSection, prefix = "") => {
+		for (const [key, value] of Object.entries(obj)) {
+			if (!includeSection) continue;
+			if (key === "secrets" && Array.isArray(value)) {
+				for (const secret of value) if (typeof secret === "string") lines.push(`${secret}=`);
+			} else if (key === "variables" && isPlainObject(value)) {
+				for (const [varKey, varVal] of Object.entries(value)) if (typeof varVal === "string") lines.push(`${varKey}=${varVal}`);
+			} else if (isPlainObject(value) && key !== "extends") collectSecrets(value, includeSection, `${prefix}${key}.`);
+		}
 	};
-	if (config.app && typeof config.app === "object") collectSecrets(config.app);
-	if (config.plugins && typeof config.plugins === "object") collectSecrets(config.plugins);
+	if (config.app && typeof config.app === "object") {
+		const app = config.app;
+		collectSecrets(app, has("host"), "host.");
+		collectSecrets(app, has("ui"), "ui.");
+		collectSecrets(app, has("api"), "api.");
+		collectSecrets(app, has("plugins"), "auth.");
+	}
+	if (has("plugins") && config.plugins && typeof config.plugins === "object") {
+		for (const [pluginKey, pluginVal] of Object.entries(config.plugins)) if (isPlainObject(pluginVal)) collectSecrets(pluginVal, true);
+		else if (typeof pluginVal === "string") lines.push(`# Plugin '${pluginKey}' extends ${pluginVal}`);
+	}
 	lines.push("BETTER_AUTH_SECRET=generate-a-secret-here");
 	return `${lines.join("\n")}\n`;
 }
@@ -615,5 +697,5 @@ dist/
 }
 
 //#endregion
-export { copyFilteredFiles, downloadTarball, execCommand, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, readTemplatekeep, resolveRepositoryViaExtendsChain, resolveSourceDir, runBunInstall, runDockerComposeUp, runTypesGen, scaffoldMinimalProject, writeInitSnapshot };
+export { copyFilteredFiles, detectGitRemoteUrl, downloadTarball, execCommand, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, readTemplatekeep, resolveRepositoryViaExtendsChain, resolveSourceDir, runBunInstall, runDockerComposeUp, runTypesGen, scaffoldMinimalProject, writeInitSnapshot };
 //# sourceMappingURL=init.mjs.map