grammy 1.9.2 → 1.11.0

package/README.md

@@ -96,7 +96,7 @@ Includes a setup to easily run any of them.
 —Telegram chat where you can ask any question about grammY or bots in general.
 We are also open for feedback, ideas, and contributions!
 
-The Russian commnity chat can be found [here](https://t.me/grammyjs_ru).
+The Russian community chat can be found [here](https://t.me/grammyjs_ru).
 
 ### [grammY News Channel](https://t.me/grammyjs_news)
 
@@ -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,13 @@ 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>
+    <td align="center"><a href="https://github.com/mcpeblocker"><img src="https://avatars.githubusercontent.com/u/59408255?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Alisher Ortiqov</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=mcpeblocker" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/tonytkachenko"><img src="https://avatars.githubusercontent.com/u/103267335?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Tony Tkachenko</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=tonytkachenko" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/rainrisa"><img src="https://avatars.githubusercontent.com/u/108156134?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ra</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=rainrisa" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/sartoshi-foot-dao"><img src="https://avatars.githubusercontent.com/u/99770068?v=4?s=100" width="100px;" alt=""/><br /><sub><b>sartoshi-foot-dao</b></sub></a><br /><a href="https://github.com/grammyjs/grammY/commits?author=sartoshi-foot-dao" 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.
  */
@@ -150,7 +150,7 @@ export declare class Bot<C extends Context = Context, A extends Api = Api> exten
      * unless a manual value is already set.
      *
      * Note that the recommended way to set a custom bot information object is
-     * to pass it to the configuration object of the `new Bot()` instatiation,
+     * to pass it to the configuration object of the `new Bot()` instantiation,
      * rather than assigning this property.
      */
     set botInfo(botInfo: UserFromGetMe);

package/out/bot.js

@@ -85,7 +85,7 @@ class Bot extends composer_js_1.Composer {
      * unless a manual value is already set.
      *
      * Note that the recommended way to set a custom bot information object is
-     * to pass it to the configuration object of the `new Bot()` instatiation,
+     * to pass it to the configuration object of the `new Bot()` instantiation,
      * rather than assigning this property.
      */
     set botInfo(botInfo) {

package/out/composer.d.ts

@@ -1,9 +1,7 @@
-import { type AliasProps, type Context } from "./context.js";
+import { type CallbackQueryContext, type ChatTypeContext, type CommandContext, Context, type GameQueryContext, type HearsContext, type InlineQueryContext, type MaybeArray, type StringWithSuggestions } from "./context.js";
 import { type Filter, type FilterQuery } from "./filter.js";
-import { type Chat } from "./platform.node.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.
@@ -311,7 +309,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * ```ts
      * bot.on('callback_query:data', ctx => { ... })
      * ```
-     * but it also allows you match the query data agains a given text or
+     * but it also allows you to match the query data against a given text or
      * regular expression.
      *
      * ```ts
@@ -352,7 +350,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * ```ts
      * bot.on('callback_query:game_short_name', ctx => { ... })
      * ```
-     * but it also allows you match the query data agains a given text or
+     * but it also allows you to match the query data against a given text or
      * regular expression.
      *
      * You can pass an array of triggers. Your middleware will be executed if at
@@ -395,7 +393,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * skipped and the next middleware will be executed.
      *
      * This method has two signatures. The first one is straightforward, it is
-     * the one described above. Note that the predicate may be asyncronous, i.e.
+     * the one described above. Note that the predicate may be asynchronous, i.e.
      * it can return a Promise of a boolean.
      *
      * Alternatively, you can pass a function that has a type predicate as
@@ -431,7 +429,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * other words, the middleware will only be executed if the given predicate
      * returns `false` for the given context object. Otherwise, it will be
      * skipped and the next middleware will be executed. Note that the predicate
-     * may be asyncronous, i.e. it can return a Promise of a boolean.
+     * may be asynchronous, i.e. it can return a Promise of a boolean.
      *
      * This method is the same using `filter` (normal usage) with a negated
      * predicate.
@@ -522,7 +520,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * middleware if your route function returns `undefined`, or if the key
      * returned by your router has no middleware associated with it.
      *
-     * This method may need less setup than first instanciating a `Router`, but
+     * This method may need less setup than first instantiating a `Router`, but
      * for more complex setups, having a `Router` may be more readable.
      *
      * @param router The routing function to use
@@ -538,7 +536,7 @@ export declare class Composer<C extends Context> implements MiddlewareObj<C> {
      * This method takes a predicate function that is tested once per context
      * object. If it returns `true`, the first supplied middleware is executed.
      * If it returns `false`, the second supplied middleware is executed. Note
-     * that the predicate may be asyncronous, i.e. it can return a Promise of a
+     * that the predicate may be asynchronous, i.e. it can return a Promise of a
      * boolean.
      *
      * @param predicate The predicate to check
@@ -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 place. For instance, this allows for more
+ * modular code where handlers are defined in separate files.
+ */
 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
@@ -361,7 +318,7 @@ class Composer {
      * ```ts
      * bot.on('callback_query:data', ctx => { ... })
      * ```
-     * but it also allows you match the query data agains a given text or
+     * but it also allows you to match the query data against a given text or
      * regular expression.
      *
      * ```ts
@@ -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
@@ -405,7 +361,7 @@ class Composer {
      * ```ts
      * bot.on('callback_query:game_short_name', ctx => { ... })
      * ```
-     * but it also allows you match the query data agains a given text or
+     * but it also allows you to match the query data against a given text or
      * regular expression.
      *
      * You can pass an array of triggers. Your middleware will be executed if at
@@ -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);
@@ -457,7 +411,7 @@ class Composer {
      * other words, the middleware will only be executed if the given predicate
      * returns `false` for the given context object. Otherwise, it will be
      * skipped and the next middleware will be executed. Note that the predicate
-     * may be asyncronous, i.e. it can return a Promise of a boolean.
+     * may be asynchronous, i.e. it can return a Promise of a boolean.
      *
      * This method is the same using `filter` (normal usage) with a negated
      * predicate.
@@ -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);
         });
     }
@@ -561,7 +515,7 @@ class Composer {
      * middleware if your route function returns `undefined`, or if the key
      * returned by your router has no middleware associated with it.
      *
-     * This method may need less setup than first instanciating a `Router`, but
+     * This method may need less setup than first instantiating a `Router`, but
      * for more complex setups, having a `Router` may be more readable.
      *
      * @param router The routing function to use
@@ -585,7 +539,7 @@ class Composer {
      * This method takes a predicate function that is tested once per context
      * object. If it returns `true`, the first supplied middleware is executed.
      * If it returns `false`, the second supplied middleware is executed. Note
-     * that the predicate may be asyncronous, i.e. it can return a Promise of a
+     * that the predicate may be asynchronous, i.e. it can return a Promise of a
      * boolean.
      *
      * @param predicate The predicate to check
@@ -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];
-}