npm - gramio - Versions diffs - 0.8.0 → 0.8.3 - Mend

gramio 0.8.0 → 0.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.cjs CHANGED Viewed

@@ -348,6 +348,10 @@ if (typeof Composer.prototype.registeredEvents !== "function") {
 {
   const originalExtend = Composer.prototype.extend;
   Composer.prototype.extend = function(other) {
+    if ("_" in other && !(other instanceof Promise)) {
+      if (!this["~"].__plugins) this["~"].__plugins = [];
+      this["~"].__plugins.push(other);
+    }
     const result = originalExtend.call(this, other);
     if (other["~"]?.commandsMeta) {
       if (!this["~"].commandsMeta) {
@@ -357,6 +361,10 @@ if (typeof Composer.prototype.registeredEvents !== "function") {
         this["~"].commandsMeta.set(cmd, meta);
       }
     }
+    if (other["~"]?.__plugins) {
+      if (!this["~"].__plugins) this["~"].__plugins = [];
+      this["~"].__plugins.push(...other["~"].__plugins);
+    }
     return result;
   };
 }
@@ -575,10 +583,39 @@ class Plugin {
   extend(pluginOrComposer) {
     if ("compose" in pluginOrComposer && "run" in pluginOrComposer && !("_" in pluginOrComposer)) {
       this._.composer.extend(pluginOrComposer);
+      return this;
+    }
+    const plugin = pluginOrComposer;
+    if (plugin._.composer["~"].middlewares.length) {
+      plugin._.composer.as("scoped");
+      this._.composer.extend(plugin._.composer);
+    } else if (Object.keys(plugin._.composer["~"].macros).length) {
+      Object.assign(this._.composer["~"].macros, plugin._.composer["~"].macros);
+    }
+    for (const [key, value] of Object.entries(plugin._.errorsDefinitions)) {
+      this._.errorsDefinitions[key] = value;
+      this._.composer["~"].errorsDefinitions[key] = value;
+    }
+    Object.assign(this._.decorators, plugin._.decorators);
+    this._.preRequests.push(...plugin._.preRequests);
+    this._.onResponses.push(...plugin._.onResponses);
+    this._.onResponseErrors.push(...plugin._.onResponseErrors);
+    this._.onApiCalls.push(...plugin._.onApiCalls);
+    this._.onErrors.push(...plugin._.onErrors);
+    this._.onStarts.push(...plugin._.onStarts);
+    this._.onStops.push(...plugin._.onStops);
+    this._.groups.push(...plugin._.groups);
+    for (const dep of plugin._.dependencies) {
+      if (!this._.dependencies.includes(dep)) {
+        this._.dependencies.push(dep);
+      }
     }
     return this;
   }
 }
+for (const [name, fn] of Object.entries(methods)) {
+  Plugin.prototype[name] = fn;
+}
 class Updates {
   bot;
@@ -1093,6 +1130,45 @@ class Bot {
   extend(pluginOrComposer) {
     if ("compose" in pluginOrComposer && "run" in pluginOrComposer && !("_" in pluginOrComposer)) {
       this.updates.composer.extend(pluginOrComposer);
+      const trackedPlugins = pluginOrComposer["~"]?.__plugins;
+      if (trackedPlugins) {
+        for (const p of trackedPlugins) {
+          this.decorate(p._.decorators);
+          for (const value of p._.preRequests) {
+            const [preRequest, updateName] = value;
+            if (!updateName) this.preRequest(preRequest);
+            else this.preRequest(updateName, preRequest);
+          }
+          for (const value of p._.onResponses) {
+            const [onResponse, updateName] = value;
+            if (!updateName) this.onResponse(onResponse);
+            else this.onResponse(updateName, onResponse);
+          }
+          for (const value of p._.onResponseErrors) {
+            const [onResponseError, updateName] = value;
+            if (!updateName) this.onResponseError(onResponseError);
+            else this.onResponseError(updateName, onResponseError);
+          }
+          for (const value of p._.onApiCalls) {
+            const [onApiCall, methods] = value;
+            if (!methods) this.onApiCall(onApiCall);
+            else this.onApiCall(methods, onApiCall);
+          }
+          for (const handler of p._.groups) {
+            this.group(handler);
+          }
+          for (const value of p._.onErrors) {
+            this.onError(value);
+          }
+          for (const value of p._.onStarts) {
+            this.onStart(value);
+          }
+          for (const value of p._.onStops) {
+            this.onStop(value);
+          }
+          this.dependencies.push(p._.name);
+        }
+      }
       return this;
     }
     const plugin = pluginOrComposer;
@@ -1813,6 +1889,7 @@ exports.Composer = Composer;
 exports.OPT_IN_TYPES = OPT_IN_TYPES;
 exports.Plugin = Plugin;
 exports.Updates = Updates;
+exports._composerMethods = methods;
 exports.buildAllowedUpdates = buildAllowedUpdates;
 exports.detectOptInUpdates = detectOptInUpdates;
 exports.filters = filters;

package/dist/index.d.cts CHANGED Viewed

@@ -8,11 +8,11 @@ export * from '@gramio/files';
 export * from '@gramio/format';
 export * from '@gramio/keyboards';
 import * as _gramio_types from '@gramio/types';
-import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramReactionTypeEmojiEmoji, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramBotCommandScope, TelegramMessageEntity } from '@gramio/types';
+import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramReactionTypeEmojiEmoji, TelegramUser, APIMethodParams, APIMethodReturn, TelegramBotCommandScope, SetWebhookParams, TelegramUpdate, TelegramMessageEntity } from '@gramio/types';
 export * from '@gramio/types';
 import * as _gramio_composer from '@gramio/composer';
-import { ComposerLike, MacroDefinitions, CommandMeta, EventContextOf, EventComposer, MacroDef, Next, EventQueue, HandlerOptions, DeriveFromOptions } from '@gramio/composer';
-export { CommandMeta, ContextCallback, DeriveFromOptions, EventComposer, EventQueue, HandlerOptions, MacroDef, MacroDefinitions, MacroDeriveType, MacroHooks, MacroOptionType, Middleware, Next, ScopeShorthand, WithCtx, buildFromOptions, compose, noopNext, skip, stop } from '@gramio/composer';
+import { ComposerLike, MacroDefinitions, EventContextOf, EventComposer, MacroDef, Next, EventQueue, HandlerOptions, DeriveFromOptions } from '@gramio/composer';
+export { ContextCallback, DeriveFromOptions, EventComposer, EventQueue, HandlerOptions, MacroDef, MacroDefinitions, MacroDeriveType, MacroHooks, MacroOptionType, Middleware, Next, WithCtx, buildFromOptions, compose, noopNext, skip, stop } from '@gramio/composer';
 /**
  * Telegram Bot API top-level update type name.
@@ -174,16 +174,50 @@ type Ctx<K extends keyof ContextsMapping<AnyBot>> = InstanceType<ContextsMapping
 type GramIOLike<T> = ComposerLike<T> & {
     "~": {
         macros: MacroDefinitions;
-        commandsMeta: Map<string, CommandMeta>;
+        commandsMeta?: Map<string, unknown>;
         Derives?: Record<string, object>;
     };
     chosenInlineResult(trigger: any, handler: any, macroOptions?: any): T;
 };
+declare const methods: {
+    reaction<TThis extends GramIOLike<TThis>>(this: TThis, trigger: MaybeArray<TelegramReactionTypeEmojiEmoji>, handler: (context: Ctx<"message_reaction"> & EventContextOf<TThis, "message_reaction">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    callbackQuery<TThis extends GramIOLike<TThis>, Trigger extends CallbackData | string | RegExp>(this: TThis, trigger: Trigger, handler: (context: Ctx<"callback_query"> & {
+        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
+    } & EventContextOf<TThis, "callback_query">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    chosenInlineResult<TThis extends GramIOLike<TThis>>(this: TThis, trigger: RegExp | string | ((context: Ctx<"chosen_inline_result">) => boolean), handler: (context: Ctx<"chosen_inline_result"> & {
+        args: RegExpMatchArray | null;
+    } & EventContextOf<TThis, "chosen_inline_result">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    inlineQuery<TThis extends GramIOLike<TThis>>(this: TThis, trigger: RegExp | string | ((context: Ctx<"inline_query">) => boolean), handler: (context: Ctx<"inline_query"> & {
+        args: RegExpMatchArray | null;
+    } & EventContextOf<TThis, "inline_query">) => unknown, options?: {
+        onResult?: (context: Ctx<"chosen_inline_result"> & {
+            args: RegExpMatchArray | null;
+        } & EventContextOf<TThis, "chosen_inline_result">) => unknown;
+    } & Record<string, unknown>): TThis;
+    hears<TThis extends GramIOLike<TThis>>(this: TThis, trigger: RegExp | MaybeArray<string> | ((context: Ctx<"message">) => boolean), handler: (context: Ctx<"message"> & {
+        args: RegExpMatchArray | null;
+    } & EventContextOf<TThis, "message">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    command<TThis extends GramIOLike<TThis>>(this: TThis, command: MaybeArray<string>, handlerOrMeta: ((context: Ctx<"message"> & {
+        args: string | null;
+    } & EventContextOf<TThis, "message">) => unknown) | CommandMeta, handlerOrOptions?: ((context: Ctx<"message"> & {
+        args: string | null;
+    } & EventContextOf<TThis, "message">) => unknown) | Record<string, unknown>, macroOptions?: Record<string, unknown>): TThis;
+    startParameter<TThis extends GramIOLike<TThis>>(this: TThis, parameter: RegExp | MaybeArray<string>, handler: Handler<Ctx<"message"> & {
+        rawStartPayload: string;
+    } & EventContextOf<TThis, "message">>, macroOptions?: Record<string, unknown>): TThis;
+};
 /** Teach EventComposer about GramIO-specific overloads */
 declare module "@gramio/composer" {
     interface EventComposer<TBase, TEventMap, TIn, TOut, TExposed, TDerives, TMethods, TMacros> {
         extend<P extends AnyPlugin>(plugin: P): EventComposer<TBase, TEventMap, TIn, TOut & P["_"]["Derives"]["global"], TExposed, TDerives & Omit<P["_"]["Derives"], "global">, TMethods, TMacros & P["_"]["Macros"]>;
         registeredEvents(): Set<string>;
+        callbackQuery: (typeof methods)["callbackQuery"];
+        command: (typeof methods)["command"];
+        hears: (typeof methods)["hears"];
+        reaction: (typeof methods)["reaction"];
+        inlineQuery: (typeof methods)["inlineQuery"];
+        chosenInlineResult: (typeof methods)["chosenInlineResult"];
+        startParameter: (typeof methods)["startParameter"];
     }
 }
 declare const Composer: _gramio_composer.EventComposerConstructor<Context<AnyBot>, TelegramEventMap, {
@@ -348,7 +382,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             reaction<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -356,7 +390,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             callbackQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -366,7 +400,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             chosenInlineResult<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -376,7 +410,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             inlineQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -390,7 +424,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             hears<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -400,19 +434,19 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             command<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
             }>(this: TThis, command: MaybeArray<string>, handlerOrMeta: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
-            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | _gramio_composer.CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
+            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
             } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | Record<string, unknown>, macroOptions?: Record<string, unknown>): TThis;
             startParameter<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -423,7 +457,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             reaction<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -431,7 +465,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             callbackQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -441,7 +475,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             chosenInlineResult<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -451,7 +485,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             inlineQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -465,7 +499,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             hears<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -475,19 +509,19 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             command<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
             }>(this: TThis, command: MaybeArray<string>, handlerOrMeta: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
-            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | _gramio_composer.CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
+            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
             } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | Record<string, unknown>, macroOptions?: Record<string, unknown>): TThis;
             startParameter<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -523,7 +557,10 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         decorators: Record<string, unknown>;
     };
     /** Expose composer internals so `composer.extend(plugin)` works via duck-typing */
-    get "~"(): InstanceType<typeof Composer>["~"];
+    get "~"(): Omit<InstanceType<typeof Composer>["~"], "Out" | "Derives"> & {
+        Out: Derives["global"];
+        Derives: Omit<Derives, "global">;
+    };
     /** Create new Plugin. Please provide `name` */
     constructor(name: string, { dependencies }?: {
         dependencies?: string[];
@@ -695,9 +732,24 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
     extend<UExposed extends object, UDerives extends Record<string, object>>(composer: EventComposer<any, any, any, any, UExposed, UDerives>): Plugin<Errors, Derives & {
         global: UExposed;
     } & UDerives>;
-    /**
-     * ! ** At the moment, it can only pick up types** */
-    extend<NewPlugin extends AnyPlugin>(plugin: MaybePromise<NewPlugin>): Plugin<Errors & NewPlugin["_"]["Errors"], Derives & NewPlugin["_"]["Derives"]>;
+    /** Extend plugin with another Plugin (merges middleware, hooks, decorators, error definitions, groups, and dependencies) */
+    extend<NewPlugin extends AnyPlugin>(plugin: MaybePromise<NewPlugin>): Plugin<Errors & NewPlugin["_"]["Errors"], Derives & NewPlugin["_"]["Derives"], Macros & NewPlugin["_"]["Macros"]>;
+}
+interface Plugin<Errors, Derives, Macros> {
+    /** Register callback query handler */
+    callbackQuery: (typeof methods)["callbackQuery"];
+    /** Register command handler */
+    command: (typeof methods)["command"];
+    /** Register text/caption pattern handler */
+    hears: (typeof methods)["hears"];
+    /** Register reaction handler */
+    reaction: (typeof methods)["reaction"];
+    /** Register inline query handler */
+    inlineQuery: (typeof methods)["inlineQuery"];
+    /** Register chosen inline result handler */
+    chosenInlineResult: (typeof methods)["chosenInlineResult"];
+    /** Register deep-link parameter handler */
+    startParameter: (typeof methods)["startParameter"];
 }
 /** Bot options that you can provide to {@link Bot} constructor */
@@ -1010,6 +1062,22 @@ interface PollingStartOptions {
     dropPendingUpdates?: boolean;
     deleteWebhookOnConflict?: boolean;
 }
+/** Shorthand strings for common BotCommandScope types */
+type ScopeShorthand = "default" | "all_private_chats" | "all_group_chats" | "all_chat_administrators";
+/**
+ * Metadata for a bot command, used by `syncCommands()` to push
+ * descriptions, localized names, and visibility scopes to the Telegram API.
+ */
+interface CommandMeta {
+    /** Command description shown in the Telegram menu (1-256 chars) */
+    description: string;
+    /** Localized descriptions keyed by IETF language tag */
+    locales?: Record<string, string>;
+    /** Where this command is visible. Default: `["default"]` */
+    scopes?: (TelegramBotCommandScope | ScopeShorthand)[];
+    /** Exclude this command from `syncCommands()`. The handler still works. @default false */
+    hide?: boolean;
+}
 /** Minimal key-value storage interface compatible with `@gramio/storage` */
 interface SyncStorage {
     get(key: string): string | undefined | Promise<string | undefined>;
@@ -1487,7 +1555,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
     command<TOptions extends HandlerOptions<ContextType<typeof this, "message">, Macros> = {}>(command: MaybeArray<string>, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
     } & DeriveFromOptions<Macros, TOptions>) => unknown, options?: TOptions): typeof this;
-    command<TOptions extends HandlerOptions<ContextType<typeof this, "message">, Macros> = {}>(command: MaybeArray<string>, meta: CommandMeta<TelegramBotCommandScope>, handler: (context: ContextType<typeof this, "message"> & {
+    command<TOptions extends HandlerOptions<ContextType<typeof this, "message">, Macros> = {}>(command: MaybeArray<string>, meta: CommandMeta, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
     } & DeriveFromOptions<Macros, TOptions>) => unknown, options?: TOptions): typeof this;
     /**
@@ -1928,5 +1996,5 @@ declare function webhookHandler<Framework extends keyof typeof frameworks>(bot:
     response: () => any;
 } ? (...args: Parameters<(typeof frameworks)[Framework]>) => ReturnType<ReturnType<(typeof frameworks)[Framework]>["response"]> : (...args: Parameters<(typeof frameworks)[Framework]>) => void;
-export { AllowedUpdatesFilter, Bot, Composer, ErrorKind, Hooks, OPT_IN_TYPES, Plugin, TelegramError, Updates, buildAllowedUpdates, detectOptInUpdates, filters, mapEventToAllowedUpdates, webhookHandler };
-export type { AllowedUpdateName, AllowedUpdates, AnyBot, AnyPlugin, BotOptions, BotStartOptions, BotStartOptionsLongPolling, BotStartOptionsWebhook, CallbackQueryShorthandContext, DeriveDefinitions, ErrorDefinitions, Filter, Handler, MaybePromise, MaybeSuppressedParams, MaybeSuppressedReturn, PollingStartOptions, Suppress, SuppressedAPIMethodParams, SuppressedAPIMethodReturn, SuppressedAPIMethods, SyncCommandsOptions, SyncStorage, WebhookHandlerOptions, WebhookHandlerOptionsShouldWait, WebhookHandlers };
+export { AllowedUpdatesFilter, Bot, Composer, ErrorKind, Hooks, OPT_IN_TYPES, Plugin, TelegramError, Updates, methods as _composerMethods, buildAllowedUpdates, detectOptInUpdates, filters, mapEventToAllowedUpdates, webhookHandler };
+export type { AllowedUpdateName, AllowedUpdates, AnyBot, AnyPlugin, BotOptions, BotStartOptions, BotStartOptionsLongPolling, BotStartOptionsWebhook, CallbackQueryShorthandContext, CommandMeta, DeriveDefinitions, ErrorDefinitions, Filter, Handler, MaybePromise, MaybeSuppressedParams, MaybeSuppressedReturn, PollingStartOptions, ScopeShorthand, Suppress, SuppressedAPIMethodParams, SuppressedAPIMethodReturn, SuppressedAPIMethods, SyncCommandsOptions, SyncStorage, WebhookHandlerOptions, WebhookHandlerOptionsShouldWait, WebhookHandlers };

package/dist/index.d.ts CHANGED Viewed

@@ -8,11 +8,11 @@ export * from '@gramio/files';
 export * from '@gramio/format';
 export * from '@gramio/keyboards';
 import * as _gramio_types from '@gramio/types';
-import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramReactionTypeEmojiEmoji, TelegramUser, APIMethodParams, APIMethodReturn, SetWebhookParams, TelegramUpdate, TelegramBotCommandScope, TelegramMessageEntity } from '@gramio/types';
+import { APIMethods, TelegramResponseParameters, TelegramAPIResponseError, TelegramReactionTypeEmojiEmoji, TelegramUser, APIMethodParams, APIMethodReturn, TelegramBotCommandScope, SetWebhookParams, TelegramUpdate, TelegramMessageEntity } from '@gramio/types';
 export * from '@gramio/types';
 import * as _gramio_composer from '@gramio/composer';
-import { ComposerLike, MacroDefinitions, CommandMeta, EventContextOf, EventComposer, MacroDef, Next, EventQueue, HandlerOptions, DeriveFromOptions } from '@gramio/composer';
-export { CommandMeta, ContextCallback, DeriveFromOptions, EventComposer, EventQueue, HandlerOptions, MacroDef, MacroDefinitions, MacroDeriveType, MacroHooks, MacroOptionType, Middleware, Next, ScopeShorthand, WithCtx, buildFromOptions, compose, noopNext, skip, stop } from '@gramio/composer';
+import { ComposerLike, MacroDefinitions, EventContextOf, EventComposer, MacroDef, Next, EventQueue, HandlerOptions, DeriveFromOptions } from '@gramio/composer';
+export { ContextCallback, DeriveFromOptions, EventComposer, EventQueue, HandlerOptions, MacroDef, MacroDefinitions, MacroDeriveType, MacroHooks, MacroOptionType, Middleware, Next, WithCtx, buildFromOptions, compose, noopNext, skip, stop } from '@gramio/composer';
 /**
  * Telegram Bot API top-level update type name.
@@ -174,16 +174,50 @@ type Ctx<K extends keyof ContextsMapping<AnyBot>> = InstanceType<ContextsMapping
 type GramIOLike<T> = ComposerLike<T> & {
     "~": {
         macros: MacroDefinitions;
-        commandsMeta: Map<string, CommandMeta>;
+        commandsMeta?: Map<string, unknown>;
         Derives?: Record<string, object>;
     };
     chosenInlineResult(trigger: any, handler: any, macroOptions?: any): T;
 };
+declare const methods: {
+    reaction<TThis extends GramIOLike<TThis>>(this: TThis, trigger: MaybeArray<TelegramReactionTypeEmojiEmoji>, handler: (context: Ctx<"message_reaction"> & EventContextOf<TThis, "message_reaction">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    callbackQuery<TThis extends GramIOLike<TThis>, Trigger extends CallbackData | string | RegExp>(this: TThis, trigger: Trigger, handler: (context: Ctx<"callback_query"> & {
+        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
+    } & EventContextOf<TThis, "callback_query">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    chosenInlineResult<TThis extends GramIOLike<TThis>>(this: TThis, trigger: RegExp | string | ((context: Ctx<"chosen_inline_result">) => boolean), handler: (context: Ctx<"chosen_inline_result"> & {
+        args: RegExpMatchArray | null;
+    } & EventContextOf<TThis, "chosen_inline_result">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    inlineQuery<TThis extends GramIOLike<TThis>>(this: TThis, trigger: RegExp | string | ((context: Ctx<"inline_query">) => boolean), handler: (context: Ctx<"inline_query"> & {
+        args: RegExpMatchArray | null;
+    } & EventContextOf<TThis, "inline_query">) => unknown, options?: {
+        onResult?: (context: Ctx<"chosen_inline_result"> & {
+            args: RegExpMatchArray | null;
+        } & EventContextOf<TThis, "chosen_inline_result">) => unknown;
+    } & Record<string, unknown>): TThis;
+    hears<TThis extends GramIOLike<TThis>>(this: TThis, trigger: RegExp | MaybeArray<string> | ((context: Ctx<"message">) => boolean), handler: (context: Ctx<"message"> & {
+        args: RegExpMatchArray | null;
+    } & EventContextOf<TThis, "message">) => unknown, macroOptions?: Record<string, unknown>): TThis;
+    command<TThis extends GramIOLike<TThis>>(this: TThis, command: MaybeArray<string>, handlerOrMeta: ((context: Ctx<"message"> & {
+        args: string | null;
+    } & EventContextOf<TThis, "message">) => unknown) | CommandMeta, handlerOrOptions?: ((context: Ctx<"message"> & {
+        args: string | null;
+    } & EventContextOf<TThis, "message">) => unknown) | Record<string, unknown>, macroOptions?: Record<string, unknown>): TThis;
+    startParameter<TThis extends GramIOLike<TThis>>(this: TThis, parameter: RegExp | MaybeArray<string>, handler: Handler<Ctx<"message"> & {
+        rawStartPayload: string;
+    } & EventContextOf<TThis, "message">>, macroOptions?: Record<string, unknown>): TThis;
+};
 /** Teach EventComposer about GramIO-specific overloads */
 declare module "@gramio/composer" {
     interface EventComposer<TBase, TEventMap, TIn, TOut, TExposed, TDerives, TMethods, TMacros> {
         extend<P extends AnyPlugin>(plugin: P): EventComposer<TBase, TEventMap, TIn, TOut & P["_"]["Derives"]["global"], TExposed, TDerives & Omit<P["_"]["Derives"], "global">, TMethods, TMacros & P["_"]["Macros"]>;
         registeredEvents(): Set<string>;
+        callbackQuery: (typeof methods)["callbackQuery"];
+        command: (typeof methods)["command"];
+        hears: (typeof methods)["hears"];
+        reaction: (typeof methods)["reaction"];
+        inlineQuery: (typeof methods)["inlineQuery"];
+        chosenInlineResult: (typeof methods)["chosenInlineResult"];
+        startParameter: (typeof methods)["startParameter"];
     }
 }
 declare const Composer: _gramio_composer.EventComposerConstructor<Context<AnyBot>, TelegramEventMap, {
@@ -348,7 +382,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             reaction<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -356,7 +390,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             callbackQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -366,7 +400,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             chosenInlineResult<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -376,7 +410,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             inlineQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -390,7 +424,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             hears<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -400,19 +434,19 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             command<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
             }>(this: TThis, command: MaybeArray<string>, handlerOrMeta: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
-            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | _gramio_composer.CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
+            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
             } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | Record<string, unknown>, macroOptions?: Record<string, unknown>): TThis;
             startParameter<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -423,7 +457,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             reaction<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -431,7 +465,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             callbackQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -441,7 +475,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             chosenInlineResult<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -451,7 +485,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             inlineQuery<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -465,7 +499,7 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             hears<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -475,19 +509,19 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             command<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
             }>(this: TThis, command: MaybeArray<string>, handlerOrMeta: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
-            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | _gramio_composer.CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
+            } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | CommandMeta, handlerOrOptions?: ((context: (_gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">) & {
                 args: string | null;
             } & _gramio_composer.EventContextOf<TThis, "message">) => unknown) | Record<string, unknown>, macroOptions?: Record<string, unknown>): TThis;
             startParameter<TThis extends _gramio_composer.ComposerLike<TThis> & {
                 "~": {
                     macros: MacroDefinitions;
-                    commandsMeta: Map<string, _gramio_composer.CommandMeta>;
+                    commandsMeta?: Map<string, unknown>;
                     Derives?: Record<string, object>;
                 };
                 chosenInlineResult(trigger: any, handler: any, macroOptions?: any): TThis;
@@ -523,7 +557,10 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
         decorators: Record<string, unknown>;
     };
     /** Expose composer internals so `composer.extend(plugin)` works via duck-typing */
-    get "~"(): InstanceType<typeof Composer>["~"];
+    get "~"(): Omit<InstanceType<typeof Composer>["~"], "Out" | "Derives"> & {
+        Out: Derives["global"];
+        Derives: Omit<Derives, "global">;
+    };
     /** Create new Plugin. Please provide `name` */
     constructor(name: string, { dependencies }?: {
         dependencies?: string[];
@@ -695,9 +732,24 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
     extend<UExposed extends object, UDerives extends Record<string, object>>(composer: EventComposer<any, any, any, any, UExposed, UDerives>): Plugin<Errors, Derives & {
         global: UExposed;
     } & UDerives>;
-    /**
-     * ! ** At the moment, it can only pick up types** */
-    extend<NewPlugin extends AnyPlugin>(plugin: MaybePromise<NewPlugin>): Plugin<Errors & NewPlugin["_"]["Errors"], Derives & NewPlugin["_"]["Derives"]>;
+    /** Extend plugin with another Plugin (merges middleware, hooks, decorators, error definitions, groups, and dependencies) */
+    extend<NewPlugin extends AnyPlugin>(plugin: MaybePromise<NewPlugin>): Plugin<Errors & NewPlugin["_"]["Errors"], Derives & NewPlugin["_"]["Derives"], Macros & NewPlugin["_"]["Macros"]>;
+}
+interface Plugin<Errors, Derives, Macros> {
+    /** Register callback query handler */
+    callbackQuery: (typeof methods)["callbackQuery"];
+    /** Register command handler */
+    command: (typeof methods)["command"];
+    /** Register text/caption pattern handler */
+    hears: (typeof methods)["hears"];
+    /** Register reaction handler */
+    reaction: (typeof methods)["reaction"];
+    /** Register inline query handler */
+    inlineQuery: (typeof methods)["inlineQuery"];
+    /** Register chosen inline result handler */
+    chosenInlineResult: (typeof methods)["chosenInlineResult"];
+    /** Register deep-link parameter handler */
+    startParameter: (typeof methods)["startParameter"];
 }
 /** Bot options that you can provide to {@link Bot} constructor */
@@ -1010,6 +1062,22 @@ interface PollingStartOptions {
     dropPendingUpdates?: boolean;
     deleteWebhookOnConflict?: boolean;
 }
+/** Shorthand strings for common BotCommandScope types */
+type ScopeShorthand = "default" | "all_private_chats" | "all_group_chats" | "all_chat_administrators";
+/**
+ * Metadata for a bot command, used by `syncCommands()` to push
+ * descriptions, localized names, and visibility scopes to the Telegram API.
+ */
+interface CommandMeta {
+    /** Command description shown in the Telegram menu (1-256 chars) */
+    description: string;
+    /** Localized descriptions keyed by IETF language tag */
+    locales?: Record<string, string>;
+    /** Where this command is visible. Default: `["default"]` */
+    scopes?: (TelegramBotCommandScope | ScopeShorthand)[];
+    /** Exclude this command from `syncCommands()`. The handler still works. @default false */
+    hide?: boolean;
+}
 /** Minimal key-value storage interface compatible with `@gramio/storage` */
 interface SyncStorage {
     get(key: string): string | undefined | Promise<string | undefined>;
@@ -1487,7 +1555,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
     command<TOptions extends HandlerOptions<ContextType<typeof this, "message">, Macros> = {}>(command: MaybeArray<string>, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
     } & DeriveFromOptions<Macros, TOptions>) => unknown, options?: TOptions): typeof this;
-    command<TOptions extends HandlerOptions<ContextType<typeof this, "message">, Macros> = {}>(command: MaybeArray<string>, meta: CommandMeta<TelegramBotCommandScope>, handler: (context: ContextType<typeof this, "message"> & {
+    command<TOptions extends HandlerOptions<ContextType<typeof this, "message">, Macros> = {}>(command: MaybeArray<string>, meta: CommandMeta, handler: (context: ContextType<typeof this, "message"> & {
         args: string | null;
     } & DeriveFromOptions<Macros, TOptions>) => unknown, options?: TOptions): typeof this;
     /**
@@ -1928,5 +1996,5 @@ declare function webhookHandler<Framework extends keyof typeof frameworks>(bot:
     response: () => any;
 } ? (...args: Parameters<(typeof frameworks)[Framework]>) => ReturnType<ReturnType<(typeof frameworks)[Framework]>["response"]> : (...args: Parameters<(typeof frameworks)[Framework]>) => void;
-export { AllowedUpdatesFilter, Bot, Composer, ErrorKind, Hooks, OPT_IN_TYPES, Plugin, TelegramError, Updates, buildAllowedUpdates, detectOptInUpdates, filters, mapEventToAllowedUpdates, webhookHandler };
-export type { AllowedUpdateName, AllowedUpdates, AnyBot, AnyPlugin, BotOptions, BotStartOptions, BotStartOptionsLongPolling, BotStartOptionsWebhook, CallbackQueryShorthandContext, DeriveDefinitions, ErrorDefinitions, Filter, Handler, MaybePromise, MaybeSuppressedParams, MaybeSuppressedReturn, PollingStartOptions, Suppress, SuppressedAPIMethodParams, SuppressedAPIMethodReturn, SuppressedAPIMethods, SyncCommandsOptions, SyncStorage, WebhookHandlerOptions, WebhookHandlerOptionsShouldWait, WebhookHandlers };
+export { AllowedUpdatesFilter, Bot, Composer, ErrorKind, Hooks, OPT_IN_TYPES, Plugin, TelegramError, Updates, methods as _composerMethods, buildAllowedUpdates, detectOptInUpdates, filters, mapEventToAllowedUpdates, webhookHandler };
+export type { AllowedUpdateName, AllowedUpdates, AnyBot, AnyPlugin, BotOptions, BotStartOptions, BotStartOptionsLongPolling, BotStartOptionsWebhook, CallbackQueryShorthandContext, CommandMeta, DeriveDefinitions, ErrorDefinitions, Filter, Handler, MaybePromise, MaybeSuppressedParams, MaybeSuppressedReturn, PollingStartOptions, ScopeShorthand, Suppress, SuppressedAPIMethodParams, SuppressedAPIMethodReturn, SuppressedAPIMethods, SyncCommandsOptions, SyncStorage, WebhookHandlerOptions, WebhookHandlerOptionsShouldWait, WebhookHandlers };

package/dist/index.js CHANGED Viewed

@@ -350,6 +350,10 @@ if (typeof Composer.prototype.registeredEvents !== "function") {
 {
   const originalExtend = Composer.prototype.extend;
   Composer.prototype.extend = function(other) {
+    if ("_" in other && !(other instanceof Promise)) {
+      if (!this["~"].__plugins) this["~"].__plugins = [];
+      this["~"].__plugins.push(other);
+    }
     const result = originalExtend.call(this, other);
     if (other["~"]?.commandsMeta) {
       if (!this["~"].commandsMeta) {
@@ -359,6 +363,10 @@ if (typeof Composer.prototype.registeredEvents !== "function") {
         this["~"].commandsMeta.set(cmd, meta);
       }
     }
+    if (other["~"]?.__plugins) {
+      if (!this["~"].__plugins) this["~"].__plugins = [];
+      this["~"].__plugins.push(...other["~"].__plugins);
+    }
     return result;
   };
 }
@@ -577,10 +585,39 @@ class Plugin {
   extend(pluginOrComposer) {
     if ("compose" in pluginOrComposer && "run" in pluginOrComposer && !("_" in pluginOrComposer)) {
       this._.composer.extend(pluginOrComposer);
+      return this;
+    }
+    const plugin = pluginOrComposer;
+    if (plugin._.composer["~"].middlewares.length) {
+      plugin._.composer.as("scoped");
+      this._.composer.extend(plugin._.composer);
+    } else if (Object.keys(plugin._.composer["~"].macros).length) {
+      Object.assign(this._.composer["~"].macros, plugin._.composer["~"].macros);
+    }
+    for (const [key, value] of Object.entries(plugin._.errorsDefinitions)) {
+      this._.errorsDefinitions[key] = value;
+      this._.composer["~"].errorsDefinitions[key] = value;
+    }
+    Object.assign(this._.decorators, plugin._.decorators);
+    this._.preRequests.push(...plugin._.preRequests);
+    this._.onResponses.push(...plugin._.onResponses);
+    this._.onResponseErrors.push(...plugin._.onResponseErrors);
+    this._.onApiCalls.push(...plugin._.onApiCalls);
+    this._.onErrors.push(...plugin._.onErrors);
+    this._.onStarts.push(...plugin._.onStarts);
+    this._.onStops.push(...plugin._.onStops);
+    this._.groups.push(...plugin._.groups);
+    for (const dep of plugin._.dependencies) {
+      if (!this._.dependencies.includes(dep)) {
+        this._.dependencies.push(dep);
+      }
     }
     return this;
   }
 }
+for (const [name, fn] of Object.entries(methods)) {
+  Plugin.prototype[name] = fn;
+}
 class Updates {
   bot;
@@ -1095,6 +1132,45 @@ class Bot {
   extend(pluginOrComposer) {
     if ("compose" in pluginOrComposer && "run" in pluginOrComposer && !("_" in pluginOrComposer)) {
       this.updates.composer.extend(pluginOrComposer);
+      const trackedPlugins = pluginOrComposer["~"]?.__plugins;
+      if (trackedPlugins) {
+        for (const p of trackedPlugins) {
+          this.decorate(p._.decorators);
+          for (const value of p._.preRequests) {
+            const [preRequest, updateName] = value;
+            if (!updateName) this.preRequest(preRequest);
+            else this.preRequest(updateName, preRequest);
+          }
+          for (const value of p._.onResponses) {
+            const [onResponse, updateName] = value;
+            if (!updateName) this.onResponse(onResponse);
+            else this.onResponse(updateName, onResponse);
+          }
+          for (const value of p._.onResponseErrors) {
+            const [onResponseError, updateName] = value;
+            if (!updateName) this.onResponseError(onResponseError);
+            else this.onResponseError(updateName, onResponseError);
+          }
+          for (const value of p._.onApiCalls) {
+            const [onApiCall, methods] = value;
+            if (!methods) this.onApiCall(onApiCall);
+            else this.onApiCall(methods, onApiCall);
+          }
+          for (const handler of p._.groups) {
+            this.group(handler);
+          }
+          for (const value of p._.onErrors) {
+            this.onError(value);
+          }
+          for (const value of p._.onStarts) {
+            this.onStart(value);
+          }
+          for (const value of p._.onStops) {
+            this.onStop(value);
+          }
+          this.dependencies.push(p._.name);
+        }
+      }
       return this;
     }
     const plugin = pluginOrComposer;
@@ -1783,4 +1859,4 @@ function webhookHandler(bot, framework, secretTokenOrOptions) {
 Symbol.metadata ??= Symbol("Symbol.metadata");
-export { AllowedUpdatesFilter, Bot, Composer, ErrorKind, OPT_IN_TYPES, Plugin, TelegramError, Updates, buildAllowedUpdates, detectOptInUpdates, filters, mapEventToAllowedUpdates, webhookHandler };
+export { AllowedUpdatesFilter, Bot, Composer, ErrorKind, OPT_IN_TYPES, Plugin, TelegramError, Updates, methods as _composerMethods, buildAllowedUpdates, detectOptInUpdates, filters, mapEventToAllowedUpdates, webhookHandler };

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "module",
-	"version": "0.8.0",
+	"version": "0.8.3",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",
@@ -65,8 +65,8 @@
 	},
 	"dependencies": {
 		"@gramio/callback-data": "^0.1.0",
-		"@gramio/composer": "^0.4.0",
-		"@gramio/contexts": "^0.5.0",
+		"@gramio/composer": "0.4.1",
+		"@gramio/contexts": "0.5.1",
 		"@gramio/files": "^0.3.2",
 		"@gramio/format": "^0.5.0",
 		"@gramio/keyboards": "^1.3.1",