@elastic/ems-client 7.17.3 → 7.17.4

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/compare_dependencies.js

@@ -46,7 +46,7 @@ const main = async function () {
   const emsClientPackageJson = JSON.parse(fs.readFileSync('package.json'));
   const emsClientDeps = {
     ...emsClientPackageJson['dependencies'],
-    ...emsClientPackageJson['devDependencies']
+    // ...emsClientPackageJson['devDependencies']
   };
 
   console.log(`ems-client@${emsClientPackageJson['version']}`);

package/.buildkite/pipeline.yml

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

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,52 +3,48 @@ 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/).
 
-## [7.17.3] - 2024-07-10
+## [7.17.4] - 2024-12-16
 
 ### Changed
+- Update dependencies (search PRs for `is:pr label:7.17.4,dependencies`)
+
 
+## [7.17.3] - 2024-07-10
+### Changed
 - Update dependencies #243
 
 ## [7.17.2] - 2024-07-05
-
 ## Changed
-
 - Update dependencies  #218 #219 #220 #221 #236 #237
 
 ## [7.17.1] - 2023-11-09
-
 ### Changed
-
 - Default EMS version is 7.17
 - Upgrade dependencies #138 #162 #165 #169 #172 #173 !76 #184 #191 #198 #205
 - Migration from Jenkins to Buildkite for automatic testing #163 #199
 - Upgrade to Node 20 #208
 
 ## [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
 
@@ -62,7 +58,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
@@ -89,7 +84,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
@@ -124,12 +118,10 @@ 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.
@@ -142,7 +134,6 @@ always needed and in fact breaks some client-side use of this lib
 -  Remove paragraph element from html attribution [#15](https://github.com/elastic/ems-client/pull/15)
 
 ## [7.2.1] - 2019-12-11
-
 ### Fixed
 - Inject correct attribution into vector tile sources [#14](https://github.com/elastic/ems-client/pull/14/files)
 
@@ -153,17 +144,13 @@ 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
 - Transpile the browser-side assets to be IE compatible.
 
 ## [1.0.1] - 2019-08-27
-
 ### Fixed
 - 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

@@ -0,0 +1,25 @@
+// @ts-check
+
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import globals from 'globals';
+
+export default tseslint.config(
+  eslint.configs.recommended,
+  ...tseslint.configs.recommended,
+  {
+    ignores: ["target","*.config.js",".buildkite"]
+  },
+  {
+    files: ['**/*.{ts,tsx,mts,cts}'],
+    rules: {
+      'no-undef': 'off',
+      '@typescript-eslint/ban-types': 'off'
+    },
+    "languageOptions": {
+      "globals": {
+        ...globals.node
+      }
+    }
+  },
+);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@elastic/ems-client",
-  "version": "7.17.3",
+  "version": "7.17.4",
   "description": "JavaScript client library for the Elastic Maps Service",
   "main": "target/node/index.js",
   "browser": "target/web/index.js",
   "types": "target/index.d.ts",
   "scripts": {
     "prelint": "tsc --noEmit",
-    "lint": "eslint . --ext .ts,.tsx",
+    "lint": "prettier --check src/* && eslint .",
     "pretest": "yarn lint",
     "test": "jest",
     "build": "tsc --emitDeclarationOnly && yarn build-web && yarn build-node",
@@ -35,38 +35,43 @@
     }
   },
   "dependencies": {
-    "@types/geojson": "^7946.0.14",
-    "@types/lru-cache": "^5.1.0",
-    "@types/topojson-client": "^3.1.4",
-    "@types/topojson-specification": "^1.0.5",
-    "lodash": "^4.17.21",
-    "lru-cache": "^4.1.5",
-    "semver": "7.6.2",
-    "topojson-client": "^3.1.0"
+    "@types/geojson": "7946.0.15",
+    "@types/topojson-client": "3.1.5",
+    "lodash": "4.17.21",
+    "lru-cache": "4.1.5",
+    "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",
-    "@types/jest": "^26.0.10",
-    "@types/lodash": "4.17.5",
-    "@types/node": "^13.13.5",
-    "@types/node-fetch": "^2.5.7",
-    "@types/semver": "^7.1.0",
-    "@typescript-eslint/eslint-plugin": "^2.33.0",
-    "@typescript-eslint/parser": "^2.33.0",
-    "babel-jest": "^26.3.0",
-    "eslint": "^7.0.0",
-    "eslint-config-prettier": "^6.11.0",
-    "eslint-plugin-prettier": "^3.1.3",
-    "husky": "^4.2.5",
-    "jest": "^26.4.0",
-    "node-fetch": "^2.6.7",
-    "prettier": "^2.0.5",
-    "ts-jest": "^26.2.0",
-    "typescript": "4.6.3"
+    "@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/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/src/ems_client.ts

@@ -15,6 +15,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 DEFAULT_EMS_VERSION = '7.17';
 
@@ -96,10 +97,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;
 };
@@ -204,8 +205,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 _manifestServiceUrl?: string;
   private readonly _fileApiUrl: string;
   private readonly _tileApiUrl: string;
@@ -218,11 +219,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
@@ -300,7 +301,7 @@ export class EMSClient {
    */
   addQueryParams(additionalQueryParams: { [key: string]: string }): void {
     for (const key in additionalQueryParams) {
-      if (additionalQueryParams.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(additionalQueryParams, key)) {
         if (additionalQueryParams[key] !== this._queryParams[key]) {
           //changes detected.
           this._queryParams = _.assign({}, this._queryParams, additionalQueryParams);

package/src/tms_service.ts

@@ -252,13 +252,12 @@ export class TMSService extends AbstractEmsService {
       vectorFormats = this._getFormats(formatType, this._emsClient.getDefaultLocale());
     }
     if (!vectorFormats.length) {
-      // eslint-disable-next-line max-len
       throw new Error(
         `Cannot find ${formatType} tile layer for locale ${this._emsClient.getLocale()} or ${this._emsClient.getDefaultLocale()}`
       );
     }
     const defaultStyle = vectorFormats[0];
-    if (defaultStyle && defaultStyle.hasOwnProperty('url')) {
+    if (defaultStyle && Object.prototype.hasOwnProperty.call(defaultStyle, 'url')) {
       return defaultStyle.url;
     }
   }

package/target/ems_client.d.ts

@@ -1,51 +1,53 @@
 import { TMSService } from './tms_service';
 import { EMSFormatType, FileLayer } from './file_layer';
 import { FeatureCollection } from 'geojson';
-declare type LocalizedStrings = {
+import { Response } from 'node-fetch';
+import { RequestInfo } from 'node-fetch';
+type LocalizedStrings = {
     [key: string]: string;
 };
-declare type BaseClientConfig = {
+type BaseClientConfig = {
     appName?: string;
     manifestServiceUrl?: string;
     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;
 };
-declare type DeprecatedClientConfig = BaseClientConfig & {
+type DeprecatedClientConfig = BaseClientConfig & {
     kbnVersion: string;
 };
-declare type ClientConfig = BaseClientConfig & {
+type ClientConfig = BaseClientConfig & {
     appVersion: string;
 };
-declare type EmsCatalogService = {
+type EmsCatalogService = {
     id?: string;
     name?: string;
     manifest: string;
     type: string;
 };
-declare type EmsCatalogManifest = {
+type EmsCatalogManifest = {
     version?: string;
     services: EmsCatalogService[];
 };
-declare type EmsTmsCatalog = {
+type EmsTmsCatalog = {
     version?: string;
     services: TMSServiceConfig[];
 };
-export declare type EmsTmsFormat = {
+export type EmsTmsFormat = {
     locale: string;
     format: string;
     url: string;
 };
-export declare type BaseEmsServiceConfig = {
+export type BaseEmsServiceConfig = {
     attribution: EmsLayerAttribution[];
 };
-export declare type FileLayerConfig = BaseEmsServiceConfig & {
+export type FileLayerConfig = BaseEmsServiceConfig & {
     layer_id: string;
     created_at: string;
     formats: (EmsFileLayerFormatGeoJson | EmsFileLayerFormatTopoJson)[];
@@ -53,7 +55,7 @@ export declare type FileLayerConfig = BaseEmsServiceConfig & {
     legacy_ids: string[];
     layer_name: LocalizedStrings;
 };
-export declare type FileLayerField = {
+export type FileLayerField = {
     type: string;
     id: string;
     label: LocalizedStrings;
@@ -61,27 +63,27 @@ export declare type FileLayerField = {
     regex?: string;
     alias?: string[];
 };
-export declare type TMSServiceConfig = BaseEmsServiceConfig & {
+export type TMSServiceConfig = BaseEmsServiceConfig & {
     id: string;
     name: {
         en: string;
     };
     formats: EmsTmsFormat[];
 };
-declare type EmsFileCatalog = {
+type EmsFileCatalog = {
     version?: string;
     layers: FileLayerConfig[];
 };
-export declare type EmsLayerAttribution = {
+export type EmsLayerAttribution = {
     label: LocalizedStrings;
     url: LocalizedStrings;
 };
-export declare type EmsFileLayerFormatGeoJson = {
+export type EmsFileLayerFormatGeoJson = {
     type: EMSFormatType.geojson;
     url: string;
     legacy_default: boolean;
 };
-export declare type EmsFileLayerFormatTopoJson = {
+export type EmsFileLayerFormatTopoJson = {
     type: EMSFormatType.topojson;
     url: string;
     legacy_default: boolean;

package/target/file_layer.d.ts

@@ -5,7 +5,7 @@ export declare enum EMSFormatType {
     geojson = "geojson",
     topojson = "topojson"
 }
-export declare type EMSFormatTypeStrings = keyof typeof EMSFormatType;
+export type EMSFormatTypeStrings = keyof typeof EMSFormatType;
 export declare class FileLayer extends AbstractEmsService {
     protected readonly _config: FileLayerConfig;
     constructor(config: FileLayerConfig, emsClient: EMSClient, proxyPath: string);

package/target/node/ems_client.js

@@ -167,7 +167,7 @@ class EMSClient {
    */
   addQueryParams(additionalQueryParams) {
     for (const key in additionalQueryParams) {
-      if (additionalQueryParams.hasOwnProperty(key)) {
+      if (Object.prototype.hasOwnProperty.call(additionalQueryParams, key)) {
         if (additionalQueryParams[key] !== this._queryParams[key]) {
           //changes detected.
           this._queryParams = _lodash.default.assign({}, this._queryParams, additionalQueryParams);

package/target/node/tms_service.js

@@ -184,11 +184,10 @@ class TMSService extends _ems_service.AbstractEmsService {
       vectorFormats = this._getFormats(formatType, this._emsClient.getDefaultLocale());
     }
     if (!vectorFormats.length) {
-      // eslint-disable-next-line max-len
       throw new Error(`Cannot find ${formatType} tile layer for locale ${this._emsClient.getLocale()} or ${this._emsClient.getDefaultLocale()}`);
     }
     const defaultStyle = vectorFormats[0];
-    if (defaultStyle && defaultStyle.hasOwnProperty('url')) {
+    if (defaultStyle && Object.prototype.hasOwnProperty.call(defaultStyle, 'url')) {
       return defaultStyle.url;
     }
   }

package/target/tms_service.d.ts

@@ -1,6 +1,6 @@
 import { EMSClient, TMSServiceConfig } from './ems_client';
 import { AbstractEmsService } from './ems_service';
-declare type EmsVectorSource = {
+type EmsVectorSource = {
     type: 'vector';
     url: string;
     tiles: string[];
@@ -10,10 +10,10 @@ declare type EmsVectorSource = {
     maxzoom?: number;
     attribution?: string;
 };
-declare type EmsVectorSources = {
+type EmsVectorSources = {
     [sourceName: string]: EmsVectorSource;
 };
-declare type EmsVectorStyle = {
+type EmsVectorStyle = {
     sources: EmsVectorSources;
     sprite: string;
     glyphs: string;
@@ -28,17 +28,17 @@ declare type EmsVectorStyle = {
     version: number;
     zoom?: number;
 };
-declare type EmsSprite = {
+type EmsSprite = {
     height: number;
     pixelRatio: number;
     width: number;
     x: number;
     y: number;
 };
-declare type EmsSpriteSheet = {
+type EmsSpriteSheet = {
     [spriteName: string]: EmsSprite;
 };
-declare type EmsRasterStyle = {
+type EmsRasterStyle = {
     tilejson: string;
     name: string;
     attribution: string;

package/target/web/ems_client.js

@@ -161,7 +161,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) {
@@ -225,7 +225,7 @@ export var EMSClient = /*#__PURE__*/function () {
     key: "addQueryParams",
     value: function addQueryParams(additionalQueryParams) {
       for (var _key in additionalQueryParams) {
-        if (additionalQueryParams.hasOwnProperty(_key)) {
+        if (Object.prototype.hasOwnProperty.call(additionalQueryParams, _key)) {
           if (additionalQueryParams[_key] !== this._queryParams[_key]) {
             //changes detected.
             this._queryParams = _.assign({}, this._queryParams, additionalQueryParams);
@@ -238,7 +238,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:
@@ -260,7 +260,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:
@@ -282,7 +282,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:
@@ -304,7 +304,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:
@@ -326,7 +326,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:
@@ -386,7 +386,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) {
@@ -424,7 +424,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) {
@@ -490,7 +490,7 @@ export var EMSClient = /*#__PURE__*/function () {
   }, {
     key: "_getManifestWithParams",
     value: function () {
-      var _getManifestWithParams2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9(url) {
+      var _getManifestWithParams2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(url) {
         var extendedUrl;
         return _regeneratorRuntime().wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
@@ -516,7 +516,7 @@ export var EMSClient = /*#__PURE__*/function () {
     value: function _invalidateSettings() {
       var _this2 = this;
       this._cache.reset();
-      this._getMainCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      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) {
@@ -553,7 +553,7 @@ export var EMSClient = /*#__PURE__*/function () {
           }
         }, _callee10);
       })));
-      this._getDefaultTMSCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      this._getDefaultTMSCatalog = _.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) {
@@ -584,7 +584,7 @@ export var EMSClient = /*#__PURE__*/function () {
           }
         }, _callee11);
       })));
-      this._getDefaultFileCatalog = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      this._getDefaultFileCatalog = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var catalogue, firstService, url;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
@@ -617,7 +617,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 _callee13() {
+      this._loadTMSServices = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var tmsManifest;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
@@ -635,7 +635,7 @@ export var EMSClient = /*#__PURE__*/function () {
           }
         }, _callee13);
       })));
-      this._loadFileLayers = _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      this._loadFileLayers = _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var fileManifest;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {

package/target/web/file_layer.js

@@ -45,7 +45,7 @@ export var FileLayer = /*#__PURE__*/function (_AbstractEmsService) {
   return _createClass(FileLayer, [{
     key: "getGeoJson",
     value: function () {
-      var _getGeoJson = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _getGeoJson = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
         var cachedGeoJson, format, fetchUrl, geojson, fetchedJson, _meta$feature_collect, meta, featureCollectionPath;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {

package/target/web/tms_service.js

@@ -35,7 +35,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
     _classCallCheck(this, TMSService);
     _this = _callSuper(this, TMSService, [config, emsClient, proxyPath]);
     _defineProperty(_this, "_config", void 0);
-    _defineProperty(_this, "_getRasterStyleJson", _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    _defineProperty(_this, "_getRasterStyleJson", _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var rasterUrl, url;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -55,7 +55,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
         }
       }, _callee);
     }))));
-    _defineProperty(_this, "_getVectorStyleJsonRaw", _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    _defineProperty(_this, "_getVectorStyleJsonRaw", _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var vectorUrl, url, vectorJson;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -79,7 +79,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
         }
       }, _callee2);
     }))));
-    _defineProperty(_this, "_getVectorStyleJsonInlined", _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    _defineProperty(_this, "_getVectorStyleJsonInlined", _.once(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var vectorJson, inlinedSources, sources, _iterator, _step, _sourceName, url, sourceUrl, extendedUrl, sourceJson, extendedTileUrls;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -166,7 +166,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   return _createClass(TMSService, [{
     key: "getDefaultRasterStyle",
     value: function () {
-      var _getDefaultRasterStyle = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+      var _getDefaultRasterStyle = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var _this2 = this;
         var tileJson, tiles;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
@@ -202,7 +202,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getUrlTemplate",
     value: function () {
-      var _getUrlTemplate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+      var _getUrlTemplate = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
         var tileJson, directUrl;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
@@ -233,7 +233,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getUrlTemplateForVector",
     value: function () {
-      var _getUrlTemplateForVector = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee6(sourceId) {
+      var _getUrlTemplateForVector = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee6(sourceId) {
         var tileJson, directUrl;
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
@@ -270,7 +270,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getVectorStyleSheet",
     value: function () {
-      var _getVectorStyleSheet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
+      var _getVectorStyleSheet = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7() {
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
@@ -292,7 +292,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getVectorStyleSheetRaw",
     value: function () {
-      var _getVectorStyleSheetRaw = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
+      var _getVectorStyleSheetRaw = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8() {
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
             case 0:
@@ -314,7 +314,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getSpriteSheetMeta",
     value: function () {
-      var _getSpriteSheetMeta = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
+      var _getSpriteSheetMeta = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9() {
         var isRetina,
           metaUrl,
           spritePngs,
@@ -362,7 +362,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getSpriteSheetJsonPath",
     value: function () {
-      var _getSpriteSheetJsonPath = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
+      var _getSpriteSheetJsonPath = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
         var isRetina,
           spriteSheetRootPath,
           suffix,
@@ -397,7 +397,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getSpriteSheetPngPath",
     value: function () {
-      var _getSpriteSheetPngPath = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
+      var _getSpriteSheetPngPath = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
         var isRetina,
           spriteSheetRootPath,
           suffix,
@@ -437,7 +437,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getMinZoom",
     value: function () {
-      var _getMinZoom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
+      var _getMinZoom = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
         var tileJson;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
@@ -467,7 +467,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "getMaxZoom",
     value: function () {
-      var _getMaxZoom = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
+      var _getMaxZoom = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
         var tileJson;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
@@ -518,11 +518,10 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
         vectorFormats = this._getFormats(formatType, this._emsClient.getDefaultLocale());
       }
       if (!vectorFormats.length) {
-        // eslint-disable-next-line max-len
         throw new Error("Cannot find ".concat(formatType, " tile layer for locale ").concat(this._emsClient.getLocale(), " or ").concat(this._emsClient.getDefaultLocale()));
       }
       var defaultStyle = vectorFormats[0];
-      if (defaultStyle && defaultStyle.hasOwnProperty('url')) {
+      if (defaultStyle && Object.prototype.hasOwnProperty.call(defaultStyle, 'url')) {
         return defaultStyle.url;
       }
     }
@@ -536,7 +535,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "_getSpriteSheetRootPath",
     value: function () {
-      var _getSpriteSheetRootPath2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
+      var _getSpriteSheetRootPath2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14() {
         var vectorStyleJson;
         return _regeneratorRuntime().wrap(function _callee14$(_context14) {
           while (1) switch (_context14.prev = _context14.next) {
@@ -566,7 +565,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
   }, {
     key: "_getUrlTemplateForGlyphs",
     value: function () {
-      var _getUrlTemplateForGlyphs2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
+      var _getUrlTemplateForGlyphs2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee15() {
         var vectorStyleJson;
         return _regeneratorRuntime().wrap(function _callee15$(_context15) {
           while (1) switch (_context15.prev = _context15.next) {

package/test/__snapshots__/ems_client.test.ts.snap

@@ -1,29 +1,29 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`.getFileLayers[1] - getGeoJson defaults should convert topojson to geojson 1`] = `
-Object {
-  "features": Array [
-    Object {
-      "geometry": Object {
-        "coordinates": Array [
-          Array [
-            Array [
+{
+  "features": [
+    {
+      "geometry": {
+        "coordinates": [
+          [
+            [
               72.77144284428442,
               62.593,
             ],
-            Array [
+            [
               50.625,
               50.06444104410441,
             ],
-            Array [
+            [
               91.7565793579358,
               35.46,
             ],
-            Array [
+            [
               93.867,
               58.2621401140114,
             ],
-            Array [
+            [
               72.77144284428442,
               62.593,
             ],
@@ -31,7 +31,7 @@ Object {
         ],
         "type": "Polygon",
       },
-      "properties": Object {
+      "properties": {
         "foo": "bar",
       },
       "type": "Feature",
@@ -42,29 +42,29 @@ Object {
 `;
 
 exports[`.getFileLayers[1] - getGeoJson limited cache 1`] = `
-Object {
-  "features": Array [
-    Object {
-      "geometry": Object {
-        "coordinates": Array [
-          Array [
-            Array [
+{
+  "features": [
+    {
+      "geometry": {
+        "coordinates": [
+          [
+            [
               72.77144284428442,
               62.593,
             ],
-            Array [
+            [
               50.625,
               50.06444104410441,
             ],
-            Array [
+            [
               91.7565793579358,
               35.46,
             ],
-            Array [
+            [
               93.867,
               58.2621401140114,
             ],
-            Array [
+            [
               72.77144284428442,
               62.593,
             ],
@@ -72,7 +72,7 @@ Object {
         ],
         "type": "Polygon",
       },
-      "properties": Object {
+      "properties": {
         "foo": "bar",
       },
       "type": "Feature",

package/test/ems_client_util.ts

@@ -42,7 +42,7 @@ export function getEMSClient(options = {}) {
 
   const getManifestMock = jest
     .spyOn(emsClient, 'getManifest')
-    .mockImplementation(async (url: string): Promise<any> => {
+    .mockImplementation(async (url: string): Promise<object | unknown> => {
       //simulate network calls
       if (url.startsWith('https://foobar')) {
         return EMS_CATALOGUE;

package/.eslintignore

@@ -1 +0,0 @@
-/target

package/.eslintrc

@@ -1,18 +0,0 @@
-{
-  "parser": "@typescript-eslint/parser",
-  "plugins": ["@typescript-eslint"],
-  "extends": [
-    "plugin:@typescript-eslint/recommended",
-    "prettier/@typescript-eslint",
-    "plugin:prettier/recommended"
-  ],
-  "rules": {
-    "@typescript-eslint/member-ordering": 2,
-    "@typescript-eslint/camelcase": 0,
-    "@typescript-eslint/no-explicit-any": 0,
-    "@typescript-eslint/no-inferrable-types": 0,
-    "@typescript-eslint/explicit-function-return-type": 0,
-    "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/interface-name-prefix": 0
-  }
-}