gramio 0.8.1 → 0.9.0

package/dist/index.cjs

@@ -34,7 +34,8 @@ const ALL_NAMES = [
   "chat_member",
   "chat_join_request",
   "chat_boost",
-  "removed_chat_boost"
+  "removed_chat_boost",
+  "managed_bot"
 ];
 const MESSAGE_PARENT_TYPES = [
   "message",
@@ -348,6 +349,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 +362,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 +584,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 +1131,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 +1890,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

@@ -179,11 +179,45 @@ type GramIOLike<T> = ComposerLike<T> & {
     };
     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, {
@@ -282,6 +316,8 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             invoice: _gramio_contexts.InvoiceContext<AnyBot>;
             left_chat_member: _gramio_contexts.LeftChatMemberContext<AnyBot>;
             location: _gramio_contexts.LocationContext<AnyBot>;
+            managed_bot: _gramio_contexts.ManagedBotContext<AnyBot>;
+            managed_bot_created: _gramio_contexts.ManagedBotCreatedContext<AnyBot>;
             message_auto_delete_timer_changed: _gramio_contexts.MessageAutoDeleteTimerChangedContext<AnyBot>;
             message: _gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">;
             channel_post: _gramio_contexts.MessageContext<AnyBot>;
@@ -299,6 +335,8 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             passport_data: _gramio_contexts.PassportDataContext<AnyBot>;
             pinned_message: _gramio_contexts.PinnedMessageContext<AnyBot>;
             poll_answer: _gramio_contexts.PollAnswerContext<AnyBot>;
+            poll_option_added: _gramio_contexts.PollOptionAddedContext<AnyBot>;
+            poll_option_deleted: _gramio_contexts.PollOptionDeletedContext<AnyBot>;
             poll: _gramio_contexts.PollContext<AnyBot>;
             pre_checkout_query: _gramio_contexts.PreCheckoutQueryContext<AnyBot>;
             proximity_alert_triggered: _gramio_contexts.ProximityAlertTriggeredContext<AnyBot>;
@@ -523,7 +561,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 +736,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 */
@@ -1944,5 +2000,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 { 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

@@ -179,11 +179,45 @@ type GramIOLike<T> = ComposerLike<T> & {
     };
     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, {
@@ -282,6 +316,8 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             invoice: _gramio_contexts.InvoiceContext<AnyBot>;
             left_chat_member: _gramio_contexts.LeftChatMemberContext<AnyBot>;
             location: _gramio_contexts.LocationContext<AnyBot>;
+            managed_bot: _gramio_contexts.ManagedBotContext<AnyBot>;
+            managed_bot_created: _gramio_contexts.ManagedBotCreatedContext<AnyBot>;
             message_auto_delete_timer_changed: _gramio_contexts.MessageAutoDeleteTimerChangedContext<AnyBot>;
             message: _gramio_contexts.MessageContext<AnyBot> & _gramio_contexts.Require<_gramio_contexts.MessageContext<AnyBot>, "from">;
             channel_post: _gramio_contexts.MessageContext<AnyBot>;
@@ -299,6 +335,8 @@ declare class Plugin<Errors extends ErrorDefinitions = {}, Derives extends Deriv
             passport_data: _gramio_contexts.PassportDataContext<AnyBot>;
             pinned_message: _gramio_contexts.PinnedMessageContext<AnyBot>;
             poll_answer: _gramio_contexts.PollAnswerContext<AnyBot>;
+            poll_option_added: _gramio_contexts.PollOptionAddedContext<AnyBot>;
+            poll_option_deleted: _gramio_contexts.PollOptionDeletedContext<AnyBot>;
             poll: _gramio_contexts.PollContext<AnyBot>;
             pre_checkout_query: _gramio_contexts.PreCheckoutQueryContext<AnyBot>;
             proximity_alert_triggered: _gramio_contexts.ProximityAlertTriggeredContext<AnyBot>;
@@ -523,7 +561,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 +736,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 */
@@ -1944,5 +2000,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 { 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

@@ -36,7 +36,8 @@ const ALL_NAMES = [
   "chat_member",
   "chat_join_request",
   "chat_boost",
-  "removed_chat_boost"
+  "removed_chat_boost",
+  "managed_bot"
 ];
 const MESSAGE_PARENT_TYPES = [
   "message",
@@ -350,6 +351,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 +364,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 +586,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 +1133,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 +1860,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

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "module",
-	"version": "0.8.1",
+	"version": "0.9.0",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",
@@ -56,7 +56,7 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@biomejs/biome": "2.4.4",
-		"@gramio/test": "^0.3.1",
+		"@gramio/test": "^0.5.0",
 		"@types/bun": "^1.3.9",
 		"@types/debug": "^4.1.12",
 		"expect-type": "^1.3.0",
@@ -65,12 +65,12 @@
 	},
 	"dependencies": {
 		"@gramio/callback-data": "^0.1.0",
-		"@gramio/composer": "0.4.1",
-		"@gramio/contexts": "^0.5.0",
-		"@gramio/files": "^0.3.2",
-		"@gramio/format": "^0.5.0",
-		"@gramio/keyboards": "^1.3.1",
-		"@gramio/types": "^9.5.0",
+		"@gramio/composer": "^0.4.1",
+		"@gramio/contexts": "^0.6.1",
+		"@gramio/files": "^0.4.0",
+		"@gramio/format": "^0.7.0",
+		"@gramio/keyboards": "^1.4.0",
+		"@gramio/types": "^9.6.1",
 		"debug": "^4.4.3"
 	},
 	"files": [