@domql/utils 2.3.90 → 2.3.92

package/array.js

@@ -20,3 +20,7 @@ export const removeFromArray = (arr, index) => {
   }
   return arr
 }
+
+export const swapItemsInArray = (arr, i, j) => {
+  [arr[i], arr[j]] = [arr[j], arr[i]]
+}

package/dist/cjs/array.js

@@ -19,7 +19,8 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var array_exports = {};
 __export(array_exports, {
   arrayContainsOtherArray: () => arrayContainsOtherArray,
-  removeFromArray: () => removeFromArray
+  removeFromArray: () => removeFromArray,
+  swapItemsInArray: () => swapItemsInArray
 });
 module.exports = __toCommonJS(array_exports);
 var import_types = require("./types");
@@ -41,3 +42,6 @@ const removeFromArray = (arr, index) => {
   }
   return arr;
 };
+const swapItemsInArray = (arr, i, j) => {
+  [arr[i], arr[j]] = [arr[j], arr[i]];
+};

package/dist/cjs/object.js

@@ -26,6 +26,8 @@ __export(object_exports, {
   deepStringify: () => deepStringify,
   detachFunctionsFromObject: () => detachFunctionsFromObject,
   diff: () => diff,
+  diffArrays: () => diffArrays,
+  diffObjects: () => diffObjects,
   exec: () => exec,
   flattenRecursive: () => flattenRecursive,
   isEqualDeep: () => isEqualDeep,
@@ -245,21 +247,46 @@ const overwrite = (element, params, options) => {
   }
   return changes;
 };
-const diff = (obj, original, cache) => {
-  const changes = cache || {};
-  for (const e in obj) {
+const diffObjects = (original, objToDiff, cache) => {
+  for (const e in objToDiff) {
     if (e === "ref")
       continue;
     const originalProp = original[e];
-    const objProp = obj[e];
-    if ((0, import_types.isObjectLike)(originalProp) && (0, import_types.isObjectLike)(objProp)) {
-      changes[e] = {};
-      diff(originalProp, objProp, changes[e]);
-    } else if (objProp !== void 0) {
-      changes[e] = objProp;
+    const objToDiffProp = objToDiff[e];
+    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;
     }
   }
-  return changes;
+  return cache;
+};
+const diffArrays = (original, objToDiff, cache) => {
+  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 cache;
+};
+const diff = (original, objToDiff, cache = {}) => {
+  if ((0, import_types.isArray)(original) && (0, import_types.isArray)(objToDiff)) {
+    cache = [];
+    diffArrays(original, objToDiff, cache);
+  } else {
+    diffObjects(original, objToDiff, cache);
+  }
+  return cache;
 };
 const overwriteObj = (params, obj) => {
   const changes = {};

package/object.js

@@ -229,20 +229,50 @@ export const overwrite = (element, params, options) => {
   return changes
 }
 
-export const diff = (obj, original, cache) => {
-  const changes = cache || {}
-  for (const e in obj) {
+export const diffObjects = (original, objToDiff, cache) => {
+  for (const e in objToDiff) {
     if (e === 'ref') continue
+
     const originalProp = original[e]
-    const objProp = obj[e]
-    if (isObjectLike(originalProp) && isObjectLike(objProp)) {
-      changes[e] = {}
-      diff(originalProp, objProp, changes[e])
-    } else if (objProp !== undefined) {
-      changes[e] = objProp
+    const objToDiffProp = objToDiff[e]
+
+    if (isObject(originalProp) && isObject(objToDiffProp)) {
+      cache[e] = {}
+      diff(originalProp, objToDiffProp, cache[e])
+    } else if (objToDiffProp !== undefined) {
+      cache[e] = objToDiffProp
     }
   }
-  return changes
+  return cache
+}
+
+export const diffArrays = (original, objToDiff, cache) => {
+  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 cache
+}
+
+export const diff = (original, objToDiff, cache = {}) => {
+  if (isArray(original) && isArray(objToDiff)) {
+    cache = []
+    diffArrays(original, objToDiff, cache)
+  } else {
+    diffObjects(original, objToDiff, cache)
+  }
+
+  return cache
 }
 
 /**
@@ -264,7 +294,7 @@ export const overwriteObj = (params, obj) => {
 }
 
 /**
- * Overwrites DEEPly object properties with another
+ * Overwrites DEEPLY object properties with another
  */
 export const overwriteDeep = (params, obj) => {
   for (const e in params) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.90",
+  "version": "2.3.92",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -22,5 +22,5 @@
     "@domql/globals": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "ab1a0f74fc9a7cc67cd5e732c7a8577d98fbb9b0"
+  "gitHead": "dc86022df601a498fca8c9af5be9e40dcf36ddbf"
 }