@domql/utils 2.2.0 → 2.3.0

package/node.js

@@ -1,6 +1,6 @@
 'use strict'
 
-export const cleanWithNode = proto => delete proto.node && proto
+export const cleanWithNode = extend => delete extend.node && extend
 
 export const createID = (function * () {
   let index = 1

package/object.js

@@ -71,17 +71,17 @@ export const merge = (element, obj) => {
   return element
 }
 
-export const deepMerge = (element, proto) => {
+export const deepMerge = (element, extend) => {
   // console.groupCollapsed('deepMerge:')
-  for (const e in proto) {
+  for (const e in extend) {
     const elementProp = element[e]
-    const protoProp = proto[e]
+    const extendProp = extend[e]
     // const cachedProps = cache.props
     if (e === 'parent' || e === 'props') continue
     if (elementProp === undefined) {
-      element[e] = protoProp
-    } else if (isObjectLike(elementProp) && isObject(protoProp)) {
-      deepMerge(elementProp, protoProp)
+      element[e] = extendProp
+    } else if (isObjectLike(elementProp) && isObject(extendProp)) {
+      deepMerge(elementProp, extendProp)
     }
   }
   // console.groupEnd('deepMerge:')
@@ -105,7 +105,7 @@ export const deepClone = (obj, excluding = ['parent', 'node', '__element', '__ro
   for (const prop in obj) {
     if (excluding.indexOf(prop) > -1) continue
     let objProp = obj[prop]
-    if (prop === 'proto' && isArray(objProp)) {
+    if (prop === 'extend' && isArray(objProp)) {
       objProp = mergeArray(objProp)
     }
     if (isObjectLike(objProp)) {
@@ -140,18 +140,37 @@ export const overwrite = (element, params, options) => {
 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 (originalProp !== undefined) {
+    } else if (objProp !== undefined) {
       changes[e] = objProp
     }
   }
   return changes
 }
 
+/**
+ * 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
+}
+
 /**
  * Overwrites DEEPly object properties with another
  */
@@ -177,14 +196,14 @@ export const mergeIfExisted = (a, b) => {
 }
 
 /**
- * Merges array prototypes
+ * Merges array extendtypes
  */
 export const mergeArray = (arr) => {
   return arr.reduce((a, c) => deepMerge(a, deepClone(c)), {})
 }
 
 /**
- * Merges array prototypes
+ * Merges array extendtypes
  */
 export const mergeAndCloneIfArray = obj => {
   return isArray(obj) ? mergeArray(obj) : deepClone(obj)
@@ -197,8 +216,8 @@ export const flattenRecursive = (param, prop, stack = []) => {
   const objectized = mergeAndCloneIfArray(param)
   stack.push(objectized)
 
-  const protoOfProto = objectized[prop]
-  if (protoOfProto) flattenRecursive(protoOfProto, prop, stack)
+  const extendOfExtend = objectized[prop]
+  if (extendOfExtend) flattenRecursive(extendOfExtend, prop, stack)
 
   delete objectized[prop]
 

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@domql/utils",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
     "@domql/tags": "latest"
   },
-  "gitHead": "ec7e77cec088dafc6b4a5d2893f72e3590a6761e",
+  "gitHead": "02944ad228d2cf5f5727b08e9378d221b2f7205b",
   "source": "index.js"
 }