@contrail/util 1.1.3-alpha.0 → 1.1.3

package/lib/object-util/object-util.d.ts

@@ -9,7 +9,7 @@ export declare class ObjectUtil {
     static getBySlugs(obj: any, rootSlug: string, slug?: string): any;
     static setByPath(obj: any, path: string, value: any): void;
     static chunk(array: any[], size: number): any[];
-    static removeEmptyProperties(json: Record<string, any>): Record<string, any>;
+    static removeEmptyProperties<T extends object>(data: T): T;
     static isObject: typeof isObject;
     static mergeDeep: typeof mergeDeep;
     static cloneDeep: typeof cloneDeep;

package/lib/object-util/object-util.js

@@ -15,7 +15,7 @@ class ObjectUtil {
             return value === undefined ? def : value;
         }
         const pathUnits = path.split('.');
-        pathUnits.forEach(level => {
+        pathUnits.forEach((level) => {
             if (obj) {
                 obj = obj[level];
             }
@@ -55,28 +55,24 @@ class ObjectUtil {
         }
         return chunked;
     }
-    static removeEmptyProperties(json) {
-        if (typeof json !== 'object' || json === null)
-            return json;
-        if (Array.isArray(json)) {
-            return json
-                .map(item => (typeof item === 'object' ? ObjectUtil.removeEmptyProperties(item) : item))
-                .filter(item => item !== null && item !== undefined && item !== '');
+    static removeEmptyProperties(data) {
+        if (data === null || data === undefined || typeof data !== 'object') {
+            return data;
         }
-        return Object.entries(json).reduce((acc, [key, value]) => {
-            if (value == null || value === '')
-                return acc;
-            if (typeof value === 'object') {
-                const cleanedValue = ObjectUtil.removeEmptyProperties(value);
-                if (Array.isArray(value) || Object.keys(cleanedValue).length > 0) {
-                    acc[key] = cleanedValue;
-                }
-            }
-            else {
-                acc[key] = value;
+        const isEmpty = (value) => value === null || value === undefined || (typeof value === 'string' && value.trim() === '');
+        if (Array.isArray(data)) {
+            const cleaned = data
+                .map((item) => (typeof item === 'object' && item ? ObjectUtil.removeEmptyProperties(item) : item))
+                .filter((item) => !isEmpty(item));
+            return cleaned;
+        }
+        const cleaned = Object.entries(data).reduce((acc, [key, value]) => {
+            if (!isEmpty(value)) {
+                acc[key] = typeof value === 'object' && value ? ObjectUtil.removeEmptyProperties(value) : value;
             }
             return acc;
         }, {});
+        return cleaned;
     }
 }
 exports.ObjectUtil = ObjectUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/util",
-  "version": "1.1.3-alpha.0",
+  "version": "1.1.3",
   "description": "General javascript utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",