@ethlete/query 2.2.0 → 2.3.0

package/fesm2020/ethlete-query.mjs

@@ -1,5 +1,5 @@
 import { BehaviorSubjectWithSubscriberCount, getCookie, setCookie, deleteCookie, DestroyService, equal, clone } from '@ethlete/core';
-import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, interval, startWith, tap, timer, fromEvent, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
+import { Observable, filter, takeWhile, switchMap, of, BehaviorSubject, Subject, takeUntil, interval, startWith, tap, timer, fromEvent, take, concat, 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';
 import { FormGroup } from '@angular/forms';
@@ -494,6 +494,11 @@ function filterSuccess() {
         return source.pipe(filter((value) => isQueryStateSuccess(value)));
     };
 }
+function ignoreAutoRefresh() {
+    return function (source) {
+        return source.pipe(filter((value) => !isAutoRefresh(value)));
+    };
+}
 function filterFailure() {
     return function (source) {
         return source.pipe(filter((value) => isQueryStateFailure(value)));
@@ -534,6 +539,7 @@ const isQueryStateSuccess = (state) => state?.type === "SUCCESS" /* QueryStateTy
 const isQueryStateFailure = (state) => state?.type === "FAILURE" /* QueryStateType.Failure */;
 const isQueryStateCancelled = (state) => state?.type === "CANCELLED" /* QueryStateType.Cancelled */;
 const isQueryStatePrepared = (state) => state?.type === "PREPARED" /* QueryStateType.Prepared */;
+const isAutoRefresh = (state) => state?.meta.triggeredVia === 'auto';
 const mergeHeaders = (...headers) => {
     return headers.reduce((acc, headers) => {
         if (!headers) {
@@ -576,6 +582,13 @@ const getDefaultHeaders = (headers, method) => {
     }
     return headers;
 };
+const castQueryCreatorTypes = (config) => {
+    if (config.args?.pathParams) {
+        console.error(config);
+        throw new Error('Path params cannot be overridden in castQueryCreatorTypes. Create a new query creator instead.');
+    }
+    return config.creator;
+};
 
 class Query {
     get _nextId() {
@@ -1155,6 +1168,9 @@ class InfinityQuery {
         this._data$.next([]);
         this.nextPage();
     }
+    /**
+     * @internal
+     */
     _clearSubscriptions() {
         this._subscriptions.forEach((sub) => sub.unsubscribe());
         this._subscriptions = [];
@@ -1285,7 +1301,7 @@ class InfinityQueryDirective {
         this._cleanup();
         this._infinityQuery = v;
         this._infinityQueryInstance = this._setupInfinityQuery(v);
-        this._loadNextPage();
+        this.loadNextPage();
     }
     get context() {
         return this._viewContext;
@@ -1358,12 +1374,25 @@ class InfinityQueryDirective {
             .subscribe();
         return instance;
     }
+    /**
+     * @deprecated Use `loadNextPage` instead
+     * @breaking 3.0.0
+     */
     _loadNextPage() {
+        this.loadNextPage();
+    }
+    loadNextPage() {
         if (!this._infinityQueryInstance) {
             return;
         }
         this._infinityQueryInstance.nextPage();
     }
+    reset(newConfig) {
+        if (!this._infinityQueryInstance) {
+            return;
+        }
+        this._infinityQueryInstance.reset(newConfig);
+    }
     _renderMainView() {
         if (!this._isMainViewCreated) {
             this._isMainViewCreated = true;
@@ -1412,7 +1441,7 @@ class InfinityQueryTriggerDirective {
     ngOnInit() {
         const isInteractive = this._elementRef.nativeElement.hasAttribute('infinityQueryTrigger');
         if (isInteractive) {
-            this.click$.pipe(takeUntil(this._destroy)).subscribe(() => this._infinityQuery._loadNextPage());
+            this.click$.pipe(takeUntil(this._destroy)).subscribe(() => this._infinityQuery.loadNextPage());
         }
         else {
             this._setupIntersectionObserver();
@@ -1427,7 +1456,7 @@ class InfinityQueryTriggerDirective {
         this._observer = new IntersectionObserver((entries) => {
             const entry = entries[0];
             if (entry.isIntersecting && !this._infinityQuery.context.loading) {
-                this._infinityQuery._loadNextPage();
+                this._infinityQuery.loadNextPage();
             }
         }, {
             root: this.scrollContainerSelector ? document.querySelector(this.scrollContainerSelector) : null,
@@ -1455,6 +1484,8 @@ class QueryStore {
         this._config = _config;
         this._store = new Map();
         this._garbageCollector = null;
+        this._isInLowResourceMode = false;
+        this._lastBlurTimestamp = Date.now();
         this._initSmartQueryHandling();
     }
     add(id, query) {
@@ -1491,27 +1522,39 @@ class QueryStore {
         const windowBlur$ = fromEvent(window, 'blur');
         const windowFocus$ = fromEvent(window, 'focus');
         windowBlur$.subscribe(() => {
-            this._stopGarbageCollector();
-            if (this._config?.enableSmartPolling) {
-                this.forEach((query) => {
-                    if (!query.isPolling || !query._enableSmartPolling) {
-                        return;
-                    }
-                    query.pausePolling();
-                });
-            }
+            timer(5000)
+                .pipe(takeUntil(windowFocus$), take(1))
+                .subscribe(() => {
+                this._lastBlurTimestamp = Date.now();
+                this._isInLowResourceMode = true;
+                this._stopGarbageCollector();
+                if (this._config?.enableSmartPolling) {
+                    this.forEach((query) => {
+                        if (!query.isPolling || !query._enableSmartPolling) {
+                            return;
+                        }
+                        query.pausePolling();
+                    });
+                }
+            });
         });
         windowFocus$.subscribe(() => {
+            if (!this._isInLowResourceMode) {
+                return;
+            }
+            this._isInLowResourceMode = false;
             if (this._config?.enableSmartPolling || this._config?.autoRefreshQueriesOnWindowFocus) {
                 this.forEach((query) => {
                     if (this._config?.enableSmartPolling && query._isPollingPaused) {
                         query.resumePolling();
                     }
-                    if (this._config?.autoRefreshQueriesOnWindowFocus &&
-                        query.isExpired &&
-                        query.isInUse &&
-                        query.autoRefreshOnConfig.windowFocus) {
-                        query.execute({ skipCache: true, _triggeredVia: 'auto' });
+                    if (Date.now() - this._lastBlurTimestamp > 15000) {
+                        if (this._config?.autoRefreshQueriesOnWindowFocus &&
+                            query.isExpired &&
+                            query.isInUse &&
+                            query.autoRefreshOnConfig.windowFocus) {
+                            query.execute({ skipCache: true, _triggeredVia: 'auto' });
+                        }
                     }
                 });
             }
@@ -1542,6 +1585,7 @@ class QueryStore {
         if (this._garbageCollector !== null) {
             window.clearInterval(this._garbageCollector);
             this._garbageCollector = null;
+            this._logGarbageCollector('Stop');
         }
     }
     _runGarbageCollector() {
@@ -1554,7 +1598,6 @@ class QueryStore {
         this._logGarbageCollector('Collection done');
         if (!this._store.size) {
             this._stopGarbageCollector();
-            this._logGarbageCollector('Stop');
         }
     }
     _logGarbageCollector(action) {
@@ -1926,5 +1969,5 @@ const def = () => null;
  * Generated bundle index. Do not edit.
  */
 
-export { BasicAuthProvider, BearerAuthProvider, CustomHeaderAuthProvider, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, Query, QueryClient, QueryDirective, QueryError, QueryField, QueryForm, QueryStore, buildErrorMessage, buildGqlCacheKey, buildQueryArrayString, buildQueryString, buildRoute, buildTimestampFromSeconds, createInfinityQueryConfig, createQueryCollection, decryptBearer, deepFreeze, def, detectContentTypeHeader, extractExpiresInSeconds, extractQuery, filterFailure, filterInvalidParams, filterNull, filterQueryStates, filterSuccess, forEachHeader, getDefaultHeaders, getResponseUrl, gql, hasHeader, invalidBaseRouteError, invalidBodyError, invalidRouteError, isBasicAuthProvider, isBearerAuthProvider, isCustomHeaderAuthProvider, isFetchResponse, isGqlQueryConfig, isParamValid, isQuery, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, mergeHeaders, parseAllXhrResponseHeaders, pathParamsMissingInRouteFunctionError, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, request, serializeBody, shouldCacheQuery, shouldRetryRequest, skipPaginationPageParamCalculator, switchQueryCollectionState, switchQueryState, takeUntilResponse, transformGql, transformMethod, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray };
+export { BasicAuthProvider, BearerAuthProvider, CustomHeaderAuthProvider, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, Query, QueryClient, QueryDirective, QueryError, QueryField, QueryForm, QueryStore, buildErrorMessage, buildGqlCacheKey, buildQueryArrayString, buildQueryString, buildRoute, buildTimestampFromSeconds, castQueryCreatorTypes, createInfinityQueryConfig, createQueryCollection, decryptBearer, deepFreeze, def, detectContentTypeHeader, extractExpiresInSeconds, extractQuery, filterFailure, filterInvalidParams, filterNull, filterQueryStates, filterSuccess, forEachHeader, getDefaultHeaders, getResponseUrl, gql, hasHeader, ignoreAutoRefresh, invalidBaseRouteError, invalidBodyError, invalidRouteError, isAutoRefresh, isBasicAuthProvider, isBearerAuthProvider, isCustomHeaderAuthProvider, isFetchResponse, isGqlQueryConfig, isParamValid, isQuery, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, mergeHeaders, parseAllXhrResponseHeaders, pathParamsMissingInRouteFunctionError, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, request, serializeBody, shouldCacheQuery, shouldRetryRequest, skipPaginationPageParamCalculator, switchQueryCollectionState, switchQueryState, takeUntilResponse, transformGql, transformMethod, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray };
 //# sourceMappingURL=ethlete-query.mjs.map