everything-dev 1.14.0 → 1.14.3

package/dist/plugin.d.mts

@@ -1,10 +1,10 @@
 import { z } from "./sdk.mjs";
+import { ContractProcedure, MergedErrorMap, Schema } from "./node_modules/@orpc/contract/dist/shared/contract.TuRtB1Ca.mjs";
 import * as _$every_plugin0 from "every-plugin";
-import * as _$_orpc_contract0 from "@orpc/contract";
 
 //#region src/plugin.d.ts
 declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
-  dev: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  dev: ContractProcedure<z.ZodObject<{
     host: z.ZodDefault<z.ZodEnum<{
       local: "local";
       remote: "remote";
@@ -32,8 +32,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }>;
     description: z.ZodString;
     processes: z.ZodArray<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  start: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  start: ContractProcedure<z.ZodObject<{
     port: z.ZodOptional<z.ZodNumber>;
     interactive: z.ZodOptional<z.ZodBoolean>;
     account: z.ZodOptional<z.ZodString>;
@@ -49,8 +49,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }>;
     url: z.ZodString;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  build: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  build: ContractProcedure<z.ZodObject<{
     packages: z.ZodDefault<z.ZodString>;
     force: z.ZodDefault<z.ZodBoolean>;
     deploy: z.ZodDefault<z.ZodBoolean>;
@@ -62,8 +62,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     built: z.ZodArray<z.ZodString>;
     skipped: z.ZodOptional<z.ZodArray<z.ZodString>>;
     deployed: z.ZodOptional<z.ZodBoolean>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  config: _$_orpc_contract0.ContractProcedure<_$_orpc_contract0.Schema<unknown, unknown>, z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  config: ContractProcedure<Schema<unknown, unknown>, z.ZodObject<{
     config: z.ZodNullable<z.ZodObject<{
       account: z.ZodString;
       extends: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
@@ -178,8 +178,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }, z.core.$strip>>;
     packages: z.ZodArray<z.ZodString>;
     remotes: z.ZodArray<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  pluginAdd: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  pluginAdd: ContractProcedure<z.ZodObject<{
     source: z.ZodString;
     as: z.ZodOptional<z.ZodString>;
     production: z.ZodOptional<z.ZodString>;
@@ -194,8 +194,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     integrity: z.ZodOptional<z.ZodString>;
     version: z.ZodOptional<z.ZodString>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  pluginRemove: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  pluginRemove: ContractProcedure<z.ZodObject<{
     key: z.ZodString;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
@@ -204,8 +204,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }>;
     key: z.ZodString;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  pluginList: _$_orpc_contract0.ContractProcedure<_$_orpc_contract0.Schema<unknown, unknown>, z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  pluginList: ContractProcedure<Schema<unknown, unknown>, z.ZodObject<{
     status: z.ZodEnum<{
       error: "error";
       listed: "listed";
@@ -224,8 +224,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
       name: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  pluginPublish: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  pluginPublish: ContractProcedure<z.ZodObject<{
     key: z.ZodString;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
@@ -239,8 +239,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     integrity: z.ZodOptional<z.ZodString>;
     version: z.ZodOptional<z.ZodString>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  publish: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  publish: ContractProcedure<z.ZodObject<{
     deploy: z.ZodDefault<z.ZodBoolean>;
     dryRun: z.ZodDefault<z.ZodBoolean>;
     packages: z.ZodDefault<z.ZodString>;
@@ -260,8 +260,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     error: z.ZodOptional<z.ZodString>;
     built: z.ZodOptional<z.ZodArray<z.ZodString>>;
     skipped: z.ZodOptional<z.ZodArray<z.ZodString>>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  keyPublish: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  keyPublish: ContractProcedure<z.ZodObject<{
     allowance: z.ZodDefault<z.ZodString>;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
@@ -279,8 +279,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     publicKey: z.ZodOptional<z.ZodString>;
     privateKey: z.ZodOptional<z.ZodString>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  init: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  init: ContractProcedure<z.ZodObject<{
     extends: z.ZodOptional<z.ZodString>;
     extendsAccount: z.ZodOptional<z.ZodString>;
     extendsGateway: z.ZodOptional<z.ZodString>;
@@ -306,8 +306,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     plugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
     filesCopied: z.ZodNumber;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  sync: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  sync: ContractProcedure<z.ZodObject<{
     dryRun: z.ZodDefault<z.ZodBoolean>;
     force: z.ZodDefault<z.ZodBoolean>;
     noInstall: z.ZodDefault<z.ZodBoolean>;
@@ -321,8 +321,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     skipped: z.ZodArray<z.ZodString>;
     added: z.ZodArray<z.ZodString>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  upgrade: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  upgrade: ContractProcedure<z.ZodObject<{
     dryRun: z.ZodDefault<z.ZodBoolean>;
     force: z.ZodDefault<z.ZodBoolean>;
     noInstall: z.ZodDefault<z.ZodBoolean>;
@@ -352,8 +352,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     migrated: z.ZodOptional<z.ZodArray<z.ZodString>>;
     changelogUrl: z.ZodOptional<z.ZodString>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  status: _$_orpc_contract0.ContractProcedure<_$_orpc_contract0.Schema<unknown, unknown>, z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  status: ContractProcedure<Schema<unknown, unknown>, z.ZodObject<{
     status: z.ZodEnum<{
       error: "error";
       ok: "ok";
@@ -374,8 +374,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }>;
     parentReachable: z.ZodOptional<z.ZodBoolean>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
-  typesGen: _$_orpc_contract0.ContractProcedure<z.ZodObject<{
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  typesGen: ContractProcedure<z.ZodObject<{
     env: z.ZodOptional<z.ZodEnum<{
       development: "development";
       production: "production";
@@ -395,7 +395,7 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
       remote: "remote";
     }>>;
     error: z.ZodOptional<z.ZodString>;
-  }, z.core.$strip>, _$_orpc_contract0.MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
+  }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
 }, z.ZodObject<{
   configPath: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>, z.ZodObject<{}, z.core.$strip>, undefined, {

package/dist/plugin.mjs

@@ -145,18 +145,21 @@ function listPluginAttachments(config) {
 		};
 	}).sort((a, b) => a.key.localeCompare(b.key));
 }
-async function refreshApiContractBridge(configDir, env = "development") {
-	const refreshed = await loadConfig({
-		cwd: configDir,
-		env
-	});
-	if (!refreshed) return;
-	await syncApiContractBridge({
+async function generateCodeArtifacts(configDir, config, opts) {
+	writePluginSidebarGen(configDir, config);
+	if (opts?.env) writeResolvedConfig(configDir, config, opts.env, opts.extendsChain);
+	const runtimeConfig = opts?.runtimeConfig ?? (await loadConfig({ cwd: configDir }))?.runtime;
+	if (!runtimeConfig) return null;
+	const bridge = await syncApiContractBridge({
 		configDir,
-		runtimeConfig: refreshed.runtime,
-		apiBaseUrl: refreshed.runtime.api.url
+		runtimeConfig,
+		apiBaseUrl: runtimeConfig.api.url
 	});
-	writePluginSidebarGen(configDir, refreshed.config);
+	return {
+		sidebarPath: join(configDir, "ui/src/lib/plugin-sidebar.gen.ts"),
+		resolvedConfigPath: opts?.env ? join(configDir, ".bos/bos.resolved-config.json") : void 0,
+		contractBridgePath: bridge.bridgePath
+	};
 }
 function extractPublishedUrl(output) {
 	const match = output.match(/https?:\/\/[^\s"'<>]+/g);
@@ -320,7 +323,7 @@ var plugin_default = createPlugin({
 				plugins: nextPlugins
 			};
 			await saveBosConfig(deps.configDir, deps.bosConfig);
-			await refreshApiContractBridge(deps.configDir);
+			await generateCodeArtifacts(deps.configDir, deps.bosConfig);
 			const stored = deps.bosConfig.plugins?.[key];
 			const storedObj = stored && typeof stored === "object" ? stored : {};
 			return {
@@ -350,7 +353,7 @@ var plugin_default = createPlugin({
 				plugins: Object.keys(nextPlugins).length > 0 ? nextPlugins : void 0
 			};
 			await saveBosConfig(deps.configDir, deps.bosConfig);
-			await refreshApiContractBridge(deps.configDir);
+			await generateCodeArtifacts(deps.configDir, deps.bosConfig);
 			return {
 				status: "removed",
 				key: input.key
@@ -477,7 +480,7 @@ var plugin_default = createPlugin({
 				} catch (registryError) {
 					console.warn(`[publish] Plugin registry write skipped: ${registryError instanceof Error ? registryError.message : registryError}`);
 				}
-				await refreshApiContractBridge(deps.configDir);
+				await generateCodeArtifacts(deps.configDir, deps.bosConfig);
 			}
 			return {
 				status: "published",
@@ -509,10 +512,6 @@ var plugin_default = createPlugin({
 			const refreshed = await loadConfig({ cwd: deps.configDir });
 			deps.bosConfig = refreshed?.config ?? deps.bosConfig;
 			deps.runtimeConfig = refreshed?.runtime ?? deps.runtimeConfig;
-			if (deps.bosConfig) {
-				writeResolvedConfig(deps.configDir, deps.bosConfig, "development", refreshed?.source.extended);
-				writePluginSidebarGen(deps.configDir, deps.bosConfig);
-			}
 			if (!deps.bosConfig) return {
 				status: "error",
 				description: "No bos.config.json found",
@@ -535,6 +534,11 @@ var plugin_default = createPlugin({
 				hostPort,
 				ssr
 			});
+			await generateCodeArtifacts(deps.configDir, deps.bosConfig, {
+				env: "development",
+				extendsChain: refreshed?.source.extended,
+				runtimeConfig
+			});
 			const services = buildServiceDescriptorMap(runtimeConfig, {
 				ssr,
 				proxy
@@ -545,11 +549,6 @@ var plugin_default = createPlugin({
 				const proxyUrl = resolveProxyUrl(deps.bosConfig);
 				if (proxyUrl) displayEnv.API_PROXY = proxyUrl;
 			}
-			await syncApiContractBridge({
-				configDir: deps.configDir,
-				runtimeConfig,
-				apiBaseUrl: runtimeConfig.api.url
-			});
 			const orchestrator = {
 				packages,
 				env: displayEnv,
@@ -600,7 +599,10 @@ var plugin_default = createPlugin({
 				env: "production",
 				plugins: runtimePlugins
 			});
-			writePluginSidebarGen(deps.configDir, config);
+			await generateCodeArtifacts(deps.configDir, config, {
+				env: "production",
+				runtimeConfig
+			});
 			const productionEnv = {};
 			const warnings = [];
 			if (!process.env.CORS_ORIGIN && config.domain) {
@@ -619,11 +621,6 @@ var plugin_default = createPlugin({
 			}
 			if (missingSecrets.length > 0) warnings.push(`Missing ${missingSecrets.length} secret(s): ${missingSecrets.join(", ")}`);
 			const services = buildServiceDescriptorMap(runtimeConfig);
-			await syncApiContractBridge({
-				configDir: deps.configDir,
-				runtimeConfig,
-				apiBaseUrl: runtimeConfig.api.url
-			});
 			const stagingEnvVars = isStaging ? { BOS_GATEWAY: config.staging?.domain ?? config.domain ?? "" } : {};
 			const configSource = remoteConfig ? `bos://${account}/${domain}` : findConfigPath() ?? "bos.config.json";
 			const configSourceHttp = remoteConfig && account && domain ? buildRegistryConfigUrl(account, domain) : void 0;
@@ -661,8 +658,6 @@ var plugin_default = createPlugin({
 				skipped: []
 			};
 			const buildEnv = input.deploy ? "production" : "development";
-			writeResolvedConfig(deps.configDir, deps.bosConfig, buildEnv);
-			writePluginSidebarGen(deps.configDir, deps.bosConfig);
 			const targets = selectWorkspaceTargets(input.packages, deps.bosConfig);
 			if (targets.length === 0) return {
 				status: "error",
@@ -677,10 +672,9 @@ var plugin_default = createPlugin({
 				env: buildEnv,
 				plugins: deps.runtimeConfig?.plugins
 			});
-			await syncApiContractBridge({
-				configDir: deps.configDir,
-				runtimeConfig,
-				apiBaseUrl: runtimeConfig.api.url
+			await generateCodeArtifacts(deps.configDir, deps.bosConfig, {
+				env: buildEnv,
+				runtimeConfig
 			});
 			const { built, skipped } = await buildWorkspaceTargets({
 				configDir: deps.configDir,
@@ -728,6 +722,10 @@ var plugin_default = createPlugin({
 				skipped
 			};
 			if (input.deploy) {
+				await generateCodeArtifacts(deps.configDir, deps.bosConfig, {
+					env: "production",
+					runtimeConfig: deps.runtimeConfig ?? void 0
+				});
 				const result = await buildWorkspaceTargets({
 					configDir: deps.configDir,
 					bosConfig: deps.bosConfig,
@@ -951,7 +949,7 @@ var plugin_default = createPlugin({
 						await generateDatabaseMigrations(directory);
 					}
 					const initConfig = await loadConfig({ cwd: directory });
-					if (initConfig?.config) writePluginSidebarGen(directory, initConfig.config);
+					if (initConfig?.config) await generateCodeArtifacts(directory, initConfig.config);
 					s.stop("Project initialized");
 					return {
 						status: "initialized",
@@ -996,7 +994,7 @@ var plugin_default = createPlugin({
 				const result = await syncTemplate(projectDir, input);
 				if (result.status === "synced" || result.status === "dry-run") {
 					const syncedConfig = await loadConfig({ cwd: projectDir });
-					if (syncedConfig?.config) writePluginSidebarGen(projectDir, syncedConfig.config);
+					if (syncedConfig?.config) await generateCodeArtifacts(projectDir, syncedConfig.config);
 				}
 				return result;
 			} catch (error) {
@@ -1076,12 +1074,9 @@ var plugin_default = createPlugin({
 						source: refreshed.runtime.api.source
 					};
 				}
-				const result = await syncApiContractBridge({
-					configDir: projectDir,
-					runtimeConfig: refreshed.runtime,
-					apiBaseUrl: refreshed.runtime.api.url
-				});
+				await generateCodeArtifacts(projectDir, refreshed.config, { runtimeConfig: refreshed.runtime });
 				const generated = [
+					"ui/src/lib/plugin-sidebar.gen.ts",
 					"ui/src/lib/api-types.gen.ts",
 					"api/src/lib/plugins-types.gen.ts",
 					"api/src/lib/auth-types.gen.ts"
@@ -1091,10 +1086,10 @@ var plugin_default = createPlugin({
 				return {
 					status: "success",
 					generated,
-					fetched: result.source === "remote" ? [refreshed.runtime.api.url] : [],
-					skipped: result.source === "local" ? ["api (local)"] : [],
+					fetched: refreshed.runtime.api.source === "remote" ? [refreshed.runtime.api.url] : [],
+					skipped: refreshed.runtime.api.source === "local" ? ["api (local)"] : [],
 					failed: [],
-					source: result.source
+					source: refreshed.runtime.api.source
 				};
 			} catch (error) {
 				return {