@elastic/ems-client 8.3.3 → 8.5.0

package/target/web/ems_client.js

@@ -1,15 +1,13 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+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 exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator["return"] && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, "catch": function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 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, descriptor.key, descriptor); } }
-
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+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 _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; }
+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); }
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
@@ -19,12 +17,15 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import _ from 'lodash';
 import { TMSService } from './tms_service';
 import { FileLayer } from './file_layer';
-import semver from 'semver';
+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 { toAbsoluteUrl } from './utils';
 import LRUCache from 'lru-cache';
-var DEFAULT_EMS_VERSION = '8.3';
-
+var REST_API_REGEX = /\d{4}-\d{2}-\d{2}/;
+export var LATEST_API_URL_PATH = 'latest';
 /**
  * plugins cannot have upstream dependencies on core/*-kibana.
  * Work-around by copy-pasting modifyUrl routine here.
@@ -32,13 +33,14 @@ var DEFAULT_EMS_VERSION = '8.3';
  * @param block
  */
 function modifyUrlLocal(url, block) {
-  var parsed = parseUrl(url, true); // copy over the most specific version of each
+  var parsed = parseUrl(url, true);
+
+  // copy over the most specific version of each
   // property. By default, the parsed url includes
   // several conflicting properties (like path and
   // 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 = {
     protocol: parsed.protocol,
     slashes: parsed.slashes,
@@ -48,10 +50,12 @@ function modifyUrlLocal(url, block) {
     pathname: parsed.pathname,
     query: parsed.query || {},
     hash: parsed.hash
-  }; // the block modifies the meaningfulParts object, or returns a new one
+  };
 
-  var modifiedParts = block(meaningfulParts) || meaningfulParts; // format the modified/replaced meaningfulParts back into a url
+  // the block modifies the meaningfulParts object, or returns a new one
+  var modifiedParts = block(meaningfulParts) || meaningfulParts;
 
+  // format the modified/replaced meaningfulParts back into a url
   return formatUrl({
     protocol: modifiedParts.protocol,
     slashes: modifiedParts.slashes,
@@ -63,72 +67,50 @@ function modifyUrlLocal(url, block) {
     hash: modifiedParts.hash
   });
 }
-
 var extendUrl = function extendUrl(url, props) {
   return modifyUrlLocal(url, function (parsed) {
     return _.merge(parsed, props);
   });
 };
+
 /**
  *  Unescape a url template that was escaped by encodeURI() so leaflet
  *  will be able to correctly locate the variables in the template
  *  @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, "}");
   });
 };
-
 //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 () {
-  /**
-   * these methods are assigned outside the constructor
-   */
   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, "_manifestServiceUrl", 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);
-
     // Remove kbnVersion in 8.0
     if ('kbnVersion' in config) {
       console.warn('The "kbnVersion" parameter for ems-client is deprecated. Please use "appVersion" instead.');
@@ -136,7 +118,6 @@ export var EMSClient = /*#__PURE__*/function () {
     } else {
       this._appVersion = config.appVersion;
     }
-
     this._queryParams = {
       elastic_tile_service_tos: 'agree',
       my_app_name: config.appName || 'kibana',
@@ -145,10 +126,10 @@ export var EMSClient = /*#__PURE__*/function () {
     this._sanitizer = config.htmlSanitizer ? config.htmlSanitizer : function (x) {
       return x;
     };
-    this._manifestServiceUrl = config.manifestServiceUrl;
     this._tileApiUrl = config.tileApiUrl;
     this._fileApiUrl = config.fileApiUrl;
     this._emsVersion = this._getEmsVersion(config.emsVersion);
+    this._isRestApi = this._emsVersion == config.emsVersion;
     this._emsLandingPageUrl = config.landingPageUrl || '';
     this._language = config.language || DEFAULT_LANGUAGE;
     this._fetchFunction = config.fetchFunction;
@@ -156,10 +137,8 @@ export var EMSClient = /*#__PURE__*/function () {
     this._cache = new LRUCache({
       max: config.cacheSize || 10
     });
-
     this._invalidateSettings();
   }
-
   _createClass(EMSClient, [{
     key: "getDefaultLocale",
     value: function getDefaultLocale() {
@@ -176,85 +155,67 @@ export var EMSClient = /*#__PURE__*/function () {
       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.
      */
-
   }, {
     key: "getManifest",
     value: function () {
-      var _getManifest = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(endpointUrl) {
+      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:
-                _context.t0 = _context.sent;
-                _context.next = 14;
+        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;
-
-              case 13:
-                _context.t0 = null;
-
-              case 14:
-                return _context.abrupt("return", _context.t0);
-
-              case 17:
-                _context.prev = 17;
-                _context.t1 = _context["catch"](0);
-
-                if (!(_context.t1 instanceof Error)) {
-                  _context.next = 23;
-                  break;
-                }
-
-                throw _context.t1;
-
-              case 23:
-                throw new Error('Unknown error');
-
-              case 24:
-              case "end":
-                return _context.stop();
-            }
+              }
+              throw new Error(response.statusText);
+            case 7:
+              if (!response) {
+                _context.next = 13;
+                break;
+              }
+              _context.next = 10;
+              return response.json();
+            case 10:
+              _context.t0 = _context.sent;
+              _context.next = 14;
+              break;
+            case 13:
+              _context.t0 = null;
+            case 14:
+              return _context.abrupt("return", _context.t0);
+            case 17:
+              _context.prev = 17;
+              _context.t1 = _context["catch"](0);
+              if (!(_context.t1 instanceof Error)) {
+                _context.next = 23;
+                break;
+              }
+              throw _context.t1;
+            case 23:
+              throw new Error('Unknown error');
+            case 24:
+            case "end":
+              return _context.stop();
           }
         }, _callee, this, [[0, 17]]);
       }));
-
       function getManifest(_x) {
         return _getManifest.apply(this, arguments);
       }
-
       return getManifest;
     }()
     /**
@@ -262,7 +223,6 @@ export var EMSClient = /*#__PURE__*/function () {
      *
      * @param additionalQueryParams
      */
-
   }, {
     key: "addQueryParams",
     value: function addQueryParams(additionalQueryParams) {
@@ -271,9 +231,7 @@ export var EMSClient = /*#__PURE__*/function () {
           if (additionalQueryParams[_key] !== this._queryParams[_key]) {
             //changes detected.
             this._queryParams = _.assign({}, this._queryParams, additionalQueryParams);
-
             this._invalidateSettings();
-
             break;
           }
         }
@@ -282,148 +240,117 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     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();
-            }
+      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();
-            }
+      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();
-            }
+      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();
-            }
+      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();
-            }
+      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);
       }
-
       return getTMSServices;
     }()
   }, {
     key: "cacheGeoJson",
     value: function cacheGeoJson(layerId, geoJson) {
       this._cache.set(layerId, geoJson);
-
       return;
     }
   }, {
@@ -461,107 +388,88 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     key: "findFileLayerById",
     value: function () {
-      var _findFileLayerById = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee7(id) {
+      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;
+        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;
-
-              case 10:
-              case "end":
-                return _context7.stop();
-            }
+              }
+              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);
       }
-
       return findFileLayerById;
     }()
   }, {
     key: "findTMSServiceById",
     value: function () {
-      var _findTMSServiceById = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee8(id) {
+      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;
+        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;
-
-              case 10:
-              case "end":
-                return _context8.stop();
-            }
+              }
+              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);
       }
-
       return findTMSServiceById;
     }()
   }, {
     key: "_getEmsVersion",
     value: function _getEmsVersion(version) {
-      var userVersion = semver.valid(semver.coerce(version));
-      var semverVersion = userVersion ? userVersion : semver.coerce(DEFAULT_EMS_VERSION);
-
+      if (version !== null && version !== void 0 && version.match(REST_API_REGEX)) {
+        return version;
+      }
+      var semverVersion = semverValid(semverCoerce(version));
       if (semverVersion) {
-        return "v".concat(semver.major(semverVersion), ".").concat(semver.minor(semverVersion));
+        return "v".concat(semverMajor(semverVersion), ".").concat(semverMinor(semverVersion));
       } else {
         throw new Error("Invalid version: ".concat(version));
       }
@@ -570,12 +478,10 @@ export var EMSClient = /*#__PURE__*/function () {
     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);
@@ -585,214 +491,141 @@ export var EMSClient = /*#__PURE__*/function () {
         });
       });
     }
-  }, {
-    key: "_getManifestWithParams",
-    value: function () {
-      var _getManifestWithParams2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee9(url) {
-        var extendedUrl;
-        return regeneratorRuntime.wrap(function _callee9$(_context9) {
-          while (1) {
-            switch (_context9.prev = _context9.next) {
-              case 0:
-                extendedUrl = this.extendUrlWithParams(url);
-                _context9.next = 3;
-                return this.getManifest(extendedUrl);
-
-              case 3:
-                return _context9.abrupt("return", _context9.sent);
-
-              case 4:
-              case "end":
-                return _context9.stop();
-            }
-          }
-        }, _callee9, this);
-      }));
-
-      function _getManifestWithParams(_x4) {
-        return _getManifestWithParams2.apply(this, arguments);
-      }
-
-      return _getManifestWithParams;
-    }()
   }, {
     key: "_invalidateSettings",
     value: function _invalidateSettings() {
       var _this2 = this;
-
       this._cache.reset();
-
-      this._getMainCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee10() {
-        var services;
-        return regeneratorRuntime.wrap(function _callee10$(_context10) {
-          while (1) {
-            switch (_context10.prev = _context10.next) {
-              case 0:
-                if (!_this2._manifestServiceUrl) {
-                  _context10.next = 7;
-                  break;
-                }
-
-                console.warn("The \"manifestServiceUrl\" parameter is deprecated in v7.6.0.\n        Consider using \"tileApiUrl\" and \"fileApiUrl\" instead.");
-                _context10.next = 4;
-                return _this2._getManifestWithParams(_this2._manifestServiceUrl);
-
-              case 4:
-                return _context10.abrupt("return", _context10.sent);
-
-              case 7:
-                services = [];
-
-                if (_this2._tileApiUrl) {
-                  services.push({
-                    type: 'tms',
-                    manifest: toAbsoluteUrl(_this2._tileApiUrl, "".concat(_this2._emsVersion, "/manifest"))
-                  });
-                }
-
-                if (_this2._fileApiUrl) {
-                  services.push({
-                    type: 'file',
-                    manifest: toAbsoluteUrl(_this2._fileApiUrl, "".concat(_this2._emsVersion, "/manifest"))
-                  });
-                }
-
-                return _context10.abrupt("return", {
-                  services: services
+      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"))
                 });
-
-              case 11:
-              case "end":
-                return _context10.stop();
-            }
+              }
+              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();
           }
-        }, _callee10);
+        }, _callee9);
       })));
-      this._getDefaultTMSCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee11() {
+      this._getDefaultTMSCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         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 === 'tms';
-                });
-
-                if (firstService) {
-                  _context11.next = 6;
-                  break;
-                }
-
-                return _context11.abrupt("return", {
-                  services: []
-                });
-
-              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();
-            }
+        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();
           }
-        }, _callee11);
+        }, _callee10);
       })));
-      this._getDefaultFileCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee12() {
+      this._getDefaultFileCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var catalogue, firstService, url;
-        return regeneratorRuntime.wrap(function _callee12$(_context12) {
-          while (1) {
-            switch (_context12.prev = _context12.next) {
-              case 0:
-                _context12.next = 2;
-                return _this2._getMainCatalog();
-
-              case 2:
-                catalogue = _context12.sent;
-                firstService = catalogue.services.find(function (service) {
-                  return service.type === 'file';
-                });
-
-                if (firstService) {
-                  _context12.next = 6;
-                  break;
-                }
-
-                return _context12.abrupt("return", {
-                  layers: []
-                });
-
-              case 6:
-                url = _this2._proxyPath + firstService.manifest;
-                _context12.next = 9;
-                return _this2.getManifest(url);
-
-              case 9:
-                return _context12.abrupt("return", _context12.sent);
-
-              case 10:
-              case "end":
-                return _context12.stop();
-            }
+        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();
           }
-        }, _callee12);
-      }))); //Cache the actual instances of TMSService as these in turn cache sub-manifests for the style-files
+        }, _callee11);
+      })));
 
-      this._loadTMSServices = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee13() {
+      //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 _callee13$(_context13) {
-          while (1) {
-            switch (_context13.prev = _context13.next) {
-              case 0:
-                _context13.next = 2;
-                return _this2._getDefaultTMSCatalog();
-
-              case 2:
-                tmsManifest = _context13.sent;
-                return _context13.abrupt("return", tmsManifest.services.map(function (serviceConfig) {
-                  return new TMSService(serviceConfig, _this2, _this2._proxyPath);
-                }));
-
-              case 4:
-              case "end":
-                return _context13.stop();
-            }
+        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();
           }
-        }, _callee13);
+        }, _callee12);
       })));
-      this._loadFileLayers = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee14() {
+      this._loadFileLayers = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var fileManifest;
-        return regeneratorRuntime.wrap(function _callee14$(_context14) {
-          while (1) {
-            switch (_context14.prev = _context14.next) {
-              case 0:
-                _context14.next = 2;
-                return _this2._getDefaultFileCatalog();
-
-              case 2:
-                fileManifest = _context14.sent;
-                return _context14.abrupt("return", fileManifest.layers.map(function (layerConfig) {
-                  return new FileLayer(layerConfig, _this2, _this2._proxyPath);
-                }));
-
-              case 4:
-              case "end":
-                return _context14.stop();
-            }
+        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();
           }
-        }, _callee14);
+        }, _callee13);
       })));
     }
   }]);
-
   return EMSClient;
 }();