@hellotext/hellotext 1.8.1 → 1.8.3

package/jest.config.js

@@ -0,0 +1,3 @@
+module.exports = {
+  setupFiles: ['<rootDir>/jest.setup.js'], // Setup file to run before tests
+};

package/jest.setup.js

@@ -0,0 +1,7 @@
+global.crypto.randomUUID = () => {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+    const r = (Math.random() * 16) | 0;
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
+    return v.toString(16);
+  });
+};

package/lib/api/index.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "Response", {
   }
 });
 exports.default = void 0;
-var _sessions = _interopRequireDefault(require("./sessions"));
 var _businesses = _interopRequireDefault(require("./businesses"));
 var _events = _interopRequireDefault(require("./events"));
 var _forms = _interopRequireDefault(require("./forms"));
@@ -26,11 +25,6 @@ var API = /*#__PURE__*/function () {
     _classCallCheck(this, API);
   }
   _createClass(API, null, [{
-    key: "sessions",
-    value: function sessions(businessId) {
-      return new _sessions.default(businessId);
-    }
-  }, {
     key: "businesses",
     get: function get() {
       return _businesses.default;

package/lib/api/response.js

@@ -15,6 +15,13 @@ function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototy
 var id = 0;
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 var _success = /*#__PURE__*/_classPrivateFieldLooseKey("success");
+/**
+ * Response class
+ * @class
+ * @classdesc Represents a response from the API
+ * @property {Boolean} succeeded
+ * @property {Object} data
+ */
 var Response = /*#__PURE__*/function () {
   function Response(success, response) {
     _classCallCheck(this, Response);
@@ -25,11 +32,21 @@ var Response = /*#__PURE__*/function () {
     this.response = response;
     _classPrivateFieldLooseBase(this, _success)[_success] = success;
   }
+
+  /**
+   * Get the response data
+   * @returns {*}
+   */
   _createClass(Response, [{
     key: "data",
     get: function get() {
       return this.response;
     }
+
+    /**
+     * Parse the response as JSON
+     * @returns {Promise<*>}
+     */
   }, {
     key: "json",
     value: function () {
@@ -41,11 +58,20 @@ var Response = /*#__PURE__*/function () {
       }
       return json;
     }()
+    /**
+     * Has the request failed?
+     * @returns {boolean}
+     */
   }, {
     key: "failed",
     get: function get() {
       return _classPrivateFieldLooseBase(this, _success)[_success] === false;
     }
+
+    /**
+     * Has the request succeeded?
+     * @returns {boolean}
+     */
   }, {
     key: "succeeded",
     get: function get() {

package/lib/controllers/form_controller.js

@@ -79,9 +79,6 @@ var _default = /*#__PURE__*/function (_Controller) {
         }
         this.buttonTarget.style.display = 'none';
         this.element.querySelectorAll('input').forEach(input => input.disabled = true);
-        if (!data.identified) {
-          _hellotext.default.setSession(data.session);
-        }
         this.completed();
       });
       function submit(_x) {

package/lib/hellotext.js

@@ -5,10 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _core = require("./core");
-var _api = _interopRequireDefault(require("./api"));
+var _api = _interopRequireWildcard(require("./api"));
 var _models = require("./models");
 var _errors = require("./errors");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -24,7 +25,6 @@ var id = 0;
 function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
 var _session = /*#__PURE__*/_classPrivateFieldLooseKey("session");
 var _query = /*#__PURE__*/_classPrivateFieldLooseKey("query");
-var _mintAnonymousSession = /*#__PURE__*/_classPrivateFieldLooseKey("mintAnonymousSession");
 var Hellotext = /*#__PURE__*/function () {
   function Hellotext() {
     _classCallCheck(this, Hellotext);
@@ -39,24 +39,10 @@ var Hellotext = /*#__PURE__*/function () {
      */
     function initialize(business, config) {
       _core.Configuration.assign(config);
+      _models.Session.initialize();
       _classPrivateFieldLooseBase(this, _query)[_query] = new _models.Query();
       this.business = new _models.Business(business);
       this.forms = new _models.FormCollection();
-      if (_classPrivateFieldLooseBase(this, _query)[_query].inPreviewMode) return;
-      if (_core.Configuration.session) {
-        _classPrivateFieldLooseBase(this, _session)[_session] = _core.Configuration.session;
-      } else if (_classPrivateFieldLooseBase(this, _query)[_query].session) {
-        _classPrivateFieldLooseBase(this, _session)[_session] = _models.Cookies.set('hello_session', _classPrivateFieldLooseBase(this, _query)[_query].session);
-      } else if (_core.Configuration.autoGenerateSession) {
-        _classPrivateFieldLooseBase(this, _mintAnonymousSession)[_mintAnonymousSession]().then(response => {
-          _classPrivateFieldLooseBase(this, _session)[_session] = _models.Cookies.set('hello_session', response.id);
-        });
-      }
-    }
-  }, {
-    key: "setSession",
-    value: function setSession(value) {
-      _classPrivateFieldLooseBase(this, _session)[_session] = _models.Cookies.set('hello_session', value);
     }
 
     /**
@@ -121,10 +107,7 @@ var Hellotext = /*#__PURE__*/function () {
   }, {
     key: "session",
     get: function get() {
-      if (this.notInitialized) {
-        throw new _errors.NotInitializedError();
-      }
-      return _classPrivateFieldLooseBase(this, _session)[_session];
+      return _models.Session.session;
     }
 
     /**
@@ -134,7 +117,7 @@ var Hellotext = /*#__PURE__*/function () {
   }, {
     key: "isInitialized",
     get: function get() {
-      return _classPrivateFieldLooseBase(this, _session)[_session] !== undefined;
+      return _models.Session.session !== undefined;
     }
 
     // private
@@ -158,21 +141,6 @@ var Hellotext = /*#__PURE__*/function () {
   }]);
   return Hellotext;
 }();
-function _mintAnonymousSession2() {
-  return _mintAnonymousSession3.apply(this, arguments);
-}
-function _mintAnonymousSession3() {
-  _mintAnonymousSession3 = _asyncToGenerator(function* () {
-    if (this.notInitialized) {
-      throw new _errors.NotInitializedError();
-    }
-    return _api.default.sessions(this.business.id).create();
-  });
-  return _mintAnonymousSession3.apply(this, arguments);
-}
-Object.defineProperty(Hellotext, _mintAnonymousSession, {
-  value: _mintAnonymousSession2
-});
 Object.defineProperty(Hellotext, _session, {
   writable: true,
   value: void 0

package/lib/models/form.js

@@ -40,7 +40,11 @@ var Form = /*#__PURE__*/function () {
           ifCompleted = true
         } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         if (ifCompleted && this.hasBeenCompleted) {
-          return;
+          var _this$element;
+          (_this$element = this.element) === null || _this$element === void 0 ? void 0 : _this$element.remove();
+          return _hellotext.default.eventEmitter.dispatch('form:completed', _objectSpread({
+            id: this.id
+          }, JSON.parse(localStorage.getItem("hello-form-".concat(this.id)))));
         }
         var firstStep = this.data.steps[0];
         this.buildHeader(firstStep.header);
@@ -112,13 +116,14 @@ var Form = /*#__PURE__*/function () {
   }, {
     key: "markAsCompleted",
     value: function markAsCompleted(data) {
-      localStorage.setItem("hello-form-".concat(this.id), JSON.stringify({
+      var payload = {
         state: 'completed',
-        data
-      }));
-      _hellotext.default.eventEmitter.dispatch('form:completed', _objectSpread({
-        id: this.id
-      }, data));
+        id: this.id,
+        data,
+        completedAt: new Date().getTime()
+      };
+      localStorage.setItem("hello-form-".concat(this.id), JSON.stringify(payload));
+      _hellotext.default.eventEmitter.dispatch('form:completed', payload);
     }
   }, {
     key: "hasBeenCompleted",

package/lib/models/index.js

@@ -33,8 +33,15 @@ Object.defineProperty(exports, "Query", {
     return _query.Query;
   }
 });
+Object.defineProperty(exports, "Session", {
+  enumerable: true,
+  get: function get() {
+    return _session.Session;
+  }
+});
 var _business = require("./business");
 var _form = require("./form");
 var _query = require("./query");
 var _cookies = require("./cookies");
-var _form_collection = require("./form_collection");
+var _form_collection = require("./form_collection");
+var _session = require("./session");

package/lib/models/session.js

@@ -0,0 +1,55 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Session = void 0;
+var _core = require("../core");
+var _index = require("./index");
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; }
+var id = 0;
+function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; }
+var _session = /*#__PURE__*/_classPrivateFieldLooseKey("session");
+var _query = /*#__PURE__*/_classPrivateFieldLooseKey("query");
+var Session = /*#__PURE__*/function () {
+  function Session() {
+    _classCallCheck(this, Session);
+  }
+  _createClass(Session, null, [{
+    key: "session",
+    get: function get() {
+      return _classPrivateFieldLooseBase(this, _session)[_session];
+    },
+    set: function set(value) {
+      _classPrivateFieldLooseBase(this, _session)[_session] = value;
+      _index.Cookies.set('hello_session', value);
+    }
+  }, {
+    key: "initialize",
+    value: function initialize() {
+      _classPrivateFieldLooseBase(this, _query)[_query] = new _index.Query();
+      if (_core.Configuration.session) {
+        this.session = _core.Configuration.session;
+      } else if (_classPrivateFieldLooseBase(this, _query)[_query].session) {
+        this.session = _classPrivateFieldLooseBase(this, _query)[_query].session;
+      } else if (_core.Configuration.autoGenerateSession) {
+        this.session = crypto.randomUUID();
+      }
+    }
+  }]);
+  return Session;
+}();
+exports.Session = Session;
+Object.defineProperty(Session, _session, {
+  writable: true,
+  value: void 0
+});
+Object.defineProperty(Session, _query, {
+  writable: true,
+  value: void 0
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hellotext/hellotext",
-  "version": "1.8.1",
+  "version": "1.8.3",
   "description": "Hellotext JavaScript Client",
   "source": "src/index.js",
   "main": "lib/index.js",

package/src/api/index.js

@@ -1,13 +1,8 @@
-import SessionsAPI from './sessions'
 import BusinessesAPI from './businesses'
 import EventsAPI from './events'
 import FormsAPI from './forms'
 
 export default class API {
-  static sessions(businessId) {
-    return new SessionsAPI(businessId)
-  }
-
   static get businesses() {
     return BusinessesAPI
   }

package/src/api/response.js

@@ -1,3 +1,11 @@
+/**
+ * Response class
+ * @class
+ * @classdesc Represents a response from the API
+ * @property {Boolean} succeeded
+ * @property {Object} data
+ */
+
 class Response {
   #success
 
@@ -6,18 +14,34 @@ class Response {
     this.#success = success
   }
 
+  /**
+   * Get the response data
+   * @returns {*}
+   */
   get data() {
     return this.response
   }
 
+  /**
+   * Parse the response as JSON
+   * @returns {Promise<*>}
+   */
   async json() {
     return await this.response.json()
   }
 
+  /**
+   * Has the request failed?
+   * @returns {boolean}
+   */
   get failed() {
     return this.#success === false
   }
 
+  /**
+   * Has the request succeeded?
+   * @returns {boolean}
+   */
   get succeeded() {
     return this.#success === true
   }

package/src/controllers/form_controller.js

@@ -66,10 +66,6 @@ export default class extends Controller {
     this.buttonTarget.style.display = 'none'
     this.element.querySelectorAll('input').forEach(input => (input.disabled = true))
 
-    if (!data.identified) {
-      Hellotext.setSession(data.session)
-    }
-
     this.completed()
   }
 

package/src/hellotext.js

@@ -1,7 +1,7 @@
 import { Event, Configuration } from './core'
 
-import API from './api'
-import { Business, Query, Cookies, FormCollection } from './models'
+import API, { Response } from './api'
+import { Business, Query, FormCollection, Session } from './models'
 
 import { NotInitializedError } from './errors'
 
@@ -21,27 +21,12 @@ class Hellotext {
    */
   static initialize(business, config) {
     Configuration.assign(config)
+    Session.initialize()
 
     this.#query = new Query()
 
     this.business = new Business(business)
     this.forms = new FormCollection()
-
-    if (this.#query.inPreviewMode) return
-
-    if(Configuration.session) {
-      this.#session = Configuration.session
-    } else if (this.#query.session) {
-      this.#session = Cookies.set('hello_session', this.#query.session)
-    } else if (Configuration.autoGenerateSession) {
-      this.#mintAnonymousSession().then(response => {
-        this.#session = Cookies.set('hello_session', response.id)
-      })
-    }
-  }
-
-  static setSession(value) {
-    this.#session = Cookies.set('hello_session', value)
   }
 
   /**
@@ -99,11 +84,7 @@ class Hellotext {
    * @returns {String}
    */
   static get session() {
-    if (this.notInitialized) {
-      throw new NotInitializedError()
-    }
-
-    return this.#session
+    return Session.session
   }
 
   /**
@@ -111,7 +92,7 @@ class Hellotext {
    * @returns {boolean}
    */
   static get isInitialized() {
-    return this.#session !== undefined
+    return Session.session !== undefined
   }
 
   // private
@@ -120,14 +101,6 @@ class Hellotext {
     return this.business.id === undefined
   }
 
-  static async #mintAnonymousSession() {
-    if (this.notInitialized) {
-      throw new NotInitializedError()
-    }
-
-    return API.sessions(this.business.id).create()
-  }
-
   static get headers() {
     if (this.notInitialized) {
       throw new NotInitializedError()

package/src/models/form.js

@@ -14,7 +14,12 @@ class Form {
 
   async mount({ ifCompleted = true } = {}) {
     if(ifCompleted && this.hasBeenCompleted) {
-      return
+      this.element?.remove()
+
+      return Hellotext.eventEmitter.dispatch('form:completed', {
+        id: this.id,
+        ...JSON.parse(localStorage.getItem(`hello-form-${this.id}`)),
+      })
     }
 
     const firstStep = this.data.steps[0]
@@ -91,9 +96,15 @@ class Form {
   }
 
   markAsCompleted(data) {
-    localStorage.setItem(`hello-form-${this.id}`, JSON.stringify({ state: 'completed', data }))
+    const payload = {
+      state: 'completed',
+      id: this.id,
+      data,
+      completedAt: new Date().getTime(),
+    }
 
-    Hellotext.eventEmitter.dispatch('form:completed', { id: this.id, ...data })
+    localStorage.setItem(`hello-form-${this.id}`, JSON.stringify(payload))
+    Hellotext.eventEmitter.dispatch('form:completed', payload)
   }
 
   get hasBeenCompleted() {

package/src/models/index.js

@@ -3,3 +3,4 @@ export { Form } from './form'
 export { Query } from './query'
 export { Cookies } from './cookies'
 export { FormCollection } from './form_collection'
+export { Session } from './session'

package/src/models/session.js

@@ -0,0 +1,30 @@
+import { Configuration } from '../core';
+import { Cookies, Query } from './index'
+
+class Session {
+  static #session
+  static #query
+
+  static get session() {
+    return this.#session
+  }
+
+  static set session(value) {
+    this.#session = value
+    Cookies.set('hello_session', value)
+  }
+
+  static initialize() {
+    this.#query = new Query()
+
+    if(Configuration.session) {
+      this.session = Configuration.session
+    } else if (this.#query.session) {
+      this.session =  this.#query.session
+    } else if (Configuration.autoGenerateSession) {
+      this.session = crypto.randomUUID()
+    }
+  }
+}
+
+export { Session }

package/__tests__/api/sessions_test.js

@@ -1,12 +0,0 @@
-import API from '../../src/api/sessions'
-
-beforeEach(() => {
-  global.fetch = jest.fn().mockResolvedValue({ json: jest.fn().mockResolvedValue({ id: 1 }) })
-})
-
-describe('create', () => {
-  it('creates a session object', async () => {
-    const response = await new API('M01az53K').create()
-    expect(response.id).toEqual(1)
-  })
-})

package/lib/api/sessions.js

@@ -1,46 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _core = require("../core");
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var SessionsAPI = /*#__PURE__*/function () {
-  function SessionsAPI(businessId) {
-    _classCallCheck(this, SessionsAPI);
-    this.businessId = businessId;
-  }
-  _createClass(SessionsAPI, [{
-    key: "create",
-    value: function () {
-      var _create = _asyncToGenerator(function* () {
-        var response = yield fetch(SessionsAPI.endpoint, {
-          method: 'POST',
-          headers: {
-            Authorization: "Bearer ".concat(this.businessId),
-            Accept: 'application/json'
-          }
-        });
-        return response.json();
-      });
-      function create() {
-        return _create.apply(this, arguments);
-      }
-      return create;
-    }()
-  }], [{
-    key: "endpoint",
-    get: function get() {
-      return _core.Configuration.endpoint('track/sessions');
-    }
-  }]);
-  return SessionsAPI;
-}();
-exports.default = SessionsAPI;

package/src/api/sessions.js

@@ -1,23 +0,0 @@
-import { Configuration } from '../core'
-
-export default class SessionsAPI {
-  static get endpoint() {
-    return Configuration.endpoint('track/sessions')
-  }
-
-  constructor(businessId) {
-    this.businessId = businessId
-  }
-
-  async create() {
-    const response = await fetch(SessionsAPI.endpoint, {
-      method: 'POST',
-      headers: {
-        Authorization: `Bearer ${this.businessId}`,
-        Accept: 'application/json',
-      },
-    })
-
-    return response.json()
-  }
-}