everything-dev 1.19.0 → 1.21.0

package/dist/plugin.d.cts

@@ -1,5 +1,5 @@
-import { z } from "./sdk.cjs";
 import { ContractProcedure, MergedErrorMap, Schema } from "./node_modules/@orpc/contract/dist/shared/contract.TuRtB1Ca.cjs";
+import { z } from "./sdk.cjs";
 import * as _$every_plugin0 from "every-plugin";
 
 //#region src/plugin.d.ts
@@ -56,8 +56,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     deploy: z.ZodDefault<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
-      success: "success";
       error: "error";
+      success: "success";
     }>;
     built: z.ZodArray<z.ZodString>;
     skipped: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -259,8 +259,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     dryRun: z.ZodDefault<z.ZodBoolean>;
     packages: z.ZodDefault<z.ZodString>;
     network: z.ZodOptional<z.ZodEnum<{
-      mainnet: "mainnet";
       testnet: "testnet";
+      mainnet: "mainnet";
     }>>;
     privateKey: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>, z.ZodObject<{
@@ -284,8 +284,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }>;
     account: z.ZodString;
     network: z.ZodEnum<{
-      mainnet: "mainnet";
       testnet: "testnet";
+      mainnet: "mainnet";
     }>;
     contract: z.ZodString;
     allowance: z.ZodString;
@@ -301,7 +301,12 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     domain: z.ZodOptional<z.ZodString>;
     source: z.ZodOptional<z.ZodString>;
     plugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    withHost: z.ZodDefault<z.ZodBoolean>;
+    overrides: z.ZodOptional<z.ZodArray<z.ZodEnum<{
+      plugins: "plugins";
+      host: "host";
+      ui: "ui";
+      api: "api";
+    }>>>;
     noInteractive: z.ZodDefault<z.ZodBoolean>;
     noInstall: z.ZodDefault<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
@@ -315,6 +320,12 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     domain: z.ZodOptional<z.ZodString>;
     extends: z.ZodString;
     plugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    overrides: z.ZodOptional<z.ZodArray<z.ZodEnum<{
+      plugins: "plugins";
+      host: "host";
+      ui: "ui";
+      api: "api";
+    }>>>;
     filesCopied: z.ZodNumber;
     timings: z.ZodOptional<z.ZodArray<z.ZodObject<{
       name: z.ZodString;
@@ -398,14 +409,14 @@ 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<{
-      development: "development";
       production: "production";
+      development: "development";
     }>>;
     dryRun: z.ZodDefault<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
-      success: "success";
       error: "error";
+      success: "success";
     }>;
     generated: z.ZodArray<z.ZodString>;
     fetched: z.ZodArray<z.ZodString>;
@@ -535,9 +546,9 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }> | undefined;
   } | null;
   runtimeConfig: {
-    env: "development" | "production" | "staging";
+    env: "production" | "staging" | "development";
     account: string;
-    networkId: "mainnet" | "testnet";
+    networkId: "testnet" | "mainnet";
     host: {
       name: string;
       url: string;

package/dist/plugin.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.cts","names":[],"sources":["../src/plugin.ts"],"mappings":";;;;;cAqDwC,QAAA"}
+{"version":3,"file":"plugin.d.cts","names":[],"sources":["../src/plugin.ts"],"mappings":";;;;;cAuDwC,QAAA"}

package/dist/plugin.d.mts

@@ -1,5 +1,5 @@
-import { z } from "./sdk.mjs";
 import { ContractProcedure, MergedErrorMap, Schema } from "./node_modules/@orpc/contract/dist/shared/contract.TuRtB1Ca.mjs";
+import { z } from "./sdk.mjs";
 import * as _$every_plugin0 from "every-plugin";
 
 //#region src/plugin.d.ts
@@ -56,8 +56,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     deploy: z.ZodDefault<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
-      success: "success";
       error: "error";
+      success: "success";
     }>;
     built: z.ZodArray<z.ZodString>;
     skipped: z.ZodOptional<z.ZodArray<z.ZodString>>;
@@ -259,8 +259,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     dryRun: z.ZodDefault<z.ZodBoolean>;
     packages: z.ZodDefault<z.ZodString>;
     network: z.ZodOptional<z.ZodEnum<{
-      mainnet: "mainnet";
       testnet: "testnet";
+      mainnet: "mainnet";
     }>>;
     privateKey: z.ZodOptional<z.ZodString>;
   }, z.core.$strip>, z.ZodObject<{
@@ -284,8 +284,8 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }>;
     account: z.ZodString;
     network: z.ZodEnum<{
-      mainnet: "mainnet";
       testnet: "testnet";
+      mainnet: "mainnet";
     }>;
     contract: z.ZodString;
     allowance: z.ZodString;
@@ -301,7 +301,12 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     domain: z.ZodOptional<z.ZodString>;
     source: z.ZodOptional<z.ZodString>;
     plugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
-    withHost: z.ZodDefault<z.ZodBoolean>;
+    overrides: z.ZodOptional<z.ZodArray<z.ZodEnum<{
+      plugins: "plugins";
+      host: "host";
+      ui: "ui";
+      api: "api";
+    }>>>;
     noInteractive: z.ZodDefault<z.ZodBoolean>;
     noInstall: z.ZodDefault<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
@@ -315,6 +320,12 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     domain: z.ZodOptional<z.ZodString>;
     extends: z.ZodString;
     plugins: z.ZodOptional<z.ZodArray<z.ZodString>>;
+    overrides: z.ZodOptional<z.ZodArray<z.ZodEnum<{
+      plugins: "plugins";
+      host: "host";
+      ui: "ui";
+      api: "api";
+    }>>>;
     filesCopied: z.ZodNumber;
     timings: z.ZodOptional<z.ZodArray<z.ZodObject<{
       name: z.ZodString;
@@ -398,14 +409,14 @@ 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<{
-      development: "development";
       production: "production";
+      development: "development";
     }>>;
     dryRun: z.ZodDefault<z.ZodBoolean>;
   }, z.core.$strip>, z.ZodObject<{
     status: z.ZodEnum<{
-      success: "success";
       error: "error";
+      success: "success";
     }>;
     generated: z.ZodArray<z.ZodString>;
     fetched: z.ZodArray<z.ZodString>;
@@ -535,9 +546,9 @@ declare const _default: _$every_plugin0.LoadedPluginWithBinding<{
     }> | undefined;
   } | null;
   runtimeConfig: {
-    env: "development" | "production" | "staging";
+    env: "production" | "staging" | "development";
     account: string;
-    networkId: "mainnet" | "testnet";
+    networkId: "testnet" | "mainnet";
     host: {
       name: string;
       url: string;

package/dist/plugin.d.mts.map

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

package/dist/plugin.mjs

@@ -7,7 +7,7 @@ import { syncApiContractBridge } from "./api-contract.mjs";
 import { buildRuntimeConfig, detectLocalPackages, prepareDevelopmentRuntimeConfig } from "./app.mjs";
 import { ensureEnvFile, writeGeneratedInfra } from "./cli/infra.mjs";
 import { saveBosConfig } from "./utils/save-config.mjs";
-import { copyFilteredFiles, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, readTemplatekeep, resolveSourceDir, runBunInstall, runDockerComposeUp, runTypesGen, scaffoldMinimalProject, writeInitSnapshot } from "./cli/init.mjs";
+import { copyFilteredFiles, detectGitRemoteUrl, fetchParentConfig, generateDatabaseMigrations, personalizeConfig, readTemplatekeep, resolveSourceDir, runBunInstall, runDockerComposeUp, runTypesGen, scaffoldMinimalProject, writeInitSnapshot } from "./cli/init.mjs";
 import { promptInitOptions } from "./cli/prompts.mjs";
 import { getStatus } from "./cli/status.mjs";
 import { syncTemplate } from "./cli/sync.mjs";
@@ -780,7 +780,7 @@ var plugin_default = createPlugin({
 				let directory = input.directory;
 				let account = input.account;
 				let domain = input.domain;
-				let withHost = input.withHost;
+				let overrides = input.overrides;
 				let plugins = input.plugins;
 				if (input.extends) {
 					const match = (input.extends.startsWith("bos://") ? input.extends : `bos://${input.extends}`).match(/^bos:\/\/([^/]+)\/(.+)$/);
@@ -791,20 +791,23 @@ var plugin_default = createPlugin({
 				}
 				extendsAccount = extendsAccount || "dev.everything.near";
 				extendsGateway = extendsGateway || "everything.dev";
+				const s = p.spinner();
+				s.start("Initializing project");
 				let parentPluginKeys = [];
 				let parentConfig = null;
 				try {
-					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway));
+					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway), s);
 					if (parentConfig?.plugins && typeof parentConfig.plugins === "object") parentPluginKeys = Object.keys(parentConfig.plugins);
 				} catch {}
 				if (!input.noInteractive) {
+					s.stop("Config fetched");
 					const prompted = await promptInitOptions({
 						extends: `bos://${extendsAccount}/${extendsGateway}`,
 						directory,
 						account,
 						domain,
 						plugins,
-						withHost,
+						overrides,
 						parentPluginKeys
 					});
 					extendsAccount = prompted.extendsAccount;
@@ -812,16 +815,22 @@ var plugin_default = createPlugin({
 					directory = prompted.directory;
 					account = prompted.account;
 					domain = prompted.domain;
-					withHost = prompted.withHost;
 					plugins = prompted.plugins;
+					overrides = prompted.overrides;
+					s.start("Setting up project");
 				}
+				overrides = overrides?.length ? overrides : ["ui", "api"];
+				if (overrides.includes("plugins") && !plugins?.length) plugins = parentPluginKeys;
+				plugins = plugins ?? [];
 				directory = directory || domain || extendsGateway;
 				const targetDir = resolve(directory);
-				plugins = plugins ?? [];
 				const extendsRef = `bos://${extendsAccount}/${extendsGateway}`;
+				if (overrides.includes("plugins") && !plugins.length) {}
+				const repository = await detectGitRemoteUrl(process.cwd()).catch(() => void 0) ?? parentConfig?.repository;
 				if (!parentConfig) try {
-					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway));
+					parentConfig = await timePhase(timings, "parent config", () => fetchParentConfig(extendsAccount, extendsGateway), s);
 				} catch {
+					s.stop("Failed");
 					return {
 						status: "error",
 						directory,
@@ -829,7 +838,8 @@ var plugin_default = createPlugin({
 						account,
 						domain,
 						extends: extendsRef,
-						plugins: plugins ?? [],
+						plugins,
+						overrides,
 						filesCopied: 0,
 						timings,
 						error: `No config found at ${extendsRef} — are you sure this is the right parent?`
@@ -839,12 +849,10 @@ var plugin_default = createPlugin({
 					extendsAccount,
 					extendsGateway,
 					source: input.source
-				}));
+				}), s);
 				parentConfig = resolvedParentConfig;
 				const isMinimalScaffold = sourceDir === "";
 				try {
-					const s = p.spinner();
-					s.start("Setting up project");
 					let filesCopied;
 					if (isMinimalScaffold) filesCopied = await timePhase(timings, "scaffold project", () => scaffoldMinimalProject(targetDir, parentConfig, {
 						extendsAccount,
@@ -852,58 +860,66 @@ var plugin_default = createPlugin({
 						account: account || extendsAccount,
 						domain,
 						plugins,
-						withHost
-					}));
+						overrides,
+						repository
+					}), s);
 					else {
 						const patterns = await readTemplatekeep(sourceDir);
-						if (patterns.length === 0) return {
-							status: "error",
-							directory,
-							extendsRef,
-							account,
-							domain,
-							extends: extendsRef,
-							plugins: plugins ?? [],
-							filesCopied: 0,
-							error: "No .templatekeep found in template source"
-						};
+						if (patterns.length === 0) {
+							s.stop("Failed");
+							return {
+								status: "error",
+								directory,
+								extendsRef,
+								account,
+								domain,
+								extends: extendsRef,
+								plugins,
+								overrides,
+								filesCopied: 0,
+								error: "No .templatekeep found in template source"
+							};
+						}
 						const pluginRoutes = {};
-						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;
+						if (overrides.includes("plugins")) {
+							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;
+						}
 						filesCopied = await timePhase(timings, "copy files", () => copyFilteredFiles(sourceDir, targetDir, patterns, {
-							withHost,
+							overrides,
 							plugins,
 							pluginRoutes
-						}));
+						}), s);
 						await timePhase(timings, "personalize config", () => personalizeConfig(targetDir, {
 							extendsAccount,
 							extendsGateway,
 							account: account || extendsAccount,
 							domain: domain || extendsGateway,
 							plugins,
+							overrides,
 							pluginRoutes,
 							workspaceOpts: { sourceDir },
-							withHost
-						}));
+							repository
+						}), s);
 						await timePhase(timings, "write snapshot", () => writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
-							withHost,
+							overrides,
 							plugins,
 							pluginRoutes
-						}));
+						}), s);
 					}
-					const initConfig = await timePhase(timings, "resolve config", () => loadConfig({ cwd: targetDir }));
+					const initConfig = await timePhase(timings, "resolve config", () => loadConfig({ cwd: targetDir }), s);
 					if (initConfig?.runtime) await timePhase(timings, "generate env/docker", async () => {
 						writeGeneratedInfra(targetDir, initConfig.runtime);
-					});
+					}, s);
 					await timePhase(timings, "create env file", async () => {
 						ensureEnvFile(targetDir);
-					});
+					}, s);
 					if (!input.noInstall) {
-						await timePhase(timings, "install dependencies", () => runBunInstall(targetDir));
-						await timePhase(timings, "generate types", () => runTypesGen(targetDir));
-						await timePhase(timings, "generate migrations", () => generateDatabaseMigrations(targetDir));
+						await timePhase(timings, "install dependencies", () => runBunInstall(targetDir), s);
+						await timePhase(timings, "generate types", () => runTypesGen(targetDir), s);
+						await timePhase(timings, "generate migrations", () => generateDatabaseMigrations(targetDir), s);
 					}
-					if (input.noInstall && initConfig?.config) await timePhase(timings, "generate code artifacts", () => generateCodeArtifacts(targetDir, initConfig.config));
+					if (input.noInstall && initConfig?.config) await timePhase(timings, "generate code artifacts", () => generateCodeArtifacts(targetDir, initConfig.config), s);
 					s.stop("Project initialized");
 					if (!input.noInteractive) {
 						if (await p.confirm({
@@ -929,6 +945,7 @@ var plugin_default = createPlugin({
 						domain,
 						extends: extendsRef,
 						plugins,
+						overrides,
 						filesCopied,
 						timings
 					};
@@ -945,6 +962,7 @@ var plugin_default = createPlugin({
 					domain: input.domain,
 					extends: extendsRef,
 					plugins: input.plugins ?? [],
+					overrides: input.overrides,
 					filesCopied: 0,
 					timings: [],
 					error: error instanceof Error ? error.message : "Unknown error"