@domql/utils 2.3.120 → 2.3.126

package/dist/cjs/object.js

@@ -37,7 +37,6 @@ __export(object_exports, {
   mergeIfExisted: () => mergeIfExisted,
   overwrite: () => overwrite,
   overwriteDeep: () => overwriteDeep,
-  overwriteObj: () => overwriteObj,
   overwriteShallow: () => overwriteShallow,
   removeFromObject: () => removeFromObject
 });
@@ -60,8 +59,10 @@ const map = (obj, extention, element) => {
     obj[e] = exec(extention[e], element);
   }
 };
-const merge = (element, obj) => {
+const merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
+    if (excludeFrom.includes(e) || e.includes("__"))
+      continue;
     const elementProp = element[e];
     const objProp = obj[e];
     if (elementProp === void 0) {
@@ -229,21 +230,6 @@ const deepDestringify = (obj, stringified = {}) => {
   }
   return stringified;
 };
-const overwrite = (element, params, excludeFrom = []) => {
-  const { ref } = element;
-  const changes = {};
-  for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes("__"))
-      continue;
-    const elementProp = element[e];
-    const paramsProp = params[e];
-    if (paramsProp) {
-      ref.__cache[e] = changes[e] = elementProp;
-      ref[e] = paramsProp;
-    }
-  }
-  return changes;
-};
 const diffObjects = (original, objToDiff, cache) => {
   for (const e in objToDiff) {
     if (e === "ref")
@@ -285,13 +271,17 @@ const diff = (original, objToDiff, cache = {}) => {
   }
   return cache;
 };
-const overwriteObj = (params, obj) => {
+const overwrite = (element, params, excludeFrom = []) => {
+  const { ref } = element;
   const changes = {};
   for (const e in params) {
-    const objProp = obj[e];
+    if (excludeFrom.includes(e) || e.includes("__"))
+      continue;
+    const elementProp = element[e];
     const paramsProp = params[e];
     if (paramsProp) {
-      obj[e] = changes[e] = objProp;
+      ref.__cache[e] = changes[e] = elementProp;
+      ref[e] = paramsProp;
     }
   }
   return changes;

package/object.js

@@ -21,8 +21,9 @@ export const map = (obj, extention, element) => {
   }
 }
 
-export const merge = (element, obj) => {
+export const merge = (element, obj, excludeFrom = []) => {
   for (const e in obj) {
+    if (excludeFrom.includes(e) || e.includes('__')) continue
     const elementProp = element[e]
     const objProp = obj[e]
     if (elementProp === undefined) {
@@ -204,28 +205,6 @@ export const deepDestringify = (obj, stringified = {}) => {
   return stringified
 }
 
-/**
- * Overwrites object properties with another
- */
-export const overwrite = (element, params, excludeFrom = []) => {
-  const { ref } = element
-  const changes = {}
-
-  for (const e in params) {
-    if (excludeFrom.includes(e) || e.includes('__')) continue
-
-    const elementProp = element[e]
-    const paramsProp = params[e]
-
-    if (paramsProp) {
-      ref.__cache[e] = changes[e] = elementProp
-      ref[e] = paramsProp
-    }
-  }
-
-  return changes
-}
-
 export const diffObjects = (original, objToDiff, cache) => {
   for (const e in objToDiff) {
     if (e === 'ref') continue
@@ -275,15 +254,19 @@ export const diff = (original, objToDiff, cache = {}) => {
 /**
  * Overwrites object properties with another
  */
-export const overwriteObj = (params, obj) => {
+export const overwrite = (element, params, excludeFrom = []) => {
+  const { ref } = element
   const changes = {}
 
   for (const e in params) {
-    const objProp = obj[e]
+    if (excludeFrom.includes(e) || e.includes('__')) continue
+
+    const elementProp = element[e]
     const paramsProp = params[e]
 
     if (paramsProp) {
-      obj[e] = changes[e] = objProp
+      ref.__cache[e] = changes[e] = elementProp
+      ref[e] = paramsProp
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.120",
+  "version": "2.3.126",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -23,7 +23,7 @@
     "@domql/key": "latest",
     "@domql/tags": "latest"
   },
-  "gitHead": "6e932a813b8e6ee0a57a40ebc6dc757cc44e6427",
+  "gitHead": "6329de71d2e831d0efd9d59e765567aa8c563481",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }