commandkit 1.2.0-rc.10 → 1.2.0-rc.12

package/dist/{commandkit-lhbfAyX9.js → commandkit-DabqpQ6v.js}

@@ -1,24 +1,25 @@
 const require_chunk = require('./chunk-nOFOJqeH.js');
 const require_colors = require('./colors-DL3ucTiT.js');
 const require_error_codes = require('./error-codes-Ds0bnPvT.js');
-const require_element = require('./element-Bak9llw_.js');
-const require_EventInterceptor = require('./EventInterceptor-CQEXyUTp.js');
-const require_constants = require('./constants-B5_Ta7PR.js');
-const require_CompilerPlugin = require('./CompilerPlugin-M8r3yNAl.js');
-const require_RuntimePlugin = require('./RuntimePlugin-BUecuBIU.js');
-const require_resolve_file_url = require('./resolve-file-url-ChIyw-Vf.js');
-const require_utils = require('./utils-KsNof0Xz.js');
-const require_types_package = require('./types-package-BWArjyBF.js');
-const require_constants$1 = require('./constants-BOOGN85p.js');
-const require_EventWorkerContext = require('./EventWorkerContext-Dq29tieI.js');
-const require_signals = require('./signals-ChFMD7mB.js');
-const require_helpers = require('./helpers-Dl8wW6aO.js');
-const require_MessageCommandParser = require('./MessageCommandParser-Dl0xxtdr.js');
-const require_CommandsRouter = require('./CommandsRouter-Dmzw-ikm.js');
-const require_EventsRouter = require('./EventsRouter-3Gygh-km.js');
-const require_common = require('./common-CrqwC-sx.js');
-const require_CommandKitEventsChannel = require('./CommandKitEventsChannel-BtRzr3Tz.js');
-const require_store = require('./store-CM6pWVZh.js');
+const require_warning = require('./warning-CszH8HeS.js');
+const require_element = require('./element-DibzzA5L.js');
+const require_EventInterceptor = require('./EventInterceptor-BWoEJMHZ.js');
+const require_constants = require('./constants-BMWH2YUr.js');
+const require_CompilerPlugin = require('./CompilerPlugin-CZ4412Zm.js');
+const require_RuntimePlugin = require('./RuntimePlugin-COeXe8rP.js');
+const require_resolve_file_url = require('./resolve-file-url-CJoD0FAn.js');
+const require_utils = require('./utils-Br3eenD1.js');
+const require_types_package = require('./types-package-D11rQXLs.js');
+const require_constants$1 = require('./constants-D0dawKxO.js');
+const require_EventWorkerContext = require('./EventWorkerContext-D_9q1Bm2.js');
+const require_signals = require('./signals-Cnqe9dFV.js');
+const require_helpers = require('./helpers-D2_1jih6.js');
+const require_MessageCommandParser = require('./MessageCommandParser-CKh-tM97.js');
+const require_CommandsRouter = require('./CommandsRouter-CWMipIis.js');
+const require_EventsRouter = require('./EventsRouter-C04XqRKf.js');
+const require_common = require('./common-fIO6fqGZ.js');
+const require_CommandKitEventsChannel = require('./CommandKitEventsChannel-2l9Za-le.js');
+const require_store = require('./store-ZwL2gN6a.js');
 let node_events = require("node:events");
 node_events = require_chunk.__toESM(node_events);
 let discord_js = require("discord.js");
@@ -113,7 +114,7 @@ function useStore() {
 }
 
 //#endregion
-//#region src/components/v1/button/ButtonKit.ts
+//#region src/components/interactive/button/ButtonKit.ts
 /**
 * A builder for creating buttons with additional features like interaction collectors and event handling.
 */
@@ -208,7 +209,9 @@ var ButtonKit = class extends discord_js.ButtonBuilder {
 	#setupInteractionCollector() {
 		if (this.data.style === discord_js.ButtonStyle.Link || !this.#contextData || !this.#onClickHandler) return;
 		if ((this.customId ?? null) === null) throw new TypeError("Cannot setup \"onClick\" handler on a button without a custom id.");
-		this.#unsub = this.#getEventInterceptor().subscribe(discord_js.Events.InteractionCreate, async (interaction) => {
+		const interceptor = this.#getEventInterceptor();
+		if (!interceptor) return;
+		this.#unsub = interceptor.subscribe(discord_js.Events.InteractionCreate, async (interaction) => {
 			var _this$contextData5, _this$unsub;
 			if (!interaction.isButton()) return;
 			const myCustomId = this.customId ?? null;
@@ -238,7 +241,7 @@ var ButtonKit = class extends discord_js.ButtonBuilder {
 };
 
 //#endregion
-//#region src/components/v1/button/Button.ts
+//#region src/components/interactive/button/Button.ts
 /**
 * The button component.
 * @param props The button properties.
@@ -264,7 +267,7 @@ function Button(props) {
 }
 
 //#endregion
-//#region src/components/v1/modal/ModalKit.ts
+//#region src/components/interactive/modal/ModalKit.ts
 /**
 * A builder for creating modals with additional features like interaction collectors and event handling.
 * This class extends the ModalBuilder from discord.js and adds methods for handling interactions.
@@ -389,7 +392,7 @@ var ModalKit = class extends discord_js.ModalBuilder {
 };
 
 //#endregion
-//#region src/components/v1/modal/Modal.ts
+//#region src/components/interactive/modal/Modal.ts
 /**
 * The modal component.
 * @param props The modal properties.
@@ -403,11 +406,8 @@ function Modal(props) {
 	if (props.customId) modal.setCustomId(props.customId);
 	if (props.onSubmit) modal.onSubmit(props.onSubmit, props.options);
 	if (props.children) {
-		const childs = (Array.isArray(props.children) ? props.children : [props.children]).map((c) => {
-			if (c instanceof discord_js.ActionRowBuilder) return c;
-			if (c instanceof discord_js.TextInputBuilder) return new discord_js.ActionRowBuilder().addComponents(c);
-		}).filter((c) => c != null);
-		modal.addComponents(childs);
+		const childs = Array.isArray(props.children) ? props.children : [props.children];
+		modal.components.push(...childs);
 	}
 	if (props.onEnd) modal.onEnd(props.onEnd);
 	if (props.onError) modal.onError(props.onError);
@@ -417,12 +417,19 @@ function Modal(props) {
 * The text input component.
 * @param props The text input properties.
 * @returns The commandkit element.
-* @example <TextInput customId="input" label="Input" style={TextInputStyle.Short} />
+* @example <TextInput customId="input" style={TextInputStyle.Short} />
 */
 function TextInput(props) {
 	const input = new discord_js.TextInputBuilder().setStyle(props.style);
 	if (props.customId) input.setCustomId(props.customId);
-	if (props.label) input.setLabel(props.label);
+	if (props.label) {
+		require_warning.warnDeprecated({
+			what: "Property `label`",
+			where: "<TextInput />",
+			message: "Use the <Label /> component instead."
+		});
+		input.setLabel(props.label);
+	}
 	if (props.placeholder) input.setPlaceholder(props.placeholder);
 	if (props.maxLength) input.setMaxLength(props.maxLength);
 	if (props.minLength) input.setMinLength(props.minLength);
@@ -456,7 +463,7 @@ function ParagraphInput(props) {
 }
 
 //#endregion
-//#region src/components/v1/select-menu/StringSelectMenuKit.ts
+//#region src/components/interactive/select-menu/StringSelectMenuKit.ts
 /**
 * A builder for creating string select menus with additional features like interaction collectors and event handling.
 * This class extends the StringSelectMenuBuilder from discord.js and adds methods for handling interactions.
@@ -581,7 +588,7 @@ var StringSelectMenuKit = class extends discord_js.StringSelectMenuBuilder {
 };
 
 //#endregion
-//#region src/components/v1/select-menu/ChannelSelectMenuKit.ts
+//#region src/components/interactive/select-menu/ChannelSelectMenuKit.ts
 /**
 * A builder for creating channel select menus with additional features like interaction collectors and event handling.
 * This class extends the ChannelSelectMenuBuilder from discord.js and adds methods for handling interactions.
@@ -706,7 +713,7 @@ var ChannelSelectMenuKit = class extends discord_js.ChannelSelectMenuBuilder {
 };
 
 //#endregion
-//#region src/components/v1/select-menu/MentionableSelectMenuKit.ts
+//#region src/components/interactive/select-menu/MentionableSelectMenuKit.ts
 var MentionableSelectMenuKit = class extends discord_js.MentionableSelectMenuBuilder {
 	#onSelectHandler = null;
 	#contextData = {
@@ -826,7 +833,7 @@ var MentionableSelectMenuKit = class extends discord_js.MentionableSelectMenuBui
 };
 
 //#endregion
-//#region src/components/v1/select-menu/UserSelectMenuKit.ts
+//#region src/components/interactive/select-menu/UserSelectMenuKit.ts
 /**
 * A builder for creating user select menus with additional features like interaction collectors and event handling.
 * This class extends the UserSelectMenuBuilder from discord.js and adds methods for handling interactions.
@@ -951,7 +958,7 @@ var UserSelectMenuKit = class extends discord_js.UserSelectMenuBuilder {
 };
 
 //#endregion
-//#region src/components/v1/select-menu/RoleSelectMenuKit.ts
+//#region src/components/interactive/select-menu/RoleSelectMenuKit.ts
 /**
 * A builder for creating role select menus with additional features like interaction collectors and event handling.
 * This class extends the RoleSelectMenuBuilder from discord.js and adds methods for handling interactions.
@@ -1076,7 +1083,7 @@ var RoleSelectMenuKit = class extends discord_js.RoleSelectMenuBuilder {
 };
 
 //#endregion
-//#region src/components/v1/select-menu/SelectMenu.ts
+//#region src/components/interactive/select-menu/SelectMenu.ts
 /**
 * @private
 */
@@ -1250,11 +1257,7 @@ var DefaultLogger = class {
 		this.logger = new console.Console(this.stdout, this.stderr);
 	}
 	_formatTime(date) {
-		const hours = date.getHours().toString().padStart(2, "0");
-		const minutes = date.getMinutes().toString().padStart(2, "0");
-		const seconds = date.getSeconds().toString().padStart(2, "0");
-		const millis = date.getMilliseconds().toString().padStart(3, "0");
-		return `${hours}:${minutes}:${seconds}.${millis}`;
+		return `${date.getHours().toString().padStart(2, "0")}:${date.getMinutes().toString().padStart(2, "0")}:${date.getSeconds().toString().padStart(2, "0")}.${date.getMilliseconds().toString().padStart(3, "0")}`;
 	}
 	_getContext() {
 		const ctx = getContext();
@@ -1830,8 +1833,7 @@ function getSrcDir() {
 */
 function getCurrentDirectory() {
 	if (currentDir) return currentDir;
-	const src = getSrcDir();
-	let root = (0, node_path.join)(require_constants.COMMANDKIT_CWD, src);
+	let root = (0, node_path.join)(require_constants.COMMANDKIT_CWD, getSrcDir());
 	if (!(0, node_fs.existsSync)(root)) root = require_constants.COMMANDKIT_CWD;
 	currentDir = root;
 	return root;
@@ -1888,8 +1890,7 @@ function debounce(fn, ms) {
 		return new Promise((res) => {
 			resolve = res;
 			timer = setTimeout(() => {
-				const result = fn(...args);
-				res(result);
+				res(fn(...args));
 				timer = null;
 				resolve = null;
 			}, ms);
@@ -2294,7 +2295,15 @@ var Context = class Context {
 	*/
 	get commandName() {
 		if (this.isInteraction()) return this.interaction.commandName;
-		else return this.config.messageCommandParser.getCommand();
+		const maybeAlias = this.config.messageCommandParser.getCommand();
+		return this.commandkit.commandHandler.resolveMessageCommandName(maybeAlias);
+	}
+	/**
+	* Gets the invoked command name (could be an alias for message commands)
+	*/
+	get invokedCommandName() {
+		if (this.isInteraction()) return this.interaction.commandName;
+		return this.config.messageCommandParser.getCommand();
 	}
 	/**
 	* Gets the command options based on the execution mode.
@@ -2733,11 +2742,17 @@ var CommandRegistrar = class {
 		return this.commandkit.commandHandler.getCommandsArray().flatMap((cmd) => {
 			const json = "toJSON" in cmd.data.command ? cmd.data.command.toJSON() : cmd.data.command;
 			const __metadata = cmd.metadata ?? cmd.data.metadata;
-			const collections = [{
+			const collections = [];
+			if (cmd.data.chatInput) collections.push({
 				...json,
-				__metadata
-			}];
-			if (cmd.data.userContextMenu && json.type !== discord_js.ApplicationCommandType.User) {
+				type: discord_js.ApplicationCommandType.ChatInput,
+				description: json.description ?? "No command description set.",
+				__metadata,
+				__applyId: (id) => {
+					cmd.discordId = id;
+				}
+			});
+			if (cmd.data.userContextMenu) {
 				var _metadata$nameAliases;
 				collections.push({
 					...json,
@@ -2746,10 +2761,13 @@ var CommandRegistrar = class {
 					options: void 0,
 					description_localizations: void 0,
 					description: void 0,
-					__metadata
+					__metadata,
+					__applyId: (id) => {
+						cmd.discordId = id;
+					}
 				});
 			}
-			if (cmd.data.messageContextMenu && json.type !== discord_js.ApplicationCommandType.Message) {
+			if (cmd.data.messageContextMenu) {
 				var _metadata$nameAliases2;
 				collections.push({
 					...json,
@@ -2758,7 +2776,10 @@ var CommandRegistrar = class {
 					description_localizations: void 0,
 					description: void 0,
 					options: void 0,
-					__metadata
+					__metadata,
+					__applyId: (id) => {
+						cmd.discordId = id;
+					}
 				});
 			}
 			return collections;
@@ -2818,8 +2839,16 @@ var CommandRegistrar = class {
 		try {
 			const data = await this.api.put(discord_js.Routes.applicationCommands(this.commandkit.client.user.id), { body: commands.map((c) => ({
 				...c,
-				__metadata: void 0
+				__metadata: void 0,
+				__applyId: void 0
 			})) });
+			data.forEach((c) => {
+				var _cmd$__applyId;
+				if (!c.id) return;
+				const cmd = commands.find((co) => co.name === c.name && co.type === c.type);
+				if (!cmd) return;
+				(_cmd$__applyId = cmd.__applyId) === null || _cmd$__applyId === void 0 || _cmd$__applyId.call(cmd, c.id);
+			});
 			Logger.info(`✨ Refreshed ${data.length} global application (/) commands`);
 		} catch (e) {
 			Logger.error`Failed to update global application (/) commands: ${e}`;
@@ -2869,8 +2898,16 @@ var CommandRegistrar = class {
 				if (prevented$1) continue;
 				const data = await this.api.put(discord_js.Routes.applicationGuildCommands(this.commandkit.client.user.id, guild), { body: guildCommands.map((b) => ({
 					...b,
-					__metadata: void 0
+					__metadata: void 0,
+					__applyId: void 0
 				})) });
+				data.forEach((c) => {
+					var _cmd$__applyId2;
+					if (!c.id) return;
+					const cmd = commands.find((co) => co.name === c.name && co.type === c.type);
+					if (!cmd) return;
+					(_cmd$__applyId2 = cmd.__applyId) === null || _cmd$__applyId2 === void 0 || _cmd$__applyId2.call(cmd, c.id);
+				});
 				count += data.length;
 			}
 			Logger.info(`✨ Refreshed ${count} guild application (/) commands`);
@@ -3011,8 +3048,7 @@ var AppCommandHandler = class {
 			if (hasChildren) {
 				const children = categoryTree[category].sort();
 				children.forEach((childCategory, idx) => {
-					const childIsLast = idx === children.length - 1;
-					printCategory(childCategory, childIndent, childIsLast, childIndent);
+					printCategory(childCategory, childIndent, idx === children.length - 1, childIndent);
 				});
 			}
 		};
@@ -3029,8 +3065,7 @@ var AppCommandHandler = class {
 			return true;
 		}).sort();
 		topLevelCategories.forEach((category, index) => {
-			const isLast = index === topLevelCategories.length - 1;
-			printCategory(category, "", isLast);
+			printCategory(category, "", index === topLevelCategories.length - 1);
 		});
 	}
 	/**
@@ -3155,6 +3190,15 @@ var AppCommandHandler = class {
 		}
 		return null;
 	}
+	resolveMessageCommandName(name) {
+		for (const [, loadedCommand] of this.loadedCommands) {
+			var _loadedCommand$data$m3;
+			if (loadedCommand.data.command.name === name) return loadedCommand.data.command.name;
+			const aliases = (_loadedCommand$data$m3 = loadedCommand.data.metadata) === null || _loadedCommand$data$m3 === void 0 ? void 0 : _loadedCommand$data$m3.aliases;
+			if (aliases && Array.isArray(aliases) && aliases.includes(name)) return loadedCommand.data.command.name;
+		}
+		return name;
+	}
 	/**
 	* Reloads all commands and middleware from scratch.
 	*/
@@ -3216,8 +3260,7 @@ var AppCommandHandler = class {
 		if (require_constants.COMMANDKIT_IS_DEV) {
 			const commandNames = Array.from(this.loadedCommands.values()).map((v) => v.data.command.name);
 			const aliases = Array.from(this.loadedCommands.values()).flatMap((v) => v.metadata.aliases || []);
-			const allNames = [...commandNames, ...aliases];
-			await require_types_package.rewriteCommandDeclaration(`type CommandTypeData = ${allNames.map((name) => JSON.stringify(name)).join(" | ")}`);
+			await require_types_package.rewriteCommandDeclaration(`type CommandTypeData = ${[...commandNames, ...aliases].map((name) => JSON.stringify(name)).join(" | ")}`);
 		}
 		await this.commandkit.plugins.execute((ctx, plugin) => {
 			return plugin.onAfterCommandsLoad(ctx);
@@ -3252,6 +3295,7 @@ var AppCommandHandler = class {
 		try {
 			if (command.path === null) {
 				this.loadedCommands.set(id, {
+					discordId: null,
 					command,
 					metadata: {
 						guilds: [],
@@ -3259,11 +3303,7 @@ var AppCommandHandler = class {
 						userPermissions: [],
 						botPermissions: []
 					},
-					data: { command: {
-						name: command.name,
-						description: `${command.name} command`,
-						type: 1
-					} }
+					data: { command: { name: command.name } }
 				});
 				return;
 			}
@@ -3279,7 +3319,8 @@ var AppCommandHandler = class {
 				botPermissions: []
 			};
 			const commandName = commandFileData.command.name || command.name;
-			const commandDescription = commandFileData.command.description || `${commandName} command`;
+			let commandDescription = commandFileData.command.description;
+			if (!commandDescription && commandFileData.chatInput) commandDescription = "No command description set.";
 			const updatedCommandData = {
 				...commandFileData.command,
 				name: commandName,
@@ -3302,6 +3343,7 @@ var AppCommandHandler = class {
 			const commandJson = "toJSON" in lastUpdated && typeof lastUpdated.toJSON === "function" ? lastUpdated.toJSON() : lastUpdated;
 			if ("guilds" in commandJson || "aliases" in commandJson) Logger.warn(`Command \`${command.name}\` uses deprecated metadata properties. Please update to use the new \`metadata\` object or \`generateMetadata\` function.`);
 			this.loadedCommands.set(id, {
+				discordId: null,
 				command,
 				metadata: {
 					guilds: commandJson.guilds,
@@ -3877,7 +3919,6 @@ var CommandKit = class CommandKit extends node_events.default {
 	/**
 	* Create a new command and event handler with CommandKit.
 	* @param options - The default CommandKit configuration.
-	* @see {@link https://commandkit.js.org/docs/guide/commandkit-setup}
 	*/
 	constructor(options = {}) {
 		if (CommandKit.instance) process.emitWarning("CommandKit instance already exists. Having multiple instance in same project is discouraged and it may lead to unexpected behavior.", { code: "MultiInstanceWarning" });
@@ -4482,4 +4523,4 @@ Object.defineProperty(exports, 'useStore', {
     return useStore;
   }
 });
-//# sourceMappingURL=commandkit-lhbfAyX9.js.map
+//# sourceMappingURL=commandkit-DabqpQ6v.js.map