@carto/api-client 0.4.0-alpha.3 → 0.4.0-alpha.5

package/build/api-client.cjs

@@ -12,9 +12,9 @@ var union__default = /*#__PURE__*/_interopDefaultLegacy(union);
 
 /**
  * @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.
  *
@@ -65,24 +65,8 @@ exports.ApiVersion = void 0;
   ApiVersion["V2"] = "v2";
   ApiVersion["V3"] = "v3";
 })(exports.ApiVersion || (exports.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(exports.FilterType));
 const isFilterType = type => FILTER_TYPES.has(type);
@@ -371,6 +355,32 @@ function _isMultiPolygon(geometry) {
   return invariant.getType(geometry) === 'MultiPolygon';
 }
 
+/**
+ * Current version of @carto/api-client.
+ * @internal
+ */
+/** @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
@@ -447,7 +457,7 @@ function dealWithApiError(_ref) {
   if (data.error === 'Column not found') {
     throw new InvalidColumnError(`${data.error} ${data.column_name}`);
   }
-  if (data.error?.includes('Missing columns')) {
+  if (typeof data.error === 'string' && data.error?.includes('Missing columns')) {
     throw new InvalidColumnError(data.error);
   }
   switch (response.status) {
@@ -1074,22 +1084,6 @@ function buildQueryUrl(_ref4) {
   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;
-
 // deck.gl
 const requestWithParameters = function (_ref) {
   let {
@@ -1105,7 +1099,7 @@ const requestWithParameters = function (_ref) {
     // user-provided parameters.
     parameters = {
       v: V3_MINOR_VERSION,
-      client: DEFAULT_CLIENT,
+      client: getClient(),
       ...(typeof deck !== 'undefined' && deck.VERSION && {
         deckglVersion: deck.VERSION
       }),
@@ -1286,7 +1280,7 @@ const baseSource = function (endpoint, options, urlParameters) {
 };
 const SOURCE_DEFAULTS = {
   apiBaseUrl: DEFAULT_API_BASE_URL,
-  clientId: DEFAULT_CLIENT,
+  clientId: getClient(),
   format: 'tilejson',
   headers: {},
   maxLengthURL: DEFAULT_MAX_LENGTH_URL
@@ -1657,11 +1651,6 @@ const query = function (options) {
 
 exports.CartoAPIError = CartoAPIError;
 exports.DEFAULT_API_BASE_URL = DEFAULT_API_BASE_URL;
-exports.DEFAULT_CLIENT = DEFAULT_CLIENT;
-exports.DEFAULT_GEO_COLUMN = DEFAULT_GEO_COLUMN;
-exports.DEFAULT_MAX_LENGTH_URL = DEFAULT_MAX_LENGTH_URL;
-exports.DEFAULT_TILE_RESOLUTION = DEFAULT_TILE_RESOLUTION;
-exports.DEFAULT_TILE_SIZE = DEFAULT_TILE_SIZE;
 exports.SOURCE_DEFAULTS = SOURCE_DEFAULTS;
 exports.WidgetBaseSource = WidgetBaseSource;
 exports.WidgetQuerySource = WidgetQuerySource;