everything-dev 1.26.1 → 1.28.0

package/dist/cli/init.mjs

@@ -1,6 +1,5 @@
 import { fetchBosConfigFromFastKv } from "../fastkv.mjs";
 import { loadManifestNormalizationSpec, normalizePackageManifestsInTree } from "../internal/manifest-normalizer.mjs";
-import { isPathExcluded } from "../utils/path-match.mjs";
 import { saveBosConfig } from "../utils/save-config.mjs";
 import { writeSnapshot } from "./snapshot.mjs";
 import { createRequire } from "node:module";
@@ -14,6 +13,24 @@ import { glob } from "glob";
 
 //#region src/cli/init.ts
 const require = createRequire(import.meta.url);
+const INIT_ROOT_PATTERNS = [
+	"bos.config.json",
+	"package.json",
+	".env.example",
+	".gitignore",
+	"biome.json",
+	"bunfig.toml",
+	"Dockerfile",
+	"railway.json",
+	".agent/**",
+	"AGENTS.md",
+	".opencode/skills/everything-dev/**",
+	".changeset/config.json",
+	".changeset/README.md",
+	"README.md",
+	"CONTRIBUTING.md",
+	".github/templates/**"
+];
 const FRAMEWORK_PACKAGES = ["every-plugin", "everything-dev"];
 const OVERRIDE_WORKSPACE_MAP = {
 	ui: ["ui"],
@@ -55,13 +72,18 @@ async function resolveSourceDir(opts) {
 		cleanup: async () => {}
 	};
 }
-async function readTemplatekeep(sourceDir) {
-	const keepFile = join(sourceDir, ".templatekeep");
-	if (!existsSync(keepFile)) return [];
-	const patterns = readFileSync(keepFile, "utf-8").split("\n").map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#"));
-	if (!patterns.includes(".templatekeep")) patterns.unshift(".templatekeep");
+function buildInitPatterns(overrides, plugins) {
+	const has = (section) => overrides.includes(section);
+	const patterns = [...INIT_ROOT_PATTERNS];
+	if (has("ui")) patterns.push("ui/**");
+	if (has("api")) patterns.push("api/**");
+	if (has("host")) patterns.push("host/**");
+	if (has("plugins")) for (const plugin of plugins ?? []) patterns.push(`plugins/${plugin}/**`);
 	return patterns;
 }
+function sourcePathToDestinationPath(filePath) {
+	return filePath.startsWith(".github/templates/") ? filePath.replace(/^\.github\/templates\//, ".github/") : filePath;
+}
 async function fetchParentConfig(extendsAccount, extendsGateway) {
 	return fetchBosConfigFromFastKv(`bos://${extendsAccount}/${extendsGateway}`);
 }
@@ -185,62 +207,30 @@ 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) {
+async function copyFilteredFiles(sourceDir, destination, patterns, _options) {
 	if (patterns.length === 0) return 0;
-	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);
-	}
 	const allFiles = /* @__PURE__ */ new Set();
-	for (const pattern of effectivePatterns) {
+	for (const pattern of patterns) {
 		const matches = await glob(pattern, {
 			cwd: sourceDir,
 			nodir: true,
 			dot: true,
-			absolute: false
+			absolute: false,
+			ignore: [
+				"**/node_modules/**",
+				"**/.git/**",
+				"**/dist/**",
+				"**/.bos/**"
+			]
 		});
-		for (const match of matches) {
-			const pluginMatch = match.match(/^plugins\/([^/]+)/);
-			if (pluginMatch) {
-				const pluginName = pluginMatch[1];
-				if (!(options.plugins?.includes(pluginName) ?? true)) continue;
-			}
-			if (isPathExcluded(match, excludedRoutePatterns)) continue;
-			allFiles.add(match);
-		}
-	}
-	const routeFiles = /* @__PURE__ */ new Set();
-	if (options.pluginRoutes) for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) {
-		if (!(options.plugins?.includes(pluginKey) ?? true)) continue;
-		for (const rp of routePatterns) {
-			const matches = await glob(rp, {
-				cwd: sourceDir,
-				nodir: true,
-				dot: true,
-				absolute: false
-			});
-			for (const match of matches) if (!isPathExcluded(match, excludedRoutePatterns)) routeFiles.add(match);
-		}
+		for (const match of matches) allFiles.add(match);
 	}
-	for (const f of routeFiles) allFiles.add(f);
 	mkdirSync(destination, { recursive: true });
 	let count = 0;
 	for (const filePath of allFiles) {
 		const src = join(sourceDir, filePath);
 		if (!lstatSync(src).isFile()) continue;
-		const dest = join(destination, filePath.startsWith(".github/templates/") ? filePath.replace(/^\.github\/templates\//, ".github/") : filePath);
+		const dest = join(destination, sourcePathToDestinationPath(filePath));
 		mkdirSync(dirname(dest), { recursive: true });
 		writeFileSync(dest, readFileSync(src));
 		count++;
@@ -312,37 +302,38 @@ async function personalizeConfig(destination, opts) {
 				ws.packages = ws.packages.filter((p) => {
 					if (p.startsWith("packages/")) return false;
 					if (p === "host") return has("host");
-					if (p === "plugins/*") return false;
-					const pluginMatch = p.match(/^plugins\/([^/]+)/);
-					if (pluginMatch) return has("plugins") && (opts.plugins?.includes(pluginMatch[1]) ?? true);
+					if (p.startsWith("plugins/")) return false;
 					return true;
 				});
-				if (has("plugins") && (opts.plugins?.length ?? 0) > 0) for (const plugin of opts.plugins ?? []) {
-					const pluginWorkspace = `plugins/${plugin}`;
-					if (!ws.packages.includes(pluginWorkspace)) ws.packages.push(pluginWorkspace);
+				if (has("plugins")) {
+					if (!ws.packages.includes("plugins/*")) ws.packages.push("plugins/*");
 				}
 			}
 		}
 		if (pkg.scripts && typeof pkg.scripts === "object") {
 			const scripts = pkg.scripts;
-			const rewrite = (key, from, to) => {
-				if (scripts[key]?.includes(from)) scripts[key] = scripts[key].replaceAll(from, to);
+			const FROM = "bun packages/everything-dev/src/cli.ts";
+			const TO = "node_modules/.bin/bos";
+			const rewrite = (key) => {
+				if (scripts[key]?.includes(FROM)) scripts[key] = scripts[key].replaceAll(FROM, TO);
 			};
-			rewrite("dev", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-			rewrite("dev:ui", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-			rewrite("dev:api", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-			rewrite("dev:proxy", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-			rewrite("build", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-			rewrite("deploy", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-			rewrite("publish", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
-			rewrite("start", "packages/everything-dev/src/cli.ts", "node_modules/.bin/bos");
+			rewrite("dev");
+			rewrite("dev:ui");
+			rewrite("dev:api");
+			rewrite("dev:proxy");
+			rewrite("build");
+			rewrite("deploy");
+			rewrite("publish");
+			rewrite("start");
+			rewrite("bos");
 			scripts.postinstall = "node_modules/.bin/bos types gen || true";
 			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 (!has("ui")) scripts.typecheck = scripts.typecheck.replace(/bun run --cwd ui tsc --noEmit & ?/, "");
+				if (!has("api")) scripts.typecheck = scripts.typecheck.replace(/bun run --cwd api tsc --noEmit & ?/, "");
 				if (!has("host")) scripts.typecheck = scripts.typecheck.replace(/bun run --cwd host tsc --noEmit & ?/, "");
 			}
-			if (!scripts.bos) scripts.bos = "node_modules/.bin/bos";
 		}
 		if (pkg.devDependencies && typeof pkg.devDependencies === "object") {
 			const deps = pkg.devDependencies;
@@ -462,7 +453,22 @@ async function runBunInstallForUpgrade(destination, spinner) {
 	await runWithProgress("bun", ["install", "--force"], destination, spinner, "Installing dependencies");
 }
 async function runTypesGen(destination, spinner) {
-	await runWithProgress("node_modules/.bin/bos", ["types", "gen"], destination, spinner, "Generating types");
+	if (existsSync(join(destination, "node_modules", ".bin", "bos"))) {
+		await runWithProgress("node_modules/.bin/bos", ["types", "gen"], destination, spinner, "Generating types");
+		return;
+	}
+	if (existsSync(join(destination, "packages", "everything-dev", "src", "cli.ts"))) {
+		await runWithProgress("bun", [
+			"run",
+			"--cwd",
+			"packages/everything-dev",
+			"src/cli.ts",
+			"types",
+			"gen"
+		], destination, spinner, "Generating types");
+		return;
+	}
+	throw new Error("Unable to locate bos CLI for types generation");
 }
 async function runDockerComposeUp(destination) {
 	await execCommand("docker", [
@@ -506,7 +512,9 @@ function stripOrphanedWorkspacesFromLockfile(lockfilePath, allowedWorkspaces) {
 	const allowed = new Set(["", ...allowedWorkspaces]);
 	const keys = Object.keys(workspaceMap);
 	let changed = false;
-	for (const key of keys) if (!allowed.has(key)) {
+	for (const key of keys) {
+		if (allowed.has(key)) continue;
+		if (allowedWorkspaces.some((pattern) => pattern.endsWith("/*") && key.startsWith(pattern.slice(0, -1)))) continue;
 		delete workspaceMap[key];
 		changed = true;
 	}
@@ -520,32 +528,46 @@ const WORKSPACE_LOCAL_PATHS = {
 	"everything-dev": "packages/everything-dev",
 	"every-plugin": "packages/every-plugin"
 };
+function readJsonFile(filePath) {
+	return JSON.parse(readFileSync(filePath, "utf-8"));
+}
+function tryResolvePackageJson(packageName) {
+	try {
+		return require.resolve(`${packageName}/package.json`);
+	} catch {
+		return null;
+	}
+}
 function resolveFrameworkCatalog() {
 	const catalog = {};
-	try {
-		const monorepoPkgPath = join(dirname(require.resolve("everything-dev/package.json")), "..", "..", "package.json");
-		if (existsSync(monorepoPkgPath)) {
-			const sourceCatalog = JSON.parse(readFileSync(monorepoPkgPath, "utf-8")).workspaces?.catalog;
+	const everythingDevPackageJson = tryResolvePackageJson("everything-dev");
+	if (everythingDevPackageJson) {
+		try {
+			const monorepoPkgPath = join(dirname(everythingDevPackageJson), "..", "..", "package.json");
+			if (existsSync(monorepoPkgPath)) {
+				const sourceCatalog = readJsonFile(monorepoPkgPath).workspaces?.catalog;
+				if (sourceCatalog && typeof sourceCatalog === "object") {
+					for (const [name, version] of Object.entries(sourceCatalog)) if (typeof version === "string") catalog[name] = version;
+				}
+			}
+		} catch {}
+		try {
+			const selfPkg = readJsonFile(everythingDevPackageJson);
+			if (selfPkg.version && !catalog["everything-dev"]) catalog["everything-dev"] = `^${selfPkg.version}`;
+			const sourceCatalog = selfPkg.workspaces?.catalog;
 			if (sourceCatalog && typeof sourceCatalog === "object") {
-				for (const [name, version] of Object.entries(sourceCatalog)) if (typeof version === "string") catalog[name] = version;
+				for (const [name, version] of Object.entries(sourceCatalog)) if (typeof version === "string" && !catalog[name]) catalog[name] = version;
 			}
-		}
-	} catch {}
-	try {
-		const selfPkgPath = require.resolve("everything-dev/package.json");
-		const selfPkg = JSON.parse(readFileSync(selfPkgPath, "utf-8"));
-		if (selfPkg.version && !catalog["everything-dev"]) catalog["everything-dev"] = `^${selfPkg.version}`;
-		const sourceCatalog = selfPkg.workspaces?.catalog;
-		if (sourceCatalog && typeof sourceCatalog === "object") {
-			for (const [name, version] of Object.entries(sourceCatalog)) if (typeof version === "string" && !catalog[name]) catalog[name] = version;
-		}
-	} catch {}
-	if (Object.keys(catalog).length > 0) return 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 {}
+		} catch {}
+	}
+	for (const packageName of FRAMEWORK_PACKAGES) {
+		const resolved = tryResolvePackageJson(packageName);
+		if (!resolved) continue;
+		try {
+			const pkg = readJsonFile(resolved);
+			if (pkg.version) catalog[packageName] = `^${pkg.version}`;
+		} catch {}
+	}
 	return catalog;
 }
 async function scaffoldMinimalProject(destination, parentConfig, opts) {
@@ -596,7 +618,7 @@ async function scaffoldMinimalProject(destination, parentConfig, opts) {
 	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}`);
+	if (has("plugins")) workspacePackages.push("plugins/*");
 	const catalog = resolveFrameworkCatalog();
 	const pkg = {
 		name: opts.domain || opts.extendsGateway,
@@ -660,47 +682,29 @@ async function resolveWorkspaceRefs(destination, options) {
 		}
 	}
 }
-async function writeInitSnapshot(destination, extendsAccount, extendsGateway, sourceDir, patterns, options) {
-	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);
-	}
+async function writeInitSnapshot(destination, extendsAccount, extendsGateway, sourceDir, patterns, _options) {
 	const allFiles = /* @__PURE__ */ new Set();
-	for (const pattern of effectivePatterns) {
+	for (const pattern of patterns) {
 		const matches = await glob(pattern, {
 			cwd: sourceDir,
 			nodir: true,
 			dot: true,
-			absolute: false
+			absolute: false,
+			ignore: [
+				"**/node_modules/**",
+				"**/.git/**",
+				"**/dist/**",
+				"**/.bos/**"
+			]
 		});
-		for (const match of matches) {
-			const pluginMatch = match.match(/^plugins\/([^/]+)/);
-			if (pluginMatch && !(options.plugins?.includes(pluginMatch[1]) ?? true)) continue;
-			if (isPathExcluded(match, excludedRoutePatterns)) continue;
-			allFiles.add(match);
-		}
-	}
-	if (options.pluginRoutes) for (const [pluginKey, routePatterns] of Object.entries(options.pluginRoutes)) {
-		if (!(options.plugins?.includes(pluginKey) ?? true)) continue;
-		for (const rp of routePatterns) {
-			const matches = await glob(rp, {
-				cwd: sourceDir,
-				nodir: true,
-				dot: true,
-				absolute: false
-			});
-			for (const match of matches) if (!isPathExcluded(match, excludedRoutePatterns)) allFiles.add(match);
-		}
+		for (const match of matches) allFiles.add(match);
 	}
 	const fileHashes = {};
 	for (const filePath of allFiles) {
 		const src = join(sourceDir, filePath);
 		if (!lstatSync(src).isFile()) continue;
 		const content = readFileSync(src);
-		const destPath = filePath.startsWith(".github/templates/") ? filePath.replace(/^\.github\/templates\//, ".github/") : filePath;
+		const destPath = sourcePathToDestinationPath(filePath);
 		fileHashes[destPath] = computeHash(content);
 	}
 	await writeSnapshot(destination, {
@@ -785,5 +789,5 @@ dist/
 }
 
 //#endregion
-export { copyFilteredFiles, detectGitRemoteUrl, downloadTarball, execCommand, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, readTemplatekeep, removeInitLockfile, resolveRepositoryViaExtendsChain, resolveSourceDir, runBunInstall, runBunInstallForUpgrade, runDockerComposeUp, runTypesGen, scaffoldMinimalProject, stripOrphanedWorkspacesFromLockfile, writeInitSnapshot };
+export { INIT_ROOT_PATTERNS, buildInitPatterns, copyFilteredFiles, detectGitRemoteUrl, downloadTarball, execCommand, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, removeInitLockfile, resolveRepositoryViaExtendsChain, resolveSourceDir, runBunInstall, runBunInstallForUpgrade, runDockerComposeUp, runTypesGen, scaffoldMinimalProject, sourcePathToDestinationPath, stripOrphanedWorkspacesFromLockfile, writeInitSnapshot };
 //# sourceMappingURL=init.mjs.map