everything-dev 1.43.0 → 1.44.1

package/dist/plugin.mjs

@@ -21,10 +21,10 @@ import { buildDescription, buildServiceDescriptorMap } from "./service-descripto
 import { run } from "./utils/run.mjs";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
+import { Effect } from "effect";
 import { EventEmitter } from "node:events";
 import { access, readFile } from "node:fs/promises";
 import process from "node:process";
-import { Effect } from "effect";
 
 //#region src/plugin.ts
 const pluginEvents = new EventEmitter();
@@ -317,8 +317,10 @@ async function buildWorkspaceTargets(opts) {
 		bosConfig: opts.bosConfig ?? void 0,
 		extendsChain: []
 	})).catalogChanged) await run("bun", ["install"], { cwd: opts.configDir });
-	if (existing.some((entry) => entry.key === "api")) await buildEveryPluginQuietly(opts.configDir);
-	await buildEverythingDevQuietly(opts.configDir);
+	const shouldBuildPlugin = existing.some((entry) => entry.key === "api");
+	const buildTasks = [buildEverythingDevQuietly(opts.configDir)];
+	if (shouldBuildPlugin) buildTasks.push(buildEveryPluginQuietly(opts.configDir));
+	await Promise.all(buildTasks);
 	const env = {
 		...process.env,
 		NODE_ENV: opts.deploy ? "production" : "development"
@@ -521,12 +523,9 @@ var plugin_default = createPlugin({
 			};
 		}),
 		dev: builder.dev.handler(async ({ input }) => {
+			const devTimings = [];
 			ensureEnvFile(deps.configDir);
 			loadProjectEnv(deps.configDir);
-			pluginEvents.emit("progress", {
-				phase: "config",
-				status: "running"
-			});
 			const localPackages = detectLocalPackages(deps.bosConfig ?? void 0, deps.runtimeConfig ?? void 0);
 			const hostSource = localPackages.includes("host") ? parseSourceMode(input.host, "local") : "remote";
 			const uiSource = localPackages.includes("ui") ? parseSourceMode(input.ui, "local") : "remote";
@@ -534,61 +533,44 @@ var plugin_default = createPlugin({
 			const authSource = localPackages.includes("auth") ? parseSourceMode(input.auth, "local") : "remote";
 			const ssr = input.ssr ?? false;
 			const proxy = input.proxy ?? false;
-			if ((await syncResolvedSharedDeps({
+			const sharedSync = await timePhase(devTimings, "shared deps", () => syncResolvedSharedDeps({
 				configDir: deps.configDir,
 				hostMode: hostSource,
 				bosConfig: deps.bosConfig ?? void 0,
 				extendsChain: []
-			})).catalogChanged) {
-				pluginEvents.emit("progress", {
-					phase: "install",
-					status: "running"
-				});
-				await run("bun", ["install"], { cwd: deps.configDir });
-				pluginEvents.emit("progress", {
-					phase: "install",
-					status: "done"
-				});
-			}
-			if (apiSource === "local" && !proxy || localPackages.some((pkg) => pkg.startsWith("plugin:"))) {
-				pluginEvents.emit("progress", {
-					phase: "build plugin",
-					status: "running"
-				});
-				await buildEveryPluginQuietly(deps.configDir);
-				pluginEvents.emit("progress", {
-					phase: "build plugin",
-					status: "done"
-				});
+			}));
+			let configMayHaveChanged = false;
+			if (sharedSync.catalogChanged) {
+				await timePhase(devTimings, "install", () => run("bun", ["install"], { cwd: deps.configDir }));
+				configMayHaveChanged = true;
 			}
-			pluginEvents.emit("progress", {
-				phase: "build",
-				status: "running"
+			const shouldBuildPlugin = apiSource === "local" && !proxy || localPackages.some((pkg) => pkg.startsWith("plugin:"));
+			await timePhase(devTimings, "build", async () => {
+				const buildTasks = [buildEverythingDevQuietly(deps.configDir)];
+				if (shouldBuildPlugin) buildTasks.push(buildEveryPluginQuietly(deps.configDir));
+				await Promise.all(buildTasks);
 			});
-			await buildEverythingDevQuietly(deps.configDir);
-			pluginEvents.emit("progress", {
-				phase: "build",
-				status: "done"
-			});
-			pluginEvents.emit("progress", {
-				phase: "config",
-				status: "done"
-			});
-			const refreshed = await loadResolvedConfig({
-				cwd: deps.configDir,
-				remotePlugins: input.remotePlugins
-			});
-			deps.bosConfig = refreshed?.config ?? deps.bosConfig;
-			deps.runtimeConfig = refreshed?.runtime ?? deps.runtimeConfig;
+			let devExtendsChain;
+			if (configMayHaveChanged || input.remotePlugins?.length) {
+				const refreshed = await timePhase(devTimings, "resolve config", () => loadResolvedConfig({
+					cwd: deps.configDir,
+					remotePlugins: input.remotePlugins
+				}));
+				deps.bosConfig = refreshed?.config ?? deps.bosConfig;
+				deps.runtimeConfig = refreshed?.runtime ?? deps.runtimeConfig;
+				devExtendsChain = refreshed?.source.extended;
+			}
 			if (!deps.bosConfig) return {
 				status: "error",
 				description: "No bos.config.json found",
-				processes: []
+				processes: [],
+				timings: devTimings
 			};
 			if (proxy && !resolveProxyUrl(deps.bosConfig)) return {
 				status: "error",
 				description: "No valid proxy URL configured in bos.config.json",
-				processes: []
+				processes: [],
+				timings: devTimings
 			};
 			const hostPort = input.port ?? getHostDevelopmentPort(deps.bosConfig.app.host.development);
 			suppressWarnings();
@@ -602,20 +584,18 @@ var plugin_default = createPlugin({
 			});
 			drainConfigWarnings();
 			resumeWarnings();
-			const runtimeConfig = await prepareDevelopmentRuntimeConfig(developmentRuntime, {
+			const runtimeConfig = await timePhase(devTimings, "ports", () => prepareDevelopmentRuntimeConfig(developmentRuntime, {
 				hostPort,
 				ssr
-			});
+			}));
 			syncGeneratedInfra(deps.configDir, runtimeConfig);
-			if (!existsSync(join(deps.configDir, ".env"))) {
-				ensureEnvFile(deps.configDir);
-				loadProjectEnv(deps.configDir);
-			}
-			await generateCodeArtifacts(deps.configDir, deps.bosConfig, {
+			ensureEnvFile(deps.configDir);
+			loadProjectEnv(deps.configDir);
+			await timePhase(devTimings, "generate artifacts", () => generateCodeArtifacts(deps.configDir, deps.bosConfig, {
 				env: "development",
-				extendsChain: refreshed?.source.extended,
+				extendsChain: devExtendsChain,
 				runtimeConfig
-			});
+			}));
 			const services = buildServiceDescriptorMap(runtimeConfig, {
 				ssr,
 				proxy
@@ -647,7 +627,8 @@ var plugin_default = createPlugin({
 			return {
 				status: "started",
 				description: orchestrator.description,
-				processes: packages
+				processes: packages,
+				timings: devTimings
 			};
 		}),
 		start: builder.start.handler(async ({ input }) => {
@@ -708,10 +689,8 @@ var plugin_default = createPlugin({
 			if (isStaging && config.staging?.domain) runtimeConfig.domain = config.staging.domain;
 			if (isStaging) runtimeConfig.env = "staging";
 			syncGeneratedInfra(deps.configDir, runtimeConfig);
-			if (!existsSync(join(deps.configDir, ".env"))) {
-				ensureEnvFile(deps.configDir);
-				loadProjectEnv(deps.configDir);
-			}
+			ensureEnvFile(deps.configDir);
+			loadProjectEnv(deps.configDir);
 			pluginEvents.emit("progress", {
 				phase: "generate artifacts",
 				status: "running"
@@ -1033,10 +1012,23 @@ var plugin_default = createPlugin({
 				try {
 					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway));
 					if (parentConfig?.plugins && typeof parentConfig.plugins === "object") parentPluginKeys = Object.keys(parentConfig.plugins);
-				} catch {}
+				} catch (e) {
+					console.warn(`[init] Failed to fetch parent config from ${extendsAccount}/${extendsGateway}: ${e instanceof Error ? e.message : e}`);
+				}
 				overrides = overrides?.length ? overrides : ["ui", "api"];
 				if (overrides.includes("plugins") && plugins === void 0) plugins = parentPluginKeys;
 				plugins = plugins ?? [];
+				const pluginDirMap = {};
+				if (parentConfig?.plugins) for (const plugin of plugins) {
+					const entry = parentConfig.plugins?.[plugin];
+					if (entry && typeof entry === "object") {
+						const dev = entry.development;
+						if (typeof dev === "string") {
+							const match = dev.match(/^local:plugins\/(.+)$/);
+							if (match?.[1] && match[1] !== plugin) pluginDirMap[plugin] = match[1];
+						}
+					}
+				}
 				directory = directory || domain || extendsGateway;
 				const targetDir = resolve(directory);
 				const extendsRef = `bos://${extendsAccount}/${extendsGateway}`;
@@ -1094,7 +1086,7 @@ var plugin_default = createPlugin({
 							staging: parentConfig?.staging
 						}));
 					} else {
-						const patterns = buildInitPatterns(overrides, plugins);
+						const patterns = buildInitPatterns(overrides, plugins, pluginDirMap);
 						filesCopied = await timePhase(timings, "copy files", () => copyFilteredFiles(sourceDir, targetDir, patterns, {
 							overrides,
 							plugins