@grammyjs/commands 0.5.1 → 0.6.0

package/out/commands.d.ts

@@ -1,5 +1,5 @@
-import { Command } from "./command.js";
-import { Api, BotCommand, BotCommandScope, Context } from "./deps.node.js";
+import { Command, MaybeArray } from "./command.js";
+import { Api, BotCommand, BotCommandScope, Context, Middleware } from "./deps.node.js";
 import { CommandOptions } from "./types.js";
 type SetMyCommandsParams = {
     /**
@@ -33,8 +33,17 @@ export declare class Commands<C extends Context> {
     private _populateComposer;
     private _populateMetadata;
     /**
-     * Registers a new command and returns it.
-     * @param name Command name
+     * Registers a new command with a default handler.
+     * @param name Default command name
+     * @param description Default command description
+     * @param handler Default command handler
+     * @param options Extra options that should apply only to this command
+     * @returns An instance of the `Command` class
+     */
+    command(name: string | RegExp, description: string, handler: MaybeArray<Middleware<C>>, options?: Partial<CommandOptions>): Command<C>;
+    /**
+     * Registers a new command with no handlers.
+     * @param name Default command name
      * @param description Default command description
      * @param options Extra options that should apply only to this command
      * @returns An instance of the `Command` class

package/out/commands.js

@@ -3,6 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Commands = void 0;
 const command_js_1 = require("./command.js");
 const deps_node_js_1 = require("./deps.node.js");
+const isMiddleware = (obj) => {
+    if (!obj)
+        return false;
+    if (Array.isArray(obj))
+        return obj.every(isMiddleware);
+    const objType = typeof obj;
+    switch (objType) {
+        case "function":
+            return true;
+        case "object":
+            return Object.keys(obj).includes("middleware");
+    }
+    return false;
+};
 /**
  * Central class that manages all registered commands.
  * This is the starting point for the plugin, and this is what you should pass to `bot.use` so your commands get properly registered.
@@ -47,15 +61,17 @@ class Commands {
             }
         });
     }
-    /**
-     * Registers a new command and returns it.
-     * @param name Command name
-     * @param description Default command description
-     * @param options Extra options that should apply only to this command
-     * @returns An instance of the `Command` class
-     */
-    command(name, description, options = this._commandOptions) {
+    command(name, description, handlerOrOptions, _options) {
+        var _a;
+        const handler = isMiddleware(handlerOrOptions)
+            ? handlerOrOptions
+            : undefined;
+        const options = handler
+            ? _options !== null && _options !== void 0 ? _options : this._commandOptions
+            : (_a = handlerOrOptions) !== null && _a !== void 0 ? _a : this._commandOptions;
         const command = new command_js_1.Command(name, description, options);
+        if (handler)
+            command.addToScope({ type: "default" }, handler);
         this._commands.push(command);
         return command;
     }

package/out/mod.d.ts

@@ -1,3 +1,4 @@
+export { Command } from "./command.js";
 export * from "./commands.js";
 export * from "./context.js";
 export type { CommandOptions } from "./types.js";

package/out/mod.js

@@ -14,5 +14,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Command = void 0;
+var command_js_1 = require("./command.js");
+Object.defineProperty(exports, "Command", { enumerable: true, get: function () { return command_js_1.Command; } });
 __exportStar(require("./commands.js"), exports);
 __exportStar(require("./context.js"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@grammyjs/commands",
-    "version": "0.5.1",
+    "version": "0.6.0",
     "description": "grammY Commands Plugin",
     "main": "out/mod.js",
     "scripts": {