@mtcute/dispatcher 0.13.0 → 0.13.4

package/cjs/callback-data-builder.d.ts

@@ -1,4 +1,4 @@
-import { CallbackQuery, MaybeArray, MaybePromise } from '@mtcute/core';
+import { CallbackQuery, InlineCallbackQuery, MaybeArray, MaybePromise } from '@mtcute/core';
 import { UpdateFilter } from './filters/types.js';
 /**
  * Callback data builder, inspired by [aiogram](https://github.com/aiogram/aiogram).
@@ -43,7 +43,7 @@ export declare class CallbackDataBuilder<T extends string> {
      *
      * @param params
      */
-    filter(params?: ((upd: CallbackQuery, parsed: Record<T, string>) => MaybePromise<Partial<Record<T, MaybeArray<string | RegExp>>> | boolean>) | Partial<Record<T, MaybeArray<string | RegExp>>>): UpdateFilter<CallbackQuery, {
+    filter<Update extends CallbackQuery | InlineCallbackQuery>(params?: ((upd: Update, parsed: Record<T, string>) => MaybePromise<Partial<Record<T, MaybeArray<string | RegExp>>> | boolean>) | Partial<Record<T, MaybeArray<string | RegExp>>>): UpdateFilter<Update, {
         match: Record<T, string>;
     }>;
 }

package/cjs/callback-data-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"callback-data-builder.js","sourceRoot":"","sources":["../../src/callback-data-builder.ts"],"names":[],"mappings":"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","sourcesContent":["import { CallbackQuery, MaybeArray, MaybePromise, MtArgumentError } from '@mtcute/core'\n\nimport { UpdateFilter } from './filters/types.js'\n\n/**\n * Callback data builder, inspired by [aiogram](https://github.com/aiogram/aiogram).\n *\n * This can be used to simplify management of different callbacks.\n *\n * [Learn more in the docs](/guide/topics/keyboards.html#callback-data-builders)\n */\nexport class CallbackDataBuilder<T extends string> {\n    private readonly _fields: T[]\n\n    sep = ':'\n\n    /**\n     * @param prefix  Prefix for the data. Use something unique across your bot.\n     * @param fields  Field names in the order they will be serialized.\n     */\n    constructor(\n        public prefix: string,\n        ...fields: T[]\n    ) {\n        this._fields = fields\n    }\n\n    /**\n     * Build a callback data string\n     *\n     * @param obj  Object containing the data\n     */\n    build(obj: Record<T, string>): string {\n        const ret =\n            this.prefix +\n            this.sep +\n            this._fields\n                .map((f) => {\n                    const val = obj[f]\n\n                    if (val.includes(this.sep)) {\n                        throw new MtArgumentError(\n                            `Value for ${f} ${val} contains separator ${this.sep} and cannot be used.`,\n                        )\n                    }\n\n                    return val\n                })\n                .join(this.sep)\n\n        if (ret.length > 64) {\n            throw new MtArgumentError('Resulting callback data is too long.')\n        }\n\n        return ret\n    }\n\n    /**\n     * Parse callback data to object\n     *\n     * @param data  Callback data as string\n     * @param safe  If `true`, will return `null` instead of throwing on invalid data\n     */\n    parse(data: string, safe?: false): Record<T, string>\n    parse(data: string, safe: true): Record<T, string> | null\n    parse(data: string, safe = false): Record<T, string> | null {\n        const parts = data.split(this.sep)\n\n        if (parts[0] !== this.prefix) {\n            if (safe) return null\n            throw new MtArgumentError(\n                `Invalid data passed: \"${data}\" (bad prefix, expected ${this.prefix}, got ${parts[0]})`,\n            )\n        }\n\n        if (parts.length !== this._fields.length + 1) {\n            if (safe) return null\n            throw new MtArgumentError(\n                `Invalid data passed: \"${data}\" (bad parts count, expected ${this._fields.length}, got ${\n                    parts.length - 1\n                })`,\n            )\n        }\n\n        const ret = {} as Record<T, string>\n        parts.forEach((it, idx) => {\n            if (idx === 0) return // skip prefix\n\n            ret[this._fields[idx - 1]] = it\n        })\n\n        return ret\n    }\n\n    /**\n     * Create a filter for this callback data.\n     *\n     * You can either pass an object with field names as keys and values as strings or regexes,\n     * which will be compiled to a RegExp, or a function that will be called with the parsed data.\n     * Note that the strings will be passed to `RegExp` **directly**, so you may want to escape them.\n     *\n     * When using a function, you can either return a boolean, or an object with field names as keys\n     * and values as strings or regexes. In the latter case, the resulting object will be matched\n     * against the parsed data the same way as if you passed it directly.\n     *\n     * @param params\n     */\n    filter(\n        params:\n            | ((\n                  upd: CallbackQuery,\n                  parsed: Record<T, string>,\n              ) => MaybePromise<Partial<Record<T, MaybeArray<string | RegExp>>> | boolean>)\n            | Partial<Record<T, MaybeArray<string | RegExp>>> = {},\n    ): UpdateFilter<\n        CallbackQuery,\n        {\n            match: Record<T, string>\n        }\n    > {\n        if (typeof params === 'function') {\n            return async (query) => {\n                if (!query.dataStr) return false\n\n                const data = this.parse(query.dataStr, true)\n                if (!data) return false\n\n                const fnResult = await params(query, data)\n\n                if (typeof fnResult === 'boolean') {\n                    (\n                        query as CallbackQuery & {\n                            match: Record<T, string>\n                        }\n                    ).match = data\n\n                    return fnResult\n                }\n\n                // validate result\n                for (const key in fnResult) {\n                    const value = data[key]\n                    if (value === undefined) return false\n\n                    let matchers = fnResult[key] as MaybeArray<string | RegExp>\n                    if (!Array.isArray(matchers)) matchers = [matchers]\n\n                    for (const matcher of matchers) {\n                        if (typeof matcher === 'string') {\n                            if (value !== matcher) return false\n                        } else if (!matcher.test(value)) return false\n                    }\n                }\n\n                (\n                    query as CallbackQuery & {\n                        match: Record<T, string>\n                    }\n                ).match = data\n\n                return true\n            }\n        }\n\n        const parts: string[] = []\n\n        this._fields.forEach((field) => {\n            if (!(field in params)) {\n                parts.push(`[^${this.sep}]*?`)\n\n                return\n            }\n\n            const value = params[field]\n\n            if (Array.isArray(value)) {\n                parts.push(`(${value.map((i) => (typeof i === 'string' ? i : i.source)).join('|')})`)\n            } else {\n                // noinspection SuspiciousTypeOfGuard\n                parts.push(typeof value === 'string' ? value : (value as RegExp).source)\n            }\n        })\n\n        const regex = new RegExp(`^${this.prefix}${this.sep}${parts.join(this.sep)}$`)\n\n        return (query) => {\n            const m = query.dataStr?.match(regex)\n            if (!m) return false\n            ;(\n                query as CallbackQuery & {\n                    match: Record<T, string>\n                }\n            ).match = this.parse(m[0])\n\n            return true\n        }\n    }\n}\n"]}
+{"version":3,"file":"callback-data-builder.js","sourceRoot":"","sources":["../../src/callback-data-builder.ts"],"names":[],"mappings":";;;AAAA,uCAA4G;AAI5G;;;;;;GAMG;AACH,MAAa,mBAAmB;IAUjB;IATM,OAAO,CAAK;IAE7B,GAAG,GAAG,GAAG,CAAA;IAET;;;OAGG;IACH,YACW,MAAc,EACrB,GAAG,MAAW;QADP,WAAM,GAAN,MAAM,CAAQ;QAGrB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;IACzB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,GAAsB;QACxB,MAAM,GAAG,GACL,IAAI,CAAC,MAAM;YACX,IAAI,CAAC,GAAG;YACR,IAAI,CAAC,OAAO;iBACP,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACP,MAAM,GAAG,GAAG,GAAG,CAAC,CAAC,CAAC,CAAA;gBAElB,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACzB,MAAM,IAAI,sBAAe,CACrB,aAAa,CAAC,IAAI,GAAG,uBAAuB,IAAI,CAAC,GAAG,sBAAsB,CAC7E,CAAA;gBACL,CAAC;gBAED,OAAO,GAAG,CAAA;YACd,CAAC,CAAC;iBACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAEvB,IAAI,GAAG,CAAC,MAAM,GAAG,EAAE,EAAE,CAAC;YAClB,MAAM,IAAI,sBAAe,CAAC,sCAAsC,CAAC,CAAA;QACrE,CAAC;QAED,OAAO,GAAG,CAAA;IACd,CAAC;IAUD,KAAK,CAAC,IAAY,EAAE,IAAI,GAAG,KAAK;QAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAElC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,MAAM,EAAE,CAAC;YAC3B,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAA;YACrB,MAAM,IAAI,sBAAe,CACrB,yBAAyB,IAAI,2BAA2B,IAAI,CAAC,MAAM,SAAS,KAAK,CAAC,CAAC,CAAC,GAAG,CAC1F,CAAA;QACL,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3C,IAAI,IAAI;gBAAE,OAAO,IAAI,CAAA;YACrB,MAAM,IAAI,sBAAe,CACrB,yBAAyB,IAAI,gCAAgC,IAAI,CAAC,OAAO,CAAC,MAAM,SAC5E,KAAK,CAAC,MAAM,GAAG,CACnB,GAAG,CACN,CAAA;QACL,CAAC;QAED,MAAM,GAAG,GAAG,EAAuB,CAAA;QACnC,KAAK,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE;YACtB,IAAI,GAAG,KAAK,CAAC;gBAAE,OAAM,CAAC,cAAc;YAEpC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAA;QACnC,CAAC,CAAC,CAAA;QAEF,OAAO,GAAG,CAAA;IACd,CAAC;IAED;;;;;;;;;;;;OAYG;IACH,MAAM,CACF,SAKwD,EAAE;QAO1D,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YAC/B,OAAO,KAAK,EAAE,KAAK,EAAE,EAAE;gBACnB,IAAI,CAAC,KAAK,CAAC,OAAO;oBAAE,OAAO,KAAK,CAAA;gBAEhC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;gBAC5C,IAAI,CAAC,IAAI;oBAAE,OAAO,KAAK,CAAA;gBAEvB,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;gBAE1C,IAAI,OAAO,QAAQ,KAAK,SAAS,EAAE,CAAC;oBAE5B,KAGH,CAAC,KAAK,GAAG,IAAI,CAAA;oBAEd,OAAO,QAAQ,CAAA;gBACnB,CAAC;gBAED,kBAAkB;gBAClB,KAAK,MAAM,GAAG,IAAI,QAAQ,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;oBACvB,IAAI,KAAK,KAAK,SAAS;wBAAE,OAAO,KAAK,CAAA;oBAErC,IAAI,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAgC,CAAA;oBAC3D,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC;wBAAE,QAAQ,GAAG,CAAC,QAAQ,CAAC,CAAA;oBAEnD,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;wBAC7B,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;4BAC9B,IAAI,KAAK,KAAK,OAAO;gCAAE,OAAO,KAAK,CAAA;wBACvC,CAAC;6BAAM,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;4BAAE,OAAO,KAAK,CAAA;oBACjD,CAAC;gBACL,CAAC;gBAGG,KAGH,CAAC,KAAK,GAAG,IAAI,CAAA;gBAEd,OAAO,IAAI,CAAA;YACf,CAAC,CAAA;QACL,CAAC;QAED,MAAM,KAAK,GAAa,EAAE,CAAA;QAE1B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC3B,IAAI,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,EAAE,CAAC;gBACrB,KAAK,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,KAAK,CAAC,CAAA;gBAE9B,OAAM;YACV,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;YAE3B,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvB,KAAK,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;YACzF,CAAC;iBAAM,CAAC;gBACJ,qCAAqC;gBACrC,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAE,KAAgB,CAAC,MAAM,CAAC,CAAA;YAC5E,CAAC;QACL,CAAC,CAAC,CAAA;QAEF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAE9E,OAAO,CAAC,KAAK,EAAE,EAAE;YACb,MAAM,CAAC,GAAG,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,CAAA;YACrC,IAAI,CAAC,CAAC;gBAAE,OAAO,KAAK,CACnB;YACG,KAGH,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;YAE1B,OAAO,IAAI,CAAA;QACf,CAAC,CAAA;IACL,CAAC;CACJ;AA1LD,kDA0LC","sourcesContent":["import { CallbackQuery, InlineCallbackQuery, MaybeArray, MaybePromise, MtArgumentError } from '@mtcute/core'\n\nimport { UpdateFilter } from './filters/types.js'\n\n/**\n * Callback data builder, inspired by [aiogram](https://github.com/aiogram/aiogram).\n *\n * This can be used to simplify management of different callbacks.\n *\n * [Learn more in the docs](/guide/topics/keyboards.html#callback-data-builders)\n */\nexport class CallbackDataBuilder<T extends string> {\n    private readonly _fields: T[]\n\n    sep = ':'\n\n    /**\n     * @param prefix  Prefix for the data. Use something unique across your bot.\n     * @param fields  Field names in the order they will be serialized.\n     */\n    constructor(\n        public prefix: string,\n        ...fields: T[]\n    ) {\n        this._fields = fields\n    }\n\n    /**\n     * Build a callback data string\n     *\n     * @param obj  Object containing the data\n     */\n    build(obj: Record<T, string>): string {\n        const ret =\n            this.prefix +\n            this.sep +\n            this._fields\n                .map((f) => {\n                    const val = obj[f]\n\n                    if (val.includes(this.sep)) {\n                        throw new MtArgumentError(\n                            `Value for ${f} ${val} contains separator ${this.sep} and cannot be used.`,\n                        )\n                    }\n\n                    return val\n                })\n                .join(this.sep)\n\n        if (ret.length > 64) {\n            throw new MtArgumentError('Resulting callback data is too long.')\n        }\n\n        return ret\n    }\n\n    /**\n     * Parse callback data to object\n     *\n     * @param data  Callback data as string\n     * @param safe  If `true`, will return `null` instead of throwing on invalid data\n     */\n    parse(data: string, safe?: false): Record<T, string>\n    parse(data: string, safe: true): Record<T, string> | null\n    parse(data: string, safe = false): Record<T, string> | null {\n        const parts = data.split(this.sep)\n\n        if (parts[0] !== this.prefix) {\n            if (safe) return null\n            throw new MtArgumentError(\n                `Invalid data passed: \"${data}\" (bad prefix, expected ${this.prefix}, got ${parts[0]})`,\n            )\n        }\n\n        if (parts.length !== this._fields.length + 1) {\n            if (safe) return null\n            throw new MtArgumentError(\n                `Invalid data passed: \"${data}\" (bad parts count, expected ${this._fields.length}, got ${\n                    parts.length - 1\n                })`,\n            )\n        }\n\n        const ret = {} as Record<T, string>\n        parts.forEach((it, idx) => {\n            if (idx === 0) return // skip prefix\n\n            ret[this._fields[idx - 1]] = it\n        })\n\n        return ret\n    }\n\n    /**\n     * Create a filter for this callback data.\n     *\n     * You can either pass an object with field names as keys and values as strings or regexes,\n     * which will be compiled to a RegExp, or a function that will be called with the parsed data.\n     * Note that the strings will be passed to `RegExp` **directly**, so you may want to escape them.\n     *\n     * When using a function, you can either return a boolean, or an object with field names as keys\n     * and values as strings or regexes. In the latter case, the resulting object will be matched\n     * against the parsed data the same way as if you passed it directly.\n     *\n     * @param params\n     */\n    filter<Update extends CallbackQuery | InlineCallbackQuery>(\n        params:\n            | ((\n                  upd: Update,\n                  parsed: Record<T, string>,\n              ) => MaybePromise<Partial<Record<T, MaybeArray<string | RegExp>>> | boolean>)\n            | Partial<Record<T, MaybeArray<string | RegExp>>> = {},\n    ): UpdateFilter<\n        Update,\n        {\n            match: Record<T, string>\n        }\n    > {\n        if (typeof params === 'function') {\n            return async (query) => {\n                if (!query.dataStr) return false\n\n                const data = this.parse(query.dataStr, true)\n                if (!data) return false\n\n                const fnResult = await params(query, data)\n\n                if (typeof fnResult === 'boolean') {\n                    (\n                        query as Update & {\n                            match: Record<T, string>\n                        }\n                    ).match = data\n\n                    return fnResult\n                }\n\n                // validate result\n                for (const key in fnResult) {\n                    const value = data[key]\n                    if (value === undefined) return false\n\n                    let matchers = fnResult[key] as MaybeArray<string | RegExp>\n                    if (!Array.isArray(matchers)) matchers = [matchers]\n\n                    for (const matcher of matchers) {\n                        if (typeof matcher === 'string') {\n                            if (value !== matcher) return false\n                        } else if (!matcher.test(value)) return false\n                    }\n                }\n\n                (\n                    query as Update & {\n                        match: Record<T, string>\n                    }\n                ).match = data\n\n                return true\n            }\n        }\n\n        const parts: string[] = []\n\n        this._fields.forEach((field) => {\n            if (!(field in params)) {\n                parts.push(`[^${this.sep}]*?`)\n\n                return\n            }\n\n            const value = params[field]\n\n            if (Array.isArray(value)) {\n                parts.push(`(${value.map((i) => (typeof i === 'string' ? i : i.source)).join('|')})`)\n            } else {\n                // noinspection SuspiciousTypeOfGuard\n                parts.push(typeof value === 'string' ? value : (value as RegExp).source)\n            }\n        })\n\n        const regex = new RegExp(`^${this.prefix}${this.sep}${parts.join(this.sep)}$`)\n\n        return (query) => {\n            const m = query.dataStr?.match(regex)\n            if (!m) return false\n            ;(\n                query as Update & {\n                    match: Record<T, string>\n                }\n            ).match = this.parse(m[0])\n\n            return true\n        }\n    }\n}\n"]}

package/cjs/context/parse.d.ts

@@ -2,12 +2,12 @@ import { ParsedUpdate } from '@mtcute/core';
 import { TelegramClient } from '@mtcute/core/client.js';
 import { UpdateContextDistributed } from './base.js';
 import { BusinessMessageContext } from './business-message.js';
-import { CallbackQueryContext } from './callback-query.js';
+import { CallbackQueryContext, InlineCallbackQueryContext } from './callback-query.js';
 import { ChatJoinRequestUpdateContext } from './chat-join-request.js';
 import { ChosenInlineResultContext } from './chosen-inline-result.js';
 import { InlineQueryContext } from './inline-query.js';
 import { MessageContext } from './message.js';
 import { PreCheckoutQueryContext } from './pre-checkout-query.js';
 /** @internal */
-export declare function _parsedUpdateToContext(client: TelegramClient, update: ParsedUpdate): BusinessMessageContext | CallbackQueryContext | ChatJoinRequestUpdateContext | ChosenInlineResultContext | InlineQueryContext | MessageContext | PreCheckoutQueryContext | UpdateContextDistributed<import("@mtcute/core").DeleteMessageUpdate | import("@mtcute/core").ChatMemberUpdate | import("@mtcute/core").InlineCallbackQuery | import("@mtcute/core").PollUpdate | import("@mtcute/core").PollVoteUpdate | import("@mtcute/core").UserStatusUpdate | import("@mtcute/core").UserTypingUpdate | import("@mtcute/core").HistoryReadUpdate | import("@mtcute/core").BotStoppedUpdate | import("@mtcute/core").ChatJoinRequestUpdate | import("@mtcute/core").StoryUpdate | import("@mtcute/core").DeleteStoryUpdate | import("@mtcute/core").BotReactionUpdate | import("@mtcute/core").BotReactionCountUpdate | import("@mtcute/core").BusinessConnection | import("@mtcute/core").DeleteBusinessMessageUpdate>;
+export declare function _parsedUpdateToContext(client: TelegramClient, update: ParsedUpdate): BusinessMessageContext | CallbackQueryContext | InlineCallbackQueryContext | ChatJoinRequestUpdateContext | ChosenInlineResultContext | InlineQueryContext | MessageContext | PreCheckoutQueryContext | UpdateContextDistributed<import("@mtcute/core").DeleteMessageUpdate | import("@mtcute/core").ChatMemberUpdate | import("@mtcute/core").PollUpdate | import("@mtcute/core").PollVoteUpdate | import("@mtcute/core").UserStatusUpdate | import("@mtcute/core").UserTypingUpdate | import("@mtcute/core").HistoryReadUpdate | import("@mtcute/core").BotStoppedUpdate | import("@mtcute/core").ChatJoinRequestUpdate | import("@mtcute/core").StoryUpdate | import("@mtcute/core").DeleteStoryUpdate | import("@mtcute/core").BotReactionUpdate | import("@mtcute/core").BotReactionCountUpdate | import("@mtcute/core").BusinessConnection | import("@mtcute/core").DeleteBusinessMessageUpdate>;
 export type UpdateContextType = ReturnType<typeof _parsedUpdateToContext>;

package/cjs/context/parse.js

@@ -21,6 +21,8 @@ function _parsedUpdateToContext(client, update) {
             return new chosen_inline_result_js_1.ChosenInlineResultContext(client, update.data);
         case 'callback_query':
             return new callback_query_js_1.CallbackQueryContext(client, update.data);
+        case 'inline_callback_query':
+            return new callback_query_js_1.InlineCallbackQueryContext(client, update.data);
         case 'bot_chat_join_request':
             return new chat_join_request_js_1.ChatJoinRequestUpdateContext(client, update.data);
         case 'pre_checkout_query':

package/cjs/context/parse.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/context/parse.ts"],"names":[],"mappings":";;;AAIA,+DAA8D;AAC9D,2DAA0D;AAC1D,iEAAqE;AACrE,uEAAqE;AACrE,uDAAsD;AACtD,6CAA6C;AAC7C,mEAAiE;AAEjE,gBAAgB;AAChB,SAAgB,sBAAsB,CAAC,MAAsB,EAAE,MAAoB;IAC/E,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,aAAa,CAAC;QACnB,KAAK,cAAc,CAAC;QACpB,KAAK,eAAe;YAChB,OAAO,IAAI,2BAAc,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAClD,KAAK,cAAc;YACf,OAAO,IAAI,oCAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QACtD,KAAK,sBAAsB;YACvB,OAAO,IAAI,mDAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC7D,KAAK,gBAAgB;YACjB,OAAO,IAAI,wCAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QACxD,KAAK,uBAAuB;YACxB,OAAO,IAAI,mDAA4B,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAChE,KAAK,oBAAoB;YACrB,OAAO,IAAI,+CAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC3D,KAAK,sBAAsB,CAAC;QAC5B,KAAK,uBAAuB,CAAC;QAC7B,KAAK,wBAAwB;YACzB,OAAO,IAAI,4CAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;IAC9D,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAoD,CAAA;IAC3E,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;IACvB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAA;IAE3B,OAAO,OAAO,CAAA;AAClB,CAAC;AA3BD,wDA2BC","sourcesContent":["import { ParsedUpdate } from '@mtcute/core'\nimport { TelegramClient } from '@mtcute/core/client.js'\n\nimport { UpdateContextDistributed } from './base.js'\nimport { BusinessMessageContext } from './business-message.js'\nimport { CallbackQueryContext } from './callback-query.js'\nimport { ChatJoinRequestUpdateContext } from './chat-join-request.js'\nimport { ChosenInlineResultContext } from './chosen-inline-result.js'\nimport { InlineQueryContext } from './inline-query.js'\nimport { MessageContext } from './message.js'\nimport { PreCheckoutQueryContext } from './pre-checkout-query.js'\n\n/** @internal */\nexport function _parsedUpdateToContext(client: TelegramClient, update: ParsedUpdate) {\n    switch (update.name) {\n        case 'new_message':\n        case 'edit_message':\n        case 'message_group':\n            return new MessageContext(client, update.data)\n        case 'inline_query':\n            return new InlineQueryContext(client, update.data)\n        case 'chosen_inline_result':\n            return new ChosenInlineResultContext(client, update.data)\n        case 'callback_query':\n            return new CallbackQueryContext(client, update.data)\n        case 'bot_chat_join_request':\n            return new ChatJoinRequestUpdateContext(client, update.data)\n        case 'pre_checkout_query':\n            return new PreCheckoutQueryContext(client, update.data)\n        case 'new_business_message':\n        case 'edit_business_message':\n        case 'business_message_group':\n            return new BusinessMessageContext(client, update.data)\n    }\n\n    const _update = update.data as UpdateContextDistributed<typeof update.data>\n    _update.client = client\n    _update._name = update.name\n\n    return _update\n}\n\nexport type UpdateContextType = ReturnType<typeof _parsedUpdateToContext>\n"]}
+{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../../src/context/parse.ts"],"names":[],"mappings":";;;AAIA,+DAA8D;AAC9D,2DAAsF;AACtF,iEAAqE;AACrE,uEAAqE;AACrE,uDAAsD;AACtD,6CAA6C;AAC7C,mEAAiE;AAEjE,gBAAgB;AAChB,SAAgB,sBAAsB,CAAC,MAAsB,EAAE,MAAoB;IAC/E,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QAClB,KAAK,aAAa,CAAC;QACnB,KAAK,cAAc,CAAC;QACpB,KAAK,eAAe;YAChB,OAAO,IAAI,2BAAc,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAClD,KAAK,cAAc;YACf,OAAO,IAAI,oCAAkB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QACtD,KAAK,sBAAsB;YACvB,OAAO,IAAI,mDAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC7D,KAAK,gBAAgB;YACjB,OAAO,IAAI,wCAAoB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QACxD,KAAK,uBAAuB;YACxB,OAAO,IAAI,8CAA0B,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC9D,KAAK,uBAAuB;YACxB,OAAO,IAAI,mDAA4B,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAChE,KAAK,oBAAoB;YACrB,OAAO,IAAI,+CAAuB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;QAC3D,KAAK,sBAAsB,CAAC;QAC5B,KAAK,uBAAuB,CAAC;QAC7B,KAAK,wBAAwB;YACzB,OAAO,IAAI,4CAAsB,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAA;IAC9D,CAAC;IAED,MAAM,OAAO,GAAG,MAAM,CAAC,IAAoD,CAAA;IAC3E,OAAO,CAAC,MAAM,GAAG,MAAM,CAAA;IACvB,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAA;IAE3B,OAAO,OAAO,CAAA;AAClB,CAAC;AA7BD,wDA6BC","sourcesContent":["import { ParsedUpdate } from '@mtcute/core'\nimport { TelegramClient } from '@mtcute/core/client.js'\n\nimport { UpdateContextDistributed } from './base.js'\nimport { BusinessMessageContext } from './business-message.js'\nimport { CallbackQueryContext, InlineCallbackQueryContext } from './callback-query.js'\nimport { ChatJoinRequestUpdateContext } from './chat-join-request.js'\nimport { ChosenInlineResultContext } from './chosen-inline-result.js'\nimport { InlineQueryContext } from './inline-query.js'\nimport { MessageContext } from './message.js'\nimport { PreCheckoutQueryContext } from './pre-checkout-query.js'\n\n/** @internal */\nexport function _parsedUpdateToContext(client: TelegramClient, update: ParsedUpdate) {\n    switch (update.name) {\n        case 'new_message':\n        case 'edit_message':\n        case 'message_group':\n            return new MessageContext(client, update.data)\n        case 'inline_query':\n            return new InlineQueryContext(client, update.data)\n        case 'chosen_inline_result':\n            return new ChosenInlineResultContext(client, update.data)\n        case 'callback_query':\n            return new CallbackQueryContext(client, update.data)\n        case 'inline_callback_query':\n            return new InlineCallbackQueryContext(client, update.data)\n        case 'bot_chat_join_request':\n            return new ChatJoinRequestUpdateContext(client, update.data)\n        case 'pre_checkout_query':\n            return new PreCheckoutQueryContext(client, update.data)\n        case 'new_business_message':\n        case 'edit_business_message':\n        case 'business_message_group':\n            return new BusinessMessageContext(client, update.data)\n    }\n\n    const _update = update.data as UpdateContextDistributed<typeof update.data>\n    _update.client = client\n    _update._name = update.name\n\n    return _update\n}\n\nexport type UpdateContextType = ReturnType<typeof _parsedUpdateToContext>\n"]}

package/cjs/dispatcher.d.ts

@@ -362,6 +362,29 @@ export declare class Dispatcher<State extends object = never> {
      * @param group  Handler group index
      */
     onSceneTransition(handler: ((ctx: SceneTransitionContext, state: UpdateState<State>) => MaybePromise<PropagationAction | void>) | null): void;
+    /**
+     * Register a callback query (both inline and non-inline) handler without any filters
+     *
+     * @param handler  Callback query handler
+     * @param group  Handler group index
+     */
+    onAnyCallbackQuery(handler: CallbackQueryHandler<CallbackQueryContext | InlineCallbackQueryContext, State extends never ? never : UpdateState<State>>['callback'], group?: number): void;
+    /**
+     * Register a callback query (both inline and non-inline) handler with a filter
+     *
+     * @param filter  Update filter
+     * @param handler  Callback query handler
+     * @param group  Handler group index
+     */
+    onAnyCallbackQuery<Mod>(filter: UpdateFilter<CallbackQueryContext | InlineCallbackQueryContext, Mod, State>, handler: CallbackQueryHandler<filters.Modify<CallbackQueryContext | InlineCallbackQueryContext, Mod>, State extends never ? never : UpdateState<State>>['callback'], group?: number): void;
+    /**
+     * Register a callback query (both inline and non-inline) handler with a filter
+     *
+     * @param filter  Update filter
+     * @param handler  Callback query handler
+     * @param group  Handler group index
+     */
+    onAnyCallbackQuery<Mod>(filter: UpdateFilter<CallbackQueryContext | InlineCallbackQueryContext, Mod>, handler: CallbackQueryHandler<filters.Modify<CallbackQueryContext | InlineCallbackQueryContext, Mod>, State extends never ? never : UpdateState<State>>['callback'], group?: number): void;
     /**
      * Register a new message handler without any filters
      *

package/cjs/dispatcher.js

@@ -783,6 +783,11 @@ class Dispatcher {
             this._sceneTransitionHandler = undefined;
     }
     /** @internal */
+    onAnyCallbackQuery(filter, handler, group) {
+        this._addKnownHandler('callback_query', filter, handler, group);
+        this._addKnownHandler('inline_callback_query', filter, handler, group);
+    }
+    /** @internal */
     onNewMessage(filter, handler, group) {
         this._addKnownHandler('new_message', filter, handler, group);
     }