chrxmaticc-framework 1.2.0 → 1.2.1

package/core/ChrxCommandBuilder.js

@@ -1,13 +1,10 @@
 /**
  * core/ChrxCommandBuilder.js
  * Simple command builder — write a command in 10 lines.
- * Handles SlashCommandBuilder, option types, and plugin injection automatically.
  */
 
 const { SlashCommandBuilder, PermissionFlagsBits } = require("discord.js");
 
-// ── Option type map ───────────────────────────────────────────────────────
-// Write "user" instead of ApplicationCommandOptionType.User etc.
 const TYPE_MAP = {
   string:      "addStringOption",
   number:      "addNumberOption",
@@ -21,23 +18,6 @@ const TYPE_MAP = {
 };
 
 class ChrxCommandBuilder {
-  /**
-   * @param {object} options
-   * @param {string}   options.name                  Command name (lowercase, no spaces)
-   * @param {string}   options.description            Command description
-   * @param {object[]} [options.options]              Command options/arguments
-   * @param {string}   options.options[].name         Option name
-   * @param {string}   options.options[].description  Option description
-   * @param {string}   options.options[].type         Option type — "string" | "number" | "integer" | "boolean" | "user" | "channel" | "role" | "mentionable" | "attachment"
-   * @param {boolean}  [options.options[].required]   Whether option is required (default: false)
-   * @param {Array}    [options.options[].choices]     Choices array [{ name, value }]
-   * @param {string}   [options.category]             Category label for help menus
-   * @param {string}   [options.permission]           Required permission e.g. "BanMembers"
-   * @param {boolean}  [options.ownerOnly]            Restrict to bot owner
-   * @param {boolean}  [options.guildOnly]            Restrict to guilds only (default: true)
-   * @param {number}   [options.cooldown]             Cooldown in seconds
-   * @param {Function} options.run                    Command function (interaction, plugins) => void
-   */
   constructor(options = {}) {
     if (!options.name)        throw new Error("[ChrxCommand] name is required.");
     if (!options.description) throw new Error("[ChrxCommand] description is required.");
@@ -46,7 +26,6 @@ class ChrxCommandBuilder {
     this._options   = options;
     this._cooldowns = new Map();
 
-    // ── Build SlashCommandBuilder ─────────────────────────────────────────
     const builder = new SlashCommandBuilder()
       .setName(options.name)
       .setDescription(options.description);
@@ -59,7 +38,6 @@ class ChrxCommandBuilder {
       builder.setDMPermission(false);
     }
 
-    // ── Add options ───────────────────────────────────────────────────────
     for (const opt of options.options ?? []) {
       const method = TYPE_MAP[opt.type ?? "string"];
       if (!method) throw new Error(`[ChrxCommand] Unknown option type: "${opt.type}"`);
@@ -67,43 +45,36 @@ class ChrxCommandBuilder {
       builder[method]((o) => {
         o.setName(opt.name).setDescription(opt.description);
         if (opt.required) o.setRequired(true);
-        if (opt.choices && (opt.type === "string" || opt.type === "integer" || opt.type === "number")) {
+        if (opt.choices && ["string", "integer", "number"].includes(opt.type)) {
           o.addChoices(...opt.choices);
         }
         return o;
       });
     }
 
-    this.data = builder;
+    // ── Critical: expose data and execute so CommandLoader + deploy-commands picks it up ──
+    this.data    = builder;
+    this.execute = this._execute.bind(this);
   }
 
-  /**
-   * Called by CommandLoader automatically.
-   * Handles cooldowns, permissions, ownerOnly, then calls run().
-   */
-  async execute(interaction) {
+  async _execute(interaction) {
     const client = interaction.client;
     const opts   = this._options;
 
-    // ── Guild only ────────────────────────────────────────────────────────
     if (opts.guildOnly !== false && !interaction.guild) {
       return interaction.reply({ content: "❌ This command can only be used in a server.", ephemeral: true });
     }
 
-    // ── Owner only ────────────────────────────────────────────────────────
     if (opts.ownerOnly && interaction.user.id !== process.env.OWNER_ID) {
       return interaction.reply({ content: "❌ This command is restricted to the bot owner.", ephemeral: true });
     }
 
-    // ── Permission check ──────────────────────────────────────────────────
     if (opts.permission) {
-      const member = interaction.member;
-      if (!member?.permissions.has(PermissionFlagsBits[opts.permission])) {
+      if (!interaction.member?.permissions.has(PermissionFlagsBits[opts.permission])) {
         return interaction.reply({ content: `❌ You need the **${opts.permission}** permission to use this.`, ephemeral: true });
       }
     }
 
-    // ── Cooldown ──────────────────────────────────────────────────────────
     if (opts.cooldown) {
       const key = `${interaction.user.id}-${opts.name}`;
       const now = Date.now();
@@ -120,8 +91,6 @@ class ChrxCommandBuilder {
       setTimeout(() => this._cooldowns.delete(key), opts.cooldown * 1000);
     }
 
-    // ── Inject plugins from client ────────────────────────────────────────
-    // Plugins are attached to client.chrx.* if using ChrxClient
     const plugins = {
       economy:    client.chrx?.economy,
       moderation: client.chrx?.moderation,
@@ -137,12 +106,11 @@ class ChrxCommandBuilder {
       db:         client.db,
     };
 
-    // ── Run ───────────────────────────────────────────────────────────────
     try {
       await opts.run(interaction, plugins);
     } catch (err) {
       console.error(`[ChrxCommand] Error in /${opts.name}:`, err);
-      const msg = { content: "❌ Something went wrong running this command.", ephemeral: true };
+      const msg = { content: err.message || "❌ Something went wrong running this command.", ephemeral: true };
       if (interaction.replied || interaction.deferred) {
         interaction.followUp(msg).catch(() => {});
       } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chrxmaticc-framework",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A batteries-included Discord bot framework with music, AI, XP and database support.",
   "main": "index.js",
   "files": [