@ethlete/query 5.41.1 → 5.41.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ethlete/query
 
+## 5.41.3
+
+### Patch Changes
+
+- [`b55b919`](https://github.com/ethlete-io/ethdk/commit/b55b919b019ba53bf801ba3d63721452f83c444d) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix handling of number query fields that have a default value other than null
+
+## 5.41.2
+
+### Patch Changes
+
+- [`22c97df`](https://github.com/ethlete-io/ethdk/commit/22c97df87907136adf06686347d7161085e3b33a) Thanks [@TomTomB](https://github.com/TomTomB)! - Fix handling of objects as query form values
+
 ## 5.41.1
 
 ### Patch Changes

package/fesm2022/ethlete-query.mjs

@@ -5926,6 +5926,8 @@ const transformToSortQueryParam = (value) => {
 };
 
 const ET_ARR_PREFIX = 'ET_ARR__';
+const ET_OBJ_PREFIX = 'ET_OBJ__';
+const ET_PROP_NULL_VALUE = 'ET_NULL__';
 class QueryField {
     get control() {
         return this.data.control;
@@ -6252,14 +6254,18 @@ class QueryForm {
                 deserializedValue = field.data.queryParamToValueTransformFn(value);
             }
             else if (!field.data.skipAutoTransform) {
-                const defaultIsNum = this._getDefaultValue(key) === 'number';
+                const defaultIsNum = typeof this._getDefaultValue(key) === 'number';
                 const valueIsNum = !isNaN(Number(value));
                 const valueContainsWhitespace = typeof value === 'string' && value.trim() !== value;
                 const valueHasLeadingZero = typeof value === 'string' && value.startsWith('0');
                 const valueEndsWithDot = typeof value === 'string' && value.endsWith('.');
                 const defaultIsBool = this._getDefaultValue(key) === 'boolean';
                 const valueIsBool = value === 'true' || value === 'false';
-                if (defaultIsNum || (valueIsNum && !valueContainsWhitespace && !valueHasLeadingZero && !valueEndsWithDot)) {
+                if (defaultIsNum && value === ET_PROP_NULL_VALUE) {
+                    deserializedValue = null;
+                }
+                else if (defaultIsNum ||
+                    (valueIsNum && !valueContainsWhitespace && !valueHasLeadingZero && !valueEndsWithDot)) {
                     deserializedValue = transformToNumber(value);
                 }
                 else if (defaultIsBool || valueIsBool) {
@@ -6320,9 +6326,15 @@ class QueryForm {
         if (typeof val === 'string' && val.startsWith(ET_ARR_PREFIX)) {
             return JSON.parse(val.slice(ET_ARR_PREFIX.length));
         }
+        else if (typeof val === 'string' && val.startsWith(ET_OBJ_PREFIX)) {
+            return JSON.parse(val.slice(ET_OBJ_PREFIX.length));
+        }
         else if (typeof val === 'function') {
             return val();
         }
+        else if (val === ET_PROP_NULL_VALUE) {
+            return null;
+        }
         return val ?? null;
     }
     _transformKeyToQueryParam(key) {
@@ -6334,8 +6346,14 @@ class QueryForm {
         return `${prefix}-${key}`;
     }
     _isDefaultValue(key, value) {
-        const normalizedValue = Array.isArray(value) ? `${ET_ARR_PREFIX}${JSON.stringify(value)}` : value;
-        return this._getDefaultValue(key) === normalizedValue;
+        const normalizedValue = Array.isArray(value)
+            ? `${ET_ARR_PREFIX}${JSON.stringify(value)}`
+            : typeof value === 'object' && value !== null
+                ? `${ET_OBJ_PREFIX}${JSON.stringify(value)}`
+                : value === null
+                    ? ET_PROP_NULL_VALUE
+                    : value;
+        return this._defaultValues[key] === normalizedValue;
     }
     _setupFormGroup() {
         const group = new FormGroup({});
@@ -6355,6 +6373,12 @@ class QueryForm {
             if (Array.isArray(value)) {
                 defaultValues[key] = `${ET_ARR_PREFIX}${JSON.stringify(value)}`;
             }
+            else if (typeof value === 'object' && value !== null) {
+                defaultValues[key] = `${ET_OBJ_PREFIX}${JSON.stringify(value)}`;
+            }
+            else if (value === null) {
+                defaultValues[key] = ET_PROP_NULL_VALUE;
+            }
             else {
                 defaultValues[key] = value;
             }
@@ -6378,7 +6402,9 @@ class QueryForm {
             else {
                 queryParams[queryParamKey] = field.data.valueToQueryParamTransformFn
                     ? field.data.valueToQueryParamTransformFn?.(value)
-                    : value;
+                    : value === null
+                        ? ET_PROP_NULL_VALUE
+                        : value;
             }
         }
         this._zone.run(() => {