@deck.gl/carto 9.0.0-alpha.5 → 9.0.0-alpha.7

package/dist/cartoRasterTile-worker.js

@@ -758,6 +758,9 @@
     }
   });
 
+  // ../../node_modules/@loaders.gl/worker-utils/dist/lib/node/worker_threads-browser.js
+  var parentPort = null;
+
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-utils/get-transfer-list.js
   function getTransferList(object) {
     let recursive = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
@@ -797,19 +800,6 @@
 
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-farm/worker-body.js
   async function getParentPort() {
-    let parentPort;
-    try {
-      eval("globalThis.parentPort = require('worker_threads').parentPort");
-      parentPort = globalThis.parentPort;
-    } catch {
-      try {
-        eval("globalThis.workerThreadsPromise = import('worker_threads')");
-        const workerThreads = await globalThis.workerThreadsPromise;
-        parentPort = workerThreads.parentPort;
-      } catch (error) {
-        console.error(error.message);
-      }
-    }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();
@@ -1053,7 +1043,7 @@
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.0-alpha.5" : "latest";
+  var VERSION = true ? "9.0.0-alpha.7" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {

package/dist/cartoSpatialTile-worker.js

@@ -1084,6 +1084,9 @@
     }
   });
 
+  // ../../node_modules/@loaders.gl/worker-utils/dist/lib/node/worker_threads-browser.js
+  var parentPort = null;
+
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-utils/get-transfer-list.js
   function getTransferList(object) {
     let recursive = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
@@ -1123,19 +1126,6 @@
 
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-farm/worker-body.js
   async function getParentPort() {
-    let parentPort;
-    try {
-      eval("globalThis.parentPort = require('worker_threads').parentPort");
-      parentPort = globalThis.parentPort;
-    } catch {
-      try {
-        eval("globalThis.workerThreadsPromise = import('worker_threads')");
-        const workerThreads = await globalThis.workerThreadsPromise;
-        parentPort = workerThreads.parentPort;
-      } catch (error) {
-        console.error(error.message);
-      }
-    }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();
@@ -1440,7 +1430,7 @@
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION = true ? "9.0.0-alpha.5" : "latest";
+  var VERSION = true ? "9.0.0-alpha.7" : "latest";
   var id = "cartoSpatialTile";
   var DEFAULT_OPTIONS = {
     cartoSpatialTile: {

package/dist/cartoVectorTile-worker.js

@@ -1221,6 +1221,9 @@
     }
   });
 
+  // ../../node_modules/@loaders.gl/worker-utils/dist/lib/node/worker_threads-browser.js
+  var parentPort = null;
+
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-utils/get-transfer-list.js
   function getTransferList(object) {
     let recursive = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : true;
@@ -1260,19 +1263,6 @@
 
   // ../../node_modules/@loaders.gl/worker-utils/dist/lib/worker-farm/worker-body.js
   async function getParentPort() {
-    let parentPort;
-    try {
-      eval("globalThis.parentPort = require('worker_threads').parentPort");
-      parentPort = globalThis.parentPort;
-    } catch {
-      try {
-        eval("globalThis.workerThreadsPromise = import('worker_threads')");
-        const workerThreads = await globalThis.workerThreadsPromise;
-        parentPort = workerThreads.parentPort;
-      } catch (error) {
-        console.error(error.message);
-      }
-    }
     return parentPort;
   }
   var onMessageWrapperMap = /* @__PURE__ */ new Map();
@@ -1668,7 +1658,7 @@
   }
 
   // src/layers/schema/carto-vector-tile-loader.ts
-  var VERSION = true ? "9.0.0-alpha.5" : "latest";
+  var VERSION = true ? "9.0.0-alpha.7" : "latest";
   var id = "cartoVectorTile";
   var DEFAULT_OPTIONS = {
     cartoVectorTile: {

package/dist/dist.dev.js

@@ -9124,7 +9124,6 @@ var __exports__ = (() => {
     _PointLabelLayer: () => PointLabelLayer,
     boundaryQuerySource: () => boundaryQuerySource,
     boundaryTableSource: () => boundaryTableSource,
-    boundaryTilesetSource: () => boundaryTilesetSource,
     colorBins: () => colorBins,
     colorCategories: () => colorCategories,
     colorContinuous: () => colorContinuous,
@@ -9368,7 +9367,7 @@ var __exports__ = (() => {
   }
 
   // src/layers/schema/carto-raster-tile-loader.ts
-  var VERSION = true ? "9.0.0-alpha.5" : "latest";
+  var VERSION = true ? "9.0.0-alpha.7" : "latest";
   var id = "cartoRasterTile";
   var DEFAULT_OPTIONS = {
     cartoRasterTile: {
@@ -9767,7 +9766,7 @@ var __exports__ = (() => {
   }
 
   // src/layers/schema/carto-spatial-tile-loader.ts
-  var VERSION2 = true ? "9.0.0-alpha.5" : "latest";
+  var VERSION2 = true ? "9.0.0-alpha.7" : "latest";
   var id2 = "cartoSpatialTile";
   var DEFAULT_OPTIONS2 = {
     cartoSpatialTile: {
@@ -9890,7 +9889,7 @@ var __exports__ = (() => {
       ...rest
     } of properties.properties) {
       if (geoid in mapping) {
-        import_core3.log.warn(`Duplicate geoid key in boundary mapping, using first occurance`)();
+        import_core3.log.warn("Duplicate geoid key in boundary mapping, using first occurance")();
       } else {
         mapping[geoid] = rest;
       }
@@ -10644,7 +10643,7 @@ void main(void) {
 
   // src/layers/schema/carto-vector-tile-loader.ts
   var import_earcut = __toESM(require_earcut());
-  var VERSION3 = true ? "9.0.0-alpha.5" : "latest";
+  var VERSION3 = true ? "9.0.0-alpha.7" : "latest";
   var id3 = "cartoVectorTile";
   var DEFAULT_OPTIONS3 = {
     cartoVectorTile: {
@@ -13093,29 +13092,42 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   };
 
   // src/api/endpoints.ts
-  function buildUrlFromBase(apiBaseUrl, endpoint) {
-    let suffix = `/v3/${endpoint}`;
-    if (apiBaseUrl.endsWith("/")) {
-      suffix = suffix.substring(1);
-    }
-    return `${apiBaseUrl}${suffix}`;
+  function joinPath(...args) {
+    return args.map((part) => part.endsWith("/") ? part.slice(0, -1) : part).join("/");
   }
-  function buildMapsUrlFromBase(apiBaseUrl) {
-    return buildUrlFromBase(apiBaseUrl, "maps");
+  function buildV3Path(apiBaseUrl, version, endpoint, ...rest) {
+    return joinPath(apiBaseUrl, version, endpoint, ...rest);
   }
-  function buildStatsUrlFromBase(apiBaseUrl) {
-    return buildUrlFromBase(apiBaseUrl, "stats");
+  function buildPublicMapUrl({
+    apiBaseUrl,
+    cartoMapId
+  }) {
+    return buildV3Path(apiBaseUrl, "v3", "maps", "public", cartoMapId);
   }
-  function buildQueryUrlFromBase(apiBaseUrl) {
-    return buildUrlFromBase(apiBaseUrl, "sql");
+  function buildStatsUrl({
+    attribute,
+    apiBaseUrl,
+    connectionName,
+    source,
+    type
+  }) {
+    if (type === "query") {
+      return buildV3Path(apiBaseUrl, "v3", "stats", connectionName, attribute);
+    }
+    return buildV3Path(apiBaseUrl, "v3", "stats", connectionName, source, attribute);
   }
   function buildSourceUrl({
     apiBaseUrl,
     connectionName,
-    endpoint,
-    mapsUrl
+    endpoint
   }) {
-    return `${mapsUrl || buildMapsUrlFromBase(apiBaseUrl)}/${connectionName}/${endpoint}`;
+    return buildV3Path(apiBaseUrl, "v3", "maps", connectionName, endpoint);
+  }
+  function buildQueryUrl({
+    apiBaseUrl,
+    connectionName
+  }) {
+    return buildV3Path(apiBaseUrl, "v3", "sql", connectionName, "query");
   }
 
   // src/api/request-with-parameters.ts
@@ -13256,15 +13268,15 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   // src/sources/boundary-query-source.ts
   var boundaryQuerySource = async function(options) {
     const {
-      boundaryId,
+      tilesetTableName,
       matchingColumn = "id",
-      sqlQuery,
+      propertiesSqlQuery,
       queryParameters
     } = options;
     const urlParameters = {
-      boundaryId,
+      tilesetTableName,
       matchingColumn,
-      sqlQuery
+      propertiesSqlQuery
     };
     if (queryParameters) {
       urlParameters.queryParameters = JSON.stringify(queryParameters);
@@ -13275,15 +13287,15 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   // src/sources/boundary-table-source.ts
   var boundaryTableSource = async function(options) {
     const {
-      boundaryId,
+      tilesetTableName,
       columns,
       matchingColumn = "id",
-      tableName
+      propertiesTableName
     } = options;
     const urlParameters = {
-      boundaryId,
+      tilesetTableName,
       matchingColumn,
-      tableName
+      propertiesTableName
     };
     if (columns) {
       urlParameters.columns = columns.join(",");
@@ -13291,17 +13303,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     return baseSource("boundary", options, urlParameters);
   };
 
-  // src/sources/boundary-tileset-source.ts
-  var boundaryTilesetSource = async function(options) {
-    const {
-      boundaryId
-    } = options;
-    const urlParameters = {
-      boundaryId
-    };
-    return baseSource("boundary", options, urlParameters);
-  };
-
   // src/sources/h3-query-source.ts
   var h3QuerySource = async function(options) {
     const {
@@ -13717,7 +13718,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       return attribute.categories.map((c) => c.category).filter((c) => c !== void 0 && c !== null);
     }
     if (scaleType === "quantile" && attribute.quantiles) {
-      return attribute.quantiles[scaleLength];
+      return attribute.quantiles.global ? attribute.quantiles.global[scaleLength] : attribute.quantiles[scaleLength];
     }
     let {
       min: min2
@@ -14345,7 +14346,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   }
   async function _fetchTilestats(attribute, dataset, accessToken, apiBaseUrl) {
     const {
-      connectionName: connection,
+      connectionName,
       data,
       id: id4,
       source,
@@ -14354,20 +14355,18 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     } = dataset;
     const errorContext = {
       requestType: "Tile stats",
-      connection,
+      connection: connectionName,
       type,
       source
     };
     if (!("tilestats" in data)) {
       throw new CartoAPIError(new Error(`Invalid dataset for tilestats: ${id4}`), errorContext);
     }
-    const statsUrl = buildStatsUrlFromBase(apiBaseUrl);
-    let baseUrl2 = `${statsUrl}/${connection}/`;
-    if (type === "query") {
-      baseUrl2 += attribute;
-    } else {
-      baseUrl2 += `${source}/${attribute}`;
-    }
+    const baseUrl2 = buildStatsUrl({
+      attribute,
+      apiBaseUrl,
+      ...dataset
+    });
     const headers = {
       Authorization: `Bearer ${accessToken}`
     };
@@ -14441,7 +14440,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     cartoMapId,
     clientId = DEFAULT_CLIENT,
     headers = {},
-    mapsUrl,
     autoRefresh,
     onNewData
   }) {
@@ -14452,7 +14450,10 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
       assert(typeof onNewData === "function", "`onNewData` must be a function");
       assert(typeof autoRefresh === "number" && autoRefresh > 0, "`autoRefresh` must be a positive number");
     }
-    const baseUrl2 = `${mapsUrl || buildMapsUrlFromBase(apiBaseUrl)}/public/${cartoMapId}`;
+    const baseUrl2 = buildPublicMapUrl({
+      apiBaseUrl,
+      cartoMapId
+    });
     const errorContext = {
       requestType: "Public map",
       mapId: cartoMapId
@@ -14518,7 +14519,7 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   // src/api/query.ts
   var query = async function(options) {
     const {
-      apiBaseUrl,
+      apiBaseUrl = SOURCE_DEFAULTS.apiBaseUrl,
       connectionName,
       sqlQuery,
       queryParameters
@@ -14529,8 +14530,10 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
     if (queryParameters) {
       urlParameters.queryParameters = JSON.stringify(queryParameters);
     }
-    const queryUrl = buildQueryUrlFromBase(apiBaseUrl || SOURCE_DEFAULTS.apiBaseUrl);
-    const baseUrl2 = `${queryUrl}/${connectionName}/query`;
+    const baseUrl2 = buildQueryUrl({
+      apiBaseUrl,
+      connectionName
+    });
     const headers = {
       Authorization: `Bearer ${options.accessToken}`,
       ...options.headers
@@ -14560,7 +14563,6 @@ ${formatErrorKey(key)}: ${errorContext[key]}`;
   var CARTO_SOURCES = {
     boundaryQuerySource,
     boundaryTableSource,
-    boundaryTilesetSource,
     h3QuerySource,
     h3TableSource,
     h3TilesetSource,

package/dist/es5/api/endpoints.js

@@ -3,38 +3,59 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.buildMapsUrlFromBase = buildMapsUrlFromBase;
-exports.buildStatsUrlFromBase = buildStatsUrlFromBase;
-exports.buildQueryUrlFromBase = buildQueryUrlFromBase;
+exports.buildPublicMapUrl = buildPublicMapUrl;
+exports.buildStatsUrl = buildStatsUrl;
 exports.buildSourceUrl = buildSourceUrl;
+exports.buildQueryUrl = buildQueryUrl;
 
-function buildUrlFromBase(apiBaseUrl, endpoint) {
-  var suffix = "/v3/".concat(endpoint);
+function joinPath() {
+  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+
+  return args.map(function (part) {
+    return part.endsWith('/') ? part.slice(0, -1) : part;
+  }).join('/');
+}
 
-  if (apiBaseUrl.endsWith('/')) {
-    suffix = suffix.substring(1);
+function buildV3Path(apiBaseUrl, version, endpoint) {
+  for (var _len2 = arguments.length, rest = new Array(_len2 > 3 ? _len2 - 3 : 0), _key2 = 3; _key2 < _len2; _key2++) {
+    rest[_key2 - 3] = arguments[_key2];
   }
 
-  return "".concat(apiBaseUrl).concat(suffix);
+  return joinPath.apply(void 0, [apiBaseUrl, version, endpoint].concat(rest));
 }
 
-function buildMapsUrlFromBase(apiBaseUrl) {
-  return buildUrlFromBase(apiBaseUrl, 'maps');
+function buildPublicMapUrl(_ref) {
+  var apiBaseUrl = _ref.apiBaseUrl,
+      cartoMapId = _ref.cartoMapId;
+  return buildV3Path(apiBaseUrl, 'v3', 'maps', 'public', cartoMapId);
 }
 
-function buildStatsUrlFromBase(apiBaseUrl) {
-  return buildUrlFromBase(apiBaseUrl, 'stats');
+function buildStatsUrl(_ref2) {
+  var attribute = _ref2.attribute,
+      apiBaseUrl = _ref2.apiBaseUrl,
+      connectionName = _ref2.connectionName,
+      source = _ref2.source,
+      type = _ref2.type;
+
+  if (type === 'query') {
+    return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, attribute);
+  }
+
+  return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, source, attribute);
 }
 
-function buildQueryUrlFromBase(apiBaseUrl) {
-  return buildUrlFromBase(apiBaseUrl, 'sql');
+function buildSourceUrl(_ref3) {
+  var apiBaseUrl = _ref3.apiBaseUrl,
+      connectionName = _ref3.connectionName,
+      endpoint = _ref3.endpoint;
+  return buildV3Path(apiBaseUrl, 'v3', 'maps', connectionName, endpoint);
 }
 
-function buildSourceUrl(_ref) {
-  var apiBaseUrl = _ref.apiBaseUrl,
-      connectionName = _ref.connectionName,
-      endpoint = _ref.endpoint,
-      mapsUrl = _ref.mapsUrl;
-  return "".concat(mapsUrl || buildMapsUrlFromBase(apiBaseUrl), "/").concat(connectionName, "/").concat(endpoint);
+function buildQueryUrl(_ref4) {
+  var apiBaseUrl = _ref4.apiBaseUrl,
+      connectionName = _ref4.connectionName;
+  return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');
 }
 //# sourceMappingURL=endpoints.js.map

package/dist/es5/api/endpoints.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/endpoints.ts"],"names":["buildUrlFromBase","apiBaseUrl","endpoint","suffix","endsWith","substring","buildMapsUrlFromBase","buildStatsUrlFromBase","buildQueryUrlFromBase","buildSourceUrl","connectionName","mapsUrl"],"mappings":";;;;;;;;;;AAIA,SAASA,gBAAT,CAA0BC,UAA1B,EAA8CC,QAA9C,EAAoE;AAClE,MAAIC,MAAM,iBAAUD,QAAV,CAAV;;AACA,MAAID,UAAU,CAACG,QAAX,CAAoB,GAApB,CAAJ,EAA8B;AAC5BD,IAAAA,MAAM,GAAGA,MAAM,CAACE,SAAP,CAAiB,CAAjB,CAAT;AACD;;AAED,mBAAUJ,UAAV,SAAuBE,MAAvB;AACD;;AAEM,SAASG,oBAAT,CAA8BL,UAA9B,EAA0D;AAC/D,SAAOD,gBAAgB,CAACC,UAAD,EAAa,MAAb,CAAvB;AACD;;AAEM,SAASM,qBAAT,CAA+BN,UAA/B,EAA2D;AAChE,SAAOD,gBAAgB,CAACC,UAAD,EAAa,OAAb,CAAvB;AACD;;AAEM,SAASO,qBAAT,CAA+BP,UAA/B,EAA2D;AAChE,SAAOD,gBAAgB,CAACC,UAAD,EAAa,KAAb,CAAvB;AACD;;AAEM,SAASQ,cAAT,OAUI;AAAA,MATTR,UASS,QATTA,UASS;AAAA,MARTS,cAQS,QARTA,cAQS;AAAA,MAPTR,QAOS,QAPTA,QAOS;AAAA,MANTS,OAMS,QANTA,OAMS;AACT,mBAAUA,OAAO,IAAIL,oBAAoB,CAACL,UAAD,CAAzC,cAAyDS,cAAzD,cAA2ER,QAA3E;AACD","sourcesContent":["import {MapType} from './types';\n\nexport type V3Endpoint = 'maps' | 'stats' | 'sql';\n\nfunction buildUrlFromBase(apiBaseUrl: string, endpoint: V3Endpoint) {\n  let suffix = `/v3/${endpoint}`;\n  if (apiBaseUrl.endsWith('/')) {\n    suffix = suffix.substring(1);\n  }\n\n  return `${apiBaseUrl}${suffix}`;\n}\n\nexport function buildMapsUrlFromBase(apiBaseUrl: string): string {\n  return buildUrlFromBase(apiBaseUrl, 'maps');\n}\n\nexport function buildStatsUrlFromBase(apiBaseUrl: string): string {\n  return buildUrlFromBase(apiBaseUrl, 'stats');\n}\n\nexport function buildQueryUrlFromBase(apiBaseUrl: string): string {\n  return buildUrlFromBase(apiBaseUrl, 'sql');\n}\n\nexport function buildSourceUrl({\n  apiBaseUrl,\n  connectionName,\n  endpoint,\n  mapsUrl\n}: {\n  apiBaseUrl: string;\n  connectionName: string;\n  endpoint: MapType;\n  mapsUrl?: string;\n}): string {\n  return `${mapsUrl || buildMapsUrlFromBase(apiBaseUrl)}/${connectionName}/${endpoint}`;\n}\n"],"file":"endpoints.js"}
+{"version":3,"sources":["../../../src/api/endpoints.ts"],"names":["joinPath","args","map","part","endsWith","slice","join","buildV3Path","apiBaseUrl","version","endpoint","rest","buildPublicMapUrl","cartoMapId","buildStatsUrl","attribute","connectionName","source","type","buildSourceUrl","buildQueryUrl"],"mappings":";;;;;;;;;;AAIA,SAASA,QAAT,GAA6C;AAAA,oCAAxBC,IAAwB;AAAxBA,IAAAA,IAAwB;AAAA;;AAC3C,SAAOA,IAAI,CAACC,GAAL,CAAS,UAAAC,IAAI;AAAA,WAAKA,IAAI,CAACC,QAAL,CAAc,GAAd,IAAqBD,IAAI,CAACE,KAAL,CAAW,CAAX,EAAc,CAAC,CAAf,CAArB,GAAyCF,IAA9C;AAAA,GAAb,EAAkEG,IAAlE,CAAuE,GAAvE,CAAP;AACD;;AAED,SAASC,WAAT,CACEC,UADF,EAEEC,OAFF,EAGEC,QAHF,EAKU;AAAA,qCADLC,IACK;AADLA,IAAAA,IACK;AAAA;;AACR,SAAOX,QAAQ,MAAR,UAASQ,UAAT,EAAqBC,OAArB,EAA8BC,QAA9B,SAA2CC,IAA3C,EAAP;AACD;;AAEM,SAASC,iBAAT,OAMI;AAAA,MALTJ,UAKS,QALTA,UAKS;AAAA,MAJTK,UAIS,QAJTA,UAIS;AACT,SAAON,WAAW,CAACC,UAAD,EAAa,IAAb,EAAmB,MAAnB,EAA2B,QAA3B,EAAqCK,UAArC,CAAlB;AACD;;AAEM,SAASC,aAAT,QAYI;AAAA,MAXTC,SAWS,SAXTA,SAWS;AAAA,MAVTP,UAUS,SAVTA,UAUS;AAAA,MATTQ,cASS,SATTA,cASS;AAAA,MARTC,MAQS,SARTA,MAQS;AAAA,MAPTC,IAOS,SAPTA,IAOS;;AACT,MAAIA,IAAI,KAAK,OAAb,EAAsB;AACpB,WAAOX,WAAW,CAACC,UAAD,EAAa,IAAb,EAAmB,OAAnB,EAA4BQ,cAA5B,EAA4CD,SAA5C,CAAlB;AACD;;AAGD,SAAOR,WAAW,CAACC,UAAD,EAAa,IAAb,EAAmB,OAAnB,EAA4BQ,cAA5B,EAA4CC,MAA5C,EAAoDF,SAApD,CAAlB;AACD;;AAEM,SAASI,cAAT,QAQI;AAAA,MAPTX,UAOS,SAPTA,UAOS;AAAA,MANTQ,cAMS,SANTA,cAMS;AAAA,MALTN,QAKS,SALTA,QAKS;AACT,SAAOH,WAAW,CAACC,UAAD,EAAa,IAAb,EAAmB,MAAnB,EAA2BQ,cAA3B,EAA2CN,QAA3C,CAAlB;AACD;;AAEM,SAASU,aAAT,QAMI;AAAA,MALTZ,UAKS,SALTA,UAKS;AAAA,MAJTQ,cAIS,SAJTA,cAIS;AACT,SAAOT,WAAW,CAACC,UAAD,EAAa,IAAb,EAAmB,KAAnB,EAA0BQ,cAA1B,EAA0C,OAA1C,CAAlB;AACD","sourcesContent":["import {MapType} from './types';\n\nexport type V3Endpoint = 'maps' | 'stats' | 'sql';\n\nfunction joinPath(...args: string[]): string {\n  return args.map(part => (part.endsWith('/') ? part.slice(0, -1) : part)).join('/');\n}\n\nfunction buildV3Path(\n  apiBaseUrl: string,\n  version: 'v3',\n  endpoint: V3Endpoint,\n  ...rest: string[]\n): string {\n  return joinPath(apiBaseUrl, version, endpoint, ...rest);\n}\n\nexport function buildPublicMapUrl({\n  apiBaseUrl,\n  cartoMapId\n}: {\n  apiBaseUrl: string;\n  cartoMapId: string;\n}): string {\n  return buildV3Path(apiBaseUrl, 'v3', 'maps', 'public', cartoMapId);\n}\n\nexport function buildStatsUrl({\n  attribute,\n  apiBaseUrl,\n  connectionName,\n  source,\n  type\n}: {\n  attribute: string;\n  apiBaseUrl: string;\n  connectionName: string;\n  source: string;\n  type: MapType;\n}): string {\n  if (type === 'query') {\n    return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, attribute);\n  }\n\n  // type === 'table'\n  return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, source, attribute);\n}\n\nexport function buildSourceUrl({\n  apiBaseUrl,\n  connectionName,\n  endpoint\n}: {\n  apiBaseUrl: string;\n  connectionName: string;\n  endpoint: MapType;\n}): string {\n  return buildV3Path(apiBaseUrl, 'v3', 'maps', connectionName, endpoint);\n}\n\nexport function buildQueryUrl({\n  apiBaseUrl,\n  connectionName\n}: {\n  apiBaseUrl: string;\n  connectionName: string;\n}): string {\n  return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');\n}\n"],"file":"endpoints.js"}

package/dist/es5/api/fetch-map.js

@@ -241,15 +241,15 @@ function _fetchTilestats(_x6, _x7, _x8, _x9) {
 
 function _fetchTilestats2() {
   _fetchTilestats2 = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(attribute, dataset, accessToken, apiBaseUrl) {
-    var connection, data, id, source, type, queryParameters, errorContext, statsUrl, baseUrl, headers, parameters, stats, attributes, index;
+    var connectionName, data, id, source, type, queryParameters, errorContext, baseUrl, headers, parameters, stats, attributes, index;
     return _regenerator.default.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            connection = dataset.connectionName, data = dataset.data, id = dataset.id, source = dataset.source, type = dataset.type, queryParameters = dataset.queryParameters;
+            connectionName = dataset.connectionName, data = dataset.data, id = dataset.id, source = dataset.source, type = dataset.type, queryParameters = dataset.queryParameters;
             errorContext = {
               requestType: 'Tile stats',
-              connection: connection,
+              connection: connectionName,
               type: type,
               source: source
             };
@@ -262,15 +262,10 @@ function _fetchTilestats2() {
             throw new _cartoApiError.CartoAPIError(new Error("Invalid dataset for tilestats: ".concat(id)), errorContext);
 
           case 4:
-            statsUrl = (0, _endpoints.buildStatsUrlFromBase)(apiBaseUrl);
-            baseUrl = "".concat(statsUrl, "/").concat(connection, "/");
-
-            if (type === 'query') {
-              baseUrl += attribute;
-            } else {
-              baseUrl += "".concat(source, "/").concat(attribute);
-            }
-
+            baseUrl = (0, _endpoints.buildStatsUrl)(_objectSpread({
+              attribute: attribute,
+              apiBaseUrl: apiBaseUrl
+            }, dataset));
             headers = {
               Authorization: "Bearer ".concat(accessToken)
             };
@@ -284,7 +279,7 @@ function _fetchTilestats2() {
               }
             }
 
-            _context2.next = 12;
+            _context2.next = 10;
             return (0, _requestWithParameters.requestWithParameters)({
               baseUrl: baseUrl,
               headers: headers,
@@ -292,7 +287,7 @@ function _fetchTilestats2() {
               errorContext: errorContext
             });
 
-          case 12:
+          case 10:
             stats = _context2.sent;
             attributes = data.tilestats.layers[0].attributes;
             index = attributes.findIndex(function (d) {
@@ -301,7 +296,7 @@ function _fetchTilestats2() {
             attributes[index] = stats;
             return _context2.abrupt("return", true);
 
-          case 17:
+          case 15:
           case "end":
             return _context2.stop();
         }
@@ -438,13 +433,13 @@ function fetchMap(_x16) {
 
 function _fetchMap() {
   _fetchMap = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee6(_ref3) {
-    var _ref3$apiBaseUrl, apiBaseUrl, cartoMapId, _ref3$clientId, clientId, _ref3$headers, headers, mapsUrl, autoRefresh, onNewData, baseUrl, errorContext, map, stopAutoRefresh, intervalId, geojsonLayers, geojsonDatasetIds, out, textLayers, font;
+    var _ref3$apiBaseUrl, apiBaseUrl, cartoMapId, _ref3$clientId, clientId, _ref3$headers, headers, autoRefresh, onNewData, baseUrl, errorContext, map, stopAutoRefresh, intervalId, geojsonLayers, geojsonDatasetIds, out, textLayers, font;
 
     return _regenerator.default.wrap(function _callee6$(_context6) {
       while (1) {
         switch (_context6.prev = _context6.next) {
           case 0:
-            _ref3$apiBaseUrl = _ref3.apiBaseUrl, apiBaseUrl = _ref3$apiBaseUrl === void 0 ? _common.DEFAULT_API_BASE_URL : _ref3$apiBaseUrl, cartoMapId = _ref3.cartoMapId, _ref3$clientId = _ref3.clientId, clientId = _ref3$clientId === void 0 ? _common.DEFAULT_CLIENT : _ref3$clientId, _ref3$headers = _ref3.headers, headers = _ref3$headers === void 0 ? {} : _ref3$headers, mapsUrl = _ref3.mapsUrl, autoRefresh = _ref3.autoRefresh, onNewData = _ref3.onNewData;
+            _ref3$apiBaseUrl = _ref3.apiBaseUrl, apiBaseUrl = _ref3$apiBaseUrl === void 0 ? _common.DEFAULT_API_BASE_URL : _ref3$apiBaseUrl, cartoMapId = _ref3.cartoMapId, _ref3$clientId = _ref3.clientId, clientId = _ref3$clientId === void 0 ? _common.DEFAULT_CLIENT : _ref3$clientId, _ref3$headers = _ref3.headers, headers = _ref3$headers === void 0 ? {} : _ref3$headers, autoRefresh = _ref3.autoRefresh, onNewData = _ref3.onNewData;
             (0, _utils.assert)(cartoMapId, 'Must define CARTO map id: fetchMap({cartoMapId: "XXXX-XXXX-XXXX"})');
             (0, _utils.assert)(apiBaseUrl, 'Must define apiBaseUrl');
 
@@ -454,7 +449,10 @@ function _fetchMap() {
               (0, _utils.assert)(typeof autoRefresh === 'number' && autoRefresh > 0, '`autoRefresh` must be a positive number');
             }
 
-            baseUrl = "".concat(mapsUrl || (0, _endpoints.buildMapsUrlFromBase)(apiBaseUrl), "/public/").concat(cartoMapId);
+            baseUrl = (0, _endpoints.buildPublicMapUrl)({
+              apiBaseUrl: apiBaseUrl,
+              cartoMapId: cartoMapId
+            });
             errorContext = {
               requestType: 'Public map',
               mapId: cartoMapId