@mmstack/resource 19.2.0 → 20.0.1

package/README.md

@@ -23,7 +23,7 @@
 1. Install mmstack-resource
 
 ```bash
-npm install @mmstack/primitives
+npm install @mmstack/resource
 ```
 
 2. Initialize the QueryCache & interceptors (optional)

package/fesm2022/mmstack-resource.mjs

@@ -1,4 +1,4 @@
-import { computed, untracked, InjectionToken, inject, isDevMode, signal, effect, linkedSignal, ResourceStatus, DestroyRef } from '@angular/core';
+import { computed, untracked, InjectionToken, inject, isDevMode, signal, effect, linkedSignal, DestroyRef } from '@angular/core';
 import { takeUntilDestroyed, toObservable } from '@angular/core/rxjs-interop';
 import { of, tap, map, finalize, shareReplay, interval, firstValueFrom, combineLatestWith, filter } from 'rxjs';
 import { HttpContextToken, HttpContext, HttpResponse, HttpParams, httpResource, HttpClient } from '@angular/common/http';
@@ -755,9 +755,9 @@ function retryOnError(res, opt) {
     };
     const ref = effect(() => {
         switch (res.status()) {
-            case ResourceStatus.Error:
+            case 'error':
                 return onError();
-            case ResourceStatus.Resolved:
+            case 'resolved':
                 return onSuccess();
         }
     });
@@ -805,7 +805,9 @@ function queryResource(request, options) {
             return undefined;
         return request() ?? undefined;
     }, {
-        equal: createEqualRequest(options?.equal),
+        equal: options?.triggerOnSameRequest
+            ? undefined
+            : createEqualRequest(options?.equal),
     });
     const hashFn = typeof options?.cache === 'object'
         ? (options.cache.hash ?? urlWithParams)
@@ -881,9 +883,9 @@ function queryResource(request, options) {
     // iterate circuit breaker state, is effect as a computed would cause a circular dependency (resource -> cb -> resource)
     const cbEffectRef = effect(() => {
         const status = resource.status();
-        if (status === ResourceStatus.Error)
+        if (status === 'error')
             cb.fail();
-        else if (status === ResourceStatus.Resolved)
+        else if (status === 'resolved')
             cb.success();
     });
     const set = (value) => {
@@ -1007,22 +1009,22 @@ function mutationResource(request, options = {}) {
     const value$ = toObservable(resource.value);
     const statusSub = toObservable(resource.status)
         .pipe(combineLatestWith(error$, value$), map(([status, error, value]) => {
-        if (status === ResourceStatus.Error && error) {
+        if (status === 'error' && error) {
             return {
-                status: ResourceStatus.Error,
+                status: 'error',
                 error,
             };
         }
-        if (status === ResourceStatus.Resolved && value !== null) {
+        if (status === 'resolved' && value !== null) {
             return {
-                status: ResourceStatus.Resolved,
+                status: 'resolved',
                 value,
             };
         }
         return null;
     }), filter((v) => v !== null), takeUntilDestroyed(destroyRef))
         .subscribe((result) => {
-        if (result.status === ResourceStatus.Error)
+        if (result.status === 'error')
             onError?.(result.error, ctx);
         else
             onSuccess?.(result.value, ctx);