wingbot 3.55.1 → 3.55.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.55.1",
+  "version": "3.55.2",
   "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 90 --functions 89 --branches 80",
+    "test:coverage:threshold": "nyc check-coverage --lines 89 --functions 89 --branches 80",
     "test:backend": "mocha ./test",
     "test:lint": "eslint --ext .js src test *.js plugins"
   },

package/src/wingbot/CustomEntityDetectionModel.js

@@ -76,6 +76,8 @@ function optionalWrap (l, r, content) {
     return `${l || ''}(${content})${r || ''}`;
 }
 
+const MULTI_ENTITY_CLEANER = /((?<!\\)\([^()]*[^()\\]\)|@[A-Z0-9-]+)\?/g;
+
 class CustomEntityDetectionModel {
 
     /**
@@ -485,11 +487,18 @@ class CustomEntityDetectionModel {
 
     /**
      *
-     * @param {RegExp} regexp
+     * @param {RegExp|string} regexp
      */
     _extractRegExpDependencies (regexp) {
-        const matches = regexp.source.match(/@[A-Z0-9-]+/g);
-        return Array.from(new Set(matches).values());
+        let str = typeof regexp === 'string' ? regexp : regexp.source;
+        const matches = str.match(/@[A-Z0-9-]+/g);
+        const known = Array.from(new Set(matches));
+        if (known.length <= 1 || !str.match(MULTI_ENTITY_CLEANER)) {
+            return known;
+        }
+        str = str.replace(MULTI_ENTITY_CLEANER, '');
+        const cleanDeps = this._extractRegExpDependencies(str);
+        return Array.from(new Set([...cleanDeps, ...matches]));
     }
 
     /**