grammy 1.6.2 → 1.7.2

package/out/filter.d.ts

@@ -1,5 +1,5 @@
-import { AliasProps, Context } from "./context.js";
-import { Update } from "./platform.node.js";
+import { type AliasProps, type Context } from "./context.js";
+import { type Update } from "./platform.node.js";
 declare type FilterFunction<C extends Context, D extends C> = (ctx: C) => ctx is D;
 /**
  * > This is an advanced function of grammY.
@@ -352,11 +352,11 @@ declare const UPDATE_KEYS: {
 };
 declare type KeyOf<T> = string & keyof T;
 declare type S = typeof UPDATE_KEYS;
-declare type L1 = KeyOf<S>;
-declare type L2<K extends L1 = L1> = K extends unknown ? `${K}:${KeyOf<S[K]>}` : never;
-declare type L3<K0 extends L1 = L1> = K0 extends unknown ? L3_<K0> : never;
-declare type L3_<K0 extends L1, K1 extends KeyOf<S[K0]> = KeyOf<S[K0]>> = K1 extends unknown ? `${K0}:${K1}:${KeyOf<S[K0][K1]>}` : never;
-declare type L123 = L1 | L2 | L3;
+declare type L1S = KeyOf<S>;
+declare type L2S<L1 extends L1S = L1S> = L1 extends unknown ? `${L1}:${KeyOf<S[L1]>}` : never;
+declare type L3S<L1 extends L1S = L1S> = L1 extends unknown ? L3S_<L1> : never;
+declare type L3S_<L1 extends L1S, L2 extends KeyOf<S[L1]> = KeyOf<S[L1]>> = L2 extends unknown ? `${L1}:${L2}:${KeyOf<S[L1][L2]>}` : never;
+declare type L123 = L1S | L2S | L3S;
 declare type InjectShortcuts<Q extends L123 = L123> = Q extends `${infer R}:${infer S}:${infer T}` ? `${CollapseL1<R, L1Shortcuts>}:${CollapseL2<S, L2Shortcuts>}:${T}` : Q extends `${infer R}:${infer S}` ? `${CollapseL1<R, L1Shortcuts>}:${CollapseL2<S>}` : CollapseL1<Q>;
 declare type CollapseL1<Q extends string, L extends L1Shortcuts = Exclude<L1Shortcuts, "">> = Q | (L extends string ? Q extends typeof L1_SHORTCUTS[L][number] ? L : never : never);
 declare type CollapseL2<Q extends string, L extends L2Shortcuts = Exclude<L2Shortcuts, "">> = Q | (L extends string ? Q extends typeof L2_SHORTCUTS[L][number] ? L : never : never);
@@ -388,14 +388,17 @@ declare type NotUndefined = string | number | boolean | SomeObject;
  * Given a FilterQuery, returns an object that, when intersected with an Update,
  * marks those properties as required that are guaranteed to exist.
  */
-declare type RunQuery<Q extends string> = L1Combinations<Q, L1Parts<Q>>;
-declare type L1Combinations<Q extends string, L1 extends string> = Combine<L1Fields<Q, L1>, L1>;
-declare type L1Fields<Q extends string, L1 extends string> = L1 extends unknown ? Record<L1, L2Combinations<L2Parts<Q, L1>>> : never;
-declare type L2Combinations<L2 extends string> = [L2] extends [never] ? NotUndefined : Combine<L2Fields<L2>, L2>;
-declare type L2Fields<L2 extends string> = L2 extends unknown ? Record<L2 | Twins<L2>, NotUndefined> : never;
+declare type RunQuery<Q extends string> = L1Discriminator<Q, L1Parts<Q>>;
+declare type L1Parts<Q extends string> = Q extends `${infer L1}:${string}` ? L1 : Q;
+declare type L2Parts<Q extends string, L1 extends string> = Q extends `${L1}:${infer L2}:${string}` ? L2 : Q extends `${L1}:${infer L2}` ? L2 : never;
+declare type L1Discriminator<Q extends string, L1 extends string> = Combine<L1Fragment<Q, L1>, L1>;
+declare type L1Fragment<Q extends string, L1 extends string> = L1 extends unknown ? Record<L1, L2Discriminator<L1, L2Parts<Q, L1>>> : never;
+declare type L2Discriminator<L1 extends string, L2 extends string> = [L2] extends [
+    never
+] ? L2ShallowFragment<L1> : Combine<L2Fragment<L1, L2>, L2>;
+declare type L2Fragment<L1 extends string, L2 extends string> = L2 extends unknown ? Record<L2 | AddTwins<L1, L2>, NotUndefined> : never;
+declare type L2ShallowFragment<L1 extends string> = Record<AddTwins<L1, never>, NotUndefined>;
 declare type Combine<U, K extends string> = U extends unknown ? U & Partial<Record<Exclude<K, keyof U>, undefined>> : never;
-declare type L1Parts<Q extends string> = Q extends `${infer U}:${string}` ? U : Q;
-declare type L2Parts<Q extends string, P extends string> = Q extends `${P}:${infer U}:${string}` ? U : Q extends `${P}:${infer U}` ? U : never;
 /**
  * This type infers which properties will be present on the given context object
  * provided it matches the given filter query. If the filter query is a union
@@ -411,6 +414,7 @@ declare type FilteredContext<C extends Context, U extends Update> = C & Record<"
 interface Shortcuts<U extends Update> {
     msg: [U["callback_query"]] extends [SomeObject] ? U["callback_query"]["message"] : [U["message"]] extends [SomeObject] ? U["message"] : [U["edited_message"]] extends [SomeObject] ? U["edited_message"] : [U["channel_post"]] extends [SomeObject] ? U["channel_post"] : [U["edited_channel_post"]] extends [SomeObject] ? U["edited_channel_post"] : undefined;
     chat: [U["callback_query"]] extends [SomeObject] ? NonNullable<U["callback_query"]["message"]>["chat"] | undefined : [Shortcuts<U>["msg"]] extends [SomeObject] ? Shortcuts<U>["msg"]["chat"] : [U["my_chat_member"]] extends [SomeObject] ? U["my_chat_member"]["chat"] : [U["chat_member"]] extends [SomeObject] ? U["chat_member"]["chat"] : [U["chat_join_request"]] extends [SomeObject] ? U["chat_join_request"]["chat"] : undefined;
+    senderChat: [Shortcuts<U>["msg"]] extends [SomeObject] ? Shortcuts<U>["msg"]["sender_chat"] : undefined;
     from: [U["callback_query"]] extends [SomeObject] ? U["callback_query"]["from"] : [U["inline_query"]] extends [SomeObject] ? U["inline_query"]["from"] : [U["shipping_query"]] extends [SomeObject] ? U["shipping_query"]["from"] : [U["pre_checkout_query"]] extends [SomeObject] ? U["pre_checkout_query"]["from"] : [U["chosen_inline_result"]] extends [SomeObject] ? U["chosen_inline_result"]["from"] : [U["message"]] extends [SomeObject] ? NonNullable<U["message"]["from"]> : [U["edited_message"]] extends [SomeObject] ? NonNullable<U["edited_message"]["from"]> : [U["my_chat_member"]] extends [SomeObject] ? U["my_chat_member"]["from"] : [U["chat_member"]] extends [SomeObject] ? U["chat_member"]["from"] : [U["chat_join_request"]] extends [SomeObject] ? U["chat_join_request"]["from"] : undefined;
 }
 declare const L1_SHORTCUTS: {
@@ -425,16 +429,29 @@ declare const L2_SHORTCUTS: {
 };
 declare type L1Shortcuts = KeyOf<typeof L1_SHORTCUTS>;
 declare type L2Shortcuts = KeyOf<typeof L2_SHORTCUTS>;
-declare type ExpandShortcuts<Q extends string> = Q extends `${infer R}:${infer S}:${infer T}` ? `${ExpandL1<R>}:${ExpandL2<S>}:${T}` : Q extends `${infer R}:${infer S}` ? `${ExpandL1<R>}:${ExpandL2<S>}` : ExpandL1<Q>;
+declare type ExpandShortcuts<Q extends string> = Q extends `${infer L1}:${infer L2}:${infer L3}` ? `${ExpandL1<L1>}:${ExpandL2<L2>}:${L3}` : Q extends `${infer L1}:${infer L2}` ? `${ExpandL1<L1>}:${ExpandL2<L2>}` : ExpandL1<Q>;
 declare type ExpandL1<S extends string> = S extends L1Shortcuts ? typeof L1_SHORTCUTS[S][number] : S;
 declare type ExpandL2<S extends string> = S extends L2Shortcuts ? typeof L2_SHORTCUTS[S][number] : S;
-declare type Twins<V extends string> = V extends KeyOf<Equivalents> ? Equivalents[V] : V;
-declare type Equivalents = {
+declare type AddTwins<L1 extends string, L2 extends string> = TwinsFromL1<L1, L2> | TwinsFromL2<L1, L2>;
+declare type TwinsFromL1<L1 extends string, L2 extends string> = L1 extends KeyOf<L1Equivalents> ? L1Equivalents[L1] : L2;
+declare type L1Equivalents = {
+    message: "from";
+    edited_message: "from" | "edit_date";
+    channel_post: "sender_chat";
+    edited_channel_post: "sender_chat" | "edit_date";
+};
+declare type TwinsFromL2<L1 extends string, L2 extends string> = L1 extends KeyOf<L2Equivalents> ? L2 extends KeyOf<L2Equivalents[L1]> ? L2Equivalents[L1][L2] : L2 : L2;
+declare type L2Equivalents = {
+    message: MessageEquivalents;
+    edited_message: MessageEquivalents;
+    channel_post: MessageEquivalents;
+    edited_channel_post: MessageEquivalents;
+};
+declare type MessageEquivalents = {
     animation: "document";
-    entities: TextMessages;
+    entities: "text";
     caption: CaptionMessages;
     caption_entities: CaptionMessages;
 };
-declare type TextMessages = "text";
 declare type CaptionMessages = "animation" | "audio" | "document" | "photo" | "video" | "voice";
 export {};

package/out/mod.d.ts

@@ -1,14 +1,11 @@
-export { Bot, BotError } from "./bot.js";
-export type { BotConfig, ErrorHandler, PollingOptions } from "./bot.js";
+export { Bot, type BotConfig, BotError, type ErrorHandler, type PollingOptions, } from "./bot.js";
 export { InputFile } from "./platform.node.js";
 export { Context } from "./context.js";
 export * from "./convenience/keyboard.js";
 export * from "./convenience/session.js";
 export * from "./convenience/webhook.js";
-export { Composer } from "./composer.js";
-export type { Middleware, MiddlewareFn, MiddlewareObj, NextFunction, } from "./composer.js";
-export { matchFilter } from "./filter.js";
-export type { Filter, FilterQuery } from "./filter.js";
+export { Composer, type Middleware, type MiddlewareFn, type MiddlewareObj, type NextFunction, } from "./composer.js";
+export { type Filter, type FilterQuery, matchFilter } from "./filter.js";
 export { Api } from "./core/api.js";
-export type { ApiCallFn, ApiClientOptions, RawApi, TransformableApi, Transformer, WebhookReplyEnvelope, } from "./core/client.js";
+export { type ApiCallFn, type ApiClientOptions, type RawApi, type TransformableApi, type Transformer, type WebhookReplyEnvelope, } from "./core/client.js";
 export { GrammyError, HttpError } from "./core/error.js";

package/out/mod.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/out/platform.node.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { InputFileProxy } from "@grammyjs/types";
+import { type InputFileProxy } from "@grammyjs/types";
 import { Agent as HttpAgent } from "http";
 import { Agent as HttpsAgent } from "https";
 import { Readable } from "stream";
-import type { ReadStream } from "fs";
+import { type ReadStream } from "fs";
 import { URL } from "url";
 export * from "@grammyjs/types";
 import { debug as d } from "debug";

package/out/platform.node.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -58,31 +62,7 @@ class InputFile {
      * @param filename Optional name of the file
      */
     constructor(file, filename) {
-        Object.defineProperty(this, "consumed", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: false
-        });
-        Object.defineProperty(this, "fileData", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        /**
-         * Optional name of the constructed `InputFile` instance.
-         *
-         * Check out the
-         * [documenation](https://grammy.dev/guide/files.html#uploading-your-own-file)
-         * on sending files with `InputFile`.
-         */
-        Object.defineProperty(this, "filename", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        this.consumed = false;
         this.fileData = file;
         filename !== null && filename !== void 0 ? filename : (filename = this.guessFilename(file));
         this.filename = filename;

package/out/shim.node.d.ts

@@ -1,2 +1,2 @@
-export { AbortController, AbortSignal } from "abort-controller";
+export { AbortController, type AbortSignal } from "abort-controller";
 export { default as fetch } from "node-fetch";

package/out/shim.node.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fetch = exports.AbortSignal = exports.AbortController = void 0;
+exports.fetch = exports.AbortController = void 0;
 var abort_controller_1 = require("abort-controller");
 Object.defineProperty(exports, "AbortController", { enumerable: true, get: function () { return abort_controller_1.AbortController; } });
-Object.defineProperty(exports, "AbortSignal", { enumerable: true, get: function () { return abort_controller_1.AbortSignal; } });
 var node_fetch_1 = require("node-fetch");
 Object.defineProperty(exports, "fetch", { enumerable: true, get: function () { return node_fetch_1.default; } });

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.6.2",
+    "version": "1.7.2",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {
@@ -23,17 +23,17 @@
         "contribs": "all-contributors"
     },
     "dependencies": {
-        "@grammyjs/types": "^2.5.1",
+        "@grammyjs/types": "^2.6.0",
         "abort-controller": "^3.0.0",
-        "debug": "^4.3.3",
-        "node-fetch": "^2.6.5"
+        "debug": "^4.3.4",
+        "node-fetch": "^2.6.7"
     },
     "devDependencies": {
         "@types/debug": "^4.1.7",
-        "@types/node": "^12.20.36",
-        "@types/node-fetch": "^2.5.12",
+        "@types/node": "^12.20.47",
+        "@types/node-fetch": "^2.6.1",
         "all-contributors-cli": "^6.20.0",
-        "deno2node": "^1.1.0"
+        "deno2node": "^1.3.0"
     },
     "files": [
         "out/"