seedcord 0.19.5 → 0.21.0

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-B8yLARxT.mjs";
+import { n as SEEDCORD_CONFIG_FILENAMES, t as version } from "./src-CZ2Lqriy.mjs";
 import { createRequire } from "node:module";
 import { Command } from "@commander-js/extra-typings";
 import { LEVEL_COLOR, Logger, LoggerChannelRegistry } from "@seedcord/logger";
@@ -10,7 +10,6 @@ import { BRAND, SeedcordError, validateDiscordToken } from "@seedcord/errors/int
 import { delimiter, dirname, extname, isAbsolute, join, relative, resolve, sep } from "node:path";
 import { pathToFileURL } from "node:url";
 import { createJiti } from "jiti";
-import { tsImport } from "tsx/esm/api";
 import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import { spawn } from "node:child_process";
 import "reflect-metadata";
@@ -221,45 +220,34 @@ const TS_EXTENSIONS = /* @__PURE__ */ new Set([
 	".mts",
 	".cts"
 ]);
-var RuntimeModuleLoader = class {
-	options;
-	jiti = createJiti(import.meta.url, {
+const EXTENSIONS = [
+	...TS_EXTENSIONS,
+	".js",
+	".mjs",
+	".cjs"
+];
+function jitiFor(entryPath) {
+	return createJiti(pathToFileURL(entryPath).href, {
 		cache: false,
 		interopDefault: true,
-		extensions: [
-			".ts",
-			".tsx",
-			".mts",
-			".cts",
-			".js",
-			".mjs",
-			".cjs"
-		]
+		extensions: EXTENSIONS,
+		tsconfigPaths: true,
+		jsx: true
 	});
-	constructor(options = {}) {
-		this.options = options;
-	}
+}
+var RuntimeModuleLoader = class {
 	async importModule(entryPath) {
 		const normalized = resolve(entryPath);
 		if (!existsSync(normalized)) throw new SeedcordError(SeedcordErrorCode.CliEntryNotFound, [normalized]);
-		if (this.shouldUseTsx(normalized)) return this.importWithTsx(normalized);
+		if (TS_EXTENSIONS.has(extname(normalized).toLowerCase())) return this.importTypeScript(normalized);
 		return this.importWithNode(normalized);
 	}
-	shouldUseTsx(filePath) {
-		if (this.options.forceTsx) return true;
-		return TS_EXTENSIONS.has(extname(filePath).toLowerCase());
-	}
-	async importWithTsx(entryPath) {
-		const specifier = pathToFileURL(entryPath).href;
-		const tsconfig = this.resolveTsconfig(entryPath);
+	async importTypeScript(entryPath) {
 		try {
-			return await tsImport(specifier, {
-				parentURL: import.meta.url,
-				tsconfig
-			});
+			return await jitiFor(entryPath).import(entryPath);
 		} catch (error) {
-			const reason = Error.isError(error) ? error.message : "Unknown tsx error";
-			throw new SeedcordError(SeedcordErrorCode.CliTsxImportFailed, [entryPath, reason]);
+			const reason = Error.isError(error) ? error.message : "Unknown jiti error";
+			throw new SeedcordError(SeedcordErrorCode.CliTsImportFailed, [entryPath, reason]);
 		}
 	}
 	async importWithNode(entryPath) {
@@ -268,7 +256,7 @@ var RuntimeModuleLoader = class {
 			return await import(specifier);
 		} catch (nativeError) {
 			try {
-				return await this.jiti.import(entryPath);
+				return await jitiFor(entryPath).import(entryPath);
 			} catch (fallbackError) {
 				const nativeReason = Error.isError(nativeError) ? nativeError.message : "Unknown ESM import error";
 				const fallbackReason = Error.isError(fallbackError) ? fallbackError.message : "Unknown jiti error";
@@ -280,17 +268,6 @@ var RuntimeModuleLoader = class {
 			}
 		}
 	}
-	resolveTsconfig(entryPath) {
-		if (this.options.tsconfig !== void 0) return this.options.tsconfig;
-		return this.findNearestTsconfig(dirname(entryPath)) ?? false;
-	}
-	findNearestTsconfig(startDir) {
-		const candidate = resolve(startDir, "tsconfig.json");
-		if (existsSync(candidate)) return candidate;
-		const parent = dirname(startDir);
-		if (parent === startDir) return void 0;
-		return this.findNearestTsconfig(parent);
-	}
 };
 
 //#endregion
@@ -640,12 +617,18 @@ const IDENTIFIER = /^[A-Za-z_$][A-Za-z0-9_$]*$/;
 const CONTROL_CHAR = 32;
 const HEX_RADIX = 16;
 function renderAugmentation(registry, target, plugins) {
-	const keys = (plugins?.keys ?? []).toSorted(compare);
+	const keys = groupNames(plugins?.keys ?? []).toSorted(compare);
 	const attached = plugins !== void 0 && keys.length > 0;
 	const botImport = attached ? `import type ${BOT_BINDING} from '${escapeLiteral(plugins.specifier)}';\n\n` : "";
 	const coreRows = attached ? `    interface Core {\n${renderPluginRows(keys)}\n    }\n` : "";
 	return `${`${BANNER}\n\n${botImport}// prettier-ignore\ndeclare module '${target}' {\n` + coreRows}    interface SlashRegistry {\n${renderSlashRows(registry.slash)}\n    }\n    interface UserContextMenuRegistry {\n${renderContextMenuRows(registry.userContextMenus)}\n    }\n    interface MessageContextMenuRegistry {\n${renderContextMenuRows(registry.messageContextMenus)}\n    }\n    interface EmojiMap {\n${renderEmojiRows(registry.emojis)}\n    }\n}\n\nexport {};\n`;
 }
+function groupNames(keys) {
+	return [...new Set(keys.map((key) => {
+		const dot = key.indexOf(".");
+		return dot === -1 ? key : key.slice(0, dot);
+	}))];
+}
 function renderPluginRows(keys) {
 	return keys.map((key) => `        ${renderKey(key)}: (typeof ${BOT_BINDING})['${escapeLiteral(key)}'];`).join("\n");
 }