@aracna/telegram-bot 1.9.8 → 1.9.10

package/index.d.ts

@@ -5,8 +5,6 @@ import { AnswerCallbackQuery } from '@aracna/telegram-bot-types';
 import { AnswerInlineQuery } from '@aracna/telegram-bot-types';
 import { AnswerPreCheckoutQuery } from '@aracna/telegram-bot-types';
 import { AnswerShippingQuery } from '@aracna/telegram-bot-types';
-import { API as API_2 } from '@aracna/core';
-import { APIConfig } from '@aracna/core';
 import { BanChatMember } from '@aracna/telegram-bot-types';
 import { BotCommand } from '@aracna/telegram-bot-types';
 import { CallbackQuery as CallbackQuery_2 } from '@aracna/telegram-bot-types';
@@ -50,6 +48,8 @@ import { PollAnswer } from '@aracna/telegram-bot-types';
 import { PreCheckoutQuery } from '@aracna/telegram-bot-types';
 import { PromoteChatMember } from '@aracna/telegram-bot-types';
 import { RequestMethod } from '@aracna/core';
+import { RestAPI } from '@aracna/core';
+import { RestApiConfig } from '@aracna/core';
 import { RestrictChatMember } from '@aracna/telegram-bot-types';
 import { SendAnimation } from '@aracna/telegram-bot-types';
 import { SendAudio } from '@aracna/telegram-bot-types';
@@ -97,9 +97,9 @@ declare class Answer extends Child {
     shippingQuery(id: string, ok: boolean, parameters?: Partial<AnswerShippingQuery>): Promise<boolean | FetchError>;
 }
 
-declare class API extends API_2 {
-    post<V, W, X = undefined>(path: string, body?: W, config?: APIConfig<void>): Promise<V | FetchError<X>>;
-    transformBody<V>(method: RequestMethod, path: string, body: V, config: APIConfig<void>): Promise<FormData>;
+declare class API extends RestAPI {
+    post<V, W, X = undefined>(path: string, body?: W, config?: RestApiConfig<void>): Promise<V | FetchError<X>>;
+    transformBody<V>(method: RequestMethod, path: string, body: V, config: RestApiConfig<void>): Promise<FormData>;
 }
 
 declare class Ban extends Child {
@@ -273,7 +273,7 @@ export declare interface HandlerOptions {
 export declare class HTMLUtils {
     static tags: string[];
     static sanitize(text: string): string;
-    static progress(value: number, minimum?: number, maximum?: number, size?: number): string;
+    static progress(value: number, min?: number, max?: number, size?: number): string;
 }
 
 export declare class InlineKeyboardUtils {

package/modules/api.d.ts

@@ -1,5 +1,5 @@
-import { APIConfig, API as CoreAPI, FetchError, RequestMethod } from '@aracna/core';
-export declare class API extends CoreAPI {
-    post<V, W, X = undefined>(path: string, body?: W, config?: APIConfig<void>): Promise<V | FetchError<X>>;
-    transformBody<V>(method: RequestMethod, path: string, body: V, config: APIConfig<void>): Promise<FormData>;
+import { FetchError, RequestMethod, RestAPI, RestApiConfig } from '@aracna/core';
+export declare class API extends RestAPI {
+    post<V, W, X = undefined>(path: string, body?: W, config?: RestApiConfig<void>): Promise<V | FetchError<X>>;
+    transformBody<V>(method: RequestMethod, path: string, body: V, config: RestApiConfig<void>): Promise<FormData>;
 }

package/modules/api.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.API = void 0;
 const core_1 = require("@aracna/core");
-class API extends core_1.API {
+class API extends core_1.RestAPI {
     async post(path, body, config) {
         let response;
-        response = await this.handle('POST', path, body, config);
+        response = await this.post(path, body, config);
         if (response instanceof Error)
             return response;
         return response.data.result;
@@ -14,7 +14,7 @@ class API extends core_1.API {
         switch (method) {
             case 'GET':
             case 'POST':
-                await (0, core_1.useNodeFetch)(await (0, core_1.tcp)(() => Promise.resolve().then(() => require('node-fetch'))));
+                await (0, core_1.useNodeFetch)(await (0, core_1.importNodeFetch)());
                 return (0, core_1.serializeFormData)(typeof body === 'object' ? body : {});
             default:
                 return (0, core_1.serializeFormData)({});

package/modules/telegram.js

@@ -113,7 +113,7 @@ class Telegram {
         let handler, potential;
         handler = dummy_1.Dummy.handler;
         handler.description = description;
-        handler.id = core_1.ID.generate({ blacklist: this.handlerIDs });
+        handler.id = (0, core_1.generateRandomString)({ blacklist: this.handlerIDs });
         handler.key = key;
         handler.middleware = middleware;
         handler.type = type;

package/package.json

@@ -1,15 +1,16 @@
 {
   "author": "Dario Sechi",
   "devDependencies": {
-    "@aracna/core": "^1.1.41",
-    "@aracna/telegram-bot-types": "^1.2.4",
-    "@microsoft/api-extractor": "^7.36.4",
-    "@vitest/coverage-v8": "^0.34.2",
-    "@vitest/ui": "^0.34.2",
+    "@aracna/core": "^1.1.75",
+    "@aracna/telegram-bot-types": "^1.2.9",
+    "@microsoft/api-extractor": "^7.39.0",
+    "@types/node": "^20.10.5",
+    "@vitest/coverage-v8": "^1.1.0",
+    "@vitest/ui": "^1.1.0",
     "dotenv": "^16.3.1",
-    "fastify": "^4.21.0",
-    "typescript": "^5.1.6",
-    "vitest": "^0.34.2"
+    "fastify": "^4.25.1",
+    "typescript": "^5.3.3",
+    "vitest": "^1.1.0"
   },
   "license": "MIT",
   "main": "index.js",
@@ -18,12 +19,14 @@
     "@aracna/core": ">= 1.1.12",
     "@aracna/telegram-bot-types": ">= 1.2.0"
   },
-  "scripts": {
-    "test": "yarn vitest run",
-    "build": "rm -rf dist && yarn tsc && yarn api-extractor run --local",
-    "tarball": "yarn version && cp LICENSE package.json README.md dist/. && cd dist && yarn pack",
-    "deploy": "yarn test && yarn build && yarn tarball && yarn publish dist/*.tgz && git push"
+  "publishConfig": {
+    "directory": "dist"
   },
   "types": "index.d.ts",
-  "version": "1.9.8"
-}
+  "version": "1.9.10",
+  "scripts": {
+    "build": "rm -rf dist && pnpm tsc && pnpm api-extractor run --local",
+    "prepublish": "pnpm test && pnpm build && pnpm version patch && cp LICENSE package.json README.md dist",
+    "test": "vitest run"
+  }
+}

package/utils/html.utils.d.ts

@@ -1,5 +1,5 @@
 export declare class HTMLUtils {
     static tags: string[];
     static sanitize(text: string): string;
-    static progress(value: number, minimum?: number, maximum?: number, size?: number): string;
+    static progress(value: number, min?: number, max?: number, size?: number): string;
 }

package/utils/html.utils.js

@@ -10,10 +10,10 @@ class HTMLUtils {
             .replace(new RegExp(`(?<!(${this.tags.join('|')}))>`, 'gm'), '&gt;')
             .replace(/&/gm, '&amp;');
     }
-    static progress(value, minimum = 0, maximum = 100, size = 20) {
+    static progress(value, min = 0, max = 100, size = 20) {
         let percentage, steps;
-        percentage = (0, core_1.getNumberPercentage)(value, minimum, maximum);
-        steps = new Array(size).fill(0).map((v, k) => ((k * maximum) / size < percentage ? '=' : ' '));
+        percentage = (0, core_1.getNumberPercentage)(value, { min, max });
+        steps = new Array(size).fill(0).map((v, k) => ((k * max) / size < percentage ? '=' : ' '));
         return `<code>[${steps.join('')}]</code>`;
     }
 }