Better applyDeltas

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/utils",
-	"version": "0.27.0",
+	"version": "0.27.3",
 	"description": "Utility library",
 	"author": "Zak Timson",
 	"license": "MIT",

src/objects.ts

@@ -1,56 +1,51 @@
 export type Delta = { [key: string]: any | Delta | null };
 
+
 /**
- * Applies deltas in order to modify `target`.
+ * Applies deltas to `target`.
- * @param target - Object to mutate
+ * @param base starting point
- * @param deltas - List of deltas to apply
+ * @param deltas List of deltas to apply
  * @returns Mutated target
  */
-export function applyDeltas(target: any, deltas: Delta[]): any {
+export function applyDeltas(base: any, ...deltas: any[]): any {
-	for(const delta of deltas) {
+	function applyDelta(base: any, delta: any): any {
-		for(const [key, value] of Object.entries(delta)) {
+		if(delta === null) return null;
-			if(value === null) {
+		if(typeof base !== 'object' || base === null) return delta === undefined ? base : delta;
-				delete target[key]; // Remove
+		const result = Array.isArray(base) ? [...base] : { ...base };
-			} else if(Array.isArray(value)) {
+		for(const key in delta) {
-				target[key] = [...value]; // Array
+			const val = delta[key];
-			} else if(typeof value === 'object') {
+			if(val === undefined) delete result[key];
-				if(typeof target[key] !== 'object' || Array.isArray(target[key]) || !target[key])
+			else if(typeof val === 'object' && val !== null && !Array.isArray(val)) result[key] = applyDelta(result[key], val);
-					target[key] = {}; // Nested
+			else result[key] = val;
-				applyDeltas(target[key], [value]); // Recurse
-			} else {
-				target[key] = value; // Primitive
-			}
 		}
+		return result;
 	}
-	return target;
+
+	for(const d of deltas.flat()) base = applyDelta(base, d?.delta ?? d);
+	return base;
 }
 
 /**
  * Creates a nested delta that reverts `target` back to `old`.
  * @param old - Original object
- * @param target - Modified object
+ * @param updated - Modified object
- * @returns Delta to revert changes
+ * @returns New changes
  */
-export function calcDelta(old: any, target: any): Delta {
+export function calcDelta(old: any, updated: any): any {
-	const delta: Delta = {};
+	if(updated == null) return null; // full delete
-	const keys = new Set([...Object.keys(old || {}), ...Object.keys(target || {})]);
+	const delta: any = {};
-	for(const key of keys) {
+	const isObj = (v: any) => v && typeof v === 'object' && !Array.isArray(v);
-		const val1 = old?.[key];
+	for (const key of new Set([...(old ? Object.keys(old) : []), ...(updated ? Object.keys(updated) : [])])) {
-		const val2 = target?.[key];
+		const oldVal = old?.[key];
-		if(!(key in target)) {
+		const newVal = updated?.[key];
-			delta[key] = val1; // Removed
+		if(isObj(oldVal) && isObj(newVal)) {
-		} else if(!(key in old)) {
+			const nested = calcDelta(oldVal, newVal);
-			delta[key] = null; // Added
+			if(nested !== null && Object.keys(nested).length > 0) delta[key] = nested;
-		} else if(Array.isArray(val1) || Array.isArray(val2)) {
+		} else if(JSON.stringify(oldVal) !== JSON.stringify(newVal)) {
-			if(JSON.stringify(val1) !== JSON.stringify(val2)) delta[key] = val1; // Array
+			delta[key] = newVal;
-		} else if(typeof val1 === 'object' && typeof val2 === 'object' && val1 && val2) {
-			const nested = calcDelta(val1, val2);
-			if(Object.keys(nested).length) delta[key] = nested; // Nested
-		} else if(val1 !== val2) {
-			delta[key] = val1; // Modified
 		}
 	}
-	return delta;
+	return Object.keys(delta).length === 0 ? {} : delta;
 }
 
 /**
@@ -330,8 +325,8 @@ export function JSONSerialize<T1>(obj: T1): T1 | string {
 export function JSONSanitize(obj: any, space?: number): string {
 	const cache: any[] = [];
 	return JSON.stringify(obj, (key, value) => {
-		if (typeof value === 'object' && value !== null) {
+		if(typeof value === 'object' && value !== null) {
-			if (cache.includes(value)) return '[Circular]';
+			if(cache.includes(value)) return '[Circular]';
 			cache.push(value);
 		}
 		return value;