@ethlete/query 5.43.0 → 5.43.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @ethlete/query
 
+## 5.43.1
+
+### Patch Changes
+
+- [`f40e8a2`](https://github.com/ethlete-io/ethdk/commit/f40e8a224a6f0c527f4204e696966a1416da0f43) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix query state observable not getting properly memorized
+
+- [`f40e8a2`](https://github.com/ethlete-io/ethdk/commit/f40e8a224a6f0c527f4204e696966a1416da0f43) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix bearer auth provider causing maximum callstack exceeded errors in certain edge cases
+
 ## 5.43.0
 
 ### Minor Changes

package/fesm2022/ethlete-query.mjs

@@ -1,6 +1,6 @@
 import * as i1 from '@ethlete/core';
 import { createDestroy, computedTillTruthy, syncSignal, RuntimeError, isObject, injectRoute, getDomain, getCookie, setCookie, deleteCookie, clamp, previousSignalValue, DelayableDirective, nextFrame, injectQueryParamChanges, injectQueryParams, clone, equal, ET_PROPERTY_REMOVED } from '@ethlete/core';
-import { Observable, takeUntil, startWith, pairwise, tap, switchMap, of, BehaviorSubject, Subject, fromEvent, timer, take, Subscription, retry, throwError, catchError, ReplaySubject, map, shareReplay, interval, skip, takeWhile, filter, combineLatest, withLatestFrom, debounceTime, merge } from 'rxjs';
+import { Observable, takeUntil, startWith, pairwise, tap, switchMap, of, BehaviorSubject, Subject, fromEvent, timer, take, Subscription, retry, throwError, catchError, ReplaySubject, map, shareReplay, interval, skip, takeWhile, filter, combineLatest, EMPTY, withLatestFrom, debounceTime, merge } from 'rxjs';
 import { HttpStatusCode, HttpErrorResponse, HttpEventType, HttpClient, HttpHeaders } from '@angular/common/http';
 import * as i0 from '@angular/core';
 import { assertInInjectionContext, inject, Injector, runInInjectionContext, signal, effect, untracked, computed, isDevMode, InjectionToken, EnvironmentInjector, createEnvironmentInjector, DestroyRef, ɵEffectScheduler as _EffectScheduler, ErrorHandler, Pipe, ChangeDetectorRef, input, ViewContainerRef, TemplateRef, Directive, Input, ElementRef, ViewEncapsulation, ChangeDetectionStrategy, Component, NgZone } from '@angular/core';
@@ -4342,13 +4342,16 @@ class Query {
         return ++this._currentLocalId;
     }
     get state$() {
-        return this._state$.pipe(tap((s) => {
-            if (!this._client.config.logging?.preparedQuerySubscriptions)
-                return;
-            if (isQueryStatePrepared(s)) {
-                console.warn(`Query ${this._routeWithParams} was subscribed to in the prepared state. Did you forget to call .execute()?`);
-            }
-        }), switchMap((s) => this._transformState(s)), shareReplay({ bufferSize: 1, refCount: true }));
+        if (!this._memoizedState$) {
+            this._memoizedState$ = this._state$.pipe(tap((s) => {
+                if (!this._client.config.logging?.preparedQuerySubscriptions)
+                    return;
+                if (isQueryStatePrepared(s)) {
+                    console.warn(`Query ${this._routeWithParams} was subscribed to in the prepared state. Did you forget to call .execute()?`);
+                }
+            }), switchMap((s) => this._transformState(s)), shareReplay({ bufferSize: 1, refCount: true }));
+        }
+        return this._memoizedState$;
     }
     /**
      * The current state of the query.
@@ -4452,6 +4455,7 @@ class Query {
          * @internal
          */
         this._isPollingPaused = false;
+        this._memoizedState$ = null;
         this._state$ = new BehaviorSubject({
             type: "PREPARED" /* QueryStateType.Prepared */,
             meta: { id: this._currentLocalId, triggeredVia: 'program' },
@@ -4493,16 +4497,19 @@ class Query {
                     // The tokens might get set without a refresh query being created (e.g.) directly after login.
                     authProvider.currentRefreshQuery$.pipe(switchQueryState(), takeUntilResponse()),
                     authProvider.tokens$.pipe(take(1)),
-                ]).pipe(takeUntil(this._onAbort$), filter(([state, tokens]) => {
-                    if (state) {
-                        return !isQueryStateLoading(state);
+                ]).pipe(takeUntil(this._onAbort$), switchMap(([state, tokens]) => {
+                    if (state && isQueryStateLoading(state)) {
+                        return EMPTY;
                     }
-                    return !!tokens;
-                }), tap(([state]) => {
                     if (isQueryStateFailure(state)) {
                         this._updateEntityState({ type: 'failure', error: state.error, headers: {} }, meta, options);
+                        return EMPTY;
+                    }
+                    if (!state && !(tokens?.token || tokens?.refreshToken)) {
+                        return EMPTY;
                     }
-                }), map(() => true), take(1));
+                    return of(true);
+                }), take(1));
             }
             goSignal
                 .pipe(switchMap(() => {
@@ -4915,7 +4922,9 @@ class BearerAuthProvider {
         }) ?? {
             body: { refreshToken: currentRefreshToken },
         };
-        const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });
+        const query = this._config.refreshConfig.queryCreator
+            .prepare(args)
+            .execute({ skipCache: true, _isUnauthorizedRetry: true });
         this._currentRefreshQuery$.next(query);
         this._currentRefreshQuery$
             .pipe(switchQueryState(), tap((state) => {