grammy 1.8.0 → 1.8.3

package/README.md

@@ -10,7 +10,7 @@ _<h2 align="center"> [:mag: Documentation](https://grammy.dev) | [:page_with_cur
 
 <!-- deno-fmt-ignore-start -->
 
-[![Bot API](https://img.shields.io/badge/Bot%20API-5.7-blue?logo=telegram&style=flat-square)](https://core.telegram.org/bots/api)
+[![Bot API](https://img.shields.io/badge/Bot%20API-6.0-blue?logo=telegram&style=flat-square)](https://core.telegram.org/bots/api)
 [![npm](https://img.shields.io/npm/v/grammy?logo=npm&style=flat-square)](https://www.npmjs.org/package/grammy) <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
 [![All Contributors](https://img.shields.io/badge/all_contributors-54-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

package/out/composer.d.ts

@@ -553,10 +553,10 @@ 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>;
 }
-declare type HearsContext<C extends Context> = Filter<C & {
-    match: string | RegExpMatchArray;
+declare type HearsContext<C extends Context> = Filter<Omit<C, "match"> & {
+    match: Extract<C["match"], string | RegExpMatchArray>;
 }, ":text" | ":caption">;
-declare type CommandContext<C extends Context> = Filter<C & {
-    match: string;
+declare type CommandContext<C extends Context> = Filter<Omit<C, "match"> & {
+    match: Extract<C["match"], string>;
 }, ":entities:bot_command">;
 export {};

package/out/convenience/session.js

@@ -64,13 +64,15 @@ function session(options = {}) {
         Object.defineProperty(ctx, "session", {
             get() {
                 if (key === undefined) {
-                    throw new Error("Cannot access session data because the session key was undefined!");
+                    const msg = undef("access", getSessionKey);
+                    throw new Error(msg);
                 }
                 return value;
             },
             set(v) {
                 if (key === undefined) {
-                    throw new Error("Cannot assign session data because the session key was undefined!");
+                    const msg = undef("assign", getSessionKey);
+                    throw new Error(msg);
                 }
                 value = v;
             },
@@ -132,7 +134,8 @@ function lazySession(options = {}) {
         async function load() {
             var _a;
             if (key === undefined) {
-                throw new Error("Cannot access lazy session data because the session key was undefined!");
+                const msg = undef("access", getSessionKey, { lazy: true });
+                throw new Error(msg);
             }
             let v = await storage.read(key);
             if (!fetching)
@@ -162,7 +165,8 @@ function lazySession(options = {}) {
             },
             set(v) {
                 if (key === undefined) {
-                    throw new Error("Cannot assign lazy session data because the session key was undefined!");
+                    const msg = undef("assign", getSessionKey, { lazy: true });
+                    throw new Error(msg);
                 }
                 wrote = true;
                 fetching = false;
@@ -184,10 +188,20 @@ function lazySession(options = {}) {
     };
 }
 exports.lazySession = lazySession;
+/** Stores session data per chat by default */
 function defaultGetSessionKey(ctx) {
     var _a;
     return (_a = ctx.chat) === null || _a === void 0 ? void 0 : _a.id.toString();
 }
+/** Returns a useful error message for when the session key is undefined */
+function undef(op, getSessionKey, opts = {}) {
+    var _a;
+    const lazy = (_a = opts.lazy) !== null && _a !== void 0 ? _a : false;
+    const reason = getSessionKey === defaultGetSessionKey
+        ? "this update does not belong to a chat, so the session key is undefined"
+        : "the custom `getSessionKey` function returned undefined for this update";
+    return `Cannot ${op} ${lazy ? "lazy " : ""}session data because ${reason}!`;
+}
 /**
  * The memory session storage is a built-in storage adapter that saves your
  * session data in RAM using a regular JavaScript `Map` object. If you use this

package/out/core/client.d.ts

@@ -23,8 +23,7 @@ export interface WebhookReplyEnvelope {
  * Type of a function that can perform an API call. Used for Transformers.
  */
 export declare type ApiCallFn<R extends RawApi = RawApi> = <M extends Methods<R>>(method: M, payload: Payload<M, R>, signal?: AbortSignal) => Promise<ApiResponse<ApiCallResult<M, R>>>;
-declare type ApiCallResult<M extends Methods<R>, R extends RawApi> = R[M] extends (...args: unknown[]) => unknown ? Await<ReturnType<R[M]>> : never;
-declare type Await<T> = T extends PromiseLike<infer V> ? V : T;
+declare type ApiCallResult<M extends Methods<R>, R extends RawApi> = R[M] extends (...args: unknown[]) => unknown ? Awaited<ReturnType<R[M]>> : never;
 /**
  * API call transformers are functions that can access and modify the method and
  * payload of an API call on the fly. This can be useful if you want to

package/out/core/client.js

@@ -18,7 +18,7 @@ class ApiClient {
         this.installedTransformers = [];
         this.call = async (method, p, signal) => {
             const payload = p !== null && p !== void 0 ? p : {};
-            debug("Calling", method);
+            debug(`Calling ${method}`);
             // General config
             const opts = this.options;
             const formDataRequired = (0, payload_js_1.requiresFormDataUpload)(payload);

package/out/core/payload.js

@@ -119,7 +119,7 @@ async function* payloadToMultipartItr(payload, boundary) {
         first = false;
     }
     // End multipart/form-data protocol
-    yield enc.encode(`\r\n--${boundary}--`);
+    yield enc.encode(`\r\n--${boundary}--\r\n`);
 }
 /**
  * Replaces all instances of `InputFile` in a given payload by attach://
@@ -164,7 +164,7 @@ or newline (\\n) characters! Filename for property '${origin}' was:
 ${filename}
 """`);
     }
-    yield enc.encode(`content-disposition:form-data;name="${id}";filename=${filename}\r\n\r\n`);
+    yield enc.encode(`content-disposition:form-data;name="${id}";filename=${filename}\r\ncontent-type:application/octet-stream\r\n\r\n`);
     const data = await input[platform_node_js_1.toRaw]();
     if (data instanceof Uint8Array)
         yield data;

package/out/platform.node.d.ts

@@ -22,7 +22,7 @@ export declare function baseFetchConfig(apiRoot: string): {
 /** Something that looks like a URL. */
 interface URLLike {
     /**
-     * Identifier of the resouce. Must be in a format that can be parsed by the
+     * Identifier of the resource. Must be in a format that can be parsed by the
      * URL constructor.
      */
     url: string;

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "grammy",
     "description": "The Telegram Bot Framework.",
-    "version": "1.8.0",
+    "version": "1.8.3",
     "author": "KnorpelSenf",
     "license": "MIT",
     "engines": {
@@ -30,7 +30,7 @@
     },
     "devDependencies": {
         "@types/debug": "^4.1.7",
-        "@types/node": "^12.20.47",
+        "@types/node": "^12.20.50",
         "@types/node-fetch": "^2.6.1",
         "all-contributors-cli": "^6.20.0",
         "deno2node": "^1.3.0"