everything-dev 1.16.2 → 1.17.0

package/dist/plugin.d.mts

@@ -93,15 +93,13 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
           production: z.ZodOptional<z.ZodString>;
           staging: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>]>>;
+        name: z.ZodOptional<z.ZodString>;
         development: z.ZodOptional<z.ZodString>;
         production: z.ZodOptional<z.ZodString>;
         integrity: z.ZodOptional<z.ZodString>;
-        name: z.ZodOptional<z.ZodString>;
-        version: z.ZodOptional<z.ZodString>;
         proxy: z.ZodOptional<z.ZodString>;
         variables: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodString>>;
         secrets: z.ZodOptional<z.ZodArray<z.ZodString>>;
-        routes: z.ZodOptional<z.ZodArray<z.ZodString>>;
         sidebar: z.ZodOptional<z.ZodArray<z.ZodObject<{
           icon: z.ZodString;
           label: z.ZodString;
@@ -112,6 +110,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
             admin: "admin";
           }>>;
         }, z.core.$strip>>>;
+        routes: z.ZodOptional<z.ZodArray<z.ZodString>>;
+        version: z.ZodOptional<z.ZodString>;
         app: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
         shared: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodRecord<z.ZodString, z.ZodObject<{
           version: z.ZodString;
@@ -139,7 +139,12 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
           ssrIntegrity: z.ZodOptional<z.ZodString>;
         }, z.core.$strip>;
         api: z.ZodObject<{
-          name: z.ZodString;
+          extends: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+            development: z.ZodOptional<z.ZodString>;
+            production: z.ZodOptional<z.ZodString>;
+            staging: z.ZodOptional<z.ZodString>;
+          }, z.core.$strip>]>>;
+          name: z.ZodOptional<z.ZodString>;
           development: z.ZodOptional<z.ZodString>;
           production: z.ZodOptional<z.ZodString>;
           integrity: z.ZodOptional<z.ZodString>;
@@ -156,9 +161,15 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
               admin: "admin";
             }>>;
           }, z.core.$strip>>>;
+          routes: z.ZodOptional<z.ZodArray<z.ZodString>>;
         }, z.core.$strip>;
         auth: z.ZodOptional<z.ZodObject<{
-          name: z.ZodString;
+          extends: z.ZodOptional<z.ZodUnion<readonly [z.ZodString, z.ZodObject<{
+            development: z.ZodOptional<z.ZodString>;
+            production: z.ZodOptional<z.ZodString>;
+            staging: z.ZodOptional<z.ZodString>;
+          }, z.core.$strip>]>>;
+          name: z.ZodOptional<z.ZodString>;
           development: z.ZodOptional<z.ZodString>;
           production: z.ZodOptional<z.ZodString>;
           integrity: z.ZodOptional<z.ZodString>;
@@ -175,6 +186,7 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
               admin: "admin";
             }>>;
           }, z.core.$strip>>>;
+          routes: z.ZodOptional<z.ZodArray<z.ZodString>>;
         }, z.core.$strip>>;
       }, z.core.$strip>;
     }, z.core.$strip>>;
@@ -307,6 +319,10 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     extends: z.ZodString;
     plugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
     filesCopied: z.ZodNumber;
+    timings: z.ZodOptional<z.ZodArray<z.ZodObject<{
+      name: z.ZodString;
+      durationMs: z.ZodNumber;
+    }, z.core.$strip>>>;
     error: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
   sync: ContractProcedure<z.ZodObject<{
@@ -354,6 +370,10 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     migrated: z.ZodOptional<z.ZodArray<z.ZodString>>;
     availablePlugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
     selectedPlugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    timings: z.ZodOptional<z.ZodArray<z.ZodObject<{
+      name: z.ZodString;
+      durationMs: z.ZodNumber;
+    }, z.core.$strip>>>;
     changelogUrl: z.ZodOptional<z.ZodString>;
     error: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
@@ -381,8 +401,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
   }, z.core.$strip>, MergedErrorMap<Record<never, never>, Record<never, never>>, Record<never, never>>;
   typesGen: ContractProcedure<z.ZodObject<{
     env: z.ZodOptional<z.ZodEnum<{
-      production: "production";
       development: "development";
+      production: "production";
     }>>;
     dryRun: z.ZodDefault<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
@@ -421,7 +441,12 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
         ssrIntegrity?: string | undefined;
       };
       api: {
-        name: string;
+        extends?: string | {
+          development?: string | undefined;
+          production?: string | undefined;
+          staging?: string | undefined;
+        } | undefined;
+        name?: string | undefined;
         development?: string | undefined;
         production?: string | undefined;
         integrity?: string | undefined;
@@ -434,9 +459,15 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
           to?: string | undefined;
           roleRequired?: "anon" | "member" | "admin" | undefined;
         }[] | undefined;
+        routes?: string[] | undefined;
       };
       auth?: {
-        name: string;
+        extends?: string | {
+          development?: string | undefined;
+          production?: string | undefined;
+          staging?: string | undefined;
+        } | undefined;
+        name?: string | undefined;
         development?: string | undefined;
         production?: string | undefined;
         integrity?: string | undefined;
@@ -449,6 +480,7 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
           to?: string | undefined;
           roleRequired?: "anon" | "member" | "admin" | undefined;
         }[] | undefined;
+        routes?: string[] | undefined;
       } | undefined;
     };
     extends?: string | {
@@ -478,21 +510,21 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
         production?: string | undefined;
         staging?: string | undefined;
       } | undefined;
+      name?: string | undefined;
       development?: string | undefined;
       production?: string | undefined;
       integrity?: string | undefined;
-      name?: string | undefined;
-      version?: string | undefined;
       proxy?: string | undefined;
       variables?: Record<string, string> | undefined;
       secrets?: string[] | undefined;
-      routes?: string[] | undefined;
       sidebar?: {
         icon: string;
         label: string;
         to?: string | undefined;
         roleRequired?: "anon" | "member" | "admin" | undefined;
       }[] | undefined;
+      routes?: string[] | undefined;
+      version?: string | undefined;
       app?: Record<string, unknown> | undefined;
       shared?: Record<string, Record<string, {
         version: string;
@@ -506,7 +538,7 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }> | undefined;
   } | null;
   runtimeConfig: {
-    env: "production" | "development" | "staging";
+    env: "development" | "production" | "staging";
     account: string;
     networkId: "testnet" | "mainnet";
     host: {

package/dist/plugin.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.mts","names":[],"sources":["../src/plugin.ts"],"mappings":";;;;;cA+CwC,QAAA"}
+{"version":3,"file":"plugin.d.mts","names":[],"sources":["../src/plugin.ts"],"mappings":";;;;;cAoDwC,QAAA"}

package/dist/plugin.mjs

@@ -11,21 +11,24 @@ import { copyFilteredFiles, fetchParentConfig, generateDatabaseMigrations, perso
 import { promptInitOptions } from "./cli/prompts.mjs";
 import { getStatus } from "./cli/status.mjs";
 import { syncTemplate } from "./cli/sync.mjs";
+import { timePhase } from "./cli/timing.mjs";
 import { upgradeTemplate } from "./cli/upgrade.mjs";
-import { colors } from "./utils/theme.mjs";
 import { computeSriHashForUrl } from "./integrity.mjs";
-import { buildDescription, buildServiceDescriptorMap } from "./service-descriptor.mjs";
-import { devApp, startApp } from "./dev-session.mjs";
 import { addFunctionCallAccessKey, ensureNearCli, executeTransaction } from "./near-cli.mjs";
+import { buildDescription, buildServiceDescriptorMap } from "./service-descriptor.mjs";
 import { syncAndGenerateSharedUi } from "./shared.mjs";
 import { writePluginSidebarGen } from "./sidebar.mjs";
 import { run } from "./utils/run.mjs";
+import { colors } from "./utils/theme.mjs";
 import { existsSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, resolve } from "node:path";
 import * as p from "@clack/prompts";
 import { Effect } from "effect";
 
 //#region src/plugin.ts
+async function loadDevSession() {
+	return import("./dev-session.mjs");
+}
 const buildCommands = {
 	host: {
 		cmd: "bun",
@@ -131,10 +134,10 @@ function listPluginAttachments(config) {
 	}).sort((a, b) => a.key.localeCompare(b.key));
 }
 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;
+	writePluginSidebarGen(configDir, runtimeConfig);
 	const bridge = await syncApiContractBridge({
 		configDir,
 		runtimeConfig,
@@ -405,15 +408,15 @@ var plugin_default = createPlugin({
 				const pluginConfigPath = join(localPath, "bos.config.json");
 				if (existsSync(pluginConfigPath)) try {
 					const pluginConfig = JSON.parse(readFileSync(pluginConfigPath, "utf-8"));
-					if (!pluginConfig.app) pluginConfig.app = {};
-					const app = pluginConfig.app;
-					if (!app.api) app.api = {};
-					const api = app.api;
-					api.production = publishedUrl;
-					if (integrity) api.integrity = integrity;
-					else delete api.integrity;
+					if (!pluginConfig.plugins || typeof pluginConfig.plugins !== "object") pluginConfig.plugins = {};
+					const plugins = pluginConfig.plugins;
+					if (!plugins[input.key] || typeof plugins[input.key] !== "object") plugins[input.key] = {};
+					const entry = plugins[input.key];
+					entry.production = publishedUrl;
+					if (integrity) entry.integrity = integrity;
+					else delete entry.integrity;
 					writeFileSync(pluginConfigPath, `${JSON.stringify(pluginConfig, null, 2)}\n`);
-					console.log(`   ✅ Updated ${pluginConfigPath}: app.api.production`);
+					console.log(`   ✅ Updated ${pluginConfigPath}: plugins.${input.key}.production`);
 				} catch (err) {
 					console.error(`   ❌ Failed to update plugin bos.config.json:`, err instanceof Error ? err.message : err);
 				}
@@ -531,6 +534,7 @@ var plugin_default = createPlugin({
 				port: runtimeConfig.host.port,
 				interactive: input.interactive
 			};
+			const { devApp } = await loadDevSession();
 			devApp(orchestrator, services, runtimeConfig);
 			return {
 				status: "started",
@@ -609,7 +613,7 @@ var plugin_default = createPlugin({
 			}
 			summaryLines.push("");
 			console.log(summaryLines.join("\n"));
-			startApp({
+			const orchestrator = {
 				packages: ["host"],
 				env: {
 					NODE_ENV: "production",
@@ -620,7 +624,9 @@ var plugin_default = createPlugin({
 				port,
 				interactive: input.interactive,
 				noLogs: true
-			}, services, runtimeConfig);
+			};
+			const { startApp } = await loadDevSession();
+			startApp(orchestrator, services, runtimeConfig);
 			return {
 				status: "running",
 				url: `http://localhost:${port}`
@@ -818,6 +824,7 @@ var plugin_default = createPlugin({
 		}),
 		init: builder.init.handler(async ({ input }) => {
 			try {
+				const timings = [];
 				let extendsAccount = input.extendsAccount;
 				let extendsGateway = input.extendsGateway;
 				let directory = input.directory;
@@ -837,7 +844,7 @@ var plugin_default = createPlugin({
 				let parentPluginKeys = [];
 				let parentConfig = null;
 				try {
-					parentConfig = await fetchParentConfig(extendsAccount, extendsGateway);
+					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway));
 					if (parentConfig?.plugins && typeof parentConfig.plugins === "object") parentPluginKeys = Object.keys(parentConfig.plugins);
 				} catch {}
 				if (!input.noInteractive) {
@@ -864,7 +871,7 @@ var plugin_default = createPlugin({
 				const targetDir = resolve(directory);
 				plugins = plugins ?? [];
 				if (!parentConfig) try {
-					parentConfig = await fetchParentConfig(extendsAccount, extendsGateway);
+					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway));
 				} catch {
 					return {
 						status: "error",
@@ -876,14 +883,15 @@ var plugin_default = createPlugin({
 						extends: `bos://${extendsAccount}/${extendsGateway}`,
 						plugins: plugins ?? [],
 						filesCopied: 0,
+						timings,
 						error: `No config found at bos://${extendsAccount}/${extendsGateway} — are you sure this is the right parent?`
 					};
 				}
-				const { sourceDir, parentConfig: resolvedParentConfig, cleanup } = await resolveSourceDir({
+				const { sourceDir, parentConfig: resolvedParentConfig, cleanup } = await timePhase(timings, "template source", () => resolveSourceDir({
 					extendsAccount,
 					extendsGateway,
 					source: input.source
-				});
+				}));
 				parentConfig = resolvedParentConfig;
 				try {
 					const patterns = await readTemplatekeep(sourceDir);
@@ -900,18 +908,16 @@ var plugin_default = createPlugin({
 						error: "No .templatekeep found in template source"
 					};
 					const pluginRoutes = {};
-					if (parentConfig.plugins) for (const [key, entry] of Object.entries(parentConfig.plugins)) {
-						const entryRef = getPluginRef(entry);
-						if (entryRef?.routes && entryRef.routes.length > 0) pluginRoutes[key] = entryRef.routes;
-					}
+					const parentRuntimePlugins = await buildRuntimePluginsForConfig(parentConfig, sourceDir, "production");
+					for (const [key, plugin] of Object.entries(parentRuntimePlugins ?? {})) if (plugin.routes && plugin.routes.length > 0) pluginRoutes[key] = plugin.routes;
 					const s = p.spinner();
 					s.start("Setting up project");
-					const filesCopied = await copyFilteredFiles(sourceDir, targetDir, patterns, {
+					const filesCopied = await timePhase(timings, "copy files", () => copyFilteredFiles(sourceDir, targetDir, patterns, {
 						withHost,
 						plugins,
 						pluginRoutes
-					});
-					await personalizeConfig(targetDir, {
+					}));
+					await timePhase(timings, "personalize config", () => personalizeConfig(targetDir, {
 						extendsAccount,
 						extendsGateway,
 						account: account || extendsAccount,
@@ -920,21 +926,25 @@ var plugin_default = createPlugin({
 						pluginRoutes,
 						workspaceOpts: { sourceDir },
 						withHost
-					});
-					await writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
+					}));
+					await timePhase(timings, "write snapshot", () => writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
 						withHost,
 						plugins,
 						pluginRoutes
+					}));
+					const initConfig = await timePhase(timings, "resolve config", () => loadConfig({ cwd: targetDir }));
+					if (initConfig?.runtime) await timePhase(timings, "generate env/docker", async () => {
+						writeGeneratedInfra(targetDir, initConfig.runtime);
+					});
+					await timePhase(timings, "create env file", async () => {
+						ensureEnvFile(targetDir);
 					});
-					const initConfig = await loadConfig({ cwd: targetDir });
-					if (initConfig?.runtime) writeGeneratedInfra(targetDir, initConfig.runtime);
-					ensureEnvFile(targetDir);
 					if (!input.noInstall) {
-						await runBunInstall(targetDir);
-						await runTypesGen(targetDir);
-						await generateDatabaseMigrations(targetDir);
+						await timePhase(timings, "install dependencies", () => runBunInstall(targetDir));
+						await timePhase(timings, "generate types", () => runTypesGen(targetDir));
+						await timePhase(timings, "generate migrations", () => generateDatabaseMigrations(targetDir));
 					}
-					if (initConfig?.config) await generateCodeArtifacts(targetDir, initConfig.config);
+					if (input.noInstall && initConfig?.config) await timePhase(timings, "generate code artifacts", () => generateCodeArtifacts(targetDir, initConfig.config));
 					s.stop("Project initialized");
 					if (!input.noInteractive) {
 						if (await p.confirm({
@@ -944,7 +954,7 @@ var plugin_default = createPlugin({
 							const dockerSpinner = p.spinner();
 							dockerSpinner.start("Starting Docker services");
 							try {
-								await runDockerComposeUp(targetDir);
+								await timePhase(timings, "docker compose up", () => runDockerComposeUp(targetDir));
 								dockerSpinner.stop("Docker services ready");
 							} catch (error) {
 								dockerSpinner.stop("Docker services not started");
@@ -961,7 +971,8 @@ var plugin_default = createPlugin({
 						domain,
 						extends: `bos://${extendsAccount}/${extendsGateway}`,
 						plugins,
-						filesCopied
+						filesCopied,
+						timings
 					};
 				} finally {
 					await cleanup();
@@ -977,6 +988,7 @@ var plugin_default = createPlugin({
 					extends: input.extendsAccount && input.extendsGateway ? `bos://${input.extendsAccount}/${input.extendsGateway}` : "",
 					plugins: input.plugins ?? [],
 					filesCopied: 0,
+					timings: [],
 					error: error instanceof Error ? error.message : "Unknown error"
 				};
 			}