seedcord 0.23.0-next.0 → 0.23.0-next.2

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-RLphadYM.mjs";
+import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./version-Cmdvyxh7.mjs";
 import { createRequire } from "node:module";
 import { Command, Option } from "@commander-js/extra-typings";
 import { SeedcordErrorCode, isSeedcordError, paint } from "@seedcord/errors";
@@ -29,8 +29,6 @@ import { ApplicationCommandOptionType, ApplicationCommandType, InteractionContex
 import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import { assertNever, filterCirculars } from "@seedcord/utils";
 import { TypedEventEmitter } from "@seedcord/event-emitter";
-import { Console } from "node:console";
-import { Writable } from "node:stream";
 import { cpus, tmpdir, totalmem } from "node:os";
 import process$1 from "node:process";
 import { settleWithin } from "@seedcord/core/node/internal";
@@ -39,8 +37,10 @@ import { minimatch } from "minimatch";
 import { once } from "node:events";
 import { createServer as createServer$1 } from "node:http";
 import { createServer as createServer$2 } from "node:net";
+import { Console } from "node:console";
+import { Writable } from "node:stream";
+import { camelCase, debounce, kebabCase, pascalCase, snakeCase } from "es-toolkit";
 import Handlebars from "handlebars";
-import { camelCase, kebabCase, pascalCase, snakeCase } from "es-toolkit";
 
 //#region src/core/output/wrapLines.ts
 function wrapLines(text, width, prefix) {
@@ -994,10 +994,10 @@ var ProjectFiles = class {
 		return this.layout.modulesUnder(folder);
 	}
 	async foldersIncludingEmpty() {
-		return (await this.entries()).filter(({ isFolder }) => isFolder).map(({ path }) => this.layout.keyOf(path)).toSorted();
+		return (await this.entries()).flatMap(({ isFolder, path }) => isFolder ? [this.layout.keyOf(path)] : []).toSorted();
 	}
 	async pathsWithHash() {
-		return (await this.entries()).map(({ path }) => path).filter((path) => basename(path).includes("#") && !relative(this.layout.root, dirname(path)).includes("#")).toSorted();
+		return (await this.entries()).flatMap(({ path }) => basename(path).includes("#") && !relative(this.layout.root, dirname(path)).includes("#") ? [path] : []).toSorted();
 	}
 	async entries() {
 		const besideRoot = this.layout.listedBesideRoot().map(async (folder) => [{
@@ -2653,8 +2653,11 @@ function importMetaPaths(program) {
 }
 const FILE_URL = "__seedcordPathToFileURL";
 const FILE_URL_IMPORT = `import { pathToFileURL as ${FILE_URL} } from 'node:url';`;
+const BUILT_ROOT = "__seedcordBuiltRoot";
 function pinModulePaths(layout) {
-	const builtRoot = `${BOT_FILES_SLOT}.root`;
+	const utilsPath = fileURLToPath(import.meta.resolve("@seedcord/utils/internal"));
+	const builtRootImport = `import { builtRoot as ${BUILT_ROOT} } from ${JSON.stringify(utilsPath)};`;
+	const builtRoot = `${BUILT_ROOT}()`;
 	return {
 		name: "seedcord:pin-module-paths",
 		transform(code, id) {
@@ -2671,6 +2674,7 @@ function pinModulePaths(layout) {
 			};
 			let rewritten = code;
 			for (const { start, end, key } of rewrites.toReversed()) rewritten = rewritten.slice(0, start) + values[key] + rewritten.slice(end);
+			rewritten = builtRootImport + rewritten;
 			if (rewrites.some(({ key }) => key === "url")) rewritten = FILE_URL_IMPORT + rewritten;
 			return {
 				code: rewritten,
@@ -2932,7 +2936,10 @@ var EdgeBuild = class extends TargetBuild {
 		await bootWorker({
 			root: this.target.viteRoot,
 			mode: this.project.config.viteMode,
-			plugins: [cloudflare.plugins({ persistState: false })],
+			plugins: [cloudflare.plugins({
+				persistState: false,
+				remoteBindings: false
+			})],
 			environments: workerEnvironment()
 		});
 	}
@@ -2970,6 +2977,7 @@ function assertOutDirSafe(outDir) {
 const ENTRY_ID = "seedcord:entry";
 const RESOLVED_ENTRY_ID = `\0${ENTRY_ID}`;
 const ROOT_EXPRESSION = `import.meta.dirname ?? ${JSON.stringify(PLACEHOLDER_ROOT)}`;
+const ONLY_EXPORTS_WARNING = "This build only exports your bot, so running it doesn't start your bot. Set build.start in seedcord.config.ts and build again, or import this file from your app.";
 function isServerEntry(moduleId) {
 	return moduleId === RESOLVED_ENTRY_ID;
 }
@@ -2977,7 +2985,11 @@ function runStartFile(startKey) {
 	return [`await import(${JSON.stringify(startKey)});`];
 }
 function exportInstance(instanceKey) {
-	return [`const { default: bot } = await import(${JSON.stringify(instanceKey)});`, "export default bot;"];
+	return [
+		`const { default: bot } = await import(${JSON.stringify(instanceKey)});`,
+		`if (import.meta.main) console.warn(${JSON.stringify(ONLY_EXPORTS_WARNING)});`,
+		"export default bot;"
+	];
 }
 function serverEntry(builtFiles, importBot) {
 	const source = [
@@ -3079,7 +3091,7 @@ const DECLARATIONS_NAME = "types";
 const ENTRY_DECLARATIONS_NAME = ENTRY_FILE_NAME.replace(/\.mjs$/, ".d.mts");
 var ExportBuild = class extends ServerBuild {
 	nextCommands() {
-		return [];
+		return [["start", "this build only exports your bot. set build.start to run it with node"]];
 	}
 	bundle() {
 		const { config, configDir } = this.project;
@@ -3396,7 +3408,7 @@ var AugmentationBuilder = class {
 		menus.set(json.name, { cache: cacheStateOf(json.contexts) });
 	}
 	warnEmptyGroups(json) {
-		for (const option of json.options ?? []) if (option.type === ApplicationCommandOptionType.SubcommandGroup && (option.options ?? []).length === 0) this.logger.warn(`Slash group \`${json.name}/${option.name}\` has no subcommands and will not deploy.`);
+		for (const option of json.options ?? []) if (option.type === ApplicationCommandOptionType.SubcommandGroup && (option.options ?? []).length === 0) this.logger.warn(`Slash group \`${json.name}/${option.name}\` doesn't have any subcommands, so it won't deploy.`);
 	}
 	mapOptions(options) {
 		const table = {};
@@ -3864,10 +3876,13 @@ var CleanMode = class extends RemoveMode {
 	}
 	select(scan) {
 		const globalKeys = new Set(scan.global.map(commandKey));
-		return scan.guilds.map(({ scope, commands }) => ({
-			scope,
-			commands: commands.filter((c) => globalKeys.has(commandKey(c)))
-		})).filter(({ commands }) => commands.length > 0);
+		return scan.guilds.flatMap(({ scope, commands }) => {
+			const alsoGlobal = commands.filter((c) => globalKeys.has(commandKey(c)));
+			return alsoGlobal.length > 0 ? [{
+				scope,
+				commands: alsoGlobal
+			}] : [];
+		});
 	}
 	remove(session, selected) {
 		return session.deleteCommands(selected);
@@ -4803,28 +4818,6 @@ var ChangeStore = class extends TypedEventEmitter {
 	};
 };
 
-//#endregion
-//#region src/ui/stores/routeConsole.ts
-function routeConsoleToLogs() {
-	let level = "info";
-	const toLogs = new Writable({ write(chunk, _encoding, done) {
-		LoggerChannelRegistry.instance.dispatch(consoleRecord(level, chunk.toString().replace(/\n$/, "")));
-		done();
-	} });
-	const formatter = new Console({
-		stdout: toLogs,
-		stderr: toLogs
-	});
-	return routeConsole(CONSOLE_METHODS, (method, args, invoked) => {
-		level = CONSOLE_LEVEL[method];
-		if (method === "trace") {
-			LoggerChannelRegistry.instance.dispatch(consoleRecord(level, "", [traceError(format(...args), invoked)]));
-			return;
-		}
-		Reflect.apply(formatter[method], formatter, args);
-	});
-}
-
 //#endregion
 //#region src/ui/stores/LogStore.ts
 const STACK_FRAME = /^\s+at\s/;
@@ -4837,7 +4830,6 @@ var LogStore = class LogStore extends ChangeStore {
 	buffer = [];
 	nextId = 1;
 	sinkHandle = null;
-	restoreConsole = null;
 	pendingUpdate = false;
 	flushTimer = null;
 	MAX_LOGS = 1e3;
@@ -4851,12 +4843,9 @@ var LogStore = class LogStore extends ChangeStore {
 	mount() {
 		if (this.sinkHandle) return;
 		this.sinkHandle = LoggerChannelRegistry.instance.installSink(this, { muteConsole: true });
-		this.restoreConsole = routeConsoleToLogs();
 	}
 	unmount() {
 		if (!this.sinkHandle) return;
-		this.restoreConsole?.();
-		this.restoreConsole = null;
 		this.sinkHandle.dispose();
 		this.sinkHandle = null;
 	}
@@ -5755,11 +5744,11 @@ function acceptsSessionKeys(state) {
 function dispatchHotkey(ctx) {
 	const found = BINDINGS.get(keyIdOf(ctx.input, ctx.key));
 	const binding = found && isLive(found, ctx) ? found : void 0;
-	if (binding?.confirm && ctx.state.armed !== binding.confirm) {
-		ctx.store.setArmed(binding.confirm);
+	if (binding?.confirm && ctx.state.pendingConfirm !== binding.confirm) {
+		ctx.store.setPendingConfirm(binding.confirm);
 		return;
 	}
-	if (ctx.state.armed !== null) ctx.store.setArmed(null);
+	if (ctx.state.pendingConfirm !== null) ctx.store.setPendingConfirm(null);
 	binding?.run(ctx);
 }
 
@@ -5991,6 +5980,9 @@ var SiteAddress = class {
 	get path() {
 		return new URL(this.url).pathname.replace(/\/$/, "");
 	}
+	get exportDir() {
+		return `dist${this.path}`;
+	}
 	at(path) {
 		if (path === "") return this.url;
 		return `${this.url}/${path.replace(/^\/+/, "")}`;
@@ -6414,7 +6406,7 @@ function RestartRequiredCard() {
 	}, /* @__PURE__ */ React.createElement(Text, {
 		color: ui.warn,
 		bold: true
-	}, "Restart required"), /* @__PURE__ */ React.createElement(Text, null, "A change needs a full restart. press", " ", /* @__PURE__ */ React.createElement(Text, {
+	}, "Restart required"), /* @__PURE__ */ React.createElement(Text, null, "A change needs a full restart. Press", " ", /* @__PURE__ */ React.createElement(Text, {
 		color: ui.warn,
 		bold: true
 	}, "r"), " ", "to restart"));
@@ -6460,11 +6452,11 @@ function openingPhase(status) {
 /** Every pending notice, ranked with the one that blocks a decision first. */
 function noticesOf(state) {
 	const notices = [];
-	if (state.armed) notices.push({
-		key: state.armed,
-		summary: CONFIRMS[state.armed].title,
-		action: `press ${confirmKeyLabel(state.armed)} again`,
-		card: /* @__PURE__ */ React.createElement(ConfirmCard, { confirm: state.armed })
+	if (state.pendingConfirm) notices.push({
+		key: state.pendingConfirm,
+		summary: CONFIRMS[state.pendingConfirm].title,
+		action: `press ${confirmKeyLabel(state.pendingConfirm)} again`,
+		card: /* @__PURE__ */ React.createElement(ConfirmCard, { confirm: state.pendingConfirm })
 	});
 	if (state.commandUpdatePrompt) {
 		const count = state.commandUpdatePrompt.length;
@@ -6699,7 +6691,7 @@ const INITIAL = {
 	commandUpdatePrompt: null,
 	port: null,
 	tunnel: null,
-	armed: null,
+	pendingConfirm: null,
 	idleAnimation: true,
 	liveSinceMs: null
 };
@@ -6726,8 +6718,8 @@ var DevStore = class extends ChangeStore {
 	setTunnel(tunnel) {
 		this.patch({ tunnel });
 	}
-	setArmed(armed) {
-		this.patch({ armed });
+	setPendingConfirm(pendingConfirm) {
+		this.patch({ pendingConfirm });
 	}
 	setIdleAnimation(idleAnimation) {
 		this.patch({ idleAnimation });
@@ -6789,11 +6781,11 @@ var DevStore = class extends ChangeStore {
 			...next
 		};
 		const liveSinceMs = isSessionLive(merged.phase) ? this.state.liveSinceMs ?? Date.now() : null;
-		const armed = merged.phase === this.state.phase ? merged.armed : null;
+		const pendingConfirm = merged.phase === this.state.phase ? merged.pendingConfirm : null;
 		this.state = {
 			...merged,
 			liveSinceMs,
-			armed
+			pendingConfirm
 		};
 		this.emit("change");
 	}
@@ -7343,6 +7335,7 @@ var BaseDevRuntime = class {
 	async openWithCleanup(context) {
 		const resources = new AsyncDisposableStack();
 		try {
+			resources.defer(() => LoggerChannelRegistry.instance.configure({}));
 			resources.use(setDevFiles(context.files.layout.toJSON()));
 			return await this.open(context, resources);
 		} catch (error) {
@@ -7583,10 +7576,6 @@ function invokeErrorsAsJson() {
 		}
 	};
 }
-function installCliLogSinks(stack) {
-	installNodeDefaults();
-	stack.defer(() => LoggerChannelRegistry.instance.configure({}));
-}
 var EdgeDevRuntime = class extends BaseDevRuntime {
 	target;
 	settleStart;
@@ -7599,7 +7588,7 @@ var EdgeDevRuntime = class extends BaseDevRuntime {
 		const { files } = context;
 		const { viteRoot } = this.target;
 		resources.use(fenceSignals());
-		installCliLogSinks(resources);
+		installNodeDefaults();
 		this.emit(context, {
 			type: "progress",
 			status: "Loading Cloudflare plugin…"
@@ -7951,6 +7940,7 @@ async function write(rest, endpoint) {
 function superseded(attempt) {
 	return attempt.signal.aborted;
 }
+const TUNNEL_FAILED = "Tunnel setup failed, so the bot runs without a public endpoint";
 function elapsedSince(startedAt) {
 	return () => paint.mute(`+${formatUptime(Date.now() - startedAt)}`);
 }
@@ -8018,7 +8008,7 @@ var TunnelCoordinator = class {
 	}
 	reportFailure(error, patched) {
 		this.deps.onStatus(null);
-		this.deps.logger.error("Tunnel setup failed, the bot runs without a public endpoint", error);
+		this.deps.logger.error(TUNNEL_FAILED, error);
 		const hint = this.deps.kind.failureHint(patched);
 		if (hint) this.deps.logger.info(hint);
 	}
@@ -8046,7 +8036,7 @@ var TunnelCoordinator = class {
 //#region src/commands/dev/tunnel/createTunnelCoordinator.ts
 const PASTE_HINT = "The tunnel is still up, so try pasting that URL into the dashboard.";
 const RESTART_HINT = "Restart for a fresh hostname, or set `tunnel` to an https URL you already serve.";
-const NO_PORT_HINT = `No tunnel, since the bot runs with ${paint.bold("port: false")} and cloudflared has no port to forward to. Give the bot a port while you develop, or set ${paint.amber("tunnel")} to the url of the server that serves it: ${paint.sky(PRODUCTION_SITES.guide.at("build/embed"))}`;
+const NO_PORT_HINT = `seedcord didn't start a tunnel, since the bot runs with ${paint.bold("port: false")} and cloudflared doesn't have a port to forward to. Give the bot a port while you develop, or set ${paint.amber("tunnel")} to the URL of the server that serves your bot: ${paint.sky(PRODUCTION_SITES.guide.at("build/embed"))}`;
 function missingCloudflaredHint(platform) {
 	const arrow = paint.mute("→");
 	return [
@@ -8121,7 +8111,7 @@ var TunnelRouter = class {
 	}
 	route(tunnel, port, instance) {
 		return this.routeTo(tunnel, port, instance).catch((error) => {
-			this.logger.error("Tunnel setup failed, the bot runs without a public endpoint", error);
+			this.logger.error(TUNNEL_FAILED, error);
 		});
 	}
 	async routeTo(tunnel, port, instance) {
@@ -8225,6 +8215,7 @@ var DevRunner = class DevRunner {
 				store.setBusy(true);
 				await this.currentSession.stop();
 				this.currentSession = null;
+				store.clearPrompt();
 			}
 		} catch (_) {
 			_usingCtx$4.e = _;
@@ -8272,11 +8263,35 @@ var DevRunner = class DevRunner {
 	}
 };
 
+//#endregion
+//#region src/commands/dev/routeConsoleToLogs.ts
+function routeConsoleToLogs() {
+	let level = "info";
+	const toLogs = new Writable({ write(chunk, _encoding, done) {
+		LoggerChannelRegistry.instance.dispatch(consoleRecord(level, chunk.toString().replace(/\n$/, "")));
+		done();
+	} });
+	const formatter = new Console({
+		stdout: toLogs,
+		stderr: toLogs
+	});
+	return routeConsole(CONSOLE_METHODS, (method, args, invoked) => {
+		level = CONSOLE_LEVEL[method];
+		if (method === "trace") {
+			LoggerChannelRegistry.instance.dispatch(consoleRecord(level, "", [traceError(format(...args), invoked)]));
+			return;
+		}
+		Reflect.apply(formatter[method], formatter, args);
+	});
+}
+
 //#endregion
 //#region src/commands/dev/runPlain.ts
 const logger = cliLogger("Dev");
+const COMMAND_SAVES_QUIET_MS = 2e3;
 const COMMANDS = /* @__PURE__ */ new Map([
 	["restart", (runner) => runner.restart()],
+	["codegen", (runner) => runner.writeTypes()],
 	["disconnect", (runner) => runner.disconnect()],
 	["quit", (runner) => runner.quit()]
 ]);
@@ -8288,15 +8303,21 @@ function commandOn(line) {
 	}
 }
 function leaveToRun(command) {
-	command.catch(() => void 0);
+	Promise.resolve(command).catch(() => void 0);
 }
 async function runPlain(store, runner, input) {
 	try {
 		var _usingCtx$3 = _usingCtx();
+		const refreshCommands = debounce(() => runner.refreshCommands(true), COMMAND_SAVES_QUIET_MS);
+		let promptedFiles = null;
 		let failure;
 		const answer = () => {
 			const { phase, commandUpdatePrompt, error } = store.getState();
-			if (commandUpdatePrompt !== null) runner.refreshCommands(true);
+			if (commandUpdatePrompt !== promptedFiles) {
+				promptedFiles = commandUpdatePrompt;
+				if (promptedFiles) refreshCommands();
+				else refreshCommands.cancel();
+			}
 			if (phase === "restart-required") {
 				logger.info("Restarting to pick up the change");
 				leaveToRun(runner.restart());
@@ -8317,6 +8338,7 @@ async function runPlain(store, runner, input) {
 		try {
 			await runner.run();
 		} finally {
+			refreshCommands.cancel();
 			store.off("change", answer);
 		}
 		if (failure) throw failure;
@@ -8344,6 +8366,7 @@ var DevCommand = class extends BaseCommand {
 				try {
 					var _usingCtx$2 = _usingCtx();
 					_usingCtx$2.u(DevSignals.own(() => void runner.quit()));
+					_usingCtx$2.u(routeConsoleToLogs());
 					await (isInteractive() ? this.runDevApp(store, runner, stateFolder) : runPlain(store, runner, process.stdin));
 				} catch (_) {
 					_usingCtx$2.e = _;
@@ -8358,17 +8381,13 @@ var DevCommand = class extends BaseCommand {
 			process.exit();
 		});
 	}
-	async write(text) {
-		return new Promise((resolve) => {
-			process.stdout.write(text, () => {
-				resolve();
-			});
-		});
-	}
 	async printLogLocation() {
-		await this.write(`${WORDMARK} dev stopped. logs: logs/\n`);
+		this.logger.info(`${WORDMARK} dev stopped. logs: logs/`);
 		const report = profileReport();
-		if (report !== null) await this.write(`${report}\n`);
+		if (report !== null) this.logger.info(report);
+		await new Promise((resolve) => {
+			process.stdout.write("", resolve);
+		});
 	}
 	async runDevApp(store, runner, stateFolder) {
 		let failure;
@@ -8917,7 +8936,7 @@ var MakeRunner = class MakeRunner {
 			const output = template.output(name, project);
 			const files = output.render(await new InputQuestions(prompter, answered).ask(output.inputs()));
 			await steps.step("write", async () => {
-				for (const file of files) await writeNew(file);
+				await Promise.all(files.map((file) => writeNew(file)));
 			}, () => paint.mute(plural(files.length, "file")), () => files.map((file) => paint.path(file.path)));
 			steps.line();
 			steps.line(paint.mute(`Run ${paint.bold("seedcord codegen")}, or keep ${paint.bold("seedcord dev")} running, to type new routes.`));