wingbot 3.38.0-alpha.2 → 3.38.0-alpha.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.38.0-alpha.2",
+  "version": "3.38.0-alpha.4",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {
@@ -9,7 +9,7 @@
     "doc": "npm run doc:gql && node ./bin/makeApiDoc.js && cpy ./CHANGELOG.md ./doc && gitbook install ./doc && gitbook build ./doc && rimraf -rf ./docs && rimraf --rf ./doc/CHANGELOG.md && move-cli ./doc/_book ./docs",
     "test": "npm run test:lint && npm run test:coverage && npm run test:coverage:threshold",
     "test:coverage": "nyc --reporter=html mocha ./test && nyc report",
-    "test:coverage:threshold": "nyc check-coverage --lines 91 --functions 90 --branches 82",
+    "test:coverage:threshold": "nyc check-coverage --lines 90 --functions 90 --branches 80",
     "test:backend": "mocha ./test",
     "test:lint": "eslint --ext .js src test *.js plugins"
   },

package/src/Tester.js

@@ -360,6 +360,20 @@ class Tester {
         this.storage.saveState(stateObj);
     }
 
+    /**
+     * Assert, that state contains a subset of provided value
+     *
+     * @param {object} object
+     * @example
+     *
+     * t.stateContains({ value: true });
+     */
+    stateContains (object) {
+        const { state } = this.getState();
+
+        assert.deepEqual(state, { ...state, ...object }, 'Conversation state equals');
+    }
+
     /**
      * Makes text request
      *

package/src/utils/customCondition.js

@@ -126,7 +126,7 @@ const compare = (variable, operator, value = undefined) => {
             }
 
             if (variable === null || variable === undefined) {
-                return ['null', 'undefined', ''].includes(`${value}`);
+                return value === null || value === undefined || value === '';
             }
 
             return `${variable}`.includes(`${value}`);

package/src/utils/getUpdate.js

@@ -86,7 +86,7 @@ function toArray (previousValue) {
 }
 
 const ENTITY_HBS_REGEXP = /^\s*\{\{\[?@([^@[\]{}\s]+)(\])?\}\}\s*$/;
-const VARIABLE_HBS_REGEXP = /^\s*\{\{\[?([^@[\]{}\s]+)\]?\}\}\s*$/;
+const VARIABLE_HBS_REGEXP = /^\s*\{\{\[?([^$@[\]{}\s]+)\]?\}\}\s*$/;
 
 function getSetState (setState, req, res = null, useState = null, configuration = null) {
     if (!setState) {
@@ -96,11 +96,7 @@ function getSetState (setState, req, res = null, useState = null, configuration
         .filter((k) => k !== '_');
 
     let obj = {};
-    let state = {
-        ...req.state,
-        ...(res ? res.newState : {}),
-        ...(useState || {})
-    };
+    let state = stateData(req, res, configuration, useState);
 
     keys.forEach((k) => {
         const val = setState[k];
@@ -161,8 +157,6 @@ function getSetState (setState, req, res = null, useState = null, configuration
                     valAsArray.shift();
                 } else if (val._$pop) {
                     valAsArray.pop();
-                } else if (val._$pushT) {
-                    valAsArray.push(req.text());
                 } else {
                     const value = val._$add || val._$rem || val._$push || val._$set;
                     const [, entity, rear] = `${value}`.match(ENTITY_HBS_REGEXP) || [];
@@ -181,7 +175,7 @@ function getSetState (setState, req, res = null, useState = null, configuration
                         values = [];
                     } else {
                         const useValue = typeof value === 'string'
-                            ? handlebars.compile(value)(stateData(req, res, configuration))
+                            ? handlebars.compile(value)(state)
                                 .split(/(?<!\\),/g)
                                 .map((v) => v.replace(/\\,/g, ',').trim())
                             : value;
@@ -207,7 +201,7 @@ function getSetState (setState, req, res = null, useState = null, configuration
                 set = val;
             }
         } else if (typeof val === 'string') {
-            set = handlebars.compile(val)(stateData(req, res, configuration));
+            set = handlebars.compile(val)(state);
         } else if (val === null
             || SCALAR_TYPES.includes(typeof val)) {
             set = val;

package/src/utils/quickReplies.js

@@ -69,6 +69,16 @@ function makeExpectedKeyword (
 
 /** @typedef {import('../Responder').QuickReply} QuickReply */
 
+const THIS_REGEX = /\{\{\$this\}\}/g;
+
+function hasThis (val) {
+    return typeof val === 'string' && val.match(THIS_REGEX);
+}
+
+function replaceThis (val, title) {
+    return val.replace(THIS_REGEX, title);
+}
+
 /**
  *
  * @ignore
@@ -208,6 +218,25 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
 
             const hasData = Object.keys(data).length !== 0;
             const hasSetState = setState && Object.keys(setState).length !== 0;
+            const translatedTitle = translate(title);
+
+            if (hasSetState) {
+                // replace {{this}}
+                Object.entries(setState)
+                    .forEach(([key, val]) => {
+                        if (typeof val === 'object' && val) {
+                            Object.entries(val)
+                                .forEach(([k, v]) => {
+                                    if (k.match(/^_\$/) && hasThis(v)) {
+                                        // eslint-disable-next-line no-param-reassign
+                                        val[k] = replaceThis(v, translatedTitle);
+                                    }
+                                });
+                        } else if (hasThis(val)) {
+                            setState[key] = replaceThis(val, translatedTitle);
+                        }
+                    });
+            }
 
             if (data._senderMeta
                 && data._senderMeta.flag === FLAG_DISAMBIGUATION_SELECTED) {
@@ -229,7 +258,6 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
                 payload = JSON.stringify(payload);
             }
 
-            const translatedTitle = translate(title);
             const translatedAiTitle = typeof aiTitle === 'string' ? translate(aiTitle) : aiTitle;
             const expect = makeExpectedKeyword(
                 absoluteAction,

package/src/utils/stateData.js

@@ -11,18 +11,23 @@
  * @param {Request} req
  * @param {Responder} res
  * @param {object} configuration
+ * @param {object} [stateOverride]
  * @returns {object}
  */
-module.exports = function stateData (req, res = null, configuration = null) {
+module.exports = function stateData (req, res = null, configuration = null, stateOverride = {}) {
     const c = configuration || req.configuration;
 
+    const $this = req.text();
+
     return {
         c,
         configuration: c,
         ...req.state,
         ...(res ? res.newState : {}),
+        ...stateOverride,
+        $this,
         ...req.actionData(),
         ...(res ? res.data : {}),
-        $input: req.text()
+        $input: $this
     };
 };