stoatx 0.2.1 → 0.4.0

package/dist/index.mjs

@@ -3,9 +3,10 @@ import "reflect-metadata";
 
 // src/decorators/keys.ts
 var METADATA_KEYS = {
-  IS_STOAT_CLASS: /* @__PURE__ */ Symbol("mally:stoat:isClass"),
-  SIMPLE_COMMANDS: /* @__PURE__ */ Symbol("mally:stoat:simpleCommands"),
-  GUARDS: "mally:command:guards"
+  IS_STOAT_CLASS: /* @__PURE__ */ Symbol("stoatx:stoat:isClass"),
+  SIMPLE_COMMANDS: /* @__PURE__ */ Symbol("stoatx:stoat:simpleCommands"),
+  GUARDS: "stoatx:command:guards",
+  EVENTS: /* @__PURE__ */ Symbol("stoatx:stoat:events")
 };
 
 // src/decorators/store.ts
@@ -116,6 +117,31 @@ function getGuards(target) {
   return Reflect.getMetadata(METADATA_KEYS.GUARDS, target) || [];
 }
 
+// src/decorators/Events.ts
+import "reflect-metadata";
+function createEventDecorator(event, type) {
+  return (target, propertyKey, descriptor) => {
+    const constructor = target.constructor;
+    const existingEvents = Reflect.getMetadata(METADATA_KEYS.EVENTS, constructor) || [];
+    existingEvents.push({
+      methodName: String(propertyKey),
+      event,
+      type
+    });
+    Reflect.defineMetadata(METADATA_KEYS.EVENTS, existingEvents, constructor);
+    return descriptor;
+  };
+}
+function On(event) {
+  return createEventDecorator(event, "on");
+}
+function Once(event) {
+  return createEventDecorator(event, "once");
+}
+function getEventsMetadata(target) {
+  return Reflect.getMetadata(METADATA_KEYS.EVENTS, target) || [];
+}
+
 // src/decorators/utils.ts
 function buildSimpleCommandMetadata(options, methodName, category) {
   return {
@@ -139,6 +165,7 @@ var _CommandRegistry = class _CommandRegistry {
   constructor(extensions = [".js", ".mjs", ".cjs"]) {
     this.commands = /* @__PURE__ */ new Map();
     this.aliases = /* @__PURE__ */ new Map();
+    this.registeredEvents = [];
     this.processedStoatClasses = /* @__PURE__ */ new Set();
     this.extensions = extensions;
   }
@@ -162,7 +189,7 @@ var _CommandRegistry = class _CommandRegistry {
         await this.loadFile(file, directory);
       }
     }
-    console.log(`[Mally] Loaded ${this.commands.size} command(s)`);
+    console.log(`[Stoatx] Loaded ${this.commands.size} command(s) and ${this.registeredEvents.length} event(s)`);
   }
   /**
    * Auto-discover command files across one or more roots.
@@ -190,7 +217,7 @@ var _CommandRegistry = class _CommandRegistry {
       }) ?? roots[0];
       await this.loadFile(file, baseDir);
     }
-    console.log(`[Mally] Auto-discovered ${candidateFiles} candidate file(s), loaded ${this.commands.size} command(s)`);
+    console.log(`[Stoatx] Loaded ${this.commands.size} command(s) and ${this.registeredEvents.length} event(s)`);
   }
   getDefaultAutoDiscoveryPatterns() {
     return this.extensions.map((ext) => `**/*${ext}`);
@@ -198,7 +225,7 @@ var _CommandRegistry = class _CommandRegistry {
   async isLikelyCommandModule(filePath) {
     try {
       const source = await fs.readFile(filePath, "utf8");
-      return source.includes("Stoat") || source.includes("SimpleCommand") || source.includes("Command") || source.includes("mally:command");
+      return source.includes("Stoat") || source.includes("SimpleCommand") || source.includes("Command") || source.includes("stoatx:command");
     } catch {
       return true;
     }
@@ -209,7 +236,7 @@ var _CommandRegistry = class _CommandRegistry {
   register(instance, metadata, classConstructor, methodName) {
     const name = metadata.name.toLowerCase();
     if (this.commands.has(name)) {
-      console.warn(`[Mally] Duplicate command name: ${name}. Skipping...`);
+      console.warn(`[Stoatx] Duplicate command name: ${name}. Skipping...`);
       return;
     }
     this.validateGuards(classConstructor, metadata.name);
@@ -217,7 +244,7 @@ var _CommandRegistry = class _CommandRegistry {
     for (const alias of metadata.aliases) {
       const aliasLower = alias.toLowerCase();
       if (this.aliases.has(aliasLower) || this.commands.has(aliasLower)) {
-        console.warn(`[Mally] Duplicate alias: ${aliasLower}. Skipping...`);
+        console.warn(`[Stoatx] Duplicate alias: ${aliasLower}. Skipping...`);
         continue;
       }
       this.aliases.set(aliasLower, name);
@@ -250,6 +277,12 @@ var _CommandRegistry = class _CommandRegistry {
   getAllMetadata() {
     return this.getAll().map((c) => c.metadata);
   }
+  /**
+   * Get all registered events
+   */
+  getEvents() {
+    return this.registeredEvents;
+  }
   /**
    * Get commands grouped by category
    */
@@ -269,6 +302,7 @@ var _CommandRegistry = class _CommandRegistry {
   clear() {
     this.commands.clear();
     this.aliases.clear();
+    this.registeredEvents.length = 0;
     this.processedStoatClasses.clear();
   }
   /**
@@ -296,20 +330,20 @@ var _CommandRegistry = class _CommandRegistry {
    * @private
    */
   validateGuards(commandClass, commandName) {
-    const guards = Reflect.getMetadata("mally:command:guards", commandClass) || [];
+    const guards = Reflect.getMetadata("stoatx:command:guards", commandClass) || [];
     for (const GuardClass of guards) {
       const guardInstance = new GuardClass();
       if (typeof guardInstance.run !== "function") {
         console.error(
-          `[Mally] FATAL: Guard "${GuardClass.name}" on command "${commandName}" does not have a run() method.`
+          `[Stoatx] FATAL: Guard "${GuardClass.name}" on command "${commandName}" does not have a run() method.`
         );
         process.exit(1);
       }
       if (typeof guardInstance.guardFail !== "function") {
         console.error(
-          `[Mally] FATAL: Guard "${GuardClass.name}" on command "${commandName}" does not have a guardFail() method.`
+          `[Stoatx] FATAL: Guard "${GuardClass.name}" on command "${commandName}" does not have a guardFail() method.`
         );
-        console.error(`[Mally] All guards must implement guardFail() to handle failed checks.`);
+        console.error(`[Stoatx] All guards must implement guardFail() to handle failed checks.`);
         process.exit(1);
       }
     }
@@ -330,15 +364,16 @@ var _CommandRegistry = class _CommandRegistry {
         this.registerStoatClassCommands(stoatClass, stoatInstance, filePath, baseDir);
       }
     } catch (error) {
-      console.error(`[Mally] Failed to load command file: ${filePath}`, error);
+      console.error(`[Stoatx] Failed to load command file: ${filePath}`, error);
     }
   }
   registerStoatClassCommands(stoatClass, instance, filePath, baseDir) {
     const simpleCommands = getSimpleCommands(stoatClass);
+    const events = getEventsMetadata(stoatClass);
     const category = this.getCategoryFromPath(filePath, baseDir);
-    if (simpleCommands.length === 0) {
+    if (simpleCommands.length === 0 && events.length === 0) {
       console.warn(
-        `[Mally] Class ${stoatClass.name} is decorated with @Stoat but has no @SimpleCommand methods. Skipping...`
+        `[Stoatx] Class ${stoatClass.name} is decorated with @Stoat but has no @SimpleCommand, @On or @Once methods. Skipping...`
       );
       this.processedStoatClasses.add(stoatClass);
       return;
@@ -346,12 +381,25 @@ var _CommandRegistry = class _CommandRegistry {
     for (const cmdDef of simpleCommands) {
       const method = instance[cmdDef.methodName];
       if (typeof method !== "function") {
-        console.warn(`[Mally] Method ${cmdDef.methodName} not found on ${stoatClass.name}. Skipping...`);
+        console.warn(`[Stoatx] Method ${cmdDef.methodName} not found on ${stoatClass.name}. Skipping...`);
         continue;
       }
       const metadata = buildSimpleCommandMetadata(cmdDef.options, cmdDef.methodName, category);
       this.register(instance, metadata, stoatClass, cmdDef.methodName);
     }
+    for (const eventDef of events) {
+      const method = instance[eventDef.methodName];
+      if (typeof method !== "function") {
+        console.warn(`[Stoatx] Method ${eventDef.methodName} not found on ${stoatClass.name}. Skipping...`);
+        continue;
+      }
+      this.registeredEvents.push({
+        instance,
+        methodName: eventDef.methodName,
+        event: eventDef.event,
+        type: eventDef.type
+      });
+    }
     this.processedStoatClasses.add(stoatClass);
   }
   /**
@@ -377,7 +425,23 @@ var CommandRegistry = _CommandRegistry;
 
 // src/handler.ts
 import "reflect-metadata";
-var MallyHandler = class {
+import { Client as StoatClient } from "stoat.js";
+var Client = class extends StoatClient {
+  constructor(options) {
+    super();
+    this.handler = new StoatxHandler({ ...options, client: this });
+    this.on("messageCreate", async (message) => {
+      await this.handler.handle(message);
+    });
+  }
+  /**
+   * Initialize the StoatxHandler commands
+   */
+  async initCommands() {
+    await this.handler.init();
+  }
+};
+var StoatxHandler = class {
   constructor(options) {
     this.cooldowns = /* @__PURE__ */ new Map();
     this.client = options.client;
@@ -394,9 +458,33 @@ var MallyHandler = class {
   async init() {
     if (this.commandsDir) {
       await this.registry.loadFromDirectory(this.commandsDir);
-      return;
+    } else {
+      await this.registry.autoDiscover(this.discoveryOptions);
+    }
+    this.attachEvents();
+  }
+  /**
+   * Attach registered events to the client
+   */
+  attachEvents() {
+    const events = this.registry.getEvents();
+    for (const eventDef of events) {
+      const handler = async (...args) => {
+        try {
+          await eventDef.instance[eventDef.methodName](...args, this.client);
+        } catch (error) {
+          console.error(
+            `[Stoatx] Event Handler Error in @${eventDef.type === "on" ? "On" : "Once"}('${eventDef.event}'):`,
+            error
+          );
+        }
+      };
+      if (eventDef.type === "once") {
+        this.client.once(eventDef.event, handler);
+      } else {
+        this.client.on(eventDef.event, handler);
+      }
     }
-    await this.registry.autoDiscover(this.discoveryOptions);
   }
   /**
    * Parse a raw message into command context
@@ -463,7 +551,7 @@ var MallyHandler = class {
     const channelId = message.channel.id;
     const serverId = message.server?.id;
     const reply = async (content) => {
-      await message.channel.sendMessage(content);
+      return await message.channel.sendMessage(content);
     };
     return this.handleMessage(rawContent, message, {
       authorId,
@@ -508,7 +596,7 @@ var MallyHandler = class {
       await ctx.reply("This command is owner-only.");
       return false;
     }
-    const guards = Reflect.getMetadata("mally:command:guards", classConstructor) || [];
+    const guards = Reflect.getMetadata("stoatx:command:guards", classConstructor) || [];
     for (const guardClass of guards) {
       const guardInstance = new guardClass();
       if (typeof guardInstance.run === "function") {
@@ -517,7 +605,7 @@ var MallyHandler = class {
           if (typeof guardInstance.guardFail === "function") {
             await guardInstance.guardFail(ctx);
           } else {
-            console.error("[Mally] Guard check failed but no guardFail method defined on", guardClass.name);
+            console.error("[Stoatx] Guard check failed but no guardFail method defined on", guardClass.name);
           }
           return false;
         }
@@ -542,7 +630,7 @@ var MallyHandler = class {
       if (typeof instance.onError === "function") {
         await instance.onError(ctx, error);
       } else {
-        console.error(`[Mally] Error in command ${metadata.name}:`, error);
+        console.error(`[Stoatx] Error in command ${metadata.name}:`, error);
         await ctx.reply(`An error occurred: ${error.message}`);
       }
       return false;
@@ -638,13 +726,16 @@ var MallyHandler = class {
   }
 };
 export {
+  Client,
   CommandRegistry,
   Guard,
   METADATA_KEYS,
-  MallyHandler,
+  On,
+  Once,
   SimpleCommand,
   Stoat,
   buildSimpleCommandMetadata,
+  getEventsMetadata,
   getGuards,
   getSimpleCommands,
   isStoatClass

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stoatx",
-  "version": "0.2.1",
+  "version": "0.4.0",
   "description": "A high-performance, decorator-based command handler for the Stoat ecosystem.",
   "repository": {
     "type": "git",
@@ -23,16 +23,10 @@
   "files": [
     "dist"
   ],
-  "license": "AGPL-3.0-or-later",
+  "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
-  "scripts": {
-    "build": "tsup src/index.ts --format cjs,esm --dts",
-    "dev": "tsup src/index.ts --format cjs,esm --watch --dts",
-    "lint": "eslint src/**/*.ts",
-    "format": "prettier --write src/**/*.ts"
-  },
   "dependencies": {
     "reflect-metadata": "^0.2.2",
     "stoat.js": "^7.3.6",
@@ -46,5 +40,10 @@
   },
   "peerDependencies": {
     "reflect-metadata": "^0.2.0"
+  },
+  "scripts": {
+    "build": "tsup src/index.ts --format cjs,esm --dts --tsconfig tsconfig.build.json",
+    "dev": "tsup src/index.ts --format cjs,esm --watch --dts --tsconfig tsconfig.build.json",
+    "lint": "eslint src/**/*.ts"
   }
-}
+}