@elastic/ems-client 8.6.3 → 8.8.0

package/target/web/ems_client.js

@@ -1,13 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
-function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
-function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -16,16 +6,17 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
  */
 import _ from 'lodash';
 import { TMSService } from './tms_service';
-import { FileLayer } from './file_layer';
+import { EMSFormatType, FileLayer } from './file_layer';
 import semverCoerce from 'semver/functions/coerce';
 import semverValid from 'semver/functions/valid';
 import semverMajor from 'semver/functions/major';
 import semverMinor from 'semver/functions/minor';
-import { format as formatUrl, parse as parseUrl } from 'url';
+import { format as formatUrl, parse as parseUrl, UrlObject } from 'url';
 import { toAbsoluteUrl } from './utils';
-import LRUCache from 'lru-cache';
-var REST_API_REGEX = /\d{4}-\d{2}-\d{2}/;
-export var LATEST_API_URL_PATH = 'latest';
+import { ParsedUrlQueryInput } from 'querystring';
+import { LRUCache } from 'lru-cache';
+const REST_API_REGEX = /\d{4}-\d{2}-\d{2}/;
+export const LATEST_API_URL_PATH = 'latest';
 /**
  * plugins cannot have upstream dependencies on core/*-kibana.
  * Work-around by copy-pasting modifyUrl routine here.
@@ -33,7 +24,7 @@ export var LATEST_API_URL_PATH = 'latest';
  * @param block
  */
 function modifyUrlLocal(url, block) {
-  var parsed = parseUrl(url, true);
+  const parsed = parseUrl(url, true);
 
   // copy over the most specific version of each
   // property. By default, the parsed url includes
@@ -41,7 +32,7 @@ function modifyUrlLocal(url, block) {
   // pathname + search, or search and query) and keeping
   // track of which property is actually used when they
   // are formatted is harder than necessary
-  var meaningfulParts = {
+  const meaningfulParts = {
     protocol: parsed.protocol,
     slashes: parsed.slashes,
     auth: parsed.auth,
@@ -53,7 +44,7 @@ function modifyUrlLocal(url, block) {
   };
 
   // the block modifies the meaningfulParts object, or returns a new one
-  var modifiedParts = block(meaningfulParts) || meaningfulParts;
+  const modifiedParts = block(meaningfulParts) || meaningfulParts;
 
   // format the modified/replaced meaningfulParts back into a url
   return formatUrl({
@@ -67,11 +58,7 @@ function modifyUrlLocal(url, block) {
     hash: modifiedParts.hash
   });
 }
-var extendUrl = function extendUrl(url, props) {
-  return modifyUrlLocal(url, function (parsed) {
-    return _.merge(parsed, props);
-  });
-};
+const extendUrl = (url, props) => modifyUrlLocal(url, parsed => _.merge(parsed, props));
 
 /**
  *  Unescape a url template that was escaped by encodeURI() so leaflet
@@ -79,38 +66,36 @@ var extendUrl = function extendUrl(url, props) {
  *  @param  {String} url
  *  @return {String}
  */
-var unescapeTemplateVars = function unescapeTemplateVars(url) {
-  var ENCODED_TEMPLATE_VARS_RE = /%7B(\w+?)%7D/g;
-  return url.replace(ENCODED_TEMPLATE_VARS_RE, function (total, varName) {
-    return "{".concat(varName, "}");
-  });
+const unescapeTemplateVars = url => {
+  const ENCODED_TEMPLATE_VARS_RE = /%7B(\w+?)%7D/g;
+  return url.replace(ENCODED_TEMPLATE_VARS_RE, (total, varName) => `{${varName}}`);
 };
 //this is not the default locale from Kibana, but the default locale supported by the Elastic Maps Service
-var DEFAULT_LANGUAGE = 'en';
-export var EMSClient = /*#__PURE__*/function () {
-  function EMSClient(config) {
-    _classCallCheck(this, EMSClient);
-    _defineProperty(this, "EMS_LOAD_TIMEOUT", 32000);
-    _defineProperty(this, "_queryParams", void 0);
-    _defineProperty(this, "_appVersion", void 0);
-    _defineProperty(this, "_fetchFunction", void 0);
-    _defineProperty(this, "_sanitizer", void 0);
-    _defineProperty(this, "_fileApiUrl", void 0);
-    _defineProperty(this, "_tileApiUrl", void 0);
-    _defineProperty(this, "_emsVersion", void 0);
-    _defineProperty(this, "_emsLandingPageUrl", void 0);
-    _defineProperty(this, "_language", void 0);
-    _defineProperty(this, "_proxyPath", void 0);
-    _defineProperty(this, "_cache", void 0);
-    _defineProperty(this, "_isRestApi", false);
-    /**
-     * these methods are assigned outside the constructor
-     */
-    _defineProperty(this, "_getMainCatalog", void 0);
-    _defineProperty(this, "_getDefaultTMSCatalog", void 0);
-    _defineProperty(this, "_getDefaultFileCatalog", void 0);
-    _defineProperty(this, "_loadTMSServices", void 0);
-    _defineProperty(this, "_loadFileLayers", void 0);
+const DEFAULT_LANGUAGE = 'en';
+export class EMSClient {
+  EMS_LOAD_TIMEOUT = 32000;
+  _queryParams;
+  _appVersion;
+  _fetchFunction;
+  _sanitizer;
+  _fileApiUrl;
+  _tileApiUrl;
+  _emsVersion;
+  _emsLandingPageUrl;
+  _language;
+  _proxyPath;
+  _cache;
+  _isRestApi = false;
+
+  /**
+   * these methods are assigned outside the constructor
+   */
+  _getMainCatalog;
+  _getDefaultTMSCatalog;
+  _getDefaultFileCatalog;
+  _loadTMSServices;
+  _loadFileLayers;
+  constructor(config) {
     // Remove kbnVersion in 8.0
     if ('kbnVersion' in config) {
       console.warn('The "kbnVersion" parameter for ems-client is deprecated. Please use "appVersion" instead.');
@@ -123,9 +108,7 @@ export var EMSClient = /*#__PURE__*/function () {
       my_app_name: config.appName || 'kibana',
       my_app_version: this._appVersion
     };
-    this._sanitizer = config.htmlSanitizer ? config.htmlSanitizer : function (x) {
-      return x;
-    };
+    this._sanitizer = config.htmlSanitizer ? config.htmlSanitizer : x => x;
     this._tileApiUrl = config.tileApiUrl;
     this._fileApiUrl = config.fileApiUrl;
     this._emsVersion = this._getEmsVersion(config.emsVersion);
@@ -139,497 +122,198 @@ export var EMSClient = /*#__PURE__*/function () {
     });
     this._invalidateSettings();
   }
-  return _createClass(EMSClient, [{
-    key: "getDefaultLocale",
-    value: function getDefaultLocale() {
-      return DEFAULT_LANGUAGE;
-    }
-  }, {
-    key: "getLocale",
-    value: function getLocale() {
-      return this._language;
+  getDefaultLocale() {
+    return DEFAULT_LANGUAGE;
+  }
+  getLocale() {
+    return this._language;
+  }
+  getValueInLanguage(i18nObject) {
+    if (!i18nObject) {
+      return '';
     }
-  }, {
-    key: "getValueInLanguage",
-    value: function getValueInLanguage(i18nObject) {
-      if (!i18nObject) {
-        return '';
+    return i18nObject[this._language] ? i18nObject[this._language] : i18nObject[DEFAULT_LANGUAGE];
+  }
+
+  /**
+   * this internal method is overridden by the tests to simulate custom manifest.
+   */
+  async getManifest(endpointUrl) {
+    try {
+      const url = extendUrl(endpointUrl, {
+        query: this._queryParams
+      });
+      const response = await this._fetchWithTimeout(url);
+      if (!response.ok) {
+        throw new Error(response.statusText);
+      }
+      if (response) {
+        return await response.json();
+      } else {
+        throw new Error('Response not found');
+      }
+    } catch (e) {
+      if (e instanceof Error) {
+        throw e;
+      } else {
+        throw new Error('Unknown error', {
+          cause: e
+        });
       }
-      return i18nObject[this._language] ? i18nObject[this._language] : i18nObject[DEFAULT_LANGUAGE];
     }
+  }
 
-    /**
-     * this internal method is overridden by the tests to simulate custom manifest.
-     */
-  }, {
-    key: "getManifest",
-    value: (function () {
-      var _getManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(endpointUrl) {
-        var url, response;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              _context.prev = 0;
-              url = extendUrl(endpointUrl, {
-                query: this._queryParams
-              });
-              _context.next = 4;
-              return this._fetchWithTimeout(url);
-            case 4:
-              response = _context.sent;
-              if (response.ok) {
-                _context.next = 7;
-                break;
-              }
-              throw new Error(response.statusText);
-            case 7:
-              if (!response) {
-                _context.next = 13;
-                break;
-              }
-              _context.next = 10;
-              return response.json();
-            case 10:
-              return _context.abrupt("return", _context.sent);
-            case 13:
-              throw new Error('Response not found');
-            case 14:
-              _context.next = 23;
-              break;
-            case 16:
-              _context.prev = 16;
-              _context.t0 = _context["catch"](0);
-              if (!(_context.t0 instanceof Error)) {
-                _context.next = 22;
-                break;
-              }
-              throw _context.t0;
-            case 22:
-              throw new Error('Unknown error');
-            case 23:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this, [[0, 16]]);
-      }));
-      function getManifest(_x) {
-        return _getManifest.apply(this, arguments);
-      }
-      return getManifest;
-    }()
-    /**
-     * Add optional query-parameters to all requests
-     *
-     * @param additionalQueryParams
-     */
-    )
-  }, {
-    key: "addQueryParams",
-    value: function addQueryParams(additionalQueryParams) {
-      for (var _key in additionalQueryParams) {
-        if (Object.prototype.hasOwnProperty.call(additionalQueryParams, _key)) {
-          if (additionalQueryParams[_key] !== this._queryParams[_key]) {
-            //changes detected.
-            this._queryParams = _.assign({}, this._queryParams, additionalQueryParams);
-            this._invalidateSettings();
-            break;
-          }
+  /**
+   * Add optional query-parameters to all requests
+   *
+   * @param additionalQueryParams
+   */
+  addQueryParams(additionalQueryParams) {
+    for (const key in additionalQueryParams) {
+      if (Object.prototype.hasOwnProperty.call(additionalQueryParams, key)) {
+        if (additionalQueryParams[key] !== this._queryParams[key]) {
+          //changes detected.
+          this._queryParams = _.assign({}, this._queryParams, additionalQueryParams);
+          this._invalidateSettings();
+          break;
         }
       }
     }
-  }, {
-    key: "getMainManifest",
-    value: function () {
-      var _getMainManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _context2.next = 2;
-              return this._getMainCatalog();
-            case 2:
-              return _context2.abrupt("return", _context2.sent);
-            case 3:
-            case "end":
-              return _context2.stop();
-          }
-        }, _callee2, this);
-      }));
-      function getMainManifest() {
-        return _getMainManifest.apply(this, arguments);
-      }
-      return getMainManifest;
-    }()
-  }, {
-    key: "getDefaultFileManifest",
-    value: function () {
-      var _getDefaultFileManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
-            case 0:
-              _context3.next = 2;
-              return this._getDefaultFileCatalog();
-            case 2:
-              return _context3.abrupt("return", _context3.sent);
-            case 3:
-            case "end":
-              return _context3.stop();
-          }
-        }, _callee3, this);
-      }));
-      function getDefaultFileManifest() {
-        return _getDefaultFileManifest.apply(this, arguments);
-      }
-      return getDefaultFileManifest;
-    }()
-  }, {
-    key: "getDefaultTMSManifest",
-    value: function () {
-      var _getDefaultTMSManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
-            case 0:
-              _context4.next = 2;
-              return this._getDefaultTMSCatalog();
-            case 2:
-              return _context4.abrupt("return", _context4.sent);
-            case 3:
-            case "end":
-              return _context4.stop();
-          }
-        }, _callee4, this);
-      }));
-      function getDefaultTMSManifest() {
-        return _getDefaultTMSManifest.apply(this, arguments);
-      }
-      return getDefaultTMSManifest;
-    }()
-  }, {
-    key: "getFileLayers",
-    value: function () {
-      var _getFileLayers = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
-            case 0:
-              _context5.next = 2;
-              return this._loadFileLayers();
-            case 2:
-              return _context5.abrupt("return", _context5.sent);
-            case 3:
-            case "end":
-              return _context5.stop();
-          }
-        }, _callee5, this);
-      }));
-      function getFileLayers() {
-        return _getFileLayers.apply(this, arguments);
-      }
-      return getFileLayers;
-    }()
-  }, {
-    key: "getTMSServices",
-    value: function () {
-      var _getTMSServices = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
-        return _regeneratorRuntime().wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
-            case 0:
-              _context6.next = 2;
-              return this._loadTMSServices();
-            case 2:
-              return _context6.abrupt("return", _context6.sent);
-            case 3:
-            case "end":
-              return _context6.stop();
-          }
-        }, _callee6, this);
-      }));
-      function getTMSServices() {
-        return _getTMSServices.apply(this, arguments);
+  }
+  async getMainManifest() {
+    return await this._getMainCatalog();
+  }
+  async getDefaultFileManifest() {
+    return await this._getDefaultFileCatalog();
+  }
+  async getDefaultTMSManifest() {
+    return await this._getDefaultTMSCatalog();
+  }
+  async getFileLayers() {
+    return await this._loadFileLayers();
+  }
+  async getTMSServices() {
+    return await this._loadTMSServices();
+  }
+  cacheGeoJson(layerId, geoJson) {
+    this._cache.set(layerId, geoJson);
+    return;
+  }
+  getCachedGeoJson(layerId) {
+    return this._cache.get(layerId);
+  }
+  getEmsVersion() {
+    return this._emsVersion;
+  }
+  getTileApiUrl() {
+    return this._tileApiUrl;
+  }
+  getFileApiUrl() {
+    return this._fileApiUrl;
+  }
+  getLandingPageUrl() {
+    return this._emsLandingPageUrl;
+  }
+  sanitizeHtml(html) {
+    return this._sanitizer(html);
+  }
+  extendUrlWithParams(url) {
+    return unescapeTemplateVars(extendUrl(url, {
+      query: this._queryParams
+    }));
+  }
+  async findFileLayerById(id) {
+    const fileLayers = await this.getFileLayers();
+    for (let i = 0; i < fileLayers.length; i++) {
+      if (fileLayers[i].hasId(id)) {
+        return fileLayers[i];
       }
-      return getTMSServices;
-    }()
-  }, {
-    key: "cacheGeoJson",
-    value: function cacheGeoJson(layerId, geoJson) {
-      this._cache.set(layerId, geoJson);
-      return;
-    }
-  }, {
-    key: "getCachedGeoJson",
-    value: function getCachedGeoJson(layerId) {
-      return this._cache.get(layerId);
-    }
-  }, {
-    key: "getEmsVersion",
-    value: function getEmsVersion() {
-      return this._emsVersion;
-    }
-  }, {
-    key: "getTileApiUrl",
-    value: function getTileApiUrl() {
-      return this._tileApiUrl;
     }
-  }, {
-    key: "getFileApiUrl",
-    value: function getFileApiUrl() {
-      return this._fileApiUrl;
-    }
-  }, {
-    key: "getLandingPageUrl",
-    value: function getLandingPageUrl() {
-      return this._emsLandingPageUrl;
+  }
+  async findTMSServiceById(id) {
+    const tmsServices = await this.getTMSServices();
+    for (let i = 0; i < tmsServices.length; i++) {
+      if (tmsServices[i].hasId(id)) {
+        return tmsServices[i];
+      }
     }
-  }, {
-    key: "sanitizeHtml",
-    value: function sanitizeHtml(html) {
-      return this._sanitizer(html);
+  }
+  _getEmsVersion(version) {
+    if (version?.match(REST_API_REGEX)) {
+      return version;
     }
-  }, {
-    key: "extendUrlWithParams",
-    value: function extendUrlWithParams(url) {
-      return unescapeTemplateVars(extendUrl(url, {
-        query: this._queryParams
-      }));
+    const semverVersion = semverValid(semverCoerce(version));
+    if (semverVersion) {
+      return `v${semverMajor(semverVersion)}.${semverMinor(semverVersion)}`;
+    } else {
+      throw new Error(`Invalid version: ${version}`);
     }
-  }, {
-    key: "findFileLayerById",
-    value: function () {
-      var _findFileLayerById = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(id) {
-        var fileLayers, i;
-        return _regeneratorRuntime().wrap(function _callee7$(_context7) {
-          while (1) switch (_context7.prev = _context7.next) {
-            case 0:
-              _context7.next = 2;
-              return this.getFileLayers();
-            case 2:
-              fileLayers = _context7.sent;
-              i = 0;
-            case 4:
-              if (!(i < fileLayers.length)) {
-                _context7.next = 10;
-                break;
-              }
-              if (!fileLayers[i].hasId(id)) {
-                _context7.next = 7;
-                break;
-              }
-              return _context7.abrupt("return", fileLayers[i]);
-            case 7:
-              i++;
-              _context7.next = 4;
-              break;
-            case 10:
-            case "end":
-              return _context7.stop();
-          }
-        }, _callee7, this);
-      }));
-      function findFileLayerById(_x2) {
-        return _findFileLayerById.apply(this, arguments);
+  }
+  _fetchWithTimeout(url) {
+    return new Promise((resolve, reject) => {
+      const timer = setTimeout(() => reject(new Error(`Request to ${url} timed out`)), this.EMS_LOAD_TIMEOUT);
+      this._fetchFunction(url).then(response => {
+        clearTimeout(timer);
+        resolve(response);
+      }, err => {
+        clearTimeout(timer);
+        reject(err);
+      });
+    });
+  }
+  _invalidateSettings() {
+    this._cache.clear();
+    this._getMainCatalog = _.once(async () => {
+      const services = [];
+      if (this._tileApiUrl) {
+        const version = this._isRestApi ? LATEST_API_URL_PATH : this._emsVersion;
+        services.push({
+          type: 'tms',
+          manifest: toAbsoluteUrl(this._tileApiUrl, `${version}/manifest`)
+        });
       }
-      return findFileLayerById;
-    }()
-  }, {
-    key: "findTMSServiceById",
-    value: function () {
-      var _findTMSServiceById = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(id) {
-        var tmsServices, i;
-        return _regeneratorRuntime().wrap(function _callee8$(_context8) {
-          while (1) switch (_context8.prev = _context8.next) {
-            case 0:
-              _context8.next = 2;
-              return this.getTMSServices();
-            case 2:
-              tmsServices = _context8.sent;
-              i = 0;
-            case 4:
-              if (!(i < tmsServices.length)) {
-                _context8.next = 10;
-                break;
-              }
-              if (!tmsServices[i].hasId(id)) {
-                _context8.next = 7;
-                break;
-              }
-              return _context8.abrupt("return", tmsServices[i]);
-            case 7:
-              i++;
-              _context8.next = 4;
-              break;
-            case 10:
-            case "end":
-              return _context8.stop();
-          }
-        }, _callee8, this);
-      }));
-      function findTMSServiceById(_x3) {
-        return _findTMSServiceById.apply(this, arguments);
+      if (this._fileApiUrl) {
+        const version = this._isRestApi ? LATEST_API_URL_PATH : this._emsVersion;
+        services.push({
+          type: 'file',
+          manifest: toAbsoluteUrl(this._fileApiUrl, `${version}/manifest`)
+        });
       }
-      return findTMSServiceById;
-    }()
-  }, {
-    key: "_getEmsVersion",
-    value: function _getEmsVersion(version) {
-      if (version !== null && version !== void 0 && version.match(REST_API_REGEX)) {
-        return version;
+      return {
+        services: services
+      };
+    });
+    this._getDefaultTMSCatalog = _.once(async () => {
+      const catalogue = await this._getMainCatalog();
+      const firstService = catalogue.services.find(service => service.type === 'tms');
+      if (!firstService) {
+        return {
+          services: []
+        };
       }
-      var semverVersion = semverValid(semverCoerce(version));
-      if (semverVersion) {
-        return "v".concat(semverMajor(semverVersion), ".").concat(semverMinor(semverVersion));
-      } else {
-        throw new Error("Invalid version: ".concat(version));
+      const url = this._proxyPath + firstService.manifest;
+      return await this.getManifest(url);
+    });
+    this._getDefaultFileCatalog = _.once(async () => {
+      const catalogue = await this._getMainCatalog();
+      const firstService = catalogue.services.find(service => service.type === 'file');
+      if (!firstService) {
+        return {
+          layers: []
+        };
       }
-    }
-  }, {
-    key: "_fetchWithTimeout",
-    value: function _fetchWithTimeout(url) {
-      var _this = this;
-      return new Promise(function (resolve, reject) {
-        var timer = setTimeout(function () {
-          return reject(new Error("Request to ".concat(url, " timed out")));
-        }, _this.EMS_LOAD_TIMEOUT);
-        _this._fetchFunction(url).then(function (response) {
-          clearTimeout(timer);
-          resolve(response);
-        }, function (err) {
-          clearTimeout(timer);
-          reject(err);
-        });
-      });
-    }
-  }, {
-    key: "_invalidateSettings",
-    value: function _invalidateSettings() {
-      var _this2 = this;
-      this._cache.reset();
-      this._getMainCatalog = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
-        var services, version, _version;
-        return _regeneratorRuntime().wrap(function _callee9$(_context9) {
-          while (1) switch (_context9.prev = _context9.next) {
-            case 0:
-              services = [];
-              if (_this2._tileApiUrl) {
-                version = _this2._isRestApi ? LATEST_API_URL_PATH : _this2._emsVersion;
-                services.push({
-                  type: 'tms',
-                  manifest: toAbsoluteUrl(_this2._tileApiUrl, "".concat(version, "/manifest"))
-                });
-              }
-              if (_this2._fileApiUrl) {
-                _version = _this2._isRestApi ? LATEST_API_URL_PATH : _this2._emsVersion;
-                services.push({
-                  type: 'file',
-                  manifest: toAbsoluteUrl(_this2._fileApiUrl, "".concat(_version, "/manifest"))
-                });
-              }
-              return _context9.abrupt("return", {
-                services: services
-              });
-            case 4:
-            case "end":
-              return _context9.stop();
-          }
-        }, _callee9);
-      })));
-      this._getDefaultTMSCatalog = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
-        var catalogue, firstService, url;
-        return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-          while (1) switch (_context10.prev = _context10.next) {
-            case 0:
-              _context10.next = 2;
-              return _this2._getMainCatalog();
-            case 2:
-              catalogue = _context10.sent;
-              firstService = catalogue.services.find(function (service) {
-                return service.type === 'tms';
-              });
-              if (firstService) {
-                _context10.next = 6;
-                break;
-              }
-              return _context10.abrupt("return", {
-                services: []
-              });
-            case 6:
-              url = _this2._proxyPath + firstService.manifest;
-              _context10.next = 9;
-              return _this2.getManifest(url);
-            case 9:
-              return _context10.abrupt("return", _context10.sent);
-            case 10:
-            case "end":
-              return _context10.stop();
-          }
-        }, _callee10);
-      })));
-      this._getDefaultFileCatalog = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
-        var catalogue, firstService, url;
-        return _regeneratorRuntime().wrap(function _callee11$(_context11) {
-          while (1) switch (_context11.prev = _context11.next) {
-            case 0:
-              _context11.next = 2;
-              return _this2._getMainCatalog();
-            case 2:
-              catalogue = _context11.sent;
-              firstService = catalogue.services.find(function (service) {
-                return service.type === 'file';
-              });
-              if (firstService) {
-                _context11.next = 6;
-                break;
-              }
-              return _context11.abrupt("return", {
-                layers: []
-              });
-            case 6:
-              url = _this2._proxyPath + firstService.manifest;
-              _context11.next = 9;
-              return _this2.getManifest(url);
-            case 9:
-              return _context11.abrupt("return", _context11.sent);
-            case 10:
-            case "end":
-              return _context11.stop();
-          }
-        }, _callee11);
-      })));
+      const url = this._proxyPath + firstService.manifest;
+      return await this.getManifest(url);
+    });
 
-      //Cache the actual instances of TMSService as these in turn cache sub-manifests for the style-files
-      this._loadTMSServices = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
-        var tmsManifest;
-        return _regeneratorRuntime().wrap(function _callee12$(_context12) {
-          while (1) switch (_context12.prev = _context12.next) {
-            case 0:
-              _context12.next = 2;
-              return _this2._getDefaultTMSCatalog();
-            case 2:
-              tmsManifest = _context12.sent;
-              return _context12.abrupt("return", tmsManifest.services.map(function (serviceConfig) {
-                return new TMSService(serviceConfig, _this2, _this2._proxyPath);
-              }));
-            case 4:
-            case "end":
-              return _context12.stop();
-          }
-        }, _callee12);
-      })));
-      this._loadFileLayers = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
-        var fileManifest;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
-            case 0:
-              _context13.next = 2;
-              return _this2._getDefaultFileCatalog();
-            case 2:
-              fileManifest = _context13.sent;
-              return _context13.abrupt("return", fileManifest.layers.map(function (layerConfig) {
-                return new FileLayer(layerConfig, _this2, _this2._proxyPath);
-              }));
-            case 4:
-            case "end":
-              return _context13.stop();
-          }
-        }, _callee13);
-      })));
-    }
-  }]);
-}();
+    //Cache the actual instances of TMSService as these in turn cache sub-manifests for the style-files
+    this._loadTMSServices = _.once(async () => {
+      const tmsManifest = await this._getDefaultTMSCatalog();
+      return tmsManifest.services.map(serviceConfig => new TMSService(serviceConfig, this, this._proxyPath));
+    });
+    this._loadFileLayers = _.once(async () => {
+      const fileManifest = await this._getDefaultFileCatalog();
+      return fileManifest.layers.map(layerConfig => new FileLayer(layerConfig, this, this._proxyPath));
+    });
+  }
+}