@deck.gl/carto 8.6.0 → 8.6.4

package/dist/dist.dev.js

@@ -10256,7 +10256,7 @@ module.exports = Object.assign(deck, {carto: CartoUtils});
 /*!**************************!*\
   !*** ./src/api/index.js ***!
   \**************************/
-/*! exports provided: FORMATS, MAP_TYPES, API_VERSIONS, getDataV2, CONNECTIONS, getData, mapInstantiation */
+/*! exports provided: FORMATS, MAP_TYPES, API_VERSIONS, getDataV2, CONNECTIONS, fetchLayerData, getData, mapInstantiation */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10274,6 +10274,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "CONNECTIONS", function() { return _maps_client__WEBPACK_IMPORTED_MODULE_1__["CONNECTIONS"]; });
 
 /* harmony import */ var _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./maps-v3-client */ "./src/api/maps-v3-client.js");
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fetchLayerData", function() { return _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__["fetchLayerData"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getData", function() { return _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__["getData"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "mapInstantiation", function() { return _maps_v3_client__WEBPACK_IMPORTED_MODULE_2__["mapInstantiation"]; });
@@ -10289,7 +10291,7 @@ __webpack_require__.r(__webpack_exports__);
 /*!************************************!*\
   !*** ./src/api/maps-api-common.js ***!
   \************************************/
-/*! exports provided: DEFAULT_USER_COMPONENT_IN_URL, DEFAULT_REGION_COMPONENT_IN_URL, API_VERSIONS, MAP_TYPES, FORMATS, encodeParameter */
+/*! exports provided: DEFAULT_USER_COMPONENT_IN_URL, DEFAULT_REGION_COMPONENT_IN_URL, API_VERSIONS, DEFAULT_MAPS_URL_FORMAT, MAP_TYPES, FORMATS, encodeParameter */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10297,6 +10299,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DEFAULT_USER_COMPONENT_IN_URL", function() { return DEFAULT_USER_COMPONENT_IN_URL; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DEFAULT_REGION_COMPONENT_IN_URL", function() { return DEFAULT_REGION_COMPONENT_IN_URL; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "API_VERSIONS", function() { return API_VERSIONS; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "DEFAULT_MAPS_URL_FORMAT", function() { return DEFAULT_MAPS_URL_FORMAT; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "MAP_TYPES", function() { return MAP_TYPES; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "FORMATS", function() { return FORMATS; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "encodeParameter", function() { return encodeParameter; });
@@ -10309,6 +10312,11 @@ const API_VERSIONS = {
   V3: 'v3'
 };
 
+const DEFAULT_MAPS_URL_FORMAT = {
+  [API_VERSIONS.V1]: `https://${DEFAULT_USER_COMPONENT_IN_URL}.carto.com/api/v1/map`,
+  [API_VERSIONS.V2]: `https://maps-api-v2.${DEFAULT_REGION_COMPONENT_IN_URL}.carto.com/user/${DEFAULT_USER_COMPONENT_IN_URL}`
+};
+
 const MAP_TYPES = {
   QUERY: 'query',
   TABLE: 'table',
@@ -10364,8 +10372,20 @@ const TILE_EXTENT = 4096;
  * Obtain a TileJson from Maps API v1 and v2
  */
 async function getDataV2({type, source, credentials}) {
-  const localCreds = {...Object(_config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"])(), ...credentials};
-  const {apiVersion} = localCreds;
+  const defaultCredentials = Object(_config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"])();
+  const apiVersion = (credentials && credentials.apiVersion) || defaultCredentials.apiVersion;
+  // Only pick up default credentials if they have been defined for
+  // correct API version
+  const localCreds = {
+    ..._config__WEBPACK_IMPORTED_MODULE_0__["defaultClassicCredentials"],
+    ...(defaultCredentials.apiVersion === apiVersion && defaultCredentials),
+    ...credentials
+  };
+
+  if (!localCreds.mapsUrl) {
+    localCreds.mapsUrl = _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["DEFAULT_MAPS_URL_FORMAT"][apiVersion];
+  }
+
   let url;
 
   const connection = type === 'tileset' ? CONNECTIONS.BIGQUERY : CONNECTIONS.CARTO;
@@ -10500,12 +10520,13 @@ function createMapConfig(sql) {
 /*!***********************************!*\
   !*** ./src/api/maps-v3-client.js ***!
   \***********************************/
-/*! exports provided: mapInstantiation, getData */
+/*! exports provided: mapInstantiation, fetchLayerData, getData */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "mapInstantiation", function() { return mapInstantiation; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "fetchLayerData", function() { return fetchLayerData; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getData", function() { return getData; });
 /* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../config */ "./src/config.js");
 /* harmony import */ var _maps_api_common__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./maps-api-common */ "./src/api/maps-api-common.js");
@@ -10581,9 +10602,11 @@ function dealWithError({response, error}) {
 /**
  * Build a URL with all required parameters
  */
-function getParameters({type, source, geoColumn, columns}) {
-  const encodedClient = Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('client', 'deck-gl-carto');
-  const parameters = [encodedClient];
+function getParameters({type, source, geoColumn, columns, schema}) {
+  const parameters = [Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('client', 'deck-gl-carto')];
+  if (schema) {
+    parameters.push(Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])('schema', true));
+  }
 
   const sourceName = type === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["MAP_TYPES"].QUERY ? 'q' : 'name';
   parameters.push(Object(_maps_api_common__WEBPACK_IMPORTED_MODULE_1__["encodeParameter"])(sourceName, source));
@@ -10606,10 +10629,11 @@ async function mapInstantiation({
   connection,
   credentials,
   geoColumn,
-  columns
+  columns,
+  schema
 }) {
   const baseUrl = `${credentials.mapsUrl}/${connection}/${type}`;
-  const url = `${baseUrl}?${getParameters({type, source, geoColumn, columns})}`;
+  const url = `${baseUrl}?${getParameters({type, source, geoColumn, columns, schema})}`;
   const {accessToken} = credentials;
 
   const format = 'json';
@@ -10636,9 +10660,7 @@ function getUrlFromMetadata(metadata, format) {
   return null;
 }
 
-async function getData({type, source, connection, credentials, geoColumn, columns, format}) {
-  const localCreds = {...Object(_config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"])(), ...credentials};
-
+function checkGetLayerDataParameters({type, source, connection, localCreds}) {
   _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(connection, 'Must define connection');
   _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(type, 'Must define a type');
   _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(source, 'Must define a source');
@@ -10646,7 +10668,26 @@ async function getData({type, source, connection, credentials, geoColumn, column
   _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(localCreds.apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3, 'Method only available for v3');
   _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(localCreds.apiBaseUrl, 'Must define apiBaseUrl');
   _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(localCreds.accessToken, 'Must define an accessToken');
-  _deck_gl_core__WEBPACK_IMPORTED_MODULE_2__["log"].assert(localCreds.mapsUrl, 'mapsUrl cannot be undefined');
+}
+
+async function fetchLayerData({
+  type,
+  source,
+  connection,
+  credentials,
+  geoColumn,
+  columns,
+  format,
+  schema
+}) {
+  const defaultCredentials = Object(_config__WEBPACK_IMPORTED_MODULE_0__["getDefaultCredentials"])();
+  // Only pick up default credentials if they have been defined for
+  // correct API version
+  const localCreds = {
+    ...(defaultCredentials.apiVersion === _maps_api_common__WEBPACK_IMPORTED_MODULE_1__["API_VERSIONS"].V3 && defaultCredentials),
+    ...credentials
+  };
+  checkGetLayerDataParameters({type, source, connection, localCreds});
 
   if (!localCreds.mapsUrl) {
     localCreds.mapsUrl = Object(_config__WEBPACK_IMPORTED_MODULE_0__["buildMapsUrlFromBase"])(localCreds.apiBaseUrl);
@@ -10658,7 +10699,8 @@ async function getData({type, source, connection, credentials, geoColumn, column
     connection,
     credentials: localCreds,
     geoColumn,
-    columns
+    columns,
+    schema
   });
   let url;
   let mapFormat;
@@ -10681,7 +10723,27 @@ async function getData({type, source, connection, credentials, geoColumn, column
 
   const {accessToken} = localCreds;
 
-  return await request({url, format: mapFormat, accessToken});
+  const data = await request({url, format: mapFormat, accessToken});
+  const result = {data, format: mapFormat};
+  if (schema) {
+    result.schema = metadata.schema;
+  }
+
+  return result;
+}
+
+async function getData({type, source, connection, credentials, geoColumn, columns, format}) {
+  const layerData = await fetchLayerData({
+    type,
+    source,
+    connection,
+    credentials,
+    geoColumn,
+    columns,
+    format,
+    schema: false
+  });
+  return layerData.data;
 }
 
 
@@ -10714,11 +10776,12 @@ const base_url = 'https://basemaps.cartocdn.com/gl/{basemap}-gl-style/style.json
 /*!***********************!*\
   !*** ./src/config.js ***!
   \***********************/
-/*! exports provided: setDefaultCredentials, getDefaultCredentials, buildMapsUrlFromBase */
+/*! exports provided: defaultClassicCredentials, setDefaultCredentials, getDefaultCredentials, buildMapsUrlFromBase */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 __webpack_require__.r(__webpack_exports__);
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "defaultClassicCredentials", function() { return defaultClassicCredentials; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "setDefaultCredentials", function() { return setDefaultCredentials; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "getDefaultCredentials", function() { return getDefaultCredentials; });
 /* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "buildMapsUrlFromBase", function() { return buildMapsUrlFromBase; });
@@ -10747,7 +10810,7 @@ function setDefaultCredentials(opts) {
 
   switch (apiVersion) {
     case _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"].V1:
-      opts.mapsUrl = opts.mapsUrl || 'https://{user}.carto.com/api/v1/map';
+      opts.mapsUrl = opts.mapsUrl || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["DEFAULT_MAPS_URL_FORMAT"][apiVersion];
       credentials = {
         apiVersion,
         ...defaultClassicCredentials,
@@ -10756,7 +10819,7 @@ function setDefaultCredentials(opts) {
       break;
 
     case _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["API_VERSIONS"].V2:
-      opts.mapsUrl = opts.mapsUrl || 'https://maps-api-v2.{region}.carto.com/user/{user}';
+      opts.mapsUrl = opts.mapsUrl || _api_maps_api_common__WEBPACK_IMPORTED_MODULE_0__["DEFAULT_MAPS_URL_FORMAT"][apiVersion];
       credentials = {
         apiVersion,
         ...defaultClassicCredentials,
@@ -10806,7 +10869,7 @@ function buildMapsUrlFromBase(apiBaseUrl) {
 /*!**********************!*\
   !*** ./src/index.js ***!
   \**********************/
-/*! exports provided: getDefaultCredentials, setDefaultCredentials, CartoSQLLayer, CartoBQTilerLayer, CartoLayer, BASEMAP, colorBins, colorCategories, colorContinuous, FORMATS, MAP_TYPES, API_VERSIONS, _getDataV2, getData, _mapInstantiation */
+/*! exports provided: getDefaultCredentials, setDefaultCredentials, CartoSQLLayer, CartoBQTilerLayer, CartoLayer, BASEMAP, colorBins, colorCategories, colorContinuous, FORMATS, MAP_TYPES, API_VERSIONS, fetchLayerData, _getDataV2, getData, _mapInstantiation */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -10844,6 +10907,8 @@ __webpack_require__.r(__webpack_exports__);
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "API_VERSIONS", function() { return _api__WEBPACK_IMPORTED_MODULE_8__["API_VERSIONS"]; });
 
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "fetchLayerData", function() { return _api__WEBPACK_IMPORTED_MODULE_8__["fetchLayerData"]; });
+
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "_getDataV2", function() { return _api__WEBPACK_IMPORTED_MODULE_8__["getDataV2"]; });
 
 /* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "getData", function() { return _api__WEBPACK_IMPORTED_MODULE_8__["getData"]; });

package/dist/es5/api/index.js

@@ -5,43 +5,49 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "FORMATS", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsApiCommon.FORMATS;
   }
 });
 Object.defineProperty(exports, "MAP_TYPES", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsApiCommon.MAP_TYPES;
   }
 });
 Object.defineProperty(exports, "API_VERSIONS", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsApiCommon.API_VERSIONS;
   }
 });
 Object.defineProperty(exports, "getDataV2", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsClient.getDataV2;
   }
 });
 Object.defineProperty(exports, "CONNECTIONS", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsClient.CONNECTIONS;
   }
 });
+Object.defineProperty(exports, "fetchLayerData", {
+  enumerable: true,
+  get: function () {
+    return _mapsV3Client.fetchLayerData;
+  }
+});
 Object.defineProperty(exports, "getData", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsV3Client.getData;
   }
 });
 Object.defineProperty(exports, "mapInstantiation", {
   enumerable: true,
-  get: function get() {
+  get: function () {
     return _mapsV3Client.mapInstantiation;
   }
 });

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA","sourcesContent":["export {FORMATS, MAP_TYPES, API_VERSIONS} from './maps-api-common';\nexport {getDataV2, CONNECTIONS} from './maps-client';\nexport {getData, mapInstantiation} from './maps-v3-client';\n"],"file":"index.js"}
+{"version":3,"sources":["../../../src/api/index.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;AACA;;AACA","sourcesContent":["export {FORMATS, MAP_TYPES, API_VERSIONS} from './maps-api-common';\nexport {getDataV2, CONNECTIONS} from './maps-client';\nexport {fetchLayerData, getData, mapInstantiation} from './maps-v3-client';\n"],"file":"index.js"}

package/dist/es5/api/maps-api-common.js

@@ -4,24 +4,29 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.encodeParameter = encodeParameter;
-exports.FORMATS = exports.MAP_TYPES = exports.API_VERSIONS = exports.DEFAULT_REGION_COMPONENT_IN_URL = exports.DEFAULT_USER_COMPONENT_IN_URL = void 0;
-var DEFAULT_USER_COMPONENT_IN_URL = '{user}';
+exports.FORMATS = exports.MAP_TYPES = exports.DEFAULT_MAPS_URL_FORMAT = exports.API_VERSIONS = exports.DEFAULT_REGION_COMPONENT_IN_URL = exports.DEFAULT_USER_COMPONENT_IN_URL = void 0;
+const DEFAULT_USER_COMPONENT_IN_URL = '{user}';
 exports.DEFAULT_USER_COMPONENT_IN_URL = DEFAULT_USER_COMPONENT_IN_URL;
-var DEFAULT_REGION_COMPONENT_IN_URL = '{region}';
+const DEFAULT_REGION_COMPONENT_IN_URL = '{region}';
 exports.DEFAULT_REGION_COMPONENT_IN_URL = DEFAULT_REGION_COMPONENT_IN_URL;
-var API_VERSIONS = {
+const API_VERSIONS = {
   V1: 'v1',
   V2: 'v2',
   V3: 'v3'
 };
 exports.API_VERSIONS = API_VERSIONS;
-var MAP_TYPES = {
+const DEFAULT_MAPS_URL_FORMAT = {
+  [API_VERSIONS.V1]: "https://".concat(DEFAULT_USER_COMPONENT_IN_URL, ".carto.com/api/v1/map"),
+  [API_VERSIONS.V2]: "https://maps-api-v2.".concat(DEFAULT_REGION_COMPONENT_IN_URL, ".carto.com/user/").concat(DEFAULT_USER_COMPONENT_IN_URL)
+};
+exports.DEFAULT_MAPS_URL_FORMAT = DEFAULT_MAPS_URL_FORMAT;
+const MAP_TYPES = {
   QUERY: 'query',
   TABLE: 'table',
   TILESET: 'tileset'
 };
 exports.MAP_TYPES = MAP_TYPES;
-var FORMATS = {
+const FORMATS = {
   GEOJSON: 'geojson',
   NDJSON: 'ndjson',
   TILEJSON: 'tilejson',

package/dist/es5/api/maps-api-common.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/api/maps-api-common.js"],"names":["DEFAULT_USER_COMPONENT_IN_URL","DEFAULT_REGION_COMPONENT_IN_URL","API_VERSIONS","V1","V2","V3","MAP_TYPES","QUERY","TABLE","TILESET","FORMATS","GEOJSON","NDJSON","TILEJSON","JSON","encodeParameter","name","value","encodeURIComponent"],"mappings":";;;;;;;AAAO,IAAMA,6BAA6B,GAAG,QAAtC;;AACA,IAAMC,+BAA+B,GAAG,UAAxC;;AAEA,IAAMC,YAAY,GAAG;AAC1BC,EAAAA,EAAE,EAAE,IADsB;AAE1BC,EAAAA,EAAE,EAAE,IAFsB;AAG1BC,EAAAA,EAAE,EAAE;AAHsB,CAArB;;AAMA,IAAMC,SAAS,GAAG;AACvBC,EAAAA,KAAK,EAAE,OADgB;AAEvBC,EAAAA,KAAK,EAAE,OAFgB;AAGvBC,EAAAA,OAAO,EAAE;AAHc,CAAlB;;AAOA,IAAMC,OAAO,GAAG;AACrBC,EAAAA,OAAO,EAAE,SADY;AAErBC,EAAAA,MAAM,EAAE,QAFa;AAGrBC,EAAAA,QAAQ,EAAE,UAHW;AAIrBC,EAAAA,IAAI,EAAE;AAJe,CAAhB;;;AAUA,SAASC,eAAT,CAAyBC,IAAzB,EAA+BC,KAA/B,EAAsC;AAC3C,mBAAUD,IAAV,cAAkBE,kBAAkB,CAACD,KAAD,CAApC;AACD","sourcesContent":["export const DEFAULT_USER_COMPONENT_IN_URL = '{user}';\nexport const DEFAULT_REGION_COMPONENT_IN_URL = '{region}';\n\nexport const API_VERSIONS = {\n  V1: 'v1',\n  V2: 'v2',\n  V3: 'v3'\n};\n\nexport const MAP_TYPES = {\n  QUERY: 'query',\n  TABLE: 'table',\n  TILESET: 'tileset'\n};\n\n// AVAILABLE FORMATS\nexport const FORMATS = {\n  GEOJSON: 'geojson',\n  NDJSON: 'ndjson',\n  TILEJSON: 'tilejson',\n  JSON: 'json'\n};\n\n/**\n * Simple encode parameter\n */\nexport function encodeParameter(name, value) {\n  return `${name}=${encodeURIComponent(value)}`;\n}\n"],"file":"maps-api-common.js"}
+{"version":3,"sources":["../../../src/api/maps-api-common.js"],"names":["DEFAULT_USER_COMPONENT_IN_URL","DEFAULT_REGION_COMPONENT_IN_URL","API_VERSIONS","V1","V2","V3","DEFAULT_MAPS_URL_FORMAT","MAP_TYPES","QUERY","TABLE","TILESET","FORMATS","GEOJSON","NDJSON","TILEJSON","JSON","encodeParameter","name","value","encodeURIComponent"],"mappings":";;;;;;;AAAO,MAAMA,6BAA6B,GAAG,QAAtC;;AACA,MAAMC,+BAA+B,GAAG,UAAxC;;AAEA,MAAMC,YAAY,GAAG;AAC1BC,EAAAA,EAAE,EAAE,IADsB;AAE1BC,EAAAA,EAAE,EAAE,IAFsB;AAG1BC,EAAAA,EAAE,EAAE;AAHsB,CAArB;;AAMA,MAAMC,uBAAuB,GAAG;AACrC,GAACJ,YAAY,CAACC,EAAd,qBAA8BH,6BAA9B,0BADqC;AAErC,GAACE,YAAY,CAACE,EAAd,iCAA0CH,+BAA1C,6BAA4FD,6BAA5F;AAFqC,CAAhC;;AAKA,MAAMO,SAAS,GAAG;AACvBC,EAAAA,KAAK,EAAE,OADgB;AAEvBC,EAAAA,KAAK,EAAE,OAFgB;AAGvBC,EAAAA,OAAO,EAAE;AAHc,CAAlB;;AAOA,MAAMC,OAAO,GAAG;AACrBC,EAAAA,OAAO,EAAE,SADY;AAErBC,EAAAA,MAAM,EAAE,QAFa;AAGrBC,EAAAA,QAAQ,EAAE,UAHW;AAIrBC,EAAAA,IAAI,EAAE;AAJe,CAAhB;;;AAUA,SAASC,eAAT,CAAyBC,IAAzB,EAA+BC,KAA/B,EAAsC;AAC3C,mBAAUD,IAAV,cAAkBE,kBAAkB,CAACD,KAAD,CAApC;AACD","sourcesContent":["export const DEFAULT_USER_COMPONENT_IN_URL = '{user}';\nexport const DEFAULT_REGION_COMPONENT_IN_URL = '{region}';\n\nexport const API_VERSIONS = {\n  V1: 'v1',\n  V2: 'v2',\n  V3: 'v3'\n};\n\nexport const DEFAULT_MAPS_URL_FORMAT = {\n  [API_VERSIONS.V1]: `https://${DEFAULT_USER_COMPONENT_IN_URL}.carto.com/api/v1/map`,\n  [API_VERSIONS.V2]: `https://maps-api-v2.${DEFAULT_REGION_COMPONENT_IN_URL}.carto.com/user/${DEFAULT_USER_COMPONENT_IN_URL}`\n};\n\nexport const MAP_TYPES = {\n  QUERY: 'query',\n  TABLE: 'table',\n  TILESET: 'tileset'\n};\n\n// AVAILABLE FORMATS\nexport const FORMATS = {\n  GEOJSON: 'geojson',\n  NDJSON: 'ndjson',\n  TILEJSON: 'tilejson',\n  JSON: 'json'\n};\n\n/**\n * Simple encode parameter\n */\nexport function encodeParameter(name, value) {\n  return `${name}=${encodeURIComponent(value)}`;\n}\n"],"file":"maps-api-common.js"}

package/dist/es5/api/maps-client.js

@@ -1,161 +1,106 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getDataV2 = getDataV2;
 exports.CONNECTIONS = void 0;
 
-var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-
 var _config = require("../config");
 
 var _mapsApiCommon = require("./maps-api-common");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-var CONNECTIONS = {
+const CONNECTIONS = {
   BIGQUERY: 'bigquery',
   CARTO: 'carto'
 };
 exports.CONNECTIONS = CONNECTIONS;
-var BUFFER_SIZE = 16;
-var TILE_EXTENT = 4096;
+const BUFFER_SIZE = 16;
+const TILE_EXTENT = 4096;
+
+async function getDataV2({
+  type,
+  source,
+  credentials
+}) {
+  const defaultCredentials = (0, _config.getDefaultCredentials)();
+  const apiVersion = credentials && credentials.apiVersion || defaultCredentials.apiVersion;
+  const localCreds = { ..._config.defaultClassicCredentials,
+    ...(defaultCredentials.apiVersion === apiVersion && defaultCredentials),
+    ...credentials
+  };
 
-function getDataV2(_x) {
-  return _getDataV.apply(this, arguments);
-}
+  if (!localCreds.mapsUrl) {
+    localCreds.mapsUrl = _mapsApiCommon.DEFAULT_MAPS_URL_FORMAT[apiVersion];
+  }
 
-function _getDataV() {
-  _getDataV = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(_ref) {
-    var type, source, credentials, localCreds, apiVersion, url, connection, mapConfig, layergroup;
-    return _regenerator.default.wrap(function _callee$(_context) {
-      while (1) {
-        switch (_context.prev = _context.next) {
-          case 0:
-            type = _ref.type, source = _ref.source, credentials = _ref.credentials;
-            localCreds = _objectSpread(_objectSpread({}, (0, _config.getDefaultCredentials)()), credentials);
-            apiVersion = localCreds.apiVersion;
-            connection = type === 'tileset' ? CONNECTIONS.BIGQUERY : CONNECTIONS.CARTO;
-            _context.t0 = apiVersion;
-            _context.next = _context.t0 === _mapsApiCommon.API_VERSIONS.V1 ? 7 : _context.t0 === _mapsApiCommon.API_VERSIONS.V2 ? 13 : 17;
-            break;
-
-          case 7:
-            mapConfig = createMapConfig(source);
-            url = buildURLMapsAPIv1({
-              mapConfig: mapConfig,
-              credentials: localCreds
-            });
-            _context.next = 11;
-            return request({
-              url: url,
-              credentials: localCreds
-            });
-
-          case 11:
-            layergroup = _context.sent;
-            return _context.abrupt("return", layergroup.metadata.tilejson.vector);
-
-          case 13:
-            url = buildURLMapsAPIv2({
-              connection: connection,
-              type: type,
-              source: source,
-              credentials: localCreds
-            });
-            _context.next = 16;
-            return request({
-              url: url,
-              credentials: localCreds
-            });
-
-          case 16:
-            return _context.abrupt("return", _context.sent);
-
-          case 17:
-            throw new Error("Invalid maps API version. It shoud be ".concat(_mapsApiCommon.API_VERSIONS.V1, " or ").concat(_mapsApiCommon.API_VERSIONS.V2));
-
-          case 18:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  }));
-  return _getDataV.apply(this, arguments);
-}
+  let url;
+  const connection = type === 'tileset' ? CONNECTIONS.BIGQUERY : CONNECTIONS.CARTO;
+
+  switch (apiVersion) {
+    case _mapsApiCommon.API_VERSIONS.V1:
+      const mapConfig = createMapConfig(source);
+      url = buildURLMapsAPIv1({
+        mapConfig,
+        credentials: localCreds
+      });
+      const layergroup = await request({
+        url,
+        credentials: localCreds
+      });
+      return layergroup.metadata.tilejson.vector;
+
+    case _mapsApiCommon.API_VERSIONS.V2:
+      url = buildURLMapsAPIv2({
+        connection,
+        type,
+        source,
+        credentials: localCreds
+      });
+      return await request({
+        url,
+        credentials: localCreds
+      });
 
-function request(_x2) {
-  return _request.apply(this, arguments);
+    default:
+      throw new Error("Invalid maps API version. It shoud be ".concat(_mapsApiCommon.API_VERSIONS.V1, " or ").concat(_mapsApiCommon.API_VERSIONS.V2));
+  }
 }
 
-function _request() {
-  _request = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref2) {
-    var url, credentials, response, json;
-    return _regenerator.default.wrap(function _callee2$(_context2) {
-      while (1) {
-        switch (_context2.prev = _context2.next) {
-          case 0:
-            url = _ref2.url, credentials = _ref2.credentials;
-            _context2.prev = 1;
-            _context2.next = 4;
-            return fetch(url, {
-              headers: {
-                Accept: 'application/json'
-              }
-            });
-
-          case 4:
-            response = _context2.sent;
-            _context2.next = 10;
-            break;
-
-          case 7:
-            _context2.prev = 7;
-            _context2.t0 = _context2["catch"](1);
-            throw new Error("Failed to connect to Maps API: ".concat(_context2.t0));
-
-          case 10:
-            _context2.next = 12;
-            return response.json();
-
-          case 12:
-            json = _context2.sent;
-
-            if (!response.ok) {
-              dealWithError({
-                response: response,
-                json: json,
-                credentials: credentials
-              });
-            }
-
-            return _context2.abrupt("return", json);
-
-          case 15:
-          case "end":
-            return _context2.stop();
-        }
+async function request({
+  url,
+  credentials
+}) {
+  let response;
+
+  try {
+    response = await fetch(url, {
+      headers: {
+        Accept: 'application/json'
       }
-    }, _callee2, null, [[1, 7]]);
-  }));
-  return _request.apply(this, arguments);
-}
+    });
+  } catch (error) {
+    throw new Error("Failed to connect to Maps API: ".concat(error));
+  }
+
+  const json = await response.json();
 
-function dealWithError(_ref3) {
-  var response = _ref3.response,
-      json = _ref3.json,
-      credentials = _ref3.credentials;
+  if (!response.ok) {
+    dealWithError({
+      response,
+      json,
+      credentials
+    });
+  }
+
+  return json;
+}
 
+function dealWithError({
+  response,
+  json,
+  credentials
+}) {
   switch (response.status) {
     case 401:
       throw new Error("Unauthorized access to Maps API: invalid combination of user ('".concat(credentials.username, "') and apiKey ('").concat(credentials.apiKey, "')"));
@@ -164,33 +109,35 @@ function dealWithError(_ref3) {
       throw new Error("Unauthorized access to dataset: the provided apiKey('".concat(credentials.apiKey, "') doesn't provide access to the requested data"));
 
     default:
-      var e = credentials.apiVersion === _mapsApiCommon.API_VERSIONS.V1 ? JSON.stringify(json.errors) : json.error;
+      const e = credentials.apiVersion === _mapsApiCommon.API_VERSIONS.V1 ? JSON.stringify(json.errors) : json.error;
       throw new Error(e);
   }
 }
 
 function initURLParameters(credentials) {
-  var encodedApiKey = (0, _mapsApiCommon.encodeParameter)('api_key', credentials.apiKey);
-  var encodedClient = (0, _mapsApiCommon.encodeParameter)('client', "deck-gl-carto");
+  const encodedApiKey = (0, _mapsApiCommon.encodeParameter)('api_key', credentials.apiKey);
+  const encodedClient = (0, _mapsApiCommon.encodeParameter)('client', "deck-gl-carto");
   return [encodedApiKey, encodedClient];
 }
 
-function buildURLMapsAPIv1(_ref4) {
-  var mapConfig = _ref4.mapConfig,
-      credentials = _ref4.credentials;
-  var parameters = initURLParameters(credentials);
-  var cfg = JSON.stringify(mapConfig);
+function buildURLMapsAPIv1({
+  mapConfig,
+  credentials
+}) {
+  const parameters = initURLParameters(credentials);
+  const cfg = JSON.stringify(mapConfig);
   return "".concat(mapsUrl(credentials), "?").concat(parameters.join('&'), "&").concat((0, _mapsApiCommon.encodeParameter)('config', cfg));
 }
 
-function buildURLMapsAPIv2(_ref5) {
-  var connection = _ref5.connection,
-      type = _ref5.type,
-      source = _ref5.source,
-      credentials = _ref5.credentials;
-  var parameters = initURLParameters(credentials);
-  var mapsApiType = type === _mapsApiCommon.MAP_TYPES.QUERY ? 'sql' : type;
-  var url = "".concat(mapsUrl(credentials), "/").concat(connection, "/").concat(mapsApiType, "?");
+function buildURLMapsAPIv2({
+  connection,
+  type,
+  source,
+  credentials
+}) {
+  const parameters = initURLParameters(credentials);
+  const mapsApiType = type === _mapsApiCommon.MAP_TYPES.QUERY ? 'sql' : type;
+  let url = "".concat(mapsUrl(credentials), "/").concat(connection, "/").concat(mapsApiType, "?");
   url += "".concat((0, _mapsApiCommon.encodeParameter)('source', source), "&format=tilejson&").concat(parameters.join('&'));
   return url;
 }
@@ -208,7 +155,7 @@ function createMapConfig(sql) {
     layers: [{
       type: 'mapnik',
       options: {
-        sql: sql,
+        sql,
         vector_extent: TILE_EXTENT
       }
     }]