@ztimson/utils 0.27.0 → 0.27.1

package/dist/index.mjs

@@ -117,44 +117,33 @@ ${opts.message || this.desc}`;
 `;
   }
 }
-function applyDeltas(target, deltas) {
-  for (const delta of deltas) {
-    for (const [key, value] of Object.entries(delta)) {
-      if (value === null) {
-        delete target[key];
-      } else if (Array.isArray(value)) {
-        target[key] = [...value];
-      } else if (typeof value === "object") {
-        if (typeof target[key] !== "object" || Array.isArray(target[key]) || !target[key])
-          target[key] = {};
-        applyDeltas(target[key], [value]);
-      } else {
-        target[key] = value;
-      }
-    }
+function applyDelta(base, deltas) {
+  if (deltas === null) return null;
+  if (typeof base !== "object" || base === null) return deltas === void 0 ? base : deltas;
+  const result = Array.isArray(base) ? [...base] : { ...base };
+  for (const key in deltas) {
+    const val = deltas[key];
+    if (val === void 0) delete result[key];
+    else if (typeof val === "object" && val !== null && !Array.isArray(val)) result[key] = applyDelta(result[key], val);
+    else result[key] = val;
   }
-  return target;
+  return result;
 }
-function calcDelta(old, target) {
+function calcDelta(old, updated) {
+  if (updated == null) return null;
   const delta = {};
-  const keys = /* @__PURE__ */ new Set([...Object.keys(old || {}), ...Object.keys(target || {})]);
-  for (const key of keys) {
-    const val1 = old == null ? void 0 : old[key];
-    const val2 = target == null ? void 0 : target[key];
-    if (!(key in target)) {
-      delta[key] = val1;
-    } else if (!(key in old)) {
-      delta[key] = null;
-    } else if (Array.isArray(val1) || Array.isArray(val2)) {
-      if (JSON.stringify(val1) !== JSON.stringify(val2)) delta[key] = val1;
-    } else if (typeof val1 === "object" && typeof val2 === "object" && val1 && val2) {
-      const nested = calcDelta(val1, val2);
-      if (Object.keys(nested).length) delta[key] = nested;
-    } else if (val1 !== val2) {
-      delta[key] = val1;
+  const isObj = (v) => v && typeof v === "object" && !Array.isArray(v);
+  for (const key of /* @__PURE__ */ new Set([...old ? Object.keys(old) : [], ...updated ? Object.keys(updated) : []])) {
+    const oldVal = old == null ? void 0 : old[key];
+    const newVal = updated == null ? void 0 : updated[key];
+    if (isObj(oldVal) && isObj(newVal)) {
+      const nested = calcDelta(oldVal, newVal);
+      if (nested !== null && Object.keys(nested).length > 0) delta[key] = nested;
+    } else if (JSON.stringify(oldVal) !== JSON.stringify(newVal)) {
+      delta[key] = newVal;
     }
   }
-  return delta;
+  return Object.keys(delta).length === 0 ? {} : delta;
 }
 function clean(obj, undefinedOnly = false) {
   if (obj == null) throw new Error("Cannot clean a NULL value");
@@ -2375,7 +2364,7 @@ export {
   UnauthorizedError,
   addUnique,
   adjustedInterval,
-  applyDeltas,
+  applyDelta,
   arrayDiff,
   calcDelta,
   camelCase,