@ethlete/query 1.0.1 → 2.0.0

package/fesm2020/ethlete-query.mjs

@@ -1,4 +1,4 @@
-import { getCookie, setCookie, deleteCookie, DestroyService, equal, clone } from '@ethlete/core';
+import { BehaviorSubjectWithSubscriberCount, getCookie, setCookie, deleteCookie, DestroyService, equal, clone } from '@ethlete/core';
 import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, interval, tap, timer, fromEvent, startWith, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
 import * as i0 from '@angular/core';
 import { Directive, Input, InjectionToken, inject, ChangeDetectorRef, ViewContainerRef, TemplateRef, ErrorHandler, ElementRef } from '@angular/core';
@@ -545,6 +545,12 @@ class Query {
         }
         return ts < Date.now();
     }
+    get isInUse() {
+        return this._state$.subscriberCount > 0;
+    }
+    get _config() {
+        return this._queryConfig;
+    }
     constructor(_client, _queryConfig, _routeWithParams, _args) {
         this._client = _client;
         this._queryConfig = _queryConfig;
@@ -553,7 +559,7 @@ class Query {
         this._currentId = 0;
         this._pollingSubscription = null;
         this._onAbort$ = new Subject();
-        this._state$ = new BehaviorSubject({
+        this._state$ = new BehaviorSubjectWithSubscriberCount({
             type: "PREPARED" /* QueryStateType.Prepared */,
             meta: { id: this._currentId },
         });
@@ -1355,6 +1361,24 @@ class QueryStore {
         this._store.delete(id);
         this._logState(id, null, 'REMOVE');
     }
+    forEach(callback) {
+        for (const [key, query] of this._store) {
+            callback(query, key);
+        }
+    }
+    refreshQueriesInUse(config) {
+        const { ignoreCacheValidity, purgeUnused } = config ?? {};
+        for (const [key, query] of this._store) {
+            if (query.isInUse &&
+                (query.isExpired || ignoreCacheValidity) &&
+                (query._config.autoRefreshOn?.queryClientDefaultHeadersChange ?? true)) {
+                query.execute({ skipCache: true });
+            }
+            else if (purgeUnused && !query.isInUse) {
+                this.remove(key);
+            }
+        }
+    }
     _logState(key, item, operation) {
         if (!this._config?.enableChangeLogging)
             return;
@@ -1384,7 +1408,7 @@ class QueryStore {
     _runGarbageCollector() {
         this._logGarbageCollector('Collecting...');
         this._store.forEach((item, key) => {
-            if (item.isExpired) {
+            if (item.isExpired && !item.isInUse) {
                 this.remove(key);
             }
         });
@@ -1470,6 +1494,9 @@ class QueryClient {
                 if (shouldCacheQuery(queryConfig.method)) {
                     const existingQuery = this._store.get(cacheKey);
                     if (existingQuery) {
+                        if (existingQuery.isExpired) {
+                            existingQuery.execute();
+                        }
                         return existingQuery;
                     }
                 }
@@ -1491,14 +1518,17 @@ class QueryClient {
             }
             this._authProvider$.next(authProvider);
         };
-        this.setDefaultHeaders = (headers) => {
+        this.setDefaultHeaders = (config) => {
             if (!this._clientConfig.request) {
                 this._clientConfig.request = {
-                    headers: headers ?? undefined,
+                    headers: config.headers ?? undefined,
                 };
             }
             else {
-                this._clientConfig.request.headers = headers ?? undefined;
+                this._clientConfig.request.headers = config.headers ?? undefined;
+            }
+            if (config.refreshQueriesInUse) {
+                this._store.refreshQueriesInUse({ purgeUnused: true, ignoreCacheValidity: true });
             }
         };
         this.clearAuthProvider = () => {