@domql/utils 2.1.0 → 2.2.8

package/object.js

@@ -1,8 +1,8 @@
 'use strict'
 
-import { TAGS } from '@domql/registry'
+import { HTML_TAGS } from '@domql/tags'
 
-export const isValidHtmlTag = arg => TAGS.body.indexOf(arg)
+export const isValidHtmlTag = arg => HTML_TAGS.body.indexOf(arg)
 
 export const isObject = arg => {
   if (arg === null) return false
@@ -119,6 +119,7 @@ export const deepClone = (obj, excluding = ['parent', 'node', '__element', '__ro
  * Overwrites object properties with another
  */
 export const overwrite = (element, params, options) => {
+  const { ref } = element
   const changes = {}
 
   for (const e in params) {
@@ -128,11 +129,43 @@ export const overwrite = (element, params, options) => {
     const paramsProp = params[e]
 
     if (paramsProp) {
-      element.__cached[e] = changes[e] = elementProp
-      element[e] = paramsProp
+      ref.__cache[e] = changes[e] = elementProp
+      ref[e] = paramsProp
     }
+  }
+
+  return changes
+}
+
+export const diff = (obj, original, cache) => {
+  const changes = cache || {}
+  for (const e in obj) {
+    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
+    }
+  }
+  return changes
+}
 
-    if (options.cleanExec) delete element.__exec[e]
+/**
+ * Overwrites object properties with another
+ */
+export const overwriteObj = (params, obj) => {
+  const changes = {}
+
+  for (const e in params) {
+    const objProp = obj[e]
+    const paramsProp = params[e]
+
+    if (paramsProp) {
+      obj[e] = changes[e] = objProp
+    }
   }
 
   return changes
@@ -141,9 +174,8 @@ export const overwrite = (element, params, options) => {
 /**
  * Overwrites DEEPly object properties with another
  */
-export const overwriteDeep = (obj, params, excluding = ['node', '__root']) => {
+export const overwriteDeep = (params, obj) => {
   for (const e in params) {
-    if (excluding.indexOf(e) > -1) continue
     const objProp = obj[e]
     const paramsProp = params[e]
     if (isObjectLike(objProp) && isObjectLike(paramsProp)) {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@domql/utils",
-  "version": "2.1.0",
+  "version": "2.2.8",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "@domql/registry": "latest"
+    "@domql/tags": "latest"
   },
-  "gitHead": "1e384e4a15f44201165f6bd54efb4a0e9c105745",
+  "gitHead": "2870bbc0b27fb7f7e4635b6be6000660880d41cd",
   "source": "index.js"
 }