@elastic/ems-client 8.3.2 → 8.4.0

package/.ci/jobs/defaults.yml

@@ -40,7 +40,7 @@
           set -e
           set +x
 
-          NODE_IMG="node:10"
+          NODE_IMG="node:16"
 
           docker pull $NODE_IMG
           docker run --rm -i \
@@ -51,7 +51,7 @@
               --volume $PWD:/app \
               --workdir /app \
               $NODE_IMG \
-              bash -c 'npm config set spin false && /opt/yarn*/bin/yarn && yarn test && yarn run build'
+              bash -c '/opt/yarn*/bin/yarn && yarn test && yarn run build'
 
     publishers:
       - email:

package/CHANGELOG.md

@@ -3,6 +3,16 @@ 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.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
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elastic/ems-client",
-  "version": "8.3.2",
+  "version": "8.4.0",
   "description": "JavaScript client library for the Elastic Maps Service",
   "main": "target/node/index.js",
   "browser": "target/web/index.js",
@@ -35,14 +35,14 @@
     }
   },
   "dependencies": {
-    "@types/geojson": "^7946.0.7",
+    "@types/geojson": "^7946.0.10",
     "@types/lru-cache": "^5.1.0",
-    "@types/topojson-client": "^3.0.0",
+    "@types/topojson-client": "^3.1.1",
     "@types/topojson-specification": "^1.0.1",
     "chroma-js": "^2.1.0",
     "lodash": "^4.17.15",
     "lru-cache": "^6.0.0",
-    "semver": "^7.3.2",
+    "semver": "^7.3.8",
     "topojson-client": "^3.1.0"
   },
   "devDependencies": {

package/src/ems_client.ts

@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
 import _ from 'lodash';
 import { TMSService } from './tms_service';
 import { EMSFormatType, FileLayer } from './file_layer';
@@ -16,7 +15,7 @@ import { toAbsoluteUrl } from './utils';
 import { ParsedUrlQueryInput } from 'querystring';
 import LRUCache from 'lru-cache';
 
-const DEFAULT_EMS_VERSION = '8.3';
+const DEFAULT_EMS_VERSION = '8.4';
 
 type URLMeaningfulParts = {
   auth?: string | null;

package/src/index.ts

@@ -8,3 +8,4 @@
 export { EMSClient, FileLayerField } from './ems_client';
 export { FileLayer } from './file_layer';
 export { TMSService, EmsSprite, EmsSpriteSheet } from './tms_service';
+export { blendMode } from './utils';

package/src/tms_service.ts

@@ -124,7 +124,11 @@ export class TMSService extends AbstractEmsService {
   /*
   Suggested default operations for the different EMS styles
   */
-  public static colorOperationDefaults = [
+  public static colorOperationDefaults: {
+    style: string;
+    operation: blendMode;
+    percentage: number;
+  }[] = [
     { 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 },
@@ -220,9 +224,9 @@ export class TMSService extends AbstractEmsService {
   */
   public static transformColorProperties(
     layer: LayerSpecification,
-    color: string,
-    operation: blendMode,
-    percentage: number
+    color?: string,
+    operation?: blendMode,
+    percentage?: number
   ): { property: keyof layerPaintProperty; color: mbColorDefinition | undefined }[] {
     if (['background', 'fill', 'line', 'symbol'].indexOf(layer.type) !== -1 && layer.paint) {
       const paint = layer.paint as layerPaintProperty;
@@ -250,7 +254,10 @@ export class TMSService extends AbstractEmsService {
         const paintColor = paint[type];
         return {
           property: type,
-          color: paintColor ? colorizeColor(paintColor, color, operation, percentage) : paintColor,
+          color:
+            paintColor && color
+              ? colorizeColor(paintColor, color, operation, percentage)
+              : paintColor,
         };
       });
     } else {

package/src/utils.ts

@@ -76,7 +76,7 @@ function transformColor(paintColor: mbColorDefinition, func: Function): mbColorD
       const newColor = transformColor(stop[1], func);
       return [stop[0], newColor];
     });
-    const newPaintColor = { ...paintColor, ...stops };
+    const newPaintColor = Object.assign({}, paintColor, { stops });
     return newPaintColor;
   } else return paintColor;
 }

package/target/index.d.ts

@@ -1,3 +1,4 @@
 export { EMSClient, FileLayerField } from './ems_client';
 export { FileLayer } from './file_layer';
 export { TMSService, EmsSprite, EmsSpriteSheet } from './tms_service';
+export { blendMode } from './utils';

package/target/node/ems_client.js

@@ -4,27 +4,18 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.EMSClient = void 0;
-
 var _lodash = _interopRequireDefault(require("lodash"));
-
 var _tms_service = require("./tms_service");
-
 var _file_layer = require("./file_layer");
-
 var _semver = _interopRequireDefault(require("semver"));
-
 var _url = require("url");
-
 var _utils = require("./utils");
-
 var _lruCache = _interopRequireDefault(require("lru-cache"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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; }
-
-const DEFAULT_EMS_VERSION = '8.3';
-
+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); }
+const DEFAULT_EMS_VERSION = '8.4';
 /**
  * plugins cannot have upstream dependencies on core/*-kibana.
  * Work-around by copy-pasting modifyUrl routine here.
@@ -32,13 +23,14 @@ const DEFAULT_EMS_VERSION = '8.3';
  * @param block
  */
 function modifyUrlLocal(url, block) {
-  const parsed = (0, _url.parse)(url, true); // copy over the most specific version of each
+  const parsed = (0, _url.parse)(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
-
   const meaningfulParts = {
     protocol: parsed.protocol,
     slashes: parsed.slashes,
@@ -48,10 +40,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
+  };
 
-  const modifiedParts = block(meaningfulParts) || meaningfulParts; // format the modified/replaced meaningfulParts back into a url
+  // the block modifies the meaningfulParts object, or returns a new one
+  const modifiedParts = block(meaningfulParts) || meaningfulParts;
 
+  // format the modified/replaced meaningfulParts back into a url
   return (0, _url.format)({
     protocol: modifiedParts.protocol,
     slashes: modifiedParts.slashes,
@@ -63,65 +57,44 @@ function modifyUrlLocal(url, block) {
     hash: modifiedParts.hash
   });
 }
-
 const extendUrl = (url, props) => modifyUrlLocal(url, parsed => _lodash.default.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}
  */
-
-
 const unescapeTemplateVars = url => {
   const ENCODED_TEMPLATE_VARS_RE = /%7B(\w+?)%7D/g;
   return url.replace(ENCODED_TEMPLATE_VARS_RE, (total, varName) => `{${varName}}`);
 };
-
 //this is not the default locale from Kibana, but the default locale supported by the Elastic Maps Service
 const DEFAULT_LANGUAGE = 'en';
-
 class EMSClient {
   /**
    * these methods are assigned outside the constructor
    */
+
   constructor(config) {
     _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, "_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.');
@@ -129,7 +102,6 @@ class EMSClient {
     } else {
       this._appVersion = config.appVersion;
     }
-
     this._queryParams = {
       elastic_tile_service_tos: 'agree',
       my_app_name: config.appName || 'kibana',
@@ -147,41 +119,33 @@ class EMSClient {
     this._cache = new _lruCache.default({
       max: config.cacheSize || 10
     });
-
     this._invalidateSettings();
   }
-
   getDefaultLocale() {
     return DEFAULT_LANGUAGE;
   }
-
   getLocale() {
     return this._language;
   }
-
   getValueInLanguage(i18nObject) {
     if (!i18nObject) {
       return '';
     }
-
     return i18nObject[this._language] ? i18nObject[this._language] : i18nObject[DEFAULT_LANGUAGE];
   }
+
   /**
    * this internal method is overridden by the tests to simulate custom manifest.
    */
-
-
   async getManifest(endpointUrl) {
     try {
       const url = extendUrl(endpointUrl, {
         query: this._queryParams
       });
       const response = await this._fetchWithTimeout(url);
-
       if (!response.ok) {
         throw new Error(response.statusText);
       }
-
       return response ? await response.json() : null;
     } catch (e) {
       if (e instanceof Error) {
@@ -191,116 +155,91 @@ class EMSClient {
       }
     }
   }
+
   /**
    * Add optional query-parameters to all requests
    *
    * @param additionalQueryParams
    */
-
-
   addQueryParams(additionalQueryParams) {
     for (const key in additionalQueryParams) {
       if (additionalQueryParams.hasOwnProperty(key)) {
         if (additionalQueryParams[key] !== this._queryParams[key]) {
           //changes detected.
           this._queryParams = _lodash.default.assign({}, this._queryParams, additionalQueryParams);
-
           this._invalidateSettings();
-
           break;
         }
       }
     }
   }
-
   async getMainManifest() {
     return await this._getMainCatalog();
   }
-
   async getDefaultFileManifest() {
     return await this._getDefaultFileCatalog();
   }
-
   async getDefaultTMSManifest() {
     return await this._getDefaultTMSCatalog();
   }
-
   async getFileLayers() {
     return await this._loadFileLayers();
   }
-
   async getTMSServices() {
     return await this._loadTMSServices();
   }
-
   cacheGeoJson(layerId, geoJson) {
     this._cache.set(layerId, geoJson);
-
     return;
   }
-
   getCachedGeoJson(layerId) {
     return this._cache.get(layerId);
   }
-
   getTileApiUrl() {
     return this._tileApiUrl;
   }
-
   getFileApiUrl() {
     return this._fileApiUrl;
   }
-
   getLandingPageUrl() {
     return this._emsLandingPageUrl;
   }
-
   sanitizeHtml(html) {
     return this._sanitizer(html);
   }
-
   extendUrlWithParams(url) {
     return unescapeTemplateVars(extendUrl(url, {
       query: this._queryParams
     }));
   }
-
   async findFileLayerById(id) {
     const fileLayers = await this.getFileLayers();
-
     for (let i = 0; i < fileLayers.length; i++) {
       if (fileLayers[i].hasId(id)) {
         return fileLayers[i];
       }
     }
   }
-
   async findTMSServiceById(id) {
     const tmsServices = await this.getTMSServices();
-
     for (let i = 0; i < tmsServices.length; i++) {
       if (tmsServices[i].hasId(id)) {
         return tmsServices[i];
       }
     }
   }
-
   _getEmsVersion(version) {
     const userVersion = _semver.default.valid(_semver.default.coerce(version));
-
     const semverVersion = userVersion ? userVersion : _semver.default.coerce(DEFAULT_EMS_VERSION);
-
     if (semverVersion) {
       return `v${_semver.default.major(semverVersion)}.${_semver.default.minor(semverVersion)}`;
     } else {
       throw new Error(`Invalid version: ${version}`);
     }
   }
-
   _fetchWithTimeout(url) {
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => reject(new Error(`Request to ${url} timed out`)), this.EMS_LOAD_TIMEOUT);
-
       this._fetchFunction(url).then(response => {
         clearTimeout(timer);
         resolve(response);
@@ -310,15 +249,12 @@ class EMSClient {
       });
     });
   }
-
   async _getManifestWithParams(url) {
     const extendedUrl = this.extendUrlWithParams(url);
     return await this.getManifest(extendedUrl);
   }
-
   _invalidateSettings() {
     this._cache.reset();
-
     this._getMainCatalog = _lodash.default.once(async () => {
       // Preserve manifestServiceUrl parameter for backwards compatibility with EMS v7.2
       if (this._manifestServiceUrl) {
@@ -327,21 +263,18 @@ class EMSClient {
         return await this._getManifestWithParams(this._manifestServiceUrl);
       } else {
         const services = [];
-
         if (this._tileApiUrl) {
           services.push({
             type: 'tms',
             manifest: (0, _utils.toAbsoluteUrl)(this._tileApiUrl, `${this._emsVersion}/manifest`)
           });
         }
-
         if (this._fileApiUrl) {
           services.push({
             type: 'file',
             manifest: (0, _utils.toAbsoluteUrl)(this._fileApiUrl, `${this._emsVersion}/manifest`)
           });
         }
-
         return {
           services: services
         };
@@ -350,30 +283,27 @@ class EMSClient {
     this._getDefaultTMSCatalog = _lodash.default.once(async () => {
       const catalogue = await this._getMainCatalog();
       const firstService = catalogue.services.find(service => service.type === 'tms');
-
       if (!firstService) {
         return {
           services: []
         };
       }
-
       const url = this._proxyPath + firstService.manifest;
       return await this.getManifest(url);
     });
     this._getDefaultFileCatalog = _lodash.default.once(async () => {
       const catalogue = await this._getMainCatalog();
       const firstService = catalogue.services.find(service => service.type === 'file');
-
       if (!firstService) {
         return {
           layers: []
         };
       }
-
       const url = this._proxyPath + firstService.manifest;
       return await this.getManifest(url);
-    }); //Cache the actual instances of TMSService as these in turn cache sub-manifests for the style-files
+    });
 
+    //Cache the actual instances of TMSService as these in turn cache sub-manifests for the style-files
     this._loadTMSServices = _lodash.default.once(async () => {
       const tmsManifest = await this._getDefaultTMSCatalog();
       return tmsManifest.services.map(serviceConfig => new _tms_service.TMSService(serviceConfig, this, this._proxyPath));
@@ -383,7 +313,5 @@ class EMSClient {
       return fileManifest.layers.map(layerConfig => new _file_layer.FileLayer(layerConfig, this, this._proxyPath));
     });
   }
-
 }
-
 exports.EMSClient = EMSClient;

package/target/node/ems_service.js

@@ -4,19 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AbstractEmsService = void 0;
-
 var _utils = require("./utils");
-
-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 _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); }
 class AbstractEmsService {
   constructor(config, emsClient, proxyPath) {
     _defineProperty(this, "_emsClient", void 0);
-
     _defineProperty(this, "_config", void 0);
-
     _defineProperty(this, "_proxyPath", void 0);
-
     _defineProperty(this, "_getAbsoluteUrl", url => {
       if (/^https?:\/\//.test(url)) {
         return url;
@@ -24,41 +20,31 @@ class AbstractEmsService {
         return (0, _utils.toAbsoluteUrl)(this.getApiUrl(), url);
       }
     });
-
     this._config = config;
     this._emsClient = emsClient;
     this._proxyPath = proxyPath;
   }
-
   getAttributions() {
     return this._config.attribution.map(attribution => {
       const url = this._emsClient.getValueInLanguage(attribution.url);
-
       const label = this._emsClient.getValueInLanguage(attribution.label);
-
       return {
         url: url,
         label: label
       };
     });
   }
-
   getMarkdownAttribution() {
     const attributions = this._config.attribution.map(attribution => {
       const url = this._emsClient.getValueInLanguage(attribution.url);
-
       const label = this._emsClient.getValueInLanguage(attribution.label);
-
       return `[${label}](${url})`;
     });
-
     return attributions.join('|');
   }
+
   /**
    * Checks if url is absolute. If not, prepend the basePath.
    */
-
-
 }
-
 exports.AbstractEmsService = AbstractEmsService;