@webuildbots/webuildbots-sdk 8.3.1 → 9.2.1

package/lib/builder/block/logic-bb.d.ts

@@ -0,0 +1,8 @@
+import { RulesLogic } from 'json-logic-js';
+import BlockBuilder from './block-builder';
+export default class LogicBB extends BlockBuilder {
+    constructor();
+    formId(formId: string): this;
+    defaultMappingBlockId(blockId: string): this;
+    condition(condition: RulesLogic, blockId: string): this;
+}

package/lib/builder/block/logic-bb.js

@@ -0,0 +1,45 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var block_enums_1 = require("../../const/block-enums");
+var block_builder_1 = __importDefault(require("./block-builder"));
+var LogicBB = /** @class */ (function (_super) {
+    __extends(LogicBB, _super);
+    function LogicBB() {
+        var _this = _super.call(this) || this;
+        _this.block.type = block_enums_1.BlockTypes.FUNCTION;
+        _this.block.function = {};
+        _this.block.function.type = block_enums_1.FunctionTypes.LOGIC_BLOCK;
+        _this.block.function.logic = { expressions: [] };
+        return _this;
+    }
+    LogicBB.prototype.formId = function (formId) {
+        this.block.function.logic.formId = formId;
+        return this;
+    };
+    LogicBB.prototype.defaultMappingBlockId = function (blockId) {
+        this.block.function.logic.defaultMappingBlockId = blockId;
+        return this;
+    };
+    LogicBB.prototype.condition = function (condition, blockId) {
+        this.block.function.logic.expressions.push({ condition: condition, blockId: blockId });
+        return this;
+    };
+    return LogicBB;
+}(block_builder_1.default));
+exports.default = LogicBB;

package/lib/builder/choice/common-cb.d.ts

@@ -1,3 +1,4 @@
 import BlockCB from './block-cb';
 export declare const backToMenu: () => BlockCB;
 export declare const speakToSomeoneCB: () => BlockCB;
+export declare const tryAgainCB: (value: any, args?: any) => BlockCB;

package/lib/builder/choice/common-cb.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.speakToSomeoneCB = exports.backToMenu = void 0;
+exports.tryAgainCB = exports.speakToSomeoneCB = exports.backToMenu = void 0;
 var block_cb_1 = __importDefault(require("./block-cb"));
 var common_blocks_enums_1 = require("../../const/common-blocks-enums");
 var languages_enums_1 = require("../../const/languages-enums");
@@ -21,3 +21,10 @@ var speakToSomeoneCB = function () {
         .addTitle(languages_enums_1.Languages.WELSH, "Siaradwch â'r tîm");
 };
 exports.speakToSomeoneCB = speakToSomeoneCB;
+var tryAgainCB = function (value, args) {
+    return new block_cb_1.default(value)
+        .addTitle(languages_enums_1.Languages.ENGLISH, 'Try again')
+        .addTitle(languages_enums_1.Languages.WELSH, 'Ceisio eto')
+        .args(args);
+};
+exports.tryAgainCB = tryAgainCB;

package/lib/const/block-enums.d.ts

@@ -42,5 +42,6 @@ export declare enum VoiceAction {
 }
 export declare enum FunctionTypes {
     EMAIL_FORM_AS_TABLE = "email-form-as-table",
-    UNSET_FORM = "unset-form"
+    UNSET_FORM = "unset-form",
+    LOGIC_BLOCK = "logic-block"
 }

package/lib/const/block-enums.js

@@ -55,4 +55,5 @@ var FunctionTypes;
 (function (FunctionTypes) {
     FunctionTypes["EMAIL_FORM_AS_TABLE"] = "email-form-as-table";
     FunctionTypes["UNSET_FORM"] = "unset-form";
+    FunctionTypes["LOGIC_BLOCK"] = "logic-block";
 })(FunctionTypes = exports.FunctionTypes || (exports.FunctionTypes = {}));

package/lib/index.d.ts

@@ -21,4 +21,5 @@ import ItemBuilder from './builder/item-builder';
 import DefinedIB from './builder/defined-ib';
 import ResponseBuilder from './builder/response-builder';
 import { WebhookRequest, WebhookResponse, ResponseUnitType, ResponseUnit, BlockPointer, Client, JWTPayload } from './interfaces/webhook';
-export { BlockBuilder, ComplexBB, FunctionBB, EmailFormTableBB, UnsetFormBB, ImageBB, SelectBB, TextBB, VideoBB, DevSwitchBB, BlockCB, ChoiceBuilder, DefinedCB, DefinedIB, ExtensionCB, LocationCB, PhoneCB, UrlCB, GalleryBB, BasicBB, ItemBuilder, WebhookResponse, WebhookRequest, ResponseUnit, ResponseUnitType, BlockPointer, ResponseBuilder, Client, JWTPayload };
+import LogicBB from './builder/block/logic-bb';
+export { BlockBuilder, ComplexBB, FunctionBB, EmailFormTableBB, UnsetFormBB, ImageBB, SelectBB, TextBB, VideoBB, DevSwitchBB, LogicBB, BlockCB, ChoiceBuilder, DefinedCB, DefinedIB, ExtensionCB, LocationCB, PhoneCB, UrlCB, GalleryBB, BasicBB, ItemBuilder, WebhookResponse, WebhookRequest, ResponseUnit, ResponseUnitType, BlockPointer, ResponseBuilder, Client, JWTPayload };

package/lib/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResponseBuilder = exports.ResponseUnitType = exports.ItemBuilder = exports.BasicBB = exports.GalleryBB = exports.UrlCB = exports.PhoneCB = exports.LocationCB = exports.ExtensionCB = exports.DefinedIB = exports.DefinedCB = exports.ChoiceBuilder = exports.BlockCB = exports.DevSwitchBB = exports.VideoBB = exports.TextBB = exports.SelectBB = exports.ImageBB = exports.UnsetFormBB = exports.EmailFormTableBB = exports.FunctionBB = exports.ComplexBB = exports.BlockBuilder = void 0;
+exports.ResponseBuilder = exports.ResponseUnitType = exports.ItemBuilder = exports.BasicBB = exports.GalleryBB = exports.UrlCB = exports.PhoneCB = exports.LocationCB = exports.ExtensionCB = exports.DefinedIB = exports.DefinedCB = exports.ChoiceBuilder = exports.BlockCB = exports.LogicBB = exports.DevSwitchBB = exports.VideoBB = exports.TextBB = exports.SelectBB = exports.ImageBB = exports.UnsetFormBB = exports.EmailFormTableBB = exports.FunctionBB = exports.ComplexBB = exports.BlockBuilder = void 0;
 var block_builder_1 = __importDefault(require("./builder/block/block-builder"));
 exports.BlockBuilder = block_builder_1.default;
 var basic_bb_1 = __importDefault(require("./builder/block/basic-bb"));
@@ -50,3 +50,5 @@ var response_builder_1 = __importDefault(require("./builder/response-builder"));
 exports.ResponseBuilder = response_builder_1.default;
 var webhook_1 = require("./interfaces/webhook");
 Object.defineProperty(exports, "ResponseUnitType", { enumerable: true, get: function () { return webhook_1.ResponseUnitType; } });
+var logic_bb_1 = __importDefault(require("./builder/block/logic-bb"));
+exports.LogicBB = logic_bb_1.default;

package/lib/interfaces/block.d.ts

@@ -1,5 +1,7 @@
 export default interface Block {
+    _id?: any;
     version: number;
+    clientDbId?: any;
     created: Date;
     deleted?: boolean;
     delay?: number;
@@ -10,6 +12,7 @@ export default interface Block {
     next?: string;
     onReply?: {
         blockId: string;
+        module?: string;
         args?: any;
     };
     formFieldCallback?: {
@@ -71,11 +74,12 @@ export default interface Block {
                     value?: any;
                 };
                 profile?: any;
+                formValue?: string;
                 userStatus?: string;
-                formField?: boolean;
                 session?: any;
                 functionArgs?: any;
                 persistentMenu?: boolean;
+                next?: string;
                 selectBlock?: {
                     id: string;
                 };
@@ -95,26 +99,57 @@ export default interface Block {
                     value?: any;
                 };
                 profile?: any;
+                formValue?: string;
                 userStatus?: string;
-                formField?: boolean;
                 session?: any;
                 functionArgs?: any;
                 persistentMenu?: boolean;
+                next?: string;
                 selectBlock?: {
                     id: string;
                 };
             };
+            serialized?: string;
         }>;
     };
     function?: {
         name?: string;
         handlerName?: string;
         type?: string;
+        logic?: {
+            formId: string;
+            defaultMappingBlockId: string;
+            expressions?: Array<{
+                condition: any;
+                blockId: string;
+            }>;
+        };
         emailFormAsTable?: {
             toEmail: string;
             fromEmail?: string;
             subject: string;
         };
+        argosLabsExecuteScenario?: {
+            apiScenarioId: string;
+            apiPamId: string;
+            botParameters?: any;
+            startedMessage: {
+                any?: string;
+                en?: string;
+                nl?: string;
+                cy?: string;
+                it?: string;
+                de?: string;
+            };
+            finishedMessage: {
+                any?: string;
+                en?: string;
+                nl?: string;
+                cy?: string;
+                it?: string;
+                de?: string;
+            };
+        };
         args: any;
         formId?: string;
         todo?: boolean;
@@ -141,11 +176,12 @@ export default interface Block {
                 value?: any;
             };
             profile?: any;
+            formValue?: string;
             userStatus?: string;
-            formField?: boolean;
             session?: any;
             functionArgs?: any;
             persistentMenu?: boolean;
+            next?: string;
             selectBlock?: {
                 id: string;
             };
@@ -171,5 +207,4 @@ export default interface Block {
         jovoFollowUpState?: string;
         alexaPermissionRequired?: string;
     };
-    _id?: any;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webuildbots/webuildbots-sdk",
-  "version": "8.3.1",
+  "version": "9.2.1",
   "description": "webuildbots sdk",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -52,6 +52,7 @@
     "typescript": "^4.0.3"
   },
   "dependencies": {
+    "@types/json-logic-js": "^1.2.1",
     "bson-objectid": "^1.3.1",
     "deep-equal": "^2.0.4",
     "flatted": "^3.1.0",
@@ -60,4 +61,4 @@
     "md5": "^2.3.0",
     "wbb-logger": "^1.1.0"
   }
-}
+}

package/lib/util/address-utils.d.ts

@@ -1,6 +0,0 @@
-interface Address1And2 {
-    address1: string;
-    address2: string;
-}
-export declare const compareAddress: (a: Address1And2, b: Address1And2) => boolean;
-export {};

package/lib/util/address-utils.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.compareAddress = void 0;
-var string_utils_1 = require("./string-utils");
-var compareAddress = function (a, b) {
-    return (string_utils_1.eqIgnoreCaseAndPunctuations(a.address1, b.address1) ||
-        string_utils_1.eqIgnoreCaseAndPunctuations(a.address1, b.address1 + " " + b.address2) ||
-        string_utils_1.eqIgnoreCaseAndPunctuations(a.address1 + " " + a.address2, b.address1) ||
-        string_utils_1.eqIgnoreCaseAndPunctuations(a.address1 + " " + a.address2, b.address1 + " " + b.address2));
-};
-exports.compareAddress = compareAddress;

package/lib/util/string-utils.d.ts

@@ -1,14 +0,0 @@
-/**
- * Strip emojis and punctuation from {@code s}
- *
- * @param s
- */
-export declare function stripEmojiPunc(s: string): string;
-/**
- * Fill a given path with parameters by replacing the placeholder
- * @param path e.g. /user/{id}/edit
- * @param params key-value pair
- */
-export declare const fillPath: (path: string, params: Record<string, any>) => string;
-export declare const removeNonAlphaNum: (s: string) => string;
-export declare const eqIgnoreCaseAndPunctuations: (a: string, b: string) => boolean;

package/lib/util/string-utils.js

@@ -1,37 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.eqIgnoreCaseAndPunctuations = exports.removeNonAlphaNum = exports.fillPath = exports.stripEmojiPunc = void 0;
-var emoji_regex_1 = __importDefault(require("emoji-regex"));
-var emojiRE = emoji_regex_1.default();
-/**
- * Strip emojis and punctuation from {@code s}
- *
- * @param s
- */
-function stripEmojiPunc(s) {
-    return s.replace(/[.,/#!$%^&*;:{}=\-_`~()]/g, '').replace(emojiRE, '');
-}
-exports.stripEmojiPunc = stripEmojiPunc;
-/**
- * Fill a given path with parameters by replacing the placeholder
- * @param path e.g. /user/{id}/edit
- * @param params key-value pair
- */
-var fillPath = function (path, params) {
-    for (var _i = 0, _a = Object.keys(params); _i < _a.length; _i++) {
-        var key = _a[_i];
-        path = path.replace(new RegExp("{" + key + "}", 'g'), params[key]);
-    }
-    return path;
-};
-exports.fillPath = fillPath;
-// remove any non alphabet or number character
-var removeNonAlphaNum = function (s) { return s.replace(/[^A-z0-9]/g, ''); };
-exports.removeNonAlphaNum = removeNonAlphaNum;
-var eqIgnoreCaseAndPunctuations = function (a, b) {
-    return exports.removeNonAlphaNum(a).toLowerCase() === exports.removeNonAlphaNum(b).toLowerCase();
-};
-exports.eqIgnoreCaseAndPunctuations = eqIgnoreCaseAndPunctuations;