@carto/api-client 0.4.0-alpha.3 → 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) {
@@ -1011,22 +1017,6 @@ function buildQueryUrl({
   return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');
 }
 
-/******************************************************************************
- * 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;
-
 const DEFAULT_HEADERS = {
   Accept: 'application/json',
   'Content-Type': 'application/json'
@@ -1044,7 +1034,7 @@ async function requestWithParameters({
   // user-provided parameters.
   parameters = _extends({
     v: V3_MINOR_VERSION,
-    client: 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
@@ -1490,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