commandkit 1.2.0-dev.20250825125304 → 1.2.0-dev.20250826015841

package/dist/{commandkit-CYJ8d2gj.js → commandkit-c0sAaK0G.js}

@@ -1,6 +1,6 @@
 const require_chunk = require('./chunk-nOFOJqeH.js');
 const require_colors = require('./colors-Cd4Oz-r-.js');
-const require_error_codes = require('./error-codes-C-ViHyu-.js');
+const require_error_codes = require('./error-codes-Ds0bnPvT.js');
 const require_element = require('./element-Bak9llw_.js');
 const require_EventInterceptor = require('./EventInterceptor-CQ4PBpBJ.js');
 const require_constants = require('./constants-B5_Ta7PR.js');
@@ -9,10 +9,10 @@ const require_RuntimePlugin = require('./RuntimePlugin-CBgBLXTG.js');
 const require_utils = require('./utils-BnXM4eKk.js');
 const require_resolve_file_url = require('./resolve-file-url-DHTQj2mU.js');
 const require_types_package = require('./types-package-DrnIdWLg.js');
-const require_EventWorkerContext = require('./EventWorkerContext-CSlD9rbx.js');
-const require_signals = require('./signals-DHdYrd-n.js');
-const require_constants$1 = require('./constants-CUND8XkG.js');
-const require_MessageCommandParser = require('./MessageCommandParser-B_BEQ3p8.js');
+const require_constants$1 = require('./constants-DxfYtA6t.js');
+const require_EventWorkerContext = require('./EventWorkerContext-TZIKxVCu.js');
+const require_signals = require('./signals-r7qPAvOR.js');
+const require_MessageCommandParser = require('./MessageCommandParser-TPEPhjvx.js');
 const require_CommandsRouter = require('./CommandsRouter-tMAivEfv.js');
 const require_EventsRouter = require('./EventsRouter-C_J0M3uO.js');
 const require_common = require('./common-DNADUU3_.js');
@@ -66,6 +66,7 @@ function makeContextAwareFunction(env, fn, finalizer) {
 				return result;
 			} catch (e) {
 				if (!require_error_codes.isCommandKitError(e)) env.setExecutionError(e);
+				else throw e;
 			} finally {
 				if (typeof finalizer === "function") setImmediate(async () => {
 					try {
@@ -1290,8 +1291,10 @@ var DefaultLogger = class {
 		const prefix = this._getPrefix(level);
 		const context$1 = this._getContext();
 		const colorFn = TextColorMap[level];
-		if (context$1) this.logger.log(`${prefix}\n${context$1} ${require_colors.colors_default.dim(BoxChars.corner)}`, colorFn(message));
-		else this.logger.log(`${prefix} ${require_colors.colors_default.dim(BoxChars.corner)}`, colorFn(message));
+		let processedMessage = message;
+		if (message instanceof Error) processedMessage = `${message.message}\n${message.stack}`;
+		if (context$1) this.logger.log(`${prefix}\n${context$1} ${require_colors.colors_default.dim(BoxChars.corner)}`, colorFn(processedMessage));
+		else this.logger.log(`${prefix} ${require_colors.colors_default.dim(BoxChars.corner)}`, colorFn(processedMessage));
 	}
 	_logTemplate(level, strings, ...values) {
 		const prefix = this._getPrefix(level);
@@ -1300,10 +1303,15 @@ var DefaultLogger = class {
 		let result = "";
 		for (let i = 0; i < strings.length; i++) {
 			result += strings[i];
-			if (i < values.length) result += (0, util.inspect)(values[i], {
-				colors: require_constants.COMMANDKIT_IS_DEV,
-				depth: 2
-			});
+			if (i < values.length) {
+				const value = values[i];
+				if (value instanceof Error) result += `${value.message}\n${value.stack}`;
+				else if (value !== null && typeof value === "object") result += (0, util.inspect)(value, {
+					colors: true,
+					depth: 2
+				});
+				else result += value;
+			}
 		}
 		if (context$1) this.logger.log(`${prefix}\n${context$1} ${require_colors.colors_default.dim(BoxChars.corner)}`, colorFn(result));
 		else this.logger.log(`${prefix} ${require_colors.colors_default.dim(BoxChars.corner)}`, colorFn(result));
@@ -1606,7 +1614,7 @@ var CompilerPluginRuntime = class {
 				await ((_plugin$activate = plugin.activate) === null || _plugin$activate === void 0 ? void 0 : _plugin$activate.call(plugin, this));
 			});
 		} catch (e) {
-			console.error(`Plugin ${plugin.name} failed to activate with ${(e === null || e === void 0 ? void 0 : e.stack) || e}`);
+			Logger.error`Plugin ${plugin.name} failed to activate with ${e}`;
 		}
 		this.initialized = true;
 	}
@@ -1625,7 +1633,7 @@ var CompilerPluginRuntime = class {
 				await ((_plugin$deactivate = plugin.deactivate) === null || _plugin$deactivate === void 0 ? void 0 : _plugin$deactivate.call(plugin, this));
 			});
 		} catch (e) {
-			console.error(`Plugin ${plugin.name} failed to deactivate with ${(e === null || e === void 0 ? void 0 : e.stack) || e}`);
+			Logger.error`Plugin ${plugin.name} failed to deactivate with ${e}`;
 		}
 		this.initialized = false;
 	}
@@ -2421,37 +2429,11 @@ var Context = class Context {
 		if (this.isMessage()) return this.config.messageCommandParser.getArgs();
 		return [];
 	}
-	/**
-	* Stops upcoming middleware or current command execution.
-	* If this is called inside pre-stage middleware, the next run will be the actual command, skipping all other pre-stage middlewares.
-	* If this is called inside a command itself, it will skip all post-stage middlewares.
-	* If this is called inside post-stage middleware, it will skip all other post-stage middlewares.
-	*/
-	exit() {
-		require_signals.exitMiddleware();
-	}
 };
 /**
 * Extended context class for middleware execution with additional control methods.
 */
 var MiddlewareContext = class extends Context {
-	/**
-	* @private
-	* @internal
-	*/
-	#cancel = false;
-	/**
-	* Whether the command execution was cancelled.
-	*/
-	get cancelled() {
-		return this.#cancel;
-	}
-	/**
-	* Cancels the command execution.
-	*/
-	cancel() {
-		this.#cancel = true;
-	}
 	/**
 	* Sets command runner function to wrap the command execution.
 	* @param fn The function to set.
@@ -2486,6 +2468,7 @@ var AppCommandRunner = class {
 	* Handles the complete command lifecycle including before/after middleware execution.
 	* @param prepared - The prepared command execution data
 	* @param source - The source interaction or message that triggered the command
+	* @param options - The options for running the command
 	*/
 	async runCommand(prepared, source, options) {
 		const { commandkit: commandkit$1 } = this.handler;
@@ -2498,119 +2481,126 @@ var AppCommandRunner = class {
 		env.variables.set("currentCommandName", prepared.command.command.name);
 		env.variables.set("execHandlerKind", executionMode);
 		env.variables.set("customHandler", (options === null || options === void 0 ? void 0 : options.handler) ?? null);
-		const ctx = new MiddlewareContext(commandkit$1, {
-			command: prepared.command,
-			environment: env,
-			executionMode,
-			interaction: !(source instanceof discord_js.Message) ? source : null,
-			message: source instanceof discord_js.Message ? source : null,
-			forwarded: false,
-			customArgs: { setCommandRunner: (fn) => {
-				runCommand = fn;
-			} },
-			messageCommandParser: prepared.messageCommandParser
-		});
-		let middlewaresCanceled = false;
-		if (prepared.middlewares.length) await provideContext(env, async () => {
-			for (const middleware of prepared.middlewares) {
-				if (!middleware.data.beforeExecute) continue;
-				try {
-					await middleware.data.beforeExecute(ctx);
+		try {
+			const middlewareCtx = new MiddlewareContext(commandkit$1, {
+				command: prepared.command,
+				environment: env,
+				executionMode,
+				interaction: !(source instanceof discord_js.Message) ? source : null,
+				message: source instanceof discord_js.Message ? source : null,
+				forwarded: false,
+				customArgs: { setCommandRunner: (fn) => {
+					runCommand = fn;
+				} },
+				messageCommandParser: prepared.messageCommandParser
+			});
+			const beforeMiddlewares = prepared.middlewares.filter((m) => m.data.beforeExecute);
+			let beforeMiddlewaresStopped = false;
+			if (beforeMiddlewares.length) await provideContext(env, async () => {
+				for (const middleware of beforeMiddlewares) try {
+					await middleware.data.beforeExecute(middlewareCtx);
 				} catch (e) {
-					if (require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.ExitMiddleware)) {
-						middlewaresCanceled = true;
-						return;
+					if (require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.StopMiddlewares)) {
+						beforeMiddlewaresStopped = true;
+						Logger.debug(`Middleware propagation stopped for command "${middlewareCtx.commandName}". stopMiddlewares() was called inside a beforeExecute function at "${middleware.middleware.relativePath}"`);
+						break;
 					}
 					if (require_error_codes.isErrorType(e, [require_error_codes.CommandKitErrorCodes.ForwardedCommand, require_error_codes.CommandKitErrorCodes.InvalidCommandPrefix])) continue;
 					throw e;
 				}
-			}
-		});
-		let result;
-		if (!ctx.cancelled) {
-			const targetData = prepared.command.data;
-			const fn = targetData[(options === null || options === void 0 ? void 0 : options.handler) || executionMode];
-			if (!fn) Logger.warn(`Command ${prepared.command.command.name} has no handler for ${executionMode}`);
-			const analytics = commandkit$1.analytics;
-			if (fn) try {
-				const _executeCommand = makeContextAwareFunction(env, async () => {
-					env.registerDeferredFunction(async (env$1) => {
-						var _prepared$command2;
-						env$1.markEnd();
-						const error = env$1.getExecutionError();
-						const marker = env$1.getMarker();
-						const time = `${env$1.getExecutionTime().toFixed(2)}ms`;
-						if (error) {
-							var _prepared$command;
-							Logger.error(`[${marker} - ${time}] Error executing command: ${error.stack || error}`);
-							const commandName$1 = ((_prepared$command = prepared.command) === null || _prepared$command === void 0 || (_prepared$command = _prepared$command.data) === null || _prepared$command === void 0 || (_prepared$command = _prepared$command.command) === null || _prepared$command === void 0 ? void 0 : _prepared$command.name) ?? prepared.command.command.name;
+			});
+			let result;
+			let stopMiddlewaresCalledInCmd = false;
+			if (!beforeMiddlewaresStopped) {
+				const targetData = prepared.command.data;
+				const fn = targetData[(options === null || options === void 0 ? void 0 : options.handler) || executionMode];
+				if (!fn) Logger.warn(`Command ${prepared.command.command.name} has no handler for ${executionMode}`);
+				const analytics = commandkit$1.analytics;
+				if (fn) try {
+					const _executeCommand = makeContextAwareFunction(env, async () => {
+						env.registerDeferredFunction(async (env$1) => {
+							var _prepared$command2;
+							env$1.markEnd();
+							const error = env$1.getExecutionError();
+							const marker = env$1.getMarker();
+							const time = `${env$1.getExecutionTime().toFixed(2)}ms`;
+							if (error) {
+								var _prepared$command;
+								Logger.error`[${marker} - ${time}] Error executing command: ${error}`;
+								const commandName$1 = ((_prepared$command = prepared.command) === null || _prepared$command === void 0 || (_prepared$command = _prepared$command.data) === null || _prepared$command === void 0 || (_prepared$command = _prepared$command.command) === null || _prepared$command === void 0 ? void 0 : _prepared$command.name) ?? prepared.command.command.name;
+								await analytics.track({
+									name: require_constants$1.AnalyticsEvents.COMMAND_EXECUTION,
+									id: commandName$1,
+									data: {
+										error: true,
+										executionTime: env$1.getExecutionTime().toFixed(2),
+										type: executionMode,
+										command: commandName$1
+									}
+								});
+								return;
+							}
+							Logger.info(`[${marker} - ${time}] Command executed successfully`);
+							const commandName = ((_prepared$command2 = prepared.command) === null || _prepared$command2 === void 0 || (_prepared$command2 = _prepared$command2.data) === null || _prepared$command2 === void 0 || (_prepared$command2 = _prepared$command2.command) === null || _prepared$command2 === void 0 ? void 0 : _prepared$command2.name) ?? prepared.command.command.name;
 							await analytics.track({
 								name: require_constants$1.AnalyticsEvents.COMMAND_EXECUTION,
-								id: commandName$1,
+								id: commandName,
 								data: {
-									error: true,
+									error: false,
 									executionTime: env$1.getExecutionTime().toFixed(2),
 									type: executionMode,
-									command: commandName$1
+									command: commandName
 								}
 							});
-							return;
-						}
-						Logger.info(`[${marker} - ${time}] Command executed successfully`);
-						const commandName = ((_prepared$command2 = prepared.command) === null || _prepared$command2 === void 0 || (_prepared$command2 = _prepared$command2.data) === null || _prepared$command2 === void 0 || (_prepared$command2 = _prepared$command2.command) === null || _prepared$command2 === void 0 ? void 0 : _prepared$command2.name) ?? prepared.command.command.name;
-						await analytics.track({
-							name: require_constants$1.AnalyticsEvents.COMMAND_EXECUTION,
-							id: commandName,
-							data: {
-								error: false,
-								executionTime: env$1.getExecutionTime().toFixed(2),
-								type: executionMode,
-								command: commandName
-							}
 						});
+						return fn(middlewareCtx.clone());
+					}, this.#finalizer.bind(this));
+					const executeCommand = runCommand != null ? runCommand(_executeCommand) : _executeCommand;
+					env.markStart(prepared.command.data.command.name);
+					const res = await commandkit$1.plugins.execute(async (ctx, plugin) => {
+						return plugin.executeCommand(ctx, env, source, prepared, executeCommand);
 					});
-					return fn(ctx.clone());
-				}, this.#finalizer.bind(this));
-				const executeCommand = runCommand != null ? runCommand(_executeCommand) : _executeCommand;
-				env.markStart(prepared.command.data.command.name);
-				const res = await commandkit$1.plugins.execute(async (ctx$1, plugin) => {
-					return plugin.executeCommand(ctx$1, env, source, prepared, executeCommand);
-				});
-				if (!res) result = await executeCommand();
-			} catch (e) {
-				if (require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.ExitMiddleware)) middlewaresCanceled = true;
-				if (!require_error_codes.isErrorType(e, [require_error_codes.CommandKitErrorCodes.ForwardedCommand, require_error_codes.CommandKitErrorCodes.ExitMiddleware])) {
-					if (shouldThrowOnError) throw e;
-					Logger.error(e);
+					if (!res) result = await executeCommand();
+				} catch (e) {
+					if (require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.StopMiddlewares)) {
+						stopMiddlewaresCalledInCmd = true;
+						Logger.debug(`Middleware propagation stopped for command "${middlewareCtx.commandName}". stopMiddlewares() was called by the command itself`);
+					} else if (!require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.ForwardedCommand)) {
+						if (shouldThrowOnError) throw e;
+						Logger.error`${e}`;
+					}
 				}
-			}
-		} else result = {
-			error: true,
-			message: "Command execution was cancelled by the middleware."
-		};
-		if (!middlewaresCanceled && prepared.middlewares.length) await provideContext(env, async () => {
-			for (const middleware of prepared.middlewares) {
-				if (!middleware.data.afterExecute) continue;
-				try {
-					await middleware.data.afterExecute(ctx);
+			} else result = {
+				error: true,
+				message: "Command execution was cancelled by a beforeExecute middleware."
+			};
+			const afterMiddlewares = prepared.middlewares.filter((m) => m.data.afterExecute);
+			if (!beforeMiddlewaresStopped && !stopMiddlewaresCalledInCmd && afterMiddlewares.length) await provideContext(env, async () => {
+				for (const middleware of afterMiddlewares) try {
+					await middleware.data.afterExecute(middlewareCtx);
 				} catch (e) {
-					if (require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.ExitMiddleware)) return;
+					if (require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.StopMiddlewares)) {
+						Logger.debug(`Middleware propagation stopped for command "${middlewareCtx.commandName}". stopMiddlewares() was called inside an afterExecute function at "${middleware.middleware.relativePath}"`);
+						break;
+					}
 					throw e;
 				}
-			}
-		});
-		return result;
+			});
+			return result;
+		} finally {
+			await this.#finalizer(env, false);
+		}
 	}
 	/**
 	* @private
 	* @internal
 	* Finalizes command execution by running deferred functions and plugin cleanup.
 	*/
-	async #finalizer() {
-		const env = useEnvironment();
+	async #finalizer(env, runPlugins = true) {
+		env ??= useEnvironment();
 		await env.runDeferredFunctions();
 		env.clearAllDeferredFunctions();
-		await this.handler.commandkit.plugins.execute(async (ctx, plugin) => {
+		if (runPlugins) await this.handler.commandkit.plugins.execute(async (ctx, plugin) => {
 			await plugin.onAfterCommand(ctx, env);
 		});
 	}
@@ -2820,7 +2810,7 @@ async function beforeExecute(ctx) {
 		} catch (error) {
 			Logger.error`Could not send 'Server-only command' DM to user ${(interaction === null || interaction === void 0 ? void 0 : interaction.user.id) ?? (message === null || message === void 0 ? void 0 : message.author.id)} for command ${command.command.name}: ${error}`;
 		}
-		return ctx.cancel();
+		require_signals.stopMiddlewares();
 	}
 	const userPermissions = (interaction === null || interaction === void 0 ? void 0 : interaction.memberPermissions) ?? (message === null || message === void 0 || (_message$member = message.member) === null || _message$member === void 0 ? void 0 : _message$member.permissions);
 	let userPermissionsRequired = ((_command$metadata = command.metadata) === null || _command$metadata === void 0 ? void 0 : _command$metadata.userPermissions) ?? [];
@@ -2870,7 +2860,7 @@ async function beforeExecute(ctx) {
 	} catch (error) {
 		Logger.error`Could not send 'Not enough permissions' reply to user ${(interaction === null || interaction === void 0 ? void 0 : interaction.user.id) ?? (message === null || message === void 0 ? void 0 : message.author.id)} for command ${command.command.name}: ${error}`;
 	}
-	return ctx.cancel();
+	require_signals.stopMiddlewares();
 }
 
 //#endregion
@@ -3082,7 +3072,7 @@ var AppCommandHandler = class {
 				var _loadedCommand$metada, _loadedCommand$metada2, _json$options;
 				const loadedCommand$1 = this.findCommandByName(command);
 				if (!loadedCommand$1) {
-					if (require_constants.COMMANDKIT_IS_DEV && this.commandkit.config.showUnknownPrefixCommandsWarning) Logger.error(`Prefix command "${command}" was not found.\nNote: This warning is only shown in development mode as an alert to help you find the command. If you wish to remove this warning, set \`showUnknownPrefixCommandsWarning\` to \`false\` in your commandkit config.`);
+					if (require_constants.COMMANDKIT_IS_DEV && this.commandkit.config.showUnknownPrefixCommandsWarning) Logger.error`Prefix command "${command}" was not found.\nNote: This warning is only shown in development mode as an alert to help you find the command. If you wish to remove this warning, set \`showUnknownPrefixCommandsWarning\` to \`false\` in your commandkit config.`;
 					return null;
 				}
 				if (source.guildId && ((_loadedCommand$metada = loadedCommand$1.metadata) === null || _loadedCommand$metada === void 0 || (_loadedCommand$metada = _loadedCommand$metada.guilds) === null || _loadedCommand$metada === void 0 ? void 0 : _loadedCommand$metada.length) && !((_loadedCommand$metada2 = loadedCommand$1.metadata) === null || _loadedCommand$metada2 === void 0 ? void 0 : _loadedCommand$metada2.guilds.includes(source.guildId))) return null;
@@ -3098,7 +3088,7 @@ var AppCommandHandler = class {
 				cmdName = parts[0];
 			} catch (e) {
 				if (require_error_codes.isErrorType(e, require_error_codes.CommandKitErrorCodes.InvalidCommandPrefix)) return null;
-				Logger.error(e);
+				Logger.error`${e}`;
 				return null;
 			}
 		} else {
@@ -3383,7 +3373,7 @@ var AppEventsHandler = class {
 			const listeners = [];
 			for (const listener of event.listeners) {
 				const handler = await import(require_resolve_file_url.toFileURL(listener, true));
-				if (!handler.default || typeof handler.default !== "function") Logger.error(`Event handler for ${event.event}${event.namespace ? ` of namespace ${event.namespace}` : ""} does not have a default export or is not a function`);
+				if (!handler.default || typeof handler.default !== "function") Logger.error`Event handler for ${event.event}${event.namespace ? ` of namespace ${event.namespace}` : ""} does not have a default export or is not a function`;
 				listeners.push({
 					handler: handler.default,
 					once: !!handler.once
@@ -3915,7 +3905,7 @@ var CommandKit = class CommandKit extends node_events.default {
 			registerDevHooks(this);
 			await require_types_package.generateTypesPackage();
 		} catch (e) {
-			if (process.env.COMMANDKIT_DEBUG_TYPEGEN) Logger.error(e);
+			if (process.env.COMMANDKIT_DEBUG_TYPEGEN) Logger.error`${e}`;
 		}
 		await this.loadPlugins();
 		await this.#init();
@@ -4472,4 +4462,4 @@ Object.defineProperty(exports, 'useEnvironment', {
     return useEnvironment;
   }
 });
-//# sourceMappingURL=commandkit-CYJ8d2gj.js.map
+//# sourceMappingURL=commandkit-c0sAaK0G.js.map