grammy 1.9.2 → 1.10.0

package/README.md

@@ -151,7 +151,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/jokasimr"><img src="https://avatars.githubusercontent.com/u/20954731?v=4?s=100" width="100px;" alt=""/><br /><sub><b>jokasimr</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ajokasimr" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/CikiMomogi"><img src="https://avatars.githubusercontent.com/u/74030149?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ciki Momogi</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=CikiMomogi" title="Documentation">📖</a></td>
     <td align="center"><a href="https://github.com/AndreoliBR"><img src="https://avatars.githubusercontent.com/u/15970011?v=4?s=100" width="100px;" alt=""/><br /><sub><b>AndreoliBR</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AAndreoliBR" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://github.com/Loskir"><img src="https://avatars.githubusercontent.com/u/21295738?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kirill Loskutov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Loskir" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3ALoskir" title="Bug reports">🐛</a> <a href="#ideas-Loskir" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-Loskir" title="Design">🎨</a> <a href="#question-Loskir" title="Answering Questions">💬</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3ALoskir" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/Loskir"><img src="https://avatars.githubusercontent.com/u/21295738?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kirill Loskutov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Loskir" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3ALoskir" title="Bug reports">🐛</a> <a href="#ideas-Loskir" title="Ideas, Planning, & Feedback">🤔</a> <a href="#design-Loskir" title="Design">🎨</a> <a href="#question-Loskir" title="Answering Questions">💬</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3ALoskir" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=Loskir" title="Code">💻</a> <a href="#plugin-Loskir" title="Plugin/utility libraries">🔌</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://lungers.com/"><img src="https://avatars.githubusercontent.com/u/32808683?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Andrew Lane</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3AAndrewLaneX" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AAndrewLaneX" title="Reviewed Pull Requests">👀</a></td>
@@ -178,13 +178,13 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://zhemu.buzz/"><img src="https://avatars.githubusercontent.com/u/56839018?v=4?s=100" width="100px;" alt=""/><br /><sub><b>linbuxiao</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=linbuxiao" title="Documentation">📖</a> <a href="#translation-linbuxiao" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/JiquanWang99"><img src="https://avatars.githubusercontent.com/u/63894579?v=4?s=100" width="100px;" alt=""/><br /><sub><b>JiquanWang99</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=JiquanWang99" title="Documentation">📖</a> <a href="#translation-JiquanWang99" title="Translation">🌍</a></td>
     <td align="center"><a href="http://bor691.ir/"><img src="https://avatars.githubusercontent.com/u/4184939?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Borhan Hafez</b></sub></a><br /><a href="#plugin-zumoshi" title="Plugin/utility libraries">🔌</a></td>
-    <td align="center"><a href="https://blog.limx.dev/"><img src="https://avatars.githubusercontent.com/u/6434137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WingLim</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=WingLim" title="Documentation">📖</a> <a href="#translation-WingLim" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://blog.limx.dev/"><img src="https://avatars.githubusercontent.com/u/6434137?v=4?s=100" width="100px;" alt=""/><br /><sub><b>WingLim</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=WingLim" title="Documentation">📖</a> <a href="#translation-WingLim" title="Translation">🌍</a> <a href="https://github.com/grammyjs/grammY/commits?author=WingLim" title="Code">💻</a> <a href="#plugin-WingLim" title="Plugin/utility libraries">🔌</a> <a href="#ideas-WingLim" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
   <tr>
     <td align="center"><a href="https://github.com/taotie111"><img src="https://avatars.githubusercontent.com/u/44166322?v=4?s=100" width="100px;" alt=""/><br /><sub><b>taotie111</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=taotie111" title="Documentation">📖</a> <a href="#translation-taotie111" title="Translation">🌍</a></td>
     <td align="center"><a href="https://www.linkedin.com/in/merlin-brandes-42328717a/"><img src="https://avatars.githubusercontent.com/u/14237330?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Merlin</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=FatalMerlin" title="Documentation">📖</a></td>
     <td align="center"><a href="https://darve.sh"><img src="https://avatars.githubusercontent.com/u/22394081?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Darvesh</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adarvesh" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=darvesh" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adarvesh" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="http://telegram.me/dcdunkan"><img src="https://avatars.githubusercontent.com/u/70066170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dcdunkan</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adcdunkan" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Code">💻</a> <a href="#plugin-dcdunkan" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adcdunkan" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Documentation">📖</a> <a href="#ideas-dcdunkan" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-dcdunkan" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="http://telegram.me/dcdunkan"><img src="https://avatars.githubusercontent.com/u/70066170?v=4?s=100" width="100px;" alt=""/><br /><sub><b>dcdunkan</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Adcdunkan" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Code">💻</a> <a href="#plugin-dcdunkan" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adcdunkan" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/grammyjs/grammY/commits?author=dcdunkan" title="Documentation">📖</a> <a href="#ideas-dcdunkan" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-dcdunkan" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#tool-dcdunkan" title="Tools">🔧</a></td>
     <td align="center"><a href="https://xuann.wang/"><img src="https://avatars.githubusercontent.com/u/44045911?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kid</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=kidonng" title="Documentation">📖</a> <a href="#translation-kidonng" title="Translation">🌍</a></td>
     <td align="center"><a href="http://slava.fomin.io/"><img src="https://avatars.githubusercontent.com/u/1702725?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Slava Fomin II</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aslavafomin" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=slavafomin" title="Documentation">📖</a></td>
     <td align="center"><a href="https://kikobeats.com/"><img src="https://avatars.githubusercontent.com/u/2096101?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Kiko Beats</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Kikobeats" title="Documentation">📖</a></td>
@@ -204,7 +204,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://github.com/Scrip7"><img src="https://avatars.githubusercontent.com/u/37535505?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Hesoyam</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Scrip7" title="Documentation">📖</a></td>
     <td align="center"><a href="http://yrz.am"><img src="https://avatars.githubusercontent.com/u/96742416?v=4?s=100" width="100px;" alt=""/><br /><sub><b>yrzam</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Ayrzam" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://github.com/drmikecrowe"><img src="https://avatars.githubusercontent.com/u/90312?v=4?s=100" width="100px;" alt=""/><br /><sub><b>drmikecrowe</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Adrmikecrowe" title="Reviewed Pull Requests">👀</a></td>
-    <td align="center"><a href="https://rys.pw"><img src="https://avatars.githubusercontent.com/u/1641362?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=C0rn3j" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://rys.pw"><img src="https://avatars.githubusercontent.com/u/1641362?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Martin</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=C0rn3j" title="Documentation">📖</a> <a href="https://github.com/grammyjs/grammY/issues?q=author%3AC0rn3j" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3AC0rn3j" title="Reviewed Pull Requests">👀</a></td>
     <td align="center"><a href="http://pavelpolyakov.com/"><img src="https://avatars.githubusercontent.com/u/839290?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pavel</b></sub></a><br /><a href="#example-PavelPolyakov" title="Examples">💡</a></td>
   </tr>
   <tr>
@@ -217,7 +217,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="https://oott123.com"><img src="https://avatars.githubusercontent.com/u/905663?v=4?s=100" width="100px;" alt=""/><br /><sub><b>三三</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aoott123" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=oott123" title="Code">💻</a></td>
   </tr>
   <tr>
-    <td align="center"><a href="http://roz.ninja"><img src="https://avatars.githubusercontent.com/u/3948961?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roz</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aroziscoding" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=roziscoding" title="Code">💻</a></td>
+    <td align="center"><a href="http://roz.ninja"><img src="https://avatars.githubusercontent.com/u/3948961?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Roz</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/issues?q=author%3Aroziscoding" title="Bug reports">🐛</a> <a href="https://github.com/grammyjs/grammY/commits?author=roziscoding" title="Code">💻</a> <a href="https://github.com/grammyjs/grammY/pulls?q=is%3Apr+reviewed-by%3Aroziscoding" title="Reviewed Pull Requests">👀</a></td>
+    <td align="center"><a href="https://github.com/daniharo"><img src="https://avatars.githubusercontent.com/u/47931084?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Dani Haro</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=daniharo" title="Code">💻</a> <a href="#plugin-daniharo" title="Plugin/utility libraries">🔌</a> <a href="https://github.com/grammyjs/grammY/commits?author=daniharo" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/Ryukaizen"><img src="https://avatars.githubusercontent.com/u/55140313?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ryukaizen</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=Ryukaizen" title="Documentation">📖</a></td>
   </tr>
 </table>
 

package/out/bot.d.ts

@@ -2,7 +2,7 @@ import { BotError, Composer } from "./composer.js";
 import { Context } from "./context.js";
 import { Api } from "./core/api.js";
 import { type ApiClientOptions, type WebhookReplyEnvelope } from "./core/client.js";
-import { type Update, type UserFromGetMe } from "./platform.node.js";
+import { type Update, type UserFromGetMe } from "./types.js";
 /**
  * Options that can be specified when running the bot via simple long polling.
  */

package/out/composer.d.ts

@@ -1,9 +1,7 @@
-import { type AliasProps, type Context } from "./context.js";
-import { type Filter, type FilterQuery } from "./filter.js";
-import { type Chat } from "./platform.node.js";
+import { type CallbackQueryContext, type ChatTypeContext, type CommandContext, Context, type GameQueryContext, type HearsContext, type InlineQueryContext, type MaybeArray, type StringWithSuggestions } from "./context.js";
+import { Filter, FilterQuery } from "./filter.js";
+import { type Chat } from "./types.js";
 declare type MaybePromise<T> = T | Promise<T>;
-declare type MaybeArray<T> = T | T[];
-declare type StringWithSuggestions<S extends string> = (string & {}) | S;
 /**
  * A function of this type is passed as the second parameter to all middleware.
  * Invoke it to call the downstream middleware and pass on the control flow.
@@ -586,27 +584,58 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      */
     errorBoundary(errorHandler: (error: BotError<C>, next: NextFunction) => MaybePromise<unknown>, ...middleware: Array<Middleware<C>>): Composer<C>;
 }
-export declare type HearsContext<C extends Context> = Filter<Omit<C, "match"> & {
-    match: Extract<C["match"], string | RegExpMatchArray>;
-}, ":text" | ":caption">;
-export declare type CommandContext<C extends Context> = Filter<Omit<C, "match"> & {
-    match: Extract<C["match"], string>;
-}, ":entities:bot_command">;
-export declare type CallbackQueryContext<C extends Context> = Filter<C, "callback_query:data">;
-export declare type GameQueryContext<C extends Context> = Filter<C, "callback_query:game_short_name">;
-export declare type InlineQueryContext<C extends Context> = Filter<C, "inline_query">;
-export declare type ChatTypeContext<C extends Context, T extends Chat["type"]> = C & Record<"update", ChatTypeUpdate<T>> & ChatType<T> & ChatTypeRecord<"msg", T> & AliasProps<ChatTypeUpdate<T>>;
-declare type ChatTypeUpdate<T extends Chat["type"]> = ChatTypeRecord<"message" | "edited_message" | "channel_post" | "edited_channel_post" | "my_chat_member" | "chat_member" | "chat_join_request", T> & Partial<Record<"callback_query", ChatTypeRecord<"message", T>>>;
-declare type ChatTypeRecord<K extends string, T extends Chat["type"]> = Partial<Record<K, ChatType<T>>>;
-interface ChatType<T extends Chat["type"]> {
-    chat: {
-        type: T;
-    };
-}
+/**
+ * Type of the middleware that can be passed to `bot.hears`.
+ *
+ * This helper type can be used to annotate middleware functions that are
+ * defined in one place, so that they have the correct type when passed to
+ * `bot.hears` in a different place. For instance, this allows for more modular
+ * code where handlers are defined in separate files.
+ */
 export declare type HearsMiddleware<C extends Context> = Middleware<HearsContext<C>>;
+/**
+ * Type of the middleware that can be passed to `bot.command`.
+ *
+ * This helper type can be used to annotate middleware functions that are
+ * defined in one place, so that they have the correct type when passed to
+ * `bot.command` in a different place. For instance, this allows for more
+ * modular code where handlers are defined in separate files.
+ */
 export declare type CommandMiddleware<C extends Context> = Middleware<CommandContext<C>>;
+/**
+ * Type of the middleware that can be passed to `bot.callbackQuery`.
+ *
+ * This helper type can be used to annotate middleware functions that are
+ * defined in one place, so that they have the correct type when passed to
+ * `bot.callbackQuery` in a different plac For instance, this allows for more
+ * modular code where handlers are defined in separate files.e.
+ */
 export declare type CallbackQueryMiddleware<C extends Context> = Middleware<CallbackQueryContext<C>>;
+/**
+ * Type of the middleware that can be passed to `bot.gameQuery`.
+ *
+ * This helper type can be used to annotate middleware functions that are
+ * defined in one place, so that they have the correct type when passed to
+ * `bot.gameQuery` in a different place. For instance, this allows for more
+ * modular code where handlers are defined in separate files.
+ */
 export declare type GameQueryMiddleware<C extends Context> = Middleware<GameQueryContext<C>>;
+/**
+ * Type of the middleware that can be passed to `bot.inlineQuery`.
+ *
+ * This helper type can be used to annotate middleware functions that are
+ * defined in one place, so that they have the correct type when passed to
+ * `bot.inlineQuery` in a different place. For instance, this allows for more
+ * modular code where handlers are defined in separate files.
+ */
 export declare type InlineQueryMiddleware<C extends Context> = Middleware<InlineQueryContext<C>>;
+/**
+ * Type of the middleware that can be passed to `bot.chatType`.
+ *
+ * This helper type can be used to annotate middleware functions that are
+ * defined in one place, so that they have the correct type when passed to
+ * `bot.chatType` in a different place. For instance, this allows for more
+ * modular code where handlers are defined in separate files.
+ */
 export declare type ChatTypeMiddleware<C extends Context, T extends Chat["type"]> = Middleware<ChatTypeContext<C, T>>;
 export {};

package/out/composer.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Composer = exports.run = exports.BotError = void 0;
-const filter_js_1 = require("./filter.js");
+const context_js_1 = require("./context.js");
 // === Middleware errors
 /**
  * This error is thrown when middleware throws. It simply wraps the original
@@ -181,7 +181,7 @@ class Composer {
      * @param middleware The middleware to register behind the given filter
      */
     on(filter, ...middleware) {
-        return this.filter((0, filter_js_1.matchFilter)(filter), ...middleware);
+        return this.filter(context_js_1.Context.has.filterQuery(filter), ...middleware);
     }
     /**
      * Registers some middleware that will only be executed when the message
@@ -215,13 +215,7 @@ class Composer {
      * @param middleware The middleware to register
      */
     hears(trigger, ...middleware) {
-        const trg = triggerFn(trigger);
-        return this.on([":text", ":caption"]).filter((ctx) => {
-            var _a, _b;
-            const msg = (_a = ctx.message) !== null && _a !== void 0 ? _a : ctx.channelPost;
-            const txt = (_b = msg.text) !== null && _b !== void 0 ? _b : msg.caption;
-            return match(ctx, txt, trg);
-        }, ...middleware);
+        return this.filter(context_js_1.Context.has.text(trigger), ...middleware);
     }
     /**
      * Registers some middleware that will only be executed when a certain
@@ -279,43 +273,7 @@ class Composer {
      * @param middleware The middleware to register
      */
     command(command, ...middleware) {
-        const atCommands = new Set();
-        const noAtCommands = new Set();
-        toArray(command).forEach((cmd) => {
-            if (cmd.startsWith("/")) {
-                throw new Error(`Do not include '/' when registering command handlers (use '${cmd.substring(1)}' not '${cmd}')`);
-            }
-            const set = cmd.indexOf("@") === -1 ? noAtCommands : atCommands;
-            set.add(cmd);
-        });
-        return this.on(":entities:bot_command").filter((ctx) => {
-            var _a;
-            const msg = (_a = ctx.message) !== null && _a !== void 0 ? _a : ctx.channelPost;
-            const txt = msg.text;
-            return msg.entities.some((e) => {
-                if (e.type !== "bot_command")
-                    return false;
-                if (e.offset !== 0)
-                    return false;
-                const cmd = txt.substring(1, e.length);
-                if (noAtCommands.has(cmd) || atCommands.has(cmd)) {
-                    ctx.match = txt.substring(cmd.length + 1).trimStart();
-                    return true;
-                }
-                const index = cmd.indexOf("@");
-                if (index === -1)
-                    return false;
-                const atTarget = cmd.substring(index + 1);
-                if (atTarget !== ctx.me.username)
-                    return false;
-                const atCommand = cmd.substring(0, index);
-                if (noAtCommands.has(atCommand)) {
-                    ctx.match = txt.substring(cmd.length + 1).trimStart();
-                    return true;
-                }
-                return false;
-            });
-        }, ...middleware);
+        return this.filter(context_js_1.Context.has.command(command), ...middleware);
     }
     /**
      * Registers some middleware for certain chat types only. For example, you
@@ -349,8 +307,7 @@ class Composer {
      * @param middleware The middleware to register
      */
     chatType(chatType, ...middleware) {
-        const set = new Set(toArray(chatType));
-        return this.filter((ctx) => { var _a; return ((_a = ctx.chat) === null || _a === void 0 ? void 0 : _a.type) !== undefined && set.has(ctx.chat.type); }, ...middleware);
+        return this.filter(context_js_1.Context.has.chatType(chatType), ...middleware);
     }
     /**
      * Registers some middleware for callback queries, i.e. the updates that
@@ -393,8 +350,7 @@ class Composer {
      * @param middleware The middleware to register
      */
     callbackQuery(trigger, ...middleware) {
-        const trg = triggerFn(trigger);
-        return this.on("callback_query:data").filter((ctx) => match(ctx, ctx.callbackQuery.data, trg), ...middleware);
+        return this.filter(context_js_1.Context.has.callbackQuery(trigger), ...middleware);
     }
     /**
      * Registers some middleware for game queries, i.e. the updates that
@@ -415,8 +371,7 @@ class Composer {
      * @param middleware The middleware to register
      */
     gameQuery(trigger, ...middleware) {
-        const trg = triggerFn(trigger);
-        return this.on("callback_query:game_short_name").filter((ctx) => match(ctx, ctx.callbackQuery.game_short_name, trg), ...middleware);
+        return this.filter(context_js_1.Context.has.gameQuery(trigger), ...middleware);
     }
     /**
      * Registers middleware for inline queries. Telegram sends an inline query
@@ -441,8 +396,7 @@ class Composer {
      * @param middleware The middleware to register
      */
     inlineQuery(trigger, ...middleware) {
-        const trg = triggerFn(trigger);
-        return this.on("inline_query").filter((ctx) => match(ctx, ctx.inlineQuery.query, trg), ...middleware);
+        return this.filter(context_js_1.Context.has.inlineQuery(trigger), ...middleware);
     }
     filter(predicate, ...middleware) {
         const composer = new Composer(...middleware);
@@ -525,7 +479,7 @@ class Composer {
     lazy(middlewareFactory) {
         return this.use(async (ctx, next) => {
             const middleware = await middlewareFactory(ctx);
-            const arr = toArray(middleware);
+            const arr = Array.isArray(middleware) ? middleware : [middleware];
             await flatten(new Composer(...arr))(ctx, next);
         });
     }
@@ -653,22 +607,3 @@ class Composer {
     }
 }
 exports.Composer = Composer;
-// === Util functions
-function triggerFn(trigger) {
-    return toArray(trigger).map((t) => typeof t === "string"
-        ? (txt) => (txt === t ? t : null)
-        : (txt) => txt.match(t));
-}
-function match(ctx, content, triggers) {
-    for (const t of triggers) {
-        const res = t(content);
-        if (res) {
-            ctx.match = res;
-            return true;
-        }
-    }
-    return false;
-}
-function toArray(e) {
-    return Array.isArray(e) ? e : [e];
-}

package/out/context.d.ts

@@ -1,12 +1,72 @@
 import { type Api, type Other as OtherApi } from "./core/api.js";
 import { type Methods, type RawApi } from "./core/client.js";
-import { type Chat, type ChatPermissions, type InlineQueryResult, type InputFile, type InputMedia, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type LabeledPrice, type Message, type PassportElementError, type Update, type User, type UserFromGetMe } from "./platform.node.js";
+import { type Filter, type FilterQuery } from "./filter.js";
+import { type Chat, type ChatPermissions, type InlineQueryResult, type InputFile, type InputMedia, type InputMediaAudio, type InputMediaDocument, type InputMediaPhoto, type InputMediaVideo, type LabeledPrice, type Message, type PassportElementError, type Update, type User, type UserFromGetMe } from "./types.js";
+export declare type MaybeArray<T> = T | T[];
+export declare type StringWithSuggestions<S extends string> = (string & {}) | S;
 declare type Other<M extends Methods<RawApi>, X extends string = never> = OtherApi<RawApi, M, X>;
 declare type SnakeToCamelCase<S extends string> = S extends `${infer L}_${infer R}` ? `${L}${Capitalize<SnakeToCamelCase<R>>}` : S;
 export declare type AliasProps<U> = {
     [K in string & keyof U as SnakeToCamelCase<K>]: U[K];
 };
 declare type RenamedUpdate = AliasProps<Omit<Update, "update_id">>;
+interface StaticHas {
+    /**
+     * Generates a predicate function that can test context objects for matching
+     * the given filter query. This uses the same logic as `bot.on`.
+     *
+     * @param filter The filter query to check
+     */
+    filterQuery<Q extends FilterQuery>(filter: Q | Q[]): <C extends Context>(ctx: C) => ctx is Filter<C, Q>;
+    /**
+     * Generates a predicate function that can test context objects for
+     * containing the given text, or for the text to match the given regular
+     * expression. This uses the same logic as `bot.hears`.
+     *
+     * @param trigger The string or regex to match
+     */
+    text(trigger: MaybeArray<string | RegExp>): <C extends Context>(ctx: C) => ctx is HearsContext<C>;
+    /**
+     * Generates a predicate function that can test context objects for
+     * containing a command. This uses the same logic as `bot.command`.
+     *
+     * @param command The command to match
+     */
+    command<S extends string>(command: MaybeArray<StringWithSuggestions<S | "start" | "help" | "settings">>): <C extends Context>(ctx: C) => ctx is CommandContext<C>;
+    /**
+     * Generates a predicate function that can test context objects for
+     * belonging to a chat with the given chat type. This uses the same logic as
+     * `bot.chatType`.
+     *
+     * @param chatType The chat type to match
+     */
+    chatType<T extends Chat["type"]>(chatType: MaybeArray<T>): <C extends Context>(ctx: C) => ctx is ChatTypeContext<C, T>;
+    /**
+     * Generates a predicate function that can test context objects for
+     * containing the given callback query, or for the callback query data to
+     * match the given regular expression. This uses the same logic as
+     * `bot.callbackQuery`.
+     *
+     * @param trigger The string or regex to match
+     */
+    callbackQuery(trigger: MaybeArray<string | RegExp>): <C extends Context>(ctx: C) => ctx is CallbackQueryContext<C>;
+    /**
+     * Generates a predicate function that can test context objects for
+     * containing the given game query, or for the game name to match the given
+     * regular expression. This uses the same logic as `bot.gameQuery`.
+     *
+     * @param trigger The string or regex to match
+     */
+    gameQuery(trigger: MaybeArray<string | RegExp>): <C extends Context>(ctx: C) => ctx is GameQueryContext<C>;
+    /**
+     * Generates a predicate function that can test context objects for
+     * containing the given inline query, or for the inline query to match the
+     * given regular expression. This uses the same logic as `bot.inlineQuery`.
+     *
+     * @param trigger The string or regex to match
+     */
+    inlineQuery(trigger: MaybeArray<string | RegExp>): <C extends Context>(ctx: C) => ctx is InlineQueryContext<C>;
+}
 /**
  * When your bot receives a message, Telegram sends an update object to your
  * bot. The update contains information about the chat, the user, and of course
@@ -133,6 +193,82 @@ export declare class Context implements RenamedUpdate {
      * `(ctx.callbackQuery ?? ctx.chosenInlineResult)?.inline_message_id`
      */
     get inlineMessageId(): string | undefined;
+    /**
+     * `Context.has` is an object that contains a number of useful functions for
+     * probing context objects. Each of these functions can generate a predicate
+     * function, to which you can pass context objects in order to check if a
+     * condition holds for the respective context object.
+     *
+     * For example, you can call `Context.has.filterQuery(":text")` to generate
+     * a predicate function that tests context objects for containing text:
+     * ```ts
+     * const hasText = Context.has.filterQuery(":text");
+     *
+     * if (hasText(ctx0)) {} // `ctx0` matches the filter query `:text`
+     * if (hasText(ctx1)) {} // `ctx1` matches the filter query `:text`
+     * if (hasText(ctx2)) {} // `ctx2` matches the filter query `:text`
+     * ```
+     * These predicate funtions are used internally by the has-methods that are
+     * installed on every context object. This means that calling
+     * `ctx.has(":text")` is equivalent to
+     * `Context.has.filterQuery(":text")(ctx)`.
+     */
+    static has: StaticHas;
+    /**
+     * Returns `true` if this context object matches the given filter query, and
+     * `false` otherwise. This uses the same logic as `bot.on`.
+     *
+     * @param filter The filter query to check
+     */
+    has<Q extends FilterQuery>(filter: Q | Q[]): this is Filter<this, Q>;
+    /**
+     * Returns `true` if this context object contains the given text, or if it
+     * contains text that matches the given regular expression. It returns
+     * `false` otherwise. This uses the same logic as `bot.hears`.
+     *
+     * @param trigger The string or regex to match
+     */
+    hasText(trigger: MaybeArray<string | RegExp>): this is HearsContext<this>;
+    /**
+     * Returns `true` if this context object contains the given command, and
+     * `false` otherwise. This uses the same logic as `bot.command`.
+     *
+     * @param command The command to match
+     */
+    hasCommand<S extends string>(command: MaybeArray<StringWithSuggestions<S | "start" | "help" | "settings">>): this is CommandContext<this>;
+    /**
+     * Returns `true` if this context object belongs to a chat with the given
+     * chat type, and `false` otherwise. This uses the same logic as
+     * `bot.chatType`.
+     *
+     * @param chatType The chat type to match
+     */
+    hasChatType<T extends Chat["type"]>(chatType: MaybeArray<T>): this is ChatTypeContext<this, T>;
+    /**
+     * Returns `true` if this context object contains the given callback query,
+     * or if the contained callback query data matches the given regular
+     * expression. It returns `false` otherwise. This uses the same logic as
+     * `bot.callbackQuery`.
+     *
+     * @param trigger The string or regex to match
+     */
+    hasCallbackQuery(trigger: MaybeArray<string | RegExp>): this is CallbackQueryContext<this>;
+    /**
+     * Returns `true` if this context object contains the given game query, or
+     * if the contained game query matches the given regular expression. It
+     * returns `false` otherwise. This uses the same logic as `bot.gameQuery`.
+     *
+     * @param trigger The string or regex to match
+     */
+    hasGameQuery(trigger: MaybeArray<string | RegExp>): this is GameQueryContext<this>;
+    /**
+     * Returns `true` if this context object contains the given inline query, or
+     * if the contained inline query matches the given regular expression. It
+     * returns `false` otherwise. This uses the same logic as `bot.inlineQuery`.
+     *
+     * @param trigger The string or regex to match
+     */
+    hasInlineQuery(trigger: MaybeArray<string | RegExp>): this is InlineQueryContext<this>;
     /**
      * Context-aware alias for `api.sendMessage`. Use this method to send text messages. On success, the sent Message is returned.
      *
@@ -848,5 +984,84 @@ export declare class Context implements RenamedUpdate {
      */
     replyWithGame(game_short_name: string, other?: Other<"sendGame", "chat_id" | "game_short_name">, signal?: AbortSignal): Promise<Message.GameMessage>;
 }
+/**
+ * Type of the context object that is available inside the handlers for
+ * `bot.hears`.
+ *
+ * This helper type can be used to narrow down context objects the same way how
+ * `bot.hears` does it. This allows you to annotate context objects in
+ * middleware that is not directly passed to `bot.hears`, hence not inferring
+ * the correct type automatically. That way, handlers can be defined in separate
+ * files and still have the correct types.
+ */
+export declare type HearsContext<C extends Context> = Filter<NarrowMatch<C, string | RegExpMatchArray>, ":text" | ":caption">;
+/**
+ * Type of the context object that is available inside the handlers for
+ * `bot.command`.
+ *
+ * This helper type can be used to narrow down context objects the same way how
+ * `bot.command` does it. This allows you to annotate context objects in
+ * middleware that is not directly passed to `bot.command`, hence not inferring
+ * the correct type automatically. That way, handlers can be defined in separate
+ * files and still have the correct types.
+ */
+export declare type CommandContext<C extends Context> = Filter<NarrowMatch<C, string>, ":entities:bot_command">;
+declare type NarrowMatch<C extends Context, T extends C["match"]> = {
+    [K in keyof C]: K extends "match" ? (T extends C[K] ? T : never) : C[K];
+};
+/**
+ * Type of the context object that is available inside the handlers for
+ * `bot.callbackQuery`.
+ *
+ * This helper type can be used to annotate narrow down context objects the same
+ * way `bot.callbackQuery` does it. This allows you to how context objects in
+ * middleware that is not directly passed to `bot.callbackQuery`, hence not
+ * inferring the correct type automatically. That way, handlers can be defined
+ * in separate files and still have the correct types.
+ */
+export declare type CallbackQueryContext<C extends Context> = Filter<C, "callback_query:data">;
+/**
+ * Type of the context object that is available inside the handlers for
+ * `bot.gameQuery`.
+ *
+ * This helper type can be used to narrow down context objects the same way how
+ * `bot.gameQuery` does it. This allows you to annotate context objects in
+ * middleware that is not directly passed to `bot.gameQuery`, hence not
+ * inferring the correct type automatically. That way, handlers can be defined
+ * in separate files and still have the correct types.
+ */
+export declare type GameQueryContext<C extends Context> = Filter<C, "callback_query:game_short_name">;
+/**
+ * Type of the context object that is available inside the handlers for
+ * `bot.inlineQuery`.
+ *
+ * This helper type can be used to narrow down context objects the same way how
+ * annotate `bot.inlineQuery` does it. This allows you to context objects in
+ * middleware that is not directly passed to `bot.inlineQuery`, hence not
+ * inferring the correct type automatically. That way, handlers can be defined
+ * in separate files and still have the correct types.
+ */
+export declare type InlineQueryContext<C extends Context> = Filter<C, "inline_query">;
+/**
+ * Type of the context object that is available inside the handlers for
+ * `bot.chatType`.
+ *
+ * This helper type can be used to narrow down context objects the same way how
+ * `bot.chatType` does it. This allows you to annotate context objects in
+ * middleware that is not directly passed to `bot.chatType`, hence not inferring
+ * the correct type automatically. That way, handlers can be defined in separate
+ * files and still have the correct types.
+ */
+export declare type ChatTypeContext<C extends Context, T extends Chat["type"]> = C & Record<"update", ChatTypeUpdate<T>> & ChatType<T> & ChatTypeRecord<"msg", T> & AliasProps<ChatTypeUpdate<T>>;
+declare type ChatTypeUpdate<T extends Chat["type"]> = ChatTypeRecord<"message" | "edited_message" | "channel_post" | "edited_channel_post" | "my_chat_member" | "chat_member" | "chat_join_request", T> & Partial<Record<"callback_query", ChatTypeRecord<"message", T>>> & ConstrainUpdatesByChatType<T>;
+declare type ConstrainUpdatesByChatType<T extends Chat["type"]> = Record<[
+    T
+] extends ["channel"] ? "message" | "edited_message" : "channel_post" | "edited_channel_post", undefined>;
+declare type ChatTypeRecord<K extends string, T extends Chat["type"]> = Partial<Record<K, ChatType<T>>>;
+interface ChatType<T extends Chat["type"]> {
+    chat: {
+        type: T;
+    };
+}
 import { AbortSignal } from "./shim.node.js";
 export {};