@mmstack/resource 19.6.3 → 19.6.5

package/fesm2022/mmstack-resource.mjs

@@ -2455,13 +2455,19 @@ function mutationResource(request, options0 = {}) {
             return eq(a, b);
         },
     });
-    const queue = signal([]);
+    const queueEnabled = !!options.queue;
+    const queueKeyFn = typeof options.queue === 'object' ? options.queue.key : undefined;
+    const queue = linkedSignal({
+        source: () => queueKeyFn?.(),
+        computation: () => signal([]),
+    });
     let ctx = undefined;
     const queueRef = effect(() => {
-        const nextInQueue = queue().at(0);
+        const q = queue(); // subscribe to swaps (key change / clearQueue)
+        const nextInQueue = q().at(0); // subscribe to contents
         if (nextInQueue === undefined || next() !== NULL_VALUE)
             return;
-        queue.update((q) => q.slice(1));
+        q.update((arr) => arr.slice(1));
         const [value, ictx] = nextInQueue;
         try {
             ctx = onMutate?.(value, ictx);
@@ -2473,7 +2479,7 @@ function mutationResource(request, options0 = {}) {
             if (isDevMode())
                 console.error('[@mmstack/resource]: error thrown in onMutate hook, mutation was not applied', mutationErr);
         }
-    });
+    }, { injector: options.injector });
     const req = computed(() => {
         const nr = next();
         if (nr === NULL_VALUE)
@@ -2525,9 +2531,13 @@ function mutationResource(request, options0 = {}) {
     const destroyRef = options.injector
         ? options.injector.get(DestroyRef)
         : inject(DestroyRef);
-    const error$ = toObservable(resource.error);
-    const value$ = toObservable(resource.value).pipe(catchError(() => of(NULL_VALUE)));
-    const statusSub = toObservable(resource.status)
+    const error$ = toObservable(resource.error, { injector: options.injector });
+    const value$ = toObservable(resource.value, {
+        injector: options.injector,
+    }).pipe(catchError(() => of(NULL_VALUE)));
+    const statusSub = toObservable(resource.status, {
+        injector: options.injector,
+    })
         .pipe(combineLatestWith(error$, value$), map(([status, error, value]) => {
         if (status === ResourceStatus.Error && error) {
             return {
@@ -2563,7 +2573,6 @@ function mutationResource(request, options0 = {}) {
         ctx = undefined;
         next.set(NULL_VALUE);
     });
-    const shouldQueue = options.queue ?? false;
     const ref = {
         ...resource,
         destroy: () => {
@@ -2573,8 +2582,8 @@ function mutationResource(request, options0 = {}) {
             resource.destroy();
         },
         mutate: (value, ictx) => {
-            if (shouldQueue) {
-                return queue.update((q) => [...q, [value, ictx]]);
+            if (queueEnabled) {
+                return queue().update((arr) => [...arr, [value, ictx]]);
             }
             else {
                 // latest-wins: a mutation already in flight gets superseded (its request is
@@ -2608,6 +2617,11 @@ function mutationResource(request, options0 = {}) {
             const nv = next();
             return nv === NULL_VALUE ? null : nv;
         }),
+        clearQueue: () => {
+            if (!queueEnabled)
+                return;
+            queue.set(signal([]));
+        },
         // redeclare disabled with last value so that it is not affected by the resource's internal disablement logic
         disabled: computed(() => cb.isOpen() || lastValueRequest() === undefined),
     };