seedcord 0.21.3 → 0.21.5

package/README.md

@@ -17,7 +17,7 @@
 
 <div align="center">
 
-[![npm](https://img.shields.io/npm/v/seedcord?style=flat-square&logo=npm&logoColor=c8341f&label=&labelColor=1f1f1f&color=c8341f)](https://www.npmjs.com/package/seedcord) [![node](https://img.shields.io/node/v/seedcord?style=flat-square&label=node&labelColor=1f1f1f&color=4d7d33)](https://nodejs.org) [![license](https://img.shields.io/npm/l/seedcord?style=flat-square&label=license&labelColor=1f1f1f&color=f8f6e8)](LICENSE)
+[![npm](https://img.shields.io/npm/v/seedcord?style=flat-square&label=npm&labelColor=1f1f1f&color=c8341f)](https://www.npmjs.com/package/seedcord) [![node](https://img.shields.io/node/v/seedcord?style=flat-square&label=node&labelColor=1f1f1f&color=4d7d33)](https://nodejs.org) [![bun](https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Fseedcord%2Fseedcord%2Fnext%2Fcli%2Fseedcord%2Fpackage.json&query=%24.engines.bun&style=flat-square&label=bun&labelColor=1f1f1f&color=fbf0df)](https://bun.com) [![license](https://img.shields.io/npm/l/seedcord?style=flat-square&label=license&labelColor=1f1f1f&color=f8f6e8)](LICENSE)
 
 </div>
 

package/bin/seedcord.mjs

@@ -5,28 +5,49 @@ import { fileURLToPath, pathToFileURL } from 'node:url';
 
 const here = dirname(fileURLToPath(import.meta.url));
 
-function declaredNodeRange() {
+function declaredEngines() {
     try {
         const pkg = JSON.parse(readFileSync(resolve(here, '../package.json'), 'utf8'));
-        return pkg.engines?.node ?? '';
+        return pkg.engines ?? {};
     } catch {
-        return '';
+        return {};
     }
 }
 
-// importing core's own check here would load the code this guards
-function unsupportedNodeRange() {
-    const range = declaredNodeRange();
+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();
+    const { bun, node } = process.versions;
+    const runtime =
+        bun === undefined
+            ? { name: 'Node', range: engines.node ?? '', running: node }
+            : { name: 'Bun', range: engines.bun ?? '', running: bun };
 
-    const required = new RegExp(String.raw`^>=(\d+)(?:\.(\d+))?`).exec(range.replaceAll(/\s/g, ''));
-    const current = /^v?(\d+)\.(\d+)/.exec(process.version);
-    if (!required || !current) return null;
+    const range = runtime.range.replaceAll(/\s/g, '');
+    if (!range.startsWith('>=')) return undefined;
 
-    const requiredMinor = required[2] ?? '0';
-    const meets =
-        Number(current[1]) > Number(required[1]) ||
-        (Number(current[1]) === Number(required[1]) && Number(current[2]) >= Number(requiredMinor));
-    return meets ? null : range;
+    const required = parseVersion(range.slice('>='.length));
+    const running = parseVersion(runtime.running);
+    if (!required || !running || meetsMinimum(required, running)) return undefined;
+    return runtime;
 }
 
 async function run() {
@@ -41,10 +62,12 @@ async function run() {
     await import(pathToFileURL(srcEntry).href);
 }
 
-const unsupported = unsupportedNodeRange();
+const unsupported = unsupportedRuntime();
 if (unsupported) {
     // eslint-disable-next-line no-console -- the bin has no logger
-    console.error(`seedcord requires Node ${unsupported} and this process runs ${process.version}.`);
+    console.error(
+        `seedcord requires ${unsupported.name} ${unsupported.range} but this process runs ${unsupported.running}.`
+    );
     process.exit(1);
 }
 

package/dist/cli.mjs

@@ -1,5 +1,5 @@
-import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-CUR3x9pA.mjs";
-import { createRequire, findPackageJSON } from "node:module";
+import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-B41FGgG4.mjs";
+import { createRequire } from "node:module";
 import { Command } from "@commander-js/extra-typings";
 import { LEVEL_COLOR, Logger, LoggerChannelRegistry } from "@seedcord/logger";
 import { formatBody, installNodeDefaults } from "@seedcord/logger/node";
@@ -31,8 +31,6 @@ import process$1 from "node:process";
 import { assertNever } from "@seedcord/utils";
 import { settleWithin } from "@seedcord/core/node/internal";
 import { createServer, createServerModuleRunner, defineConfig, mergeConfig } from "vite";
-import { EvaluatedModules } from "vite/module-runner";
-import tsconfigPaths from "vite-tsconfig-paths";
 import { minimatch } from "minimatch";
 import { createServer as createServer$1 } from "node:net";
 
@@ -967,17 +965,17 @@ var CleanRunner = class CleanRunner {
 	async fetchBotGuilds(rest) {
 		const guilds = [];
 		let after;
-		for (;;) {
+		let page;
+		do {
 			const query = new URLSearchParams({ limit: String(GUILD_PAGE) });
 			if (after) query.set("after", after);
-			const page = await rest.get(Routes.userGuilds(), { query });
+			page = await rest.get(Routes.userGuilds(), { query });
 			for (const guild of page) guilds.push({
 				id: guild.id,
 				name: guild.name
 			});
 			after = page.at(-1)?.id;
-			if (page.length < GUILD_PAGE || !after) break;
-		}
+		} while (page.length === GUILD_PAGE && after);
 		return guilds;
 	}
 	async fetchGlobalNames(rest, appId) {
@@ -2887,7 +2885,6 @@ var DevStore = class extends TypedEventEmitter {
 			case "module-loading":
 			case "module-loaded":
 			case "module-error":
-			case "file-change":
 			case "ready": break;
 			default: assertNever(event);
 		}
@@ -3080,11 +3077,17 @@ var DevSession = class {
 //#endregion
 //#region src/commands/dev/runtime/HmrPlugin.ts
 const DEBOUNCE_MS = 250;
+const TYPE_COLOR = {
+	create: paint.mint,
+	createDir: paint.mint,
+	update: paint.sky,
+	delete: paint.coral,
+	deleteDir: paint.coral
+};
 var HmrPlugin = class extends TypedEventEmitter {
 	config;
 	logger;
 	lastUpdate = /* @__PURE__ */ new Map();
-	awaitingCreateEcho = /* @__PURE__ */ new Set();
 	server = null;
 	dynamicRestartPatterns = /* @__PURE__ */ new Set();
 	get hot() {
@@ -3099,10 +3102,13 @@ var HmrPlugin = class extends TypedEventEmitter {
 		this.logger = new Logger("HMR", { channel: "hmr" });
 	}
 	get plugin() {
+		const onHotUpdate = this.hotUpdate.bind(this);
 		return {
 			name: "seedcord:hmr",
 			configureServer: this.configureServer.bind(this),
-			hotUpdate: this.hotUpdate.bind(this)
+			hotUpdate(ctx) {
+				return onHotUpdate(this.environment, ctx);
+			}
 		};
 	}
 	sendRefreshCommands(shouldRefresh) {
@@ -3110,10 +3116,8 @@ var HmrPlugin = class extends TypedEventEmitter {
 	}
 	configureServer(server) {
 		this.server = server;
-		server.watcher.on("add", (file) => this.handleFileEvent(file, "create"));
-		server.watcher.on("unlink", (file) => this.handleFileEvent(file, "delete"));
-		server.watcher.on("addDir", (file) => this.handleFileEvent(file, "createDir"));
-		server.watcher.on("unlinkDir", (file) => this.handleFileEvent(file, "deleteDir"));
+		server.watcher.on("addDir", (dir) => this.handleDirEvent(dir, "createDir"));
+		server.watcher.on("unlinkDir", (dir) => this.handleDirEvent(dir, "deleteDir"));
 		server.watcher.add(this.config.configFile);
 		server.watcher.on("change", (file) => this.handleChange(file));
 		this.dev?.on("seedcord:commands-update-prompt", (data) => {
@@ -3134,14 +3138,12 @@ var HmrPlugin = class extends TypedEventEmitter {
 		});
 	}
 	isDebounced(file, type) {
-		if (this.justSaw(file, type)) return true;
-		this.lastUpdate.set(`${file}::${type}`, Date.now());
+		const key = `${file}::${type}`;
+		const last = this.lastUpdate.get(key);
+		if (last !== void 0 && Date.now() - last < DEBOUNCE_MS) return true;
+		this.lastUpdate.set(key, Date.now());
 		return false;
 	}
-	justSaw(file, type) {
-		const last = this.lastUpdate.get(`${file}::${type}`);
-		return last !== void 0 && Date.now() - last < DEBOUNCE_MS;
-	}
 	handleChange(file) {
 		if (!this.isCriticalFile(file) || this.isDebounced(file, "update")) return;
 		this.reportRestartRequired(file);
@@ -3151,78 +3153,56 @@ var HmrPlugin = class extends TypedEventEmitter {
 		this.logger.warn(`${paint.coral("Critical file changed:")} ${paint.sky.bold(relPath)}. Restart required.`);
 		this.emit("event", { type: "restart-required" });
 	}
-	handleFileEvent(file, type) {
-		if (this.isDebounced(file, type)) return;
-		if (type === "create") this.awaitingCreateEcho.add(file);
-		const relPath = relative(process.cwd(), file);
-		const typeColor = type === "create" || type === "createDir" ? paint.mint : type === "delete" || type === "deleteDir" ? paint.coral : paint.sky;
-		this.logger.trace(`${typeColor(type.toUpperCase())} ${paint.mute(relPath)}`);
-		const payload = {
-			file,
-			type,
+	handleDirEvent(dir, type) {
+		if (this.isDebounced(dir, type)) return;
+		this.send({
+			file: dir,
+			type
+		});
+	}
+	send(event) {
+		const relPath = relative(process.cwd(), event.file);
+		this.logger.trace(`${TYPE_COLOR[event.type](event.type.toUpperCase())} ${paint.mute(relPath)}`);
+		this.dev?.send("seedcord:hmr", {
+			...event,
 			rollback: this.config.hmr?.rollback ?? true
-		};
-		this.dev?.send("seedcord:hmr", payload);
+		});
 	}
-	hotUpdate(ctx) {
-		const { file, modules, server } = ctx;
-		const type = "update";
-		if (this.awaitingCreateEcho.delete(file) && this.justSaw(file, "create") || this.isDebounced(file, type)) return [];
-		const relPath = relative(process.cwd(), file);
-		this.logger.trace(`${paint.sky(type.toUpperCase())} ${paint.mute(relPath)}`);
+	hotUpdate(environment, ctx) {
+		const { type, file, modules } = ctx;
+		if (environment.name !== "ssr" || this.isDebounced(file, type)) return [];
 		if (this.isCriticalFile(file)) {
 			this.reportRestartRequired(file);
 			return [];
 		}
-		const moduleGraph = server.moduleGraph;
-		const fileModules = moduleGraph.getModulesByFile(file);
-		const allModules = fileModules ? [...fileModules] : [];
-		const combinedModules = /* @__PURE__ */ new Set([...modules, ...allModules]);
-		const affectedModules = this.getAffectedModules([...combinedModules]);
-		const filesToInvalidate = /* @__PURE__ */ new Set([file, ...affectedModules]);
-		for (const fileToInvalidate of filesToInvalidate) {
-			const mods = moduleGraph.getModulesByFile(fileToInvalidate);
-			if (mods) for (const mod of mods) moduleGraph.invalidateModule(mod);
-		}
-		this.emit("event", {
-			type: "file-change",
-			path: file
-		});
-		const payload = {
+		const { moduleGraph } = environment;
+		const affectedModules = affectedFiles(file, modules);
+		for (const target of affectedModules) for (const mod of moduleGraph.getModulesByFile(target) ?? []) moduleGraph.invalidateModule(mod);
+		this.send({
 			file,
 			type,
-			affectedModules,
-			rollback: this.config.hmr?.rollback ?? true
-		};
-		this.dev?.send("seedcord:hmr", payload);
+			affectedModules
+		});
 		return [];
 	}
 	isCriticalFile(file) {
-		const root = this.config.root;
+		const { root, configFile, entry, instance } = this.config;
 		const relPath = relative(root, file);
-		if (this.config.hmr?.restart) {
-			for (const pattern of this.config.hmr.restart) if (minimatch(relPath, pattern)) return true;
-		}
-		for (const pattern of this.dynamicRestartPatterns) if (minimatch(relPath, pattern)) return true;
-		if (file === this.config.configFile || file.endsWith("package.json") || file.endsWith("tsconfig.json") || file.endsWith(".env")) return true;
-		const entryPath = resolve(root, this.config.entry);
-		const instancePath = resolve(root, this.config.instance);
-		if (file === entryPath || file === instancePath) return true;
-		return false;
-	}
-	getAffectedModules(modules) {
-		const affected = /* @__PURE__ */ new Set();
-		const seen = /* @__PURE__ */ new Set();
-		const traverse = (mod) => {
-			if (!mod.file || seen.has(mod.file)) return;
-			seen.add(mod.file);
-			affected.add(mod.file);
-			mod.importers.forEach(traverse);
-		};
-		modules.forEach(traverse);
-		return [...affected];
+		return [...this.config.hmr?.restart ?? [], ...this.dynamicRestartPatterns].some((pattern) => minimatch(relPath, pattern)) || file === configFile || file.endsWith("package.json") || file.endsWith("tsconfig.json") || file.endsWith(".env") || file === resolve(root, entry) || file === resolve(root, instance);
 	}
 };
+function affectedFiles(file, modules) {
+	const files = /* @__PURE__ */ new Set([file]);
+	const visited = /* @__PURE__ */ new Set();
+	const visit = (mod) => {
+		if (visited.has(mod)) return;
+		visited.add(mod);
+		if (mod.file) files.add(mod.file);
+		mod.importers.forEach(visit);
+	};
+	modules.forEach(visit);
+	return [...files];
+}
 
 //#endregion
 //#region src/commands/dev/runtime/seedcordDependents.ts
@@ -3241,12 +3221,14 @@ function dependencyNames(manifestPath, fields) {
 	});
 }
 function installedManifest(name, fromManifest) {
-	try {
-		return findPackageJSON(name, pathToFileURL(fromManifest));
-	} catch (error) {
-		if (Error.isError(error) && "code" in error && error.code === "ERR_MODULE_NOT_FOUND") return void 0;
-		throw error;
-	}
+	let dir = dirname(fromManifest);
+	let checked;
+	do {
+		const candidate = join(dir, "node_modules", name, "package.json");
+		if (existsSync(candidate)) return realpathSync(candidate);
+		checked = dir;
+		dir = dirname(dir);
+	} while (dir !== checked);
 }
 function isSeedcordPackage(name) {
 	return name.startsWith("@seedcord/");
@@ -3295,6 +3277,7 @@ function logsIgnore(root) {
 	return (path) => path === logs || path.startsWith(logs + sep);
 }
 var vite_config_default = defineConfig({
+	resolve: { tsconfigPaths: true },
 	server: {
 		middlewareMode: true,
 		hmr: true,
@@ -3353,7 +3336,6 @@ var ViteDevRuntime = class {
 	viteServer = null;
 	moduleRunner = null;
 	eventHandler = null;
-	evaluatedModules = null;
 	hmrPlugin = null;
 	async start(context) {
 		this.context = context;
@@ -3372,29 +3354,17 @@ var ViteDevRuntime = class {
 			configFile: false,
 			server: { watch: { ignored: [logsIgnore(projectRoot)] } },
 			ssr: { noExternal: seedcordDependents(projectDir) },
-			plugins: [tsconfigPaths({ root: projectDir }), hmrPlugin.plugin]
+			plugins: [hmrPlugin.plugin]
 		});
 		this.viteServer = await createServer(config);
-		this.evaluatedModules = new EvaluatedModules();
-		this.moduleRunner = createServerModuleRunner(this.viteServer.environments.ssr, { evaluatedModules: this.evaluatedModules });
-		hmrPlugin.on("event", this.handleHmrEvent.bind(this));
+		this.moduleRunner = createServerModuleRunner(this.viteServer.environments.ssr);
+		hmrPlugin.on("event", this.emit.bind(this));
 		this.emit({
 			type: "module-loaded",
 			path: projectRoot
 		});
 		this.emit({ type: "ready" });
 	}
-	handleHmrEvent(event) {
-		if (event.type === "file-change") this.invalidateModule(event.path);
-		this.emit(event);
-	}
-	invalidateModule(file) {
-		const projectRoot = this.context?.config.root;
-		if (!projectRoot || !this.evaluatedModules) return;
-		const moduleId = toModuleId(projectRoot, file);
-		const moduleNode = this.evaluatedModules.getModuleById(moduleId);
-		if (moduleNode) this.evaluatedModules.invalidateModule(moduleNode);
-	}
 	refreshCommands(shouldRefresh) {
 		this.hmrPlugin?.sendRefreshCommands(shouldRefresh);
 	}
@@ -3430,7 +3400,6 @@ var ViteDevRuntime = class {
 			this.viteServer = null;
 		}
 		this.moduleRunner = null;
-		this.evaluatedModules = null;
 		this.hmrPlugin = null;
 		this.context = null;
 		this.eventHandler = null;