@ethlete/query 0.1.0-next.2 → 0.1.0-next.20

package/fesm2015/ethlete-query.mjs

@@ -1,39 +1,61 @@
+import { getCookie, setCookie, deleteCookie, DestroyService } from '@ethlete/core';
+import { filter, takeWhile, switchMap, of, BehaviorSubject, Subject, interval, takeUntil, tap, timer, fromEvent, startWith, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
 import { __awaiter } from 'tslib';
-import { Subject, timer, filter, takeWhile, BehaviorSubject, interval, takeUntil, tap, switchMap, of, fromEvent, startWith, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
 import * as i0 from '@angular/core';
 import { Directive, Input, InjectionToken, inject, ChangeDetectorRef, ViewContainerRef, TemplateRef, ErrorHandler, ElementRef } from '@angular/core';
 import { FormGroup } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 class CustomHeaderAuthProvider {
-    constructor(_config) {
-        this._config = _config;
-        this.queryClient = null;
-    }
     get header() {
         return { [this._config.name]: this._config.value };
     }
+    constructor(_config) {
+        this._config = _config;
+    }
     cleanUp() {
         // noop
     }
 }
 
 class BasicAuthProvider {
-    constructor(_config) {
-        this._config = _config;
-        this.queryClient = null;
-    }
     get header() {
         return { Authorization: `Basic ${this._basicAuthString}` };
     }
     get _basicAuthString() {
         return btoa(`${this._config.username}:${this._config.password}`);
     }
+    constructor(_config) {
+        this._config = _config;
+    }
     cleanUp() {
         // noop
     }
 }
 
+const getOpName = /(query|mutation) ?([\w\d-_]+)? ?\(.*?\)? \{/;
+const transformGql = (str) => {
+    str = Array.isArray(str) ? str.join('') : str;
+    const name = getOpName.exec(str);
+    return function (variables) {
+        const data = { query: str };
+        if (variables)
+            data['variables'] = JSON.stringify(variables);
+        if (name && name.length) {
+            const operationName = name[2];
+            if (operationName)
+                data['operationName'] = name[2];
+        }
+        return JSON.stringify(data);
+    };
+};
+const gql = (strings, ...values) => {
+    const str = strings.reduce((acc, cur, i) => {
+        return acc + cur + (values[i] || '');
+    }, '');
+    return str;
+};
+
 const buildErrorMessage = (code, message) => `[@ethlete\\query:${code}] ${message}`;
 class QueryError extends Error {
     constructor(code, message, data) {
@@ -202,12 +224,20 @@ const buildRequestError = (error, route, requestInit) => __awaiter(void 0, void
     }
     if (isFetchResponse(error)) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let detail;
+        let detail = null;
         try {
-            detail = yield error.text();
+            detail = yield error.json();
+        }
+        catch (_a) {
+            // noop
         }
-        catch (err) {
-            detail = null;
+        if (!detail) {
+            try {
+                detail = yield error.text();
+            }
+            catch (_b) {
+                // noop
+            }
         }
         const err = {
             code: error.status,
@@ -236,12 +266,12 @@ const buildBody = (body) => {
     if (typeof body === 'string') {
         return body;
     }
-    if (typeof body === 'object') {
-        return JSON.stringify(body);
-    }
     if (body instanceof FormData) {
         return body;
     }
+    if (typeof body === 'object') {
+        return JSON.stringify(body);
+    }
     throw invalidBodyError(body);
 };
 const transformMethod = (method) => {
@@ -267,12 +297,15 @@ const guessContentType = (body) => {
 };
 
 const request = (options) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b;
     try {
         const response = yield fetch(options.route, options.init);
         if (!response.ok) {
             throw response;
         }
-        const data = (yield response.json());
+        const isJsonResponse = (_a = response.headers.get('Content-Type')) === null || _a === void 0 ? void 0 : _a.includes('application/json');
+        const isTextResponse = (_b = response.headers.get('Content-Type')) === null || _b === void 0 ? void 0 : _b.includes('text/plain');
+        const data = (isJsonResponse ? yield response.json() : isTextResponse ? yield response.text() : null);
         const expiresInSeconds = options.cacheAdapter
             ? options.cacheAdapter(response.headers)
             : extractExpiresInSeconds(response.headers);
@@ -284,157 +317,6 @@ const request = (options) => __awaiter(void 0, void 0, void 0, function* () {
     }
 });
 
-const isBasicAuthProvider = (authProvider) => authProvider instanceof BasicAuthProvider;
-const isBearerAuthProvider = (authProvider) => authProvider instanceof BearerAuthProvider;
-const isCustomHeaderAuthProvider = (authProvider) => authProvider instanceof CustomHeaderAuthProvider;
-const decryptBearer = (token) => {
-    try {
-        const base64Url = token.split('.')[1];
-        const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
-        const jsonPayload = decodeURIComponent(atob(base64)
-            .split('')
-            .map((c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
-            .join(''));
-        return JSON.parse(jsonPayload);
-    }
-    catch (error) {
-        console.error(`Invalid bearer token: ${token}`, error);
-        return null;
-    }
-};
-
-class BearerAuthProvider {
-    constructor(_config) {
-        var _a, _b;
-        this._config = _config;
-        this._refreshToken = null;
-        this._refreshTimerSubscription = null;
-        this.queryClient = null;
-        this.onRefreshInitiation$ = new Subject();
-        this.onRefreshSuccess$ = new Subject();
-        this.onRefreshFailure$ = new Subject();
-        this._token = _config.token;
-        this._refreshToken = (_b = (_a = _config.refreshConfig) === null || _a === void 0 ? void 0 : _a.token) !== null && _b !== void 0 ? _b : null;
-        if (this._config.refreshConfig) {
-            this._setupRefresh(this._config.refreshConfig);
-        }
-    }
-    get header() {
-        return { Authorization: `Bearer ${this._token}` };
-    }
-    cleanUp() {
-        var _a;
-        (_a = this._refreshTimerSubscription) === null || _a === void 0 ? void 0 : _a.unsubscribe();
-        this._refreshTimerSubscription = null;
-    }
-    _setupRefresh(config) {
-        var _a;
-        const bearer = decryptBearer(this._token);
-        if (!bearer) {
-            return;
-        }
-        const expiresInPropertyName = config.expiresInPropertyName || 'exp';
-        const expiresIn = bearer[expiresInPropertyName];
-        const fiveMinutes = 5 * 60 * 1000;
-        if (expiresIn === undefined) {
-            throw new Error(`Bearer token does not contain an '${expiresInPropertyName}' property`);
-        }
-        const remainingTime = new Date(expiresIn * 1000).getTime() - fiveMinutes - new Date().getTime();
-        const strategy = (_a = config.strategy) !== null && _a !== void 0 ? _a : "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */;
-        switch (strategy) {
-            case "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */:
-                this._refreshTimerSubscription = timer(remainingTime).subscribe(() => this._refresh(config));
-                break;
-        }
-    }
-    _refresh(config) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this._refreshToken) {
-                throw new Error('No refresh token found');
-            }
-            if (!this.queryClient) {
-                throw new Error('Query client instance is null');
-            }
-            const { method, route, bodyAdapter, responseAdapter } = config;
-            const fullRoute = buildRoute({
-                base: this.queryClient.config.baseRoute,
-                route,
-            });
-            const body = bodyAdapter ? bodyAdapter(this._refreshToken) : { refreshToken: this._refreshToken };
-            const requestInit = { body: buildBody(body), method };
-            this.onRefreshInitiation$.next();
-            try {
-                const result = yield request({
-                    route: fullRoute,
-                    init: requestInit,
-                });
-                const tokens = responseAdapter ? responseAdapter(result.data) : result.data;
-                if (!tokens.token) {
-                    throw new Error('Token not found in response');
-                }
-                if (!tokens.refreshToken) {
-                    throw new Error('Refresh token not found in response');
-                }
-                this._token = tokens.token;
-                this._refreshToken = tokens.refreshToken;
-                this.onRefreshSuccess$.next(tokens);
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    this.onRefreshFailure$.next(yield buildRequestError(error, fullRoute, requestInit));
-                }
-                else {
-                    this.onRefreshFailure$.next(error);
-                }
-            }
-        });
-    }
-}
-
-const getOpName = /(query|mutation) ?([\w\d-_]+)? ?\(.*?\)? \{/;
-const transformGql = (str) => {
-    str = Array.isArray(str) ? str.join('') : str;
-    const name = getOpName.exec(str);
-    return function (variables) {
-        const data = { query: str };
-        if (variables)
-            data['variables'] = JSON.stringify(variables);
-        if (name && name.length) {
-            const operationName = name[2];
-            if (operationName)
-                data['operationName'] = name[2];
-        }
-        return JSON.stringify(data);
-    };
-};
-const gql = (strings, ...values) => {
-    const str = strings.reduce((acc, cur, i) => {
-        return acc + cur + (values[i] || '');
-    }, '');
-    return str;
-};
-
-const deepFreeze = (object) => {
-    // Retrieve the property names defined on object
-    const propNames = Object.getOwnPropertyNames(object);
-    // Freeze properties before freezing self
-    for (const name of propNames) {
-        const value = object[name];
-        if (value && typeof value === 'object') {
-            deepFreeze(value);
-        }
-    }
-    return Object.freeze(object);
-};
-
-/**
- * Dummy function for providing types while not breaking inference.
- * **This function always returns null.**
- * @see https://github.com/microsoft/TypeScript/issues/26242
- * @returns null
- */
-const def = () => null;
-
 function filterSuccess() {
     return function (source) {
         return source.pipe(filter((value) => isQueryStateSuccess(value)));
@@ -445,9 +327,34 @@ function filterFailure() {
         return source.pipe(filter((value) => isQueryStateFailure(value)));
     };
 }
-function takeUntilResponse() {
+function filterQueryStates(allowedStates) {
+    return function (source) {
+        return source.pipe(filter((value) => value && allowedStates.includes(value.type)));
+    };
+}
+function takeUntilResponse(config) {
     return function (source) {
-        return source.pipe(takeWhile((value) => isQueryStateLoading(value), true));
+        return source.pipe(takeWhile((value) => {
+            if ((config === null || config === void 0 ? void 0 : config.excludeNull) && value === null) {
+                return false;
+            }
+            return isQueryStateLoading(value) || value === null;
+        }, true));
+    };
+}
+function filterNull() {
+    return function (source) {
+        return source.pipe(filter((value) => value !== null));
+    };
+}
+function switchQueryState() {
+    return function (source) {
+        return source.pipe(switchMap((value) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.state$) !== null && _a !== void 0 ? _a : of(null); }));
+    };
+}
+function switchQueryCollectionState() {
+    return function (source) {
+        return source.pipe(switchMap((value) => { var _a; return (_a = value === null || value === void 0 ? void 0 : value.query.state$) !== null && _a !== void 0 ? _a : of(null); }));
     };
 }
 const isQueryStateLoading = (state) => (state === null || state === void 0 ? void 0 : state.type) === "LOADING" /* QueryStateType.Loading */;
@@ -472,23 +379,23 @@ const isGqlQueryConfig = (config) => {
     }
     return true;
 };
+const isQuery = (query) => {
+    if (!query || typeof query !== 'object' || Array.isArray(query)) {
+        return false;
+    }
+    if (!('state$' in query)) {
+        return false;
+    }
+    return true;
+};
+const createQueryCollection = (
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+queryMap) => new BehaviorSubject(null);
+const extractQuery = (v) => { var _a; return (_a = (isQuery(v) ? v : v === null || v === void 0 ? void 0 : v.query)) !== null && _a !== void 0 ? _a : null; };
 
 class Query {
-    constructor(_client, _queryConfig, _route, _args) {
-        this._client = _client;
-        this._queryConfig = _queryConfig;
-        this._route = _route;
-        this._args = _args;
-        this._currentId = 0;
-        this._abortController = new AbortController();
-        this._pollingSubscription = null;
-        this._state$ = new BehaviorSubject({
-            type: "PREPARED" /* QueryStateType.Prepared */,
-            meta: { id: this._currentId },
-        });
-    }
     get _nextId() {
-        return this._currentId++;
+        return ++this._currentId;
     }
     get state$() {
         return this._state$.asObservable();
@@ -506,6 +413,20 @@ class Query {
         }
         return ts < Date.now();
     }
+    constructor(_client, _queryConfig, _route, _args) {
+        this._client = _client;
+        this._queryConfig = _queryConfig;
+        this._route = _route;
+        this._args = _args;
+        this._currentId = 0;
+        this._abortController = new AbortController();
+        this._pollingSubscription = null;
+        this._onAbort$ = new Subject();
+        this._state$ = new BehaviorSubject({
+            type: "PREPARED" /* QueryStateType.Prepared */,
+            meta: { id: this._currentId },
+        });
+    }
     clone() {
         return this._client.fetch(this._queryConfig);
     }
@@ -521,11 +442,12 @@ class Query {
         if (isQueryStateLoading(this._state$.value)) {
             this.abort();
         }
-        const meta = deepFreeze({ id });
+        const meta = { id };
         this._state$.next({
             type: "LOADING" /* QueryStateType.Loading */,
             meta,
         });
+        this._updateUseResultInDependencies();
         let body = null;
         let contentType = null;
         if (isGqlQueryConfig(this._queryConfig)) {
@@ -561,6 +483,10 @@ class Query {
                 };
             }
         }
+        // For form data we need to remove content type header because browser will set it automatically including boundary
+        if (headers && 'Content-Type' in headers && headers['Content-Type'] === 'multipart/form-data') {
+            delete headers['Content-Type'];
+        }
         request({
             route: this._route,
             init: {
@@ -575,7 +501,11 @@ class Query {
             const isResponseObject = typeof response === 'object';
             const isGql = isGqlQueryConfig(this._queryConfig);
             let responseData = null;
-            if (isGql && isResponseObject && 'data' in response.data) {
+            if (isGql &&
+                isResponseObject &&
+                !!response.data &&
+                typeof response.data === 'object' &&
+                'data' in response.data) {
                 responseData = response.data['data'];
             }
             else {
@@ -586,9 +516,9 @@ class Query {
                 : responseData;
             this._state$.next({
                 type: "SUCCESS" /* QueryStateType.Success */,
-                response: deepFreeze(transformedResponse),
-                rawResponse: deepFreeze(responseData),
-                meta: deepFreeze(Object.assign(Object.assign({}, meta), { expiresAt: response.expiresInTimestamp })),
+                response: transformedResponse,
+                rawResponse: responseData,
+                meta: Object.assign(Object.assign({}, meta), { expiresAt: response.expiresInTimestamp }),
             });
         })
             .catch((error) => this._handleExecuteError(error, meta));
@@ -597,6 +527,7 @@ class Query {
     abort() {
         this._abortController.abort();
         this._abortController = new AbortController();
+        this._onAbort$.next();
         return this;
     }
     poll(config) {
@@ -614,6 +545,28 @@ class Query {
         this._pollingSubscription = null;
         return this;
     }
+    _updateUseResultInDependencies() {
+        var _a, _b;
+        if (!((_b = (_a = this._args) === null || _a === void 0 ? void 0 : _a.useResultIn) === null || _b === void 0 ? void 0 : _b.length)) {
+            return;
+        }
+        this.state$
+            .pipe(filterSuccess(), takeUntil(this._onAbort$), takeUntilResponse(), tap((state) => {
+            var _a;
+            if (!((_a = this._args) === null || _a === void 0 ? void 0 : _a.useResultIn)) {
+                return;
+            }
+            for (const query of this._args.useResultIn) {
+                query._state$.next({
+                    type: "SUCCESS" /* QueryStateType.Success */,
+                    meta: Object.assign(Object.assign({}, state.meta), { id: query._nextId }),
+                    rawResponse: state.rawResponse,
+                    response: state.response,
+                });
+            }
+        }))
+            .subscribe();
+    }
     _handleExecuteError(error, meta) {
         if (isAbortRequestError(error)) {
             this._state$.next({
@@ -634,7 +587,185 @@ class Query {
     }
 }
 
+const isBasicAuthProvider = (authProvider) => authProvider instanceof BasicAuthProvider;
+const isBearerAuthProvider = (authProvider) => authProvider instanceof BearerAuthProvider;
+const isCustomHeaderAuthProvider = (authProvider) => authProvider instanceof CustomHeaderAuthProvider;
+const decryptBearer = (token) => {
+    try {
+        const base64Url = token.split('.')[1];
+        const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/');
+        const jsonPayload = decodeURIComponent(atob(base64)
+            .split('')
+            .map((c) => '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2))
+            .join(''));
+        return JSON.parse(jsonPayload);
+    }
+    catch (error) {
+        console.error(`Invalid bearer token: ${token}`, error);
+        return null;
+    }
+};
+
+class BearerAuthProvider {
+    get header() {
+        return { Authorization: `Bearer ${this._tokens$.getValue().token}` };
+    }
+    get tokens$() {
+        return this._tokens$.asObservable();
+    }
+    get tokens() {
+        return this._tokens$.getValue();
+    }
+    get currentRefreshQuery$() {
+        return this._currentRefreshQuery$.asObservable();
+    }
+    get currentRefreshQuery() {
+        return this._currentRefreshQuery$.getValue();
+    }
+    constructor(_config) {
+        var _a, _b, _c, _d, _e, _f, _g;
+        this._config = _config;
+        this._destroy$ = new Subject();
+        this._currentRefreshQuery$ = new BehaviorSubject(null);
+        this._tokens$ = new BehaviorSubject({
+            token: null,
+            refreshToken: null,
+        });
+        const cookieEnabled = (_b = (_a = _config.refreshConfig) === null || _a === void 0 ? void 0 : _a.cookieEnabled) !== null && _b !== void 0 ? _b : true;
+        const cookieToken = ((_c = _config.refreshConfig) === null || _c === void 0 ? void 0 : _c.cookieName) && cookieEnabled ? (_d = getCookie(_config.refreshConfig.cookieName)) !== null && _d !== void 0 ? _d : null : null;
+        this._tokens$.next({
+            token: _config.token || null,
+            refreshToken: ((_e = _config.refreshConfig) === null || _e === void 0 ? void 0 : _e.token) || cookieToken || null,
+        });
+        if (!this.tokens.token && !this.tokens.refreshToken) {
+            if (!((_f = _config.refreshConfig) === null || _f === void 0 ? void 0 : _f.cookieName)) {
+                console.error('A BearerAuthProvider was created without token or refresh token. You should provide at least a cookieName where the refresh token might be stored.');
+            }
+            return;
+        }
+        if (this.tokens.token) {
+            this._prepareForRefresh();
+            if (this.tokens.refreshToken && ((_g = this._config.refreshConfig) === null || _g === void 0 ? void 0 : _g.cookieName)) {
+                setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
+            }
+        }
+        else if (this.tokens.refreshToken) {
+            this._refreshQuery();
+        }
+    }
+    cleanUp() {
+        var _a;
+        this._destroy$.next(true);
+        this._destroy$.unsubscribe();
+        this._currentRefreshQuery$.next(null);
+        if ((_a = this._config.refreshConfig) === null || _a === void 0 ? void 0 : _a.cookieName) {
+            deleteCookie(this._config.refreshConfig.cookieName, '/');
+        }
+    }
+    enableCookie() {
+        var _a;
+        if (!((_a = this._config.refreshConfig) === null || _a === void 0 ? void 0 : _a.cookieName)) {
+            throw new Error('No cookie name was provided');
+        }
+        if (!this.tokens.refreshToken) {
+            throw new Error('No refresh token was provided');
+        }
+        this._config.refreshConfig.cookieEnabled = true;
+        setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
+    }
+    disableCookie() {
+        var _a;
+        if (!((_a = this._config.refreshConfig) === null || _a === void 0 ? void 0 : _a.cookieName)) {
+            throw new Error('No cookie name was provided');
+        }
+        this._config.refreshConfig.cookieEnabled = false;
+        deleteCookie(this._config.refreshConfig.cookieName, '/');
+    }
+    _prepareForRefresh() {
+        var _a, _b;
+        if (!this.tokens.token || !this._config.refreshConfig) {
+            return;
+        }
+        const bearer = decryptBearer(this.tokens.token);
+        if (!bearer) {
+            return;
+        }
+        const expiresInPropertyName = this._config.refreshConfig.expiresInPropertyName || 'exp';
+        const expiresIn = bearer[expiresInPropertyName];
+        const fiveMinutes = 5 * 60 * 1000;
+        const refreshBuffer = (_a = this._config.refreshConfig.refreshBuffer) !== null && _a !== void 0 ? _a : fiveMinutes;
+        if (expiresIn === undefined) {
+            throw new Error(`Bearer token does not contain an '${expiresInPropertyName}' property`);
+        }
+        const remainingTime = new Date(expiresIn * 1000).getTime() - refreshBuffer - new Date().getTime();
+        const strategy = (_b = this._config.refreshConfig.strategy) !== null && _b !== void 0 ? _b : "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */;
+        switch (strategy) {
+            case "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */:
+                timer(remainingTime)
+                    .pipe(takeUntil(this._destroy$))
+                    .subscribe(() => this._refreshQuery());
+                break;
+        }
+    }
+    _refreshQuery() {
+        var _a, _b, _c;
+        const currentRefreshToken = this.tokens.refreshToken;
+        if (!currentRefreshToken || !this._config.refreshConfig) {
+            return;
+        }
+        const args = (_c = (_b = (_a = this._config.refreshConfig).requestArgsAdapter) === null || _b === void 0 ? void 0 : _b.call(_a, {
+            token: this.tokens.token,
+            refreshToken: currentRefreshToken,
+        })) !== null && _c !== void 0 ? _c : {
+            body: { refreshToken: currentRefreshToken },
+        };
+        const query = this._config.refreshConfig.queryCreator.prepare(args).execute({ skipCache: true });
+        this._currentRefreshQuery$.next(query);
+        this._currentRefreshQuery$
+            .pipe(switchQueryState(), tap((state) => {
+            var _a, _b, _c, _d, _e;
+            if (isQueryStateSuccess(state)) {
+                if ((_a = this._config.refreshConfig) === null || _a === void 0 ? void 0 : _a.responseAdapter) {
+                    const tokens = this._config.refreshConfig.responseAdapter(state.response);
+                    this._tokens$.next(tokens);
+                }
+                else {
+                    this._tokens$.next({
+                        token: state.response['token'],
+                        refreshToken: state.response['refreshToken'],
+                    });
+                }
+                const cookieEnabled = (_c = (_b = this._config.refreshConfig) === null || _b === void 0 ? void 0 : _b.cookieEnabled) !== null && _c !== void 0 ? _c : true;
+                if (((_d = this._config.refreshConfig) === null || _d === void 0 ? void 0 : _d.cookieName) && this.tokens.refreshToken && cookieEnabled) {
+                    setCookie(this._config.refreshConfig.cookieName, this.tokens.refreshToken);
+                }
+                this._prepareForRefresh();
+            }
+            else if (isQueryStateFailure(state)) {
+                this._tokens$.next({ token: null, refreshToken: null });
+                if ((_e = this._config.refreshConfig) === null || _e === void 0 ? void 0 : _e.cookieName) {
+                    deleteCookie(this._config.refreshConfig.cookieName, '/');
+                }
+            }
+        }), takeUntilResponse(), takeUntil(this._destroy$))
+            .subscribe();
+    }
+}
+
 class QueryDirective {
+    get query() {
+        return this._query;
+    }
+    set query(v) {
+        this._query = v;
+        this._subscribeToQuery();
+    }
+    get cache() {
+        return this._cache;
+    }
+    set cache(v) {
+        this._cache = v;
+    }
     constructor(_mainTemplateRef, _viewContainerRef, _errorHandler, _cdr) {
         this._mainTemplateRef = _mainTemplateRef;
         this._viewContainerRef = _viewContainerRef;
@@ -651,19 +782,6 @@ class QueryDirective {
         };
         this._cache = false;
     }
-    get query() {
-        return this._query;
-    }
-    set query(v) {
-        this._query = v;
-        this._subscribeToQuery();
-    }
-    get cache() {
-        return this._cache;
-    }
-    set cache(v) {
-        this._cache = v;
-    }
     static ngTemplateContextGuard(dir, ctx) {
         return true;
     }
@@ -681,7 +799,8 @@ class QueryDirective {
         if (!this.query) {
             return;
         }
-        const sub = this.query.state$.pipe(tap((state) => this._updateView(state))).subscribe();
+        const query = isQuery(this.query) ? this.query : this.query.query;
+        const sub = query.state$.pipe(tap((state) => this._updateView(state))).subscribe();
         this._subscription = sub;
     }
     _updateView(state) {
@@ -717,9 +836,9 @@ class QueryDirective {
         }
     }
 }
-QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: QueryDirective, deps: [{ token: i0.TemplateRef }, { token: i0.ViewContainerRef }, { token: i0.ErrorHandler }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
-QueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.9", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: QueryDirective, decorators: [{
+QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: QueryDirective, deps: [{ token: i0.TemplateRef }, { token: i0.ViewContainerRef }, { token: i0.ErrorHandler }, { token: i0.ChangeDetectorRef }], target: i0.ɵɵFactoryTarget.Directive });
+QueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.2", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: QueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -735,17 +854,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImpor
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 class InfinityQuery {
-    constructor(_config) {
-        var _a, _b;
-        this._config = _config;
-        this._currentPage$ = new BehaviorSubject(null);
-        this._currentCalculatedPage$ = new BehaviorSubject(null);
-        this._totalPages$ = new BehaviorSubject(null);
-        this._itemsPerPage$ = new BehaviorSubject((_b = (_a = this._config.limitParam) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 10);
-        this._currentQuery$ = new BehaviorSubject(null);
-        this._data$ = new BehaviorSubject([]);
-        this._subscriptions = [];
-    }
     get currentPage$() {
         return this._currentPage$.asObservable();
     }
@@ -782,6 +890,17 @@ class InfinityQuery {
     get data() {
         return this._data$.getValue();
     }
+    constructor(_config) {
+        var _a, _b;
+        this._config = _config;
+        this._currentPage$ = new BehaviorSubject(null);
+        this._currentCalculatedPage$ = new BehaviorSubject(null);
+        this._totalPages$ = new BehaviorSubject(null);
+        this._itemsPerPage$ = new BehaviorSubject((_b = (_a = this._config.limitParam) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 10);
+        this._currentQuery$ = new BehaviorSubject(null);
+        this._data$ = new BehaviorSubject([]);
+        this._subscriptions = [];
+    }
     nextPage() {
         var _a, _b, _c, _d, _e;
         const newPage = ((_a = this._currentPage$.value) !== null && _a !== void 0 ? _a : 0) + 1;
@@ -884,6 +1003,7 @@ const skipPaginationPageParamCalculator = ({ page, itemsPerPage }) => itemsPerPa
 const INFINITY_QUERY_TOKEN = new InjectionToken('INFINITY_QUERY_TOKEN');
 class InfinityQueryDirective {
     constructor() {
+        this._queryConfigChanged$ = new Subject();
         this._viewContext = {
             $implicit: null,
             infinityQuery: null,
@@ -897,17 +1017,19 @@ class InfinityQueryDirective {
             itemsPerPage: null,
         };
         this._infinityQueryInstance = null;
-        this._destroy$ = new Subject();
+        this._destroy$ = inject(DestroyService, { self: true }).destroy$;
         this._cdr = inject(ChangeDetectorRef);
         this._viewContainerRef = inject(ViewContainerRef);
         this._mainTemplateRef = inject((TemplateRef));
         this._errorHandler = inject(ErrorHandler);
+        this._data$ = new BehaviorSubject([]);
         this._isMainViewCreated = false;
     }
     get infinityQuery() {
         return this._infinityQuery;
     }
     set infinityQuery(v) {
+        this._cleanup();
         this._infinityQuery = v;
         this._infinityQueryInstance = this._setupInfinityQuery(v);
         this._loadNextPage();
@@ -918,6 +1040,12 @@ class InfinityQueryDirective {
     get instance() {
         return this._infinityQueryInstance;
     }
+    get data$() {
+        return this._data$.asObservable();
+    }
+    get data() {
+        return this._data$.getValue();
+    }
     static ngTemplateContextGuard(dir, ctx) {
         return true;
     }
@@ -926,8 +1054,6 @@ class InfinityQueryDirective {
     }
     ngOnDestroy() {
         var _a;
-        this._destroy$.next(true);
-        this._destroy$.unsubscribe();
         (_a = this.instance) === null || _a === void 0 ? void 0 : _a._destroy();
     }
     _setupInfinityQuery(config) {
@@ -966,15 +1092,17 @@ class InfinityQueryDirective {
                 this._viewContext.currentPage = null;
                 this._viewContext.itemsPerPage = null;
                 this._viewContext.totalPages = null;
+                this._data$.next([]);
             }
             this._cdr.markForCheck();
-        }), takeUntil(this._destroy$))
+        }), takeUntil(this._destroy$), takeUntil(this._queryConfigChanged$))
             .subscribe();
         instance.data$
             .pipe(tap((data) => {
             this._viewContext.infinityQuery = this._viewContext.$implicit = data;
+            this._data$.next(data);
             this._cdr.markForCheck();
-        }), takeUntil(this._destroy$))
+        }), takeUntil(this._destroy$), takeUntil(this._queryConfigChanged$))
             .subscribe();
         return instance;
     }
@@ -990,16 +1118,32 @@ class InfinityQueryDirective {
             this._viewContainerRef.createEmbeddedView(this._mainTemplateRef, this._viewContext);
         }
     }
+    _cleanup() {
+        var _a;
+        this._queryConfigChanged$.next(true);
+        (_a = this.instance) === null || _a === void 0 ? void 0 : _a._destroy();
+        this._viewContext.loading = false;
+        this._viewContext.error = null;
+        this._viewContext.infinityQuery = null;
+        this._viewContext.$implicit = null;
+        this._viewContext.isFirstLoad = false;
+        this._viewContext.canLoadMore = false;
+        this._viewContext.currentPage = null;
+        this._viewContext.itemsPerPage = null;
+        this._viewContext.totalPages = null;
+        this._data$.next([]);
+    }
 }
-InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.9", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }], ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: InfinityQueryDirective, decorators: [{
+InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.2", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService], exportAs: ["infinityQuery"], ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
                     selector: '[infinityQuery]',
+                    exportAs: 'infinityQuery',
                     standalone: true,
-                    providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }],
+                    providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService],
                 }]
         }], propDecorators: { infinityQuery: [{
                 type: Input
@@ -1043,9 +1187,9 @@ class InfinityQueryTriggerDirective {
         this._observer.observe(this._elementRef.nativeElement);
     }
 }
-InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.9", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.9", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
+InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.2", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.2", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1140,10 +1284,19 @@ config, args) => {
 };
 
 class QueryClient {
+    get config() {
+        return this._clientConfig;
+    }
+    get authProvider() {
+        return this._authProvider$.getValue();
+    }
+    get authProvider$() {
+        return this._authProvider$.asObservable();
+    }
     constructor(_clientConfig) {
         var _a, _b;
         this._clientConfig = _clientConfig;
-        this._authProvider = null;
+        this._authProvider$ = new BehaviorSubject(null);
         this.get = (queryConfig) => this.fetch(Object.assign(Object.assign({}, queryConfig), { method: 'GET' }));
         this.post = (queryConfig) => this.fetch(Object.assign(Object.assign({}, queryConfig), { method: 'POST' }));
         this.put = (queryConfig) => this.fetch(Object.assign(Object.assign({}, queryConfig), { method: 'PUT' }));
@@ -1179,39 +1332,32 @@ class QueryClient {
             };
         };
         this.setAuthProvider = (authProvider) => {
-            if (this._authProvider) {
+            if (this.authProvider) {
                 throw new Error('The auth provider is already set. Please call clearAuthProvider() first.');
             }
-            this._authProvider = authProvider;
-            authProvider.queryClient = this;
+            this._authProvider$.next(authProvider);
         };
         this.clearAuthProvider = () => {
             var _a;
-            (_a = this._authProvider) === null || _a === void 0 ? void 0 : _a.cleanUp();
-            this._authProvider = null;
+            (_a = this.authProvider) === null || _a === void 0 ? void 0 : _a.cleanUp();
+            this._authProvider$.next(null);
         };
         this._store = new QueryStore({
             enableChangeLogging: (_a = _clientConfig.logging) === null || _a === void 0 ? void 0 : _a.queryStateChanges,
             enableGarbageCollectorLogging: (_b = _clientConfig.logging) === null || _b === void 0 ? void 0 : _b.queryStateGarbageCollector,
         });
     }
-    get config() {
-        return this._clientConfig;
-    }
-    get authProvider() {
-        return this._authProvider;
-    }
 }
 
 class QueryField {
+    get control() {
+        return this.data.control;
+    }
     constructor(data) {
         this.data = data;
         this.changes$ = this._setupChangesObservable();
         this._currentDebounceTimeout = null;
     }
-    get control() {
-        return this.data.control;
-    }
     setValue(value) {
         if (this._currentDebounceTimeout !== null) {
             clearTimeout(this._currentDebounceTimeout);
@@ -1259,10 +1405,11 @@ class QueryForm {
         const queryParams = this._activatedRoute.snapshot.queryParams;
         for (const [key, field] of Object.entries(this._fields)) {
             const value = queryParams[key];
-            if (value === undefined) {
+            // We only check using == because the value types can be different (e.g. "1" and 1)
+            if (value === undefined || value == field.control.value) {
                 continue;
             }
-            const deserializedValue = (_c = (_b = (_a = field.data).queryParamTransformFn) === null || _b === void 0 ? void 0 : _b.call(_a, value)) !== null && _c !== void 0 ? _c : value;
+            const deserializedValue = (_c = (_b = (_a = field.data).queryParamToValueTransformFn) === null || _b === void 0 ? void 0 : _b.call(_a, value)) !== null && _c !== void 0 ? _c : value;
             field.setValue(deserializedValue);
         }
     }
@@ -1304,6 +1451,7 @@ class QueryForm {
         return defaultValues;
     }
     _syncViaUrlQueryParams(values) {
+        var _a, _b;
         if (!this._router || !this._activatedRoute) {
             return;
         }
@@ -1313,7 +1461,9 @@ class QueryForm {
                 delete queryParams[key];
             }
             else {
-                queryParams[key] = value;
+                queryParams[key] = this._fields[key].data.valueToQueryParamTransformFn
+                    ? (_b = (_a = this._fields[key].data).valueToQueryParamTransformFn) === null || _b === void 0 ? void 0 : _b.call(_a, value)
+                    : value;
             }
         }
         this._router.navigate([], {
@@ -1395,10 +1545,55 @@ const transformToDateArray = (value) => {
     }
     return null;
 };
+const transformToSort = (value) => {
+    if (typeof value === 'string') {
+        const [active, direction] = value.split(':');
+        return {
+            active,
+            direction: direction,
+        };
+    }
+    return null;
+};
+const transformToSortQueryParam = (value) => {
+    if (typeof value === 'string') {
+        return value;
+    }
+    if (value && typeof value === 'object' && 'active' in value && 'direction' in value) {
+        const valAsSort = value;
+        return valAsSort.direction ? `${valAsSort.active}:${valAsSort.direction}` : null;
+    }
+    return null;
+};
+
+const deepFreeze = (object) => {
+    // check if object is actually an object or frozen
+    if (!object || typeof object !== 'object' || Object.isFrozen(object)) {
+        return object;
+    }
+    // Retrieve the property names defined on object
+    const propNames = Object.getOwnPropertyNames(object);
+    // Freeze properties before freezing self
+    for (const name of propNames) {
+        const value = object[name];
+        if (value && typeof value === 'object') {
+            deepFreeze(value);
+        }
+    }
+    return Object.freeze(object);
+};
+
+/**
+ * Dummy function for providing types while not breaking inference.
+ * **This function always returns null.**
+ * @see https://github.com/microsoft/TypeScript/issues/26242
+ * @returns null
+ */
+const def = () => null;
 
 /**
  * Generated bundle index. Do not edit.
  */
 
-export { BasicAuthProvider, BearerAuthProvider, CustomHeaderAuthProvider, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, Query, QueryClient, QueryDirective, QueryError, QueryField, QueryForm, QueryStore, buildBody, buildErrorMessage, buildGqlCacheKey, buildQueryArrayString, buildQueryString, buildRequestError, buildRoute, buildTimestampFromSeconds, createInfinityQueryConfig, decryptBearer, deepFreeze, def, extractExpiresInSeconds, filterFailure, filterInvalidParams, filterSuccess, gql, guessContentType, invalidBaseRouteError, invalidBodyError, invalidRouteError, isAbortRequestError, isBasicAuthProvider, isBearerAuthProvider, isCustomHeaderAuthProvider, isFetchResponse, isGqlQueryConfig, isParamValid, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, mergeHeaders, pathParamsMissingInRouteFunctionError, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, request, shouldCacheQuery, skipPaginationPageParamCalculator, takeUntilResponse, transformGql, transformMethod, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToString, transformToStringArray };
+export { BasicAuthProvider, BearerAuthProvider, CustomHeaderAuthProvider, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, Query, QueryClient, QueryDirective, QueryError, QueryField, QueryForm, QueryStore, buildBody, buildErrorMessage, buildGqlCacheKey, buildQueryArrayString, buildQueryString, buildRequestError, buildRoute, buildTimestampFromSeconds, createInfinityQueryConfig, createQueryCollection, decryptBearer, deepFreeze, def, extractExpiresInSeconds, extractQuery, filterFailure, filterInvalidParams, filterNull, filterQueryStates, filterSuccess, gql, guessContentType, invalidBaseRouteError, invalidBodyError, invalidRouteError, isAbortRequestError, isBasicAuthProvider, isBearerAuthProvider, isCustomHeaderAuthProvider, isFetchResponse, isGqlQueryConfig, isParamValid, isQuery, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, mergeHeaders, pathParamsMissingInRouteFunctionError, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, request, shouldCacheQuery, skipPaginationPageParamCalculator, switchQueryCollectionState, switchQueryState, takeUntilResponse, transformGql, transformMethod, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray };
 //# sourceMappingURL=ethlete-query.mjs.map