wingbot 3.65.4 → 3.65.6

package/package.json

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

package/src/AiMatching.js

@@ -461,6 +461,19 @@ class AiMatching {
         const regexpScore = this._matchRegexp(req, regexps, noIntentHandicap);
         const textLength = req.text().trim().length;
 
+        let useState;
+        if (stateless || intents.length === 0) {
+            useState = Object.entries(stateData(req))
+                .reduce((o, [k, v]) => {
+                    if (k.startsWith('@')) {
+                        return o;
+                    }
+                    return Object.assign(o, { [k]: v });
+                }, {});
+        } else {
+            useState = stateData(req);
+        }
+
         if (regexpScore !== 0 || (intents.length === 0 && regexps.length === 0)) {
 
             if (entities.length === 0) {
@@ -475,19 +488,6 @@ class AiMatching {
                 };
             }
 
-            let useState;
-            if (stateless || intents.length === 0) {
-                useState = Object.entries(stateData(req))
-                    .reduce((o, [k, v]) => {
-                        if (k.startsWith('@')) {
-                            return o;
-                        }
-                        return Object.assign(o, { [k]: v });
-                    }, {});
-            } else {
-                useState = stateData(req);
-            }
-
             const {
                 score, handicap, matched, metl
             } = this
@@ -561,7 +561,7 @@ class AiMatching {
                             requestIntent,
                             entities,
                             req,
-                            stateless
+                            useState
                         );
 
                     if (score > max) {
@@ -594,7 +594,7 @@ class AiMatching {
      * @param {Intent} requestIntent
      * @param {EntityExpression[]} wantedEntities
      * @param {AIRequest} req
-     * @param {boolean} stateless
+     * @param {object} useState
      * @returns {{score:number,entities:Entity[]}}
      */
     _intentMatchingScore (
@@ -603,7 +603,7 @@ class AiMatching {
         requestIntent,
         wantedEntities,
         req,
-        stateless = false
+        useState
     ) {
         if (wantedIntent !== requestIntent.intent) {
             return { score: 0, entities: [] };
@@ -625,7 +625,7 @@ class AiMatching {
                 textLength,
                 wantedEntities,
                 useEntities,
-                stateless ? {} : req.state,
+                useState,
                 requestIntent.entities
                     ? (x) => Math.atan((x - 0.76) * 40) / Math.atan((1 - 0.76) * 40)
                     : (x) => x,

package/src/templates/GenericTemplate.js

@@ -78,11 +78,14 @@ class GenericTemplate extends ButtonTemplate {
      *
      * @param {string} action - Button action (can be absolute or relative)
      * @param {object} [data={}] - Action data
+     * @param {object} [setState] - SetState data
      * @returns {this}
      *
      * @memberOf GenericTemplate
      */
-    setElementActionPostback (action, data = {}) {
+    setElementActionPostback (action, data = {}, setState = null) {
+        const hasSetState = setState && Object.keys(setState).length !== 0;
+
         Object.assign(this._element, {
             default_action: {
                 type: 'postback',
@@ -91,7 +94,8 @@ class GenericTemplate extends ButtonTemplate {
                     data: {
                         _ca: this.context.currentAction,
                         ...data
-                    }
+                    },
+                    ...(hasSetState ? { setState } : {})
                 })
             }
         });
@@ -134,6 +138,7 @@ class GenericTemplate extends ButtonTemplate {
         return this;
     }
 
+    // @ts-ignore
     getTemplate () {
         this._attachAndClearButtons();
         const res = {