@hellotext/hellotext 2.0.4 → 2.0.6

package/lib/api/webchats.cjs

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _hellotext = _interopRequireDefault(require("../hellotext"));
 var _core = require("../core");
+var _hellotext = _interopRequireDefault(require("../hellotext"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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); } }
@@ -34,8 +34,11 @@ let WebchatsAPI = /*#__PURE__*/function () {
         method: 'GET',
         headers: _hellotext.default.headers
       });
-      const htmlText = await response.text();
-      return new DOMParser().parseFromString(htmlText, "text/html").querySelector('article');
+      const data = await response.json();
+      if (!_hellotext.default.business.data) {
+        _hellotext.default.business.setData(data.business);
+      }
+      return new DOMParser().parseFromString(data.html, 'text/html').querySelector('article');
     }
   }]);
   return WebchatsAPI;

package/lib/api/webchats.js

@@ -5,8 +5,8 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 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); }
-import Hellotext from '../hellotext';
 import { Configuration } from '../core';
+import Hellotext from '../hellotext';
 var WebchatsAPI = /*#__PURE__*/function () {
   function WebchatsAPI() {
     _classCallCheck(this, WebchatsAPI);
@@ -31,8 +31,11 @@ var WebchatsAPI = /*#__PURE__*/function () {
           method: 'GET',
           headers: Hellotext.headers
         });
-        var htmlText = yield response.text();
-        return new DOMParser().parseFromString(htmlText, "text/html").querySelector('article');
+        var data = yield response.json();
+        if (!Hellotext.business.data) {
+          Hellotext.business.setData(data.business);
+        }
+        return new DOMParser().parseFromString(data.html, 'text/html').querySelector('article');
       });
       function get(_x) {
         return _get.apply(this, arguments);

package/lib/hellotext.cjs

@@ -33,11 +33,10 @@ let Hellotext = /*#__PURE__*/function () {
      * @param { Configuration } config
      */
     async function initialize(business, config) {
-      this.forms = new _models.FormCollection();
       this.business = new _models.Business(business);
+      this.forms = new _models.FormCollection();
       _core.Configuration.assign(config);
       _models.Session.initialize();
-      this.business.fetchPublicData().then(() => this.forms.collect());
       _classPrivateFieldLooseBase(this, _query)[_query] = new _models.Query();
       if (_core.Configuration.webchat.id) {
         this.webchat = await _models.Webchat.load(_core.Configuration.webchat.id);

package/lib/hellotext.js

@@ -31,11 +31,10 @@ var Hellotext = /*#__PURE__*/function () {
      */
     function () {
       var _initialize = _asyncToGenerator(function* (business, config) {
-        this.forms = new FormCollection();
         this.business = new Business(business);
+        this.forms = new FormCollection();
         Configuration.assign(config);
         Session.initialize();
-        this.business.fetchPublicData().then(() => this.forms.collect());
         _classPrivateFieldLooseBase(this, _query)[_query] = new Query();
         if (Configuration.webchat.id) {
           this.webchat = yield Webchat.load(Configuration.webchat.id);

package/lib/models/business.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Business = void 0;
-var _businesses = _interopRequireDefault(require("../api/businesses"));
 var _locales = _interopRequireDefault(require("../locales"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -16,9 +15,20 @@ let Business = /*#__PURE__*/function () {
   function Business(id) {
     _classCallCheck(this, Business);
     this.id = id;
-    this.data = {};
+    this.data = null;
   }
   _createClass(Business, [{
+    key: "setData",
+    value: function setData(data) {
+      this.data = data;
+      if (typeof document !== 'undefined') {
+        const linkTag = document.createElement('link');
+        linkTag.rel = 'stylesheet';
+        linkTag.href = data.style_url;
+        document.head.append(linkTag);
+      }
+    }
+  }, {
     key: "subscription",
     get: function () {
       return this.data.subscription;
@@ -43,19 +53,6 @@ let Business = /*#__PURE__*/function () {
     get: function () {
       return this.data.features;
     }
-  }, {
-    key: "fetchPublicData",
-    value: async function fetchPublicData() {
-      return _businesses.default.get(this.id).then(response => response.json()).then(data => {
-        this.data = data;
-        if (typeof document !== 'undefined') {
-          const linkTag = document.createElement('link');
-          linkTag.rel = 'stylesheet';
-          linkTag.href = data.style_url;
-          document.head.append(linkTag);
-        }
-      });
-    }
   }]);
   return Business;
 }();

package/lib/models/business.js

@@ -1,19 +1,27 @@
-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); }
-import API from '../api/businesses';
 import locales from '../locales';
 var Business = /*#__PURE__*/function () {
   function Business(id) {
     _classCallCheck(this, Business);
     this.id = id;
-    this.data = {};
+    this.data = null;
   }
   _createClass(Business, [{
+    key: "setData",
+    value: function setData(data) {
+      this.data = data;
+      if (typeof document !== 'undefined') {
+        var linkTag = document.createElement('link');
+        linkTag.rel = 'stylesheet';
+        linkTag.href = data.style_url;
+        document.head.append(linkTag);
+      }
+    }
+  }, {
     key: "subscription",
     get: function get() {
       return this.data.subscription;
@@ -38,25 +46,6 @@ var Business = /*#__PURE__*/function () {
     get: function get() {
       return this.data.features;
     }
-  }, {
-    key: "fetchPublicData",
-    value: function () {
-      var _fetchPublicData = _asyncToGenerator(function* () {
-        return API.get(this.id).then(response => response.json()).then(data => {
-          this.data = data;
-          if (typeof document !== 'undefined') {
-            var linkTag = document.createElement('link');
-            linkTag.rel = 'stylesheet';
-            linkTag.href = data.style_url;
-            document.head.append(linkTag);
-          }
-        });
-      });
-      function fetchPublicData() {
-        return _fetchPublicData.apply(this, arguments);
-      }
-      return fetchPublicData;
-    }()
   }]);
   return Business;
 }();

package/lib/models/form_collection.cjs

@@ -63,9 +63,6 @@ let FormCollection = /*#__PURE__*/function () {
       const promises = formsIdsToFetch.map(id => {
         return _forms.default.get(id).then(response => response.json());
       });
-      if (!_hellotext.default.business.enabledWhitelist) {
-        console.warn('No whitelist has been configured. It is advised to whitelist the domain to avoid bots from submitting forms.');
-      }
       this.fetching = true;
       await Promise.all(promises).then(forms => forms.forEach(this.add)).then(() => _hellotext.default.eventEmitter.dispatch('forms:collected', this)).then(() => this.fetching = false);
       if (_core.Configuration.forms.autoMount) {
@@ -87,6 +84,12 @@ let FormCollection = /*#__PURE__*/function () {
     value: function add(data) {
       if (this.includes(data.id)) return;
       this.forms.push(new _form.Form(data));
+      if (!_hellotext.default.business.data) {
+        _hellotext.default.business.setData(data.business);
+      }
+      if (!_hellotext.default.business.enabledWhitelist) {
+        console.warn('No whitelist has been configured. It is advised to whitelist the domain to avoid bots from submitting forms.');
+      }
     }
   }, {
     key: "getById",

package/lib/models/form_collection.js

@@ -59,9 +59,6 @@ var FormCollection = /*#__PURE__*/function () {
         var promises = formsIdsToFetch.map(id => {
           return API.get(id).then(response => response.json());
         });
-        if (!Hellotext.business.enabledWhitelist) {
-          console.warn('No whitelist has been configured. It is advised to whitelist the domain to avoid bots from submitting forms.');
-        }
         this.fetching = true;
         yield Promise.all(promises).then(forms => forms.forEach(this.add)).then(() => Hellotext.eventEmitter.dispatch('forms:collected', this)).then(() => this.fetching = false);
         if (Configuration.forms.autoMount) {
@@ -88,6 +85,12 @@ var FormCollection = /*#__PURE__*/function () {
     value: function add(data) {
       if (this.includes(data.id)) return;
       this.forms.push(new Form(data));
+      if (!Hellotext.business.data) {
+        Hellotext.business.setData(data.business);
+      }
+      if (!Hellotext.business.enabledWhitelist) {
+        console.warn('No whitelist has been configured. It is advised to whitelist the domain to avoid bots from submitting forms.');
+      }
     }
   }, {
     key: "getById",

package/lib/models/webchat.cjs

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Webchat = void 0;
-var _hellotext = _interopRequireDefault(require("../hellotext"));
 var _core = require("../core");
 var _api = _interopRequireDefault(require("../api"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/models/webchat.js

@@ -5,7 +5,6 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 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); }
-import Hellotext from '../hellotext';
 import { Configuration } from '../core';
 import API from '../api';
 var Webchat = /*#__PURE__*/function () {

package/package.json

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

package/src/api/webchats.js

@@ -1,5 +1,5 @@
-import Hellotext from '../hellotext'
 import { Configuration } from '../core'
+import Hellotext from '../hellotext'
 
 class WebchatsAPI {
   static get endpoint() {
@@ -22,8 +22,13 @@ class WebchatsAPI {
       headers: Hellotext.headers,
     })
 
-    const htmlText = await response.text()
-    return (new DOMParser()).parseFromString(htmlText, "text/html").querySelector('article');
+    const data = await response.json()
+
+    if (!Hellotext.business.data) {
+      Hellotext.business.setData(data.business)
+    }
+
+    return new DOMParser().parseFromString(data.html, 'text/html').querySelector('article')
   }
 }
 

package/src/hellotext.js

@@ -20,14 +20,12 @@ class Hellotext {
    * @param { Configuration } config
    */
   static async initialize(business, config) {
-    this.forms = new FormCollection()
     this.business = new Business(business)
+    this.forms = new FormCollection()
 
     Configuration.assign(config)
     Session.initialize()
 
-    this.business.fetchPublicData().then(() => this.forms.collect())
-
     this.#query = new Query()
 
     if (Configuration.webchat.id) {

package/src/models/business.js

@@ -1,11 +1,21 @@
-import API from '../api/businesses'
-
 import locales from '../locales'
 
 class Business {
   constructor(id) {
     this.id = id
-    this.data = {}
+    this.data = null
+  }
+
+  setData(data) {
+    this.data = data
+
+    if (typeof document !== 'undefined') {
+      const linkTag = document.createElement('link')
+      linkTag.rel = 'stylesheet'
+      linkTag.href = data.style_url
+
+      document.head.append(linkTag)
+    }
   }
 
   get subscription() {
@@ -27,22 +37,6 @@ class Business {
   get features() {
     return this.data.features
   }
-
-  async fetchPublicData() {
-    return API.get(this.id)
-      .then(response => response.json())
-      .then(data => {
-        this.data = data
-
-        if (typeof document !== 'undefined') {
-          const linkTag = document.createElement('link')
-          linkTag.rel = 'stylesheet'
-          linkTag.href = data.style_url
-
-          document.head.append(linkTag)
-        }
-      })
-  }
 }
 
 export { Business }

package/src/models/form_collection.js

@@ -55,12 +55,6 @@ class FormCollection {
       return API.get(id).then(response => response.json())
     })
 
-    if (!Hellotext.business.enabledWhitelist) {
-      console.warn(
-        'No whitelist has been configured. It is advised to whitelist the domain to avoid bots from submitting forms.',
-      )
-    }
-
     this.fetching = true
 
     await Promise.all(promises)
@@ -83,7 +77,18 @@ class FormCollection {
 
   add(data) {
     if (this.includes(data.id)) return
+
     this.forms.push(new Form(data))
+
+    if (!Hellotext.business.data) {
+      Hellotext.business.setData(data.business)
+    }
+
+    if (!Hellotext.business.enabledWhitelist) {
+      console.warn(
+        'No whitelist has been configured. It is advised to whitelist the domain to avoid bots from submitting forms.',
+      )
+    }
   }
 
   getById(id) {

package/src/models/webchat.js

@@ -1,7 +1,6 @@
-import Hellotext from '../hellotext';
 import { Configuration } from '../core'
 
-import API from '../api';
+import API from '../api'
 
 class Webchat {
   static async load(id) {