Update dependencies and CI image (#232)

* [CI] Upgrade to the latest CI image and upgrade babel deps and types

* Upgrade semver

* Upgrade @types/node

* Upgrade to husy 9

* Update eslint, jest, typescript

* Add prepare script for husky

* Upgrade @types/node and maplibre

* Add prettier to the lint script and lint fixes

* Upgrade maplibre

* Upgrade node-fetch

* Upgrade lru-cache

* Downgrade lru-cache to 7.18.3

* [skip-ci] Update changelog

Author: jsanz

.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.4"
   cpu: "2"
   memory: "2G"
 

.eslintignore

@@ -0,0 +1 @@
+yarn test

.eslintrc

@@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## Added
 
 ## Changed
-
+- Update dependencies #232
 
 ## [8.5.1] - 2023-11-09
 

.husky/pre-commit

@@ -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"]
+  },
+  {
+    files: ['**/*.{ts,tsx,mts,cts}'],
+    rules: {
+      'no-undef': 'off',
+      '@typescript-eslint/ban-types': 'off'
+    },
+    "languageOptions": {
+      "globals": {
+        ...globals.node
+      }
+    }
+  },
+);

CHANGELOG.md

@@ -6,8 +6,9 @@
   "browser": "target/web/index.js",
   "types": "target/index.d.ts",
   "scripts": {
+    "prepare": "husky",
     "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",
@@ -29,20 +30,14 @@
     "url": "https://github.com/elastic/ems-client/issues"
   },
   "homepage": "https://github.com/elastic/ems-client#readme",
-  "husky": {
-    "hooks": {
-      "pre-commit": "yarn test"
-    }
-  },
   "dependencies": {
     "@types/geojson": "^7946.0.14",
-    "@types/lru-cache": "^5.1.0",
     "@types/topojson-client": "^3.1.4",
     "@types/topojson-specification": "^1.0.5",
     "chroma-js": "^2.1.0",
     "lodash": "^4.17.15",
-    "lru-cache": "^6.0.0",
-    "semver": "7.6.0",
+    "lru-cache": "7.18.3",
+    "semver": "7.6.2",
     "topojson-client": "^3.1.0"
   },
   "devDependencies": {
@@ -51,25 +46,29 @@
     "@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/jest": "^26.0.10",
+    "@types/eslint__js": "^8.42.3",
+    "@types/jest": "^29.5.12",
     "@types/lodash": "^4.14.150",
-    "@types/node": "^13.13.5",
+    "@types/node": "^20.12.13",
     "@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",
-    "maplibre-gl": "2.1.9",
-    "node-fetch": "^2.6.1",
-    "prettier": "^2.0.5",
-    "ts-jest": "^26.2.0",
-    "typescript": "4.6.3"
+    "@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": "4.3.2",
+    "node-fetch": "^2.7.0",
+    "prettier": "^3.2.5",
+    "ts-jest": "^29.1.4",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.11.0"
   },
   "engines": {
     "node": ">=18 <=20"

eslint.config.mjs

@@ -290,7 +290,11 @@ export class EMSClient {
       if (!response.ok) {
         throw new Error(response.statusText);
       }
-      return response ? await response.json() : null;
+      if (response) {
+        return (await response.json()) as Promise<T>;
+      } else {
+        throw new Error('Response not found');
+      }
     } catch (e) {
       if (e instanceof Error) {
         throw e;
@@ -307,7 +311,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);
@@ -426,7 +430,7 @@ export class EMSClient {
   }
 
   private _invalidateSettings(): void {
-    this._cache.reset();
+    this._cache.clear();
     this._getMainCatalog = _.once(async (): Promise<EmsCatalogManifest> => {
       const services = [];
       if (this._tileApiUrl) {

package.json

@@ -169,9 +169,8 @@ export class TMSService extends AbstractEmsService {
         if (url) {
           const sourceUrl = this._proxyPath + this._getAbsoluteUrl(url);
           const extendedUrl = this._emsClient.extendUrlWithParams(sourceUrl);
-          const sourceJson = await this._emsClient.getManifest<VectorSourceSpecification>(
-            extendedUrl
-          );
+          const sourceJson =
+            await this._emsClient.getManifest<VectorSourceSpecification>(extendedUrl);
           const tiles = sourceJson?.tiles?.map((tileUrl) => {
             const directUrl = this._proxyPath + this._getAbsoluteUrl(tileUrl);
             return this._emsClient.extendUrlWithParams(directUrl);
@@ -374,33 +373,41 @@ export class TMSService extends AbstractEmsService {
 
   async getMinZoom(format = 'vector'): Promise<number | undefined> {
     switch (format) {
-      case 'vector':
+      case 'vector': {
         const { sources } = (await this._getVectorStyleJsonInlined()) || { sources: {} };
         return Math.min(
           ...Object.values(sources)
-            .map(({ minzoom }) => minzoom)
+            .map((s) => {
+              return s && s instanceof Object && 'minzoom' in s ? s['minzoom'] : null;
+            })
             .filter((minzoom): minzoom is number => Number.isFinite(minzoom))
         );
-      case 'raster':
+      }
+      case 'raster': {
         const { minzoom } = (await this._getRasterStyleJson()) || {};
         return minzoom;
+      }
       default:
         return;
     }
   }
 
   async getMaxZoom(format = 'vector'): Promise<number | undefined> {
     switch (format) {
-      case 'vector':
+      case 'vector': {
         const { sources } = (await this._getVectorStyleJsonInlined()) || { sources: {} };
         return Math.max(
           ...Object.values(sources)
-            .map(({ maxzoom }) => maxzoom)
+            .map((s) => {
+              return s && s instanceof Object && 'maxzoom' in s ? s['maxzoom'] : null;
+            })
             .filter((maxzoom): maxzoom is number => Number.isFinite(maxzoom))
         );
-      case 'raster':
+      }
+      case 'raster': {
         const { maxzoom } = (await this._getRasterStyleJson()) || {};
         return maxzoom;
+      }
       default:
         return;
     }
@@ -425,13 +432,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;
     }
   }
@@ -445,7 +451,7 @@ export class TMSService extends AbstractEmsService {
   private async _getSpriteSheetRootPath(): Promise<string> {
     const vectorStyleJson = await this._getVectorStyleJsonRaw();
     if (vectorStyleJson?.sprite) {
-      return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.sprite);
+      return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.sprite.toString());
     } else {
       return '';
     }

src/ems_client.ts

@@ -1,37 +1,37 @@
 // 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,
             ],
           ],
         ],
         "type": "Polygon",
       },
-      "properties": Object {
+      "properties": {
         "foo": "bar",
       },
       "type": "Feature",
@@ -42,37 +42,37 @@ 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,
             ],
           ],
         ],
         "type": "Polygon",
       },
-      "properties": Object {
+      "properties": {
         "foo": "bar",
       },
       "type": "Feature",

src/tms_service.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;