@mmstack/resource 20.0.2 → 20.0.4

package/fesm2022/mmstack-resource.mjs

@@ -322,30 +322,25 @@ function parseCacheControlHeader(req) {
         };
     return directives;
 }
-function resolveTimings(cacheControl, staleTime, ttl) {
-    const timings = {
-        staleTime,
-        ttl,
-    };
+function resolveTimings(cacheControl, optStaleTime, optTTL) {
+    let staleTime = optStaleTime;
+    let ttl = optTTL;
     if (cacheControl.immutable)
         return {
             staleTime: Infinity,
             ttl: Infinity,
         };
+    if (cacheControl.maxAge !== null)
+        ttl = cacheControl.maxAge * 1000;
+    if (cacheControl.staleWhileRevalidate !== null)
+        staleTime = cacheControl.staleWhileRevalidate * 1000;
     // if no-cache is set, we must always revalidate
     if (cacheControl.noCache || cacheControl.mustRevalidate)
-        timings.staleTime = 0;
-    if (cacheControl.staleWhileRevalidate !== null)
-        timings.staleTime = cacheControl.staleWhileRevalidate;
-    if (cacheControl.maxAge !== null)
-        timings.ttl = cacheControl.maxAge * 1000;
-    // if stale-while-revalidate is set, we must revalidate after that time at the latest, but we can still serve the stale data
-    if (cacheControl.staleWhileRevalidate !== null) {
-        const ms = cacheControl.staleWhileRevalidate * 1000;
-        if (timings.staleTime === undefined || timings.staleTime > ms)
-            timings.staleTime = ms;
+        staleTime = 0;
+    if (ttl !== undefined && staleTime !== undefined && ttl < staleTime) {
+        staleTime = ttl;
     }
-    return timings;
+    return { staleTime, ttl };
 }
 /**
  * Creates an `HttpInterceptorFn` that implements caching for HTTP requests. This interceptor
@@ -403,6 +398,8 @@ function createCacheInterceptor(allowedMethods = ['GET', 'HEAD', 'OPTIONS']) {
                 if (cacheControl.noStore)
                     return;
                 const { staleTime, ttl } = resolveTimings(cacheControl, opt.staleTime, opt.ttl);
+                if (opt.ttl === 0)
+                    return; // no point
                 cache.store(key, event, staleTime, ttl);
             }
         }), map((event) => {
@@ -784,6 +781,24 @@ function retryOnError(res, opt) {
     };
 }
 
+function toResourceObject(res) {
+    return {
+        asReadonly: () => res.asReadonly(),
+        destroy: () => res.destroy(),
+        error: res.error,
+        headers: res.headers,
+        isLoading: res.isLoading,
+        progress: res.progress,
+        status: res.status,
+        statusCode: res.statusCode,
+        value: res.value,
+        reload: () => res.reload(),
+        hasValue: (() => res.hasValue()),
+        set: (v) => res.set(v),
+        update: (v) => res.update(v),
+    };
+}
+
 function normalizeParams(params) {
     if (params instanceof HttpParams)
         return params.toString();
@@ -849,11 +864,11 @@ function queryResource(request, options) {
             };
         })
         : stableRequest;
-    let resource = httpResource(cachedRequest, {
+    let resource = toResourceObject(httpResource(cachedRequest, {
         ...options,
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         parse: options?.parse, // Not my favorite thing to do, but here it is completely safe.
-    });
+    }));
     resource = catchValueError(resource, options?.defaultValue);
     // get full HttpResonse from Cache
     const cachedEvent = cache.get(cacheKey);