@domql/utils 2.31.26 → 2.31.28

package/dist/cjs/object.js

@@ -23,15 +23,16 @@ __export(object_exports, {
   createObjectWithoutPrototype: () => createObjectWithoutPrototype,
   deepClone: () => deepClone,
   deepContains: () => deepContains,
-  deepDestringify: () => deepDestringify,
+  deepDestringifyFunctions: () => deepDestringifyFunctions,
   deepDiff: () => deepDiff,
   deepMerge: () => deepMerge,
-  deepStringify: () => deepStringify,
-  deepStringifyWithMaxDepth: () => deepStringifyWithMaxDepth,
+  deepStringifyFunctions: () => deepStringifyFunctions,
+  deepStringifyFunctionsWithMaxDepth: () => deepStringifyFunctionsWithMaxDepth,
   detachFunctionsFromObject: () => detachFunctionsFromObject,
   detectInfiniteLoop: () => detectInfiniteLoop,
   diff: () => diff,
   diffObjects: () => diffObjects,
+  evalStringToObject: () => evalStringToObject,
   excludeKeysFromObject: () => excludeKeysFromObject,
   exec: () => exec,
   flattenRecursive: () => flattenRecursive,
@@ -53,8 +54,7 @@ __export(object_exports, {
   overwriteShallow: () => overwriteShallow,
   removeFromObject: () => removeFromObject,
   removeNestedKeyByPath: () => removeNestedKeyByPath,
-  setInObjectByPath: () => setInObjectByPath,
-  stringToObject: () => stringToObject
+  setInObjectByPath: () => setInObjectByPath
 });
 module.exports = __toCommonJS(object_exports);
 var import_globals = require("./globals.js");
@@ -182,7 +182,7 @@ const deepClone = (obj, options = {}) => {
   }
   return clone2;
 };
-const deepStringify = (obj, stringified = {}) => {
+const deepStringifyFunctions = (obj, stringified = {}) => {
   var _a, _b;
   if (!obj) return;
   if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
@@ -199,13 +199,13 @@ const deepStringify = (obj, stringified = {}) => {
       stringified[prop] = objProp.toString();
     } else if ((0, import_types.isObject)(objProp)) {
       stringified[prop] = {};
-      deepStringify(objProp, stringified[prop]);
+      deepStringifyFunctions(objProp, stringified[prop]);
     } else if ((0, import_types.isArray)(objProp)) {
       stringified[prop] = [];
       objProp.forEach((v, i) => {
         if ((0, import_types.isObject)(v)) {
           stringified[prop][i] = {};
-          deepStringify(v, stringified[prop][i]);
+          deepStringifyFunctions(v, stringified[prop][i]);
         } else if ((0, import_types.isFunction)(v)) {
           stringified[prop][i] = v.toString();
         } else {
@@ -219,7 +219,7 @@ const deepStringify = (obj, stringified = {}) => {
   return stringified;
 };
 const MAX_DEPTH = 100;
-const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "") => {
+const deepStringifyFunctionsWithMaxDepth = (obj, stringified = {}, depth = 0, path = "") => {
   if (depth > MAX_DEPTH) {
     console.warn(
       `Maximum depth exceeded at path: ${path}. Possible circular reference.`
@@ -233,7 +233,7 @@ const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "")
       stringified[prop] = objProp.toString();
     } else if ((0, import_types.isObject)(objProp)) {
       stringified[prop] = {};
-      deepStringifyWithMaxDepth(
+      deepStringifyFunctionsWithMaxDepth(
         objProp,
         stringified[prop],
         depth + 1,
@@ -245,7 +245,7 @@ const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "")
         const itemPath = `${currentPath}[${i}]`;
         if ((0, import_types.isObject)(v)) {
           stringified[prop][i] = {};
-          deepStringifyWithMaxDepth(
+          deepStringifyFunctionsWithMaxDepth(
             v,
             stringified[prop][i],
             depth + 1,
@@ -342,7 +342,7 @@ const detachFunctionsFromObject = (obj, detached = {}) => {
     if ((0, import_types.isFunction)(objProp)) continue;
     else if ((0, import_types.isObject)(objProp)) {
       detached[prop] = {};
-      deepStringify(objProp, detached[prop]);
+      deepStringifyFunctions(objProp, detached[prop]);
     } else if ((0, import_types.isArray)(objProp)) {
       detached[prop] = [];
       objProp.forEach((v, i) => {
@@ -381,7 +381,7 @@ const hasFunction = (str) => {
   const isJSONLike = /^["[{]/.test(trimmed) && !trimmed.includes("=>");
   return (isFunction2 || isClass) && !isObjectLiteral && !isArrayLiteral && !isJSONLike;
 };
-const deepDestringify = (obj, destringified = {}) => {
+const deepDestringifyFunctions = (obj, destringified = {}) => {
   for (const prop in obj) {
     const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
     if (!hasOwnProperty2) continue;
@@ -412,30 +412,40 @@ const deepDestringify = (obj, destringified = {}) => {
             destringified[prop].push(arrProp);
           }
         } else if ((0, import_types.isObject)(arrProp)) {
-          destringified[prop].push(deepDestringify(arrProp));
+          destringified[prop].push(deepDestringifyFunctions(arrProp));
         } else {
           destringified[prop].push(arrProp);
         }
       });
     } else if ((0, import_types.isObject)(objProp)) {
-      destringified[prop] = deepDestringify(objProp, destringified[prop]);
+      destringified[prop] = deepDestringifyFunctions(
+        objProp,
+        destringified[prop]
+      );
     } else {
       destringified[prop] = objProp;
     }
   }
   return destringified;
 };
-const stringToObject = (str, opts = { verbose: true }) => {
+const evalStringToObject = (str, opts = { verbose: true }) => {
   try {
-    return str ? import_globals.window.eval("(" + str + ")") : {};
+    return str ? (opts.window || import_globals.window).eval("(" + str + ")") : {};
   } catch (e) {
     if (opts.verbose) console.warn(e);
-    if (opts.errorCallback) return opts.errorCallback(e);
+    if (opts.onError) return opts.onError(e);
   }
 };
 const diffObjects = (original, objToDiff, cache, opts) => {
   let hasDiff = false;
-  const allKeys = /* @__PURE__ */ new Set([...Object.keys(original), ...Object.keys(objToDiff)]);
+  const originalKeys = Object.keys(original);
+  const diffKeys = Object.keys(objToDiff);
+  const allKeys = [.../* @__PURE__ */ new Set([...originalKeys, ...diffKeys])];
+  const originalKeyOrder = originalKeys.join(",");
+  const diffKeyOrder = diffKeys.filter((k) => originalKeys.includes(k)).join(",");
+  if (originalKeyOrder !== diffKeyOrder) {
+    hasDiff = true;
+  }
   for (const key of allKeys) {
     if (key === "ref") continue;
     const originalProp = original[key];
@@ -469,6 +479,11 @@ const diffArrays = (original, objToDiff, cache, opts) => {
     return objToDiff;
   }
   let hasDiff = false;
+  const originalStringified = original.map((item) => JSON.stringify(item));
+  const diffStringified = objToDiff.map((item) => JSON.stringify(item));
+  if (originalStringified.join(",") !== diffStringified.join(",")) {
+    hasDiff = true;
+  }
   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)) {
@@ -476,15 +491,15 @@ const diffArrays = (original, objToDiff, cache, opts) => {
       hasDiff = true;
     }
   }
-  return hasDiff ? cache : void 0;
+  return hasDiff ? objToDiff : void 0;
 };
 const diff = (original, objToDiff, cache = {}, opts = {}) => {
   if (opts.cloneInstances) {
     original = deepClone(original);
     objToDiff = deepClone(objToDiff);
   }
-  original = deepStringify(original);
-  objToDiff = deepStringify(objToDiff);
+  original = deepStringifyFunctions(original);
+  objToDiff = deepStringifyFunctions(objToDiff);
   if ((0, import_types.isArray)(original) && (0, import_types.isArray)(objToDiff)) {
     const result = diffArrays(original, objToDiff, [], opts);
     return result === void 0 ? {} : result;

package/dist/esm/object.js

@@ -151,7 +151,7 @@ const deepClone = (obj, options = {}) => {
   }
   return clone2;
 };
-const deepStringify = (obj, stringified = {}) => {
+const deepStringifyFunctions = (obj, stringified = {}) => {
   var _a, _b;
   if (!obj) return;
   if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
@@ -168,13 +168,13 @@ const deepStringify = (obj, stringified = {}) => {
       stringified[prop] = objProp.toString();
     } else if (isObject(objProp)) {
       stringified[prop] = {};
-      deepStringify(objProp, stringified[prop]);
+      deepStringifyFunctions(objProp, stringified[prop]);
     } else if (isArray(objProp)) {
       stringified[prop] = [];
       objProp.forEach((v, i) => {
         if (isObject(v)) {
           stringified[prop][i] = {};
-          deepStringify(v, stringified[prop][i]);
+          deepStringifyFunctions(v, stringified[prop][i]);
         } else if (isFunction(v)) {
           stringified[prop][i] = v.toString();
         } else {
@@ -188,7 +188,7 @@ const deepStringify = (obj, stringified = {}) => {
   return stringified;
 };
 const MAX_DEPTH = 100;
-const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "") => {
+const deepStringifyFunctionsWithMaxDepth = (obj, stringified = {}, depth = 0, path = "") => {
   if (depth > MAX_DEPTH) {
     console.warn(
       `Maximum depth exceeded at path: ${path}. Possible circular reference.`
@@ -202,7 +202,7 @@ const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "")
       stringified[prop] = objProp.toString();
     } else if (isObject(objProp)) {
       stringified[prop] = {};
-      deepStringifyWithMaxDepth(
+      deepStringifyFunctionsWithMaxDepth(
         objProp,
         stringified[prop],
         depth + 1,
@@ -214,7 +214,7 @@ const deepStringifyWithMaxDepth = (obj, stringified = {}, depth = 0, path = "")
         const itemPath = `${currentPath}[${i}]`;
         if (isObject(v)) {
           stringified[prop][i] = {};
-          deepStringifyWithMaxDepth(
+          deepStringifyFunctionsWithMaxDepth(
             v,
             stringified[prop][i],
             depth + 1,
@@ -311,7 +311,7 @@ const detachFunctionsFromObject = (obj, detached = {}) => {
     if (isFunction(objProp)) continue;
     else if (isObject(objProp)) {
       detached[prop] = {};
-      deepStringify(objProp, detached[prop]);
+      deepStringifyFunctions(objProp, detached[prop]);
     } else if (isArray(objProp)) {
       detached[prop] = [];
       objProp.forEach((v, i) => {
@@ -350,7 +350,7 @@ const hasFunction = (str) => {
   const isJSONLike = /^["[{]/.test(trimmed) && !trimmed.includes("=>");
   return (isFunction2 || isClass) && !isObjectLiteral && !isArrayLiteral && !isJSONLike;
 };
-const deepDestringify = (obj, destringified = {}) => {
+const deepDestringifyFunctions = (obj, destringified = {}) => {
   for (const prop in obj) {
     const hasOwnProperty2 = Object.prototype.hasOwnProperty.call(obj, prop);
     if (!hasOwnProperty2) continue;
@@ -381,30 +381,40 @@ const deepDestringify = (obj, destringified = {}) => {
             destringified[prop].push(arrProp);
           }
         } else if (isObject(arrProp)) {
-          destringified[prop].push(deepDestringify(arrProp));
+          destringified[prop].push(deepDestringifyFunctions(arrProp));
         } else {
           destringified[prop].push(arrProp);
         }
       });
     } else if (isObject(objProp)) {
-      destringified[prop] = deepDestringify(objProp, destringified[prop]);
+      destringified[prop] = deepDestringifyFunctions(
+        objProp,
+        destringified[prop]
+      );
     } else {
       destringified[prop] = objProp;
     }
   }
   return destringified;
 };
-const stringToObject = (str, opts = { verbose: true }) => {
+const evalStringToObject = (str, opts = { verbose: true }) => {
   try {
-    return str ? window.eval("(" + str + ")") : {};
+    return str ? (opts.window || window).eval("(" + str + ")") : {};
   } catch (e) {
     if (opts.verbose) console.warn(e);
-    if (opts.errorCallback) return opts.errorCallback(e);
+    if (opts.onError) return opts.onError(e);
   }
 };
 const diffObjects = (original, objToDiff, cache, opts) => {
   let hasDiff = false;
-  const allKeys = /* @__PURE__ */ new Set([...Object.keys(original), ...Object.keys(objToDiff)]);
+  const originalKeys = Object.keys(original);
+  const diffKeys = Object.keys(objToDiff);
+  const allKeys = [.../* @__PURE__ */ new Set([...originalKeys, ...diffKeys])];
+  const originalKeyOrder = originalKeys.join(",");
+  const diffKeyOrder = diffKeys.filter((k) => originalKeys.includes(k)).join(",");
+  if (originalKeyOrder !== diffKeyOrder) {
+    hasDiff = true;
+  }
   for (const key of allKeys) {
     if (key === "ref") continue;
     const originalProp = original[key];
@@ -438,6 +448,11 @@ const diffArrays = (original, objToDiff, cache, opts) => {
     return objToDiff;
   }
   let hasDiff = false;
+  const originalStringified = original.map((item) => JSON.stringify(item));
+  const diffStringified = objToDiff.map((item) => JSON.stringify(item));
+  if (originalStringified.join(",") !== diffStringified.join(",")) {
+    hasDiff = true;
+  }
   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)) {
@@ -445,15 +460,15 @@ const diffArrays = (original, objToDiff, cache, opts) => {
       hasDiff = true;
     }
   }
-  return hasDiff ? cache : void 0;
+  return hasDiff ? objToDiff : void 0;
 };
 const diff = (original, objToDiff, cache = {}, opts = {}) => {
   if (opts.cloneInstances) {
     original = deepClone(original);
     objToDiff = deepClone(objToDiff);
   }
-  original = deepStringify(original);
-  objToDiff = deepStringify(objToDiff);
+  original = deepStringifyFunctions(original);
+  objToDiff = deepStringifyFunctions(objToDiff);
   if (isArray(original) && isArray(objToDiff)) {
     const result = diffArrays(original, objToDiff, [], opts);
     return result === void 0 ? {} : result;
@@ -761,15 +776,16 @@ export {
   createObjectWithoutPrototype,
   deepClone,
   deepContains,
-  deepDestringify,
+  deepDestringifyFunctions,
   deepDiff,
   deepMerge,
-  deepStringify,
-  deepStringifyWithMaxDepth,
+  deepStringifyFunctions,
+  deepStringifyFunctionsWithMaxDepth,
   detachFunctionsFromObject,
   detectInfiniteLoop,
   diff,
   diffObjects,
+  evalStringToObject,
   excludeKeysFromObject,
   exec,
   flattenRecursive,
@@ -791,6 +807,5 @@ export {
   overwriteShallow,
   removeFromObject,
   removeNestedKeyByPath,
-  setInObjectByPath,
-  stringToObject
+  setInObjectByPath
 };

package/object.js

@@ -208,7 +208,7 @@ export const deepClone = (obj, options = {}) => {
 /**
  * Stringify object
  */
-export const deepStringify = (obj, stringified = {}) => {
+export const deepStringifyFunctions = (obj, stringified = {}) => {
   if (!obj) return
   if (obj.node || obj.__ref || obj.parent || obj.__element || obj.parse) {
     ;(obj.__element || obj.parent?.__element).warn(
@@ -224,13 +224,13 @@ export const deepStringify = (obj, stringified = {}) => {
       stringified[prop] = objProp.toString()
     } else if (isObject(objProp)) {
       stringified[prop] = {}
-      deepStringify(objProp, stringified[prop])
+      deepStringifyFunctions(objProp, stringified[prop])
     } else if (isArray(objProp)) {
       stringified[prop] = []
       objProp.forEach((v, i) => {
         if (isObject(v)) {
           stringified[prop][i] = {}
-          deepStringify(v, stringified[prop][i])
+          deepStringifyFunctions(v, stringified[prop][i])
         } else if (isFunction(v)) {
           stringified[prop][i] = v.toString()
         } else {
@@ -246,7 +246,7 @@ export const deepStringify = (obj, stringified = {}) => {
 }
 
 const MAX_DEPTH = 100 // Adjust this value as needed
-export const deepStringifyWithMaxDepth = (
+export const deepStringifyFunctionsWithMaxDepth = (
   obj,
   stringified = {},
   depth = 0,
@@ -267,7 +267,7 @@ export const deepStringifyWithMaxDepth = (
       stringified[prop] = objProp.toString()
     } else if (isObject(objProp)) {
       stringified[prop] = {}
-      deepStringifyWithMaxDepth(
+      deepStringifyFunctionsWithMaxDepth(
         objProp,
         stringified[prop],
         depth + 1,
@@ -279,7 +279,7 @@ export const deepStringifyWithMaxDepth = (
         const itemPath = `${currentPath}[${i}]`
         if (isObject(v)) {
           stringified[prop][i] = {}
-          deepStringifyWithMaxDepth(
+          deepStringifyFunctionsWithMaxDepth(
             v,
             stringified[prop][i],
             depth + 1,
@@ -389,7 +389,7 @@ export const detachFunctionsFromObject = (obj, detached = {}) => {
     if (isFunction(objProp)) continue
     else if (isObject(objProp)) {
       detached[prop] = {}
-      deepStringify(objProp, detached[prop])
+      deepStringifyFunctions(objProp, detached[prop])
     } else if (isArray(objProp)) {
       detached[prop] = []
       objProp.forEach((v, i) => {
@@ -440,7 +440,7 @@ export const hasFunction = (str) => {
   )
 }
 
-export const deepDestringify = (obj, destringified = {}) => {
+export const deepDestringifyFunctions = (obj, destringified = {}) => {
   for (const prop in obj) {
     const hasOwnProperty = Object.prototype.hasOwnProperty.call(obj, prop)
     if (!hasOwnProperty) continue
@@ -473,13 +473,16 @@ export const deepDestringify = (obj, destringified = {}) => {
             destringified[prop].push(arrProp)
           }
         } else if (isObject(arrProp)) {
-          destringified[prop].push(deepDestringify(arrProp))
+          destringified[prop].push(deepDestringifyFunctions(arrProp))
         } else {
           destringified[prop].push(arrProp)
         }
       })
     } else if (isObject(objProp)) {
-      destringified[prop] = deepDestringify(objProp, destringified[prop])
+      destringified[prop] = deepDestringifyFunctions(
+        objProp,
+        destringified[prop]
+      )
     } else {
       destringified[prop] = objProp
     }
@@ -487,20 +490,31 @@ export const deepDestringify = (obj, destringified = {}) => {
   return destringified
 }
 
-export const stringToObject = (str, opts = { verbose: true }) => {
+export const evalStringToObject = (str, opts = { verbose: true }) => {
   try {
-    return str ? window.eval('(' + str + ')') : {} // eslint-disable-line
+    return str ? (opts.window || window).eval('(' + str + ')') : {} // eslint-disable-line
   } catch (e) {
     if (opts.verbose) console.warn(e)
-    if (opts.errorCallback) return opts.errorCallback(e)
+    if (opts.onError) return opts.onError(e)
   }
 }
 
 export const diffObjects = (original, objToDiff, cache, opts) => {
   let hasDiff = false
 
-  // Use union of keys
-  const allKeys = new Set([...Object.keys(original), ...Object.keys(objToDiff)])
+  // Use union of keys maintaining original order where possible
+  const originalKeys = Object.keys(original)
+  const diffKeys = Object.keys(objToDiff)
+  const allKeys = [...new Set([...originalKeys, ...diffKeys])]
+
+  // Check if key order has changed
+  const originalKeyOrder = originalKeys.join(',')
+  const diffKeyOrder = diffKeys
+    .filter((k) => originalKeys.includes(k))
+    .join(',')
+  if (originalKeyOrder !== diffKeyOrder) {
+    hasDiff = true
+  }
 
   for (const key of allKeys) {
     if (key === 'ref') continue
@@ -537,11 +551,23 @@ export const diffObjects = (original, objToDiff, cache, opts) => {
 }
 
 const diffArrays = (original, objToDiff, cache, opts) => {
+  // Different lengths means arrays are different
   if (original.length !== objToDiff.length) {
     return objToDiff
   }
 
   let hasDiff = false
+
+  // First check if any elements have changed position
+  // by doing a shallow comparison of elements
+  const originalStringified = original.map((item) => JSON.stringify(item))
+  const diffStringified = objToDiff.map((item) => JSON.stringify(item))
+
+  if (originalStringified.join(',') !== diffStringified.join(',')) {
+    hasDiff = true
+  }
+
+  // Then do deep comparison of each element
   for (let i = 0; i < original.length; i++) {
     const diffObj = diff(original[i], objToDiff[i], {}, opts)
     if (
@@ -553,7 +579,7 @@ const diffArrays = (original, objToDiff, cache, opts) => {
     }
   }
 
-  return hasDiff ? cache : undefined
+  return hasDiff ? objToDiff : undefined
 }
 
 export const diff = (original, objToDiff, cache = {}, opts = {}) => {
@@ -562,8 +588,8 @@ export const diff = (original, objToDiff, cache = {}, opts = {}) => {
     objToDiff = deepClone(objToDiff)
   }
 
-  original = deepStringify(original)
-  objToDiff = deepStringify(objToDiff)
+  original = deepStringifyFunctions(original)
+  objToDiff = deepStringifyFunctions(objToDiff)
 
   if (isArray(original) && isArray(objToDiff)) {
     const result = diffArrays(original, objToDiff, [], opts)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.31.26",
+  "version": "2.31.28",
   "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": "126577d65a218af7e2f66b0a3f9691942ee8b9d2",
+  "gitHead": "62fc6275cd961fffd78b8f4c7474e10a61251c38",
   "devDependencies": {
     "@babel/core": "^7.27.1"
   }