@etsoo/shared 1.2.40 → 1.2.41

package/__tests__/Utils.ts

@@ -306,6 +306,16 @@ test('Tests for setNestedValue', () => {
     expect(Reflect.get((obj.jsonData as any).newProperty, 'value')).toBe(125);
 });
 
+test('Tests for setNestedValue removal', () => {
+    const obj = { jsonData: { photoSize: [200, 100], supportResizing: true } };
+
+    Utils.setNestedValue(obj, 'jsonData.photoSize', undefined);
+    expect(obj.jsonData.photoSize).toBeUndefined();
+
+    Utils.setNestedValue(obj, 'jsonData.supportResizing', undefined);
+    expect(obj.jsonData.supportResizing).toBeUndefined();
+});
+
 test('Tests for sortByFavor', () => {
     const items = [1, 2, 3, 4, 5, 6, 7];
     expect(Utils.sortByFavor(items, [5, 1, 3])).toStrictEqual([

package/lib/cjs/Utils.d.ts

@@ -267,8 +267,9 @@ export declare namespace Utils {
      * @param data Data
      * @param name Field name, support property chain like 'jsonData.logSize'
      * @param value Value
+     * @param keepNull Keep null value or not
      */
-    function setNestedValue(data: object, name: string, value: unknown): void;
+    function setNestedValue(data: object, name: string, value: unknown, keepNull?: boolean): void;
     /**
      * Parse path similar with node.js path.parse
      * @param path Input path

package/lib/cjs/Utils.js

@@ -541,18 +541,26 @@ var Utils;
      * @param data Data
      * @param name Field name, support property chain like 'jsonData.logSize'
      * @param value Value
+     * @param keepNull Keep null value or not
      */
-    function setNestedValue(data, name, value) {
+    function setNestedValue(data, name, value, keepNull) {
         const properties = name.split('.');
         const len = properties.length;
-        if (len === 1)
-            Reflect.set(data, name, value);
+        if (len === 1) {
+            if (value == null && keepNull !== true) {
+                Reflect.deleteProperty(data, name);
+            }
+            else {
+                Reflect.set(data, name, value);
+            }
+        }
         else {
             let curr = data;
             for (let i = 0; i < len; i++) {
                 const property = properties[i];
                 if (i + 1 === len) {
-                    Reflect.set(curr, property, value);
+                    setNestedValue(curr, property, value, keepNull);
+                    // Reflect.set(curr, property, value);
                 }
                 else {
                     let p = Reflect.get(curr, property);

package/lib/mjs/Utils.d.ts

@@ -267,8 +267,9 @@ export declare namespace Utils {
      * @param data Data
      * @param name Field name, support property chain like 'jsonData.logSize'
      * @param value Value
+     * @param keepNull Keep null value or not
      */
-    function setNestedValue(data: object, name: string, value: unknown): void;
+    function setNestedValue(data: object, name: string, value: unknown, keepNull?: boolean): void;
     /**
      * Parse path similar with node.js path.parse
      * @param path Input path

package/lib/mjs/Utils.js

@@ -535,18 +535,26 @@ export var Utils;
      * @param data Data
      * @param name Field name, support property chain like 'jsonData.logSize'
      * @param value Value
+     * @param keepNull Keep null value or not
      */
-    function setNestedValue(data, name, value) {
+    function setNestedValue(data, name, value, keepNull) {
         const properties = name.split('.');
         const len = properties.length;
-        if (len === 1)
-            Reflect.set(data, name, value);
+        if (len === 1) {
+            if (value == null && keepNull !== true) {
+                Reflect.deleteProperty(data, name);
+            }
+            else {
+                Reflect.set(data, name, value);
+            }
+        }
         else {
             let curr = data;
             for (let i = 0; i < len; i++) {
                 const property = properties[i];
                 if (i + 1 === len) {
-                    Reflect.set(curr, property, value);
+                    setNestedValue(curr, property, value, keepNull);
+                    // Reflect.set(curr, property, value);
                 }
                 else {
                     let p = Reflect.get(curr, property);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/shared",
-    "version": "1.2.40",
+    "version": "1.2.41",
     "description": "TypeScript shared utilities and functions",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -58,7 +58,7 @@
         "@types/lodash.isequal": "^4.5.8",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
-        "ts-jest": "^29.1.2",
+        "ts-jest": "^29.1.4",
         "typescript": "^5.4.5"
     },
     "dependencies": {

package/src/Utils.ts

@@ -735,18 +735,30 @@ export namespace Utils {
      * @param data Data
      * @param name Field name, support property chain like 'jsonData.logSize'
      * @param value Value
+     * @param keepNull Keep null value or not
      */
-    export function setNestedValue(data: object, name: string, value: unknown) {
+    export function setNestedValue(
+        data: object,
+        name: string,
+        value: unknown,
+        keepNull?: boolean
+    ) {
         const properties = name.split('.');
         const len = properties.length;
-        if (len === 1) Reflect.set(data, name, value);
-        else {
+        if (len === 1) {
+            if (value == null && keepNull !== true) {
+                Reflect.deleteProperty(data, name);
+            } else {
+                Reflect.set(data, name, value);
+            }
+        } else {
             let curr = data;
             for (let i = 0; i < len; i++) {
                 const property = properties[i];
 
                 if (i + 1 === len) {
-                    Reflect.set(curr, property, value);
+                    setNestedValue(curr, property, value, keepNull);
+                    // Reflect.set(curr, property, value);
                 } else {
                     let p = Reflect.get(curr, property);
                     if (p == null) {