seedcord 0.22.0-next.1 → 0.22.0

package/bin/seedcord.mjs

@@ -3,6 +3,8 @@ import { existsSync, readFileSync } from 'node:fs';
 import { dirname, resolve } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
+import { isValid, isValidRange, satisfies } from 'verkit';
+
 const here = dirname(fileURLToPath(import.meta.url));
 
 function declaredEngines() {
@@ -14,24 +16,6 @@ function declaredEngines() {
     }
 }
 
-function parseVersion(text) {
-    const [withoutBuild = ''] = text.replace(/^v/, '').split('+');
-    const [release = '', ...prerelease] = withoutBuild.split('-');
-    const parts = release.split('.').map(Number);
-    return parts.every(Number.isInteger) ? { parts, prerelease: prerelease.length > 0 } : undefined;
-}
-
-// semver ranks 1.4.2-canary.1 below 1.4.2
-function meetsMinimum(required, running) {
-    const length = Math.max(required.parts.length, running.parts.length);
-    for (let index = 0; index < length; index++) {
-        const wanted = required.parts[index] ?? 0;
-        const got = running.parts[index] ?? 0;
-        if (got !== wanted) return got > wanted;
-    }
-    return !running.prerelease;
-}
-
 // importing core's assertDeclaredRuntime here would load the code this guards
 function unsupportedRuntime() {
     const engines = declaredEngines();
@@ -41,12 +25,13 @@ function unsupportedRuntime() {
             ? { name: 'Node', range: engines.node ?? '', running: node }
             : { name: 'Bun', range: engines.bun ?? '', running: bun };
 
-    const range = runtime.range.replaceAll(/\s/g, '');
-    if (!range.startsWith('>=')) return undefined;
-
-    const required = parseVersion(range.slice('>='.length));
-    const running = parseVersion(runtime.running);
-    if (!required || !running || meetsMinimum(required, running)) return undefined;
+    if (
+        !runtime.range ||
+        !isValidRange(runtime.range) ||
+        !isValid(runtime.running) ||
+        satisfies(runtime.running, runtime.range, { includePrerelease: true })
+    )
+        return undefined;
     return runtime;
 }
 

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-CbQWW68A.mjs";
+import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-rYAuhl0h.mjs";
 import { createRequire } from "node:module";
 import { Command, Option } from "@commander-js/extra-typings";
 import { SeedcordErrorCode, isSeedcordError, paint } from "@seedcord/errors";
@@ -18,10 +18,11 @@ import { BOT_FILES_KEY, BUILT_FILES_READY_KEY, BotLayout, asError, encodeFile, h
 import { spawn } from "node:child_process";
 import { HostAugmentTarget, HostListenHost, HostPluginKeys, HostShutdown, HostStartup, HostVersion, SeedcordBrand } from "@seedcord/types/internal";
 import { Visitor, createBuilder, createLogger, createServer, createServerModuleRunner, loadEnv, mergeConfig, preview } from "vite";
+import { fileURLToPath } from "node:url";
 import { format, parseEnv, stripVTControlCharacters } from "node:util";
+import { BAKED_IDS_KEY, CommandMetadataKey, GLOBAL_ID, bindEnv, commandKey, commandRefOf, commandsRoute, currentApplication, fromDevLogLine, fromWireError, globalFirst, guildSummaries, isCommandClass, linkCommands, planDeploy, putCommands, readBotToken, readCommands, readCommandsAt, resolveDeployTarget, resolveEmojis, scopeIdsOf, skippedNote, warnLinks, wrapHot } from "@seedcord/core/internal";
+import { Converters, ENVIRONMENT_KEYS, Envapter, Environment, PortableSource, merge } from "envapt";
 import { randomUUID } from "node:crypto";
-import { Converters, ENVIRONMENT_KEYS, Envapter, Environment, FileSource, PortableSource, merge } from "envapt";
-import { BAKED_IDS_KEY, CommandMetadataKey, GLOBAL_ID, commandKey, commandRefOf, commandsRoute, currentApplication, fromDevLogLine, fromWireError, globalFirst, guildSummaries, isCommandClass, linkCommands, planDeploy, putCommands, readBotToken, readCommands, readCommandsAt, resolveDeployTarget, resolveEmojis, scopeIdsOf, skippedNote, warnLinks, wrapHot } from "@seedcord/core/internal";
 import { DiscordAPIError, REST } from "@discordjs/rest";
 import "reflect-metadata";
 import { ApplicationCommandOptionType, ApplicationCommandType, InteractionContextType, RESTJSONErrorCodes, Routes } from "discord-api-types/v10";
@@ -1577,12 +1578,7 @@ function botEnvironment(environments) {
 
 //#endregion
 //#region src/core/modules/edgeStandIns.ts
-const BIND_ENV_ID$1 = "seedcord:bind-env";
-const RESOLVED_BIND_ENV_ID = `\0${BIND_ENV_ID$1}`;
 const CLOUDFLARE_WORKERS_ID = "\0seedcord:cloudflare-workers";
-const bindEnv = (env) => `import { Envapter, PortableSource } from 'envapt';
-Envapter.useSource(new PortableSource(${env}));
-`;
 const cloudflareWorkers = (env) => `export const env = ${env};
 export const exports = {};
 export const cache = {};
@@ -1602,18 +1598,40 @@ function edgeStandIns(loadEnv) {
 	return {
 		name: "seedcord:edge-stand-ins",
 		resolveId(id) {
-			if (id === "seedcord:bind-env") return RESOLVED_BIND_ENV_ID;
 			if (id === "cloudflare:workers") return CLOUDFLARE_WORKERS_ID;
 		},
 		async load(id) {
-			if (id !== RESOLVED_BIND_ENV_ID && id !== CLOUDFLARE_WORKERS_ID) return void 0;
+			if (id !== CLOUDFLARE_WORKERS_ID) return void 0;
 			const workerEnv = await loadEnv();
 			const values = JSON.stringify(workerEnv.values());
-			return id === RESOLVED_BIND_ENV_ID ? bindEnv(values) : cloudflareWorkers(values);
+			return cloudflareWorkers(values);
 		}
 	};
 }
 
+//#endregion
+//#region src/core/modules/envBootstrap.ts
+const ENV_BOOTSTRAP_ID = "seedcord:env";
+const RESOLVED_ENV_BOOTSTRAP_ID = `\0${ENV_BOOTSTRAP_ID}`;
+function envBootstrapSource(options) {
+	const helperPath = fileURLToPath(import.meta.resolve("@seedcord/core/internal/env"));
+	const imports = `import { Envapter } from 'envapt';
+import { bindViteEnv } from ${JSON.stringify(helperPath)};\n`;
+	if (options.runtime === "worker") return `${imports}import { env } from 'cloudflare:workers';
+export const binding = bindViteEnv(Envapter, import.meta.env, { bindings: env });\n`;
+	if (options.directory !== void 0) return `${imports}export const binding = bindViteEnv(Envapter, import.meta.env, { directory: ${JSON.stringify(options.directory)} });\n`;
+	const utilsPath = fileURLToPath(import.meta.resolve("@seedcord/utils/internal"));
+	return `${imports}import { botConfigDir } from ${JSON.stringify(utilsPath)};
+export const binding = bindViteEnv(Envapter, import.meta.env, { directory: botConfigDir() });\n`;
+}
+function envBootstrap(options) {
+	return {
+		name: "seedcord:env",
+		resolveId: (id) => id === "seedcord:env" ? RESOLVED_ENV_BOOTSTRAP_ID : void 0,
+		load: (id) => id === RESOLVED_ENV_BOOTSTRAP_ID ? envBootstrapSource(options) : void 0
+	};
+}
+
 //#endregion
 //#region src/core/modules/openViteServer.ts
 function closesOn(stack) {
@@ -1651,6 +1669,7 @@ const IMPORT_DEADLINE_MS = 3e4;
 var RunnerModuleLoader = class {
 	runner;
 	deadlineMs;
+	binding;
 	constructor(runner, deadlineMs = IMPORT_DEADLINE_MS) {
 		this.runner = runner;
 		this.deadlineMs = deadlineMs;
@@ -1660,8 +1679,16 @@ var RunnerModuleLoader = class {
 		if (!existsSync(path)) throw new SeedcordError(SeedcordErrorCode.CoreImportFailed, [path, "The file does not exist."]);
 		return this.load(path, path);
 	}
-	async bindEdgeEnv() {
-		await this.load(BIND_ENV_ID$1, "envapt");
+	async bindEnv() {
+		const { binding } = await this.load(ENV_BOOTSTRAP_ID, "envapt");
+		this.binding = binding;
+	}
+	async [Symbol.asyncDispose]() {
+		try {
+			await this.runner.close();
+		} finally {
+			this.binding?.[Symbol.dispose]();
+		}
 	}
 	async load(id, shownAs) {
 		let timer;
@@ -1877,6 +1904,9 @@ var WorkerEnv = class WorkerEnv {
 	static async load(cloudflareConfig, mode) {
 		return new WorkerEnv(await loadWorker(cloudflareConfig, mode), cloudflareConfig, mode);
 	}
+	bindToCli(stack) {
+		stack.use(bindEnv(Envapter, merge(Envapter.source, new PortableSource(this.values())), this.envDir));
+	}
 	values() {
 		const local = this.localVars();
 		const values = {};
@@ -1896,17 +1926,6 @@ var WorkerEnv = class WorkerEnv {
 
 //#endregion
 //#region src/core/modules/openModuleLoader.ts
-var ViteModuleLoader = class extends RunnerModuleLoader {
-	server;
-	constructor(server, runner) {
-		super(runner);
-		this.server = server;
-	}
-	async [Symbol.asyncDispose]() {
-		await this.runner.close();
-		await this.server.close();
-	}
-};
 function lazyWorkerEnv(cloudflareConfig, mode, loaded) {
 	let loading = loaded && Promise.resolve(loaded);
 	return () => loading ??= WorkerEnv.load(cloudflareConfig, mode);
@@ -1915,8 +1934,8 @@ async function openModuleLoader(projectDir, target, mode, use, devCopy) {
 	try {
 		var _usingCtx$7 = _usingCtx();
 		const runsWorkerCode = target.kind === "edge" && use !== "config";
-		const workerEnv = target.kind === "edge" ? lazyWorkerEnv(target.cloudflareConfig, mode, devCopy?.workerEnv) : void 0;
-		if (runsWorkerCode) await workerEnv?.();
+		const loadWorkerEnv = target.kind === "edge" ? lazyWorkerEnv(target.cloudflareConfig, mode, devCopy?.workerEnv) : void 0;
+		const workerEnv = runsWorkerCode && loadWorkerEnv ? await loadWorkerEnv() : void 0;
 		const conditions = runsWorkerCode ? WORKERD_CONDITIONS : NODE_CONDITIONS;
 		const userPlugins = use === "config" ? [] : use.vitePlugins.create();
 		const config = mergeViteConfig(userCodeConfig(conditions, projectDir), {
@@ -1935,16 +1954,26 @@ async function openModuleLoader(projectDir, target, mode, use, devCopy) {
 				noDiscovery: true,
 				include: []
 			},
-			plugins: [...workerEnv ? [edgeStandIns(workerEnv)] : [], userPlugins]
+			plugins: [
+				envBootstrap(runsWorkerCode ? { runtime: "worker" } : {
+					runtime: "node",
+					directory: projectDir
+				}),
+				...loadWorkerEnv ? [edgeStandIns(loadWorkerEnv)] : [],
+				userPlugins
+			]
 		});
 		const onFailure = _usingCtx$7.a(new AsyncDisposableStack());
+		workerEnv?.bindToCli(onFailure);
 		const server = await openViteServer(onFailure, config);
 		const runner = createServerModuleRunner(botEnvironment(server.environments), { hmr: false });
-		onFailure.defer(() => runner.close());
-		const loader = new ViteModuleLoader(server, runner);
-		if (runsWorkerCode) await loader.bindEdgeEnv();
-		onFailure.move();
-		return loader;
+		const loader = onFailure.use(new RunnerModuleLoader(runner));
+		await loader.bindEnv();
+		const resources = onFailure.move();
+		return {
+			importModule: loader.importModule.bind(loader),
+			[Symbol.asyncDispose]: () => resources.disposeAsync()
+		};
 	} catch (_) {
 		_usingCtx$7.e = _;
 	} finally {
@@ -1977,6 +2006,8 @@ function envFilesSetDevNodeEnv(mode, configDir) {
 }
 var ShellMode = class ShellMode {
 	variable;
+	nodeEnv = process.env.NODE_ENV;
+	viteNodeEnv = process.env.VITE_USER_NODE_ENV;
 	constructor(variable) {
 		this.variable = variable;
 	}
@@ -1993,7 +2024,12 @@ var ShellMode = class ShellMode {
 	applyMode(defaultMode, configDir) {
 		const mode = this.viteMode(defaultMode);
 		Envapter.environment = mode;
-		process.env.NODE_ENV ||= envFilesSetDevNodeEnv(mode, configDir) ? "development" : defaultMode;
+		if (this.nodeEnv) process.env.NODE_ENV = this.nodeEnv;
+		else {
+			if (this.viteNodeEnv === void 0) delete process.env.VITE_USER_NODE_ENV;
+			else process.env.VITE_USER_NODE_ENV = this.viteNodeEnv;
+			process.env.NODE_ENV = envFilesSetDevNodeEnv(mode, configDir) ? "development" : defaultMode;
+		}
 		return mode;
 	}
 	viteMode(defaultMode) {
@@ -2335,10 +2371,6 @@ const workerEntryConfig = () => ({ entrypoint: WORKER_ENTRY_ID });
 const BIND_ENV_ID = "virtual:seedcord/bind-env";
 const BUILT_FILES_ID = "virtual:seedcord/built-files";
 const BAKED_IDS_ID = "virtual:seedcord/baked-ids";
-const BIND_ENV = `import { env } from 'cloudflare:workers';
-import { Envapter, PortableSource } from 'envapt';
-Envapter.useSource(new PortableSource(env));
-`;
 const CWD_ID = "virtual:seedcord/cwd";
 function cwdSource(cwd) {
 	return `process.cwd = () => ${JSON.stringify(cwd)};\n`;
@@ -2370,7 +2402,7 @@ function setupSources({ layout, folders, rootKey, mode }) {
 	return new Map([
 		[CWD_ID, cwdSource(cwd)],
 		...modules,
-		[BIND_ENV_ID, BIND_ENV],
+		[BIND_ENV_ID, envBootstrapSource({ runtime: "worker" })],
 		[BUILT_FILES_ID, builtFilesSource({
 			layout,
 			folders,
@@ -2809,6 +2841,7 @@ function serverEntry(builtFiles, importBot) {
 			rootExpression: ROOT_EXPRESSION,
 			sourcePaths: false
 		}),
+		`await import('${ENV_BOOTSTRAP_ID}');`,
 		...importBot,
 		""
 	].join("\n");
@@ -2828,7 +2861,8 @@ function outputChunks(result) {
 function outputName(moduleId, layout) {
 	if (isServerEntry(moduleId)) return ENTRY_FILE_NAME;
 	if (moduleId && isListedFileId(moduleId)) return `_virtual/files${layout.listedKeyOf(listedFileOf(moduleId))}.js`;
-	return `[name]${BotLayout.builtExtension(withoutQuery(moduleId ?? ""))}`;
+	if (moduleId && layout.holds(moduleId)) return BotLayout.builtPath(layout.keyOf(withoutQuery(moduleId))).slice(1);
+	return "_virtual/[name]-[hash].js";
 }
 var ServerBuild = class extends TargetBuild {
 	target;
@@ -2851,19 +2885,24 @@ var ServerBuild = class extends TargetBuild {
 			rootKey: BotLayout.keyUnder(configDir, root),
 			configFile: BotLayout.keyUnder(outDir, config.configFile)
 		};
-		const result = await this.buildBot([serverEntry(builtFiles, importBot), pinModulePaths(layout)], {
+		const fileName = (chunk) => outputName(chunk.facadeModuleId, layout);
+		const result = await this.buildBot([
+			envBootstrap({ runtime: "node" }),
+			serverEntry(builtFiles, importBot),
+			pinModulePaths(layout)
+		], {
 			outDir,
 			emptyOutDir: true,
 			sourcemap: true,
 			minify: false,
 			target: NODE_TARGET,
 			rolldownOptions: {
-				input: ENTRY_ID,
+				input: [ENTRY_ID, ...await files.modulePaths()],
+				preserveEntrySignatures: "strict",
 				output: {
 					format: "esm",
-					preserveModules: true,
-					preserveModulesRoot: root,
-					entryFileNames: (chunk) => outputName(chunk.facadeModuleId, layout)
+					entryFileNames: fileName,
+					chunkFileNames: fileName
 				}
 			}
 		});
@@ -7153,10 +7192,6 @@ function installCliLogSinks(stack) {
 	installNodeDefaults();
 	stack.defer(() => LoggerChannelRegistry.instance.configure({}));
 }
-function bindWorkerEnvToCli(workerEnv, stack) {
-	Envapter.useSource(merge(new FileSource(), new PortableSource(workerEnv.values())));
-	stack.defer(() => Envapter.useSource(new FileSource()));
-}
 var EdgeDevRuntime = class extends BaseDevRuntime {
 	target;
 	settleStart;
@@ -7179,7 +7214,6 @@ var EdgeDevRuntime = class extends BaseDevRuntime {
 			CloudflareWorker.load(this.target),
 			WorkerEnv.load(this.target.cloudflareConfig, config.viteMode)
 		]);
-		bindWorkerEnvToCli(workerEnv, resources);
 		const nodeCopy = await openModuleLoader(dirname(config.configFile), this.target, config.viteMode, config, {
 			watch: devWatchOptions(files.layout),
 			workerEnv
@@ -7289,11 +7323,20 @@ var ServerDevRuntime = class extends BaseDevRuntime {
 		const hmr = this.openHmr(context, BOT_ENVIRONMENT, resources);
 		const server = await openViteServer(resources, mergeViteConfig(serverViteConfig(context.config, context.files.layout), {
 			mode: context.config.viteMode,
-			plugins: [hmr.plugin, context.config.vitePlugins.create()]
+			plugins: [
+				envBootstrap({
+					runtime: "node",
+					directory: dirname(context.config.configFile)
+				}),
+				hmr.plugin,
+				context.config.vitePlugins.create()
+			]
 		})).catch(rethrowVitePluginError);
+		const modules = resources.use(new RunnerModuleLoader(createServerModuleRunner(botEnvironment(server.environments))));
+		await modules.bindEnv();
 		return {
 			context,
-			modules: new RunnerModuleLoader(createServerModuleRunner(botEnvironment(server.environments))),
+			modules,
 			hmr,
 			resources
 		};