stoatx 0.4.0 → 0.5.1

package/dist/index.d.mts

@@ -1,4 +1,5 @@
-import { Client as Client$1, Message } from 'stoat.js';
+import { Client as Client$1, Message } from '@stoatx/client';
+export * from '@stoatx/client';
 
 /**
  * Permission types for commands
@@ -469,7 +470,7 @@ declare class StoatxHandler {
      * });
      * ```
      */
-    handle(message: any): Promise<boolean>;
+    handle(message: Message): Promise<boolean>;
     /**
      * Handle a raw message string with metadata
      *

package/dist/index.d.ts

@@ -1,4 +1,5 @@
-import { Client as Client$1, Message } from 'stoat.js';
+import { Client as Client$1, Message } from '@stoatx/client';
+export * from '@stoatx/client';
 
 /**
  * Permission types for commands
@@ -469,7 +470,7 @@ declare class StoatxHandler {
      * });
      * ```
      */
-    handle(message: any): Promise<boolean>;
+    handle(message: Message): Promise<boolean>;
     /**
      * Handle a raw message string with metadata
      *

package/dist/index.js

@@ -17,6 +17,7 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
   // If the importer is in node compatibility mode or this is not an ESM
   // file that has been converted to a CommonJS file using a Babel-
@@ -59,13 +60,14 @@ var METADATA_KEYS = {
 
 // src/decorators/store.ts
 var DecoratorStore = class _DecoratorStore {
+  static instance;
+  /** Stoat classes with their SimpleCommand methods */
+  stoatClasses = /* @__PURE__ */ new Map();
+  /** Registered commands from @Stoat/@SimpleCommand decorators */
+  commands = [];
+  /** Whether the store has been initialized */
+  initialized = false;
   constructor() {
-    /** Stoat classes with their SimpleCommand methods */
-    this.stoatClasses = /* @__PURE__ */ new Map();
-    /** Registered commands from @Stoat/@SimpleCommand decorators */
-    this.commands = [];
-    /** Whether the store has been initialized */
-    this.initialized = false;
   }
   static getInstance() {
     if (!_DecoratorStore.instance) {
@@ -209,12 +211,20 @@ var path = __toESM(require("path"));
 var fs = __toESM(require("fs/promises"));
 var import_node_url = require("url");
 var import_tinyglobby = require("tinyglobby");
-var _CommandRegistry = class _CommandRegistry {
+var CommandRegistry = class _CommandRegistry {
+  static DEFAULT_AUTO_DISCOVERY_IGNORES = [
+    "**/node_modules/**",
+    "**/.git/**",
+    "**/*.d.ts",
+    "**/*.test.*",
+    "**/*.spec.*"
+  ];
+  commands = /* @__PURE__ */ new Map();
+  aliases = /* @__PURE__ */ new Map();
+  registeredEvents = [];
+  extensions;
+  processedStoatClasses = /* @__PURE__ */ new Set();
   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;
   }
   /**
@@ -273,7 +283,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("stoatx:command");
+      return source.includes("Stoat") || source.includes("SimpleCommand") || source.includes("stoatx:command");
     } catch {
       return true;
     }
@@ -462,19 +472,12 @@ var _CommandRegistry = class _CommandRegistry {
     return void 0;
   }
 };
-_CommandRegistry.DEFAULT_AUTO_DISCOVERY_IGNORES = [
-  "**/node_modules/**",
-  "**/.git/**",
-  "**/*.d.ts",
-  "**/*.test.*",
-  "**/*.spec.*"
-];
-var CommandRegistry = _CommandRegistry;
 
 // src/handler.ts
 var import_reflect_metadata5 = require("reflect-metadata");
-var import_stoat = require("stoat.js");
-var Client = class extends import_stoat.Client {
+var import_client = require("@stoatx/client");
+var Client = class extends import_client.Client {
+  handler;
   constructor(options) {
     super();
     this.handler = new StoatxHandler({ ...options, client: this });
@@ -490,8 +493,15 @@ var Client = class extends import_stoat.Client {
   }
 };
 var StoatxHandler = class {
+  commandsDir;
+  discoveryOptions;
+  prefixResolver;
+  owners;
+  registry;
+  cooldowns = /* @__PURE__ */ new Map();
+  disableMentionPrefix;
+  client;
   constructor(options) {
-    this.cooldowns = /* @__PURE__ */ new Map();
     this.client = options.client;
     this.commandsDir = options.commandsDir;
     this.discoveryOptions = options.discovery;
@@ -527,10 +537,11 @@ var StoatxHandler = class {
           );
         }
       };
+      const eventName = eventDef.event;
       if (eventDef.type === "once") {
-        this.client.once(eventDef.event, handler);
+        this.client.once(eventName, handler);
       } else {
-        this.client.on(eventDef.event, handler);
+        this.client.on(eventName, handler);
       }
     }
   }
@@ -599,7 +610,7 @@ var StoatxHandler = class {
     const channelId = message.channel.id;
     const serverId = message.server?.id;
     const reply = async (content) => {
-      return await message.channel.sendMessage(content);
+      return await message.channel.send(content);
     };
     return this.handleMessage(rawContent, message, {
       authorId,
@@ -679,7 +690,6 @@ var StoatxHandler = class {
         await instance.onError(ctx, error);
       } else {
         console.error(`[Stoatx] Error in command ${metadata.name}:`, error);
-        await ctx.reply(`An error occurred: ${error.message}`);
       }
       return false;
     }
@@ -773,6 +783,9 @@ var StoatxHandler = class {
     commandCooldowns.set(userId, Date.now() + metadata.cooldown);
   }
 };
+
+// src/index.ts
+__reExport(index_exports, require("@stoatx/client"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Client,
@@ -787,5 +800,6 @@ var StoatxHandler = class {
   getEventsMetadata,
   getGuards,
   getSimpleCommands,
-  isStoatClass
+  isStoatClass,
+  ...require("@stoatx/client")
 });

package/dist/index.mjs

@@ -11,13 +11,14 @@ var METADATA_KEYS = {
 
 // src/decorators/store.ts
 var DecoratorStore = class _DecoratorStore {
+  static instance;
+  /** Stoat classes with their SimpleCommand methods */
+  stoatClasses = /* @__PURE__ */ new Map();
+  /** Registered commands from @Stoat/@SimpleCommand decorators */
+  commands = [];
+  /** Whether the store has been initialized */
+  initialized = false;
   constructor() {
-    /** Stoat classes with their SimpleCommand methods */
-    this.stoatClasses = /* @__PURE__ */ new Map();
-    /** Registered commands from @Stoat/@SimpleCommand decorators */
-    this.commands = [];
-    /** Whether the store has been initialized */
-    this.initialized = false;
   }
   static getInstance() {
     if (!_DecoratorStore.instance) {
@@ -161,12 +162,20 @@ import * as path from "path";
 import * as fs from "fs/promises";
 import { pathToFileURL } from "url";
 import { glob } from "tinyglobby";
-var _CommandRegistry = class _CommandRegistry {
+var CommandRegistry = class _CommandRegistry {
+  static DEFAULT_AUTO_DISCOVERY_IGNORES = [
+    "**/node_modules/**",
+    "**/.git/**",
+    "**/*.d.ts",
+    "**/*.test.*",
+    "**/*.spec.*"
+  ];
+  commands = /* @__PURE__ */ new Map();
+  aliases = /* @__PURE__ */ new Map();
+  registeredEvents = [];
+  extensions;
+  processedStoatClasses = /* @__PURE__ */ new Set();
   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;
   }
   /**
@@ -225,7 +234,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("stoatx:command");
+      return source.includes("Stoat") || source.includes("SimpleCommand") || source.includes("stoatx:command");
     } catch {
       return true;
     }
@@ -414,19 +423,12 @@ var _CommandRegistry = class _CommandRegistry {
     return void 0;
   }
 };
-_CommandRegistry.DEFAULT_AUTO_DISCOVERY_IGNORES = [
-  "**/node_modules/**",
-  "**/.git/**",
-  "**/*.d.ts",
-  "**/*.test.*",
-  "**/*.spec.*"
-];
-var CommandRegistry = _CommandRegistry;
 
 // src/handler.ts
 import "reflect-metadata";
-import { Client as StoatClient } from "stoat.js";
+import { Client as StoatClient } from "@stoatx/client";
 var Client = class extends StoatClient {
+  handler;
   constructor(options) {
     super();
     this.handler = new StoatxHandler({ ...options, client: this });
@@ -442,8 +444,15 @@ var Client = class extends StoatClient {
   }
 };
 var StoatxHandler = class {
+  commandsDir;
+  discoveryOptions;
+  prefixResolver;
+  owners;
+  registry;
+  cooldowns = /* @__PURE__ */ new Map();
+  disableMentionPrefix;
+  client;
   constructor(options) {
-    this.cooldowns = /* @__PURE__ */ new Map();
     this.client = options.client;
     this.commandsDir = options.commandsDir;
     this.discoveryOptions = options.discovery;
@@ -479,10 +488,11 @@ var StoatxHandler = class {
           );
         }
       };
+      const eventName = eventDef.event;
       if (eventDef.type === "once") {
-        this.client.once(eventDef.event, handler);
+        this.client.once(eventName, handler);
       } else {
-        this.client.on(eventDef.event, handler);
+        this.client.on(eventName, handler);
       }
     }
   }
@@ -551,7 +561,7 @@ var StoatxHandler = class {
     const channelId = message.channel.id;
     const serverId = message.server?.id;
     const reply = async (content) => {
-      return await message.channel.sendMessage(content);
+      return await message.channel.send(content);
     };
     return this.handleMessage(rawContent, message, {
       authorId,
@@ -631,7 +641,6 @@ var StoatxHandler = class {
         await instance.onError(ctx, error);
       } else {
         console.error(`[Stoatx] Error in command ${metadata.name}:`, error);
-        await ctx.reply(`An error occurred: ${error.message}`);
       }
       return false;
     }
@@ -725,6 +734,9 @@ var StoatxHandler = class {
     commandCooldowns.set(userId, Date.now() + metadata.cooldown);
   }
 };
+
+// src/index.ts
+export * from "@stoatx/client";
 export {
   Client,
   CommandRegistry,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stoatx",
-  "version": "0.4.0",
+  "version": "0.5.1",
   "description": "A high-performance, decorator-based command handler for the Stoat ecosystem.",
   "repository": {
     "type": "git",
@@ -29,8 +29,8 @@
   },
   "dependencies": {
     "reflect-metadata": "^0.2.2",
-    "stoat.js": "^7.3.6",
-    "tinyglobby": "^0.2.10"
+    "tinyglobby": "^0.2.10",
+    "@stoatx/client": "0.1.1"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",