@ethlete/query 0.1.0-next.1 → 0.1.0-next.3

package/fesm2020/ethlete-query.mjs

@@ -164,13 +164,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 +182,8 @@ const buildRequestError = async (error) => {
             message: 'Syntax error',
             detail: null,
             raw: error,
+            route,
+            requestInit,
         };
         return err;
     }
@@ -189,6 +193,8 @@ const buildRequestError = async (error) => {
             message: `${error.name}: ${error.message}`,
             detail: null,
             raw: error,
+            route,
+            requestInit,
         };
         return err;
     }
@@ -206,6 +212,8 @@ const buildRequestError = async (error) => {
             message: error.statusText,
             detail,
             raw: error,
+            route,
+            requestInit,
         };
         return err;
     }
@@ -214,6 +222,8 @@ const buildRequestError = async (error) => {
         message: 'Unknown error',
         detail: null,
         raw: error,
+        route,
+        requestInit,
     };
     return err;
 };
@@ -268,7 +278,7 @@ const request = async (options) => {
         return { data, expiresInTimestamp };
     }
     catch (error) {
-        throw await buildRequestError(error);
+        throw await buildRequestError(error, options.route, options.init);
     }
 };
 
@@ -345,11 +355,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 +375,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);
@@ -1268,10 +1279,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 +1333,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 +1417,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, 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, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray };
 //# sourceMappingURL=ethlete-query.mjs.map