@mmstack/resource 20.2.5 → 20.2.7

package/fesm2022/mmstack-resource.mjs

@@ -60,7 +60,7 @@ class Cache {
     }
     /** @internal */
     getInternal(key) {
-        const keySignal = computed(() => key());
+        const keySignal = computed(() => key(), ...(ngDevMode ? [{ debugName: "keySignal" }] : []));
         return computed(() => {
             const key = keySignal();
             if (!key)
@@ -471,15 +471,15 @@ const DEFAULT_OPTIONS = {
 };
 /** @internal */
 function internalCeateCircuitBreaker(treshold = 5, resetTimeout = 30000, shouldFail = () => true, shouldFailForever = () => false) {
-    const halfOpen = signal(false);
-    const failureCount = signal(0);
+    const halfOpen = signal(false, ...(ngDevMode ? [{ debugName: "halfOpen" }] : []));
+    const failureCount = signal(0, ...(ngDevMode ? [{ debugName: "failureCount" }] : []));
     const status = computed(() => {
         if (failureCount() >= treshold)
             return 'OPEN';
         return halfOpen() ? 'HALF_OPEN' : 'CLOSED';
-    });
-    const isClosed = computed(() => status() !== 'OPEN');
-    const isOpen = computed(() => status() !== 'CLOSED');
+    }, ...(ngDevMode ? [{ debugName: "status" }] : []));
+    const isClosed = computed(() => status() !== 'OPEN', ...(ngDevMode ? [{ debugName: "isClosed" }] : []));
+    const isOpen = computed(() => status() !== 'CLOSED', ...(ngDevMode ? [{ debugName: "isOpen" }] : []));
     const success = () => {
         failureCount.set(0);
         halfOpen.set(false);
@@ -500,7 +500,7 @@ function internalCeateCircuitBreaker(treshold = 5, resetTimeout = 30000, shouldF
             clearTimeout(timeout);
             failForeverResetId = null;
         });
-    });
+    }, ...(ngDevMode ? [{ debugName: "effectRef" }] : []));
     const failInternal = () => {
         failureCount.set(failureCount() + 1);
         halfOpen.set(false);
@@ -904,7 +904,7 @@ function retryOnError(res, opt) {
             case 'resolved':
                 return onSuccess();
         }
-    });
+    }, ...(ngDevMode ? [{ debugName: "ref" }] : []));
     return {
         ...res,
         destroy: () => {
@@ -967,11 +967,13 @@ function queryResource(request, options) {
         if (cb.isOpen())
             return undefined;
         return request() ?? undefined;
-    }, {
-        equal: options?.triggerOnSameRequest
-            ? undefined
-            : createEqualRequest(options?.equal),
-    });
+    }, ...(ngDevMode ? [{ debugName: "stableRequest", equal: options?.triggerOnSameRequest
+                ? undefined
+                : createEqualRequest(options?.equal) }] : [{
+            equal: options?.triggerOnSameRequest
+                ? undefined
+                : createEqualRequest(options?.equal),
+        }]));
     const hashFn = typeof options?.cache === 'object'
         ? (options.cache.hash ?? urlWithParams)
         : urlWithParams;
@@ -982,7 +984,7 @@ function queryResource(request, options) {
         if (!r)
             return null;
         return hashFn(r);
-    });
+    }, ...(ngDevMode ? [{ debugName: "cacheKey" }] : []));
     const bustBrowserCache = typeof options?.cache === 'object' &&
         options.cache.bustBrowserCache === true;
     const ignoreCacheControl = typeof options?.cache === 'object' &&
@@ -1048,7 +1050,7 @@ function queryResource(request, options) {
             const err = resource.error();
             if (err)
                 onError(err);
-        });
+        }, ...(ngDevMode ? [{ debugName: "onErrorRef" }] : []));
         // cleanup on manual destroy, I'm comfortable setting these props in-line as we have yet to 'release' the object out of this lexical scope
         const destroyRest = resource.destroy;
         resource.destroy = () => {
@@ -1063,7 +1065,7 @@ function queryResource(request, options) {
             cb.fail(untracked(resource.error));
         else if (status === 'resolved')
             cb.success();
-    });
+    }, ...(ngDevMode ? [{ debugName: "cbEffectRef" }] : []));
     const set = (value) => {
         resource.value.set(value);
         const k = untracked(cacheKey);
@@ -1117,6 +1119,11 @@ function queryResource(request, options) {
             try {
                 await firstValueFrom(client.request(prefetchRequest.method ?? 'GET', prefetchRequest.url, {
                     ...prefetchRequest,
+                    credentials: prefetchRequest.credentials,
+                    priority: prefetchRequest.priority,
+                    cache: prefetchRequest.cache,
+                    mode: prefetchRequest.mode,
+                    redirect: prefetchRequest.redirect,
                     context: setCacheContext(prefetchRequest.context, {
                         staleTime,
                         ttl,
@@ -1164,25 +1171,51 @@ function mutationResource(request, options = {}) {
     const { onMutate, onError, onSuccess, onSettled, equal, ...rest } = options;
     const requestEqual = createEqualRequest(equal);
     const eq = equal ?? Object.is;
-    const next = signal(null, {
-        equal: (a, b) => {
-            if (!a && !b)
-                return true;
-            if (!a || !b)
-                return false;
-            return eq(a, b);
-        },
-    });
+    const next = signal(null, ...(ngDevMode ? [{ debugName: "next", equal: (a, b) => {
+                if (!a && !b)
+                    return true;
+                if (!a || !b)
+                    return false;
+                return eq(a, b);
+            } }] : [{
+            equal: (a, b) => {
+                if (!a && !b)
+                    return true;
+                if (!a || !b)
+                    return false;
+                return eq(a, b);
+            },
+        }]));
     const req = computed(() => {
         const nr = next();
         if (!nr)
             return;
         return request(nr) ?? undefined;
-    }, {
-        equal: requestEqual,
+    }, ...(ngDevMode ? [{ debugName: "req", equal: requestEqual }] : [{
+            equal: requestEqual,
+        }]));
+    const lastValue = linkedSignal({
+        source: next,
+        computation: (next, prev) => {
+            if (next === null && !!prev)
+                return prev.value;
+            return next;
+        },
     });
+    const lastValueRequest = computed(() => {
+        const nr = lastValue();
+        if (!nr)
+            return;
+        return request(nr) ?? undefined;
+    }, ...(ngDevMode ? [{ debugName: "lastValueRequest", equal: requestEqual }] : [{
+            equal: requestEqual,
+        }]));
+    const cb = createCircuitBreaker(options?.circuitBreaker === true
+        ? undefined
+        : (options?.circuitBreaker ?? false), options?.injector);
     const resource = queryResource(req, {
         ...rest,
+        circuitBreaker: cb,
         defaultValue: null, // doesnt matter since .value is not accessible
     });
     let ctx = undefined;
@@ -1227,6 +1260,8 @@ function mutationResource(request, options = {}) {
             next.set(value);
         },
         current: next,
+        // redeclare disabled with last value so that it is not affected by the resource's internal disablement logic
+        disabled: computed(() => cb.isOpen() || lastValueRequest() === undefined),
     };
 }