wingbot 3.39.0-alpha.1 → 3.39.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.39.0-alpha.1",
+  "version": "3.39.0-alpha.2",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "scripts": {

package/src/AiMatching.js

@@ -191,7 +191,7 @@ class AiMatching {
         return returnIfEmpty;
     }
 
-    _hbsOrFn (value, cb) {
+    _hbsOrFn (value) {
         if (typeof value === 'string') {
             let useValue = value;
             if (useValue.match(/^\$[a-zA-Z0-9_-]+$/)) {
@@ -199,13 +199,12 @@ class AiMatching {
             }
             if (useValue.match(/\{\{.+\}\}/)) {
                 const compiler = handlebars.compile(useValue);
-                return (data) => {
-                    const res = compiler(data);
-                    return cb(res);
-                };
+                // @ts-ignore
+                compiler.template = useValue;
+                return compiler;
             }
         }
-        return cb(value);
+        return value;
     }
 
     _normalizeComparisonArray (compare, op) {
@@ -220,7 +219,7 @@ class AiMatching {
             const [val] = arr;
 
             return [
-                this._hbsOrFn(val, (r) => this._normalizeToNumber(r, 0))
+                this._hbsOrFn(val)
             ];
         }
 
@@ -228,12 +227,12 @@ class AiMatching {
             const [min, max] = arr;
 
             return [
-                this._hbsOrFn(min, (r) => this._normalizeToNumber(r, -Infinity)),
-                this._hbsOrFn(max, (r) => this._normalizeToNumber(r, Infinity))
+                this._hbsOrFn(min),
+                this._hbsOrFn(max)
             ];
         }
 
-        return arr.map((cmp) => this._hbsOrFn(cmp, (r) => `${r}`));
+        return arr.map((cmp) => this._hbsOrFn(cmp));
     }
 
     _stringOpToOperation (op) {
@@ -285,6 +284,7 @@ class AiMatching {
      */
     getSetStateForEntityRules ({ entities }) {
         return entities.reduce((o, rule) => {
+
             if (rule instanceof RegExp) {
                 return o;
             }
@@ -297,13 +297,13 @@ class AiMatching {
 
             if (rule.op === COMPARE.EQUAL
                 && rule.compare
-                && rule.compare.length === 1
-                && typeof rule.compare[0] !== 'function') {
+                && rule.compare.length === 1) {
 
                 const key = `@${rule.entity}`;
                 const value = rule.compare[0];
 
-                return Object.assign(o, vars.dialogContext(key, value));
+                // @ts-ignore
+                return vars.dialogContext(key, value && (value.template || value));
             }
             return o;
         }, {});
@@ -732,11 +732,15 @@ class AiMatching {
                 : false;
         }
 
-        const useCmp = (compare || [])
+        let useCmp = (compare || [])
             .map((c) => (typeof c === 'function'
                 ? c(requestState)
                 : c));
 
+        if ([COMPARE.EQUAL, COMPARE.NOT_EQUAL].includes(operation)) {
+            useCmp = useCmp.map((c) => (typeof c === 'string' ? c : `${c}`));
+        }
+
         switch (operation) {
             case COMPARE.EQUAL:
                 return useCmp.length === 0 || useCmp.includes(`${value}`);
@@ -748,7 +752,8 @@ class AiMatching {
                 if (normalized === null) {
                     return false;
                 }
-                return normalized >= min && normalized <= max;
+                return normalized >= this._normalizeToNumber(min, -Infinity)
+                    && normalized <= this._normalizeToNumber(max, Infinity);
             }
             case COMPARE.GT:
             case COMPARE.LT:
@@ -759,7 +764,7 @@ class AiMatching {
                 if (normalized === null) {
                     return false;
                 }
-                return this._numberComparison(op, cmp, normalized);
+                return this._numberComparison(op, this._normalizeToNumber(cmp, 0), normalized);
             }
             default:
                 return true;

package/src/Request.js

@@ -1137,7 +1137,15 @@ class Request {
             let { setState = {} } = res;
             for (const gi of this.globalIntents.values()) {
                 if (gi.action === res.action) {
-                    ({ entitiesSetState } = gi);
+                    entitiesSetState = { ...gi.entitiesSetState };
+
+                    const values = Array.from(Object.values(entitiesSetState));
+
+                    for (const value of values) {
+                        if (typeof value === 'function') {
+                            Object.assign(entitiesSetState, value(stateData(this)));
+                        }
+                    }
                 }
             }
             const newState = {

package/src/utils/quickReplies.js

@@ -208,6 +208,7 @@ function makeQuickReplies (replies, path = '', translate = (w) => w, quickReplyC
                                 }
                                 return o;
                             }, {});
+
                         setState = {
                             ...entitiesSetState,
                             ...setState