wingbot 3.38.0-alpha.1 → 3.38.0-alpha.3

package/package.json

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

package/src/utils/customCondition.js

@@ -119,11 +119,17 @@ const compare = (variable, operator, value = undefined) => {
             return isStringNumber(variable) ? !toNumber(variable) : !variable;
         case ConditionOperators.contains:
             if (typeof variable === 'string') {
-                if (isSimpleWord(value)) return webalize(variable).includes(webalize(`${value}`));
-                return variable.toLocaleLowerCase().includes(value.toString().toLocaleLowerCase());
+                if (isSimpleWord(value)) {
+                    return webalize(variable).includes(webalize(`${value}`));
+                }
+                return variable.toLocaleLowerCase().includes(`${value}`.toLocaleLowerCase());
             }
 
-            return variable.toString().includes(value.toString());
+            if (variable === null || variable === undefined) {
+                return value === null || value === undefined || value === '';
+            }
+
+            return `${variable}`.includes(`${value}`);
 
         case ConditionOperators['not contains']:
             return !compare(variable, ConditionOperators.contains, value);

package/src/utils/getUpdate.js

@@ -86,7 +86,7 @@ function toArray (previousValue) {
 }
 
 const ENTITY_HBS_REGEXP = /^\s*\{\{\[?@([^@[\]{}\s]+)(\])?\}\}\s*$/;
-const VARIABLE_HBS_REGEXP = /^\s*\{\{\[?([^@[\]{}\s]+)\]?\}\}\s*$/;
+const VARIABLE_HBS_REGEXP = /^\s*\{\{\[?([^$@[\]{}\s]+)\]?\}\}\s*$/;
 
 function getSetState (setState, req, res = null, useState = null, configuration = null) {
     if (!setState) {
@@ -161,8 +161,6 @@ function getSetState (setState, req, res = null, useState = null, configuration
                     valAsArray.shift();
                 } else if (val._$pop) {
                     valAsArray.pop();
-                } else if (val._$pushT) {
-                    valAsArray.push(req.text());
                 } else {
                     const value = val._$add || val._$rem || val._$push || val._$set;
                     const [, entity, rear] = `${value}`.match(ENTITY_HBS_REGEXP) || [];