commandkit 1.2.4 → 1.2.6

package/dist/{commandkit-5cCZPGBF.js → commandkit-Ck5bsJYv.js}

@@ -1138,7 +1138,7 @@ var MacroPlugin = class extends require_plugins_CompilerPlugin.CompilerPlugin {
 		if (!this.options.enabled) return null;
 		if (/\.json$/.test(params.id)) return null;
 		if (!params.code.includes("use macro")) return null;
-		const { contents } = await this.macroTransformer.transform(params.code, params.id);
+		const { code: contents } = await this.macroTransformer.transform(params.code, params.id);
 		return {
 			code: typeof contents === "string" ? contents : new TextDecoder().decode(contents),
 			map: null
@@ -2071,11 +2071,15 @@ var CommandRegistrar = class {
 			const applyId = (id) => {
 				cmd.discordId = id;
 			};
-			if (isPreGeneratedCtx || isContextMenuType) return [{
-				...json,
-				__metadata,
-				__applyId: applyId
-			}];
+			if (isPreGeneratedCtx || isContextMenuType) {
+				const hasMatchingPreGeneratedContextMenu = json.type === discord_js.ApplicationCommandType.User && commandIds.has(`${cmd.command.id}::user-ctx`) || json.type === discord_js.ApplicationCommandType.Message && commandIds.has(`${cmd.command.id}::message-ctx`);
+				if (!isPreGeneratedCtx && hasMatchingPreGeneratedContextMenu) return [];
+				return [{
+					...json,
+					__metadata,
+					__applyId: applyId
+				}];
+			}
 			const collections = [];
 			const hasPreGeneratedUserContextMenu = commandIds.has(`${cmd.command.id}::user-ctx`);
 			const hasPreGeneratedMessageContextMenu = commandIds.has(`${cmd.command.id}::message-ctx`);
@@ -2478,9 +2482,24 @@ var AppCommandHandler = class {
 	printBanner() {
 		var _this$commandkit$comm;
 		const uncategorized = crypto.randomUUID();
-		const flatCommands = this.getCommandsArray();
+		const loadedFlatCommands = this.getCommandsArray();
+		const loadedCommandIds = new Set(loadedFlatCommands.map((cmd) => cmd.command.id));
+		const flatCommands = loadedFlatCommands.filter((cmd) => {
+			const type = cmd.data.command.type;
+			const generatedUserContextMenu = loadedCommandIds.has(`${cmd.command.id}::user-ctx`);
+			const generatedMessageContextMenu = loadedCommandIds.has(`${cmd.command.id}::message-ctx`);
+			const hasMatchingGeneratedContextMenu = type === discord_js.ApplicationCommandType.User && generatedUserContextMenu || type === discord_js.ApplicationCommandType.Message && generatedMessageContextMenu;
+			const hasOnlyContextMenuHandlers = !cmd.data.chatInput && !cmd.data.message && (cmd.data.userContextMenu || cmd.data.messageContextMenu);
+			const isInferredContextMenuPlaceholder = type !== discord_js.ApplicationCommandType.User && type !== discord_js.ApplicationCommandType.Message && hasOnlyContextMenuHandlers && (generatedUserContextMenu || generatedMessageContextMenu);
+			return !hasMatchingGeneratedContextMenu && !isInferredContextMenuPlaceholder;
+		});
 		const treeNodes = Array.from(((_this$commandkit$comm = this.commandkit.commandsRouter) === null || _this$commandkit$comm === void 0 ? void 0 : _this$commandkit$comm.getData().treeNodes.values()) ?? []);
-		const hierarchicalRoots = treeNodes.filter((n) => n.kind === "command" && n.source !== "root");
+		const hierarchicalRoots = treeNodes.filter((node) => {
+			if (node.kind !== "command" || node.source === "root") return false;
+			const loadedNode = this.hierarchicalNodes.get(node.id);
+			const hasOnlyContextMenuHandlers = loadedNode && !loadedNode.data.chatInput && !loadedNode.data.message && (loadedNode.data.userContextMenu || loadedNode.data.messageContextMenu);
+			return !(node.executable && hasOnlyContextMenuHandlers);
+		});
 		const totalCount = flatCommands.length + hierarchicalRoots.length;
 		console.log(require_utils_colors.default.green(`Loaded ${require_utils_colors.default.magenta(totalCount.toString())} commands:`));
 		const printHierarchicalNode = (nodeId, prefix, indent) => {
@@ -2548,8 +2567,10 @@ var AppCommandHandler = class {
 			bucket.flat.forEach((cmd) => {
 				const cmdPrefix = entryIndex === totalEntries - 1 && !hasChildren ? "└─" : "├─";
 				const name = cmd.data.command.name;
+				const contextMenuType = cmd.data.command.type;
+				const contextMenuLabel = contextMenuType === discord_js.ApplicationCommandType.User ? require_utils_colors.default.cyan(" [user context menu]") : contextMenuType === discord_js.ApplicationCommandType.Message ? require_utils_colors.default.cyan(" [message context menu]") : "";
 				const middlewareIcon = cmd.command.middlewares.length > 0 ? require_utils_colors.default.magenta(" (λ)") : "";
-				console.log(`${require_utils_colors.default.green(`${cmdIndent}${cmdPrefix}`)} ${require_utils_colors.default.yellow(name)}${middlewareIcon}`);
+				console.log(`${require_utils_colors.default.green(`${cmdIndent}${cmdPrefix}`)} ${require_utils_colors.default.yellow(name)}${contextMenuLabel}${middlewareIcon}`);
 				entryIndex++;
 			});
 			bucket.hierarchical.forEach((root) => {
@@ -5062,7 +5083,7 @@ var CommandKit = class CommandKit extends node_events.default {
 		try {
 			const json = await (0, node_fs_promises.readFile)(artifactPath, "utf8");
 			const parsed = JSON.parse(json);
-			if (!require_app_router_TreeArtifact.validateRouterTreeArtifact(parsed, "1.2.4")) {
+			if (!require_app_router_TreeArtifact.validateRouterTreeArtifact(parsed, "1.2.6")) {
 				Logger.warn(`Ignoring router tree artifact at ${artifactPath}: schema/version mismatch. Falling back to dynamic filesystem resolution.`);
 				return false;
 			}
@@ -5693,4 +5714,4 @@ Object.defineProperty(exports, "useStore", {
     return useStore;
   }
 });
-//# sourceMappingURL=commandkit-5cCZPGBF.js.map
+//# sourceMappingURL=commandkit-Ck5bsJYv.js.map