gramio 0.2.3 → 0.2.5

package/dist/index.cjs

@@ -317,6 +317,23 @@ Plugin = __decorateElement$1(_init$1, 0, "Plugin", _Plugin_decorators, Plugin);
 __runInitializers$1(_init$1, 1, Plugin);
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function convertToString(value) {
+  const typeOfValue = typeof value;
+  if (typeOfValue === "string") return value;
+  if (typeOfValue === "object") return JSON.stringify(value);
+  return String(value);
+}
+function simplifyObject(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const typeOfValue = typeof value;
+    if (value === void 0 || value === null || typeOfValue === "function")
+      continue;
+    result[key] = convertToString(value);
+  }
+  return result;
+}
+const IS_BUN = typeof Bun !== "undefined";
 
 class UpdateQueue {
   updateQueue = [];
@@ -537,7 +554,8 @@ class Bot {
   constructor(tokenOrOptions, optionsRaw) {
     const token = typeof tokenOrOptions === "string" ? tokenOrOptions : tokenOrOptions?.token;
     const options = typeof tokenOrOptions === "object" ? tokenOrOptions : optionsRaw;
-    if (!token || typeof token !== "string")
+    if (!token) throw new Error("Token is required!");
+    if (typeof token !== "string")
       throw new Error(`Token is ${typeof token} but it should be a string!`);
     this.options = {
       ...options,
@@ -573,7 +591,7 @@ class Bot {
   }
   async _callApi(method, params = {}) {
     const debug$api$method = debug$api.extend(method);
-    const url = `${this.options.api.baseURL}${this.options.token}/${this.options.api.useTest ? "test/" : ""}${method}`;
+    let url = `${this.options.api.baseURL}${this.options.token}/${this.options.api.useTest ? "test/" : ""}${method}`;
     const reqOptions = {
       method: "POST",
       ...this.options.api.fetchOptions,
@@ -591,8 +609,18 @@ class Bot {
     );
     params = context.params;
     if (params && files.isMediaUpload(method, params)) {
-      const formData = await files.convertJsonToFormData(method, params);
-      reqOptions.body = formData;
+      if (IS_BUN) {
+        const formData = await files.convertJsonToFormData(method, params);
+        reqOptions.body = formData;
+      } else {
+        const [formData, paramsWithoutFiles] = await files.extractFilesToFormData(
+          method,
+          params
+        );
+        reqOptions.body = formData;
+        const simplifiedParams = simplifyObject(paramsWithoutFiles);
+        url += `?${new URLSearchParams(simplifiedParams).toString()}`;
+      }
     } else {
       reqOptions.headers.set("Content-Type", "application/json");
       reqOptions.body = JSON.stringify(params);
@@ -953,12 +981,14 @@ class Bot {
       if (!context.data) return next();
       if (typeof trigger === "string" && context.data !== trigger)
         return next();
-      if (trigger instanceof callbackData.CallbackData && !trigger.regexp().test(context.data))
-        return next();
-      if (trigger instanceof RegExp && !trigger.test(context.data))
-        return next();
-      if (trigger instanceof callbackData.CallbackData)
+      if (trigger instanceof RegExp) {
+        if (!trigger.test(context.data)) return next();
+        context.queryData = context.data.match(trigger);
+      }
+      if (trigger instanceof callbackData.CallbackData) {
+        if (!trigger.regexp().test(context.data)) return next();
         context.queryData = trigger.unpack(context.data);
+      }
       return handler(context);
     });
   }

package/dist/index.d.cts

@@ -889,7 +889,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * ```
      */
     callbackQuery<Trigger extends CallbackData | string | RegExp>(trigger: Trigger, handler: (context: Omit<ContextType<typeof this, "callback_query">, "data"> & Derives["global"] & Derives["callback_query"] & {
-        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : RegExpMatchArray | null;
+        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
     }) => unknown): this;
     /** Register handler to `chosen_inline_result` update */
     chosenInlineResult<Ctx = ContextType<typeof this, "chosen_inline_result"> & Derives["global"] & Derives["chosen_inline_result"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
@@ -944,7 +944,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     if (context.args) await context.send(`Params ${context.args[1]}`);
      * });
      */
-    hears<Ctx = ContextType<typeof this, "message"> & Derives["global"] & Derives["message"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
+    hears<Ctx = ContextType<typeof this, "message"> & Derives["global"] & Derives["message"], Trigger extends RegExp | string | ((context: Ctx) => boolean) = RegExp | string | ((context: Ctx) => boolean)>(trigger: Trigger, handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown): this;
     /**

package/dist/index.d.ts

@@ -889,7 +889,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      * ```
      */
     callbackQuery<Trigger extends CallbackData | string | RegExp>(trigger: Trigger, handler: (context: Omit<ContextType<typeof this, "callback_query">, "data"> & Derives["global"] & Derives["callback_query"] & {
-        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : RegExpMatchArray | null;
+        queryData: Trigger extends CallbackData ? ReturnType<Trigger["unpack"]> : Trigger extends RegExp ? RegExpMatchArray : never;
     }) => unknown): this;
     /** Register handler to `chosen_inline_result` update */
     chosenInlineResult<Ctx = ContextType<typeof this, "chosen_inline_result"> & Derives["global"] & Derives["chosen_inline_result"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
@@ -944,7 +944,7 @@ declare class Bot<Errors extends ErrorDefinitions = {}, Derives extends DeriveDe
      *     if (context.args) await context.send(`Params ${context.args[1]}`);
      * });
      */
-    hears<Ctx = ContextType<typeof this, "message"> & Derives["global"] & Derives["message"]>(trigger: RegExp | string | ((context: Ctx) => boolean), handler: (context: Ctx & {
+    hears<Ctx = ContextType<typeof this, "message"> & Derives["global"] & Derives["message"], Trigger extends RegExp | string | ((context: Ctx) => boolean) = RegExp | string | ((context: Ctx) => boolean)>(trigger: Trigger, handler: (context: Ctx & {
         args: RegExpMatchArray | null;
     }) => unknown): this;
     /**

package/dist/index.js

@@ -4,7 +4,7 @@ import { CallbackData } from '@gramio/callback-data';
 export * from '@gramio/callback-data';
 import { contextsMappings, PhotoAttachment } from '@gramio/contexts';
 export * from '@gramio/contexts';
-import { isMediaUpload, convertJsonToFormData } from '@gramio/files';
+import { isMediaUpload, convertJsonToFormData, extractFilesToFormData } from '@gramio/files';
 export * from '@gramio/files';
 import { FormattableMap } from '@gramio/format';
 export * from '@gramio/format';
@@ -319,6 +319,23 @@ Plugin = __decorateElement$1(_init$1, 0, "Plugin", _Plugin_decorators, Plugin);
 __runInitializers$1(_init$1, 1, Plugin);
 
 const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
+function convertToString(value) {
+  const typeOfValue = typeof value;
+  if (typeOfValue === "string") return value;
+  if (typeOfValue === "object") return JSON.stringify(value);
+  return String(value);
+}
+function simplifyObject(obj) {
+  const result = {};
+  for (const [key, value] of Object.entries(obj)) {
+    const typeOfValue = typeof value;
+    if (value === void 0 || value === null || typeOfValue === "function")
+      continue;
+    result[key] = convertToString(value);
+  }
+  return result;
+}
+const IS_BUN = typeof Bun !== "undefined";
 
 class UpdateQueue {
   updateQueue = [];
@@ -539,7 +556,8 @@ class Bot {
   constructor(tokenOrOptions, optionsRaw) {
     const token = typeof tokenOrOptions === "string" ? tokenOrOptions : tokenOrOptions?.token;
     const options = typeof tokenOrOptions === "object" ? tokenOrOptions : optionsRaw;
-    if (!token || typeof token !== "string")
+    if (!token) throw new Error("Token is required!");
+    if (typeof token !== "string")
       throw new Error(`Token is ${typeof token} but it should be a string!`);
     this.options = {
       ...options,
@@ -575,7 +593,7 @@ class Bot {
   }
   async _callApi(method, params = {}) {
     const debug$api$method = debug$api.extend(method);
-    const url = `${this.options.api.baseURL}${this.options.token}/${this.options.api.useTest ? "test/" : ""}${method}`;
+    let url = `${this.options.api.baseURL}${this.options.token}/${this.options.api.useTest ? "test/" : ""}${method}`;
     const reqOptions = {
       method: "POST",
       ...this.options.api.fetchOptions,
@@ -593,8 +611,18 @@ class Bot {
     );
     params = context.params;
     if (params && isMediaUpload(method, params)) {
-      const formData = await convertJsonToFormData(method, params);
-      reqOptions.body = formData;
+      if (IS_BUN) {
+        const formData = await convertJsonToFormData(method, params);
+        reqOptions.body = formData;
+      } else {
+        const [formData, paramsWithoutFiles] = await extractFilesToFormData(
+          method,
+          params
+        );
+        reqOptions.body = formData;
+        const simplifiedParams = simplifyObject(paramsWithoutFiles);
+        url += `?${new URLSearchParams(simplifiedParams).toString()}`;
+      }
     } else {
       reqOptions.headers.set("Content-Type", "application/json");
       reqOptions.body = JSON.stringify(params);
@@ -955,12 +983,14 @@ class Bot {
       if (!context.data) return next();
       if (typeof trigger === "string" && context.data !== trigger)
         return next();
-      if (trigger instanceof CallbackData && !trigger.regexp().test(context.data))
-        return next();
-      if (trigger instanceof RegExp && !trigger.test(context.data))
-        return next();
-      if (trigger instanceof CallbackData)
+      if (trigger instanceof RegExp) {
+        if (!trigger.test(context.data)) return next();
+        context.queryData = context.data.match(trigger);
+      }
+      if (trigger instanceof CallbackData) {
+        if (!trigger.regexp().test(context.data)) return next();
         context.queryData = trigger.unpack(context.data);
+      }
       return handler(context);
     });
   }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "gramio",
 	"type": "module",
-	"version": "0.2.3",
+	"version": "0.2.5",
 	"description": "Powerful, extensible and really type-safe Telegram Bot API framework",
 	"main": "dist/index.cjs",
 	"module": "dist/index.js",
@@ -41,18 +41,18 @@
 	"license": "MIT",
 	"devDependencies": {
 		"@biomejs/biome": "1.9.4",
-		"@types/bun": "^1.2.2",
+		"@types/bun": "^1.2.5",
 		"@types/debug": "^4.1.12",
-		"pkgroll": "^2.8.2",
-		"typescript": "^5.7.3"
+		"pkgroll": "^2.11.2",
+		"typescript": "^5.8.2"
 	},
 	"dependencies": {
 		"@gramio/callback-data": "^0.0.3",
-		"@gramio/contexts": "^0.1.3",
-		"@gramio/files": "^0.1.2",
+		"@gramio/contexts": "^0.1.4",
+		"@gramio/files": "^0.2.0",
 		"@gramio/format": "^0.1.5",
 		"@gramio/keyboards": "^1.1.0",
-		"@gramio/types": "^8.3.1",
+		"@gramio/types": "^8.3.3",
 		"debug": "^4.4.0",
 		"inspectable": "^3.0.2",
 		"middleware-io": "^2.8.1"