@domql/utils 2.3.24 → 2.3.26

package/object.js

@@ -48,6 +48,37 @@ export const clone = obj => {
   return o
 }
 
+// Clone anything deeply but exclude keys given in 'exclude'
+export const deepCloneExclude(obj, exclude = []) {
+  if (isArray(obj)) {
+    return obj.map(x => deepCloneExclude(x, exclude))
+  }
+
+  const o = {}
+  for (const k in obj) {
+    if (exclude.indexOf(k) > -1) continue
+
+    let v = obj[k]
+
+    if (k === 'extend' && isArray(v)) {
+      v = mergeArrayExclude(v, exclude)
+    }
+
+    if (isArray(v)) {
+      o[k] = v.map(x => deepCloneExclude(x, exclude))
+    } else if (isObject(v)) {
+      o[k] = deepCloneExclude(v, exclude)
+    } else o[k] = v
+  }
+
+  return o
+}
+
+// Merge array, but exclude keys listed in 'excl'
+export const mergeArrayExclude = (arr, excl = []) => {
+  return arr.reduce((acc, curr) => deepMerge(acc, deepCloneExclude(curr, excl)), {})
+}
+
 /**
  * Deep cloning of object
  */
@@ -79,6 +110,10 @@ export const deepStringify = (obj, stringified = {}) => {
     if (isFunction(objProp)) {
       stringified[prop] = objProp.toString()
     } else stringified[prop] = objProp
+    // if (prop === 'src') {
+    //   console.log(typeof stringified[prop])
+    //   console.log(prop, stringified[prop])
+    // }
     if (isObject(objProp)) deepStringify(stringified[prop], stringified[prop])
   }
   return stringified
@@ -91,10 +126,16 @@ export const deepDestringify = (obj, stringified = {}) => {
   for (const prop in obj) {
     const objProp = obj[prop]
     if (isString(objProp)) {
-      if (objProp.slice(0, 1) === '(') {
+      if (objProp.includes('=>') || objProp.includes('function') || objProp[0] === '(') {
+        // console.groupCollapsed(prop)
+        // console.log(obj)
+        // console.log(objProp)
         try {
-          stringified[prop] = eval(objProp) // eslint-disable-line
+          const evalProp = eval(objProp) // eslint-disable-line
+          // console.log(evalProp)
+          stringified[prop] = evalProp
         } catch (e) { if (e) stringified[prop] = objProp }
+        // console.groupEnd(prop)
       }
     } else stringified[prop] = objProp
     if (isObject(objProp)) deepDestringify(stringified[prop], stringified[prop])

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@domql/utils",
-  "version": "2.3.24",
+  "version": "2.3.26",
   "main": "index.js",
   "module": "index.js",
   "license": "MIT",
   "dependencies": {
     "@domql/globals": "latest",
     "@domql/tags": "latest"
-  },
-  "gitHead": "1b912f1758896a2721daf5fed681290833ee9a4d"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2016 rackai
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.