@ethlete/query 2.5.1 → 2.5.3

package/fesm2020/ethlete-query.mjs

@@ -601,7 +601,8 @@ const castQueryCreatorTypes = (config) => {
 const computeQueryMethod = (config) => {
     let method;
     if (isGqlQueryConfig(config.config)) {
-        method = transformMethod({ method: config.config.method, transferVia: config.config.transferVia });
+        const transferVia = config.config.transferVia ?? config.client.config.request?.gql?.transferVia;
+        method = transformMethod({ method: config.config.method, transferVia });
     }
     else {
         method = transformMethod({ method: config.config.method });
@@ -615,7 +616,7 @@ const computeQueryBody = (config) => {
         config.method === 'OPTIONS' ||
         (isGqlQueryConfig(config.config) &&
             (config.config.transferVia === 'GET' ||
-                (config.clientConfig.request?.gql?.transferVia === 'GET' && !config.config.transferVia)))) {
+                (config.client.config.request?.gql?.transferVia === 'GET' && !config.config.transferVia)))) {
         return undefined;
     }
     if (isGqlQueryConfig(config.config)) {
@@ -651,7 +652,7 @@ const computeQueryHeaders = (config) => {
 const computeQueryQueryParams = (config) => {
     if (isGqlQueryConfig(config.config) &&
         (config.config.transferVia === 'GET' ||
-            (config.clientConfig.request?.gql?.transferVia === 'GET' && !config.config.transferVia))) {
+            (config.client.config.request?.gql?.transferVia === 'GET' && !config.config.transferVia))) {
         const queryTemplate = config.config.query;
         const query = transformGql(queryTemplate);
         let params = query(config.args?.variables);
@@ -742,10 +743,10 @@ class Query {
             meta,
         });
         this._updateUseResultInDependencies();
-        const method = computeQueryMethod({ config: this._queryConfig });
+        const method = computeQueryMethod({ config: this._queryConfig, client: this._client });
         const body = computeQueryBody({
             config: this._queryConfig,
-            clientConfig: this._client.config,
+            client: this._client,
             args: this._args,
             method,
         });
@@ -846,7 +847,12 @@ class Query {
             : interval(config.interval);
         this._pollingSubscription = _interval
             .pipe(takeUntil(config.takeUntil), finalize(() => this.stopPolling()))
-            .subscribe(() => this.execute({ skipCache: true, _triggeredVia: 'poll' }));
+            .subscribe(() => {
+            if (this.state.type === "LOADING" /* QueryStateType.Loading */) {
+                return;
+            }
+            this.execute({ skipCache: true, _triggeredVia: 'poll' });
+        });
         return this;
     }
     stopPolling() {
@@ -1133,9 +1139,9 @@ class QueryDirective {
         }
     }
 }
-QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.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.2.2", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.2", ngImport: i0, type: QueryDirective, decorators: [{
+QueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", 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.3", type: QueryDirective, isStandalone: true, selector: "[query]", inputs: { query: "query", cache: ["queryCache", "cache"] }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: QueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1473,9 +1479,9 @@ class InfinityQueryDirective {
         this._data$.next([]);
     }
 }
-InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.2", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.2", 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.2", ngImport: i0, type: InfinityQueryDirective, decorators: [{
+InfinityQueryDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: InfinityQueryDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.3", 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.3", ngImport: i0, type: InfinityQueryDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1525,9 +1531,9 @@ class InfinityQueryTriggerDirective {
         this._observer.observe(this._elementRef.nativeElement);
     }
 }
-InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.2", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
-InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.2", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.2", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
+InfinityQueryTriggerDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: InfinityQueryTriggerDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+InfinityQueryTriggerDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.2.3", type: InfinityQueryTriggerDirective, isStandalone: true, selector: "[infinityQueryTrigger], infinity-query-trigger", inputs: { scrollContainerSelector: "scrollContainerSelector" }, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.2.3", ngImport: i0, type: InfinityQueryTriggerDirective, decorators: [{
             type: Directive,
             args: [{
                     // eslint-disable-next-line @angular-eslint/directive-selector
@@ -1729,7 +1735,7 @@ class QueryClient {
                     base: this._clientConfig.baseRoute,
                     route: queryConfig.route,
                     pathParams: args?.pathParams,
-                    queryParams: computeQueryQueryParams({ config: queryConfig, clientConfig: this._clientConfig, args }),
+                    queryParams: computeQueryQueryParams({ config: queryConfig, client: this, args }),
                 });
                 const cacheKey = isGqlQueryConfig(queryConfig) ? buildGqlCacheKey(queryConfig, args) : route;
                 if (shouldCacheQuery(queryConfig.method)) {
@@ -1791,11 +1797,11 @@ class QueryField {
         this.changes$ = this._setupChangesObservable();
         this._currentDebounceTimeout = null;
     }
-    setValue(value) {
+    setValue(value, options) {
         if (this._currentDebounceTimeout !== null) {
             clearTimeout(this._currentDebounceTimeout);
         }
-        if (this.data.debounce) {
+        if (this.data.debounce && !options?.skipDebounce) {
             this._currentDebounceTimeout = window.setTimeout(() => {
                 this.control.setValue(value);
             }, this.data.debounce);
@@ -1830,7 +1836,7 @@ class QueryForm {
             }
         }));
     }
-    setFormValueFromUrlQueryParams() {
+    setFormValueFromUrlQueryParams(options) {
         if (!this._activatedRoute) {
             throw new Error('Cannot set form value from url query params without ActivatedRoute');
         }
@@ -1842,7 +1848,7 @@ class QueryForm {
                 continue;
             }
             const deserializedValue = field.data.queryParamToValueTransformFn?.(value) ?? value;
-            field.setValue(deserializedValue);
+            field.setValue(deserializedValue, { skipDebounce: options?.skipDebounce ?? true });
         }
     }
     updateFormOnUrlQueryParamsChange() {