@carto/api-client 0.4.0-alpha.1 → 0.4.0-alpha.4

package/build/api-client.modern.js

@@ -6,9 +6,9 @@ import { featureCollection, feature, polygon, multiPolygon } from '@turf/helpers
 
 /**
  * @internal
- * @internalRemarks Source: @carto/react-core
+ * @internalRemarks Source: @carto/react-core, @carto/constants, @deck.gl/carto
  */
-let client = 'carto-api-client';
+let client = 'deck-gl-carto';
 /**
  * Returns current client ID, used to categorize API requests. For internal use only.
  *
@@ -59,24 +59,6 @@ var ApiVersion;
   ApiVersion["V2"] = "v2";
   ApiVersion["V3"] = "v3";
 })(ApiVersion || (ApiVersion = {}));
-/******************************************************************************
- * DEFAULTS
- */
-/** @internalRemarks Source: @carto/constants, @deck.gl/carto */
-const DEFAULT_API_BASE_URL = 'https://gcp-us-east1.api.carto.com';
-/** @internalRemarks Source: @carto/constants, @deck.gl/carto */
-const DEFAULT_CLIENT = 'deck-gl-carto';
-/** @internalRemarks Source: @carto/constants, @deck.gl/carto */
-const DEFAULT_GEO_COLUMN = 'geom';
-/**
- * Fastly default limit is 8192; leave some padding.
- * @internalRemarks Source: @deck.gl/carto
- */
-const DEFAULT_MAX_LENGTH_URL = 7000;
-/** @internalRemarks Source: @deck.gl/carto */
-const DEFAULT_TILE_SIZE = 512;
-/** @internalRemarks Source: @deck.gl/carto */
-const DEFAULT_TILE_RESOLUTION = 0.5;
 
 const FILTER_TYPES = new Set(Object.values(FilterType));
 const isFilterType = type => FILTER_TYPES.has(type);
@@ -383,6 +365,30 @@ function _objectWithoutPropertiesLoose(r, e) {
   return t;
 }
 
+/** @internalRemarks Source: @carto/constants, @deck.gl/carto */
+const DEFAULT_API_BASE_URL = 'https://gcp-us-east1.api.carto.com';
+/** @internal */
+const V3_MINOR_VERSION = '3.4';
+/** @internalRemarks Source: @carto/constants, @deck.gl/carto */
+const DEFAULT_GEO_COLUMN = 'geom';
+/**
+ * Fastly default limit is 8192; leave some padding.
+ * @internalRemarks Source: @deck.gl/carto
+ */
+const DEFAULT_MAX_LENGTH_URL = 7000;
+/** @internalRemarks Source: @deck.gl/carto */
+const DEFAULT_TILE_RESOLUTION = 0.5;
+/**
+ * @internalRemarks Source: @deck.gl/carto
+ * @internal
+ */
+const DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
+/**
+ * @internalRemarks Source: @deck.gl/carto
+ * @internal
+ */
+const DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;
+
 /**
  * Return more descriptive error from API
  * @internalRemarks Source: @carto/react-api
@@ -395,7 +401,7 @@ function dealWithApiError({
   if (data.error === 'Column not found') {
     throw new InvalidColumnError(`${data.error} ${data.column_name}`);
   }
-  if ((_data$error = data.error) != null && _data$error.includes('Missing columns')) {
+  if (typeof data.error === 'string' && (_data$error = data.error) != null && _data$error.includes('Missing columns')) {
     throw new InvalidColumnError(data.error);
   }
   switch (response.status) {
@@ -911,50 +917,6 @@ class WidgetTableSource extends WidgetBaseSource {
   }
 }
 
-// deck.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-function joinPath(...args) {
-  return args.map(part => part.endsWith('/') ? part.slice(0, -1) : part).join('/');
-}
-function buildV3Path(apiBaseUrl, version, endpoint, ...rest) {
-  return joinPath(apiBaseUrl, version, endpoint, ...rest);
-}
-/** @internal Required by fetchMap(). */
-function buildPublicMapUrl({
-  apiBaseUrl,
-  cartoMapId
-}) {
-  return buildV3Path(apiBaseUrl, 'v3', 'maps', 'public', cartoMapId);
-}
-/** @internal Required by fetchMap(). */
-function buildStatsUrl({
-  attribute,
-  apiBaseUrl,
-  connectionName,
-  source,
-  type
-}) {
-  if (type === 'query') {
-    return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, attribute);
-  }
-  // type === 'table'
-  return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, source, attribute);
-}
-function buildSourceUrl({
-  apiBaseUrl,
-  connectionName,
-  endpoint
-}) {
-  return buildV3Path(apiBaseUrl, 'v3', 'maps', connectionName, endpoint);
-}
-function buildQueryUrl({
-  apiBaseUrl,
-  connectionName
-}) {
-  return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');
-}
-
 // deck.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
@@ -1011,21 +973,49 @@ function formatErrorKey(key) {
   return key.replace(/([A-Z])/g, ' $1').replace(/^./, s => s.toUpperCase());
 }
 
-/******************************************************************************
- * VERSIONS
- */
-/** @internal */
-const V3_MINOR_VERSION = '3.4';
-/**
- * @internalRemarks Source: @deck.gl/carto
- * @internal
- */
-const DEFAULT_AGGREGATION_RES_LEVEL_H3 = 4;
-/**
- * @internalRemarks Source: @deck.gl/carto
- * @internal
- */
-const DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN = 6;
+// deck.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
+function joinPath(...args) {
+  return args.map(part => part.endsWith('/') ? part.slice(0, -1) : part).join('/');
+}
+function buildV3Path(apiBaseUrl, version, endpoint, ...rest) {
+  return joinPath(apiBaseUrl, version, endpoint, ...rest);
+}
+/** @internal Required by fetchMap(). */
+function buildPublicMapUrl({
+  apiBaseUrl,
+  cartoMapId
+}) {
+  return buildV3Path(apiBaseUrl, 'v3', 'maps', 'public', cartoMapId);
+}
+/** @internal Required by fetchMap(). */
+function buildStatsUrl({
+  attribute,
+  apiBaseUrl,
+  connectionName,
+  source,
+  type
+}) {
+  if (type === 'query') {
+    return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, attribute);
+  }
+  // type === 'table'
+  return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, source, attribute);
+}
+function buildSourceUrl({
+  apiBaseUrl,
+  connectionName,
+  endpoint
+}) {
+  return buildV3Path(apiBaseUrl, 'v3', 'maps', connectionName, endpoint);
+}
+function buildQueryUrl({
+  apiBaseUrl,
+  connectionName
+}) {
+  return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');
+}
 
 const DEFAULT_HEADERS = {
   Accept: 'application/json',
@@ -1044,7 +1034,7 @@ async function requestWithParameters({
   // user-provided parameters.
   parameters = _extends({
     v: V3_MINOR_VERSION,
-    clientId: DEFAULT_CLIENT
+    client: getClient()
   }, typeof deck !== 'undefined' && deck.VERSION && {
     deckglVersion: deck.VERSION
   }, parameters);
@@ -1122,7 +1112,7 @@ function excludeURLParameters(baseUrlString, parameters) {
 const _excluded = ["accessToken", "connectionName", "cache"];
 const SOURCE_DEFAULTS = {
   apiBaseUrl: DEFAULT_API_BASE_URL,
-  clientId: DEFAULT_CLIENT,
+  clientId: getClient(),
   format: 'tilejson',
   headers: {},
   maxLengthURL: DEFAULT_MAX_LENGTH_URL
@@ -1240,8 +1230,7 @@ const boundaryTableSource = async function boundaryTableSource(options) {
   return baseSource('boundary', options, urlParameters);
 };
 
-// deck.gl
-const h3QuerySource$1 = async function h3QuerySource(options) {
+const h3QuerySource = async function h3QuerySource(options) {
   const {
     aggregationExp,
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
@@ -1265,11 +1254,12 @@ const h3QuerySource$1 = async function h3QuerySource(options) {
   if (filters) {
     urlParameters.filters = filters;
   }
-  return baseSource('query', options, urlParameters);
+  return baseSource('query', options, urlParameters).then(result => _extends({}, result, {
+    widgetSource: new WidgetQuerySource(options)
+  }));
 };
 
-// deck.gl
-const h3TableSource$1 = async function h3TableSource(options) {
+const h3TableSource = async function h3TableSource(options) {
   const {
     aggregationExp,
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_H3,
@@ -1289,7 +1279,9 @@ const h3TableSource$1 = async function h3TableSource(options) {
   if (filters) {
     urlParameters.filters = filters;
   }
-  return baseSource('table', options, urlParameters);
+  return baseSource('table', options, urlParameters).then(result => _extends({}, result, {
+    widgetSource: new WidgetTableSource(options)
+  }));
 };
 
 // deck.gl
@@ -1318,8 +1310,7 @@ const rasterSource = async function rasterSource(options) {
   return baseSource('raster', options, urlParameters);
 };
 
-// deck.gl
-const quadbinQuerySource$1 = async function quadbinQuerySource(options) {
+const quadbinQuerySource = async function quadbinQuerySource(options) {
   const {
     aggregationExp,
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
@@ -1343,11 +1334,12 @@ const quadbinQuerySource$1 = async function quadbinQuerySource(options) {
   if (filters) {
     urlParameters.filters = filters;
   }
-  return baseSource('query', options, urlParameters);
+  return baseSource('query', options, urlParameters).then(result => _extends({}, result, {
+    widgetSource: new WidgetQuerySource(options)
+  }));
 };
 
-// deck.gl
-const quadbinTableSource$1 = async function quadbinTableSource(options) {
+const quadbinTableSource = async function quadbinTableSource(options) {
   const {
     aggregationExp,
     aggregationResLevel = DEFAULT_AGGREGATION_RES_LEVEL_QUADBIN,
@@ -1367,7 +1359,9 @@ const quadbinTableSource$1 = async function quadbinTableSource(options) {
   if (filters) {
     urlParameters.filters = filters;
   }
-  return baseSource('table', options, urlParameters);
+  return baseSource('table', options, urlParameters).then(result => _extends({}, result, {
+    widgetSource: new WidgetTableSource(options)
+  }));
 };
 
 // deck.gl
@@ -1381,8 +1375,7 @@ const quadbinTilesetSource = async function quadbinTilesetSource(options) {
   return baseSource('tileset', options, urlParameters);
 };
 
-// deck.gl
-const vectorQuerySource$1 = async function vectorQuerySource(options) {
+const vectorQuerySource = async function vectorQuerySource(options) {
   const {
     columns,
     filters,
@@ -1406,11 +1399,12 @@ const vectorQuerySource$1 = async function vectorQuerySource(options) {
   if (queryParameters) {
     urlParameters.queryParameters = queryParameters;
   }
-  return baseSource('query', options, urlParameters);
+  return baseSource('query', options, urlParameters).then(result => _extends({}, result, {
+    widgetSource: new WidgetQuerySource(options)
+  }));
 };
 
-// deck.gl
-const vectorTableSource$1 = async function vectorTableSource(options) {
+const vectorTableSource = async function vectorTableSource(options) {
   const {
     columns,
     filters,
@@ -1430,7 +1424,9 @@ const vectorTableSource$1 = async function vectorTableSource(options) {
   if (filters) {
     urlParameters.filters = filters;
   }
-  return baseSource('table', options, urlParameters);
+  return baseSource('table', options, urlParameters).then(result => _extends({}, result, {
+    widgetSource: new WidgetTableSource(options)
+  }));
 };
 
 // deck.gl
@@ -1444,49 +1440,6 @@ const vectorTilesetSource = async function vectorTilesetSource(options) {
   return baseSource('tileset', options, urlParameters);
 };
 
-/** Wrapper adding Widget API support to [vectorTableSource](https://deck.gl/docs/api-reference/carto/data-sources). */
-async function vectorTableSource(props) {
-  const response = await vectorTableSource$1(props);
-  return _extends({}, response, {
-    widgetSource: new WidgetTableSource(props)
-  });
-}
-/** Wrapper adding Widget API support to [vectorQuerySource](https://deck.gl/docs/api-reference/carto/data-sources). */
-async function vectorQuerySource(props) {
-  const response = await vectorQuerySource$1(props);
-  return _extends({}, response, {
-    widgetSource: new WidgetQuerySource(props)
-  });
-}
-/** Wrapper adding Widget API support to [h3TableSource](https://deck.gl/docs/api-reference/carto/data-sources). */
-async function h3TableSource(props) {
-  const response = await h3TableSource$1(props);
-  return _extends({}, response, {
-    widgetSource: new WidgetTableSource(props)
-  });
-}
-/** Wrapper adding Widget API support to [h3QuerySource](https://deck.gl/docs/api-reference/carto/data-sources). */
-async function h3QuerySource(props) {
-  const response = await h3QuerySource$1(props);
-  return _extends({}, response, {
-    widgetSource: new WidgetQuerySource(props)
-  });
-}
-/** Wrapper adding Widget API support to [quadbinTableSource](https://deck.gl/docs/api-reference/carto/data-sources). */
-async function quadbinTableSource(props) {
-  const response = await quadbinTableSource$1(props);
-  return _extends({}, response, {
-    widgetSource: new WidgetTableSource(props)
-  });
-}
-/** Wrapper adding Widget API support to [quadbinQuerySource](https://deck.gl/docs/api-reference/carto/data-sources). */
-async function quadbinQuerySource(props) {
-  const response = await quadbinQuerySource$1(props);
-  return _extends({}, response, {
-    widgetSource: new WidgetQuerySource(props)
-  });
-}
-
 const query = async function query(options) {
   const {
     apiBaseUrl = SOURCE_DEFAULTS.apiBaseUrl,
@@ -1527,5 +1480,5 @@ const query = async function query(options) {
   });
 };
 
-export { ApiVersion, CartoAPIError, DEFAULT_API_BASE_URL, DEFAULT_CLIENT, DEFAULT_GEO_COLUMN, DEFAULT_MAX_LENGTH_URL, DEFAULT_TILE_RESOLUTION, DEFAULT_TILE_SIZE, FilterType, SOURCE_DEFAULTS, WidgetBaseSource, WidgetQuerySource, WidgetTableSource, addFilter, boundaryQuerySource, boundaryTableSource, buildPublicMapUrl, buildStatsUrl, clearFilters, createPolygonSpatialFilter, createViewportSpatialFilter, getClient, getFilter, h3QuerySource, h3TableSource, h3TilesetSource, hasFilter, quadbinQuerySource, quadbinTableSource, quadbinTilesetSource, query, rasterSource, removeFilter, requestWithParameters, setClient, vectorQuerySource, vectorTableSource, vectorTilesetSource };
+export { ApiVersion, CartoAPIError, FilterType, SOURCE_DEFAULTS, WidgetBaseSource, WidgetQuerySource, WidgetTableSource, addFilter, boundaryQuerySource, boundaryTableSource, buildPublicMapUrl, buildStatsUrl, clearFilters, createPolygonSpatialFilter, createViewportSpatialFilter, getClient, getFilter, h3QuerySource, h3TableSource, h3TilesetSource, hasFilter, quadbinQuerySource, quadbinTableSource, quadbinTilesetSource, query, rasterSource, removeFilter, requestWithParameters, setClient, vectorQuerySource, vectorTableSource, vectorTilesetSource };
 //# sourceMappingURL=api-client.modern.js.map