@elastic/ems-client 7.16.0 → 8.2.0

package/.backportrc.json

@@ -1,5 +1,26 @@
 {
   "upstream": "elastic/ems-client",
-  "branches": [{ "name": "7.x", "checked": true }, "7.2", "7.6", "7.7", "7.8", "7.9"],
-  "labels": ["backport"]
-}
+  "branches": [
+    {
+      "name": "8.1",
+      "checked": true
+    },
+    "8.0",
+    "7.17",
+    "7.16",
+    "7.16",
+    "7.15",
+    "7.14",
+    "7.12",
+    "7.11",
+    "7.10",
+    "7.9",
+    "7.8",
+    "7.7",
+    "7.6",
+    "7.2"
+  ],
+  "labels": [
+    "backport"
+  ]
+}

package/CHANGELOG.md

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elastic/ems-client",
-  "version": "7.16.0",
+  "version": "8.2.0",
   "description": "JavaScript client library for the Elastic Maps Service",
   "main": "target/node/index.js",
   "browser": "target/web/index.js",
@@ -63,6 +63,7 @@
     "eslint-plugin-prettier": "^3.1.3",
     "husky": "^4.2.5",
     "jest": "^26.4.0",
+    "maplibre-gl": "^1.15.2",
     "node-fetch": "^2.6.1",
     "prettier": "^2.0.5",
     "ts-jest": "^26.2.0",

package/src/ems_client.ts

@@ -16,7 +16,7 @@ import { toAbsoluteUrl } from './utils';
 import { ParsedUrlQueryInput } from 'querystring';
 import LRUCache from 'lru-cache';
 
-const DEFAULT_EMS_VERSION = '7.16';
+const DEFAULT_EMS_VERSION = '8.2';
 
 type URLMeaningfulParts = {
   auth?: string | null;

package/src/ems_service.ts

@@ -6,7 +6,6 @@
  */
 
 import { EMSClient, BaseEmsServiceConfig } from './ems_client';
-import { ORIGIN } from './origin';
 import { toAbsoluteUrl } from './utils';
 
 export interface IEmsService {
@@ -15,7 +14,6 @@ export interface IEmsService {
   getDisplayName(): string;
   getId(): string;
   hasId(id: string): boolean;
-  getOrigin(): string;
   getApiUrl(): string;
 }
 
@@ -50,10 +48,6 @@ export abstract class AbstractEmsService implements IEmsService {
     return attributions.join('|');
   }
 
-  getOrigin(): string {
-    return ORIGIN.EMS;
-  }
-
   /**
    * Checks if url is absolute. If not, prepend the basePath.
    */

package/src/index.ts

@@ -6,6 +6,5 @@
  */
 
 export { EMSClient, FileLayerField } from './ems_client';
-export { ORIGIN } from './origin';
 export { FileLayer } from './file_layer';
-export { TMSService } from './tms_service';
+export { TMSService, EmsSprite, EmsSpriteSheet } from './tms_service';

package/src/tms_service.ts

@@ -6,52 +6,31 @@
  */
 
 import _ from 'lodash';
+import { Style as MapLibreStyle, VectorSource as MapLibreVectorSource } from 'maplibre-gl';
 import { EMSClient, EmsTmsFormat, TMSServiceConfig } from './ems_client';
 import { AbstractEmsService } from './ems_service';
 
-type EmsVectorSource = {
-  type: 'vector';
-  url: string;
-  tiles: string[];
-  bounds?: number[];
-  scheme?: 'xyz' | 'tms';
-  minzoom?: number;
-  maxzoom?: number;
-  attribution?: string;
-};
-
-type EmsVectorSources = {
-  [sourceName: string]: EmsVectorSource;
-};
-
-type EmsVectorStyle = {
-  sources: EmsVectorSources;
-  sprite: string;
-  glyphs: string;
-  bearing?: number;
-  center?: number[];
-  layers?: unknown[];
-  metadata?: unknown;
-  name?: string;
-  pitch?: number;
-  light?: unknown;
-  transition?: unknown;
-  version: number;
-  zoom?: number;
-};
-
-type EmsSprite = {
+export type EmsSprite = {
   height: number;
   pixelRatio: number;
   width: number;
   x: number;
   y: number;
+  sdf?: boolean;
 };
 
-type EmsSpriteSheet = {
+export type EmsSpriteSheet = {
   [spriteName: string]: EmsSprite;
 };
 
+type EmsVectorSources = {
+  [sourceName: string]: MapLibreVectorSource;
+};
+
+type EmsVectorStyle = MapLibreStyle & {
+  sources: EmsVectorSources;
+};
+
 type EmsRasterStyle = {
   tilejson: string;
   name: string;
@@ -98,19 +77,20 @@ export class TMSService extends AbstractEmsService {
       const { sources } = vectorJson;
       for (const sourceName of Object.getOwnPropertyNames(sources)) {
         const { url } = sources[sourceName];
-        const sourceUrl = this._proxyPath + this._getAbsoluteUrl(url);
-        const extendedUrl = this._emsClient.extendUrlWithParams(sourceUrl);
-        const sourceJson = await this._emsClient.getManifest<EmsVectorSource>(extendedUrl);
-
-        const extendedTileUrls = sourceJson.tiles.map((tileUrl: string) => {
-          const url = this._proxyPath + this._getAbsoluteUrl(tileUrl);
-          return this._emsClient.extendUrlWithParams(url);
-        });
-        inlinedSources[sourceName] = {
-          ...sourceJson,
-          type: 'vector',
-          tiles: extendedTileUrls,
-        };
+        if (url) {
+          const sourceUrl = this._proxyPath + this._getAbsoluteUrl(url);
+          const extendedUrl = this._emsClient.extendUrlWithParams(sourceUrl);
+          const sourceJson = await this._emsClient.getManifest<MapLibreVectorSource>(extendedUrl);
+          const tiles = sourceJson?.tiles?.map((tileUrl) => {
+            const directUrl = this._proxyPath + this._getAbsoluteUrl(tileUrl);
+            return this._emsClient.extendUrlWithParams(directUrl);
+          });
+          inlinedSources[sourceName] = {
+            ...sourceJson,
+            type: 'vector',
+            tiles,
+          };
+        }
       }
       return {
         ...vectorJson,
@@ -155,11 +135,9 @@ export class TMSService extends AbstractEmsService {
 
   async getUrlTemplateForVector(sourceId: string): Promise<string> {
     const tileJson = await this._getVectorStyleJsonInlined();
-    if (!tileJson) {
-      return '';
-    }
-    if (tileJson.sources[sourceId] && tileJson.sources[sourceId].tiles) {
-      const directUrl = this._proxyPath + this._getAbsoluteUrl(tileJson.sources[sourceId].tiles[0]);
+    const url = tileJson?.sources[sourceId]?.tiles?.pop();
+    if (url) {
+      const directUrl = this._proxyPath + this._getAbsoluteUrl(url);
       return this._emsClient.extendUrlWithParams(directUrl);
     } else {
       return '';
@@ -271,7 +249,7 @@ export class TMSService extends AbstractEmsService {
 
   private async _getSpriteSheetRootPath(): Promise<string> {
     const vectorStyleJson = await this._getVectorStyleJsonRaw();
-    if (vectorStyleJson) {
+    if (vectorStyleJson?.sprite) {
       return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.sprite);
     } else {
       return '';
@@ -280,7 +258,7 @@ export class TMSService extends AbstractEmsService {
 
   private async _getUrlTemplateForGlyphs(): Promise<string> {
     const vectorStyleJson = await this._getVectorStyleJsonRaw();
-    if (vectorStyleJson) {
+    if (vectorStyleJson?.glyphs) {
       return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.glyphs);
     } else {
       return '';

package/target/ems_service.d.ts

@@ -8,7 +8,6 @@ export interface IEmsService {
     getDisplayName(): string;
     getId(): string;
     hasId(id: string): boolean;
-    getOrigin(): string;
     getApiUrl(): string;
 }
 export declare abstract class AbstractEmsService implements IEmsService {
@@ -21,7 +20,6 @@ export declare abstract class AbstractEmsService implements IEmsService {
         label: string;
     }[];
     getMarkdownAttribution(): string;
-    getOrigin(): string;
     /**
      * Checks if url is absolute. If not, prepend the basePath.
      */

package/target/index.d.ts

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

package/target/node/ems_client.js

@@ -23,7 +23,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 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 = '7.16';
+const DEFAULT_EMS_VERSION = '8.2';
 
 /**
  * plugins cannot have upstream dependencies on core/*-kibana.

package/target/node/ems_service.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AbstractEmsService = void 0;
 
-var _origin = require("./origin");
-
 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; }
@@ -56,10 +54,6 @@ class AbstractEmsService {
 
     return attributions.join('|');
   }
-
-  getOrigin() {
-    return _origin.ORIGIN.EMS;
-  }
   /**
    * Checks if url is absolute. If not, prepend the basePath.
    */

package/target/node/index.js

@@ -9,22 +9,28 @@ Object.defineProperty(exports, "EMSClient", {
     return _ems_client.EMSClient;
   }
 });
-Object.defineProperty(exports, "FileLayer", {
+Object.defineProperty(exports, "EmsSprite", {
   enumerable: true,
   get: function () {
-    return _file_layer.FileLayer;
+    return _tms_service.EmsSprite;
   }
 });
-Object.defineProperty(exports, "FileLayerField", {
+Object.defineProperty(exports, "EmsSpriteSheet", {
   enumerable: true,
   get: function () {
-    return _ems_client.FileLayerField;
+    return _tms_service.EmsSpriteSheet;
   }
 });
-Object.defineProperty(exports, "ORIGIN", {
+Object.defineProperty(exports, "FileLayer", {
   enumerable: true,
   get: function () {
-    return _origin.ORIGIN;
+    return _file_layer.FileLayer;
+  }
+});
+Object.defineProperty(exports, "FileLayerField", {
+  enumerable: true,
+  get: function () {
+    return _ems_client.FileLayerField;
   }
 });
 Object.defineProperty(exports, "TMSService", {
@@ -36,8 +42,6 @@ Object.defineProperty(exports, "TMSService", {
 
 var _ems_client = require("./ems_client");
 
-var _origin = require("./origin");
-
 var _file_layer = require("./file_layer");
 
 var _tms_service = require("./tms_service");

package/target/node/tms_service.js

@@ -59,20 +59,24 @@ class TMSService extends _ems_service.AbstractEmsService {
             url
           } = sources[sourceName];
 
-          const sourceUrl = this._proxyPath + this._getAbsoluteUrl(url);
+          if (url) {
+            var _sourceJson$tiles;
 
-          const extendedUrl = this._emsClient.extendUrlWithParams(sourceUrl);
+            const sourceUrl = this._proxyPath + this._getAbsoluteUrl(url);
 
-          const sourceJson = await this._emsClient.getManifest(extendedUrl);
-          const extendedTileUrls = sourceJson.tiles.map(tileUrl => {
-            const url = this._proxyPath + this._getAbsoluteUrl(tileUrl);
+            const extendedUrl = this._emsClient.extendUrlWithParams(sourceUrl);
 
-            return this._emsClient.extendUrlWithParams(url);
-          });
-          inlinedSources[sourceName] = { ...sourceJson,
-            type: 'vector',
-            tiles: extendedTileUrls
-          };
+            const sourceJson = await this._emsClient.getManifest(extendedUrl);
+            const tiles = sourceJson === null || sourceJson === void 0 ? void 0 : (_sourceJson$tiles = sourceJson.tiles) === null || _sourceJson$tiles === void 0 ? void 0 : _sourceJson$tiles.map(tileUrl => {
+              const directUrl = this._proxyPath + this._getAbsoluteUrl(tileUrl);
+
+              return this._emsClient.extendUrlWithParams(directUrl);
+            });
+            inlinedSources[sourceName] = { ...sourceJson,
+              type: 'vector',
+              tiles
+            };
+          }
         }
 
         return { ...vectorJson,
@@ -116,14 +120,13 @@ class TMSService extends _ems_service.AbstractEmsService {
   }
 
   async getUrlTemplateForVector(sourceId) {
-    const tileJson = await this._getVectorStyleJsonInlined();
+    var _tileJson$sources$sou, _tileJson$sources$sou2;
 
-    if (!tileJson) {
-      return '';
-    }
+    const tileJson = await this._getVectorStyleJsonInlined();
+    const url = tileJson === null || tileJson === void 0 ? void 0 : (_tileJson$sources$sou = tileJson.sources[sourceId]) === null || _tileJson$sources$sou === void 0 ? void 0 : (_tileJson$sources$sou2 = _tileJson$sources$sou.tiles) === null || _tileJson$sources$sou2 === void 0 ? void 0 : _tileJson$sources$sou2.pop();
 
-    if (tileJson.sources[sourceId] && tileJson.sources[sourceId].tiles) {
-      const directUrl = this._proxyPath + this._getAbsoluteUrl(tileJson.sources[sourceId].tiles[0]);
+    if (url) {
+      const directUrl = this._proxyPath + this._getAbsoluteUrl(url);
 
       return this._emsClient.extendUrlWithParams(directUrl);
     } else {
@@ -241,7 +244,7 @@ class TMSService extends _ems_service.AbstractEmsService {
   async _getSpriteSheetRootPath() {
     const vectorStyleJson = await this._getVectorStyleJsonRaw();
 
-    if (vectorStyleJson) {
+    if (vectorStyleJson !== null && vectorStyleJson !== void 0 && vectorStyleJson.sprite) {
       return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.sprite);
     } else {
       return '';
@@ -251,7 +254,7 @@ class TMSService extends _ems_service.AbstractEmsService {
   async _getUrlTemplateForGlyphs() {
     const vectorStyleJson = await this._getVectorStyleJsonRaw();
 
-    if (vectorStyleJson) {
+    if (vectorStyleJson !== null && vectorStyleJson !== void 0 && vectorStyleJson.glyphs) {
       return this._proxyPath + this._getAbsoluteUrl(vectorStyleJson.glyphs);
     } else {
       return '';

package/target/tms_service.d.ts

@@ -1,43 +1,23 @@
+import { Style as MapLibreStyle, VectorSource as MapLibreVectorSource } from 'maplibre-gl';
 import { EMSClient, TMSServiceConfig } from './ems_client';
 import { AbstractEmsService } from './ems_service';
-declare type EmsVectorSource = {
-    type: 'vector';
-    url: string;
-    tiles: string[];
-    bounds?: number[];
-    scheme?: 'xyz' | 'tms';
-    minzoom?: number;
-    maxzoom?: number;
-    attribution?: string;
-};
-declare type EmsVectorSources = {
-    [sourceName: string]: EmsVectorSource;
-};
-declare type EmsVectorStyle = {
-    sources: EmsVectorSources;
-    sprite: string;
-    glyphs: string;
-    bearing?: number;
-    center?: number[];
-    layers?: unknown[];
-    metadata?: unknown;
-    name?: string;
-    pitch?: number;
-    light?: unknown;
-    transition?: unknown;
-    version: number;
-    zoom?: number;
-};
-declare type EmsSprite = {
+export declare type EmsSprite = {
     height: number;
     pixelRatio: number;
     width: number;
     x: number;
     y: number;
+    sdf?: boolean;
 };
-declare type EmsSpriteSheet = {
+export declare type EmsSpriteSheet = {
     [spriteName: string]: EmsSprite;
 };
+declare type EmsVectorSources = {
+    [sourceName: string]: MapLibreVectorSource;
+};
+declare type EmsVectorStyle = MapLibreStyle & {
+    sources: EmsVectorSources;
+};
 declare type EmsRasterStyle = {
     tilejson: string;
     name: string;

package/target/web/ems_client.js

@@ -23,7 +23,7 @@ import semver from 'semver';
 import { format as formatUrl, parse as parseUrl } from 'url';
 import { toAbsoluteUrl } from './utils';
 import LRUCache from 'lru-cache';
-var DEFAULT_EMS_VERSION = '7.16';
+var DEFAULT_EMS_VERSION = '8.2';
 
 /**
  * plugins cannot have upstream dependencies on core/*-kibana.

package/target/web/ems_service.js

@@ -12,7 +12,6 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { ORIGIN } from './origin';
 import { toAbsoluteUrl } from './utils';
 export var AbstractEmsService = /*#__PURE__*/function () {
   function AbstractEmsService(config, emsClient, proxyPath) {
@@ -70,11 +69,6 @@ export var AbstractEmsService = /*#__PURE__*/function () {
 
       return attributions.join('|');
     }
-  }, {
-    key: "getOrigin",
-    value: function getOrigin() {
-      return ORIGIN.EMS;
-    }
     /**
      * Checks if url is absolute. If not, prepend the basePath.
      */

package/target/web/index.js

@@ -5,6 +5,5 @@
  * 2.0.
  */
 export { EMSClient, FileLayerField } from './ems_client';
-export { ORIGIN } from './origin';
 export { FileLayer } from './file_layer';
-export { TMSService } from './tms_service';
+export { TMSService, EmsSprite, EmsSpriteSheet } from './tms_service';

package/target/web/tms_service.js

@@ -118,7 +118,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
     }))));
 
     _defineProperty(_assertThisInitialized(_this), "_getVectorStyleJsonInlined", _.once( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() {
-      var vectorJson, inlinedSources, sources, _iterator, _step, _sourceName, url, sourceUrl, extendedUrl, sourceJson, extendedTileUrls;
+      var vectorJson, inlinedSources, sources, _iterator, _step, _sourceName, url, _sourceJson$tiles, sourceUrl, extendedUrl, sourceJson, tiles;
 
       return regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) {
@@ -131,7 +131,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
               vectorJson = _context3.sent;
 
               if (!vectorJson) {
-                _context3.next = 43;
+                _context3.next = 44;
                 break;
               }
 
@@ -144,64 +144,70 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
 
             case 9:
               if ((_step = _iterator.n()).done) {
-                _context3.next = 21;
+                _context3.next = 22;
                 break;
               }
 
               _sourceName = _step.value;
               url = sources[_sourceName].url;
+
+              if (!url) {
+                _context3.next = 20;
+                break;
+              }
+
               sourceUrl = _this._proxyPath + _this._getAbsoluteUrl(url);
               extendedUrl = _this._emsClient.extendUrlWithParams(sourceUrl);
-              _context3.next = 16;
+              _context3.next = 17;
               return _this._emsClient.getManifest(extendedUrl);
 
-            case 16:
+            case 17:
               sourceJson = _context3.sent;
-              extendedTileUrls = sourceJson.tiles.map(function (tileUrl) {
-                var url = _this._proxyPath + _this._getAbsoluteUrl(tileUrl);
+              tiles = sourceJson === null || sourceJson === void 0 ? void 0 : (_sourceJson$tiles = sourceJson.tiles) === null || _sourceJson$tiles === void 0 ? void 0 : _sourceJson$tiles.map(function (tileUrl) {
+                var directUrl = _this._proxyPath + _this._getAbsoluteUrl(tileUrl);
 
-                return _this._emsClient.extendUrlWithParams(url);
+                return _this._emsClient.extendUrlWithParams(directUrl);
               });
               inlinedSources[_sourceName] = _objectSpread(_objectSpread({}, sourceJson), {}, {
                 type: 'vector',
-                tiles: extendedTileUrls
+                tiles: tiles
               });
 
-            case 19:
+            case 20:
               _context3.next = 9;
               break;
 
-            case 21:
-              _context3.next = 26;
+            case 22:
+              _context3.next = 27;
               break;
 
-            case 23:
-              _context3.prev = 23;
+            case 24:
+              _context3.prev = 24;
               _context3.t0 = _context3["catch"](7);
 
               _iterator.e(_context3.t0);
 
-            case 26:
-              _context3.prev = 26;
+            case 27:
+              _context3.prev = 27;
 
               _iterator.f();
 
-              return _context3.finish(26);
+              return _context3.finish(27);
 
-            case 29:
+            case 30:
               _context3.t1 = _objectSpread;
               _context3.t2 = _objectSpread({}, vectorJson);
               _context3.t3 = {};
               _context3.t4 = inlinedSources;
-              _context3.next = 35;
+              _context3.next = 36;
               return _this._getSpriteSheetRootPath();
 
-            case 35:
+            case 36:
               _context3.t5 = _context3.sent;
-              _context3.next = 38;
+              _context3.next = 39;
               return _this._getUrlTemplateForGlyphs();
 
-            case 38:
+            case 39:
               _context3.t6 = _context3.sent;
               _context3.t7 = {
                 sources: _context3.t4,
@@ -210,15 +216,15 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
               };
               return _context3.abrupt("return", (0, _context3.t1)(_context3.t2, _context3.t3, _context3.t7));
 
-            case 43:
+            case 44:
               return _context3.abrupt("return");
 
-            case 44:
+            case 45:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[7, 23, 26, 29]]);
+      }, _callee3, null, [[7, 24, 27, 30]]);
     }))));
 
     _this._config = config;
@@ -315,7 +321,9 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
     key: "getUrlTemplateForVector",
     value: function () {
       var _getUrlTemplateForVector = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6(sourceId) {
-        var tileJson, directUrl;
+        var _tileJson$sources$sou, _tileJson$sources$sou2;
+
+        var tileJson, url, directUrl;
         return regeneratorRuntime.wrap(function _callee6$(_context6) {
           while (1) {
             switch (_context6.prev = _context6.next) {
@@ -325,27 +333,20 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
 
               case 2:
                 tileJson = _context6.sent;
+                url = tileJson === null || tileJson === void 0 ? void 0 : (_tileJson$sources$sou = tileJson.sources[sourceId]) === null || _tileJson$sources$sou === void 0 ? void 0 : (_tileJson$sources$sou2 = _tileJson$sources$sou.tiles) === null || _tileJson$sources$sou2 === void 0 ? void 0 : _tileJson$sources$sou2.pop();
 
-                if (tileJson) {
-                  _context6.next = 5;
+                if (!url) {
+                  _context6.next = 9;
                   break;
                 }
 
-                return _context6.abrupt("return", '');
-
-              case 5:
-                if (!(tileJson.sources[sourceId] && tileJson.sources[sourceId].tiles)) {
-                  _context6.next = 10;
-                  break;
-                }
-
-                directUrl = this._proxyPath + this._getAbsoluteUrl(tileJson.sources[sourceId].tiles[0]);
+                directUrl = this._proxyPath + this._getAbsoluteUrl(url);
                 return _context6.abrupt("return", this._emsClient.extendUrlWithParams(directUrl));
 
-              case 10:
+              case 9:
                 return _context6.abrupt("return", '');
 
-              case 11:
+              case 10:
               case "end":
                 return _context6.stop();
             }
@@ -703,7 +704,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
               case 2:
                 vectorStyleJson = _context14.sent;
 
-                if (!vectorStyleJson) {
+                if (!(vectorStyleJson !== null && vectorStyleJson !== void 0 && vectorStyleJson.sprite)) {
                   _context14.next = 7;
                   break;
                 }
@@ -742,7 +743,7 @@ export var TMSService = /*#__PURE__*/function (_AbstractEmsService) {
               case 2:
                 vectorStyleJson = _context15.sent;
 
-                if (!vectorStyleJson) {
+                if (!(vectorStyleJson !== null && vectorStyleJson !== void 0 && vectorStyleJson.glyphs)) {
                   _context15.next = 7;
                   break;
                 }

package/test/ems_client.test.ts

@@ -431,8 +431,8 @@ it('should retrieve vectorstylesheet with all sources inlined)', async () => {
 
   expect(styleSheet!.layers!.length).toBe(111);
   expect(styleSheet!.sprite).toBe('https://tiles.foobar/styles/osm-bright/sprite');
-  expect(styleSheet!.sources!.openmaptiles!.tiles.length).toBe(1);
-  expect(styleSheet!.sources!.openmaptiles!.tiles[0]).toBe(
+  expect(styleSheet!.sources!.openmaptiles!.tiles!.length).toBe(1);
+  expect(styleSheet!.sources!.openmaptiles!.tiles![0]).toBe(
     'https://tiles.foobar/data/v3/{z}/{x}/{y}.pbf?elastic_tile_service_tos=agree&my_app_name=tester&my_app_version=7.x.x'
   );
   expect(styleSheet!.sources!.openmaptiles!.type).toBe('vector');

package/api-extractor.json

@@ -1,364 +0,0 @@
-/**
- * Config file for API Extractor.  For more info, please visit: https://api-extractor.com
- */
-{
-  "$schema": "https://developer.microsoft.com/json-schemas/api-extractor/v7/api-extractor.schema.json",
-
-  /**
-   * Optionally specifies another JSON config file that this file extends from.  This provides a way for
-   * standard settings to be shared across multiple projects.
-   *
-   * If the path starts with "./" or "../", the path is resolved relative to the folder of the file that contains
-   * the "extends" field.  Otherwise, the first path segment is interpreted as an NPM package name, and will be
-   * resolved using NodeJS require().
-   *
-   * SUPPORTED TOKENS: none
-   * DEFAULT VALUE: ""
-   */
-  // "extends": "./shared/api-extractor-base.json"
-  // "extends": "my-package/include/api-extractor-base.json"
-
-  /**
-   * Determines the "<projectFolder>" token that can be used with other config file settings.  The project folder
-   * typically contains the tsconfig.json and package.json config files, but the path is user-defined.
-   *
-   * The path is resolved relative to the folder of the config file that contains the setting.
-   *
-   * The default value for "projectFolder" is the token "<lookup>", which means the folder is determined by traversing
-   * parent folders, starting from the folder containing api-extractor.json, and stopping at the first folder
-   * that contains a tsconfig.json file.  If a tsconfig.json file cannot be found in this way, then an error
-   * will be reported.
-   *
-   * SUPPORTED TOKENS: <lookup>
-   * DEFAULT VALUE: "<lookup>"
-   */
-  // "projectFolder": "..",
-
-  /**
-   * (REQUIRED) Specifies the .d.ts file to be used as the starting point for analysis.  API Extractor
-   * analyzes the symbols exported by this module.
-   *
-   * The file extension must be ".d.ts" and not ".ts".
-   *
-   * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-   * prepend a folder token such as "<projectFolder>".
-   *
-   * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-   */
-  "mainEntryPointFilePath": "<projectFolder>/target/index.d.ts",
-
-  /**
-   * A list of NPM package names whose exports should be treated as part of this package.
-   *
-   * For example, suppose that Webpack is used to generate a distributed bundle for the project "library1",
-   * and another NPM package "library2" is embedded in this bundle.  Some types from library2 may become part
-   * of the exported API for library1, but by default API Extractor would generate a .d.ts rollup that explicitly
-   * imports library2.  To avoid this, we can specify:
-   *
-   *   "bundledPackages": [ "library2" ],
-   *
-   * This would direct API Extractor to embed those types directly in the .d.ts rollup, as if they had been
-   * local files for library1.
-   */
-  "bundledPackages": [],
-
-  /**
-   * Determines how the TypeScript compiler engine will be invoked by API Extractor.
-   */
-  "compiler": {
-    /**
-     * Specifies the path to the tsconfig.json file to be used by API Extractor when analyzing the project.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * Note: This setting will be ignored if "overrideTsconfig" is used.
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/tsconfig.json"
-     */
-    // "tsconfigFilePath": "<projectFolder>/tsconfig.json",
-    /**
-     * Provides a compiler configuration that will be used instead of reading the tsconfig.json file from disk.
-     * The object must conform to the TypeScript tsconfig schema:
-     *
-     * http://json.schemastore.org/tsconfig
-     *
-     * If omitted, then the tsconfig.json file will be read from the "projectFolder".
-     *
-     * DEFAULT VALUE: no overrideTsconfig section
-     */
-    // "overrideTsconfig": {
-    //   . . .
-    // }
-    /**
-     * This option causes the compiler to be invoked with the --skipLibCheck option. This option is not recommended
-     * and may cause API Extractor to produce incomplete or incorrect declarations, but it may be required when
-     * dependencies contain declarations that are incompatible with the TypeScript engine that API Extractor uses
-     * for its analysis.  Where possible, the underlying issue should be fixed rather than relying on skipLibCheck.
-     *
-     * DEFAULT VALUE: false
-     */
-    // "skipLibCheck": true,
-  },
-
-  /**
-   * Configures how the API report file (*.api.md) will be generated.
-   */
-  "apiReport": {
-    /**
-     * (REQUIRED) Whether to generate an API report.
-     */
-    "enabled": true
-
-    /**
-     * The filename for the API report files.  It will be combined with "reportFolder" or "reportTempFolder" to produce
-     * a full file path.
-     *
-     * The file extension should be ".api.md", and the string should not contain a path separator such as "\" or "/".
-     *
-     * SUPPORTED TOKENS: <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<unscopedPackageName>.api.md"
-     */
-    // "reportFileName": "<unscopedPackageName>.api.md",
-
-    /**
-     * Specifies the folder where the API report file is written.  The file name portion is determined by
-     * the "reportFileName" setting.
-     *
-     * The API report file is normally tracked by Git.  Changes to it can be used to trigger a branch policy,
-     * e.g. for an API review.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/etc/"
-     */
-    // "reportFolder": "<projectFolder>/etc/",
-
-    /**
-     * Specifies the folder where the temporary report file is written.  The file name portion is determined by
-     * the "reportFileName" setting.
-     *
-     * After the temporary file is written to disk, it is compared with the file in the "reportFolder".
-     * If they are different, a production build will fail.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/temp/"
-     */
-    // "reportTempFolder": "<projectFolder>/temp/"
-  },
-
-  /**
-   * Configures how the doc model file (*.api.json) will be generated.
-   */
-  "docModel": {
-    /**
-     * (REQUIRED) Whether to generate a doc model file.
-     */
-    "enabled": true
-
-    /**
-     * The output path for the doc model file.  The file extension should be ".api.json".
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/temp/<unscopedPackageName>.api.json"
-     */
-    // "apiJsonFilePath": "<projectFolder>/temp/<unscopedPackageName>.api.json"
-  },
-
-  /**
-   * Configures how the .d.ts rollup file will be generated.
-   */
-  "dtsRollup": {
-    /**
-     * (REQUIRED) Whether to generate the .d.ts rollup file.
-     */
-    "enabled": true
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated without any trimming.
-     * This file will include all declarations that are exported by the main entry point.
-     *
-     * If the path is an empty string, then this file will not be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<projectFolder>/dist/<unscopedPackageName>.d.ts"
-     */
-    // "untrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>.d.ts",
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "beta" release.
-     * This file will include only declarations that are marked as "@public" or "@beta".
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: ""
-     */
-    // "betaTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-beta.d.ts",
-
-    /**
-     * Specifies the output path for a .d.ts rollup file to be generated with trimming for a "public" release.
-     * This file will include only declarations that are marked as "@public".
-     *
-     * If the path is an empty string, then this file will not be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: ""
-     */
-    // "publicTrimmedFilePath": "<projectFolder>/dist/<unscopedPackageName>-public.d.ts",
-
-    /**
-     * When a declaration is trimmed, by default it will be replaced by a code comment such as
-     * "Excluded from this release type: exampleMember".  Set "omitTrimmingComments" to true to remove the
-     * declaration completely.
-     *
-     * DEFAULT VALUE: false
-     */
-    // "omitTrimmingComments": true
-  },
-
-  /**
-   * Configures how the tsdoc-metadata.json file will be generated.
-   */
-  "tsdocMetadata": {
-    /**
-     * Whether to generate the tsdoc-metadata.json file.
-     *
-     * DEFAULT VALUE: true
-     */
-    // "enabled": true,
-    /**
-     * Specifies where the TSDoc metadata file should be written.
-     *
-     * The path is resolved relative to the folder of the config file that contains the setting; to change this,
-     * prepend a folder token such as "<projectFolder>".
-     *
-     * The default value is "<lookup>", which causes the path to be automatically inferred from the "tsdocMetadata",
-     * "typings" or "main" fields of the project's package.json.  If none of these fields are set, the lookup
-     * falls back to "tsdoc-metadata.json" in the package folder.
-     *
-     * SUPPORTED TOKENS: <projectFolder>, <packageName>, <unscopedPackageName>
-     * DEFAULT VALUE: "<lookup>"
-     */
-    // "tsdocMetadataFilePath": "<projectFolder>/dist/tsdoc-metadata.json"
-  },
-
-  /**
-   * Specifies what type of newlines API Extractor should use when writing output files.  By default, the output files
-   * will be written with Windows-style newlines.  To use POSIX-style newlines, specify "lf" instead.
-   * To use the OS's default newline kind, specify "os".
-   *
-   * DEFAULT VALUE: "crlf"
-   */
-  // "newlineKind": "crlf",
-
-  /**
-   * Configures how API Extractor reports error and warning messages produced during analysis.
-   *
-   * There are three sources of messages:  compiler messages, API Extractor messages, and TSDoc messages.
-   */
-  "messages": {
-    /**
-     * Configures handling of diagnostic messages reported by the TypeScript compiler engine while analyzing
-     * the input .d.ts files.
-     *
-     * TypeScript message identifiers start with "TS" followed by an integer.  For example: "TS2551"
-     *
-     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
-     */
-    "compilerMessageReporting": {
-      /**
-       * Configures the default routing for messages that don't match an explicit rule in this table.
-       */
-      "default": {
-        /**
-         * Specifies whether the message should be written to the the tool's output log.  Note that
-         * the "addToApiReportFile" property may supersede this option.
-         *
-         * Possible values: "error", "warning", "none"
-         *
-         * Errors cause the build to fail and return a nonzero exit code.  Warnings cause a production build fail
-         * and return a nonzero exit code.  For a non-production build (e.g. when "api-extractor run" includes
-         * the "--local" option), the warning is displayed but the build will not fail.
-         *
-         * DEFAULT VALUE: "warning"
-         */
-        "logLevel": "warning"
-
-        /**
-         * When addToApiReportFile is true:  If API Extractor is configured to write an API report file (.api.md),
-         * then the message will be written inside that file; otherwise, the message is instead logged according to
-         * the "logLevel" option.
-         *
-         * DEFAULT VALUE: false
-         */
-        // "addToApiReportFile": false
-      }
-
-      // "TS2551": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    },
-
-    /**
-     * Configures handling of messages reported by API Extractor during its analysis.
-     *
-     * API Extractor message identifiers start with "ae-".  For example: "ae-extra-release-tag"
-     *
-     * DEFAULT VALUE: See api-extractor-defaults.json for the complete table of extractorMessageReporting mappings
-     */
-    "extractorMessageReporting": {
-      "default": {
-        "logLevel": "warning"
-        // "addToApiReportFile": false
-      }
-
-      // "ae-extra-release-tag": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    },
-
-    /**
-     * Configures handling of messages reported by the TSDoc parser when analyzing code comments.
-     *
-     * TSDoc message identifiers start with "tsdoc-".  For example: "tsdoc-link-tag-unescaped-text"
-     *
-     * DEFAULT VALUE:  A single "default" entry with logLevel=warning.
-     */
-    "tsdocMessageReporting": {
-      "default": {
-        "logLevel": "warning"
-        // "addToApiReportFile": false
-      }
-
-      // "tsdoc-link-tag-unescaped-text": {
-      //   "logLevel": "warning",
-      //   "addToApiReportFile": true
-      // },
-      //
-      // . . .
-    }
-  }
-}

package/etc/ems-client.api.md

@@ -1,154 +0,0 @@
-## API Report File for "@elastic/ems-client"
-
-> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
-
-```ts
-
-// @public (undocumented)
-export class EMSClient {
-    // Warning: (ae-forgotten-export) The symbol "ClientConfig" needs to be exported by the entry point index.d.ts
-    // Warning: (ae-forgotten-export) The symbol "DeprecatedClientConfig" needs to be exported by the entry point index.d.ts
-    constructor(config: ClientConfig | DeprecatedClientConfig);
-    addQueryParams(additionalQueryParams: {
-        [key: string]: string;
-    }): void;
-    // (undocumented)
-    readonly EMS_LOAD_TIMEOUT = 32000;
-    // (undocumented)
-    extendUrlWithParams(url: string): string;
-    // (undocumented)
-    findFileLayerById(id: string): Promise<FileLayer | undefined>;
-    // (undocumented)
-    findTMSServiceById(id: string): Promise<TMSService | undefined>;
-    // Warning: (ae-forgotten-export) The symbol "EmsFileCatalog" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    getDefaultFileManifest(): Promise<EmsFileCatalog>;
-    // (undocumented)
-    getDefaultLocale(): string;
-    // Warning: (ae-forgotten-export) The symbol "EmsTmsCatalog" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    getDefaultTMSManifest(): Promise<EmsTmsCatalog>;
-    // (undocumented)
-    getFileApiUrl(): string;
-    // (undocumented)
-    getFileLayers(): Promise<FileLayer[]>;
-    // (undocumented)
-    getLandingPageUrl(): string;
-    // (undocumented)
-    getLocale(): string;
-    // Warning: (ae-forgotten-export) The symbol "EmsCatalogManifest" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    getMainManifest(): Promise<EmsCatalogManifest>;
-    getManifest<T>(manifestUrl: string): Promise<T>;
-    // (undocumented)
-    getTileApiUrl(): string;
-    // (undocumented)
-    getTMSServices(): Promise<TMSService[]>;
-    // (undocumented)
-    getValueInLanguage(i18nObject: {
-        [language: string]: string;
-    }): string;
-    // (undocumented)
-    sanitizeHtml(html: string): string;
-    }
-
-// Warning: (ae-forgotten-export) The symbol "AbstractEmsService" needs to be exported by the entry point index.d.ts
-//
-// @public (undocumented)
-export class FileLayer extends AbstractEmsService {
-    constructor(config: FileLayerConfig, emsClient: EMSClient, proxyPath: string);
-    // Warning: (ae-forgotten-export) The symbol "FileLayerConfig" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    protected readonly _config: FileLayerConfig;
-    // (undocumented)
-    getApiUrl(): string;
-    // (undocumented)
-    getCreatedAt(): string;
-    // (undocumented)
-    getDefaultFormatMeta(): {
-        [key: string]: string;
-    } | undefined;
-    // (undocumented)
-    getDefaultFormatType(): string;
-    // (undocumented)
-    getDefaultFormatUrl(): string;
-    // (undocumented)
-    getDisplayName(): string;
-    // (undocumented)
-    getEMSHotLink(): string;
-    // (undocumented)
-    getFields(): FileLayerConfig['fields'];
-    // (undocumented)
-    getFieldsInLanguage(): {
-        type: string;
-        name: string;
-        description: string;
-    }[];
-    // (undocumented)
-    getId(): string;
-    // (undocumented)
-    hasId(id: string): boolean;
-}
-
-// @public (undocumented)
-export const ORIGIN: {
-    EMS: string;
-    KIBANA_YML: string;
-};
-
-// @public (undocumented)
-export class TMSService extends AbstractEmsService {
-    constructor(config: TMSServiceConfig, emsClient: EMSClient, proxyPath: string);
-    // Warning: (ae-forgotten-export) The symbol "TMSServiceConfig" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    protected readonly _config: TMSServiceConfig;
-    // (undocumented)
-    getApiUrl(): string;
-    // Warning: (ae-forgotten-export) The symbol "EmsRasterStyle" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    getDefaultRasterStyle(): Promise<EmsRasterStyle | undefined>;
-    // (undocumented)
-    getDisplayName(): string;
-    // (undocumented)
-    getId(): string;
-    // (undocumented)
-    getMaxZoom(): Promise<number | undefined>;
-    // (undocumented)
-    getMinZoom(): Promise<number | undefined>;
-    // (undocumented)
-    getSpriteSheetJsonPath(isRetina?: boolean): Promise<string>;
-    // (undocumented)
-    getSpriteSheetMeta(isRetina?: boolean): Promise<{
-        png: string;
-        json: EmsSpriteSheet;
-    } | undefined>;
-    // (undocumented)
-    getSpriteSheetPngPath(isRetina?: boolean): Promise<string>;
-    // (undocumented)
-    getUrlTemplate(): Promise<string>;
-    // (undocumented)
-    getUrlTemplateForVector(sourceId: string): Promise<string>;
-    // Warning: (ae-forgotten-export) The symbol "EmsVectorStyle" needs to be exported by the entry point index.d.ts
-    //
-    // (undocumented)
-    getVectorStyleSheet(): Promise<EmsVectorStyle | undefined>;
-    // (undocumented)
-    getVectorStyleSheetRaw(): Promise<EmsVectorStyle | undefined>;
-    // (undocumented)
-    hasId(id: string): boolean;
-}
-
-
-// Warnings were encountered during analysis:
-//
-// target/tms_service.d.ts:66:9 - (ae-forgotten-export) The symbol "EmsSpriteSheet" needs to be exported by the entry point index.d.ts
-
-// (No @packageDocumentation comment for this package)
-
-```

package/src/origin.ts

@@ -1,11 +0,0 @@
-/*
- * 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.
- */
-
-export const ORIGIN = {
-  EMS: 'elastic_maps_service',
-  KIBANA_YML: 'self_hosted',
-};

package/target/node/origin.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.ORIGIN = void 0;
-
-/*
- * 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.
- */
-const ORIGIN = {
-  EMS: 'elastic_maps_service',
-  KIBANA_YML: 'self_hosted'
-};
-exports.ORIGIN = ORIGIN;

package/target/origin.d.ts

@@ -1,4 +0,0 @@
-export declare const ORIGIN: {
-    EMS: string;
-    KIBANA_YML: string;
-};

package/target/web/origin.js

@@ -1,10 +0,0 @@
-/*
- * 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.
- */
-export var ORIGIN = {
-  EMS: 'elastic_maps_service',
-  KIBANA_YML: 'self_hosted'
-};