gramio 0.4.5 → 0.4.8

package/dist/index.cjs

@@ -428,7 +428,7 @@ class Bot {
   __Derives;
   "~" = this._;
   filters = {
-    context: (name2) => (context) => context.is(name2)
+    context: (name) => (context) => context.is(name)
   };
   /** Options provided to instance */
   options;
@@ -651,18 +651,27 @@ class Bot {
     return this;
   }
   decorate(nameOrRecordValue, value) {
-    for (const contextName of Object.keys(contexts.contextsMappings)) {
+    for (const contextName of Object.keys(
+      contexts.contextsMappings
+    )) {
       if (typeof nameOrRecordValue === "string")
-        Object.defineProperty(contexts.contextsMappings[contextName].prototype, name, {
-          value
-        });
+        Object.defineProperty(
+          contexts.contextsMappings[contextName].prototype,
+          nameOrRecordValue,
+          {
+            value,
+            configurable: true
+          }
+        );
       else
         Object.defineProperties(
-          // @ts-expect-error
           contexts.contextsMappings[contextName].prototype,
           Object.keys(nameOrRecordValue).reduce(
             (acc, key) => {
-              acc[key] = { value: nameOrRecordValue[key] };
+              acc[key] = {
+                value: nameOrRecordValue[key],
+                configurable: true
+              };
               return acc;
             },
             {}
@@ -1002,15 +1011,23 @@ class Bot {
    *     return context.send(`You message is /start ${context.args}`);
    * });
    */
-  command(command, handler, options) {
-    if (command.startsWith("/"))
-      throw new Error("Do not use / in command name");
+  command(command, handler) {
+    const normalizedCommands = typeof command === "string" ? [command] : Array.from(command);
+    for (const cmd of normalizedCommands) {
+      if (cmd.startsWith("/"))
+        throw new Error(`Do not use / in command name (${cmd})`);
+    }
     return this.on(["message", "business_message"], (context, next) => {
       if (context.entities?.some((entity) => {
         if (entity.type !== "bot_command" || entity.offset > 0) return false;
-        const cmd = context.text?.slice(1, entity.length)?.replace(`@${this.info.username}`, "");
+        const cmd = context.text?.slice(1, entity.length)?.replace(
+          this.info?.username ? `@${this.info.username}` : /@[a-zA-Z0-9_]+/,
+          ""
+        );
         context.args = context.text?.slice(entity.length).trim() || null;
-        return cmd === command;
+        return normalizedCommands.some(
+          (normalizedCommand) => cmd === normalizedCommand
+        );
       }))
         return handler(context);
       return next();

package/dist/index.d.cts

@@ -2,7 +2,7 @@ import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
 import { Context, UpdateName, ContextType, BotLike, Attachment } from '@gramio/contexts';
 export * from '@gramio/contexts';
-import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
+import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji } from '@gramio/types';
 export * from '@gramio/types';
 import * as middleware_io from 'middleware-io';
 import { Composer as Composer$1, Middleware, CaughtMiddlewareHandler, NextMiddleware } from 'middleware-io';
@@ -977,9 +977,9 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     return context.send(`You message is /start ${context.args}`);
      * });
      */
-    command(command: string, handler: (context: ContextType<typeof this, "message"> & {
+    command(command: MaybeArray<string>, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
-    }) => unknown, options?: Omit<SetMyCommandsParams, "commands"> & Omit<TelegramBotCommand, "command">): this;
+    }) => unknown): this;
     /** Currently not isolated!!! */
     group(grouped: (bot: typeof this) => AnyBot): typeof this;
     /**

package/dist/index.d.ts

@@ -2,7 +2,7 @@ import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
 import { Context, UpdateName, ContextType, BotLike, Attachment } from '@gramio/contexts';
 export * from '@gramio/contexts';
-import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji, SetMyCommandsParams, TelegramBotCommand } from '@gramio/types';
+import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramReactionTypeEmojiEmoji } from '@gramio/types';
 export * from '@gramio/types';
 import * as middleware_io from 'middleware-io';
 import { Composer as Composer$1, Middleware, CaughtMiddlewareHandler, NextMiddleware } from 'middleware-io';
@@ -977,9 +977,9 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     return context.send(`You message is /start ${context.args}`);
      * });
      */
-    command(command: string, handler: (context: ContextType<typeof this, "message"> & {
+    command(command: MaybeArray<string>, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
-    }) => unknown, options?: Omit<SetMyCommandsParams, "commands"> & Omit<TelegramBotCommand, "command">): this;
+    }) => unknown): this;
     /** Currently not isolated!!! */
     group(grouped: (bot: typeof this) => AnyBot): typeof this;
     /**

package/dist/index.js

@@ -430,7 +430,7 @@ class Bot {
   __Derives;
   "~" = this._;
   filters = {
-    context: (name2) => (context) => context.is(name2)
+    context: (name) => (context) => context.is(name)
   };
   /** Options provided to instance */
   options;
@@ -653,18 +653,27 @@ class Bot {
     return this;
   }
   decorate(nameOrRecordValue, value) {
-    for (const contextName of Object.keys(contextsMappings)) {
+    for (const contextName of Object.keys(
+      contextsMappings
+    )) {
       if (typeof nameOrRecordValue === "string")
-        Object.defineProperty(contextsMappings[contextName].prototype, name, {
-          value
-        });
+        Object.defineProperty(
+          contextsMappings[contextName].prototype,
+          nameOrRecordValue,
+          {
+            value,
+            configurable: true
+          }
+        );
       else
         Object.defineProperties(
-          // @ts-expect-error
           contextsMappings[contextName].prototype,
           Object.keys(nameOrRecordValue).reduce(
             (acc, key) => {
-              acc[key] = { value: nameOrRecordValue[key] };
+              acc[key] = {
+                value: nameOrRecordValue[key],
+                configurable: true
+              };
               return acc;
             },
             {}
@@ -1004,15 +1013,23 @@ class Bot {
    *     return context.send(`You message is /start ${context.args}`);
    * });
    */
-  command(command, handler, options) {
-    if (command.startsWith("/"))
-      throw new Error("Do not use / in command name");
+  command(command, handler) {
+    const normalizedCommands = typeof command === "string" ? [command] : Array.from(command);
+    for (const cmd of normalizedCommands) {
+      if (cmd.startsWith("/"))
+        throw new Error(`Do not use / in command name (${cmd})`);
+    }
     return this.on(["message", "business_message"], (context, next) => {
       if (context.entities?.some((entity) => {
         if (entity.type !== "bot_command" || entity.offset > 0) return false;
-        const cmd = context.text?.slice(1, entity.length)?.replace(`@${this.info.username}`, "");
+        const cmd = context.text?.slice(1, entity.length)?.replace(
+          this.info?.username ? `@${this.info.username}` : /@[a-zA-Z0-9_]+/,
+          ""
+        );
         context.args = context.text?.slice(entity.length).trim() || null;
-        return cmd === command;
+        return normalizedCommands.some(
+          (normalizedCommand) => cmd === normalizedCommand
+        );
       }))
         return handler(context);
       return next();

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "module",
-	"version": "0.4.5",
+	"version": "0.4.8",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",