@ethlete/query 2.6.0 → 2.7.1

package/fesm2020/ethlete-query.mjs

@@ -82,7 +82,7 @@ const buildQueryString = (params) => {
             return buildQueryArrayString(key, validParams[key]);
         }
         if (typeof validParams[key] === 'object' && validParams[key] !== null) {
-            return buildQueryString(validParams[key]);
+            return buildQueryObjectString(key, validParams[key]);
         }
         return `${key}=${encodeURIComponent(validParams[key])}`;
     })
@@ -96,6 +96,22 @@ const buildQueryArrayString = (key, array) => {
         .map((item) => `${key}${uriBrackets}=${encodeURIComponent(item)}`)
         .join('&');
 };
+const buildQueryObjectString = (key, object) => {
+    const uriBracketStart = encodeURIComponent(`${key}[`);
+    const uriBracketEnd = encodeURIComponent(`]`);
+    return Object.keys(object)
+        .map((k) => {
+        const key = `${uriBracketStart}${k}${uriBracketEnd}`;
+        if (Array.isArray(object[k])) {
+            return buildQueryArrayString(key, object[k]);
+        }
+        if (typeof object[k] === 'object' && object[k] !== null) {
+            return buildQueryObjectString(key, object[k]);
+        }
+        return `${key}=${encodeURIComponent(object[k])}`;
+    })
+        .join('&');
+};
 const isFetchResponse = (response) => typeof response === 'object' &&
     response !== null &&
     'status' in response &&
@@ -105,10 +121,13 @@ const isFetchResponse = (response) => typeof response === 'object' &&
 const filterInvalidParams = (params) => {
     const filteredParams = Object.entries(params)
         .map(([key, value]) => {
-        if (!Array.isArray(value)) {
-            return [key, value];
+        if (Array.isArray(value)) {
+            return [key, value.filter((v) => isParamValid(v))];
+        }
+        else if (typeof value === 'object' && value !== null) {
+            return [key, filterInvalidParams(value)];
         }
-        return [key, value.filter((v) => isParamValid(v))];
+        return [key, value];
     })
         .filter(([, value]) => isParamValid(value))
         .reduce((acc, [key, value]) => ({ ...acc, [key]: value }), {});
@@ -663,6 +682,29 @@ const computeQueryQueryParams = (config) => {
     }
     return config.args?.queryParams;
 };
+const paginatedEntityValueUpdater = (findFn) => ({ response, rawResponse, entity }) => {
+    const indexOfEntityRaw = rawResponse.items.findIndex((item) => findFn(item, entity));
+    const indexOfEntity = response.items.findIndex((item) => findFn(item, entity));
+    if (indexOfEntity === -1 || indexOfEntityRaw === -1) {
+        return null;
+    }
+    const newRawResponse = {
+        ...rawResponse,
+        items: [
+            ...rawResponse.items.slice(0, indexOfEntityRaw),
+            entity,
+            ...rawResponse.items.slice(indexOfEntityRaw + 1),
+        ],
+    };
+    const newResponse = {
+        ...response,
+        items: [...response.items.slice(0, indexOfEntity), entity, ...response.items.slice(indexOfEntity + 1)],
+    };
+    return {
+        response: newResponse,
+        rawResponse: newRawResponse,
+    };
+};
 
 class Query {
     get _nextId() {
@@ -739,46 +781,33 @@ class Query {
                 if (!key) {
                     return;
                 }
-                const currentValue = this._queryConfig.entity?.valueSelector({
-                    args: this._args,
-                    response,
-                    rawResponse,
-                });
                 const newData = this._queryConfig.entity?.store.getOne(event.key);
-                if (Array.isArray(currentValue)) {
-                    const index = currentValue.findIndex((item) => item[key] === event.key);
-                    if (index === -1) {
-                        return;
-                    }
-                    const newValue = [...currentValue];
-                    if (newData) {
-                        newValue[index] = newData;
-                    }
-                    else {
-                        newValue.splice(index, 1);
-                    }
-                    this._state$.next({
-                        ...this.state,
-                        response: newValue,
-                        meta: {
-                            ...this.state.meta,
-                            triggeredVia: 'auto',
-                        },
-                    });
+                if (!newData) {
+                    return;
                 }
-                else {
-                    if (currentValue?.[key] !== event.key) {
-                        return;
-                    }
-                    this._state$.next({
-                        ...this.state,
+                const newResponse = this._queryConfig.entity?.valueUpdater
+                    ? this._queryConfig.entity?.valueUpdater({
+                        args: this._args,
+                        entity: newData,
+                        rawResponse,
+                        response,
+                    })
+                    : {
                         response: newData,
-                        meta: {
-                            ...this.state.meta,
-                            triggeredVia: 'auto',
-                        },
-                    });
+                        rawResponse: newData,
+                    };
+                if (!newResponse) {
+                    return;
                 }
+                this._state$.next({
+                    ...this.state,
+                    response: newResponse.response,
+                    rawResponse: newResponse.rawResponse,
+                    meta: {
+                        ...this.state.meta,
+                        triggeredVia: 'auto',
+                    },
+                });
             });
         }
     }
@@ -1214,9 +1243,9 @@ class QueryDirective {
         }
     }
 }
-QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.4", 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.2.4", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.4", ngImport: i0, type: QueryDirective, decorators: [{
+QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.5", 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.2.5", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: QueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1355,14 +1384,7 @@ class InfinityQuery {
                 this._subscriptions = this._subscriptions.filter((sub) => sub !== stateChangesSub);
             },
         });
-        const queryAutoRefreshSub = query.state$.subscribe({
-            next: (state) => {
-                if (state.meta.triggeredVia === 'auto') {
-                    this.reset();
-                }
-            },
-        });
-        this._subscriptions.push(stateChangesSub, queryAutoRefreshSub);
+        this._subscriptions.push(stateChangesSub);
     }
     _prepareArgs(config, page) {
         const pageParamLocation = this._getPageParamLocation(config?.pageParam?.location);
@@ -1568,9 +1590,9 @@ class InfinityQueryDirective {
         this._data$.next([]);
     }
 }
-InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.4", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.4", 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.2.4", ngImport: i0, type: InfinityQueryDirective, decorators: [{
+InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.5", 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.2.5", ngImport: i0, type: InfinityQueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1620,9 +1642,9 @@ class InfinityQueryTriggerDirective {
         this._observer.observe(this._elementRef.nativeElement);
     }
 }
-InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.4", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.4", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.4", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
+InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.5", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.5", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -2259,5 +2281,5 @@ const def = () => null;
  * Generated bundle index. Do not edit.
  */
 
-export { BasicAuthProvider, BearerAuthProvider, CustomHeaderAuthProvider, EntityStore, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, Query, QueryClient, QueryDirective, QueryError, QueryField, QueryForm, QueryStore, buildErrorMessage, buildGqlCacheKey, buildQueryArrayString, buildQueryString, buildRoute, buildTimestampFromSeconds, castQueryCreatorTypes, computeQueryAuthHeader, computeQueryBody, computeQueryHeaders, computeQueryMethod, computeQueryQueryParams, createInfinityQueryConfig, createQueryCollection, decryptBearer, deepFreeze, def, detectContentTypeHeader, extractExpiresInSeconds, extractQuery, filterFailure, filterInvalidParams, filterNull, filterQueryStates, filterSuccess, forEachHeader, getDefaultHeaders, getResponseUrl, gql, hasHeader, ignoreAutoRefresh, invalidBaseRouteError, invalidBodyError, invalidRouteError, isAutoRefresh, isBasicAuthProvider, isBearerAuthProvider, isCustomHeaderAuthProvider, isFetchResponse, isGqlQueryConfig, isParamValid, isQuery, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, mergeHeaders, parseAllXhrResponseHeaders, pathParamsMissingInRouteFunctionError, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, request, serializeBody, shouldCacheQuery, shouldRetryRequest, skipPaginationPageParamCalculator, switchQueryCollectionState, switchQueryState, takeUntilResponse, transformGql, transformMethod, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray };
+export { BasicAuthProvider, BearerAuthProvider, CustomHeaderAuthProvider, EntityStore, INFINITY_QUERY_TOKEN, InfinityQuery, InfinityQueryDirective, InfinityQueryTriggerDirective, Query, QueryClient, QueryDirective, QueryError, QueryField, QueryForm, QueryStore, buildErrorMessage, buildGqlCacheKey, buildQueryArrayString, buildQueryObjectString, buildQueryString, buildRoute, buildTimestampFromSeconds, castQueryCreatorTypes, computeQueryAuthHeader, computeQueryBody, computeQueryHeaders, computeQueryMethod, computeQueryQueryParams, createInfinityQueryConfig, createQueryCollection, decryptBearer, deepFreeze, def, detectContentTypeHeader, extractExpiresInSeconds, extractQuery, filterFailure, filterInvalidParams, filterNull, filterQueryStates, filterSuccess, forEachHeader, getDefaultHeaders, getResponseUrl, gql, hasHeader, ignoreAutoRefresh, invalidBaseRouteError, invalidBodyError, invalidRouteError, isAutoRefresh, isBasicAuthProvider, isBearerAuthProvider, isCustomHeaderAuthProvider, isFetchResponse, isGqlQueryConfig, isParamValid, isQuery, isQueryStateCancelled, isQueryStateFailure, isQueryStateLoading, isQueryStatePrepared, isQueryStateSuccess, isRequestError, mergeHeaders, paginatedEntityValueUpdater, parseAllXhrResponseHeaders, pathParamsMissingInRouteFunctionError, queryStateAlreadyHasKeyError, queryStateCannotTransformError, queryStateDoesNotContainKeyError, request, serializeBody, shouldCacheQuery, shouldRetryRequest, skipPaginationPageParamCalculator, switchQueryCollectionState, switchQueryState, takeUntilResponse, transformGql, transformMethod, transformToBoolean, transformToBooleanArray, transformToDate, transformToDateArray, transformToNumber, transformToNumberArray, transformToSort, transformToSortQueryParam, transformToString, transformToStringArray };
 //# sourceMappingURL=ethlete-query.mjs.map