everything-dev 1.17.0 → 1.20.0

package/dist/plugin.cjs

@@ -409,58 +409,20 @@ var plugin_default = (0, every_plugin.createPlugin)({
 			const integrity = publishedUrl ? await require_integrity.computeSriHashForUrl(publishedUrl) : null;
 			const version = manifest?.plugin.version ?? pkgJson.version;
 			if (publishedUrl) {
-				const pluginConfigPath = (0, node_path.join)(localPath, "bos.config.json");
-				if ((0, node_fs.existsSync)(pluginConfigPath)) try {
-					const pluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
-					if (!pluginConfig.plugins || typeof pluginConfig.plugins !== "object") pluginConfig.plugins = {};
-					const plugins = pluginConfig.plugins;
+				const rootConfigPath = (0, node_path.join)(deps.configDir, "bos.config.json");
+				try {
+					const rootConfig = JSON.parse((0, node_fs.readFileSync)(rootConfigPath, "utf-8"));
+					if (!rootConfig.plugins || typeof rootConfig.plugins !== "object") rootConfig.plugins = {};
+					const plugins = rootConfig.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;
-					(0, node_fs.writeFileSync)(pluginConfigPath, `${JSON.stringify(pluginConfig, null, 2)}\n`);
-					console.log(`   ✅ Updated ${pluginConfigPath}: plugins.${input.key}.production`);
+					(0, node_fs.writeFileSync)(rootConfigPath, `${JSON.stringify(rootConfig, null, 2)}\n`);
+					console.log(`   ✅ Updated bos.config.json: plugins.${input.key}.production`);
 				} catch (err) {
-					console.error(`   ❌ Failed to update plugin bos.config.json:`, err instanceof Error ? err.message : err);
-				}
-				const account = deps.bosConfig.account;
-				const network = require_network.getNetworkIdForAccount(account);
-				let pluginDomain;
-				if ((0, node_fs.existsSync)(pluginConfigPath)) try {
-					const pluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
-					if (typeof pluginConfig.domain === "string") pluginDomain = pluginConfig.domain;
-				} catch {}
-				if (!pluginDomain) pluginDomain = `${input.key}.${deps.bosConfig.domain ?? "everything.dev"}`;
-				try {
-					const registryEntries = {};
-					if ((0, node_fs.existsSync)(pluginConfigPath)) try {
-						const publishedPluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
-						delete publishedPluginConfig.development;
-						registryEntries[`apps/${account}/${pluginDomain}/bos.config.json`] = JSON.stringify(publishedPluginConfig);
-					} catch {}
-					if (Object.keys(registryEntries).length > 0) {
-						const payload = JSON.stringify(registryEntries);
-						const argsBase64 = Buffer.from(payload).toString("base64");
-						const privateKey = process.env.NEAR_PRIVATE_KEY || process.env.BOS_NEAR_PRIVATE_KEY;
-						await effect.Effect.runPromise(require_near_cli.ensureNearCli);
-						try {
-							await effect.Effect.runPromise(require_near_cli.executeTransaction({
-								account,
-								contract: require_fastkv.getRegistryNamespaceForNetwork(network),
-								method: "__fastdata_kv",
-								argsBase64,
-								network,
-								privateKey,
-								gas: "50Tgas",
-								deposit: "0NEAR"
-							}));
-						} catch (registryError) {
-							if (!extractTransactionHash(registryError)) console.warn(`[publish] Plugin registry write failed: ${registryError instanceof Error ? registryError.message : registryError}`);
-						}
-					}
-				} catch (registryError) {
-					console.warn(`[publish] Plugin registry write skipped: ${registryError instanceof Error ? registryError.message : registryError}`);
+					console.error(`   ❌ Failed to update bos.config.json:`, err instanceof Error ? err.message : err);
 				}
 				await generateCodeArtifacts(deps.configDir, deps.bosConfig);
 			}
@@ -728,18 +690,6 @@ var plugin_default = (0, every_plugin.createPlugin)({
 				}
 			}
 			const registryEntries = { [`apps/${account}/${gateway}/bos.config.json`]: JSON.stringify(publishConfig) };
-			for (const [pluginKey, pluginEntry] of Object.entries(publishConfig.plugins ?? {})) {
-				const pluginRef = getPluginRef(pluginEntry);
-				if (!pluginRef?.development?.startsWith("local:")) continue;
-				const pluginConfigPath = (0, node_path.join)((0, node_path.join)(deps.configDir, pluginRef.development.slice(6)), "bos.config.json");
-				if (!(0, node_fs.existsSync)(pluginConfigPath)) continue;
-				try {
-					const pluginConfig = JSON.parse((0, node_fs.readFileSync)(pluginConfigPath, "utf-8"));
-					const pluginDomain = typeof pluginConfig.domain === "string" ? pluginConfig.domain : `${pluginKey}.${gateway}`;
-					delete pluginConfig.development;
-					registryEntries[`apps/${account}/${pluginDomain}/bos.config.json`] = JSON.stringify(pluginConfig);
-				} catch {}
-			}
 			const payload = JSON.stringify(registryEntries);
 			const argsBase64 = Buffer.from(payload).toString("base64");
 			const privateKey = input.privateKey || process.env.NEAR_PRIVATE_KEY || process.env.BOS_NEAR_PRIVATE_KEY;
@@ -829,33 +779,34 @@ var plugin_default = (0, every_plugin.createPlugin)({
 		init: builder.init.handler(async ({ input }) => {
 			try {
 				const timings = [];
-				let extendsAccount = input.extendsAccount;
-				let extendsGateway = input.extendsGateway;
+				let extendsAccount = "";
+				let extendsGateway = "";
 				let directory = input.directory;
 				let account = input.account;
 				let domain = input.domain;
 				let withHost = input.withHost;
 				let plugins = input.plugins;
 				if (input.extends) {
-					const match = input.extends.match(/^(?:bos:\/\/)?([^/]+)\/(.+)$/);
+					const match = (input.extends.startsWith("bos://") ? input.extends : `bos://${input.extends}`).match(/^bos:\/\/([^/]+)\/(.+)$/);
 					if (match) {
-						if (!extendsAccount) extendsAccount = match[1];
-						if (!extendsGateway) extendsGateway = match[2];
+						extendsAccount = match[1];
+						extendsGateway = match[2];
 					}
 				}
 				extendsAccount = extendsAccount || "dev.everything.near";
 				extendsGateway = extendsGateway || "everything.dev";
+				const s = _clack_prompts.spinner();
+				s.start("Initializing project");
 				let parentPluginKeys = [];
 				let parentConfig = null;
 				try {
-					parentConfig = await require_timing.timePhase(timings, "parent config", () => require_cli_init.fetchParentConfig(extendsAccount, extendsGateway));
+					parentConfig = await require_timing.timePhase(timings, "parent config", () => require_cli_init.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 require_prompts.promptInitOptions({
-						extendsAccount,
-						extendsGateway,
-						extends: input.extends,
+						extends: `bos://${extendsAccount}/${extendsGateway}`,
 						directory,
 						account,
 						domain,
@@ -870,85 +821,99 @@ var plugin_default = (0, every_plugin.createPlugin)({
 					domain = prompted.domain;
 					withHost = prompted.withHost;
 					plugins = prompted.plugins;
+					s.start("Setting up project");
 				}
 				directory = directory || domain || extendsGateway;
 				const targetDir = (0, node_path.resolve)(directory);
 				plugins = plugins ?? [];
+				const extendsRef = `bos://${extendsAccount}/${extendsGateway}`;
 				if (!parentConfig) try {
-					parentConfig = await require_timing.timePhase(timings, "parent config", () => require_cli_init.fetchParentConfig(extendsAccount, extendsGateway));
+					parentConfig = await require_timing.timePhase(timings, "parent config", () => require_cli_init.fetchParentConfig(extendsAccount, extendsGateway), s);
 				} catch {
+					s.stop("Failed");
 					return {
 						status: "error",
 						directory,
-						extendsAccount,
-						extendsGateway,
+						extendsRef,
 						account,
 						domain,
-						extends: `bos://${extendsAccount}/${extendsGateway}`,
+						extends: extendsRef,
 						plugins: plugins ?? [],
 						filesCopied: 0,
 						timings,
-						error: `No config found at bos://${extendsAccount}/${extendsGateway} — are you sure this is the right parent?`
+						error: `No config found at ${extendsRef} — are you sure this is the right parent?`
 					};
 				}
 				const { sourceDir, parentConfig: resolvedParentConfig, cleanup } = await require_timing.timePhase(timings, "template source", () => require_cli_init.resolveSourceDir({
 					extendsAccount,
 					extendsGateway,
 					source: input.source
-				}));
+				}), s);
 				parentConfig = resolvedParentConfig;
+				const isMinimalScaffold = sourceDir === "";
 				try {
-					const patterns = await require_cli_init.readTemplatekeep(sourceDir);
-					if (patterns.length === 0) return {
-						status: "error",
-						directory,
-						extendsAccount,
-						extendsGateway,
-						account,
-						domain,
-						extends: `bos://${extendsAccount}/${extendsGateway}`,
-						plugins: plugins ?? [],
-						filesCopied: 0,
-						error: "No .templatekeep found in template source"
-					};
-					const pluginRoutes = {};
-					const parentRuntimePlugins = await require_config.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 = _clack_prompts.spinner();
-					s.start("Setting up project");
-					const filesCopied = await require_timing.timePhase(timings, "copy files", () => require_cli_init.copyFilteredFiles(sourceDir, targetDir, patterns, {
-						withHost,
-						plugins,
-						pluginRoutes
-					}));
-					await require_timing.timePhase(timings, "personalize config", () => require_cli_init.personalizeConfig(targetDir, {
+					let filesCopied;
+					if (isMinimalScaffold) filesCopied = await require_timing.timePhase(timings, "scaffold project", () => require_cli_init.scaffoldMinimalProject(targetDir, parentConfig, {
 						extendsAccount,
 						extendsGateway,
 						account: account || extendsAccount,
-						domain: domain || extendsGateway,
+						domain,
 						plugins,
-						pluginRoutes,
-						workspaceOpts: { sourceDir },
 						withHost
-					}));
-					await require_timing.timePhase(timings, "write snapshot", () => require_cli_init.writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
-						withHost,
-						plugins,
-						pluginRoutes
-					}));
-					const initConfig = await require_timing.timePhase(timings, "resolve config", () => require_config.loadConfig({ cwd: targetDir }));
+					}), s);
+					else {
+						const patterns = await require_cli_init.readTemplatekeep(sourceDir);
+						if (patterns.length === 0) {
+							s.stop("Failed");
+							return {
+								status: "error",
+								directory,
+								extendsRef,
+								account,
+								domain,
+								extends: extendsRef,
+								plugins: plugins ?? [],
+								filesCopied: 0,
+								error: "No .templatekeep found in template source"
+							};
+						}
+						const pluginRoutes = {};
+						const parentRuntimePlugins = await require_config.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 require_timing.timePhase(timings, "copy files", () => require_cli_init.copyFilteredFiles(sourceDir, targetDir, patterns, {
+							withHost,
+							plugins,
+							pluginRoutes
+						}), s);
+						await require_timing.timePhase(timings, "personalize config", () => require_cli_init.personalizeConfig(targetDir, {
+							extendsAccount,
+							extendsGateway,
+							account: account || extendsAccount,
+							domain: domain || extendsGateway,
+							plugins,
+							pluginRoutes,
+							workspaceOpts: { sourceDir },
+							withHost
+						}), s);
+						await require_timing.timePhase(timings, "write snapshot", () => require_cli_init.writeInitSnapshot(targetDir, extendsAccount, extendsGateway, sourceDir, patterns, {
+							withHost,
+							plugins,
+							pluginRoutes
+						}), s);
+					}
+					const initConfig = await require_timing.timePhase(timings, "resolve config", () => require_config.loadConfig({ cwd: targetDir }), s);
 					if (initConfig?.runtime) await require_timing.timePhase(timings, "generate env/docker", async () => {
 						require_infra.writeGeneratedInfra(targetDir, initConfig.runtime);
-					});
+					}, s);
 					await require_timing.timePhase(timings, "create env file", async () => {
 						require_infra.ensureEnvFile(targetDir);
-					});
+					}, s);
 					if (!input.noInstall) {
-						await require_timing.timePhase(timings, "install dependencies", () => require_cli_init.runBunInstall(targetDir));
-						await require_timing.timePhase(timings, "generate types", () => require_cli_init.runTypesGen(targetDir));
-						await require_timing.timePhase(timings, "generate migrations", () => require_cli_init.generateDatabaseMigrations(targetDir));
+						await require_timing.timePhase(timings, "install dependencies", () => require_cli_init.runBunInstall(targetDir), s);
+						await require_timing.timePhase(timings, "generate types", () => require_cli_init.runTypesGen(targetDir), s);
+						await require_timing.timePhase(timings, "generate migrations", () => require_cli_init.generateDatabaseMigrations(targetDir), s);
 					}
-					if (input.noInstall && initConfig?.config) await require_timing.timePhase(timings, "generate code artifacts", () => generateCodeArtifacts(targetDir, initConfig.config));
+					if (input.noInstall && initConfig?.config) await require_timing.timePhase(timings, "generate code artifacts", () => generateCodeArtifacts(targetDir, initConfig.config), s);
 					s.stop("Project initialized");
 					if (!input.noInteractive) {
 						if (await _clack_prompts.confirm({
@@ -969,11 +934,10 @@ var plugin_default = (0, every_plugin.createPlugin)({
 					return {
 						status: "initialized",
 						directory,
-						extendsAccount,
-						extendsGateway,
+						extendsRef,
 						account,
 						domain,
-						extends: `bos://${extendsAccount}/${extendsGateway}`,
+						extends: extendsRef,
 						plugins,
 						filesCopied,
 						timings
@@ -982,14 +946,14 @@ var plugin_default = (0, every_plugin.createPlugin)({
 					await cleanup();
 				}
 			} catch (error) {
+				const extendsRef = input.extends ? input.extends.startsWith("bos://") ? input.extends : `bos://${input.extends}` : "bos://dev.everything.near/everything.dev";
 				return {
 					status: "error",
 					directory: input.directory ?? "",
-					extendsAccount: input.extendsAccount ?? "",
-					extendsGateway: input.extendsGateway ?? "",
+					extendsRef,
 					account: input.account,
 					domain: input.domain,
-					extends: input.extendsAccount && input.extendsGateway ? `bos://${input.extendsAccount}/${input.extendsGateway}` : "",
+					extends: extendsRef,
 					plugins: input.plugins ?? [],
 					filesCopied: 0,
 					timings: [],