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

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,6 @@ 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 +353,30 @@ function _isMultiPolygon(geometry) {
   return invariant.getType(geometry) === 'MultiPolygon';
 }
 
+/** @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
@@ -447,7 +453,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) {
@@ -970,54 +976,6 @@ class WidgetTableSource extends WidgetBaseSource {
   }
 }
 
-// deck.gl
-// SPDX-License-Identifier: MIT
-// Copyright (c) vis.gl contributors
-function joinPath() {
-  return [].slice.call(arguments).map(part => part.endsWith('/') ? part.slice(0, -1) : part).join('/');
-}
-function buildV3Path(apiBaseUrl, version, endpoint) {
-  return joinPath(apiBaseUrl, version, endpoint, ...[].slice.call(arguments, 3));
-}
-/** @internal Required by fetchMap(). */
-function buildPublicMapUrl(_ref) {
-  let {
-    apiBaseUrl,
-    cartoMapId
-  } = _ref;
-  return buildV3Path(apiBaseUrl, 'v3', 'maps', 'public', cartoMapId);
-}
-/** @internal Required by fetchMap(). */
-function buildStatsUrl(_ref2) {
-  let {
-    attribute,
-    apiBaseUrl,
-    connectionName,
-    source,
-    type
-  } = _ref2;
-  if (type === 'query') {
-    return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, attribute);
-  }
-  // type === 'table'
-  return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, source, attribute);
-}
-function buildSourceUrl(_ref3) {
-  let {
-    apiBaseUrl,
-    connectionName,
-    endpoint
-  } = _ref3;
-  return buildV3Path(apiBaseUrl, 'v3', 'maps', connectionName, endpoint);
-}
-function buildQueryUrl(_ref4) {
-  let {
-    apiBaseUrl,
-    connectionName
-  } = _ref4;
-  return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');
-}
-
 // deck.gl
 // SPDX-License-Identifier: MIT
 // Copyright (c) vis.gl contributors
@@ -1074,21 +1032,53 @@ 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() {
+  return [].slice.call(arguments).map(part => part.endsWith('/') ? part.slice(0, -1) : part).join('/');
+}
+function buildV3Path(apiBaseUrl, version, endpoint) {
+  return joinPath(apiBaseUrl, version, endpoint, ...[].slice.call(arguments, 3));
+}
+/** @internal Required by fetchMap(). */
+function buildPublicMapUrl(_ref) {
+  let {
+    apiBaseUrl,
+    cartoMapId
+  } = _ref;
+  return buildV3Path(apiBaseUrl, 'v3', 'maps', 'public', cartoMapId);
+}
+/** @internal Required by fetchMap(). */
+function buildStatsUrl(_ref2) {
+  let {
+    attribute,
+    apiBaseUrl,
+    connectionName,
+    source,
+    type
+  } = _ref2;
+  if (type === 'query') {
+    return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, attribute);
+  }
+  // type === 'table'
+  return buildV3Path(apiBaseUrl, 'v3', 'stats', connectionName, source, attribute);
+}
+function buildSourceUrl(_ref3) {
+  let {
+    apiBaseUrl,
+    connectionName,
+    endpoint
+  } = _ref3;
+  return buildV3Path(apiBaseUrl, 'v3', 'maps', connectionName, endpoint);
+}
+function buildQueryUrl(_ref4) {
+  let {
+    apiBaseUrl,
+    connectionName
+  } = _ref4;
+  return buildV3Path(apiBaseUrl, 'v3', 'sql', connectionName, 'query');
+}
 
 // deck.gl
 const requestWithParameters = function (_ref) {
@@ -1105,7 +1095,7 @@ const requestWithParameters = function (_ref) {
     // user-provided parameters.
     parameters = {
       v: V3_MINOR_VERSION,
-      clientId: DEFAULT_CLIENT,
+      client: getClient(),
       ...(typeof deck !== 'undefined' && deck.VERSION && {
         deckglVersion: deck.VERSION
       }),
@@ -1286,7 +1276,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
@@ -1347,7 +1337,7 @@ const boundaryTableSource = function (options) {
 };
 
 // deck.gl
-const h3QuerySource$1 = function (options) {
+const h3QuerySource = function (options) {
   try {
     const {
       aggregationExp,
@@ -1372,14 +1362,17 @@ const h3QuerySource$1 = function (options) {
     if (filters) {
       urlParameters.filters = filters;
     }
-    return Promise.resolve(baseSource('query', options, urlParameters));
+    return Promise.resolve(baseSource('query', options, urlParameters).then(result => ({
+      ...result,
+      widgetSource: new WidgetQuerySource(options)
+    })));
   } catch (e) {
     return Promise.reject(e);
   }
 };
 
 // deck.gl
-const h3TableSource$1 = function (options) {
+const h3TableSource = function (options) {
   try {
     const {
       aggregationExp,
@@ -1400,7 +1393,10 @@ const h3TableSource$1 = function (options) {
     if (filters) {
       urlParameters.filters = filters;
     }
-    return Promise.resolve(baseSource('table', options, urlParameters));
+    return Promise.resolve(baseSource('table', options, urlParameters).then(result => ({
+      ...result,
+      widgetSource: new WidgetTableSource(options)
+    })));
   } catch (e) {
     return Promise.reject(e);
   }
@@ -1441,7 +1437,7 @@ const rasterSource = function (options) {
 };
 
 // deck.gl
-const quadbinQuerySource$1 = function (options) {
+const quadbinQuerySource = function (options) {
   try {
     const {
       aggregationExp,
@@ -1466,14 +1462,17 @@ const quadbinQuerySource$1 = function (options) {
     if (filters) {
       urlParameters.filters = filters;
     }
-    return Promise.resolve(baseSource('query', options, urlParameters));
+    return Promise.resolve(baseSource('query', options, urlParameters).then(result => ({
+      ...result,
+      widgetSource: new WidgetQuerySource(options)
+    })));
   } catch (e) {
     return Promise.reject(e);
   }
 };
 
 // deck.gl
-const quadbinTableSource$1 = function (options) {
+const quadbinTableSource = function (options) {
   try {
     const {
       aggregationExp,
@@ -1494,7 +1493,10 @@ const quadbinTableSource$1 = function (options) {
     if (filters) {
       urlParameters.filters = filters;
     }
-    return Promise.resolve(baseSource('table', options, urlParameters));
+    return Promise.resolve(baseSource('table', options, urlParameters).then(result => ({
+      ...result,
+      widgetSource: new WidgetTableSource(options)
+    })));
   } catch (e) {
     return Promise.reject(e);
   }
@@ -1516,7 +1518,7 @@ const quadbinTilesetSource = function (options) {
 };
 
 // deck.gl
-const vectorQuerySource$1 = function (options) {
+const vectorQuerySource = function (options) {
   try {
     const {
       columns,
@@ -1541,14 +1543,17 @@ const vectorQuerySource$1 = function (options) {
     if (queryParameters) {
       urlParameters.queryParameters = queryParameters;
     }
-    return Promise.resolve(baseSource('query', options, urlParameters));
+    return Promise.resolve(baseSource('query', options, urlParameters).then(result => ({
+      ...result,
+      widgetSource: new WidgetQuerySource(options)
+    })));
   } catch (e) {
     return Promise.reject(e);
   }
 };
 
 // deck.gl
-const vectorTableSource$1 = function (options) {
+const vectorTableSource = function (options) {
   try {
     const {
       columns,
@@ -1569,7 +1574,10 @@ const vectorTableSource$1 = function (options) {
     if (filters) {
       urlParameters.filters = filters;
     }
-    return Promise.resolve(baseSource('table', options, urlParameters));
+    return Promise.resolve(baseSource('table', options, urlParameters).then(result => ({
+      ...result,
+      widgetSource: new WidgetTableSource(options)
+    })));
   } catch (e) {
     return Promise.reject(e);
   }
@@ -1590,86 +1598,6 @@ const vectorTilesetSource = function (options) {
   }
 };
 
-/** Wrapper adding Widget API support to [vectorTableSource](https://deck.gl/docs/api-reference/carto/data-sources). */
-
-/** Wrapper adding Widget API support to [quadbinQuerySource](https://deck.gl/docs/api-reference/carto/data-sources). */
-const quadbinQuerySource = function (props) {
-  try {
-    return Promise.resolve(quadbinQuerySource$1(props)).then(function (response) {
-      return {
-        ...response,
-        widgetSource: new WidgetQuerySource(props)
-      };
-    });
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-/** Wrapper adding Widget API support to [quadbinTableSource](https://deck.gl/docs/api-reference/carto/data-sources). */
-const quadbinTableSource = function (props) {
-  try {
-    return Promise.resolve(quadbinTableSource$1(props)).then(function (response) {
-      return {
-        ...response,
-        widgetSource: new WidgetTableSource(props)
-      };
-    });
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-/** Wrapper adding Widget API support to [h3QuerySource](https://deck.gl/docs/api-reference/carto/data-sources). */
-const h3QuerySource = function (props) {
-  try {
-    return Promise.resolve(h3QuerySource$1(props)).then(function (response) {
-      return {
-        ...response,
-        widgetSource: new WidgetQuerySource(props)
-      };
-    });
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-/** Wrapper adding Widget API support to [h3TableSource](https://deck.gl/docs/api-reference/carto/data-sources). */
-const h3TableSource = function (props) {
-  try {
-    return Promise.resolve(h3TableSource$1(props)).then(function (response) {
-      return {
-        ...response,
-        widgetSource: new WidgetTableSource(props)
-      };
-    });
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-/** Wrapper adding Widget API support to [vectorQuerySource](https://deck.gl/docs/api-reference/carto/data-sources). */
-const vectorQuerySource = function (props) {
-  try {
-    return Promise.resolve(vectorQuerySource$1(props)).then(function (response) {
-      return {
-        ...response,
-        widgetSource: new WidgetQuerySource(props)
-      };
-    });
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-const vectorTableSource = function (props) {
-  try {
-    return Promise.resolve(vectorTableSource$1(props)).then(function (response) {
-      return {
-        ...response,
-        widgetSource: new WidgetTableSource(props)
-      };
-    });
-  } catch (e) {
-    return Promise.reject(e);
-  }
-};
-
 // deck.gl
 const query = function (options) {
   try {
@@ -1718,12 +1646,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;