wingbot 3.67.10 → 3.67.12

package/.babelrc

@@ -0,0 +1,22 @@
+{
+    "presets": [
+        "@babel/preset-react",
+        [
+            "@babel/preset-env",
+            {
+                "targets": {
+                    "node": "current",
+                    "browsers": [
+                        "last 2 versions",
+                        "ie >= 11"
+                    ]
+                }
+            }
+        ],
+        "@babel/preset-typescript"
+    ],
+    "plugins": [
+        "@babel/plugin-proposal-class-properties"
+    ],
+    "sourceType": "unambiguous"
+}

package/.github/workflows/deploy.yml

@@ -15,7 +15,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
 
@@ -33,7 +33,7 @@ jobs:
 
       - name: Test
         run: npm run test
-      
+
       - name: Rewrite gatsby confing inside smoothdoc
         run: cp documentation/smooth-doc-gatsby-config.js documentation/node_modules/smooth-doc/gatsby-config.js
 
@@ -42,7 +42,7 @@ jobs:
 
       - name: Build documentation website with gatsby
         run: cd documentation && npm run build
-      
+
       - name: Deploy documentation to github pages
         uses: JamesIves/github-pages-deploy-action@v4
         with:

package/.github/workflows/pullRequest.yml

@@ -11,7 +11,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [12.x]
+        node-version: [16.x]
 
     steps:
 

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "wingbot",
-  "version": "3.67.10",
+  "version": "3.67.12",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
+  "type": "commonjs",
   "scripts": {
     "tsd:update": "jsdoc -t ./node_modules/tsd-jsdoc/dist/ -r ./src",
     "doc:gql": "graphql-markdown ./src/graphApi/schema.gql > doc/api/graphqlSchema.md",
@@ -36,20 +37,20 @@
   },
   "homepage": "https://github.com/wingbot.ai/wingbot#readme",
   "devDependencies": {
-    "cpy-cli": "^4.2.0",
-    "eslint": "^8.36.0",
+    "cpy-cli": "^5.0.0",
+    "eslint": "^8.56.0",
     "eslint-config-airbnb": "^19.0.4",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jsdoc": "^40.1.0",
-    "eslint-plugin-jsx-a11y": "^6.7.1",
-    "eslint-plugin-mocha": "^10.1.0",
-    "eslint-plugin-react": "^7.32.2",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jsdoc": "^48.0.2",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-mocha": "^10.2.0",
+    "eslint-plugin-react": "^7.33.2",
     "graphql-markdown": "^7.0.0",
     "jsdoc-to-markdown": "^8.0.0",
     "mocha": "^10.2.0",
     "nyc": "^15.1.0",
-    "rimraf": "^3.0.2",
-    "sinon": "^15.0.3",
+    "rimraf": "^5.0.5",
+    "sinon": "^17.0.1",
     "tsd-jsdoc": "^2.5.0"
   },
   "dependencies": {

package/src/systemEntities/regexps.js

@@ -4,7 +4,7 @@
 'use strict';
 
 const PHONE_REGEX = /((00|\+)[\s-]?[0-9]{1,4}[\s-]?)?([0-9]{3,4}[\s-]?([0-9]{2,3}[\s-]?[0-9]{2}[\s-]?[0-9]{2,3}|[0-9]{3,4}[\s-]?[0-9]{3,4}))(?=(\s|$|[,!.?\-:]))/;
-const EMAIL_REGEX = /(?<=(\s|^|:|,))[a-zA-Z0-9!#$%&'*+\-=?^_`{|}~"][^@:\s]*@[^.@\s]+\.[^@\s,]+/;
+const EMAIL_REGEX = /(?<=(\s|^|:|,|;|-|\+))[a-zA-Z0-9!#$%&'*+\-=?^_`{|}~"][^@:\s]*@[^.@\s]+\.[^@\s,:+;+-]+/;
 
 module.exports = {
     PHONE_REGEX,

package/src/wingbot/CachedModel.js

@@ -120,15 +120,13 @@ class CachedModel extends CustomEntityDetectionModel {
 
                 return {
                     ...i,
-                    entities: expectedEntities
-                        ? this.nonOverlapping(ents, expectedEntities)
-                        : ents
+                    entities: this.nonOverlapping(ents, expectedEntities || [], !expectedEntities)
                 };
             });
 
         return [
             retIntents,
-            expectedEntities ? this.nonOverlapping(retEntities, expectedEntities) : retEntities
+            this.nonOverlapping(retEntities, expectedEntities || [], !expectedEntities)
         ];
     }
 

package/src/wingbot/CustomEntityDetectionModel.js

@@ -287,9 +287,10 @@ class CustomEntityDetectionModel {
      *
      * @param {DetectedEntity[]} entities
      * @param {string[]} [expectedEntities]
+     * @param {boolean} [justDuplicates]
      * @returns {DetectedEntity[]}
      */
-    nonOverlapping (entities, expectedEntities = []) {
+    nonOverlapping (entities, expectedEntities = [], justDuplicates = false) {
         // longest first
         entities.sort(({ start: a, end: b }, { start: z, end: y }) => {
             const aLen = b - a;
@@ -308,18 +309,22 @@ class CustomEntityDetectionModel {
 
             const isExpected = expectedEntities.includes(entity.entity);
 
-            let overlapping = res
-                .some((e) => e.start < entity.end && e.end > entity.start);
+            const duplicate = res
+                .find((e) => e.start === entity.start && e.end === entity.end);
 
-            if (overlapping) {
-                const duplicate = res
-                    .find((e) => e.start === entity.start && e.end === entity.end);
+            let overlapping = justDuplicates
+                ? !!duplicate
+                : res
+                    .some((e) => e.start < entity.end && e.end > entity.start);
 
+            if (overlapping) {
                 if (duplicate) {
                     overlapping = !isExpected && expectedEntities.includes(duplicate.entity);
                 }
 
-                if (isExpected) {
+                if (duplicate && duplicate.entity === entity.entity) {
+                    overlapping = true;
+                } else if (isExpected) {
                     overlapping = false;
                     res = res.filter((e) => {
                         const isOverlapping = e.start < entity.end && e.end > entity.start;