wingbot 3.38.0 → 3.39.0-alpha.1

package/package.json

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

package/src/AiMatching.js

@@ -5,6 +5,7 @@
 
 const { replaceDiacritics } = require('./utils/tokenizer');
 const { vars } = require('./utils/stateVariables');
+const stateData = require('./utils/stateData');
 
 /** @typedef {import('handlebars')} Handlebars */
 
@@ -22,6 +23,20 @@ const FULL_EMOJI_REGEX = /^#((?:[\u2600-\u27bf].?|(?:\ud83c[\udde6-\uddff]){2}|[
 const HAS_CLOSING_HASH = /^#(.+)#$/;
 const ENTITY_REGEX = /^@([^=><!?]+)(\?)?([!=><]{1,2})?([^=><!]+)?$/i;
 
+/**
+ * RegExp to test a string for a ISO 8601 Date spec
+ *  YYYY
+ *  YYYY-MM
+ *  YYYY-MM-DD
+ *  YYYY-MM-DDThh:mmTZD
+ *  YYYY-MM-DDThh:mm:ssTZD
+ *  YYYY-MM-DDThh:mm:ss.sTZD
+ *
+ * @see https://www.w3.org/TR/NOTE-datetime
+ * @type {RegExp}
+ */
+const ISO_8601_REGEX = /^\d{4}-\d\d-\d\d(T\d\d:\d\d(:\d\d)?(\.\d+)?(([+-]\d\d:\d\d)|Z)?)?$/i;
+
 /**
  * @typedef {string} Compare
  */
@@ -88,7 +103,9 @@ const COMPARE = {
  * @prop {Function} text
  * @prop {Intent[]|null} intents
  * @prop {Entity[]} entities
+ * @prop {object} [configuration]
  * @prop {object} [state]
+ * @prop {Function} [actionData]
  */
 
 /**
@@ -162,6 +179,9 @@ class AiMatching {
 
     _normalizeToNumber (value, returnIfEmpty = null) {
         if (typeof value === 'string') {
+            if (value.match(ISO_8601_REGEX)) {
+                return value;
+            }
             const flt = parseFloat(value);
             return Number.isNaN(flt) ? returnIfEmpty : flt;
         }
@@ -172,12 +192,18 @@ class AiMatching {
     }
 
     _hbsOrFn (value, cb) {
-        if (typeof value === 'string' && value.match(/\{\{.+\}\}/)) {
-            const compiler = handlebars.compile(value);
-            return (data) => {
-                const res = compiler(data);
-                return cb(res);
-            };
+        if (typeof value === 'string') {
+            let useValue = value;
+            if (useValue.match(/^\$[a-zA-Z0-9_-]+$/)) {
+                useValue = `{{${useValue}}}`;
+            }
+            if (useValue.match(/\{\{.+\}\}/)) {
+                const compiler = handlebars.compile(useValue);
+                return (data) => {
+                    const res = compiler(data);
+                    return cb(res);
+                };
+            }
         }
         return cb(value);
     }
@@ -427,7 +453,7 @@ class AiMatching {
 
             let useState;
             if (stateless || intents.length === 0) {
-                useState = Object.entries(req.state)
+                useState = Object.entries(stateData(req))
                     .reduce((o, [k, v]) => {
                         if (k.startsWith('@')) {
                             return o;
@@ -435,7 +461,7 @@ class AiMatching {
                         return Object.assign(o, { [k]: v });
                     }, {});
             } else {
-                useState = req.state;
+                useState = stateData(req);
             }
 
             const { score, handicap, matched } = this
@@ -706,9 +732,10 @@ class AiMatching {
                 : false;
         }
 
-        const useCmp = (compare || []).map((c) => (typeof c === 'function'
-            ? c(requestState)
-            : c));
+        const useCmp = (compare || [])
+            .map((c) => (typeof c === 'function'
+                ? c(requestState)
+                : c));
 
         switch (operation) {
             case COMPARE.EQUAL:
@@ -740,6 +767,9 @@ class AiMatching {
     }
 
     _numberComparison (op, cmp, normalized) {
+        if (typeof cmp !== typeof normalized) {
+            return false;
+        }
         switch (op) {
             case COMPARE.GT:
                 return normalized > cmp;

package/src/resolvers/hbs.js

@@ -13,6 +13,15 @@ try {
             return content;
         }
 
+        if (content.name === 'lang'
+            && typeof content.loc === 'object'
+            && typeof content.data === 'object'
+            && content.data
+            && typeof content.data.root === 'object') {
+
+            return this.lang || '';
+        }
+
         const { lang } = this;
 
         if (content[lang]) {
@@ -28,7 +37,11 @@ try {
             }
         }
 
-        return content[Object.keys(content)[0]];
+        const res = content[Object.keys(content)[0]];
+
+        return res && typeof res === 'object'
+            ? (res.text || res.t || '')
+            : (res || '');
     });
 } catch (er) {
     handlebars = { compile: (text) => () => text };

package/src/utils/datetime.js

@@ -0,0 +1,50 @@
+/**
+ * @author David Menger
+ */
+'use strict';
+
+/**
+ *
+ * @param {Date} inputDate
+ * @param {boolean} toZeroTimezone
+ * @returns {string}
+ */
+function dateToISO8601String (inputDate, toZeroTimezone = false) {
+    const padDigits = function padDigits (number, digits) {
+        return Array(Math.max(digits - String(number).length + 1, 0)).join('0') + number;
+    };
+
+    let d = inputDate;
+    const offsetMinutes = d.getTimezoneOffset();
+    const offsetHours = offsetMinutes / 60;
+    let offset = 'Z';
+    if (toZeroTimezone) {
+        d = new Date(d.toISOString());
+        d.setMinutes(d.getMinutes() + offsetMinutes);
+    } else if (offsetHours < 0) {
+        offset = `+${padDigits(`${offsetHours.toString().replace('-', '')}00`, 4)}`;
+    } else if (offsetHours > 0) {
+        offset = `-${padDigits(`${offsetHours}00`, 4)}`;
+    }
+
+    return `${d.getFullYear()
+    }-${padDigits((d.getMonth() + 1), 2)
+    }-${padDigits(d.getDate(), 2)
+    }T${padDigits(d.getHours(), 2)
+    }:${padDigits(d.getMinutes(), 2)
+    }:${padDigits(d.getSeconds(), 2)
+    }.${padDigits(d.getMilliseconds(), 2)
+    }${offset}`;
+}
+
+/**
+ * Make zero date
+ *
+ * @param {Date} d
+ * @returns {Date}
+ */
+function zeroHourDate (d) {
+    return new Date(d.getFullYear(), d.getMonth(), d.getDate(), 0, -d.getTimezoneOffset());
+}
+
+module.exports = { dateToISO8601String, zeroHourDate };

package/src/utils/stateData.js

@@ -6,9 +6,19 @@
 /** @typedef {import('../Request')} Request */
 /** @typedef {import('../Responder')} Responder */
 
+const { dateToISO8601String, zeroHourDate } = require('./datetime');
+
+/**
+ * @typedef {object} IStateRequest
+ * @prop {object} [state]
+ * @prop {object} [configuration]
+ * @prop {Function} text
+ * @prop {Function} [actionData]
+ */
+
 /**
  *
- * @param {Request} req
+ * @param {IStateRequest} req
  * @param {Responder} res
  * @param {object} configuration
  * @param {object} [stateOverride]
@@ -19,6 +29,15 @@ module.exports = function stateData (req, res = null, configuration = null, stat
 
     const $this = req.text();
 
+    const now = new Date();
+
+    const $now = dateToISO8601String(now, true);
+    const $today = dateToISO8601String(zeroHourDate(now), true);
+    now.setDate(now.getDate() + 1);
+    const $tomorrow = dateToISO8601String(zeroHourDate(now), true);
+    now.setDate(now.getDate() - 2);
+    const $yesterday = dateToISO8601String(zeroHourDate(now), true);
+
     return {
         c,
         configuration: c,
@@ -26,7 +45,12 @@ module.exports = function stateData (req, res = null, configuration = null, stat
         ...(res ? res.newState : {}),
         ...stateOverride,
         $this,
-        ...req.actionData(),
+        $now,
+        $today,
+        $tomorrow,
+        $yesterday,
+        // yes - res because of circular dependency
+        ...(res && req.actionData()),
         ...(res ? res.data : {}),
         $input: $this
     };