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

package/fesm2020/ethlete-query.mjs

@@ -909,6 +909,7 @@ class InfinityQueryDirective {
         this._viewContainerRef = inject(ViewContainerRef);
         this._mainTemplateRef = inject((TemplateRef));
         this._errorHandler = inject(ErrorHandler);
+        this._data$ = new BehaviorSubject([]);
         this._isMainViewCreated = false;
     }
     get infinityQuery() {
@@ -925,6 +926,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;
     }
@@ -972,6 +979,7 @@ class InfinityQueryDirective {
                 this._viewContext.currentPage = null;
                 this._viewContext.itemsPerPage = null;
                 this._viewContext.totalPages = null;
+                this._data$.next([]);
             }
             this._cdr.markForCheck();
         }), takeUntil(this._destroy$))
@@ -979,6 +987,7 @@ class InfinityQueryDirective {
         instance.data$
             .pipe(tap((data) => {
             this._viewContext.infinityQuery = this._viewContext.$implicit = data;
+            this._data$.next(data);
             this._cdr.markForCheck();
         }), takeUntil(this._destroy$))
             .subscribe();
@@ -1279,10 +1288,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);
         }
     }
@@ -1332,7 +1342,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([], {
@@ -1414,10 +1426,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