telegram-botbuilder 1.1.1 → 1.1.3

package/lib/bot-service.d.ts

@@ -23,7 +23,8 @@ export declare class BotBuilder {
     AttachDataWait(chat: number, descriptor: string): void;
     Message(chat: number, content: string): Promise<TelegramBot.Message>;
 }
+type CallbackActionFunc = ((chatid: number, ...args: any[]) => void) | ((chatid: number, ...args: any[]) => Promise<void>);
 export declare function ChangeDialog(id: string): Action;
-export declare function CallbackAction(descriptor: string): Action;
+export declare function CallbackAction(descriptor: string | CallbackActionFunc, ...args: any[]): Action;
 export declare function WaitForData(descriptor: string): Action;
 export {};

package/lib/bot-service.js

@@ -322,7 +322,7 @@ var BotBuilder = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 8:
                         if (dialog == undefined)
-                            markup = [[{ text: "Меню", callback_data: this._schema.start }]];
+                            markup = [[{ text: "Меню", callback_data: this._schema.start }]]; // FIX RAND BTN
                         if (!(typeof (dialog === null || dialog === void 0 ? void 0 : dialog.text) === 'function')) return [3 /*break*/, 10];
                         return [4 /*yield*/, (dialog === null || dialog === void 0 ? void 0 : dialog.text(chat))];
                     case 9:
@@ -366,13 +366,34 @@ function ChangeDialog(id) {
     return function (chat, _bot) { return _bot.ChangeDialog(chat, id); };
 }
 function CallbackAction(descriptor) {
+    var _this = this;
+    var args = [];
+    for (var _i = 1; _i < arguments.length; _i++) {
+        args[_i - 1] = arguments[_i];
+    }
     return function (chat, _bot) {
-        var _a;
-        var args = [];
+        var _args = [];
         for (var _i = 2; _i < arguments.length; _i++) {
-            args[_i - 2] = arguments[_i];
+            _args[_i - 2] = arguments[_i];
         }
-        (_a = _bot.ActionSystem).emit.apply(_a, __spreadArray([descriptor, chat], args, false));
+        return __awaiter(_this, void 0, void 0, function () {
+            var _a;
+            var _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        if (!(typeof descriptor == 'function')) return [3 /*break*/, 2];
+                        return [4 /*yield*/, descriptor.apply(void 0, __spreadArray(__spreadArray([chat], args, false), _args, false))];
+                    case 1:
+                        _a = _c.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        _a = (_b = _bot.ActionSystem).emit.apply(_b, __spreadArray(__spreadArray([descriptor, chat], args, false), _args, false));
+                        _c.label = 3;
+                    case 3: return [2 /*return*/, _a];
+                }
+            });
+        });
     };
 }
 function WaitForData(descriptor) {

package/lib/bot-struct.d.ts

@@ -1,5 +1,5 @@
 import { BotBuilder } from "./bot-service";
-export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => Promise<void> | void;
+export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => (Promise<any> | any);
 export interface Dialog {
     id: string;
     text: string | ((chat: number) => Promise<string>) | ((chat: number) => string);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "telegram-botbuilder",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "main": "lib/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/readme.md

@@ -12,7 +12,7 @@ const schema: Schema = {
         [
           {
             text: 'Button 1',
-            action: [CallbackAction('button1_clicked')],
+            action: [CallbackAction('button1_clicked', 'optional arg')],
           },
           {
             text: 'Dialog 2',
@@ -23,7 +23,7 @@ const schema: Schema = {
     },
     {
       id: 'dialog2',
-      text: 'Test dialog 2',
+      text: async (chatid: number) => { return "test dialog 2"; },
       buttons: [
         [
           {

package/src/bot-service.ts

@@ -185,11 +185,13 @@ export class BotBuilder {
   }
 }
 
+type CallbackActionFunc = ((chatid: number, ...args: any[]) => void) | ((chatid: number, ...args: any[]) => Promise<void>)
+
 export function ChangeDialog(id: string): Action {
   return (chat: number, _bot: BotBuilder) => { return _bot.ChangeDialog(chat, id); };
 }
-export function CallbackAction(descriptor: string): Action {
-  return (chat: number, _bot: BotBuilder, ...args: any[]) => { _bot.ActionSystem.emit(descriptor, chat, ...args); };
+export function CallbackAction(descriptor: string | CallbackActionFunc, ...args: any[]): Action {
+  return async (chat: number, _bot: BotBuilder, ..._args: any[]) => { return typeof descriptor == 'function' ? await descriptor(chat, ...args, ..._args) : _bot.ActionSystem.emit(descriptor, chat, ...args, ..._args); };
 }
 export function WaitForData(descriptor: string): Action {
   return (chat: number, _bot: BotBuilder) => { 

package/src/bot-struct.ts

@@ -1,7 +1,7 @@
 import { BotBuilder } from "./bot-service";
 
 
-export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => Promise<void> | void;
+export type Action = (chat: number, _bot: BotBuilder, ...args: any[]) => (Promise<any> | any);
 
 export interface Dialog {
   id: string;