@mmstack/resource 20.2.10 → 20.2.11

package/fesm2022/mmstack-resource.mjs

@@ -1,8 +1,9 @@
-import { isDevMode, untracked, computed, InjectionToken, inject, signal, effect, Injector, linkedSignal, DestroyRef } from '@angular/core';
+import * as i0 from '@angular/core';
+import { isDevMode, untracked, computed, InjectionToken, inject, signal, effect, Injector, linkedSignal, Injectable, DestroyRef } from '@angular/core';
 import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 import { of, tap, map, finalize, shareReplay, interval, firstValueFrom, catchError, combineLatestWith, filter } from 'rxjs';
 import { HttpHeaders, HttpResponse, HttpContextToken, HttpContext, HttpParams, httpResource, HttpClient } from '@angular/common/http';
-import { mutable, toWritable } from '@mmstack/primitives';
+import { mutable, toWritable, sensor } from '@mmstack/primitives';
 import { v7 } from 'uuid';
 import { keys, hash, entries } from '@mmstack/object';
 
@@ -1173,6 +1174,21 @@ function retryOnError(res, opt) {
     };
 }
 
+class ResourceSensors {
+    networkStatus = sensor('networkStatus');
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.1.0", ngImport: i0, type: ResourceSensors, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.1.0", ngImport: i0, type: ResourceSensors, providedIn: 'root' });
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.1.0", ngImport: i0, type: ResourceSensors, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }] });
+function injectNetworkStatus() {
+    return inject(ResourceSensors).networkStatus;
+}
+
 function toResourceObject(res) {
     return {
         asReadonly: () => res.asReadonly(),
@@ -1222,16 +1238,24 @@ function queryResource(request, options) {
     const cb = createCircuitBreaker(options?.circuitBreaker === true
         ? undefined
         : (options?.circuitBreaker ?? false), options?.injector);
+    const networkAvailable = injectNetworkStatus();
+    const eq = options?.triggerOnSameRequest
+        ? undefined
+        : createEqualRequest(options?.equal);
     const stableRequest = computed(() => {
-        if (cb.isOpen())
+        if (!networkAvailable() || cb.isOpen())
             return undefined;
         return request() ?? undefined;
-    }, ...(ngDevMode ? [{ debugName: "stableRequest", equal: options?.triggerOnSameRequest
-                ? undefined
-                : createEqualRequest(options?.equal) }] : [{
-            equal: options?.triggerOnSameRequest
-                ? undefined
-                : createEqualRequest(options?.equal),
+    }, ...(ngDevMode ? [{ debugName: "stableRequest", equal: (a, b) => {
+                if (eq)
+                    return eq(a, b);
+                return a === b;
+            } }] : [{
+            equal: (a, b) => {
+                if (eq)
+                    return eq(a, b);
+                return a === b;
+            },
         }]));
     const hashFn = typeof options?.cache === 'object'
         ? (options.cache.hash ?? urlWithParams)
@@ -1301,6 +1325,7 @@ function queryResource(request, options) {
     resource = persistResourceValues(resource, options?.keepPrevious, options?.equal);
     const value = options?.cache
         ? toWritable(computed(() => {
+            resource.value();
             return cacheEntry()?.value ?? resource.value();
         }), resource.value.set, resource.value.update)
         : resource.value;
@@ -1447,6 +1472,17 @@ function mutationResource(request, options = {}) {
                 return eq(a, b);
             },
         }]));
+    const queue = signal([], ...(ngDevMode ? [{ debugName: "queue" }] : []));
+    let ctx = undefined;
+    const queueRef = effect(() => {
+        const nextInQueue = queue().at(0);
+        if (!nextInQueue || next() !== null)
+            return;
+        queue.update((q) => q.slice(1));
+        const [value, ictx] = nextInQueue;
+        ctx = onMutate?.(value, ictx);
+        next.set(value);
+    }, ...(ngDevMode ? [{ debugName: "queueRef" }] : []));
     const req = computed(() => {
         const nr = next();
         if (!nr)
@@ -1479,7 +1515,6 @@ function mutationResource(request, options = {}) {
         circuitBreaker: cb,
         defaultValue: null, // doesnt matter since .value is not accessible
     });
-    let ctx = undefined;
     const destroyRef = options.injector
         ? options.injector.get(DestroyRef)
         : inject(DestroyRef);
@@ -1510,15 +1545,22 @@ function mutationResource(request, options = {}) {
         ctx = undefined;
         next.set(null);
     });
+    const shouldQueue = options.queue ?? false;
     return {
         ...resource,
         destroy: () => {
             statusSub.unsubscribe();
             resource.destroy();
+            queueRef.destroy();
         },
         mutate: (value, ictx) => {
-            ctx = onMutate?.(value, ictx);
-            next.set(value);
+            if (shouldQueue) {
+                return queue.update((q) => [...q, [value, ictx]]);
+            }
+            else {
+                ctx = onMutate?.(value, ictx);
+                next.set(value);
+            }
         },
         current: next,
         // redeclare disabled with last value so that it is not affected by the resource's internal disablement logic