@ethlete/query 6.0.0-next.39 → 6.0.0-next.40

package/fesm2022/ethlete-query.mjs

@@ -1,10 +1,10 @@
 import * as i0 from '@angular/core';
-import { inject, computed, DestroyRef, InjectionToken, Injector, EnvironmentInjector, ElementRef, ErrorHandler, createEnvironmentInjector, effect, untracked, signal, linkedSignal, runInInjectionContext, isDevMode, PLATFORM_ID, resource, DOCUMENT, VERSION, makeEnvironmentProviders, assertInInjectionContext, provideEnvironmentInitializer, ChangeDetectorRef, ViewContainerRef, TemplateRef, Input, Directive, input, Pipe, ViewEncapsulation, Component, NgZone } from '@angular/core';
-import { toObservable, takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
+import { inject, Injector, effect, DestroyRef, InjectionToken, EnvironmentInjector, ElementRef, ErrorHandler, createEnvironmentInjector, untracked, signal, linkedSignal, computed, runInInjectionContext, isDevMode, PLATFORM_ID, resource, DOCUMENT, VERSION, makeEnvironmentProviders, assertInInjectionContext, provideEnvironmentInitializer, ChangeDetectorRef, ViewContainerRef, TemplateRef, Input, Directive, input, Pipe, ViewEncapsulation, Component, NgZone } from '@angular/core';
 import { UrlTree, Router, RedirectCommand, ActivatedRoute } from '@angular/router';
-import { filter, take, map, defer, from, Subject, Subscription, throwError, of, timer, switchMap, tap, retry, catchError, EMPTY, takeUntil, finalize, mergeMap, toArray, merge, takeWhile, firstValueFrom, race, concatMap, fromEvent, throttleTime, interval, combineLatest, Observable, startWith, pairwise, BehaviorSubject, ReplaySubject, shareReplay, skip, withLatestFrom, debounceTime } from 'rxjs';
-import { defineStaticProvider, RuntimeError, clamp, randomId, defineRootProvider, isObject, injectUnsavedChangesCoordinator, injectRoute, getCookie, getDomain, deleteCookie, setCookie, CORE_VERSION, createDestroy, computedTillTruthy, defineProvider, toProvideFn, toInjectFn, nextFrame, injectQueryParams, injectQueryParamChanges, clone, equal, ET_PROPERTY_REMOVED, previousSignalValue } from '@ethlete/core';
+import { Observable, defer, from, filter, Subject, Subscription, throwError, of, timer, switchMap, tap, retry, catchError, EMPTY, take, takeUntil, finalize, mergeMap, toArray, map, merge, takeWhile, firstValueFrom, race, concatMap, fromEvent, throttleTime, interval, startWith, pairwise, BehaviorSubject, combineLatest, ReplaySubject, shareReplay, skip, withLatestFrom, debounceTime } from 'rxjs';
+import { defineStaticProvider, RuntimeError, clamp, randomId, defineRootProvider, isObject, injectUnsavedChangesCoordinator, injectRoute, getCookie, deleteCookie, setCookie, CORE_VERSION, createDestroy, computedTillTruthy, defineProvider, toProvideFn, toInjectFn, nextFrame, injectQueryParams, injectQueryParamChanges, clone, equal, ET_PROPERTY_REMOVED, previousSignalValue } from '@ethlete/core';
 import { HttpClient, HttpEventType, HttpErrorResponse, HttpResponse, HttpHeaders, HttpStatusCode } from '@angular/common/http';
+import { toObservable, takeUntilDestroyed, toSignal } from '@angular/core/rxjs-interop';
 import { getActiveConsumer, setActiveConsumer } from '@angular/core/primitives/signals';
 import { isPlatformBrowser, NgClass, AsyncPipe, JsonPipe } from '@angular/common';
 import { validateAsync, form } from '@angular/forms/signals';
@@ -53,15 +53,15 @@ const createAuthGuard = (providerRef, config) => {
     const behavior = config.navigationBehaviorOptions ?? { replaceUrl: true };
     const guardFor = (requiresSession) => () => {
         const router = inject(Router);
+        const injector = inject(Injector);
         const provider = providerRef.inject();
         // Captured before the wait below: once the session settles the router has moved on, and the URL
         // the visitor actually asked for is no longer reachable from it.
         const attemptedUrl = router.currentNavigation()?.extractedUrl.toString() ?? router.url;
-        const settled = computed(() => {
+        const settled = () => {
             const status = provider.sessionStatus();
             return status !== 'unknown' && status !== 'restoring';
-        }, /* @ts-ignore */
-        ...(ngDevMode ? [{ debugName: "settled" }] : /* istanbul ignore next */ []));
+        };
         const decide = () => {
             const authenticated = provider.sessionStatus() === 'authenticated';
             if (authenticated === requiresSession)
@@ -75,7 +75,15 @@ const createAuthGuard = (providerRef, config) => {
         };
         if (settled())
             return decide();
-        return toObservable(settled).pipe(filter(Boolean), take(1), map(decide));
+        return new Observable((subscriber) => {
+            const watcher = effect(() => {
+                if (!settled())
+                    return;
+                subscriber.next(decide());
+                subscriber.complete();
+            }, { ...(ngDevMode ? { debugName: "watcher" } : /* istanbul ignore next */ {}), injector });
+            return () => watcher.destroy();
+        });
     };
     const requireSession = guardFor(true);
     const requireAnonymous = guardFor(false);
@@ -331,13 +339,12 @@ const consumeSuppressQueryStackDevtools = () => {
 const isCreateGqlQueryOptions = (options) => 'transport' in options.creatorInternals;
 
 const wrapAsObservableSignal = (source, defaultInjector) => {
+    const default$ = toObservable(source, { injector: defaultInjector });
     const asObservable = (options) => {
-        const effectiveInjector = options?.injector ?? defaultInjector;
-        const base$ = toObservable(source, { injector: effectiveInjector });
         if (options?.injector) {
-            return base$.pipe(takeUntilDestroyed(defaultInjector.get(DestroyRef)));
+            return toObservable(source, { injector: options.injector }).pipe(takeUntilDestroyed(defaultInjector.get(DestroyRef)));
         }
-        return base$;
+        return default$;
     };
     return Object.assign(source, { asObservable });
 };
@@ -693,7 +700,7 @@ const withPolling = (options) => {
                     // It should have args because a withArgs feature is present.
                     if (args === null && context.flags.hasWithArgsFeature)
                         return;
-                    if (options.executeInitially) {
+                    if (options.executeInitially && (!hold || hold.isHolder())) {
                         context.execute({ args });
                     }
                     intervalId = window.setInterval(() => {
@@ -1329,6 +1336,7 @@ const resetExecuteState = (options) => {
     const { executeState, executeOptions: opts } = options;
     const { state } = opts;
     opts.deps.client.repository.unbind(executeState.previousKey(), opts.deps.destroyRef);
+    executeState.previousKey.set(null);
     state.args.set(null);
     state.error.set(null);
     state.latestHttpEvent.set(null);
@@ -1513,21 +1521,24 @@ const buildQueryString = (params, config) => {
         }
         else if (Array.isArray(value)) {
             let currentFilteredIndex = 0;
+            let didAddAnyValue = false;
             for (const arrayValue of value) {
                 const nestedKey = writeArrayIndexes ? `${key}[${currentFilteredIndex}]` : `${key}[]`;
                 const didAddValue = processValue(nestedKey, arrayValue);
                 if (didAddValue) {
                     currentFilteredIndex++;
+                    didAddAnyValue = true;
                 }
             }
-            return null;
+            return didAddAnyValue;
         }
         else if (typeof value === 'object' && value !== null) {
+            let didAddAnyValue = false;
             for (const [objKey, val] of Object.entries(value)) {
                 const nestedKey = objectNotation === 'dot' ? `${key}.${objKey}` : `${key}[${objKey}]`;
-                processValue(nestedKey, val);
+                didAddAnyValue = processValue(nestedKey, val) || didAddAnyValue;
             }
-            return null;
+            return didAddAnyValue;
         }
         else {
             if (ignoredValues.includes(value)) {
@@ -1593,7 +1604,7 @@ const decryptBearer = (token) => {
         return JSON.parse(jsonPayload);
     }
     catch (error) {
-        console.error(`Invalid bearer token: ${token}`, error);
+        console.error('Invalid bearer token', error);
         return null;
     }
 };
@@ -1605,26 +1616,18 @@ const extractExpiresInSeconds = (headers) => {
     // In seconds
     let expiresIn = null;
     let maxAge = null;
-    if (cacheControl?.includes('no-cache')) {
+    if (cacheControl && /(?:^|,)\s*no-(?:cache|store)(?:\s|,|$)/i.test(cacheControl)) {
         return null;
     }
-    if (cacheControl?.includes('max-age')) {
-        const m = cacheControl.split('max-age=')[1];
-        if (m) {
-            maxAge = parseInt(m);
-        }
+    const maxAgeMatch = cacheControl?.match(/(?:^|,)\s*(?:s-maxage|max-age)=(\d+)/i);
+    if (maxAgeMatch?.[1]) {
+        maxAge = parseInt(maxAgeMatch[1]);
     }
-    else if (cacheControl?.includes('s-maxage')) {
-        const m = cacheControl.split('s-maxage=')[1];
-        if (m) {
-            maxAge = parseInt(m);
-        }
-    }
-    if (maxAge && age) {
+    if (maxAge !== null && age) {
         const ageSeconds = parseInt(age);
-        expiresIn = maxAge - ageSeconds;
+        expiresIn = Math.max(maxAge - ageSeconds, 0);
     }
-    else if (maxAge) {
+    else if (maxAge !== null) {
         expiresIn = maxAge / 2; // We assume the response is half way to its expiration
     }
     else if (expires) {
@@ -1647,21 +1650,27 @@ const shouldCacheQuery = (method) => {
     return method === 'GET' || method === 'OPTIONS' || method === 'HEAD';
 };
 const buildQueryCacheKey = (route, args) => {
+    const headers = typeof args?.headers === 'function' ? args.headers() : args?.headers;
+    const serializedHeaders = headers
+        ?.keys()
+        .filter((name) => name.toLowerCase() !== 'authorization')
+        .sort()
+        .map((name) => [name.toLowerCase(), headers.getAll(name)]);
     // We need to hash the body in case it's a gql query and the query get's transported in the body
     const body = JSON.stringify(args?.body || {})
         // replace all curly braces with empty string
         .replace(/{|}/g, '')
         // replace new lines and whitespaces with empty string
         .replace(/\s/g, '');
-    const seed = `${route}_${body}`;
+    const headerInput = serializedHeaders?.length ? `_${JSON.stringify(serializedHeaders)}` : '';
+    const seed = `${route}_${body}${headerInput}`;
     let hash = 0;
+    let secondaryHash = 5381;
     for (const char of seed) {
         hash = (Math.imul(31, hash) + char.charCodeAt(0)) << 0;
+        secondaryHash = Math.imul(33, secondaryHash) ^ char.charCodeAt(0);
     }
-    // Force positive number hash.
-    // 2147483647 = equivalent of Integer.MAX_VALUE.
-    hash += 2147483647 + 1;
-    return hash.toString();
+    return `${(hash >>> 0).toString().padStart(10, '0')}${(secondaryHash >>> 0).toString().padStart(10, '0')}`;
 };
 
 const parsers = [];
@@ -1725,7 +1734,7 @@ const queryErrorMessages = (error) => {
  * {@link queryErrorMessages}, for a toast or a form-field hint.
  */
 const queryErrorMessage = (error) => queryErrorMessages(error)[0] ?? null;
-const createQueryErrorResponse = (error) => {
+const createQueryErrorResponse = (error, retry) => {
     let err = error instanceof HttpErrorResponse ? error : null;
     if (!err) {
         err = new HttpErrorResponse({
@@ -1734,7 +1743,8 @@ const createQueryErrorResponse = (error) => {
             statusText: 'Unknown Error',
         });
     }
-    const retryState = runDefaultQueryRetry({ retryCount: 0, error: err });
+    const retryOptions = { retryCount: retry?.retryCount ?? 0, error: err };
+    const retryState = typeof retry?.retryFn === 'function' ? retry.retryFn(retryOptions) : runDefaultQueryRetry(retryOptions);
     const detail = err.error;
     const errorList = [];
     const parsed = runQueryErrorParsers(detail, err);
@@ -2010,7 +2020,10 @@ const createHttpRequest = (options) => {
         event$.next(event);
     };
     const updateErrorState = (errorResponse) => {
-        const errorRes = createQueryErrorResponse(errorResponse);
+        const errorRes = createQueryErrorResponse(errorResponse, {
+            retryCount: attempts(),
+            retryFn: options.retryFn,
+        });
         error.set(errorRes);
         loading.set(null);
         lastDurationMs.set(Date.now() - lastExecuteTime());
@@ -2047,7 +2060,7 @@ const createHttpRequest = (options) => {
         if (isMeasurable && elapsedTimeSinceLastExecute > SPEED_BUFFER_TIME_IN_MS) {
             const bytesPerSecond = (loadedAmount / elapsedTimeSinceLastEvent) * 1000;
             progress.speed = bytesPerSecond;
-            progress.remainingTime = Math.round((event.total - event.loaded) / bytesPerSecond) * 1000;
+            progress.remainingTime = Math.round(((event.total - event.loaded) / bytesPerSecond) * 1000);
         }
         if (isMeasurable) {
             lastLoadEventTime.set(currentTime);
@@ -2357,7 +2370,8 @@ const createPagedQueryStack = (options) => {
                 return { queries: oldQueries, lastQuery };
             }
             else if (dir === 'previous') {
-                return { queries: [newQuery, ...oldQueries], lastQuery: newQuery };
+                const queries = [newQuery, ...oldQueries];
+                return { queries, lastQuery: queries[queries.length - 1] ?? null };
             }
             else {
                 return { queries: [...oldQueries, newQuery], lastQuery: newQuery };
@@ -2414,10 +2428,14 @@ const createPagedQueryStack = (options) => {
             }
             return null;
         }
-        currentPageArgs.set(options.args(page, allResponses));
-        loadedMinPage.set(page);
+        const args = options.args(page, allResponses);
         pageDirection.set('previous');
-        return stack.subtle.runWithArgs(currentPageArgs());
+        const query = stack.subtle.runWithArgs(args);
+        if (query) {
+            currentPageArgs.set(args);
+            loadedMinPage.set(page);
+        }
+        return query;
     };
     const fetchNextPage = () => {
         const page = loadedMaxPage() + 1;
@@ -2438,10 +2456,14 @@ const createPagedQueryStack = (options) => {
             }
             return null;
         }
-        currentPageArgs.set(options.args(page, allResponses));
-        loadedMaxPage.set(page);
+        const args = options.args(page, allResponses);
         pageDirection.set('next');
-        return stack.subtle.runWithArgs(currentPageArgs());
+        const query = stack.subtle.runWithArgs(args);
+        if (query) {
+            currentPageArgs.set(args);
+            loadedMaxPage.set(page);
+        }
+        return query;
     };
     const canFetchNewPage = (pageToLoad) => {
         const currentMaxPagination = maxPagination();
@@ -3157,7 +3179,11 @@ const createQueryBatch = (options) => {
         completedBeforeRun.set(completed());
         runStartedAt.set(Date.now());
         lastSettleAt.set(null);
-        return from(entries).pipe(mergeMap((entry) => runEntry(entry), concurrency), toArray(), map(() => settleRun(entries)));
+        return from(entries).pipe(mergeMap((entry) => runEntry(entry), concurrency), toArray(), map(() => settleRun(entries)), finalize(() => {
+            if (status() === 'running')
+                status.set('idle');
+            running.set(false);
+        }));
     });
     const run = (items) => runEntries(() => {
         settled = new Array(items.length);
@@ -4065,6 +4091,10 @@ const createQueryRepository = (config) => {
     const destroyEntry = (key, cacheEntry, cause) => {
         const { method, url } = cacheEntry.request;
         clearTimeout(cacheEntry.evictTimer);
+        for (const unregister of cacheEntry.consumers.values()) {
+            unregister();
+        }
+        cacheEntry.consumers.clear();
         cacheEntry.request.destroy();
         cacheEntry.eventSubscription?.unsubscribe();
         cache.delete(key);
@@ -4088,6 +4118,7 @@ const createQueryRepository = (config) => {
         }
     };
     const retain = (key, cacheEntry) => {
+        clearTimeout(cacheEntry.evictTimer);
         cacheEntry.unusedSince = Date.now();
         cacheEntry.evictTimer = setTimeout(() => evict(key, 'expired'), cacheEntry.keepUnusedFor);
         enforceUnusedEntryLimit();
@@ -4098,6 +4129,10 @@ const createQueryRepository = (config) => {
         const cacheEntry = cache.get(key);
         if (!cacheEntry)
             return false;
+        const unregister = cacheEntry.consumers.get(consumerDestroyRef);
+        if (!unregister)
+            return false;
+        unregister();
         cacheEntry.consumers.delete(consumerDestroyRef);
         if (cacheEntry.consumers.size === 0) {
             // Only data is worth keeping around: an entry that never produced a response has nothing to
@@ -4172,32 +4207,48 @@ const createQueryRepository = (config) => {
     };
     const bind = (options) => {
         const { key, consumerDestroyRef, request, isSecure, isCached, isRefreshable, isMultiTabSyncEnabled, isPersistEnabled, keepUnusedFor, } = options;
-        const destroyListener = consumerDestroyRef.onDestroy(() => unbind(key, consumerDestroyRef));
         const cacheEntry = cache.get(key);
         if (cacheEntry && isCached) {
-            cacheEntry.consumers.set(consumerDestroyRef, destroyListener);
+            cacheEntry.isSecure ||= isSecure;
+            cacheEntry.isRefreshable ||= isRefreshable;
+            cacheEntry.isMultiTabSyncEnabled &&= isMultiTabSyncEnabled;
+            cacheEntry.isPersistEnabled &&= isPersistEnabled;
+            cacheEntry.keepUnusedFor = Math.min(cacheEntry.keepUnusedFor, keepUnusedFor);
+            if (!cacheEntry.consumers.has(consumerDestroyRef)) {
+                cacheEntry.consumers.set(consumerDestroyRef, consumerDestroyRef.onDestroy(() => unbind(key, consumerDestroyRef)));
+            }
         }
         else {
             const consumers = new Map([]);
-            consumers.set(consumerDestroyRef, destroyListener);
+            consumers.set(consumerDestroyRef, consumerDestroyRef.onDestroy(() => unbind(key, consumerDestroyRef)));
             // Drive repository events off the request's discrete, terminal event stream rather than
             // recombining the `error` + `response` signals via combineLatest (which could observe stale
             // pairings). Each settle emits exactly one terminal event.
             const eventSubscription = request.events$.subscribe((event) => {
+                const currentEntry = cache.get(key);
+                const currentIsSecure = currentEntry?.isSecure ?? isSecure;
+                const currentIsMultiTabSyncEnabled = currentEntry?.isMultiTabSyncEnabled ?? isMultiTabSyncEnabled;
+                const currentIsPersistEnabled = currentEntry?.isPersistEnabled ?? isPersistEnabled;
                 if (event.type === 'error') {
                     if (event.error.raw instanceof HttpErrorResponse) {
-                        eventsSubject.next({ type: 'request-error', error: event.error.raw, key, isSecure, request });
+                        eventsSubject.next({
+                            type: 'request-error',
+                            error: event.error.raw,
+                            key,
+                            isSecure: currentIsSecure,
+                            request,
+                        });
                     }
                 }
                 else if (event.type === HttpEventType.Response) {
                     eventsSubject.next({
                         type: 'request-success',
                         key,
-                        isSecure,
+                        isSecure: currentIsSecure,
                         request,
                         isCached,
-                        isMultiTabSyncEnabled,
-                        isPersistEnabled,
+                        isMultiTabSyncEnabled: currentIsMultiTabSyncEnabled,
+                        isPersistEnabled: currentIsPersistEnabled,
                     });
                 }
             });
@@ -4440,7 +4491,7 @@ const createSecureExecuteFactory = (options) => {
             .pipe(filter(() => {
             const currentError = options.state.error();
             return currentError?.code === 401 && options.authProvider.accessToken() !== lastRequestedWithToken;
-        }), take(1), tap(() => exec(execArgsWithDefaults)))
+        }), take(1), tap(() => exec(execArgsWithDefaults)), takeUntilDestroyed(options.deps.destroyRef))
             .subscribe();
         // `setTokens()` seeds an auth session from outside the query registry (an SSO/OIDC callback, a
         // native shell) - no query ever runs for `latestExecutedQuery` to report, so a successful token
@@ -4606,30 +4657,35 @@ const buildSequence = (steps, state, devtoolsHandle) => {
         const stepArgs = [];
         const responses = [];
         let previousResponse = undefined;
-        for (const [i, step] of steps.entries()) {
-            state.currentStep.set(i + 1);
-            const { args } = step.produceArgs(previousResponse, responses);
-            stepArgs.push(args);
-            state.stepArgs.set([...stepArgs]);
-            const snapshot = await executeUntilSettled(step.query, { args });
-            snapshots.push(snapshot);
-            state.snapshots.set([...snapshots]);
-            const error = snapshot.error();
-            if (error) {
-                state.status.set('error');
-                state.error.set(error);
-                state.failedAt.set(i);
-                state.running.set(false);
-                return { ok: false, failedAt: i, error, snapshots };
+        try {
+            for (const [i, step] of steps.entries()) {
+                state.currentStep.set(i + 1);
+                const { args } = step.produceArgs(previousResponse, responses);
+                stepArgs.push(args);
+                state.stepArgs.set([...stepArgs]);
+                const snapshot = await executeUntilSettled(step.query, { args });
+                snapshots.push(snapshot);
+                state.snapshots.set([...snapshots]);
+                const error = snapshot.error();
+                if (error) {
+                    state.status.set('error');
+                    state.error.set(error);
+                    state.failedAt.set(i);
+                    return { ok: false, failedAt: i, error, snapshots };
+                }
+                const response = snapshot.response();
+                responses.push(response);
+                state.responses.set([...responses]);
+                previousResponse = response;
             }
-            const response = snapshot.response();
-            responses.push(response);
-            state.responses.set([...responses]);
-            previousResponse = response;
+            state.status.set('success');
+            return { ok: true, responses: responses, snapshots };
+        }
+        finally {
+            if (state.status() === 'running')
+                state.status.set('idle');
+            state.running.set(false);
         }
-        state.status.set('success');
-        state.running.set(false);
-        return { ok: true, responses: responses, snapshots };
     };
     const completed = computed(() => state.snapshots().length, /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "completed" }] : /* istanbul ignore next */ []));
@@ -5002,39 +5058,10 @@ const setupBearerQueryRegistry = (builders, context) => {
         ...(ngDevMode ? [{ debugName: "querySnapshot" }] : /* istanbul ignore next */ []));
         querySnapshots.set(builder.key, querySnapshot);
         const extractTokens = builder.config.extractTokens ?? defaultExtractTokens;
-        // A 2xx whose body carries no usable tokens is a failed execution, not a successful one - the
-        // state effect below reads this so it cannot report `success` for an attempt that left the tab
-        // unauthenticated.
-        const extractionError = signal(null, /* @ts-ignore */
-        ...(ngDevMode ? [{ debugName: "extractionError" }] : /* istanbul ignore next */ []));
         const currentExecution = signal(null, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "currentExecution" }] : /* istanbul ignore next */ []));
         currentExecutions.push(currentExecution);
         const isSuperseded = (execution) => execution.id !== null && execution.id !== latestExecutionId;
-        // Runs before the state effect below, which reads the extraction error this one writes. Angular
-        // runs effects in creation order, so the two must stay in this order.
-        effect(() => {
-            const execution = currentExecution();
-            if (!execution)
-                return;
-            const { snapshot } = execution;
-            const response = snapshot.response();
-            const loading = snapshot.loading();
-            const error = snapshot.error();
-            if (response && !loading && !error && !isSuperseded(execution)) {
-                try {
-                    const tokens = extractTokens(response);
-                    extractionError.set(null);
-                    applyTokens(tokens.accessToken, tokens.refreshToken);
-                }
-                catch (extractError) {
-                    extractionError.set(createQueryErrorResponse(extractError));
-                    if (isDevMode()) {
-                        console.error(`Failed to extract tokens from ${builder.key} response:`, extractError);
-                    }
-                }
-            }
-        });
         effect(() => {
             const execution = currentExecution();
             if (!execution)
@@ -5049,13 +5076,17 @@ const setupBearerQueryRegistry = (builders, context) => {
                 executionState.set({ type, state: 'error', error });
             }
             else if (response) {
-                const failedExtraction = extractionError();
-                if (failedExtraction) {
-                    executionState.set({ type, state: 'error', error: failedExtraction });
-                }
-                else {
+                try {
+                    const tokens = extractTokens(response);
+                    applyTokens(tokens.accessToken, tokens.refreshToken);
                     executionState.set({ type, state: 'success', response });
                 }
+                catch (extractError) {
+                    executionState.set({ type, state: 'error', error: createQueryErrorResponse(extractError) });
+                    if (isDevMode()) {
+                        console.error(`Failed to extract tokens from ${builder.key} response:`, extractError);
+                    }
+                }
             }
             // Keyed on `isAlive` rather than on the branches above: a cancelled restore produces neither a
             // response nor an error, and would otherwise leave `sessionStatus` at `restoring` forever.
@@ -5069,7 +5100,6 @@ const setupBearerQueryRegistry = (builders, context) => {
         let query = null;
         const execute = (args, options) => {
             query ??= builder.config.queryCreator({ onlyManualExecution: true, injector });
-            extractionError.set(null);
             query.execute({ args, options });
             const snapshot = query.createSnapshot();
             const stateType = deriveExecutionStateType(builder, options?.triggeredBy);
@@ -5098,7 +5128,10 @@ const setupBearerQueryRegistry = (builders, context) => {
         return !!current && current.id !== null && current.snapshot.isAlive();
     }), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "hasTokenIssuingExecutionInFlight" }] : /* istanbul ignore next */ []));
-    return { queries, querySnapshots, hasTokenIssuingExecutionInFlight };
+    const invalidateTokenIssuingExecutions = () => {
+        latestExecutionId++;
+    };
+    return { queries, querySnapshots, hasTokenIssuingExecutionInFlight, invalidateTokenIssuingExecutions };
 };
 const setupFeatures = (featureBuilders, context) => {
     const features = {};
@@ -5219,7 +5252,7 @@ const createBearerAuthProviderImpl = (config) => {
         applyTokens(access, refresh);
         executionState.set({ type: 'tokenSeed', state: 'success' });
     };
-    const { queries, hasTokenIssuingExecutionInFlight } = setupBearerQueryRegistry(config.queries, {
+    const { queries, hasTokenIssuingExecutionInFlight, invalidateTokenIssuingExecutions } = setupBearerQueryRegistry(config.queries, {
         injector,
         latestExecutedQuery,
         latestNonInternalQuery,
@@ -5229,6 +5262,7 @@ const createBearerAuthProviderImpl = (config) => {
         isAuthenticated,
     });
     const logout = (cause = 'user') => {
+        invalidateTokenIssuingExecutions();
         accessToken.set(null);
         refreshToken.set(null);
         queryClient.repository.unbindAllSecure();
@@ -5264,12 +5298,14 @@ const createBearerAuthProviderImpl = (config) => {
         logout,
         afterTokenRefresh$,
         queries: queries,
+        executionState: executionState.asReadonly(),
         hasTokenIssuingExecutionInFlight,
     };
     for (const builder of config.queries) {
         builder.setup?.(querySetupContext);
     }
     const featureSetupContext = {
+        name: config.name,
         refreshToken,
         accessToken,
         bearerData,
@@ -5283,6 +5319,7 @@ const createBearerAuthProviderImpl = (config) => {
         activityCoordination: isLeader.activityCoordination,
         afterTokenRefresh$,
         queries: queries,
+        latestExecutedQuery: latestExecutedQuery.asReadonly(),
         executionState,
         sessionStatus: sessionStatus.asReadonly(),
         sessionEndCause: sessionEndCause.asReadonly(),
@@ -5396,7 +5433,11 @@ const withAuthenticationQuery = (key, config, setup) => ({
         ...config,
         // A spent credential entry must not sit out a retention window: the request body holds the
         // username and password, the response the tokens it was exchanged for.
-        queryCreator: config.queryCreator.clone({ keepUnusedFor: 0, subtle: { useQueryRepositoryCache: true } }),
+        queryCreator: config.queryCreator.clone({
+            ...(config.retryFn ? { retryFn: config.retryFn } : {}),
+            keepUnusedFor: 0,
+            subtle: { useQueryRepositoryCache: true },
+        }),
     },
     setup,
 });
@@ -5593,7 +5634,9 @@ const withRefreshQuery = (key, config) => {
         };
         const calculateRefreshBuffer = (tokenLifetimeMs) => {
             if (typeof config.refreshStrategy === 'number') {
-                return config.refreshStrategy;
+                return config.refreshStrategy >= 0 && config.refreshStrategy <= 1
+                    ? tokenLifetimeMs * (1 - config.refreshStrategy)
+                    : config.refreshStrategy;
             }
             const percentage = config.refreshStrategy?.percentage ?? 0.75;
             const minBufferMs = config.refreshStrategy?.minBufferMs ?? 60000; // 1 minute
@@ -5659,7 +5702,7 @@ const withRefreshQuery = (key, config) => {
          * Without the re-arm a single declined attempt strands the session on a token nothing renews until
          * a request fails with a 401 - by which time the refresh token may be gone too.
          */
-        const scheduledRefresh = (dueInMs, attemptsLeft) => (dueInMs <= 0 ? of(0) : timer(dueInMs)).pipe(concatMap(() => {
+        const scheduledRefresh = (dueInMs, attemptsLeft) => (dueInMs <= 0 ? of(0) : timer(Math.min(dueInMs, maxTimerDelayMs))).pipe(concatMap(() => {
             const attempt = executeRefresh('scheduled');
             const retryInMs = retryScheduledIn(attempt);
             if (retryInMs === null)
@@ -5711,13 +5754,10 @@ const withRefreshQuery = (key, config) => {
                     logout();
             });
         effect(() => {
-            const snapshot = refreshQuery().snapshot();
-            if (!snapshot || snapshot.loading())
+            const state = context.executionState();
+            if (state?.type !== 'tokenRefresh' || state.state !== 'error')
                 return;
-            const error = snapshot.error();
-            if (!error)
-                return;
-            onRefreshFailure({ error, logout: () => context.logout('expired') });
+            onRefreshFailure({ error: state.error, logout: () => context.logout('expired') });
         });
         // Auto-retry on 401: Listen to repository events and trigger refresh on 401 errors
         const autoRetryOn401 = config.autoRetryOn401 ?? true;
@@ -5750,7 +5790,7 @@ const withRefreshQuery = (key, config) => {
         config: {
             ...config,
             queryCreator: config.queryCreator.clone({
-                retryFn: refreshRetryFn,
+                retryFn: config.retryFn ?? refreshRetryFn,
                 keepUnusedFor: 0,
                 subtle: { useQueryRepositoryCache: true },
             }),
@@ -6185,31 +6225,38 @@ const setupLeaderElection = (options) => {
 
 const ENCRYPTION_KEY_STORAGE = '__eth_ek';
 const generateEncryptionKey = () => {
-    const navigatorInfo = typeof navigator !== 'undefined'
-        ? `${navigator.userAgent}${navigator.language}${screen.width}${screen.height}${screen.colorDepth}`
-        : 'server';
+    const navigatorInfo = typeof navigator !== 'undefined' ? `${navigator.userAgent}${navigator.language}` : 'server';
+    const screenInfo = typeof screen !== 'undefined' ? `${screen.width}${screen.height}${screen.colorDepth}` : 'no-screen';
     const random = Math.random().toString(36).substring(2, 15);
-    return btoa(`${navigatorInfo}${random}`);
+    return btoa(`${navigatorInfo}${screenInfo}${random}`);
 };
 let cachedKey = null;
 const getEncryptionKey = () => {
     if (cachedKey)
         return cachedKey;
     if (typeof localStorage !== 'undefined') {
-        const stored = localStorage.getItem(ENCRYPTION_KEY_STORAGE);
-        if (stored) {
-            cachedKey = stored;
-            return stored;
+        try {
+            const stored = localStorage.getItem(ENCRYPTION_KEY_STORAGE);
+            if (stored) {
+                cachedKey = stored;
+                return stored;
+            }
+        }
+        catch {
+            cachedKey = null;
         }
-        const newKey = generateEncryptionKey();
-        localStorage.setItem(ENCRYPTION_KEY_STORAGE, newKey);
-        cachedKey = newKey;
-        return newKey;
     }
-    if (!cachedKey) {
-        cachedKey = generateEncryptionKey();
+    const newKey = generateEncryptionKey();
+    cachedKey = newKey;
+    if (typeof localStorage !== 'undefined') {
+        try {
+            localStorage.setItem(ENCRYPTION_KEY_STORAGE, newKey);
+        }
+        catch {
+            return newKey;
+        }
     }
-    return cachedKey;
+    return newKey;
 };
 const xorCipher = (text, key) => {
     let result = '';
@@ -6227,7 +6274,7 @@ const encryptToken = (token) => {
         return btoa(encrypted);
     }
     catch {
-        return token;
+        return '';
     }
 };
 const decryptToken = (encryptedToken) => {
@@ -6331,6 +6378,8 @@ const setupMultiTabSync = (config, context) => {
             return;
         }
         if (message.type === 'logout' && syncLogout) {
+            if (!context.accessToken() && !context.refreshToken())
+                return;
             lastSyncedState = LOGGED_OUT;
             hadTokens = false;
             context.logout(incomingCause(message.cause));
@@ -6343,7 +6392,10 @@ const setupMultiTabSync = (config, context) => {
         if (!access || !refresh)
             return;
         const isNewSession = !context.accessToken();
-        lastSyncedState = tokenState(access, refresh);
+        const incomingState = tokenState(access, refresh);
+        if (incomingState === lastSyncedState)
+            return;
+        lastSyncedState = incomingState;
         hadTokens = true;
         if (isNewSession) {
             context.setTokens(access, refresh);
@@ -6481,25 +6533,30 @@ const SINGLE_TAB = /* @__PURE__ */ (() => {
  * // provider.features.multiTabSync.isLeader()
  */
 const withBearerAuthMultiTabSync = (config = {}) => {
-    let instance = SINGLE_TAB;
-    let channelName = config.channelName ?? '';
-    const setup = (_context) => ({
-        type: BearerAuthFeatureType.MULTI_TAB_SYNC,
-        instance,
-        devtools: () => [
-            { label: 'channel', value: channelName },
-            { label: 'tokens', value: config.syncTokens === false ? 'tab local' : 'synced' },
-            { label: 'logout', value: config.syncLogout === false ? 'tab local' : 'synced' },
-            {
-                label: 'leader election',
-                value: config.leaderElection === false ? 'every tab refreshes' : 'one tab refreshes',
-            },
-        ],
-    });
+    const pendingSetups = [];
+    const setup = (context) => {
+        const state = pendingSetups.shift() ?? {
+            instance: SINGLE_TAB,
+            channelName: config.channelName ?? defaultSyncChannelName(context.name),
+        };
+        return {
+            type: BearerAuthFeatureType.MULTI_TAB_SYNC,
+            instance: state.instance,
+            devtools: () => [
+                { label: 'channel', value: state.channelName },
+                { label: 'tokens', value: config.syncTokens === false ? 'tab local' : 'synced' },
+                { label: 'logout', value: config.syncLogout === false ? 'tab local' : 'synced' },
+                {
+                    label: 'leader election',
+                    value: config.leaderElection === false ? 'every tab refreshes' : 'one tab refreshes',
+                },
+            ],
+        };
+    };
     // The elected leader gates the auth queries' automatic refresh, which is wired up before the
     // regular feature setup runs - so this half has to happen earlier than `setup`.
     const earlySetup = (context) => {
-        channelName = config.channelName ?? defaultSyncChannelName(context.name);
+        const channelName = config.channelName ?? defaultSyncChannelName(context.name);
         // Filled in below once the election exists. Until then this tab answers as its own leader, which
         // is what it is: the sync is set up first because the auth queries read `isLeader` while being
         // wired, and a `state-request` cannot arrive before this function returns anyway.
@@ -6515,15 +6572,17 @@ const withBearerAuthMultiTabSync = (config = {}) => {
             logout: context.logout,
         });
         if (config.leaderElection === false) {
+            pendingSetups.push({ instance: SINGLE_TAB, channelName });
             return { sessionAdoption: sync.sessionAdoption, activityCoordination: sync.activityCoordination };
         }
         const election = setupLeaderElection({ name: context.name });
         isLeaderRef = () => election.isLeader();
-        instance = {
+        const instance = {
             isLeader: election.isLeader,
             instanceCount: election.instanceCount,
             leadership: election.isSupported ? 'election' : 'unsupported',
         };
+        pendingSetups.push({ instance, channelName });
         return {
             isLeader: () => election.isLeader(),
             leaderElection: instance,
@@ -6578,7 +6637,7 @@ const createPersistentAuthFeature = (config, context) => {
     };
     const rememberMeSignal = signal(initializeRememberMe(), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "rememberMeSignal" }] : /* istanbul ignore next */ []));
-    const cookieDomain = () => config.cookie?.domain ?? getDomain() ?? 'localhost';
+    const cookieDomain = () => config.cookie?.domain ?? null;
     const cookiePath = () => config.cookie?.path ?? '/';
     const removeCookie = () => deleteCookie(cookieName, cookiePath(), cookieDomain());
     effect(() => {
@@ -6593,14 +6652,15 @@ const createPersistentAuthFeature = (config, context) => {
         const expiresInDays = rememberMe ? (config.cookie?.expiresInDays ?? 30) : null;
         setCookie(cookieName, encryptToken(token), expiresInDays, cookieDomain(), cookiePath(), config.cookie?.sameSite ?? 'lax');
     });
+    effect(() => {
+        const endCause = context.sessionEndCause();
+        if (endCause)
+            removeCookie();
+    });
     effect(() => {
         const state = executionState();
         if (!state)
             return;
-        if (state.type === 'logout') {
-            removeCookie();
-            return;
-        }
         // A token the server itself rejected is worth nothing on the next visit; anything else (offline, a
         // 500, an aborted startup) leaves it in place so a reload can try again.
         const wasRejected = state.state === 'error' &&
@@ -6674,14 +6734,15 @@ const withTokenExpirationWarning = (config = {}) => {
             return new Date(exp * 1000);
         }, /* @ts-ignore */
         ...(ngDevMode ? [{ debugName: "expiresAt" }] : /* istanbul ignore next */ []));
-        const expiresIn$ = combineLatest([interval(checkInterval), toObservable(context.bearerData)]).pipe(map(() => {
-            const expiry = expiresAt();
-            if (!expiry)
-                return null;
-            const now = Date.now();
-            const msUntilExpiry = expiry.getTime() - now;
-            return msUntilExpiry > 0 ? msUntilExpiry : null;
-        }));
+        const expiresIn$ = toObservable(context.bearerData).pipe(switchMap((bearerData) => bearerData
+            ? timer(0, checkInterval).pipe(map(() => {
+                const expiry = expiresAt();
+                if (!expiry)
+                    return null;
+                const msUntilExpiry = expiry.getTime() - Date.now();
+                return msUntilExpiry > 0 ? msUntilExpiry : null;
+            }))
+            : of(null)));
         const isExpiringSoon$ = expiresIn$.pipe(map((msUntilExpiry) => {
             if (msUntilExpiry === null)
                 return false;
@@ -6811,8 +6872,9 @@ const createTrackingFeature = (context, config) => {
             });
         }
     };
+    const pendingForwardedMessages = [];
     const forwardingChannel = context.leaderElection && typeof BroadcastChannel !== 'undefined'
-        ? new BroadcastChannel('ethlete-auth-tracking')
+        ? new BroadcastChannel(`ethlete-auth-tracking:${context.name}`)
         : null;
     if (forwardingChannel) {
         forwardingChannel.onmessage = (messageEvent) => {
@@ -6822,21 +6884,44 @@ const createTrackingFeature = (context, config) => {
         };
         context.destroyRef.onDestroy(() => forwardingChannel.close());
     }
+    const forward = (message) => {
+        if (!forwardingChannel)
+            return false;
+        try {
+            forwardingChannel.postMessage(message);
+            return true;
+        }
+        catch (error) {
+            if (isDevMode()) {
+                console.warn(`[@ethlete/query] Could not forward the "${message.event}" tracking event to the leader tab.`, error);
+            }
+            return false;
+        }
+    };
+    if (context.leaderElection) {
+        effect(() => {
+            const isLeader = context.leaderElection?.isLeader() ?? false;
+            const instanceCount = context.leaderElection?.instanceCount() ?? 1;
+            if (!pendingForwardedMessages.length || (!isLeader && instanceCount <= 1))
+                return;
+            untracked(() => {
+                const pending = pendingForwardedMessages.splice(0);
+                for (const message of pending) {
+                    if (isLeader || !forward(message))
+                        fireHandlers(message.event, message.data);
+                }
+            });
+        }, { injector: context.injector });
+    }
     const emit = (event, data) => {
         if (forwardingChannel && !context.isLeader()) {
-            try {
-                forwardingChannel.postMessage({ event, data });
+            const message = { event, data };
+            if ((context.leaderElection?.instanceCount() ?? 1) <= 1) {
+                pendingForwardedMessages.push(message);
                 return;
             }
-            catch (error) {
-                // Some payloads cannot leave the tab they were made in: a query snapshot is a bundle of
-                // signals, and the structured clone algorithm throws on functions. Firing the handlers here
-                // is the lesser evil - the event reaches a handler in the wrong tab rather than taking the
-                // effect it was emitted from down with it.
-                if (isDevMode()) {
-                    console.warn(`[@ethlete/query] Could not forward the "${event}" tracking event to the leader tab.`, error);
-                }
-            }
+            if (forward(message))
+                return;
         }
         fireHandlers(event, data);
     };
@@ -6857,17 +6942,18 @@ const createTrackingFeature = (context, config) => {
             const error = snapshot.error();
             const response = snapshot.response();
             const prevState = trackedQueries.get(key);
+            if (prevState?.snapshot !== snapshot) {
+                trackedQueries.set(key, { snapshot, lastResult: null });
+                emit(`${key}Execute`, { queryKey: key, args: snapshot.args() });
+            }
             if (response && !loading && !error && prevState?.lastResult !== 'success') {
-                trackedQueries.set(key, { loading: false, lastResult: 'success' });
+                trackedQueries.set(key, { snapshot, lastResult: 'success' });
                 emit(`${key}Success`, { snapshot });
             }
             if (error && !loading && prevState?.lastResult !== 'error') {
-                trackedQueries.set(key, { loading: false, lastResult: 'error' });
+                trackedQueries.set(key, { snapshot, lastResult: 'error' });
                 emit(`${key}Failure`, { error });
             }
-            if (loading) {
-                trackedQueries.set(key, { loading: true, lastResult: null });
-            }
         });
     });
     let hadTokens = false;
@@ -6880,10 +6966,14 @@ const createTrackingFeature = (context, config) => {
         }
         hadTokens = hasTokens;
     });
-    context.afterTokenRefresh$.subscribe(() => {
+    let lastTrackedRefreshState = null;
+    effect(() => {
+        const state = context.executionState();
+        if (state === lastTrackedRefreshState || state?.type !== 'tokenRefresh' || state.state !== 'success')
+            return;
+        lastTrackedRefreshState = state;
         emit('tokenRefreshSuccess', {
-            queryKey: 'refresh',
-            snapshot: undefined,
+            automatic: !!untracked(context.latestExecutedQuery)?.snapshot.triggeredBy(),
         });
     });
     if (config?.on) {
@@ -8178,12 +8268,13 @@ const armQueryDevtoolsOverrideTransfer = (recorder, ops) => {
 
 // Generated from package.json by tools/scripts/generate-version.js - do not edit.
 /** The version of `@ethlete/query` this build was cut from. */
-const QUERY_VERSION = '6.0.0-next.39';
+const QUERY_VERSION = '6.0.0-next.40';
 
 /** How deep a schema is expanded before a nested branch is given up on. */
 const MAX_DEPTH = 12;
 /** How many elements are generated for an array, whatever its `minItems` says. */
 const MAX_ITEMS = 3;
+const MAX_STRING_LENGTH = 10_000;
 /**
  * How many array elements are generated on their own rather than copied from the first. Nested arrays
  * multiply, so without a ceiling a body of arrays-in-arrays costs `MAX_ITEMS ^ MAX_DEPTH` walks.
@@ -8376,12 +8467,12 @@ const finiteNumber = (value) => (typeof value === 'number' && Number.isFinite(va
 const pickStressStringPreset = () => STRESS_STRING_PRESETS[Math.floor(Math.random() * STRESS_STRING_PRESETS.length)];
 /** Keeps a generated string inside `minLength`/`maxLength`, since a seed is exported as a real body. */
 const fitLength = (value, schema) => {
-    const min = finiteNumber(schema['minLength']);
-    const max = finiteNumber(schema['maxLength']);
+    const min = Math.min(finiteNumber(schema['minLength']) ?? 0, MAX_STRING_LENGTH);
+    const max = Math.min(finiteNumber(schema['maxLength']) ?? MAX_STRING_LENGTH, MAX_STRING_LENGTH);
     let out = value;
-    while (min !== null && out.length < min)
+    while (out.length < min)
         out += value || 'x';
-    return max === null ? out : out.slice(0, max);
+    return out.slice(0, max);
 };
 /**
  * The value of a string field. A declared format wins in every style - a `date-time` full of lorem is
@@ -9212,6 +9303,7 @@ const snapshotQueryDevtoolsHandle = (handle) => {
                 attempts: read(() => frozen(live.subtle.attempts()), frozen(1)),
                 lastDurationMs: read(() => frozen(live.subtle.lastDurationMs()), frozen(null)),
                 resolveHeaders: read(() => frozen(live.subtle.resolveHeaders()), frozen(undefined)),
+                lastSentHeaders: read(() => frozen(live.subtle.lastSentHeaders()), frozen(undefined)),
                 lastPersistedResponseAt: read(() => frozen(live.subtle.lastPersistedResponseAt()), frozen(null)),
                 lastExternalResponseAt: read(() => frozen(live.subtle.lastExternalResponseAt()), frozen(null)),
             },
@@ -9438,6 +9530,7 @@ const clearQueryDevtoolsTombstones = (ids) => {
     const doomed = ids ? new Set(ids) : null;
     entries.update((list) => list.filter((e) => !e.destroyedAt || (doomed ? !doomed.has(e.id) : false)));
 };
+let queryDevtoolsInitialized = false;
 /**
  * Enables the `@ethlete/query` devtools. Add this to your application providers (e.g. in
  * `bootstrapApplication`) to make query clients, queries, stacks, sequences and auth providers
@@ -9454,6 +9547,9 @@ const clearQueryDevtoolsTombstones = (ids) => {
  * ```
  */
 const provideQueryDevtools = (options) => {
+    if (queryDevtoolsInitialized)
+        return makeEnvironmentProviders([]);
+    queryDevtoolsInitialized = true;
     // First: the stored settings say where the override store lives and whether the panel has raised the
     // retention this app asked for, and both are read by the calls below.
     initQueryDevtoolsSettings();
@@ -9478,7 +9574,7 @@ const provideQueryDevtools = (options) => {
     return makeEnvironmentProviders([]);
 };
 
-const getOpName = /(query|mutation) ?([\w\d-_]+)? ?\(.*?\)? \{/;
+const getOpName = /\b(?:query|mutation)\s+([\w-]+)(?:\s*\([^)]*\))?\s*\{/;
 const transformGql = (str) => {
     const normalizedStr = Array.isArray(str) ? str.join('') : str;
     const name = getOpName.exec(normalizedStr);
@@ -9488,7 +9584,7 @@ const transformGql = (str) => {
             data['variables'] = JSON.stringify(variables);
         }
         if (name && name.length) {
-            const operationName = name[2];
+            const operationName = name[1];
             if (operationName) {
                 data['operationName'] = operationName;
             }
@@ -9519,7 +9615,7 @@ const createGqlExecuteFn = (executeOptions) => {
         if (args?.queryParams && executeOptions.creatorInternals.transport === 'GET') {
             gqlParams = { ...gqlParams, ...args.queryParams };
         }
-        const computedArgs = args ?? {};
+        const computedArgs = { ...(args ?? {}) };
         if (executeOptions.creatorInternals.transport === 'GET') {
             computedArgs.queryParams = gqlParams;
         }
@@ -9607,7 +9703,7 @@ const createSecureGqlExecuteFn = (executeOptions) => {
                 ...executeOptions,
                 creatorInternals: {
                     client: executeOptions.creatorInternals.client,
-                    method: executeOptions.creatorInternals.method === 'QUERY' ? 'GET' : 'POST',
+                    method: executeOptions.creatorInternals.transport,
                     route: (executeOptions.creator?.route ?? ''),
                 },
             };
@@ -9639,7 +9735,7 @@ const createSecureGqlQueryCreator = (options, internals) => createBaseQueryCreat
                 if (rawResponse && typeof rawResponse === 'object' && 'data' in rawResponse) {
                     return rawResponse.data;
                 }
-                return rawResponse;
+                throw gqlDataPropertyMissingInResponse();
             }),
     },
     internals,
@@ -10285,7 +10381,7 @@ function queryStateSignal(source, options) {
     const { cacheResponse } = options ?? {};
     const roSignal = toSignal(toObservable(source).pipe(switchMap((q) => extractQuery(q)?.state$ ?? of(null)), switchMap((state) => {
         if (cacheResponse) {
-            return of(state).pipe(filterQueryStates(["SUCCESS" /* QueryStateType.Success */, "FAILURE" /* QueryStateType.Failure */]));
+            return of(state).pipe(filterQueryStates([QueryStateType.Success, QueryStateType.Failure]));
         }
         return of(state);
     })), {
@@ -10468,6 +10564,8 @@ class QueryStore {
         this._queryCreated$.next(query);
     }
     initSmartQueryHandling() {
+        if (typeof window === 'undefined')
+            return;
         const windowBlur$ = fromEvent(window, 'blur');
         const windowFocus$ = fromEvent(window, 'focus');
         windowBlur$.subscribe(() => {
@@ -10522,6 +10620,8 @@ class QueryStore {
         console.log(stateAsJson);
     }
     initGarbageCollector() {
+        if (typeof window === 'undefined')
+            return;
         if (this.garbageCollector !== null) {
             return;
         }
@@ -10531,6 +10631,8 @@ class QueryStore {
         }, 15000);
     }
     stopGarbageCollector() {
+        if (typeof window === 'undefined')
+            return;
         if (this.garbageCollector !== null) {
             window.clearInterval(this.garbageCollector);
             this.garbageCollector = null;
@@ -10632,7 +10734,10 @@ class V2QueryClient {
         return this._authProvider$.getValue() ?? this._clientConfig.parent?._authProvider$.getValue() ?? null;
     }
     get authProvider$() {
-        return this._authProvider$.asObservable() ?? this._clientConfig.parent?._authProvider$.asObservable() ?? null;
+        const parent = this._clientConfig.parent?._authProvider$;
+        return parent
+            ? combineLatest([this._authProvider$, parent]).pipe(map(([ownProvider, parentProvider]) => ownProvider ?? parentProvider))
+            : this._authProvider$.asObservable();
     }
 }
 
@@ -10662,6 +10767,17 @@ const v2BuildQueryCacheKey = (route, args) => {
     return hash.toString();
 };
 
+/**
+ * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
+ */
+const QueryStateType = {
+    Prepared: 'PREPARED',
+    Loading: 'LOADING',
+    Success: 'SUCCESS',
+    Failure: 'FAILURE',
+    Cancelled: 'CANCELLED',
+};
+
 let fallbackInjector = null;
 /**
  * The stashed root injector, or `null` when the fallback was never provided (or was provided on the
@@ -10726,7 +10842,7 @@ const transformExecStateToQueryState = (execState) => {
         case 'loading': {
             const loading = {
                 meta,
-                type: "LOADING" /* QueryStateType.Loading */,
+                type: QueryStateType.Loading,
                 ...(execState.loading.progress
                     ? {
                         progress: {
@@ -10744,7 +10860,7 @@ const transformExecStateToQueryState = (execState) => {
                 headers: {},
                 meta,
                 response: execState.response,
-                type: "SUCCESS" /* QueryStateType.Success */,
+                type: QueryStateType.Success,
             };
             return success;
         }
@@ -10758,14 +10874,14 @@ const transformExecStateToQueryState = (execState) => {
                     url: execState.error.raw.url || '',
                 },
                 meta,
-                type: "FAILURE" /* QueryStateType.Failure */,
+                type: QueryStateType.Failure,
             };
             return error;
         }
         default: {
             const prepared = {
                 meta,
-                type: "PREPARED" /* QueryStateType.Prepared */,
+                type: QueryStateType.Prepared,
             };
             return prepared;
         }
@@ -11354,23 +11470,23 @@ const resetPageOnError = (config) => (source) => {
 /**
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
-const isQueryStateLoading = (state) => state?.type === "LOADING" /* QueryStateType.Loading */;
+const isQueryStateLoading = (state) => state?.type === QueryStateType.Loading;
 /**
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
-const isQueryStateSuccess = (state) => state?.type === "SUCCESS" /* QueryStateType.Success */;
+const isQueryStateSuccess = (state) => state?.type === QueryStateType.Success;
 /**
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
-const isQueryStateFailure = (state) => state?.type === "FAILURE" /* QueryStateType.Failure */;
+const isQueryStateFailure = (state) => state?.type === QueryStateType.Failure;
 /**
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
-const isQueryStateCancelled = (state) => state?.type === "CANCELLED" /* QueryStateType.Cancelled */;
+const isQueryStateCancelled = (state) => state?.type === QueryStateType.Cancelled;
 /**
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
-const isQueryStatePrepared = (state) => state?.type === "PREPARED" /* QueryStateType.Prepared */;
+const isQueryStatePrepared = (state) => state?.type === QueryStateType.Prepared;
 /**
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
@@ -11522,17 +11638,12 @@ const computeQueryBody = (config) => {
  */
 const computeQueryAuthHeader = (config) => {
     let authHeader = null;
-    if (config.config.secure) {
+    if (config.config.secure === true) {
         const header = config.client.authProvider?.header;
         if (header) {
             authHeader = header;
         }
     }
-    else if (config.client.authProvider?.header) {
-        if (config.config.secure === undefined || config.config.secure) {
-            authHeader = config.client.authProvider.header;
-        }
-    }
     return authHeader;
 };
 /**
@@ -11637,7 +11748,7 @@ class V2Query {
         this._isPollingPaused = false;
         this.memoizedState$ = null;
         this._state$ = new BehaviorSubject({
-            type: "PREPARED" /* QueryStateType.Prepared */,
+            type: QueryStateType.Prepared,
             meta: { id: this.currentLocalId, triggeredVia: 'program' },
         });
     }
@@ -11732,7 +11843,7 @@ class V2Query {
                 return this;
             }
         }
-        this.updateState({ type: "LOADING" /* QueryStateType.Loading */, meta });
+        this.updateState({ type: QueryStateType.Loading, meta });
         if (this._isInMockMode) {
             this.mockRequest({}, meta, options);
         }
@@ -11789,7 +11900,7 @@ class V2Query {
         }
         this.onAbort$.next();
         this.updateState({
-            type: "CANCELLED" /* QueryStateType.Cancelled */,
+            type: QueryStateType.Cancelled,
             meta: { id: this.rawState.meta.id, triggeredVia: this.rawState.meta.triggeredVia },
         });
         return this;
@@ -11883,7 +11994,7 @@ class V2Query {
                 const { type, retryDelay, retryNumber } = requestEvent;
                 const newMeta = { ...meta, isWaitingForRetry: type === 'delay-retry', retryDelay, retryNumber };
                 this.updateState({
-                    type: "LOADING" /* QueryStateType.Loading */,
+                    type: QueryStateType.Loading,
                     meta: newMeta,
                 });
                 break;
@@ -11891,7 +12002,7 @@ class V2Query {
             case 'upload-progress':
             case 'download-progress': {
                 this.updateState({
-                    type: "LOADING" /* QueryStateType.Loading */,
+                    type: QueryStateType.Loading,
                     progress: requestEvent.progress,
                     partialText: 'partialText' in requestEvent ? requestEvent.partialText : undefined,
                     meta,
@@ -11914,7 +12025,7 @@ class V2Query {
                     });
                 }
                 this.updateState({
-                    type: "SUCCESS" /* QueryStateType.Success */,
+                    type: QueryStateType.Success,
                     response: responseData,
                     headers: headers,
                     meta: { ...meta, expiresAt: expiresInTimestamp },
@@ -11923,7 +12034,7 @@ class V2Query {
             }
             case 'failure': {
                 const { error } = requestEvent;
-                const failure = () => this.updateState({ type: "FAILURE" /* QueryStateType.Failure */, error, meta });
+                const failure = () => this.updateState({ type: QueryStateType.Failure, error, meta });
                 const bearerAuthProvider = this.getBearerAuthProvider();
                 if (!bearerAuthProvider ||
                     options?._isUnauthorizedRetry ||
@@ -11935,13 +12046,15 @@ class V2Query {
                 if (!query)
                     return failure();
                 query.state$
-                    .pipe(takeUntilResponse(), takeUntil(this.onAbort$), tap((state) => isQueryStateSuccess(state) ? this.execute({ ...options, _isUnauthorizedRetry: true }) : failure()))
+                    .pipe(takeUntilResponse(), takeUntil(this.onAbort$), tap((state) => isQueryStateSuccess(state)
+                    ? this.execute({ ...options, _isUnauthorizedRetry: true, cancelPrevious: true })
+                    : failure()))
                     .subscribe();
                 break;
             }
             case 'cancel': {
                 this.updateState({
-                    type: "CANCELLED" /* QueryStateType.Cancelled */,
+                    type: QueryStateType.Cancelled,
                     meta,
                 });
                 break;
@@ -12022,6 +12135,17 @@ class V2Query {
     }
 }
 
+/**
+ * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
+ */
+const AuthBearerRefreshStrategy = {
+    /**
+     * Automatically refresh the token 5 minutes before expiration.
+     * The time can be configured with the `refreshBuffer` property.
+     */
+    BeforeExpiration: 'beforeExpiration',
+};
+
 /**
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
@@ -12070,7 +12194,8 @@ class V2BearerAuthProvider {
         }
     }
     get header() {
-        return { Authorization: `Bearer ${this._tokens$.getValue().token}` };
+        const token = this._tokens$.getValue().token;
+        return token ? { Authorization: `Bearer ${token}` } : {};
     }
     get tokens$() {
         return this._tokens$.asObservable();
@@ -12090,8 +12215,9 @@ class V2BearerAuthProvider {
                 this._config.refreshConfig.refreshOnUnauthorizedResponse));
     }
     cleanUp() {
-        this.destroy$.next(true);
-        this.destroy$.unsubscribe();
+        this.destroy$.next();
+        this.destroy$.complete();
+        this.destroy$ = new Subject();
         this._currentRefreshQuery$.next(null);
         if (this._config.refreshConfig?.cookieName) {
             this.deleteCookie();
@@ -12173,12 +12299,12 @@ class V2BearerAuthProvider {
     setCookie() {
         if (!this._config.refreshConfig?.cookieName || !this.tokens.refreshToken)
             return;
-        setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken, this._config.refreshConfig.cookieExpiresInDays, this._config.refreshConfig.cookieDomain, this._config.refreshConfig.cookiePath, this._config.refreshConfig.cookieSameSite);
+        setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken, this._config.refreshConfig.cookieExpiresInDays, this._config.refreshConfig.cookieDomain ?? null, this._config.refreshConfig.cookiePath, this._config.refreshConfig.cookieSameSite);
     }
     deleteCookie() {
         if (!this._config.refreshConfig?.cookieName)
             return;
-        deleteCookie(this._config.refreshConfig.cookieName, this._config.refreshConfig.cookiePath, this._config.refreshConfig.cookieDomain);
+        deleteCookie(this._config.refreshConfig.cookieName, this._config.refreshConfig.cookiePath, this._config.refreshConfig.cookieDomain ?? null);
     }
     prepareForRefresh() {
         if (!this.tokens.token || !this._config.refreshConfig) {
@@ -12192,13 +12318,12 @@ class V2BearerAuthProvider {
         const expiresIn = bearer[expiresInPropertyName];
         const fiveMinutes = 5 * 60 * 1000;
         const refreshBuffer = this._config.refreshConfig.refreshBuffer ?? fiveMinutes;
-        if (expiresIn === undefined) {
-            throw new Error(`Bearer token does not contain an '${expiresInPropertyName}' property`);
-        }
+        if (typeof expiresIn !== 'number')
+            return;
         const remainingTime = new Date(expiresIn * 1000).getTime() - refreshBuffer - new Date().getTime();
-        const strategy = this._config.refreshConfig.strategy ?? "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */;
+        const strategy = this._config.refreshConfig.strategy ?? AuthBearerRefreshStrategy.BeforeExpiration;
         switch (strategy) {
-            case "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */:
+            case AuthBearerRefreshStrategy.BeforeExpiration:
                 timer(remainingTime)
                     .pipe(takeUntil(this.destroy$))
                     .subscribe(() => this._refreshQuery());
@@ -12336,6 +12461,7 @@ class InfinityQuery {
     }
     reset(newConfig) {
         this._config = { ...this._config, ...(newConfig ?? {}) };
+        this.destroyQueries();
         this._currentPage$.next(null);
         this._currentCalculatedPage$.next(null);
         this._totalPages$.next(null);
@@ -12343,6 +12469,18 @@ class InfinityQuery {
         this.queries$.next([]);
         this.nextPage();
     }
+    destroy() {
+        this.destroyQueries();
+        this.queries$.next([]);
+    }
+    destroyQueries() {
+        for (const query of this.queries$.value) {
+            query.stopPolling();
+            query.abort();
+            if ('destroy' in query && typeof query.destroy === 'function')
+                query.destroy();
+        }
+    }
     prepareArgs(config, page) {
         const pageParamLocation = this.getPageParamLocation(config?.pageParam?.location);
         const pageArgs = {
@@ -12416,8 +12554,6 @@ const INFINITY_QUERY_TOKEN = new InjectionToken('INFINITY_QUERY_TOKEN');
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
 class InfinityQueryDirective {
-    // TODO: Skipped for migration because:
-    //  Accessor inputs cannot be migrated as they are too complex.
     get infinityQuery() {
         return this._infinityQuery;
     }
@@ -12530,6 +12666,8 @@ class InfinityQueryDirective {
     }
     cleanup() {
         this.queryConfigChanged$.next(true);
+        this.infinityQueryInstance?.destroy();
+        this.infinityQueryInstance = null;
         this.viewContext.loading = false;
         this.viewContext.error = null;
         this.viewContext.etInfinityQuery = null;
@@ -12909,7 +13047,7 @@ class QueryDevtoolsComponent {
                             cookiePath: refreshCfg?.cookiePath ?? '/ (default)',
                             cookieEnabled: refreshCfg?.cookieEnabled ?? 'true (default)',
                             cookieSameSite: refreshCfg?.cookieSameSite ?? 'lax (default)',
-                            refreshBuffer: refreshCfg?.refreshBuffer ?? '30000 (default)',
+                            refreshBuffer: refreshCfg?.refreshBuffer ?? '300000 (default)',
                             expiresInPropertyName: refreshCfg?.expiresInPropertyName ?? 'exp (default)',
                             strategy: refreshCfg?.strategy ?? 'AuthBearerRefreshStrategy.BeforeExpiration (default)',
                             requestArgsAdapter: refreshCfg?.requestArgsAdapter ? 'custom' : 'default',
@@ -13193,7 +13331,6 @@ class EntityStore {
 function mapToPaginated(response) {
     return map((items) => ({ ...response, items }));
 }
-// FIXME: This breaks if SubStoreType is an array
 /**
  * Use an other store to represent a property of the current entity.
  *
@@ -13265,6 +13402,7 @@ const invalidBodyError = (data) => new RuntimeError(QueryRuntimeErrorCode.LEGACY
  * @deprecated Part of the legacy (v2) query system. Migrate to the current query API - see https://ethlete-sdk-docs.web.app/query/migrating-from-v2, and run `nx g @ethlete/query:migrate-to-query-v3` to rewrite the mechanical parts. Intent to remove in v7.
  */
 const validateWithV2Query = (path, config) => {
+    const injector = inject(Injector);
     applyQueryAsyncValidator(path, {
         params: config.args,
         debounce: config.debounce,
@@ -13275,18 +13413,30 @@ const validateWithV2Query = (path, config) => {
             loader: ({ params: prepareArgs, abortSignal }) => {
                 // Prepared per request - v2 caches by the prepared args, so a fresh `prepare()` is the
                 // legacy idiom (the sibling `selectOptionsFromV2Query` does the same via `queryComputed`).
-                const query = config.queryCreator.prepare(prepareArgs);
-                abortSignal.addEventListener('abort', () => query.abort());
+                const query = runInInjectionContext(injector, () => config.queryCreator.prepare(prepareArgs));
+                let destroyed = false;
+                const destroy = () => {
+                    if (destroyed)
+                        return;
+                    destroyed = true;
+                    query.destroy?.();
+                };
+                abortSignal.addEventListener('abort', () => {
+                    query.abort();
+                    destroy();
+                }, { once: true });
                 query.execute();
                 // Resolve once the query settles. A failure is thrown so it lands in `onError`, where the
                 // violations are mapped onto the fields; the underlying `HttpErrorResponse` is thrown so
                 // `extractFormViolations` can unwrap the 422 body.
-                return firstValueFrom(query.state$.pipe(filter((state) => isQueryStateSuccess(state) || isQueryStateFailure(state)), take(1))).then((state) => {
+                return firstValueFrom(query.state$.pipe(filter((state) => isQueryStateSuccess(state) || isQueryStateFailure(state)), take(1)))
+                    .then((state) => {
                     if (isQueryStateFailure(state)) {
                         throw state.error.httpErrorResponse;
                     }
                     return state.response;
-                });
+                })
+                    .finally(destroy);
             },
         }),
     });
@@ -13703,7 +13853,7 @@ const transformToStringArray = (value) => {
         return value.map(transformToString).filter(Boolean);
     }
     else if (typeof value === 'string') {
-        return [transformToString(value)];
+        return value ? [value] : [];
     }
     return null;
 };
@@ -13712,7 +13862,10 @@ const transformToNumber = (value) => {
         return value;
     }
     if (typeof value === 'string') {
-        return Number(value);
+        if (!value.trim())
+            return null;
+        const number = Number(value);
+        return Number.isNaN(number) ? null : number;
     }
     return null;
 };
@@ -13720,8 +13873,9 @@ const transformToNumberArray = (value) => {
     if (Array.isArray(value)) {
         return value.map(transformToNumber).filter((item) => item !== null);
     }
-    else if (typeof value === 'number') {
-        return [value];
+    else if (typeof value === 'string' || typeof value === 'number') {
+        const number = transformToNumber(value);
+        return number === null ? [] : [number];
     }
     return null;
 };
@@ -13739,7 +13893,8 @@ const transformToBooleanArray = (value) => {
         return value.map(transformToBoolean).filter((item) => item !== null);
     }
     else if (typeof value === 'string' || typeof value === 'boolean') {
-        return [transformToBoolean(value)];
+        const boolean = transformToBoolean(value);
+        return boolean === null ? [] : [boolean];
     }
     return null;
 };
@@ -13761,7 +13916,8 @@ const transformToDateArray = (value) => {
         return value.map(transformToDate).filter((item) => item !== null);
     }
     else if (typeof value === 'string' || value instanceof Date) {
-        return [transformToDate(value)];
+        const date = transformToDate(value);
+        return date === null ? [] : [date];
     }
     return null;
 };
@@ -13773,7 +13929,7 @@ const transformToSort = (value) => {
         }
         return {
             active,
-            direction: direction,
+            direction: direction === 'asc' || direction === 'desc' ? direction : '',
         };
     }
     return null;
@@ -13791,7 +13947,9 @@ const transformToSortQueryParam = (value) => {
 
 const ET_ARR_PREFIX = 'ET_ARR__';
 const ET_OBJ_PREFIX = 'ET_OBJ__';
+const ET_DATE_PREFIX = 'ET_DATE__';
 const ET_PROP_NULL_VALUE = 'ET_NULL__';
+/** @deprecated Use `queryField` with `defineQueryForm`. */
 class QueryField {
     constructor(data) {
         this.data = data;
@@ -13800,6 +13958,7 @@ class QueryField {
         return this.data.control;
     }
 }
+/** @deprecated Use `searchQueryField` with `defineQueryForm`. */
 class SearchQueryField {
     constructor(_data) {
         this._data = _data;
@@ -13814,6 +13973,7 @@ class SearchQueryField {
         return this.data.control;
     }
 }
+/** @deprecated Use `sortQueryField` with `defineQueryForm`. */
 class SortQueryField {
     constructor(_data) {
         this._data = _data;
@@ -13828,6 +13988,7 @@ class SortQueryField {
         return this.data.control;
     }
 }
+/** @deprecated Use `stringArrayQueryField` with `defineQueryForm`. */
 class StringArrayQueryField {
     constructor(_data) {
         this._data = _data;
@@ -13841,6 +14002,7 @@ class StringArrayQueryField {
         return this.data.control;
     }
 }
+/** @deprecated Use `booleanArrayQueryField` with `defineQueryForm`. */
 class BooleanArrayQueryField {
     constructor(_data) {
         this._data = _data;
@@ -13854,6 +14016,7 @@ class BooleanArrayQueryField {
         return this.data.control;
     }
 }
+/** @deprecated Use `numberArrayQueryField` with `defineQueryForm`. */
 class NumberArrayQueryField {
     constructor(_data) {
         this._data = _data;
@@ -13867,6 +14030,7 @@ class NumberArrayQueryField {
         return this.data.control;
     }
 }
+/** @deprecated Use `dateQueryField` with `defineQueryForm`. */
 class DateQueryField {
     constructor(_data) {
         this._data = _data;
@@ -13880,6 +14044,7 @@ class DateQueryField {
         return this.data.control;
     }
 }
+/** @deprecated Use `dateArrayQueryField` with `defineQueryForm`. */
 class DateArrayQueryField {
     constructor(_data) {
         this._data = _data;
@@ -13894,6 +14059,7 @@ class DateArrayQueryField {
     }
 }
 const IGNORED_FILTER_COUNT_FIELDS$1 = ['page', 'skip', 'take', 'limit', 'sort', 'sortBy', 'sortOrder', 'query', 'search'];
+/** @deprecated Use `defineQueryForm`. */
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 class QueryForm {
     // with prefix eg. page should become ${prefix}-page
@@ -13901,7 +14067,6 @@ class QueryForm {
         this._fields = _fields;
         this._options = _options;
         this.router = inject(Router);
-        this.activatedRoute = inject(ActivatedRoute);
         this.zone = inject(NgZone);
         this.queryParams = injectQueryParams();
         this.destroy$ = createDestroy();
@@ -13909,7 +14074,10 @@ class QueryForm {
         this.defaultValues = this.extractDefaultValues();
         this.didValueChanges$ = new Subject();
         this.isObserving = false;
+        this.removeQueryParamsOnCleanup = true;
         this.skipNextResets = false;
+        this.urlWriteVersion = 0;
+        this.urlNavigationMarker = {};
         this.queryParamChanges$ = toObservable(injectQueryParamChanges());
         /**
          * The angular form group that contains all the fields.
@@ -13957,7 +14125,7 @@ class QueryForm {
         })
             .filter((v) => v === false).length));
         assertInInjectionContext(QueryForm);
-        inject(DestroyRef).onDestroy(() => this.cleanup());
+        inject(DestroyRef).onDestroy(() => this.cleanup(false));
     }
     get controls() {
         return this.form.controls;
@@ -13979,6 +14147,7 @@ class QueryForm {
             return this;
         }
         this.isObserving = true;
+        this.removeQueryParamsOnCleanup = options?.writeToQueryParams !== false;
         if (options?.syncOnNavigation !== false) {
             const didChanges = this.setFormValueFromUrlQueryParams({
                 queryParams: this.queryParams(),
@@ -14048,6 +14217,9 @@ class QueryForm {
         if (options?.syncOnNavigation !== false) {
             this.queryParamChanges$
                 .pipe(takeUntil(this.destroy$), takeUntil(this.unobserveTrigger$), tap((changes) => {
+                const info = this.router.lastSuccessfulNavigation()?.extras.info;
+                if (info?.queryForm === this.urlNavigationMarker && (info.version ?? 0) < this.urlWriteVersion)
+                    return;
                 const didValueChanges = this.setFormValueFromUrlQueryParams({ queryParams: changes });
                 if (didValueChanges) {
                     this.didValueChanges$.next(true);
@@ -14087,7 +14259,7 @@ class QueryForm {
                 const valueContainsWhitespace = typeof value === 'string' && value.trim() !== value;
                 const valueHasLeadingZero = typeof value === 'string' && value.startsWith('0');
                 const valueEndsWithDot = typeof value === 'string' && value.endsWith('.');
-                const defaultIsBool = this.getDefaultValue(key) === 'boolean';
+                const defaultIsBool = typeof this.getDefaultValue(key) === 'boolean';
                 const valueIsBool = value === 'true' || value === 'false';
                 if (value === ET_PROP_NULL_VALUE) {
                     deserializedValue = null;
@@ -14109,16 +14281,20 @@ class QueryForm {
         return didValueChanges;
     }
     setValue(value, options) {
-        this._form._setValue(value, options);
         if (options?.skipResets) {
             this.skipNextResets = true;
         }
+        this._form._setValue(value, options);
+        if (!this.isObserving)
+            this.handleFormChange(true);
     }
     patchValue(value, options) {
-        this._form._patchValue(value, options);
         if (options?.skipResets) {
             this.skipNextResets = true;
         }
+        this._form._patchValue(value, options);
+        if (!this.isObserving)
+            this.handleFormChange(true);
     }
     resetFieldToDefault(key, options) {
         const defaultValue = this.getDefaultValue(key);
@@ -14196,6 +14372,9 @@ class QueryForm {
         else if (typeof val === 'string' && val.startsWith(ET_OBJ_PREFIX)) {
             return JSON.parse(val.slice(ET_OBJ_PREFIX.length));
         }
+        else if (typeof val === 'string' && val.startsWith(ET_DATE_PREFIX)) {
+            return new Date(val.slice(ET_DATE_PREFIX.length));
+        }
         else if (typeof val === 'function') {
             return val();
         }
@@ -14215,11 +14394,13 @@ class QueryForm {
     isDefaultValue(key, value) {
         const normalizedValue = Array.isArray(value)
             ? `${ET_ARR_PREFIX}${JSON.stringify(value)}`
-            : typeof value === 'object' && value !== null
-                ? `${ET_OBJ_PREFIX}${JSON.stringify(value)}`
-                : value === null
-                    ? ET_PROP_NULL_VALUE
-                    : value;
+            : value instanceof Date
+                ? `${ET_DATE_PREFIX}${value.toISOString()}`
+                : typeof value === 'object' && value !== null
+                    ? `${ET_OBJ_PREFIX}${JSON.stringify(value)}`
+                    : value === null
+                        ? ET_PROP_NULL_VALUE
+                        : value;
         return this.defaultValues[key] === normalizedValue;
     }
     setupFormGroup() {
@@ -14240,6 +14421,9 @@ class QueryForm {
             if (Array.isArray(value)) {
                 defaultValues[key] = `${ET_ARR_PREFIX}${JSON.stringify(value)}`;
             }
+            else if (value instanceof Date) {
+                defaultValues[key] = `${ET_DATE_PREFIX}${value.toISOString()}`;
+            }
             else if (typeof value === 'object' && value !== null) {
                 defaultValues[key] = `${ET_OBJ_PREFIX}${JSON.stringify(value)}`;
             }
@@ -14253,7 +14437,8 @@ class QueryForm {
         return defaultValues;
     }
     _syncViaUrlQueryParams(values, replaceUrl) {
-        const queryParams = { ...clone(this.activatedRoute.snapshot.queryParams) };
+        const queryParams = {};
+        const version = ++this.urlWriteVersion;
         for (const [key, value] of Object.entries(values)) {
             const queryParamKey = this.transformKeyToQueryParam(key);
             const field = this._fields[key];
@@ -14280,6 +14465,7 @@ class QueryForm {
                     queryParams,
                     replaceUrl,
                     queryParamsHandling: 'merge',
+                    info: { queryForm: this.urlNavigationMarker, version },
                 });
             });
         });
@@ -14303,6 +14489,7 @@ class QueryForm {
         const currentVal = clone(this.currentFormValue$.value);
         const newVal = clone(this.formValue);
         if (equal(currentVal, newVal)) {
+            this.skipNextResets = false;
             return;
         }
         if (forceOverwrite) {
@@ -14313,10 +14500,12 @@ class QueryForm {
         }
         this.currentFormValue$.next(newVal);
     }
-    cleanup() {
+    cleanup(removeQueryParams = this.removeQueryParamsOnCleanup) {
         if (!this.isObserving)
             return;
         this.isObserving = false;
+        if (!removeQueryParams)
+            return;
         const queryParamKeys = Object.keys(this._fields);
         const queryParams = queryParamKeys.reduce((acc, key) => {
             acc[this.transformKeyToQueryParam(key)] = undefined;
@@ -14395,14 +14584,23 @@ const createBranch = (fields, initial, injector) => {
     const model = signal(clone(initial), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "model" }] : /* istanbul ignore next */ []));
     const tree = form(model, { injector });
+    const defaultFor = (key) => {
+        const value = resolveDefault(fields[key]);
+        defaults[key] = value;
+        return value;
+    };
     return {
         fields: tree,
         value: model.asReadonly(),
         activeFilterCount: computed(() => computeFilterCount(fields, model(), defaults)),
         setValue: (value) => model.set(clone(value)),
         patchValue: (value) => model.update((cur) => ({ ...cur, ...value })),
-        resetFieldToDefault: (key) => model.update((cur) => ({ ...cur, [key]: defaults[key] })),
-        resetAllFieldsToDefault: () => model.set(clone(defaults)),
+        resetFieldToDefault: (key) => model.update((cur) => ({ ...cur, [key]: defaultFor(key) })),
+        resetAllFieldsToDefault: () => {
+            for (const key of Object.keys(fields))
+                defaultFor(key);
+            model.set(clone(defaults));
+        },
     };
 };
 /**
@@ -14440,6 +14638,12 @@ const defineQueryForm = (config) => {
     const prefix = config.queryParamPrefix;
     const defaults = buildDefaults(fieldDefs);
     const defaultValue = clone(defaults);
+    const defaultFor = (key) => {
+        const value = resolveDefault(fieldDefs[key]);
+        defaults[key] = value;
+        defaultValue[key] = clone(value);
+        return value;
+    };
     /** Live field values (updated immediately by bound controls). */
     const model = signal(clone(defaults), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "model" }] : /* istanbul ignore next */ []));
@@ -14455,6 +14659,8 @@ const defineQueryForm = (config) => {
     let observeOptions;
     let pendingTimer = null;
     let skipNextResets = false;
+    let urlWriteVersion = 0;
+    const urlNavigationMarker = {};
     const fields = form(model);
     const activeFilterCount = computed(() => computeFilterCount(fieldDefs, committed(), defaults), /* @ts-ignore */
     ...(ngDevMode ? [{ debugName: "activeFilterCount" }] : /* istanbul ignore next */ []));
@@ -14472,6 +14678,8 @@ const defineQueryForm = (config) => {
             return undefined;
         if (def.valueToQueryParam)
             return def.valueToQueryParam(value);
+        if (value === '' && defaults[key] === null)
+            return undefined;
         return value === null ? ET_NULL_VALUE : value;
     };
     const deserialize = (def, raw) => {
@@ -14490,6 +14698,7 @@ const defineQueryForm = (config) => {
     };
     const writeToUrl = (value) => {
         const queryParams = {};
+        const version = ++urlWriteVersion;
         for (const [key, def] of Object.entries(fieldDefs)) {
             queryParams[paramKey(key)] = queryParamFor(key, def, value[key]);
         }
@@ -14498,10 +14707,11 @@ const defineQueryForm = (config) => {
                 queryParams,
                 queryParamsHandling: 'merge',
                 replaceUrl: observeOptions?.replaceUrl,
+                info: { queryForm: urlNavigationMarker, version },
             });
         });
     };
-    const applyResets = (live, changedKeys) => {
+    const applyResets = (live, changedKeys, resetDefaults) => {
         const next = { ...live };
         for (const [key, def] of Object.entries(fieldDefs)) {
             const resets = def.isResetBy;
@@ -14518,7 +14728,11 @@ const defineQueryForm = (config) => {
             });
             if (!triggered)
                 continue;
-            const fieldDefault = defaults[key];
+            let fieldDefault = resetDefaults.get(key);
+            if (!resetDefaults.has(key)) {
+                fieldDefault = defaultFor(key);
+                resetDefaults.set(key, fieldDefault);
+            }
             if (!equal(next[key], fieldDefault)) {
                 next[key] = fieldDefault;
             }
@@ -14534,8 +14748,9 @@ const defineQueryForm = (config) => {
      */
     const resolveResets = (prev, live) => {
         let next = live;
+        const resetDefaults = new Map();
         for (let pass = 0; pass < MAX_RESET_PASSES; pass++) {
-            const applied = applyResets(next, changedKeysBetween(prev, next));
+            const applied = applyResets(next, changedKeysBetween(prev, next), resetDefaults);
             if (equal(applied, next))
                 return applied;
             next = applied;
@@ -14547,10 +14762,24 @@ const defineQueryForm = (config) => {
     };
     const flush = () => {
         clearTimer();
-        const live = model();
+        const rawLive = model();
+        const live = { ...rawLive };
+        for (const [key, def] of Object.entries(fieldDefs)) {
+            if (equal(live[key], defaults[key]))
+                continue;
+            const serialized = def.valueToQueryParam?.(live[key]);
+            const serializedToNothing = !!def.valueToQueryParam && (serialized === null || serialized === undefined);
+            const clearedNullableText = live[key] === '' && defaults[key] === null;
+            if (serializedToNothing || clearedNullableText) {
+                live[key] = defaults[key];
+            }
+        }
         const prev = committed();
         if (equal(live, prev)) {
             skipNextResets = false;
+            if (!equal(live, rawLive)) {
+                model.set(clone(live));
+            }
             return;
         }
         const next = skipNextResets ? { ...live } : resolveResets(prev, live);
@@ -14559,7 +14788,7 @@ const defineQueryForm = (config) => {
         committed.set(clone(next));
         // Reflect any reset overrides back into the bound controls. The effect re-runs
         // but no-ops because the model now equals the committed value.
-        if (!equal(next, live)) {
+        if (!equal(next, rawLive)) {
             model.set(clone(next));
         }
         if (observing() && observeOptions?.writeToQueryParams !== false) {
@@ -14626,12 +14855,12 @@ const defineQueryForm = (config) => {
             return;
         commitFromUrl(current);
     };
-    const cleanup = () => {
+    const cleanup = (removeQueryParams = true) => {
         if (!observing())
             return;
         observing.set(false);
         clearTimer();
-        if (observeOptions?.writeToQueryParams === false)
+        if (!removeQueryParams || observeOptions?.writeToQueryParams === false)
             return;
         const queryParams = {};
         for (const key of Object.keys(fieldDefs)) {
@@ -14657,7 +14886,7 @@ const defineQueryForm = (config) => {
         model.update((cur) => {
             const next = { ...cur };
             for (const key of keys) {
-                next[key] = defaults[key];
+                next[key] = defaultFor(key);
             }
             return next;
         });
@@ -14694,6 +14923,10 @@ const defineQueryForm = (config) => {
             }
             // Commit whatever the model holds now (URL-restored or programmatic defaults).
             flush();
+            if (options?.writeToQueryParams !== false &&
+                Object.values(fieldDefs).some((field) => field.appendDefaultValueToUrl === true)) {
+                writeToUrl(committed());
+            }
             return queryForm;
         },
         unobserve: () => cleanup(),
@@ -14706,7 +14939,7 @@ const defineQueryForm = (config) => {
             const keys = Object.keys(fieldDefs).filter((key) => !skip.has(key));
             resetFieldsToDefault(keys, options);
         },
-        branch: () => createBranch(fieldDefs, clone(committed()), injector),
+        branch: (branchInjector = injector) => createBranch(fieldDefs, clone(committed()), branchInjector),
     };
     // React to live control edits: schedule a debounced commit.
     effect(() => {
@@ -14719,10 +14952,13 @@ const defineQueryForm = (config) => {
         untracked(() => {
             if (!observing() || observeOptions?.syncOnNavigation === false)
                 return;
+            const info = router.lastSuccessfulNavigation()?.extras.info;
+            if (info?.queryForm === urlNavigationMarker && (info.version ?? 0) < urlWriteVersion)
+                return;
             applyFromUrl(changes);
         });
     });
-    destroyRef.onDestroy(() => cleanup());
+    destroyRef.onDestroy(() => cleanup(false));
     if (devtoolsId) {
         /**
          * The live view `<et-query-devtools>` renders. Only built while the devtools are installed - it walks
@@ -14896,13 +15132,14 @@ const createWebSocketClient = (options) => {
             const pre = previousSignalValue(computed(() => roomFn()));
             const roomData = signal(null, /* @ts-ignore */
             ...(ngDevMode ? [{ debugName: "roomData" }] : /* istanbul ignore next */ []));
+            let joinedRoomName = null;
             const join = (name) => {
-                emit({ event: 'join-room', data: name, room: name });
                 const existingRoom = rooms.get(name);
                 if (existingRoom) {
                     existingRoom.joinCount++;
                     return existingRoom;
                 }
+                emit({ event: 'join-room', data: name, room: name });
                 const message = signal(null, /* @ts-ignore */
                 ...(ngDevMode ? [{ debugName: "message" }] : /* istanbul ignore next */ []));
                 const newRoom = {
@@ -14919,12 +15156,16 @@ const createWebSocketClient = (options) => {
                     const previous = pre();
                     if (previous === current)
                         return;
-                    if (previous)
+                    if (previous) {
                         leaveRoom(previous);
+                        joinedRoomName = null;
+                    }
                     if (current) {
                         const joinedRoom = join(current);
-                        if (joinedRoom)
+                        if (joinedRoom) {
+                            joinedRoomName = current;
                             roomData.set(joinedRoom);
+                        }
                     }
                     else {
                         roomData.set(null);
@@ -14932,9 +15173,9 @@ const createWebSocketClient = (options) => {
                 });
             });
             inject(DestroyRef).onDestroy(() => {
-                const current = roomFn();
-                if (current) {
-                    leaveRoom(current);
+                if (joinedRoomName) {
+                    leaveRoom(joinedRoomName);
+                    joinedRoomName = null;
                     roomData.set(null);
                 }
             });
@@ -14964,8 +15205,11 @@ const createWebSocketClient = (options) => {
             socket.on('disconnect', () => isConnected.set(false));
         };
         const setupWebSocketListener = () => {
-            socket.onAny((data) => {
+            socket.onAny((_eventName, ...args) => {
                 try {
+                    const data = args[0];
+                    if (typeof data !== 'string')
+                        throw messageMalformed();
                     const json = JSON.parse(data);
                     recordDevtoolsMessage({ room: json.room, event: json.event, data: json.data, direction: 'in' });
                     const room = rooms.get(json.room);
@@ -15014,5 +15258,5 @@ const createWebSocketClient = (options) => {
  * Generated bundle index. Do not edit.
  */
 
-export { BasicAuthProvider, BearerAuthFeatureType, BooleanArrayQueryField, CustomHeaderAuthProvider, DEFAULT_KEEP_UNUSED_FOR, DEFAULT_QUERY_PERSISTENCE_MAX_AGE, DEFAULT_QUERY_PERSISTENCE_MAX_ENTRIES, DEFAULT_QUERY_PERSISTENCE_VERSION, DEFAULT_QUERY_PERSISTENCE_WRITE_DELAY, DateArrayQueryField, DateQueryField, EMPTY_QUERY_DEVTOOLS_FAULT, EntityStore, IGNORED_FILTER_COUNT_FIELDS, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, LegacyQuery, LegacyQueryCreator, MAX_QUERY_BATCH_TOMBSTONES, MAX_QUERY_DEVTOOLS_TOMBSTONES, MAX_UNUSED_ENTRIES, NumberArrayQueryField, ParseHttpErrorCodeToMessageDePipe, ParseHttpErrorCodeToMessageEnPipe, ParseHttpErrorCodeToTitleDePipe, ParseHttpErrorCodeToTitleEnPipe, QUERY_CLIENT_DEVTOOLS_TOKEN, QUERY_DEVTOOLS_FAULT_STATUSES, QUERY_DEVTOOLS_TOKEN_TTL_LIMIT, QUERY_PERSISTENCE_STORE_VERSION, QUERY_SYNC_PROTOCOL_VERSION, QUERY_VERSION, QueryClientFeatureType, QueryDevtoolsComponent, QueryDirective, QueryFeatureType, QueryField, QueryForm, QueryRuntimeErrorCode, QueryShortNamePipe, QueryStore, SERVER_ERROR_KIND, SERVER_VIOLATION_ERROR_KIND, SPEED_BUFFER_TIME_IN_MS, SearchQueryField, SortQueryField, StringArrayQueryField, V2BearerAuthProvider, V2Query, V2QueryClient, V2QueryCreator, addQueryContainerHandling, applyQueryDevtoolsOverrides, applyQueryDevtoolsTokenTtl, applyQueryFeatures, armAllQueryDevtoolsMocks, armQueryDevtoolsMock, armQueryDevtoolsOverrideTransfer, authExtractTokensResponseMissingAccessToken, authExtractTokensResponseMissingRefreshToken, authExtractTokensResponseNotObject, authProviderFeatureUsedMultipleTimes, booleanArrayQueryField, buildQueryCacheKey, buildQueryString, buildRoute, buildTimestampFromSeconds, canOverrideQueryDevtoolsTokenTtl, castQueryCreatorTypes, circularQueryDependency, circularQueryDependencyChecker, clearQueryDevtoolsArmedMocks, clearQueryDevtoolsFaults, clearQueryDevtoolsMockStore, clearQueryDevtoolsOverrideStore, clearQueryDevtoolsStore, clearQueryDevtoolsTokenTtl, clearQueryDevtoolsTombstones, clearRestoredQueryDevtoolsOverrides, collectLeafPaths, collectQueryDevtoolsSchemaComponents, collectQueryFormLinks, computeQueryAuthHeader, computeQueryBody, computeQueryHeaders, computeQueryMethod, computeQueryQueryParams, consumeSuppressQueryStackDevtools, contentfulGqlLikePaginationAdapter, countUnresolvedQueryDevtoolsOverrides, createAuthGuard, createBaseQuery, createBaseQueryCreator, createBearerAuthProvider, createDefaultRetryFn, createDeleteQuery, createExecuteFn, createGetQuery, createGqlExecuteFn, createGqlMutationViaGet, createGqlMutationViaPost, createGqlQuery, createGqlQueryCreator, createGqlQueryViaGet, createGqlQueryViaPost, createHttpRequest, createIndexedDbQueryPersistenceAdapter, createInfinityQueryConfig, createLegacyQueryCreator, createNoopQueryPersistenceAdapter, createPagedQueryStack, createPatchQuery, createPersistentAuthFeature, createPostQuery, createPutQuery, createQuery, createQueryBatch, createQueryClient, createQueryCollection, createQueryCollectionSignal, createQueryCollectionSubject, createQueryContext, createQueryCreator, createQueryDevtoolsFormLinks, createQueryDevtoolsFormLinksRecorder, createQueryDevtoolsOverrides, createQueryDevtoolsOverridesRecorder, createQueryDevtoolsStats, createQueryDevtoolsStatsRecorder, createQueryErrorResponse, createQueryFeature, createQueryInvalidationFilter, createQueryKeyLockManager, createQueryObject, createQueryPersistenceEngine, createQueryRepository, createQuerySnapshotFn, createQueryStack, createQuerySubmission, createQuerySyncEngine, createQuerySyncTransport, createSecureDeleteQuery, createSecureExecuteFactory, createSecureExecuteFn, createSecureGetQuery, createSecureGqlExecuteFn, createSecureGqlMutationViaGet, createSecureGqlMutationViaPost, createSecureGqlQuery, createSecureGqlQueryCreator, createSecureGqlQueryViaGet, createSecureGqlQueryViaPost, createSecurePatchQuery, createSecurePostQuery, createSecurePutQuery, createSecureQuery, createSecureQueryCreator, createTrackingFeature, createWebSocketClient, currentQueryDevtoolsBatch, dateArrayQueryField, dateQueryField, decryptBearer, deepFreeze, def, defineQueryForm, deleteQueryDevtoolsMock, describeQueryDevtoolsFeatures, detectContentTypeHeader, detectPaginationShape, dynLikePaginationAdapter, effectComputed, emptyQueryArgs, ethletePaginationAdapter, executeUntilSettled, extractExpiresInSeconds, extractFormViolations, extractHtmlErrorMessage, extractQuery, fakePaginationAdapter, filterFailure, filterNull, filterQueryStates, filterSuccess, forEachHeader, formatQueryDevtoolsDuration, generateQueryDevtoolsNumberPreset, generateQueryDevtoolsSampleNumber, generateQueryDevtoolsStringPreset, getBearerAuthProviderName, getDefaultHeaders, getQueryClientName, getQueryFeatureUsage, getResponseUrl, ggLikePaginationAdapter, gql, gqlDataPropertyMissingInResponse, hasHeader, hasQueryDevtoolsOverridesAtPath, htmlErrorPayload, htmlQueryErrorParser, ignoreAutoRefresh, initQueryDevtoolsFaults, initQueryDevtoolsMocks, initQueryDevtoolsOverridePersistence, initQueryDevtoolsSettings, injectInfinityQueryResponseDelay, injectQueryContext, insertFrom, invalidBaseRouteError, invalidBodyError, invalidRouteError, invalidStateInsideSecureExecuteFactory, isAutoRefresh, isBasicAuthProvider, isBearerAuthProvider, isClassValidatorError, isCreateGqlQueryOptions, isCustomHeaderAuthProvider, isDateShapedLeaf, isEmptyString, isGqlQueryConfig, isHtmlErrorPayload, isLegacyQuery, isNaN$1 as isNaN, isPageOutOfRangeError, isQuery, isQueryCollection, isQueryDevtoolsEnabled, isQueryDevtoolsFaultArmed, isQueryDevtoolsRequestInterceptionEnabled, isQueryErrorResponse, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, isSymfonyError, isSymfonyFormViolationListError, isSymfonyListError, isSymfonyPagerfantaOutOfRangeError, isUnderInvalidatedUrl, legacyPrepareFallbackInjector, legacyPrepareWithoutInjectionContext, loadQueryDevtoolsSchema, mapToPaginated, mapViolationsToFormErrors, matchesQueryDevtoolsMockPattern, matchesQueryDevtoolsMockQuery, maybeExecute, measureQueryDevtoolsPayload, mergeHeaders, nestedEffect, noteQueryFormRead, numberArrayQueryField, pagedQueryStackNextPageCalledWithoutPreviousPage, pagedQueryStackPageBiggerThanTotalPages, pagedQueryStackPreviousPageCalledButAlreadyAtFirstPage, paginatedEntityValueUpdater, parseAllXhrResponseHeaders, parseHttpErrorCodeToMessageDe, parseHttpErrorCodeToMessageEn, parseHttpErrorCodeToTitleDe, parseHttpErrorCodeToTitleEn, parseQueryDevtoolsOverrideTransfer, parseQueryRoute, patchQueryDevtoolsTokenPayload, pathParamsMissingInRouteFunctionError, provideInfinityQueryResponseDelay, provideLegacyPrepareFallback, provideQueryClientForDevtools, provideQueryDevtools, queryArrayComputed, queryBatchAlreadyRunning, queryBatchWithArgsUsed, queryClientFeatureUsedMultipleTimes, queryComputed, queryComputedTillTruthy, queryDevtoolsAbout, queryDevtoolsArmedMocks, queryDevtoolsArmedMocksRestored, queryDevtoolsEntries, queryDevtoolsFaults, queryDevtoolsFaultsRestored, queryDevtoolsFnDetail, queryDevtoolsMockId, queryDevtoolsMocks, queryDevtoolsOverridePersistence, queryDevtoolsRequestPath, queryDevtoolsResponseHistory, queryDevtoolsRestoredOverridesScope, queryDevtoolsSchemaNames, queryDevtoolsSchemaRoutes, queryDevtoolsSchemaState, queryDevtoolsSettings, queryDevtoolsStorage, queryDevtoolsTokenTtls, queryErrorMessage, queryErrorMessages, queryExecute, queryFeatureUsedMultipleTimes, queryField, querySequence, querySequenceAlreadyRunning, queryStackTotalQueriesAndExpectedQueriesMismatch, queryStackWithArgsUsed, queryStackWithResponseUpdateUsed, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, queryStateErrorSignal, queryStateLoadingSignal, queryStateResponseSignal, queryStateSignal, readQueryDevtoolsStore, registerEthleteVersion, registerQueryDevtoolsEntry, registerQueryErrorParser, removeFrom, request, resetExecuteState, resetPageOnError, resolveInvalidationUrl, resolveQueryDevtoolsFault, resolveQueryDevtoolsFaultForAttempt, resolveQueryDevtoolsMock, resolveQueryDevtoolsMockForAttempt, restoredQueryDevtoolsOverrides, runDefaultQueryRetry, runInQueryDevtoolsBatch, runQueryErrorParsers, saveQueryDevtoolsMock, searchQueryField, seedQueryDevtoolsSchemaBody, seedQueryDevtoolsSchemaRoute, serializeBody, serializeQueryDevtoolsOverrideTransfer, setDefaultQueryRetryFn, setQueryDevtoolsAppInfo, setQueryDevtoolsArmedMocksScope, setQueryDevtoolsFault, setQueryDevtoolsFaultResolver, setQueryDevtoolsFaultsScope, setQueryDevtoolsFormLinksFactory, setQueryDevtoolsMockResolver, setQueryDevtoolsOverridePersistence, setQueryDevtoolsOverridesFactory, setQueryDevtoolsOverridesScope, setQueryDevtoolsRegistrar, setQueryDevtoolsResponseHistory, setQueryDevtoolsSchemaLoader, setQueryDevtoolsSettings, setQueryDevtoolsStatsFactory, setQueryDevtoolsTokenPayloadPatcher, setQueryDevtoolsTokenTtl, setupQueryDependencies, setupQueryExecuteState, setupQueryState, shouldAutoExecuteGqlQuery, shouldAutoExecuteQuery, shouldCacheQuery, shouldRetryRequest, silenceMissingWithArgsFeatureErrorUsedButWithArgsPresent, skipPaginationPageParamCalculator, smartDuplicateArrayItem, snapshotQueryDevtoolsHandle, sortQueryField, splitQueryConfig, stringArrayQueryField, stringifyQueryRouteParts, sumQueryDevtoolsStats, suppressNextQueryStackDevtools, switchQueryCollectionState, switchQueryState, symfonyQueryErrorParser, takeUntilResponse, toQuerySignal, toQuerySubject, tokensNotAvailableInsideAuthAndExec, tombstoneOf, transformArrayResponse, transformExecStateToQueryState, transformGql, transformMethod, transformPaginatedResponse, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray, uncacheableRequestHasAllowCacheParam, uncacheableRequestHasCacheKeyParam, unwrapQuerySyncMessage, v2BuildQueryCacheKey, v2ExtractExpiresInSeconds, v2ShouldCacheQuery, v2ShouldRetryRequest, validateWithQuery, validateWithV2Query, withArgs, withArgsQueryFeatureMissingButRouteIsFunction, withAuthenticationQuery, withAutoRefresh, withAutoRefreshUsedInManualQuery, withAutoRefreshUsedOnUnsupportedHttpMethod, withBearerAuthMultiTabSync, withDefaultRetry, withErrorHandling, withEthleteApiErrors, withHtmlErrorParsing, withInactivityLogout, withLogging, withLongPolling, withLongPollingUsedOnUnsupportedHttpMethod, withLongPollingUsedWithPolling, withMultiTabSync, withPageResetOnError, withPersistentAuth, withPolling, withPollingUsedOnUnsupportedHttpMethod, withQueryDevtoolsOverridePersistence, withQueryPersistence, withRefreshQuery, withResponseUpdate, withSuccessHandling, withSymfonyErrors, withTokenExpirationWarning, withTokenRevocation, withTracking, wrapAsObservableSignal, wrapQuerySyncMessage, writeQueryDevtoolsStore };
+export { AuthBearerRefreshStrategy, BasicAuthProvider, BearerAuthFeatureType, BooleanArrayQueryField, CustomHeaderAuthProvider, DEFAULT_KEEP_UNUSED_FOR, DEFAULT_QUERY_PERSISTENCE_MAX_AGE, DEFAULT_QUERY_PERSISTENCE_MAX_ENTRIES, DEFAULT_QUERY_PERSISTENCE_VERSION, DEFAULT_QUERY_PERSISTENCE_WRITE_DELAY, DateArrayQueryField, DateQueryField, EMPTY_QUERY_DEVTOOLS_FAULT, EntityStore, IGNORED_FILTER_COUNT_FIELDS, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, LegacyQuery, LegacyQueryCreator, MAX_QUERY_BATCH_TOMBSTONES, MAX_QUERY_DEVTOOLS_TOMBSTONES, MAX_UNUSED_ENTRIES, NumberArrayQueryField, ParseHttpErrorCodeToMessageDePipe, ParseHttpErrorCodeToMessageEnPipe, ParseHttpErrorCodeToTitleDePipe, ParseHttpErrorCodeToTitleEnPipe, QUERY_CLIENT_DEVTOOLS_TOKEN, QUERY_DEVTOOLS_FAULT_STATUSES, QUERY_DEVTOOLS_TOKEN_TTL_LIMIT, QUERY_PERSISTENCE_STORE_VERSION, QUERY_SYNC_PROTOCOL_VERSION, QUERY_VERSION, QueryClientFeatureType, QueryDevtoolsComponent, QueryDirective, QueryFeatureType, QueryField, QueryForm, QueryRuntimeErrorCode, QueryShortNamePipe, QueryStateType, QueryStore, SERVER_ERROR_KIND, SERVER_VIOLATION_ERROR_KIND, SPEED_BUFFER_TIME_IN_MS, SearchQueryField, SortQueryField, StringArrayQueryField, V2BearerAuthProvider, V2Query, V2QueryClient, V2QueryCreator, addQueryContainerHandling, applyQueryDevtoolsOverrides, applyQueryDevtoolsTokenTtl, applyQueryFeatures, armAllQueryDevtoolsMocks, armQueryDevtoolsMock, armQueryDevtoolsOverrideTransfer, authExtractTokensResponseMissingAccessToken, authExtractTokensResponseMissingRefreshToken, authExtractTokensResponseNotObject, authProviderFeatureUsedMultipleTimes, booleanArrayQueryField, buildQueryCacheKey, buildQueryString, buildRoute, buildTimestampFromSeconds, canOverrideQueryDevtoolsTokenTtl, castQueryCreatorTypes, circularQueryDependency, circularQueryDependencyChecker, clearQueryDevtoolsArmedMocks, clearQueryDevtoolsFaults, clearQueryDevtoolsMockStore, clearQueryDevtoolsOverrideStore, clearQueryDevtoolsStore, clearQueryDevtoolsTokenTtl, clearQueryDevtoolsTombstones, clearRestoredQueryDevtoolsOverrides, collectLeafPaths, collectQueryDevtoolsSchemaComponents, collectQueryFormLinks, computeQueryAuthHeader, computeQueryBody, computeQueryHeaders, computeQueryMethod, computeQueryQueryParams, consumeSuppressQueryStackDevtools, contentfulGqlLikePaginationAdapter, countUnresolvedQueryDevtoolsOverrides, createAuthGuard, createBaseQuery, createBaseQueryCreator, createBearerAuthProvider, createDefaultRetryFn, createDeleteQuery, createExecuteFn, createGetQuery, createGqlExecuteFn, createGqlMutationViaGet, createGqlMutationViaPost, createGqlQuery, createGqlQueryCreator, createGqlQueryViaGet, createGqlQueryViaPost, createHttpRequest, createIndexedDbQueryPersistenceAdapter, createInfinityQueryConfig, createLegacyQueryCreator, createNoopQueryPersistenceAdapter, createPagedQueryStack, createPatchQuery, createPersistentAuthFeature, createPostQuery, createPutQuery, createQuery, createQueryBatch, createQueryClient, createQueryCollection, createQueryCollectionSignal, createQueryCollectionSubject, createQueryContext, createQueryCreator, createQueryDevtoolsFormLinks, createQueryDevtoolsFormLinksRecorder, createQueryDevtoolsOverrides, createQueryDevtoolsOverridesRecorder, createQueryDevtoolsStats, createQueryDevtoolsStatsRecorder, createQueryErrorResponse, createQueryFeature, createQueryInvalidationFilter, createQueryKeyLockManager, createQueryObject, createQueryPersistenceEngine, createQueryRepository, createQuerySnapshotFn, createQueryStack, createQuerySubmission, createQuerySyncEngine, createQuerySyncTransport, createSecureDeleteQuery, createSecureExecuteFactory, createSecureExecuteFn, createSecureGetQuery, createSecureGqlExecuteFn, createSecureGqlMutationViaGet, createSecureGqlMutationViaPost, createSecureGqlQuery, createSecureGqlQueryCreator, createSecureGqlQueryViaGet, createSecureGqlQueryViaPost, createSecurePatchQuery, createSecurePostQuery, createSecurePutQuery, createSecureQuery, createSecureQueryCreator, createTrackingFeature, createWebSocketClient, currentQueryDevtoolsBatch, dateArrayQueryField, dateQueryField, decryptBearer, deepFreeze, def, defineQueryForm, deleteQueryDevtoolsMock, describeQueryDevtoolsFeatures, detectContentTypeHeader, detectPaginationShape, dynLikePaginationAdapter, effectComputed, emptyQueryArgs, ethletePaginationAdapter, executeUntilSettled, extractExpiresInSeconds, extractFormViolations, extractHtmlErrorMessage, extractQuery, fakePaginationAdapter, filterFailure, filterNull, filterQueryStates, filterSuccess, forEachHeader, formatQueryDevtoolsDuration, generateQueryDevtoolsNumberPreset, generateQueryDevtoolsSampleNumber, generateQueryDevtoolsStringPreset, getBearerAuthProviderName, getDefaultHeaders, getQueryClientName, getQueryFeatureUsage, getResponseUrl, ggLikePaginationAdapter, gql, gqlDataPropertyMissingInResponse, hasHeader, hasQueryDevtoolsOverridesAtPath, htmlErrorPayload, htmlQueryErrorParser, ignoreAutoRefresh, initQueryDevtoolsFaults, initQueryDevtoolsMocks, initQueryDevtoolsOverridePersistence, initQueryDevtoolsSettings, injectInfinityQueryResponseDelay, injectQueryContext, insertFrom, invalidBaseRouteError, invalidBodyError, invalidRouteError, invalidStateInsideSecureExecuteFactory, isAutoRefresh, isBasicAuthProvider, isBearerAuthProvider, isClassValidatorError, isCreateGqlQueryOptions, isCustomHeaderAuthProvider, isDateShapedLeaf, isEmptyString, isGqlQueryConfig, isHtmlErrorPayload, isLegacyQuery, isNaN$1 as isNaN, isPageOutOfRangeError, isQuery, isQueryCollection, isQueryDevtoolsEnabled, isQueryDevtoolsFaultArmed, isQueryDevtoolsRequestInterceptionEnabled, isQueryErrorResponse, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, isSymfonyError, isSymfonyFormViolationListError, isSymfonyListError, isSymfonyPagerfantaOutOfRangeError, isUnderInvalidatedUrl, legacyPrepareFallbackInjector, legacyPrepareWithoutInjectionContext, loadQueryDevtoolsSchema, mapToPaginated, mapViolationsToFormErrors, matchesQueryDevtoolsMockPattern, matchesQueryDevtoolsMockQuery, maybeExecute, measureQueryDevtoolsPayload, mergeHeaders, nestedEffect, noteQueryFormRead, numberArrayQueryField, pagedQueryStackNextPageCalledWithoutPreviousPage, pagedQueryStackPageBiggerThanTotalPages, pagedQueryStackPreviousPageCalledButAlreadyAtFirstPage, paginatedEntityValueUpdater, parseAllXhrResponseHeaders, parseHttpErrorCodeToMessageDe, parseHttpErrorCodeToMessageEn, parseHttpErrorCodeToTitleDe, parseHttpErrorCodeToTitleEn, parseQueryDevtoolsOverrideTransfer, parseQueryRoute, patchQueryDevtoolsTokenPayload, pathParamsMissingInRouteFunctionError, provideInfinityQueryResponseDelay, provideLegacyPrepareFallback, provideQueryClientForDevtools, provideQueryDevtools, queryArrayComputed, queryBatchAlreadyRunning, queryBatchWithArgsUsed, queryClientFeatureUsedMultipleTimes, queryComputed, queryComputedTillTruthy, queryDevtoolsAbout, queryDevtoolsArmedMocks, queryDevtoolsArmedMocksRestored, queryDevtoolsEntries, queryDevtoolsFaults, queryDevtoolsFaultsRestored, queryDevtoolsFnDetail, queryDevtoolsMockId, queryDevtoolsMocks, queryDevtoolsOverridePersistence, queryDevtoolsRequestPath, queryDevtoolsResponseHistory, queryDevtoolsRestoredOverridesScope, queryDevtoolsSchemaNames, queryDevtoolsSchemaRoutes, queryDevtoolsSchemaState, queryDevtoolsSettings, queryDevtoolsStorage, queryDevtoolsTokenTtls, queryErrorMessage, queryErrorMessages, queryExecute, queryFeatureUsedMultipleTimes, queryField, querySequence, querySequenceAlreadyRunning, queryStackTotalQueriesAndExpectedQueriesMismatch, queryStackWithArgsUsed, queryStackWithResponseUpdateUsed, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, queryStateErrorSignal, queryStateLoadingSignal, queryStateResponseSignal, queryStateSignal, readQueryDevtoolsStore, registerEthleteVersion, registerQueryDevtoolsEntry, registerQueryErrorParser, removeFrom, request, resetExecuteState, resetPageOnError, resolveInvalidationUrl, resolveQueryDevtoolsFault, resolveQueryDevtoolsFaultForAttempt, resolveQueryDevtoolsMock, resolveQueryDevtoolsMockForAttempt, restoredQueryDevtoolsOverrides, runDefaultQueryRetry, runInQueryDevtoolsBatch, runQueryErrorParsers, saveQueryDevtoolsMock, searchQueryField, seedQueryDevtoolsSchemaBody, seedQueryDevtoolsSchemaRoute, serializeBody, serializeQueryDevtoolsOverrideTransfer, setDefaultQueryRetryFn, setQueryDevtoolsAppInfo, setQueryDevtoolsArmedMocksScope, setQueryDevtoolsFault, setQueryDevtoolsFaultResolver, setQueryDevtoolsFaultsScope, setQueryDevtoolsFormLinksFactory, setQueryDevtoolsMockResolver, setQueryDevtoolsOverridePersistence, setQueryDevtoolsOverridesFactory, setQueryDevtoolsOverridesScope, setQueryDevtoolsRegistrar, setQueryDevtoolsResponseHistory, setQueryDevtoolsSchemaLoader, setQueryDevtoolsSettings, setQueryDevtoolsStatsFactory, setQueryDevtoolsTokenPayloadPatcher, setQueryDevtoolsTokenTtl, setupQueryDependencies, setupQueryExecuteState, setupQueryState, shouldAutoExecuteGqlQuery, shouldAutoExecuteQuery, shouldCacheQuery, shouldRetryRequest, silenceMissingWithArgsFeatureErrorUsedButWithArgsPresent, skipPaginationPageParamCalculator, smartDuplicateArrayItem, snapshotQueryDevtoolsHandle, sortQueryField, splitQueryConfig, stringArrayQueryField, stringifyQueryRouteParts, sumQueryDevtoolsStats, suppressNextQueryStackDevtools, switchQueryCollectionState, switchQueryState, symfonyQueryErrorParser, takeUntilResponse, toQuerySignal, toQuerySubject, tokensNotAvailableInsideAuthAndExec, tombstoneOf, transformArrayResponse, transformExecStateToQueryState, transformGql, transformMethod, transformPaginatedResponse, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray, uncacheableRequestHasAllowCacheParam, uncacheableRequestHasCacheKeyParam, unwrapQuerySyncMessage, v2BuildQueryCacheKey, v2ExtractExpiresInSeconds, v2ShouldCacheQuery, v2ShouldRetryRequest, validateWithQuery, validateWithV2Query, withArgs, withArgsQueryFeatureMissingButRouteIsFunction, withAuthenticationQuery, withAutoRefresh, withAutoRefreshUsedInManualQuery, withAutoRefreshUsedOnUnsupportedHttpMethod, withBearerAuthMultiTabSync, withDefaultRetry, withErrorHandling, withEthleteApiErrors, withHtmlErrorParsing, withInactivityLogout, withLogging, withLongPolling, withLongPollingUsedOnUnsupportedHttpMethod, withLongPollingUsedWithPolling, withMultiTabSync, withPageResetOnError, withPersistentAuth, withPolling, withPollingUsedOnUnsupportedHttpMethod, withQueryDevtoolsOverridePersistence, withQueryPersistence, withRefreshQuery, withResponseUpdate, withSuccessHandling, withSymfonyErrors, withTokenExpirationWarning, withTokenRevocation, withTracking, wrapAsObservableSignal, wrapQuerySyncMessage, writeQueryDevtoolsStore };
 //# sourceMappingURL=ethlete-query.mjs.map