@elastic/ems-client 8.5.2 → 8.6.0

package/.backportrc.json

@@ -1,16 +1,10 @@
 {
-  "upstream": "elastic/ems-client",
-  "branches": [
-    {
-      "name": "8.4",
-      "checked": true
-    },
-    {
-      "name": "7.17",
-      "checked": true
-    }
-  ],
-  "labels": [
-    "backport"
-  ]
-}
+  "repoOwner": "elastic",
+  "repoName": "ems-file-service",
+  "targetBranches": ["7.17"],
+  "targetPRLabels": ["backport"],
+  "commitConflicts": true,
+  "autoMerge": true,
+  "autoMergeMethod": "squash",
+  "fork": false
+}

package/.buildkite/build.sh

@@ -9,6 +9,9 @@ set -eu
 echo "--- :yarn:  Installing dependencies"
 yarn install
 
+echo "--- :gear: Checking dependencies with Kibana"
+node .buildkite/compare_dependencies.js
+
 echo "--- :alembic: Running tests"
 yarn test
 

package/.buildkite/compare_dependencies.js

@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/* Script that will check the current package.json dependencies
+against Kibana (using BUILDKITE_BRANCH to determine the branch)
+and exits with a 1 status code if, for any shared dependency, 
+EMS Client is behind */
+
+const fs = require('node:fs');
+const semver = require('semver');
+
+const DEFAULT_BRANCH = 'main';
+const branch = process.env.KIBANA_BRANCH || DEFAULT_BRANCH;
+const kibanaPackageUrl = `https://raw.githubusercontent.com/elastic/kibana/${branch}/package.json`;
+
+const processDependency = function (dependency, srcDeps, dstDeps, dstDevDeps) {
+  if (!(dependency in dstDeps) && !(dependency in dstDevDeps)) {
+    return true;
+  }
+  const source = srcDeps[dependency].replace('^', '');
+  const destination = dstDeps[dependency] || dstDevDeps[dependency];
+
+  if (semver.satisfies(source, destination)) {
+    return true;
+  }
+
+  if ( dependency in dstDevDeps){
+    console.log(`⚠  ${dependency}: ${source} vs ${destination}`);
+    return true
+  }
+
+  console.log(`🛑  ${dependency}: ${source} vs ${destination}`);
+  return false;
+};
+
+const main = async function () {
+  const kibanaPackage = await fetch(kibanaPackageUrl);
+  const kibanaPackageJson = await kibanaPackage.json();
+  const kibanaDeps = kibanaPackageJson['dependencies'];
+  const kibanaDevDeps = kibanaPackageJson['devDependencies'];
+
+  const emsClientPackageJson = JSON.parse(fs.readFileSync('package.json'));
+  const emsClientDeps = {
+    ...emsClientPackageJson['dependencies'],
+    // ...emsClientPackageJson['devDependencies']
+  };
+
+  console.log(`ems-client@${emsClientPackageJson['version']}`);
+  console.log(`kibana@${kibanaPackageJson['version']}`);
+
+  const results = Object.keys(emsClientDeps).map((dep) =>
+    processDependency(dep, emsClientDeps, kibanaDeps, kibanaDevDeps)
+  );
+
+  process.exit(results.every(r => r) ? 0 : 1);
+};
+
+main()
+  .then(console.log)
+  .catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });

package/.buildkite/pipeline.yml

@@ -1,8 +1,10 @@
 agents:
-  image: "docker.elastic.co/ci-agent-images/ems/buildkite-agent-node20:0.4"
+  image: "docker.elastic.co/ci-agent-images/ems/buildkite-agent-node20:0.5@sha256:01d63c1c1e9895e410a8b50c0eb0ce8e986c354085a11ed1d00355a12935ac5e"
   cpu: "2"
   memory: "2G"
 
 steps:
   - label: ":hammer_and_wrench: Test and build"
     command: ".buildkite/build.sh"
+    env:
+      KIBANA_BRANCH: "main"

package/.github/workflows/backport.yml

@@ -0,0 +1,24 @@
+name: Automatic backport action
+
+on:
+  pull_request_target:
+    types: ["labeled", "closed"]
+
+jobs:
+  backport:
+    name: Backport PR
+    if: github.event.pull_request.merged == true && !(contains(github.event.pull_request.labels.*.name, 'backport'))
+    runs-on: ubuntu-latest
+    steps:
+      - name: Backport Action
+        uses: sorenlouv/backport-github-action@ad888e978060bc1b2798690dd9d03c4036560947 # v9.5.1
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Info log
+        if: ${{ success() }}
+        run: cat ~/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat ~/.backport/backport.debug.log

package/CHANGELOG.md

@@ -3,13 +3,23 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
-## [8.5.2] - 2024-07-05
+## [8.6.0] - 2024-12-13
+### Added
+- Include color options for new EMS styles #478
+
+### Changed
+- Dependencies reorganization and validation against Kibana #289
+- Update dependencies (search PRs for `is:pr label:8.5.4,dependencies`)
 
+## [8.5.3] - 2024-07-10
+### Changed
+- Update dependencies #242
+
+## [8.5.2] - 2024-07-05
 ## Changed
 - Update dependencies #232 #233 #234 #235 
 
 ## [8.5.1] - 2023-11-09
-
 ### Added
 - Add a new `getEmsVersion` method #204
 - Include OpenAPI specification #196 #197
@@ -21,83 +31,70 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Migration to Node 20 #208
 
 ## [8.5.0] - 2023-08-23
-
 - Migration from Jenkins to Buildkite for automatic testing #145 #147
 - Detached the releases of EMS Client from the services consumed #185
 - Updated the client to support date based versions #185
 - Update dependencies #159 #165 #173 #176 #181 #184
 
 ## [8.4.0] - 2023-01-11
-
 - Default EMS version is 8.4
 - Add types to colorOperationDefaults #123
 - Update dependencies #131 #133 #134 #138
 
 ## [8.3.3] - 2022-05-24
-
 - Make percentage an optional parameter #117
 - Make color and operation optional parameters #118
 
 ## [8.3.2] - 2022-05-16
-
 - Export `blendMode` type #111
 - Fix transforming color definitions with stops #112
 
 ## [8.3.1] - 2022-05-06
-
 - Added static methods to help translating basemap labels and blending colors to paint properties #105
 - Add optional `format` argument to `getMinZoom` and `getMaxZoom` #90
 
 ## [8.3.0] - 2022-04-18
-
 ### Changed
  - Default EMS version is 8.3 #104
  - Bump maplibre-gl to 2.1.9 #103
 
 ## [8.2.0] - 2022-03-24
-
 ### Changed
  - Default EMS version is 8.2
  - Removed getOrigin method #91
 
 ## [8.1.0] - 2021-11-09
-
 ### Changed
  - Default EMS version is 8.1
  - Export EmsSprite and EmsSpritesheet types
  - Inherit types from maplibre-gl
 
 ## [8.0.0] - 2021-10-20
-
 ### Changed
  - Default EMS version is 8.0
  - Remove unused API descriptors
 
 ## [7.16.0] - 2021-10-13
-
 ### Changed
  - Default EMS version is 7.16
  - Update dependencies using `yarn upgrade`
  - Better error handling for HTTP responses
 
 ## [7.15.1] - 2021-09-01
-
 ### Changed
 - Unpinned `semver` dependency [#77](https://github.com/elastic/ems-client/pull/77)
 
 ## [7.15.0] - 2021-08-12
-
 ### Changed
 - Default EMS version is 7.15
 - Updated dependencies via `yarn upgrade`
 - Fix linting issues
+
 ## [7.14.0] - 2021-06-15
 ### Added
-
 - New getters for optional field metadata `alias`, `regex`, and `values` #69
 
 ### Changed
-
 - Default EMS version is 7.14
 - **Breaking change** @elastic/ems-client is now licensed under the Elastic License v2. See the LICENSE.txt file in this repository #64
 
@@ -111,7 +108,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Updated dependencies using `yarn upgrade` and #44 #50
 - Add functions to get specific file formats #53
 
-
 ## [7.10.0] - 2020-08-17
 ### Changed
 - Default EMS version is 7.10
@@ -138,7 +134,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Convert source code to Typescript
 - Added better linting with eslint and prettier
 
-
 ## [7.8.1] - 2020-04-06
 ### Fixed
 - Correctly handle API urls that end in slashes
@@ -173,14 +168,11 @@ always needed and in fact breaks some client-side use of this lib
 - Correctly handle API urls that end in slashes
 
 ## [7.6.0] - 2020-01-13
-
 ### Added
 - Two new parameters were introduced, `tileApiUrl` and `fileApiUrl`. These should be used instead of `manifestServiceUrl`. These parameters should be set to their respective domains (e.g. `https://tiles.maps.elastic.co`, `https://vector.maps.elastic.co`). [#13](https://github.com/elastic/ems-client/pull/13)
 
 ### Changed
-
 - Starting with v7.6, new Elastic Maps Service (EMS) versions will be released with every matching major and minor release of the Elastic Stack. New releases of ems-client will also be released to match the EMS versions.
-
 - Handle relative URLs in EMS v7.6 manifests.
 
 ### Deprecated
@@ -202,7 +194,6 @@ Bump version to match the corresponding Elastic Maps Service version. This relea
 ### Fixed
 - Update browser entry point that was pointing to an incorrect path, which fell back to the main entry
 
-
 ## [1.0.2] - 2019-10-15
 
 ### Fixed
@@ -214,5 +205,4 @@ Bump version to match the corresponding Elastic Maps Service version. This relea
 - Downgrade node-fetch dependency to fix fetch error
 
 ## [1.0.0] - 2019-08-26
-
 - Initial release. Compatible with Elastic Maps Service v7.2.0.

package/eslint.config.mjs

@@ -8,7 +8,7 @@ export default tseslint.config(
   eslint.configs.recommended,
   ...tseslint.configs.recommended,
   {
-    ignores: ["target","*.config.js"]
+    ignores: ["target","*.config.js",".buildkite"]
   },
   {
     files: ['**/*.{ts,tsx,mts,cts}'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elastic/ems-client",
-  "version": "8.5.2",
+  "version": "8.6.0",
   "description": "JavaScript client library for the Elastic Maps Service",
   "main": "target/node/index.js",
   "browser": "target/web/index.js",
@@ -31,45 +31,46 @@
   },
   "homepage": "https://github.com/elastic/ems-client#readme",
   "dependencies": {
-    "@types/geojson": "^7946.0.14",
-    "@types/topojson-client": "^3.1.4",
-    "@types/topojson-specification": "^1.0.5",
-    "chroma-js": "^2.1.0",
-    "lodash": "^4.17.15",
-    "lru-cache": "7.18.3",
-    "semver": "7.6.2",
+    "@types/geojson": "7946.0.15",
+    "@types/topojson-client": "3.1.5",
+    "chroma-js": "^2.6.0",
+    "lodash": "^4.17.21",
+    "lru-cache": "^4.1.5",
+    "maplibre-gl": "3.1.0",
+    "node-fetch": "2.7.0",
+    "semver": "^7.6.3",
     "topojson-client": "^3.1.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.6.4",
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-typescript": "^7.9.0",
-    "@eslint/js": "^9.3.0",
-    "@types/chroma-js": "^2.1.3",
-    "@types/eslint__js": "^8.42.3",
-    "@types/jest": "^29.5.12",
-    "@types/lodash": "^4.14.150",
-    "@types/lru-cache": "^7.10.10",
-    "@types/node": "^20.12.13",
-    "@types/node-fetch": "^2.5.7",
-    "@types/semver": "^7.1.0",
-    "@typescript-eslint/eslint-plugin": "^7.11.0",
-    "@typescript-eslint/parser": "^7.11.0",
-    "babel-jest": "^29.7.0",
-    "eslint": "^9.3.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "globals": "^15.3.0",
-    "husky": "^9.0.11",
-    "jest": "^29.7.0",
-    "maplibre-gl": "3.1.0",
-    "node-fetch": "^2.7.0",
-    "prettier": "^3.2.5",
-    "ts-jest": "^29.1.4",
-    "typescript": "^5.4.5",
-    "typescript-eslint": "^7.11.0"
+    "@babel/cli": "7.26.4",
+    "@babel/core": "7.26.0",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/preset-env": "7.26.0",
+    "@babel/preset-typescript": "7.26.0",
+    "@eslint/core": "0.9.1",
+    "@eslint/js": "9.17.0",
+    "@types/chroma-js": "2.4.5",
+    "@types/eslint__js": "8.42.3",
+    "@types/jest": "29.5.14",
+    "@types/lodash": "4.17.13",
+    "@types/lru-cache": "5.1.1",
+    "@types/node": "20.17.10",
+    "@types/node-fetch": "2.6.12",
+    "@types/semver": "7.5.8",
+    "@types/topojson-specification": "1.0.5",
+    "@typescript-eslint/eslint-plugin": "8.18.1",
+    "@typescript-eslint/parser": "8.18.1",
+    "babel-jest": "29.7.0",
+    "eslint": "9.17.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-prettier": "5.2.1",
+    "globals": "15.14.0",
+    "husky": "9.1.7",
+    "jest": "29.7.0",
+    "prettier": "3.4.2",
+    "ts-jest": "29.2.5",
+    "typescript": "5.7.2",
+    "typescript-eslint": "8.18.1"
   },
   "engines": {
     "node": ">=18 <=20"

package/renovate.json

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "local>elastic/renovate-config"
+  ],
+  "labels": [
+    "dependencies",
+    "v7.17.4",
+    "v8.6.0"
+  ],
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    },
+    {
+      "matchDepTypes": ["devDependencies"],
+      "automerge": true
+    }
+  ]
+}

package/src/ems_client.ts

@@ -19,6 +19,7 @@ import { format as formatUrl, parse as parseUrl, UrlObject } from 'url';
 import { toAbsoluteUrl } from './utils';
 import { ParsedUrlQueryInput } from 'querystring';
 import LRUCache from 'lru-cache';
+import { RequestInfo } from 'node-fetch';
 
 const REST_API_REGEX = /\d{4}-\d{2}-\d{2}/;
 export const LATEST_API_URL_PATH = 'latest';
@@ -101,10 +102,10 @@ type BaseClientConfig = {
   tileApiUrl: string;
   fileApiUrl: string;
   emsVersion?: string;
-  htmlSanitizer?: Function;
+  htmlSanitizer?: (x: string) => string;
   language?: string;
   landingPageUrl?: string;
-  fetchFunction: Function;
+  fetchFunction: (url: RequestInfo) => Promise<Response>;
   proxyPath?: string;
   cacheSize?: number;
 };
@@ -209,8 +210,8 @@ export class EMSClient {
   readonly EMS_LOAD_TIMEOUT = 32000;
   private _queryParams: QueryParams;
   private readonly _appVersion: string;
-  private readonly _fetchFunction: Function;
-  private readonly _sanitizer: Function;
+  private readonly _fetchFunction: (url: RequestInfo) => Promise<Response>;
+  private readonly _sanitizer: (x: string) => string;
   private readonly _fileApiUrl: string;
   private readonly _tileApiUrl: string;
   private readonly _emsVersion: string;
@@ -223,11 +224,11 @@ export class EMSClient {
   /**
    * these methods are assigned outside the constructor
    */
-  private _getMainCatalog!: Function;
-  private _getDefaultTMSCatalog!: Function;
-  private _getDefaultFileCatalog!: Function;
-  private _loadTMSServices!: Function;
-  private _loadFileLayers!: Function;
+  private _getMainCatalog!: () => Promise<EmsCatalogManifest>;
+  private _getDefaultTMSCatalog!: () => Promise<EmsTmsCatalog>;
+  private _getDefaultFileCatalog!: () => Promise<EmsFileCatalog>;
+  private _loadTMSServices!: () => Promise<TMSService[]>;
+  private _loadFileLayers!: () => Promise<FileLayer[]>;
 
   constructor(config: ClientConfig | DeprecatedClientConfig) {
     // Remove kbnVersion in 8.0

package/src/tms_service.ts

@@ -132,6 +132,9 @@ export class TMSService extends AbstractEmsService {
     { style: 'road_map', operation: 'mix', percentage: 0.25 },
     { style: 'road_map_desaturated', operation: 'screen', percentage: 0.25 },
     { style: 'dark_map', operation: 'dodge', percentage: 0.25 },
+    { style: 'high_contrast', operation: 'screen', percentage: 0.25 },
+    { style: 'road_map_desaturated_v9', operation: 'screen', percentage: 0.25 },
+    { style: 'dark_map_v9', operation: 'dodge', percentage: 0.25 },
   ];
 
   protected readonly _config: TMSServiceConfig;

package/src/utils.ts

@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import chroma, { ChromaStatic } from 'chroma-js';
+import chroma, { ChromaStatic, Color } from 'chroma-js';
 import {
   ColorSpecification,
   DataDrivenPropertyValueSpecification,
@@ -63,7 +63,10 @@ export type blendMode = Parameters<ChromaStatic['blend']>[2] | 'mix';
 /*
 Function to transform a maplibre color definition by a given function.
 */
-function transformColor(paintColor: mbColorDefinition, func: Function): mbColorDefinition {
+function transformColor(
+  paintColor: mbColorDefinition,
+  func: (color: string) => Color
+): mbColorDefinition {
   if (typeof paintColor == 'string') {
     const modifiedColor = func(paintColor);
     return `rgba(${modifiedColor.rgba().join(',')})`;

package/target/ems_client.d.ts

@@ -1,6 +1,8 @@
 import { TMSService } from './tms_service';
 import { EMSFormatType, FileLayer } from './file_layer';
 import { FeatureCollection } from 'geojson';
+import { Response } from 'node-fetch';
+import { RequestInfo } from 'node-fetch';
 export declare const LATEST_API_URL_PATH = "latest";
 type LocalizedStrings = {
     [key: string]: string;
@@ -11,10 +13,10 @@ type BaseClientConfig = {
     tileApiUrl: string;
     fileApiUrl: string;
     emsVersion?: string;
-    htmlSanitizer?: Function;
+    htmlSanitizer?: (x: string) => string;
     language?: string;
     landingPageUrl?: string;
-    fetchFunction: Function;
+    fetchFunction: (url: RequestInfo) => Promise<Response>;
     proxyPath?: string;
     cacheSize?: number;
 };

package/target/node/tms_service.js

@@ -499,4 +499,16 @@ _defineProperty(TMSService, "colorOperationDefaults", [{
   style: 'dark_map',
   operation: 'dodge',
   percentage: 0.25
+}, {
+  style: 'high_contrast',
+  operation: 'screen',
+  percentage: 0.25
+}, {
+  style: 'road_map_desaturated_v9',
+  operation: 'screen',
+  percentage: 0.25
+}, {
+  style: 'dark_map_v9',
+  operation: 'dodge',
+  percentage: 0.25
 }]);

package/target/web/ems_client.js

@@ -164,7 +164,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     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) {
@@ -240,7 +240,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     key: "getMainManifest",
     value: function () {
-      var _getMainManifest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _getMainManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -262,7 +262,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     key: "getDefaultFileManifest",
     value: function () {
-      var _getDefaultFileManifest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+      var _getDefaultFileManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -284,7 +284,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     key: "getDefaultTMSManifest",
     value: function () {
-      var _getDefaultTMSManifest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _getDefaultTMSManifest = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -306,7 +306,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     key: "getFileLayers",
     value: function () {
-      var _getFileLayers = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _getFileLayers = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -328,7 +328,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     key: "getTMSServices",
     value: function () {
-      var _getTMSServices = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
+      var _getTMSServices = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6() {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
@@ -393,7 +393,7 @@ 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) {
@@ -431,7 +431,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     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) {
@@ -501,7 +501,7 @@ export var EMSClient = /*#__PURE__*/function () {
     value: function _invalidateSettings() {
       var _this2 = this;
       this._cache.reset();
-      this._getMainCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      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) {
@@ -530,7 +530,7 @@ export var EMSClient = /*#__PURE__*/function () {
           }
         }, _callee9);
       })));
-      this._getDefaultTMSCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      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) {
@@ -561,7 +561,7 @@ export var EMSClient = /*#__PURE__*/function () {
           }
         }, _callee10);
       })));
-      this._getDefaultFileCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      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) {
@@ -594,7 +594,7 @@ export var EMSClient = /*#__PURE__*/function () {
       })));
 
       //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() {
+      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) {
@@ -612,7 +612,7 @@ export var EMSClient = /*#__PURE__*/function () {
           }
         }, _callee12);
       })));
-      this._loadFileLayers = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      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) {