@ethlete/query 0.1.0-next.10 → 0.1.0-next.12

package/fesm2020/ethlete-query.mjs

@@ -1,35 +1,34 @@
 import { Subject, timer, filter, takeWhile, switchMap, of, BehaviorSubject, interval, takeUntil, tap, 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 * as i1 from '@ethlete/core';
-import { DestroyDirective } from '@ethlete/core';
+import { DestroyService } from '@ethlete/core';
 import { FormGroup } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
 class CustomHeaderAuthProvider {
+    get header() {
+        return { [this._config.name]: this._config.value };
+    }
     constructor(_config) {
         this._config = _config;
         this.queryClient = null;
     }
-    get header() {
-        return { [this._config.name]: this._config.value };
-    }
     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;
+        this.queryClient = null;
+    }
     cleanUp() {
         // noop
     }
@@ -314,10 +313,14 @@ const decryptBearer = (token) => {
 };
 
 class BearerAuthProvider {
+    get header() {
+        return { Authorization: `Bearer ${this._token}` };
+    }
     constructor(_config) {
         this._config = _config;
         this._refreshToken = null;
         this._refreshTimerSubscription = null;
+        this._failureCount = 0;
         this.queryClient = null;
         this.onRefreshInitiation$ = new Subject();
         this.onRefreshSuccess$ = new Subject();
@@ -328,14 +331,12 @@ class BearerAuthProvider {
             this._setupRefresh(this._config.refreshConfig);
         }
     }
-    get header() {
-        return { Authorization: `Bearer ${this._token}` };
-    }
     cleanUp() {
         this._refreshTimerSubscription?.unsubscribe();
         this._refreshTimerSubscription = null;
     }
     _setupRefresh(config) {
+        this.cleanUp();
         const bearer = decryptBearer(this._token);
         if (!bearer) {
             return;
@@ -343,10 +344,11 @@ class BearerAuthProvider {
         const expiresInPropertyName = config.expiresInPropertyName || 'exp';
         const expiresIn = bearer[expiresInPropertyName];
         const fiveMinutes = 5 * 60 * 1000;
+        const refreshBuffer = config.refreshBuffer ?? fiveMinutes;
         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 remainingTime = new Date(expiresIn * 1000).getTime() - refreshBuffer - new Date().getTime();
         const strategy = config.strategy ?? "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */;
         switch (strategy) {
             case "beforeExpiration" /* AuthBearerRefreshStrategy.BeforeExpiration */:
@@ -361,13 +363,14 @@ class BearerAuthProvider {
         if (!this.queryClient) {
             throw new Error('Query client instance is null');
         }
-        const { method, route, bodyAdapter, responseAdapter } = config;
+        const { method, route, requestAdapter, responseAdapter, paramLocation } = config;
+        const data = requestAdapter?.(this._refreshToken) ?? { refreshToken: this._refreshToken };
         const fullRoute = buildRoute({
             base: this.queryClient.config.baseRoute,
             route,
+            queryParams: paramLocation === 'query' ? data : undefined,
         });
-        const body = bodyAdapter ? bodyAdapter(this._refreshToken) : { refreshToken: this._refreshToken };
-        const requestInit = { body: buildBody(body), method };
+        const requestInit = { body: paramLocation === 'body' ? buildBody(data) : undefined, method };
         this.onRefreshInitiation$.next();
         try {
             const result = await request({
@@ -384,6 +387,8 @@ class BearerAuthProvider {
             this._token = tokens.token;
             this._refreshToken = tokens.refreshToken;
             this.onRefreshSuccess$.next(tokens);
+            this._setupRefresh(config);
+            this._failureCount = 0;
         }
         catch (error) {
             if (error instanceof Error) {
@@ -392,6 +397,10 @@ class BearerAuthProvider {
             else {
                 this.onRefreshFailure$.next(error);
             }
+            this._failureCount++;
+            if (this._failureCount <= (config.maxRefreshAttempts ?? 3)) {
+                this._setupRefresh(config);
+            }
         }
     }
 }
@@ -419,31 +428,6 @@ const gql = (strings, ...values) => {
     return str;
 };
 
-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;
-
 function filterSuccess() {
     return function (source) {
         return source.pipe(filter((value) => isQueryStateSuccess(value)));
@@ -501,21 +485,8 @@ const isGqlQueryConfig = (config) => {
 };
 
 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();
@@ -533,6 +504,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);
     }
@@ -547,11 +532,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)) {
@@ -616,9 +602,9 @@ class Query {
                 : responseData;
             this._state$.next({
                 type: "SUCCESS" /* QueryStateType.Success */,
-                response: deepFreeze(transformedResponse),
-                rawResponse: deepFreeze(responseData),
-                meta: deepFreeze({ ...meta, expiresAt: response.expiresInTimestamp }),
+                response: transformedResponse,
+                rawResponse: responseData,
+                meta: { ...meta, expiresAt: response.expiresInTimestamp },
             });
         })
             .catch((error) => this._handleExecuteError(error, meta));
@@ -627,6 +613,7 @@ class Query {
     abort() {
         this._abortController.abort();
         this._abortController = new AbortController();
+        this._onAbort$.next();
         return this;
     }
     poll(config) {
@@ -643,6 +630,26 @@ class Query {
         this._pollingSubscription = null;
         return this;
     }
+    _updateUseResultInDependencies() {
+        if (!this._args?.useResultIn?.length) {
+            return;
+        }
+        this.state$
+            .pipe(filterSuccess(), takeUntil(this._onAbort$), takeUntilResponse(), tap((state) => {
+            if (!this._args?.useResultIn) {
+                return;
+            }
+            for (const query of this._args.useResultIn) {
+                query._state$.next({
+                    type: "SUCCESS" /* QueryStateType.Success */,
+                    meta: { ...state.meta, id: query._nextId },
+                    rawResponse: state.rawResponse,
+                    response: state.response,
+                });
+            }
+        }))
+            .subscribe();
+    }
     _handleExecuteError(error, meta) {
         if (isAbortRequestError(error)) {
             this._state$.next({
@@ -664,6 +671,19 @@ class Query {
 }
 
 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;
@@ -680,19 +700,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;
     }
@@ -744,9 +751,9 @@ class QueryDirective {
         }
     }
 }
-QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.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.0.2", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.2", ngImport: i0, type: QueryDirective, decorators: [{
+QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", 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.0", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: QueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -762,16 +769,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.2", ngImpor
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 class InfinityQuery {
-    constructor(_config) {
-        this._config = _config;
-        this._currentPage$ = new BehaviorSubject(null);
-        this._currentCalculatedPage$ = new BehaviorSubject(null);
-        this._totalPages$ = new BehaviorSubject(null);
-        this._itemsPerPage$ = new BehaviorSubject(this._config.limitParam?.value ?? 10);
-        this._currentQuery$ = new BehaviorSubject(null);
-        this._data$ = new BehaviorSubject([]);
-        this._subscriptions = [];
-    }
     get currentPage$() {
         return this._currentPage$.asObservable();
     }
@@ -808,6 +805,16 @@ class InfinityQuery {
     get data() {
         return this._data$.getValue();
     }
+    constructor(_config) {
+        this._config = _config;
+        this._currentPage$ = new BehaviorSubject(null);
+        this._currentCalculatedPage$ = new BehaviorSubject(null);
+        this._totalPages$ = new BehaviorSubject(null);
+        this._itemsPerPage$ = new BehaviorSubject(this._config.limitParam?.value ?? 10);
+        this._currentQuery$ = new BehaviorSubject(null);
+        this._data$ = new BehaviorSubject([]);
+        this._subscriptions = [];
+    }
     nextPage() {
         const newPage = (this._currentPage$.value ?? 0) + 1;
         const calculatedPage = this._config?.pageParam?.valueCalculator?.({
@@ -940,7 +947,7 @@ class InfinityQueryDirective {
             itemsPerPage: null,
         };
         this._infinityQueryInstance = null;
-        this._destroy$ = inject(DestroyDirective).destroy$;
+        this._destroy$ = inject(DestroyService).destroy$;
         this._cdr = inject(ChangeDetectorRef);
         this._viewContainerRef = inject(ViewContainerRef);
         this._mainTemplateRef = inject((TemplateRef));
@@ -1055,17 +1062,16 @@ class InfinityQueryDirective {
         this._data$.next([]);
     }
 }
-InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.2", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.2", type: InfinityQueryDirective, isStandalone: true, selector: "[infinityQuery]", inputs: { infinityQuery: "infinityQuery" }, providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }], exportAs: ["infinityQuery"], hostDirectives: [{ directive: i1.DestroyDirective }], ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.2", ngImport: i0, type: InfinityQueryDirective, decorators: [{
+InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.0", 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.0", 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 }],
-                    hostDirectives: [DestroyDirective],
+                    providers: [{ provide: INFINITY_QUERY_TOKEN, useExisting: InfinityQueryDirective }, DestroyService],
                 }]
         }], propDecorators: { infinityQuery: [{
                 type: Input
@@ -1108,9 +1114,9 @@ class InfinityQueryTriggerDirective {
         this._observer.observe(this._elementRef.nativeElement);
     }
 }
-InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.2", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.2", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.2", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
+InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.1.0", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.1.0", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1202,6 +1208,12 @@ config, args) => {
 };
 
 class QueryClient {
+    get config() {
+        return this._clientConfig;
+    }
+    get authProvider() {
+        return this._authProvider;
+    }
     constructor(_clientConfig) {
         this._clientConfig = _clientConfig;
         this._authProvider = null;
@@ -1276,23 +1288,17 @@ class QueryClient {
             enableGarbageCollectorLogging: _clientConfig.logging?.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);
@@ -1498,6 +1504,31 @@ const transformToSortQueryParam = (value) => {
     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.
  */