@domql/utils 2.29.80 → 2.29.81

package/dist/cjs/object.js

@@ -31,7 +31,6 @@ __export(object_exports, {
   detachFunctionsFromObject: () => detachFunctionsFromObject,
   detectInfiniteLoop: () => detectInfiniteLoop,
   diff: () => diff,
-  diffArrays: () => diffArrays,
   diffObjects: () => diffObjects,
   excludeKeysFromObject: () => excludeKeysFromObject,
   exec: () => exec,
@@ -433,45 +432,64 @@ const stringToObject = (str, opts = { verbose: true }) => {
     if (opts.errorCallback) opts.errorCallback(e);
   }
 };
-const diffObjects = (original, objToDiff, cache) => {
-  for (const e in objToDiff) {
-    if (e === "ref") continue;
-    const originalProp = original[e];
-    const objToDiffProp = objToDiff[e];
+const diffObjects = (original, objToDiff, cache, opts) => {
+  let hasDiff = false;
+  for (const key in objToDiff) {
+    if (key === "ref") continue;
+    const originalProp = original[key];
+    const objToDiffProp = objToDiff[key];
     if ((0, import_types.isObject)(originalProp) && (0, import_types.isObject)(objToDiffProp)) {
-      cache[e] = {};
-      diff(originalProp, objToDiffProp, cache[e]);
-    } else if (objToDiffProp !== void 0) {
-      cache[e] = objToDiffProp;
+      const nestedDiff = diff(originalProp, objToDiffProp, {}, opts);
+      if (nestedDiff && Object.keys(nestedDiff).length > 0) {
+        cache[key] = nestedDiff;
+        hasDiff = true;
+      }
+    } else if ((0, import_types.isArray)(originalProp) && (0, import_types.isArray)(objToDiffProp)) {
+      const nestedDiff = diffArrays(originalProp, objToDiffProp, [], opts);
+      if (nestedDiff && nestedDiff.length > 0) {
+        cache[key] = nestedDiff;
+        hasDiff = true;
+      }
+    } else if (objToDiffProp !== originalProp) {
+      cache[key] = objToDiffProp;
+      hasDiff = true;
     }
   }
-  return cache;
+  return hasDiff ? cache : void 0;
 };
-const diffArrays = (original, objToDiff, cache) => {
+const diffArrays = (original, objToDiff, cache, opts) => {
   if (original.length !== objToDiff.length) {
-    cache = objToDiff;
-  } else {
-    const diffArr = [];
-    for (let i = 0; i < original.length; i++) {
-      const diffObj = diff(original[i], objToDiff[i]);
-      if (Object.keys(diffObj).length > 0) {
-        diffArr.push(diffObj);
-      }
-    }
-    if (diffArr.length > 0) {
-      cache = diffArr;
+    return objToDiff;
+  }
+  let hasDiff = false;
+  for (let i = 0; i < original.length; i++) {
+    const diffObj = diff(original[i], objToDiff[i], {}, opts);
+    if (diffObj && ((0, import_types.isObject)(diffObj) ? Object.keys(diffObj).length > 0 : true)) {
+      cache[i] = diffObj;
+      hasDiff = true;
     }
   }
-  return cache;
+  return hasDiff ? cache : void 0;
 };
-const diff = (original, objToDiff, cache = {}) => {
+const diff = (original, objToDiff, cache = {}, opts = {}) => {
+  if (opts.cloneInstances) {
+    original = deepClone(original);
+    objToDiff = deepClone(objToDiff);
+  }
+  original = deepStringify(original);
+  objToDiff = deepStringify(objToDiff);
   if ((0, import_types.isArray)(original) && (0, import_types.isArray)(objToDiff)) {
-    cache = [];
-    diffArrays(original, objToDiff, cache);
-  } else {
-    diffObjects(original, objToDiff, cache);
+    const result = diffArrays(original, objToDiff, [], opts);
+    return result === void 0 ? {} : result;
+  }
+  if ((0, import_types.isObject)(original) && (0, import_types.isObject)(objToDiff)) {
+    const result = diffObjects(original, objToDiff, {}, opts);
+    return result === void 0 ? {} : result;
+  }
+  if (original !== objToDiff) {
+    return objToDiff;
   }
-  return cache;
+  return {};
 };
 const hasOwnProperty = (o, ...args) => Object.prototype.hasOwnProperty.call(o, ...args);
 const isEmpty = (o) => Object.keys(o).length === 0;

package/dist/esm/object.js

@@ -401,45 +401,64 @@ const stringToObject = (str, opts = { verbose: true }) => {
     if (opts.errorCallback) opts.errorCallback(e);
   }
 };
-const diffObjects = (original, objToDiff, cache) => {
-  for (const e in objToDiff) {
-    if (e === "ref") continue;
-    const originalProp = original[e];
-    const objToDiffProp = objToDiff[e];
+const diffObjects = (original, objToDiff, cache, opts) => {
+  let hasDiff = false;
+  for (const key in objToDiff) {
+    if (key === "ref") continue;
+    const originalProp = original[key];
+    const objToDiffProp = objToDiff[key];
     if (isObject(originalProp) && isObject(objToDiffProp)) {
-      cache[e] = {};
-      diff(originalProp, objToDiffProp, cache[e]);
-    } else if (objToDiffProp !== void 0) {
-      cache[e] = objToDiffProp;
+      const nestedDiff = diff(originalProp, objToDiffProp, {}, opts);
+      if (nestedDiff && Object.keys(nestedDiff).length > 0) {
+        cache[key] = nestedDiff;
+        hasDiff = true;
+      }
+    } else if (isArray(originalProp) && isArray(objToDiffProp)) {
+      const nestedDiff = diffArrays(originalProp, objToDiffProp, [], opts);
+      if (nestedDiff && nestedDiff.length > 0) {
+        cache[key] = nestedDiff;
+        hasDiff = true;
+      }
+    } else if (objToDiffProp !== originalProp) {
+      cache[key] = objToDiffProp;
+      hasDiff = true;
     }
   }
-  return cache;
+  return hasDiff ? cache : void 0;
 };
-const diffArrays = (original, objToDiff, cache) => {
+const diffArrays = (original, objToDiff, cache, opts) => {
   if (original.length !== objToDiff.length) {
-    cache = objToDiff;
-  } else {
-    const diffArr = [];
-    for (let i = 0; i < original.length; i++) {
-      const diffObj = diff(original[i], objToDiff[i]);
-      if (Object.keys(diffObj).length > 0) {
-        diffArr.push(diffObj);
-      }
-    }
-    if (diffArr.length > 0) {
-      cache = diffArr;
+    return objToDiff;
+  }
+  let hasDiff = false;
+  for (let i = 0; i < original.length; i++) {
+    const diffObj = diff(original[i], objToDiff[i], {}, opts);
+    if (diffObj && (isObject(diffObj) ? Object.keys(diffObj).length > 0 : true)) {
+      cache[i] = diffObj;
+      hasDiff = true;
     }
   }
-  return cache;
+  return hasDiff ? cache : void 0;
 };
-const diff = (original, objToDiff, cache = {}) => {
+const diff = (original, objToDiff, cache = {}, opts = {}) => {
+  if (opts.cloneInstances) {
+    original = deepClone(original);
+    objToDiff = deepClone(objToDiff);
+  }
+  original = deepStringify(original);
+  objToDiff = deepStringify(objToDiff);
   if (isArray(original) && isArray(objToDiff)) {
-    cache = [];
-    diffArrays(original, objToDiff, cache);
-  } else {
-    diffObjects(original, objToDiff, cache);
+    const result = diffArrays(original, objToDiff, [], opts);
+    return result === void 0 ? {} : result;
+  }
+  if (isObject(original) && isObject(objToDiff)) {
+    const result = diffObjects(original, objToDiff, {}, opts);
+    return result === void 0 ? {} : result;
+  }
+  if (original !== objToDiff) {
+    return objToDiff;
   }
-  return cache;
+  return {};
 };
 const hasOwnProperty = (o, ...args) => Object.prototype.hasOwnProperty.call(o, ...args);
 const isEmpty = (o) => Object.keys(o).length === 0;
@@ -743,7 +762,6 @@ export {
   detachFunctionsFromObject,
   detectInfiniteLoop,
   diff,
-  diffArrays,
   diffObjects,
   excludeKeysFromObject,
   exec,

package/object.js

@@ -494,50 +494,81 @@ export const stringToObject = (str, opts = { verbose: true }) => {
   }
 }
 
-export const diffObjects = (original, objToDiff, cache) => {
-  for (const e in objToDiff) {
-    if (e === 'ref') continue
+export const diffObjects = (original, objToDiff, cache, opts) => {
+  let hasDiff = false
 
-    const originalProp = original[e]
-    const objToDiffProp = objToDiff[e]
+  for (const key in objToDiff) {
+    if (key === 'ref') continue
+
+    const originalProp = original[key]
+    const objToDiffProp = objToDiff[key]
 
     if (isObject(originalProp) && isObject(objToDiffProp)) {
-      cache[e] = {}
-      diff(originalProp, objToDiffProp, cache[e])
-    } else if (objToDiffProp !== undefined) {
-      cache[e] = objToDiffProp
+      const nestedDiff = diff(originalProp, objToDiffProp, {}, opts)
+      if (nestedDiff && Object.keys(nestedDiff).length > 0) {
+        cache[key] = nestedDiff
+        hasDiff = true
+      }
+    } else if (isArray(originalProp) && isArray(objToDiffProp)) {
+      const nestedDiff = diffArrays(originalProp, objToDiffProp, [], opts)
+      if (nestedDiff && nestedDiff.length > 0) {
+        cache[key] = nestedDiff
+        hasDiff = true
+      }
+    } else if (objToDiffProp !== originalProp) {
+      cache[key] = objToDiffProp
+      hasDiff = true
     }
   }
-  return cache
+
+  return hasDiff ? cache : undefined
 }
 
-export const diffArrays = (original, objToDiff, cache) => {
+const diffArrays = (original, objToDiff, cache, opts) => {
   if (original.length !== objToDiff.length) {
-    cache = objToDiff
-  } else {
-    const diffArr = []
-    for (let i = 0; i < original.length; i++) {
-      const diffObj = diff(original[i], objToDiff[i])
-      if (Object.keys(diffObj).length > 0) {
-        diffArr.push(diffObj)
-      }
-    }
-    if (diffArr.length > 0) {
-      cache = diffArr
+    return objToDiff
+  }
+
+  let hasDiff = false
+  for (let i = 0; i < original.length; i++) {
+    const diffObj = diff(original[i], objToDiff[i], {}, opts)
+    if (
+      diffObj &&
+      (isObject(diffObj) ? Object.keys(diffObj).length > 0 : true)
+    ) {
+      cache[i] = diffObj
+      hasDiff = true
     }
   }
-  return cache
+
+  return hasDiff ? cache : undefined
 }
 
-export const diff = (original, objToDiff, cache = {}) => {
+export const diff = (original, objToDiff, cache = {}, opts = {}) => {
+  if (opts.cloneInstances) {
+    original = deepClone(original)
+    objToDiff = deepClone(objToDiff)
+  }
+
+  original = deepStringify(original)
+  objToDiff = deepStringify(objToDiff)
+
   if (isArray(original) && isArray(objToDiff)) {
-    cache = []
-    diffArrays(original, objToDiff, cache)
-  } else {
-    diffObjects(original, objToDiff, cache)
+    const result = diffArrays(original, objToDiff, [], opts)
+    return result === undefined ? {} : result
+  }
+
+  if (isObject(original) && isObject(objToDiff)) {
+    const result = diffObjects(original, objToDiff, {}, opts)
+    return result === undefined ? {} : result
+  }
+
+  // fallback for primitives or differing types
+  if (original !== objToDiff) {
+    return objToDiff
   }
 
-  return cache
+  return {}
 }
 
 export const hasOwnProperty = (o, ...args) =>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.29.80",
+  "version": "2.29.81",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -24,7 +24,7 @@
     "build": "npx rimraf -I dist; npm run build:cjs; npm run build:esm",
     "prepublish": "npm run build; npm run copy:package:cjs"
   },
-  "gitHead": "d82b592533bd0365992abd94490da846f787beb4",
+  "gitHead": "bd0e154d7fd091d33b99e5c8da9011de0e4abea4",
   "devDependencies": {
     "@babel/core": "^7.27.1"
   }