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

package/dist/index.cjs

@@ -245,7 +245,7 @@ function scaleIdentity() {
 }
 
 // dist/layers/schema/carto-raster-tile-loader.js
-var VERSION = true ? "9.0.0-beta.8" : "latest";
+var VERSION = true ? "9.0.0-beta.10" : "latest";
 var id = "cartoRasterTile";
 var DEFAULT_OPTIONS = {
   cartoRasterTile: {
@@ -516,7 +516,7 @@ function binaryToSpatialjson(binary) {
 }
 
 // dist/layers/schema/carto-spatial-tile-loader.js
-var VERSION2 = true ? "9.0.0-beta.8" : "latest";
+var VERSION2 = true ? "9.0.0-beta.10" : "latest";
 var id2 = "cartoSpatialTile";
 var DEFAULT_OPTIONS2 = {
   cartoSpatialTile: {
@@ -1268,7 +1268,7 @@ var carto_properties_tile_loader_default = CartoPropertiesTileLoader;
 
 // dist/layers/schema/carto-vector-tile-loader.js
 var import_earcut = __toESM(require("earcut"), 1);
-var VERSION3 = true ? "9.0.0-beta.8" : "latest";
+var VERSION3 = true ? "9.0.0-beta.10" : "latest";
 var id3 = "cartoVectorTile";
 var DEFAULT_OPTIONS3 = {
   cartoVectorTile: {
@@ -1630,45 +1630,39 @@ async function requestWithParameters({ accessToken, baseUrl: baseUrl2, parameter
   if (REQUEST_CACHE.has(key)) {
     return REQUEST_CACHE.get(key);
   }
-  let url = baseUrl2;
-  if (parameters) {
-    const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(([key2, value]) => {
-      return encodeParameter(key2, value);
-    });
-    url += `?${encodedParameters.join("&")}`;
-  }
+  const url = parameters ? createURLWithParameters(baseUrl2, parameters) : baseUrl2;
   const headers = { ...DEFAULT_HEADERS, ...customHeaders };
-  try {
-    let response;
-    if (url.length > MAX_GET_LENGTH) {
-      response = await fetch(baseUrl2, { method: "POST", body: JSON.stringify(parameters), headers });
-    } else {
-      response = await fetch(url, { headers });
-    }
-    let json;
-    try {
-      json = await response.json();
-      if (accessToken) {
-        json.accessToken = accessToken;
-      }
-    } catch {
-      json = { error: "" };
+  const fetchPromise = url.length > MAX_GET_LENGTH ? fetch(baseUrl2, { method: "POST", body: JSON.stringify(parameters), headers }) : fetch(url, { headers });
+  let response;
+  const jsonPromise = fetchPromise.then((_response) => {
+    response = _response;
+    return response.json();
+  }).then((json) => {
+    if (!response || !response.ok) {
+      throw new Error(json.error);
     }
-    if (!response.ok) {
-      REQUEST_CACHE.delete(key);
-      throw new CartoAPIError(json.error, errorContext, response);
+    if (accessToken) {
+      json.accessToken = accessToken;
     }
-    REQUEST_CACHE.set(key, json);
     return json;
-  } catch (error) {
-    throw new CartoAPIError(error, errorContext);
-  }
+  }).catch((error) => {
+    REQUEST_CACHE.delete(key);
+    throw new CartoAPIError(error, errorContext, response);
+  });
+  REQUEST_CACHE.set(key, jsonPromise);
+  return jsonPromise;
 }
 function createCacheKey(baseUrl2, parameters, headers) {
   const parameterEntries = Object.entries(parameters).sort(([a], [b]) => a > b ? 1 : -1);
   const headerEntries = Object.entries(headers).sort(([a], [b]) => a > b ? 1 : -1);
   return JSON.stringify({ baseUrl: baseUrl2, parameters: parameterEntries, headers: headerEntries });
 }
+function createURLWithParameters(baseUrl2, parameters) {
+  const encodedParameters = Object.entries({ ...DEFAULT_PARAMETERS, ...parameters }).map(([key, value]) => {
+    return encodeParameter(key, value);
+  });
+  return `${baseUrl2}?${encodedParameters.join("&")}`;
+}
 
 // dist/sources/base-source.js
 var SOURCE_DEFAULTS = {