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

package/build/api-client.modern.js

@@ -1077,13 +1077,14 @@ const DEFAULT_HEADERS = {
   Accept: 'application/json',
   'Content-Type': 'application/json'
 };
-const REQUEST_CACHE = new Map();
+const DEFAULT_REQUEST_CACHE = new Map();
 async function requestWithParameters({
   baseUrl,
   parameters = {},
   headers: customHeaders = {},
   errorContext,
-  maxLengthURL = DEFAULT_MAX_LENGTH_URL
+  maxLengthURL = DEFAULT_MAX_LENGTH_URL,
+  localCache
 }) {
   // Parameters added to all requests issued with `requestWithParameters()`.
   // These parameters override parameters already in the base URL, but not
@@ -1096,7 +1097,12 @@ async function requestWithParameters({
   }, parameters);
   baseUrl = excludeURLParameters(baseUrl, Object.keys(parameters));
   const key = createCacheKey(baseUrl, parameters, customHeaders);
-  if (REQUEST_CACHE.has(key)) {
+  const {
+    cache: REQUEST_CACHE,
+    canReadCache,
+    canStoreInCache
+  } = getCacheSettings(localCache);
+  if (canReadCache && REQUEST_CACHE.has(key)) {
     return REQUEST_CACHE.get(key);
   }
   const url = createURLWithParameters(baseUrl, parameters);
@@ -1121,12 +1127,27 @@ async function requestWithParameters({
     }
     return json;
   }).catch(error => {
-    REQUEST_CACHE.delete(key);
+    if (canStoreInCache) {
+      REQUEST_CACHE.delete(key);
+    }
     throw new CartoAPIError(error, errorContext, response, responseJson);
   });
-  REQUEST_CACHE.set(key, jsonPromise);
+  if (canStoreInCache) {
+    REQUEST_CACHE.set(key, jsonPromise);
+  }
   return jsonPromise;
 }
+function getCacheSettings(localCache) {
+  var _localCache$cacheCont, _localCache$cacheCont2;
+  const canReadCache = localCache != null && (_localCache$cacheCont = localCache.cacheControl) != null && _localCache$cacheCont.includes('no-cache') ? false : true;
+  const canStoreInCache = localCache != null && (_localCache$cacheCont2 = localCache.cacheControl) != null && _localCache$cacheCont2.includes('no-store') ? false : true;
+  const cache = (localCache == null ? void 0 : localCache.cache) || DEFAULT_REQUEST_CACHE;
+  return {
+    cache,
+    canReadCache,
+    canStoreInCache
+  };
+}
 function createCacheKey(baseUrl, 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);
@@ -1194,7 +1215,8 @@ async function baseSource(endpoint, options, urlParameters) {
   const {
     clientId,
     maxLengthURL,
-    format
+    format,
+    localCache
   } = mergedOptions;
   const headers = _extends({
     Authorization: `Bearer ${options.accessToken}`
@@ -1213,7 +1235,8 @@ async function baseSource(endpoint, options, urlParameters) {
     parameters,
     headers,
     errorContext,
-    maxLengthURL
+    maxLengthURL,
+    localCache
   });
   const dataUrl = mapInstantiation[format].url[0];
   if (cache) {
@@ -1225,7 +1248,8 @@ async function baseSource(endpoint, options, urlParameters) {
       baseUrl: dataUrl,
       headers,
       errorContext,
-      maxLengthURL
+      maxLengthURL,
+      localCache
     });
     if (accessToken) {
       json.accessToken = accessToken;
@@ -1236,7 +1260,8 @@ async function baseSource(endpoint, options, urlParameters) {
     baseUrl: dataUrl,
     headers,
     errorContext,
-    maxLengthURL
+    maxLengthURL,
+    localCache
   });
 }
 
@@ -1501,6 +1526,7 @@ const query = async function query(options) {
     apiBaseUrl = SOURCE_DEFAULTS.apiBaseUrl,
     clientId = SOURCE_DEFAULTS.clientId,
     maxLengthURL = SOURCE_DEFAULTS.maxLengthURL,
+    localCache,
     connectionName,
     sqlQuery,
     queryParameters
@@ -1532,7 +1558,8 @@ const query = async function query(options) {
     parameters,
     headers,
     errorContext,
-    maxLengthURL
+    maxLengthURL,
+    localCache
   });
 };