wingbot 3.67.29 → 3.67.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wingbot",
-  "version": "3.67.29",
+  "version": "3.67.30",
   "description": "Enterprise Messaging Bot Conversation Engine",
   "main": "index.js",
   "type": "commonjs",
@@ -10,7 +10,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 89 --functions 89 --branches 80",
+    "test:coverage:threshold": "nyc check-coverage --lines 89 --functions 88 --branches 80",
     "test:backend": "mocha ./test",
     "test:lint": "eslint --ext .js src test *.js plugins"
   },

package/src/graphApi/conversationsApi.js

@@ -4,7 +4,9 @@
 'use strict';
 
 const apiAuthorizer = require('./apiAuthorizer');
-const { apiTextOutputFilter } = require('../utils/deepMapTools');
+const { apiTextOutputFilter, mapObject, defaultMapperFactory } = require('../utils/deepMapTools');
+
+/** @typedef {import('../utils/deepMapTools').Mapper} Mapper */
 
 /**
  * @typedef {object} ConversationsAPI
@@ -47,6 +49,7 @@ const { apiTextOutputFilter } = require('../utils/deepMapTools');
  * @param {string[]|Function} [acl] - limit api to array of groups or use auth function
  * @param {object} options
  * @param {textFilter} [options.stateTextFilter] - optional funcion for filtering data in states
+ * @param {Mapper} [options.mapper] - mapper for state values
  * @returns {ConversationsAPI}
  * @example
  * const { GraphApi, conversationsApi } = require('wingbot');
@@ -106,6 +109,13 @@ function conversationsApi (
             history,
             subscribtions
         });
+    } else if (options.mapper) {
+        mapState = (d) => mapObject({
+            ...d,
+            lastInteraction: d.lastInteraction || (new Date(0)),
+            history,
+            subscribtions
+        }, defaultMapperFactory(options.mapper));
     } else {
         mapState = (d) => ({
             ...d,

package/src/utils/deepMapTools.js

@@ -23,6 +23,58 @@ function deepEqual (left, right) {
     }
 }
 
+/**
+ * @callback Mapper
+ * @param {string} key
+ * @param {any} val
+ * @param {object} lastObj
+ * @param {string|null} lastKey
+ * @returns {any}
+ */
+
+/**
+ *
+ * @param {Mapper} [otherMapper]
+ * @returns {Mapper}
+ */
+function defaultMapperFactory (otherMapper = null) {
+    return (k, v, o, lk) => {
+        const useV = otherMapper
+            ? otherMapper(k, v, o, lk)
+            : v;
+
+        if (useV instanceof Date) {
+            return v.toISOString();
+        }
+        return useV;
+    };
+}
+
+/**
+ *
+ * @template T
+ * @param {T} obj
+ * @param {Mapper} mapFn
+ * @returns {T}
+ */
+function mapObject (obj, mapFn) {
+    let lastKey = null;
+    let lastObj = obj;
+
+    const str = JSON.stringify(obj, (key, val) => {
+        const ret = mapFn(key, val, lastObj, lastKey);
+
+        if (val && typeof val === 'object') {
+            lastObj = val;
+            lastKey = key || null;
+        }
+
+        return ret;
+    });
+
+    return JSON.parse(str);
+}
+
 function apiTextOutputFilter (obj, callback, prevKey = '') {
     let useKey;
     if (Array.isArray(obj)) {
@@ -59,4 +111,6 @@ function apiTextOutputFilter (obj, callback, prevKey = '') {
     return obj;
 }
 
-module.exports = { apiTextOutputFilter, deepEqual };
+module.exports = {
+    apiTextOutputFilter, deepEqual, mapObject, defaultMapperFactory
+};