@deck.gl/carto 9.0.0-beta.9 → 9.0.0

package/package.json

@@ -3,7 +3,7 @@
   "description": "CARTO official integration with Deck.gl. Build geospatial applications using CARTO and Deck.gl.",
   "license": "MIT",
   "type": "module",
-  "version": "9.0.0-beta.9",
+  "version": "9.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -42,12 +42,12 @@
     "prepublishOnly": "npm run build-bundle && npm run build-bundle -- --env=dev"
   },
   "dependencies": {
-    "@loaders.gl/gis": "^4.2.0-alpha.5",
-    "@loaders.gl/loader-utils": "^4.2.0-alpha.5",
-    "@loaders.gl/mvt": "^4.2.0-alpha.5",
-    "@loaders.gl/schema": "^4.2.0-alpha.5",
-    "@loaders.gl/tiles": "^4.2.0-alpha.5",
-    "@luma.gl/constants": "^9.0.0",
+    "@loaders.gl/gis": "^4.1.4",
+    "@loaders.gl/loader-utils": "^4.1.4",
+    "@loaders.gl/mvt": "^4.1.4",
+    "@loaders.gl/schema": "^4.1.4",
+    "@loaders.gl/tiles": "^4.1.4",
+    "@luma.gl/constants": "^9.0.6",
     "@math.gl/web-mercator": "^4.0.0",
     "@types/d3-array": "^3.0.2",
     "@types/d3-color": "^1.4.2",
@@ -64,13 +64,13 @@
     "quadbin": "^0.2.0"
   },
   "peerDependencies": {
-    "@deck.gl/aggregation-layers": "^9.0.0-beta",
-    "@deck.gl/core": "^9.0.0-beta",
-    "@deck.gl/extensions": "^9.0.0-beta",
-    "@deck.gl/geo-layers": "^9.0.0-beta",
-    "@deck.gl/layers": "^9.0.0-beta",
-    "@loaders.gl/core": "^4.2.0-alpha.5",
+    "@deck.gl/aggregation-layers": "^9.0.0",
+    "@deck.gl/core": "^9.0.0",
+    "@deck.gl/extensions": "^9.0.0",
+    "@deck.gl/geo-layers": "^9.0.0",
+    "@deck.gl/layers": "^9.0.0",
+    "@loaders.gl/core": "^4.1.0",
     "@luma.gl/core": "^9.0.0"
   },
-  "gitHead": "44cfc784310d1c6ac7766ff80e0df8c364f97354"
+  "gitHead": "fcb5ccf0a899e651949b24986488211e278e9321"
 }

package/src/api/request-with-parameters.ts

@@ -9,7 +9,7 @@ function encodeParameter(name: string, value: string | boolean | number): string
   return `${name}=${encodeURIComponent(value)}`;
 }
 
-const REQUEST_CACHE = new Map();
+const REQUEST_CACHE = new Map<string, Promise<unknown>>();
 export async function requestWithParameters<T = any>({
   accessToken,
   baseUrl,
@@ -25,47 +25,40 @@ export async function requestWithParameters<T = any>({
 }): Promise<T> {
   const key = createCacheKey(baseUrl, parameters || {}, customHeaders || {});
   if (REQUEST_CACHE.has(key)) {
-    return REQUEST_CACHE.get(key);
-  }
-
-  let url = baseUrl;
-  if (parameters) {
-    const encodedParameters = Object.entries({...DEFAULT_PARAMETERS, ...parameters}).map(
-      ([key, value]) => {
-        return encodeParameter(key, value);
-      }
-    );
-    url += `?${encodedParameters.join('&')}`;
+    return REQUEST_CACHE.get(key) as Promise<T>;
   }
 
+  const url = parameters ? createURLWithParameters(baseUrl, parameters) : baseUrl;
   const headers = {...DEFAULT_HEADERS, ...customHeaders};
-  try {
-    /* global fetch */
-    let response: Response;
-    if (url.length > MAX_GET_LENGTH) {
-      response = await fetch(baseUrl, {method: 'POST', body: JSON.stringify(parameters), headers});
-    } else {
-      response = await fetch(url, {headers});
-    }
-    let json: any;
-    try {
-      json = await response.json();
+
+  /* global fetch */
+  const fetchPromise =
+    url.length > MAX_GET_LENGTH
+      ? fetch(baseUrl, {method: 'POST', body: JSON.stringify(parameters), headers})
+      : fetch(url, {headers});
+
+  let response: Response | undefined;
+  const jsonPromise: Promise<T> = fetchPromise
+    .then((_response: Response) => {
+      response = _response;
+      return response.json();
+    })
+    .then((json: any) => {
+      if (!response || !response.ok) {
+        throw new Error(json.error);
+      }
       if (accessToken) {
         json.accessToken = accessToken;
       }
-    } catch {
-      json = {error: ''};
-    }
-    if (!response.ok) {
+      return json;
+    })
+    .catch((error: Error) => {
       REQUEST_CACHE.delete(key);
-      throw new CartoAPIError(json.error, errorContext, response);
-    }
+      throw new CartoAPIError(error, errorContext, response);
+    });
 
-    REQUEST_CACHE.set(key, json);
-    return json;
-  } catch (error) {
-    throw new CartoAPIError(error as Error, errorContext);
-  }
+  REQUEST_CACHE.set(key, jsonPromise);
+  return jsonPromise;
 }
 
 function createCacheKey(
@@ -77,3 +70,12 @@ function createCacheKey(
   const headerEntries = Object.entries(headers).sort(([a], [b]) => (a > b ? 1 : -1));
   return JSON.stringify({baseUrl, parameters: parameterEntries, headers: headerEntries});
 }
+
+function createURLWithParameters(baseUrl: string, parameters: Record<string, string>): string {
+  const encodedParameters = Object.entries({...DEFAULT_PARAMETERS, ...parameters}).map(
+    ([key, value]) => {
+      return encodeParameter(key, value);
+    }
+  );
+  return `${baseUrl}?${encodedParameters.join('&')}`;
+}

package/src/index.ts

@@ -83,7 +83,13 @@ export {
 };
 
 export type {
+  GeojsonResult,
+  JsonResult,
   TilejsonResult,
+  SourceOptions,
+  QuerySourceOptions,
+  TableSourceOptions,
+  TilesetSourceOptions,
   BoundaryQuerySourceOptions,
   BoundaryTableSourceOptions,
   H3QuerySourceOptions,
@@ -95,7 +101,5 @@ export type {
   QuadbinTilesetSourceOptions,
   VectorQuerySourceOptions,
   VectorTableSourceOptions,
-  VectorTilesetSourceOptions,
-  GeojsonResult,
-  JsonResult
+  VectorTilesetSourceOptions
 } from './sources/index';

package/src/layers/vector-tile-layer.ts

@@ -16,7 +16,7 @@ import {
 import {GeoJsonLayer} from '@deck.gl/layers';
 import {binaryToGeojson} from '@loaders.gl/gis';
 import type {BinaryFeatureCollection} from '@loaders.gl/schema';
-import type {Feature} from 'geojson';
+import type {Feature, Geometry} from 'geojson';
 
 import type {TilejsonResult} from '../sources/types';
 import {TilejsonPropType, injectAccessToken, mergeBoundaryData} from './utils';
@@ -153,7 +153,7 @@ export default class VectorTileLayer<
       const {data} = params.sourceLayer!.props;
       info.object = binaryToGeojson(data as BinaryFeatureCollection, {
         globalFeatureId: info.index
-      }) as Feature;
+      }) as Feature<Geometry, FeaturePropertiesT>;
     }
 
     return info;

package/src/sources/index.ts

@@ -36,3 +36,10 @@ export type {VectorTableSourceOptions} from './vector-table-source';
 
 export {vectorTilesetSource} from './vector-tileset-source';
 export type {VectorTilesetSourceOptions} from './vector-tileset-source';
+
+export type {
+  SourceOptions,
+  QuerySourceOptions,
+  TableSourceOptions,
+  TilesetSourceOptions
+} from './types';