wingbot 3.52.0 → 3.52.2-alpha.1

package/package.json

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

package/src/Ai.js

@@ -44,6 +44,7 @@ let uq = 1;
 /** @typedef {import('./Request').IntentAction} IntentAction */
 /** @typedef {import('./Request')} Request */
 /** @typedef {import('./Responder')} Responder */
+/** @typedef {import('./Router').Resolver} Resolver */
 /** @typedef {import('./wingbot/CachedModel').Result} Result */
 /** @typedef {import('./wingbot/CustomEntityDetectionModel').Phrases} Phrases */
 /** @typedef {import('./wingbot/CustomEntityDetectionModel').EntityDetector} EntityDetector */
@@ -412,7 +413,7 @@ class Ai {
      * - emojis (`'#😄🙃😛'`)
      *
      * @param {IntentRule|IntentRule[]} intent
-     * @returns {Function} - the middleware
+     * @returns {Resolver} - the middleware
      * @memberOf Ai
      * @example
      * const { Router, ai } = require('wingbot');

package/src/AiMatching.js

@@ -352,6 +352,11 @@ class AiMatching {
             });
     }
 
+    _escapeRegExp (string) {
+        return string
+            .replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+    }
+
     /**
      * Create a rule to be cached inside a routing structure
      *
@@ -402,7 +407,7 @@ class AiMatching {
                 } else {
                     regexText = exp.replace(/^#/, '')
                         .split('|')
-                        .map((s) => `^${s}$`.toLowerCase())
+                        .map((s) => `^${this._escapeRegExp(s)}$`.toLowerCase())
                         .join('|');
                 }
 
@@ -669,19 +674,21 @@ class AiMatching {
                     ._entityIsMatching(wanted.op, wanted.compare, undefined, requestState);
             }
 
-            if (!matching && !wanted.optional) {
+            if (!matching && (!wanted.optional || requestEntity)) {
                 return {
                     score: 0, handicap: 0, matched: [], minScore, fromState
                 };
             }
 
-            if (!matching) { // optional
+            if (!matching) { // && optional && !requestEntity
                 handicap += this.redundantEntityHandicap;
                 continue;
             }
 
             if (wanted.optional) {
-                handicap += this.optionalHandicap;
+                handicap += wanted.op
+                    ? this.optionalHandicap
+                    : (this.optionalHandicap * 2);
             }
 
             if (wanted.op === COMPARE.NOT_EQUAL) {

package/src/Request.js

@@ -688,7 +688,7 @@ class Request {
         return (this._postback === null
             && this.message !== null
             && !this.message.quick_reply
-            && !!this.message.text)
+            && typeof this.message.text === 'string')
             || this._stickerToSmile() !== '';
     }
 
@@ -746,11 +746,13 @@ class Request {
             return '';
         }
 
-        if (tokenized && this.message.text) {
-            return tokenize(this.message.text);
+        const { text } = this.message;
+
+        if (tokenized && text) {
+            return tokenize(text) || text.trim();
         }
 
-        return this.message.text || this._stickerToSmile() || '';
+        return text || this._stickerToSmile() || '';
     }
 
     /**