@hellotext/hellotext 1.4.0 → 1.5.0

package/lib/models/form_collection.js

@@ -0,0 +1,96 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.FormCollection = void 0;
+var _hellotext = _interopRequireDefault(require("../hellotext.js"));
+var _api = _interopRequireDefault(require("../api"));
+var _form = require("./form");
+var _errors = require("../errors");
+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); } }
+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 _formIdsToFetch = /*#__PURE__*/_classPrivateFieldLooseKey("formIdsToFetch");
+var FormCollection = /*#__PURE__*/function () {
+  function FormCollection() {
+    _classCallCheck(this, FormCollection);
+    Object.defineProperty(this, _formIdsToFetch, {
+      get: _get_formIdsToFetch,
+      set: void 0
+    });
+    this.forms = [];
+    this.includes = this.includes.bind(this);
+    this.excludes = this.excludes.bind(this);
+    this.add = this.add.bind(this);
+  }
+  _createClass(FormCollection, [{
+    key: "collect",
+    value: function collect() {
+      if (_hellotext.default.notInitialized) {
+        throw new _errors.NotInitializedError();
+      }
+      var formsIdsToFetch = _classPrivateFieldLooseBase(this, _formIdsToFetch)[_formIdsToFetch];
+      if (formsIdsToFetch.length === 0) return;
+      var promises = formsIdsToFetch.map(id => {
+        return _api.default.forms.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.');
+      }
+      Promise.all(promises).then(forms => forms.forEach(this.add)).then(() => _hellotext.default.eventEmitter.dispatch('forms:collected', this));
+    }
+  }, {
+    key: "forEach",
+    value: function forEach(callback) {
+      this.forms.forEach(callback);
+    }
+  }, {
+    key: "map",
+    value: function map(callback) {
+      return this.forms.map(callback);
+    }
+  }, {
+    key: "add",
+    value: function add(data) {
+      if (this.includes(data.id)) return;
+      this.forms.push(new _form.Form(data));
+    }
+  }, {
+    key: "getById",
+    value: function getById(id) {
+      return this.forms.find(form => form.id === id);
+    }
+  }, {
+    key: "getByIndex",
+    value: function getByIndex(index) {
+      return this.forms[index];
+    }
+  }, {
+    key: "includes",
+    value: function includes(formId) {
+      return this.forms.some(form => form.id === formId);
+    }
+  }, {
+    key: "excludes",
+    value: function excludes(id) {
+      return !this.includes(id);
+    }
+  }, {
+    key: "length",
+    get: function get() {
+      return this.forms.length;
+    }
+  }]);
+  return FormCollection;
+}();
+exports.FormCollection = FormCollection;
+function _get_formIdsToFetch() {
+  return Array.from(document.querySelectorAll('[data-hello-form]')).map(form => form.dataset.helloForm).filter(this.excludes);
+}

package/lib/models/index.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "Business", {
+  enumerable: true,
+  get: function get() {
+    return _business.Business;
+  }
+});
+Object.defineProperty(exports, "Cookies", {
+  enumerable: true,
+  get: function get() {
+    return _cookies.Cookies;
+  }
+});
+Object.defineProperty(exports, "Form", {
+  enumerable: true,
+  get: function get() {
+    return _form.Form;
+  }
+});
+Object.defineProperty(exports, "FormCollection", {
+  enumerable: true,
+  get: function get() {
+    return _form_collection.FormCollection;
+  }
+});
+Object.defineProperty(exports, "Query", {
+  enumerable: true,
+  get: function get() {
+    return _query.Query;
+  }
+});
+var _business = require("./business");
+var _form = require("./form");
+var _query = require("./query");
+var _cookies = require("./cookies");
+var _form_collection = require("./form_collection");

package/lib/models/query.js

@@ -0,0 +1,51 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Query = void 0;
+var _cookies = require("./cookies");
+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 Query = /*#__PURE__*/function () {
+  function Query() {
+    _classCallCheck(this, Query);
+    this.urlSearchParams = new URLSearchParams(window.location.search);
+  }
+  _createClass(Query, [{
+    key: "get",
+    value: function get(param) {
+      return this.urlSearchParams.get(this.toHellotextParam(param));
+    }
+  }, {
+    key: "has",
+    value: function has(param) {
+      return this.urlSearchParams.has(this.toHellotextParam(param));
+    }
+  }, {
+    key: "inPreviewMode",
+    get: function get() {
+      return this.has('preview');
+    }
+  }, {
+    key: "session",
+    get: function get() {
+      return this.get('session') || _cookies.Cookies.get('hello_session');
+    }
+  }, {
+    key: "toHellotextParam",
+    value: function toHellotextParam(param) {
+      return "hello_".concat(param);
+    }
+  }], [{
+    key: "inPreviewMode",
+    get: function get() {
+      return new this().inPreviewMode;
+    }
+  }]);
+  return Query;
+}();
+exports.Query = Query;

package/lib/models/step.js

@@ -0,0 +1,45 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Step = void 0;
+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 Step = /*#__PURE__*/function () {
+  function Step(data) {
+    _classCallCheck(this, Step);
+    this.data = data;
+  }
+  _createClass(Step, [{
+    key: "header",
+    get: function get() {
+      return this.data.header;
+    }
+  }, {
+    key: "inputs",
+    get: function get() {
+      return this.data.inputs;
+    }
+  }, {
+    key: "button",
+    get: function get() {
+      return this.data.button;
+    }
+  }, {
+    key: "footer",
+    get: function get() {
+      return this.data.footer;
+    }
+  }, {
+    key: "hasRequiredInputs",
+    get: function get() {
+      return this.inputs.some(input => input.required);
+    }
+  }]);
+  return Step;
+}();
+exports.Step = Step;

package/lib/query.js

@@ -1,35 +1,68 @@
-"use strict";
+'use strict'
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-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 Query = /*#__PURE__*/function () {
+Object.defineProperty(exports, '__esModule', {
+  value: true,
+})
+exports.default = void 0
+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 Query = /*#__PURE__*/ (function () {
   function Query(urlQueries) {
-    _classCallCheck(this, Query);
-    this.urlSearchParams = new URLSearchParams(urlQueries);
+    _classCallCheck(this, Query)
+    this.urlSearchParams = new URLSearchParams(urlQueries)
   }
-  _createClass(Query, [{
-    key: "get",
-    value: function get(param) {
-      return this.urlSearchParams.get(this.toHellotextParam(param));
-    }
-  }, {
-    key: "has",
-    value: function has(param) {
-      return this.urlSearchParams.has(this.toHellotextParam(param));
-    }
-  }, {
-    key: "toHellotextParam",
-    value: function toHellotextParam(param) {
-      return "hello_".concat(param);
-    }
-  }]);
-  return Query;
-}();
-exports.default = Query;
+  _createClass(Query, [
+    {
+      key: 'get',
+      value: function get(param) {
+        return this.urlSearchParams.get(this.toHellotextParam(param))
+      },
+    },
+    {
+      key: 'has',
+      value: function has(param) {
+        return this.urlSearchParams.has(this.toHellotextParam(param))
+      },
+    },
+    {
+      key: 'toHellotextParam',
+      value: function toHellotextParam(param) {
+        return 'hello_'.concat(param)
+      },
+    },
+  ])
+  return Query
+})()
+exports.default = Query

package/lib/response.js

@@ -1,49 +1,89 @@
-"use strict";
+'use strict'
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-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 _success = /*#__PURE__*/_classPrivateFieldLooseKey("success");
-var _response = /*#__PURE__*/_classPrivateFieldLooseKey("response");
-var Response = /*#__PURE__*/function () {
+Object.defineProperty(exports, '__esModule', {
+  value: true,
+})
+exports.default = void 0
+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 _success = /*#__PURE__*/ _classPrivateFieldLooseKey('success')
+var _response = /*#__PURE__*/ _classPrivateFieldLooseKey('response')
+var Response = /*#__PURE__*/ (function () {
   function Response(success, response) {
-    _classCallCheck(this, Response);
+    _classCallCheck(this, Response)
     Object.defineProperty(this, _success, {
       writable: true,
-      value: void 0
-    });
+      value: void 0,
+    })
     Object.defineProperty(this, _response, {
       writable: true,
-      value: void 0
-    });
-    _classPrivateFieldLooseBase(this, _success)[_success] = success;
-    _classPrivateFieldLooseBase(this, _response)[_response] = response;
+      value: void 0,
+    })
+    _classPrivateFieldLooseBase(this, _success)[_success] = success
+    _classPrivateFieldLooseBase(this, _response)[_response] = response
   }
-  _createClass(Response, [{
-    key: "data",
-    get: function get() {
-      return _classPrivateFieldLooseBase(this, _response)[_response];
-    }
-  }, {
-    key: "failed",
-    get: function get() {
-      return _classPrivateFieldLooseBase(this, _success)[_success] === false;
-    }
-  }, {
-    key: "succeeded",
-    get: function get() {
-      return _classPrivateFieldLooseBase(this, _success)[_success] === true;
-    }
-  }]);
-  return Response;
-}();
-exports.default = Response;
+  _createClass(Response, [
+    {
+      key: 'data',
+      get: function get() {
+        return _classPrivateFieldLooseBase(this, _response)[_response]
+      },
+    },
+    {
+      key: 'failed',
+      get: function get() {
+        return _classPrivateFieldLooseBase(this, _success)[_success] === false
+      },
+    },
+    {
+      key: 'succeeded',
+      get: function get() {
+        return _classPrivateFieldLooseBase(this, _success)[_success] === true
+      },
+    },
+  ])
+  return Response
+})()
+exports.default = Response

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hellotext/hellotext",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Hellotext JavaScript Client",
   "source": "src/index.js",
   "main": "lib/index.js",
@@ -18,7 +18,9 @@
     "jest-environment-jsdom": "^29.3.1",
     "prettier": "2.8.2",
     "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1"
+    "webpack-cli": "^5.0.1",
+    "style-loader": "^3.3.1",
+    "css-loader": "^6.5.0"
   },
   "repository": {
     "type": "git",
@@ -30,6 +32,7 @@
   ],
   "scripts": {
     "test": "NODE_ENV=test jest",
+    "build": "npm run build:babel && npm run build:webpack",
     "build:babel": "babel src -d lib",
     "build:webpack": "webpack"
   },
@@ -38,6 +41,7 @@
   },
   "dependencies": {
     "core-js": "3.27.2",
-    "whatwg-fetch": "^3.6.2"
+    "whatwg-fetch": "^3.6.2",
+    "@hotwired/stimulus": "^3.0.0"
   }
 }

package/src/api/businesses.js

@@ -0,0 +1,18 @@
+import { Configuration } from '../core'
+
+export default class {
+  static get endpoint() {
+    return Configuration.endpoint('public/businesses')
+  }
+
+  static async get(id) {
+    return fetch(`${this.endpoint}/${id}`, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${id}`,
+        Accept: 'application.json',
+        'Content-Type': 'application/json',
+      },
+    })
+  }
+}

package/src/api/events.js

@@ -0,0 +1,24 @@
+import { Configuration } from '../core'
+
+import { Query } from '../models'
+import { Response } from './response'
+
+export default class EventsAPI {
+  static get endpoint() {
+    return Configuration.endpoint('track/events')
+  }
+
+  static async create({ headers, body }) {
+    if (Query.inPreviewMode) {
+      return new Response(true, { received: true })
+    }
+
+    const response = await fetch(this.endpoint, {
+      method: 'POST',
+      headers,
+      body: JSON.stringify(body),
+    })
+
+    return new Response(response.status === 200, await response.json())
+  }
+}

package/src/api/forms.js

@@ -0,0 +1,30 @@
+import Hellotext from '../hellotext'
+import { Configuration } from '../core'
+
+import { Response } from './response'
+
+export default class FormsAPI {
+  static get endpoint() {
+    return Configuration.endpoint('public/forms')
+  }
+
+  static async get(id) {
+    return fetch(`${this.endpoint}/${id}`, {
+      method: 'GET',
+      headers: Hellotext.headers,
+    })
+  }
+
+  static async submit(id, data) {
+    const response = await fetch(`${this.endpoint}/${id}/submissions`, {
+      method: 'POST',
+      headers: Hellotext.headers,
+      body: JSON.stringify({
+        session: Hellotext.session,
+        ...data,
+      }),
+    })
+
+    return new Response(response.ok, response)
+  }
+}

package/src/api/index.js

@@ -0,0 +1,24 @@
+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
+  }
+
+  static get events() {
+    return EventsAPI
+  }
+
+  static get forms() {
+    return FormsAPI
+  }
+}
+
+export { Response } from './response'

package/src/{response.js → api/response.js}

@@ -1,14 +1,17 @@
-export default class Response {
+class Response {
   #success
-  #response
 
   constructor(success, response) {
+    this.response = response
     this.#success = success
-    this.#response = response
   }
 
   get data() {
-    return this.#response
+    return this.response
+  }
+
+  async json() {
+    return await this.response.json()
   }
 
   get failed() {
@@ -19,3 +22,5 @@ export default class Response {
     return this.#success === true
   }
 }
+
+export { Response }

package/src/api/sessions.js

@@ -0,0 +1,23 @@
+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()
+  }
+}