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

package/fesm2020/ethlete-query.mjs

@@ -1,6 +1,8 @@
-import { Subject, timer, filter, takeWhile, BehaviorSubject, interval, takeUntil, tap, switchMap, of, fromEvent, startWith, concat, take, debounceTime, combineLatest, map, distinctUntilChanged } from 'rxjs';
+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 { FormGroup } from '@angular/forms';
 import { Router, ActivatedRoute } from '@angular/router';
 
@@ -164,13 +166,15 @@ const buildTimestampFromSeconds = (seconds) => {
     }
     return new Date(Date.now() + seconds * 1000).getTime();
 };
-const buildRequestError = async (error) => {
+const buildRequestError = async (error, route, requestInit) => {
     if (error instanceof DOMException && error.code === error.ABORT_ERR) {
         const err = {
             code: -1,
             message: 'Request aborted',
             detail: null,
             raw: error,
+            route,
+            requestInit,
         };
         return err;
     }
@@ -180,6 +184,8 @@ const buildRequestError = async (error) => {
             message: 'Syntax error',
             detail: null,
             raw: error,
+            route,
+            requestInit,
         };
         return err;
     }
@@ -189,23 +195,35 @@ const buildRequestError = async (error) => {
             message: `${error.name}: ${error.message}`,
             detail: null,
             raw: error,
+            route,
+            requestInit,
         };
         return err;
     }
     if (isFetchResponse(error)) {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        let detail;
+        let detail = null;
         try {
-            detail = await error.text();
+            detail = await error.json();
         }
-        catch (err) {
-            detail = null;
+        catch {
+            // noop
+        }
+        if (!detail) {
+            try {
+                detail = await error.text();
+            }
+            catch {
+                // noop
+            }
         }
         const err = {
             code: error.status,
             message: error.statusText,
             detail,
             raw: error,
+            route,
+            requestInit,
         };
         return err;
     }
@@ -214,6 +232,8 @@ const buildRequestError = async (error) => {
         message: 'Unknown error',
         detail: null,
         raw: error,
+        route,
+        requestInit,
     };
     return err;
 };
@@ -260,7 +280,9 @@ const request = async (options) => {
         if (!response.ok) {
             throw response;
         }
-        const data = (await response.json());
+        const isJsonResponse = response.headers.get('Content-Type')?.includes('application/json');
+        const isTextResponse = response.headers.get('Content-Type')?.includes('text/plain');
+        const data = (isJsonResponse ? await response.json() : isTextResponse ? await response.text() : null);
         const expiresInSeconds = options.cacheAdapter
             ? options.cacheAdapter(response.headers)
             : extractExpiresInSeconds(response.headers);
@@ -268,7 +290,7 @@ const request = async (options) => {
         return { data, expiresInTimestamp };
     }
     catch (error) {
-        throw await buildRequestError(error);
+        throw await buildRequestError(error, options.route, options.init);
     }
 };
 
@@ -345,11 +367,12 @@ class BearerAuthProvider {
             route,
         });
         const body = bodyAdapter ? bodyAdapter(this._refreshToken) : { refreshToken: this._refreshToken };
+        const requestInit = { body: buildBody(body), method };
         this.onRefreshInitiation$.next();
         try {
             const result = await request({
                 route: fullRoute,
-                init: { body: buildBody(body), method },
+                init: requestInit,
             });
             const tokens = responseAdapter ? responseAdapter(result.data) : result.data;
             if (!tokens.token) {
@@ -364,7 +387,7 @@ class BearerAuthProvider {
         }
         catch (error) {
             if (error instanceof Error) {
-                this.onRefreshFailure$.next(await buildRequestError(error));
+                this.onRefreshFailure$.next(await buildRequestError(error, fullRoute, requestInit));
             }
             else {
                 this.onRefreshFailure$.next(error);
@@ -397,6 +420,10 @@ const gql = (strings, ...values) => {
 };
 
 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
@@ -427,11 +454,26 @@ function filterFailure() {
         return source.pipe(filter((value) => isQueryStateFailure(value)));
     };
 }
+function filterQueryStates(allowedStates) {
+    return function (source) {
+        return source.pipe(filter((value) => value && allowedStates.includes(value.type)));
+    };
+}
 function takeUntilResponse() {
     return function (source) {
         return source.pipe(takeWhile((value) => isQueryStateLoading(value), true));
     };
 }
+function filterNull() {
+    return function (source) {
+        return source.pipe(filter((value) => value !== null));
+    };
+}
+function switchQueryState() {
+    return function (source) {
+        return source.pipe(switchMap((value) => value?.state$ ?? of(null)));
+    };
+}
 const isQueryStateLoading = (state) => state?.type === "LOADING" /* QueryStateType.Loading */;
 const isQueryStateSuccess = (state) => state?.type === "SUCCESS" /* QueryStateType.Success */;
 const isQueryStateFailure = (state) => state?.type === "FAILURE" /* QueryStateType.Failure */;
@@ -520,7 +562,7 @@ class Query {
         }
         else {
             body = buildBody(this._args?.body);
-            contentType = guessContentType(body);
+            contentType = guessContentType(this._args?.body);
         }
         let authHeader = null;
         if (this._queryConfig.secure) {
@@ -559,7 +601,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 {
@@ -698,9 +744,9 @@ class QueryDirective {
         }
     }
 }
-QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.8", 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.8", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.8", ngImport: i0, type: QueryDirective, decorators: [{
+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: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -880,6 +926,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,
@@ -893,17 +940,19 @@ class InfinityQueryDirective {
             itemsPerPage: null,
         };
         this._infinityQueryInstance = null;
-        this._destroy$ = new Subject();
+        this._destroy$ = inject(DestroyDirective).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();
@@ -914,6 +963,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;
     }
@@ -921,8 +976,6 @@ class InfinityQueryDirective {
         this._renderMainView();
     }
     ngOnDestroy() {
-        this._destroy$.next(true);
-        this._destroy$.unsubscribe();
         this.instance?._destroy();
     }
     _setupInfinityQuery(config) {
@@ -961,15 +1014,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;
     }
@@ -985,16 +1040,32 @@ class InfinityQueryDirective {
             this._viewContainerRef.createEmbeddedView(this._mainTemplateRef, this._viewContext);
         }
     }
+    _cleanup() {
+        this._queryConfigChanged$.next(true);
+        this.instance?._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.8", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.8", 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.8", ngImport: i0, type: InfinityQueryDirective, decorators: [{
+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: [{
             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],
                 }]
         }], propDecorators: { infinityQuery: [{
                 type: Input
@@ -1037,9 +1108,9 @@ class InfinityQueryTriggerDirective {
         this._observer.observe(this._elementRef.nativeElement);
     }
 }
-InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.8", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.8", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.8", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
+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: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1268,10 +1339,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 = field.data.queryParamTransformFn?.(value) ?? value;
+            const deserializedValue = field.data.queryParamToValueTransformFn?.(value) ?? value;
             field.setValue(deserializedValue);
         }
     }
@@ -1321,7 +1393,9 @@ class QueryForm {
                 delete queryParams[key];
             }
             else {
-                queryParams[key] = value;
+                queryParams[key] = this._fields[key].data.valueToQueryParamTransformFn
+                    ? this._fields[key].data.valueToQueryParamTransformFn?.(value)
+                    : value;
             }
         }
         this._router.navigate([], {
@@ -1403,10 +1477,30 @@ 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;
+};
 
 /**
  * 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, decryptBearer, deepFreeze, def, extractExpiresInSeconds, filterFailure, filterInvalidParams, filterNull, filterQueryStates, 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, switchQueryState, takeUntilResponse, transformGql, transformMethod, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray };
 //# sourceMappingURL=ethlete-query.mjs.map