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

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/query
 
+## 6.0.0-next.4
+
+### Patch Changes
+
+- [#2958](https://github.com/ethlete-io/ethdk/pull/2958) [`8ecdfc0`](https://github.com/ethlete-io/ethdk/commit/8ecdfc00d785b0b535601b5d95ca7e2cd55455b6) Thanks [@github-actions](https://github.com/apps/github-actions)! - Update v3 migration to reflect latest api changes
+
+## 6.0.0-next.3
+
+### Patch Changes
+
+- [#2926](https://github.com/ethlete-io/ethdk/pull/2926) [`801d112`](https://github.com/ethlete-io/ethdk/commit/801d1122b55d24762b9e656d3a8ed70c561ec06f) Thanks [@github-actions](https://github.com/apps/github-actions)! - Fix query form emitting twice if a sort field gets cleared
+
 ## 6.0.0-next.2
 
 ### Minor Changes

package/fesm2022/ethlete-query.mjs

@@ -5665,6 +5665,8 @@ const createBearerAuthProviderImpl = (config) => {
         accessToken.set(null);
         refreshToken.set(null);
         queryClient.repository.unbindAllSecure();
+        latestExecutedQuery.set(null);
+        latestNonInternalQuery.set(null);
     };
     const isLeader = createLeaderElection(config);
     const querySetupContext = {
@@ -7022,8 +7024,11 @@ class QueryForm {
                 continue;
             const valueGotRemoved = value === ET_PROPERTY_REMOVED;
             if (valueGotRemoved) {
-                field.control.setValue(this._getDefaultValue(key), { emitEvent: false });
-                didValueChanges = true;
+                const defaultValue = this._getDefaultValue(key);
+                if (!equal(field.control.value, defaultValue)) {
+                    field.control.setValue(defaultValue, { emitEvent: false });
+                    didValueChanges = true;
+                }
                 continue;
             }
             let deserializedValue = value;
@@ -7195,6 +7200,21 @@ class QueryForm {
         });
     }
     _handleFormChange(forceOverwrite = false) {
+        // Normalize values that have a valueToQueryParamTransformFn returning null/undefined to their
+        // field default before capturing the new value. This prevents intermediate "empty object" states
+        // (e.g. Sort emitting { active: '', direction: '' } when cleared) from being
+        // emitted as distinct form values.
+        for (const [key, field] of Object.entries(this._fields)) {
+            if (!field.data.valueToQueryParamTransformFn)
+                continue;
+            const rawValue = this._formValue[key];
+            if (this._isDefaultValue(key, rawValue))
+                continue;
+            const serialized = field.data.valueToQueryParamTransformFn(rawValue);
+            if (serialized !== null && serialized !== undefined)
+                continue;
+            this.form.controls[key]?.setValue(this._getDefaultValue(key), { emitEvent: false });
+        }
         const currentVal = clone(this._currentFormValue$.value);
         const newVal = clone(this._formValue);
         if (equal(currentVal, newVal)) {