@domql/element 2.5.160 → 2.5.161

package/create.js

@@ -14,7 +14,7 @@ import {
   isUndefined,
   generateKey,
   checkIfKeyIsComponent,
-  deepCloneWithExtend,
+  deepClone,
   applyComponentFromContext,
   applyKeyComponentAsExtend,
   isVariant,
@@ -60,7 +60,7 @@ export const create = (element, parent, key, options = OPTIONS.create || {}, att
 
   const ref = addRef(element, parent, key)
 
-  ref.__initialProps = deepCloneWithExtend(element.props, [])
+  ref.__initialProps = deepClone(element.props)
 
   applyContext(element, parent, options)
 

package/dist/cjs/create.js

@@ -57,7 +57,7 @@ const create = (element, parent, key, options = import_options.OPTIONS.create ||
   parent = redefineParent(element, parent, key);
   key = createKey(element, parent, key);
   const ref = addRef(element, parent, key);
-  ref.__initialProps = (0, import_utils.deepCloneWithExtend)(element.props, []);
+  ref.__initialProps = (0, import_utils.deepClone)(element.props);
   applyContext(element, parent, options);
   (0, import_utils.applyComponentFromContext)(element, parent, options);
   if (!ref.__skipCreate) {

package/dist/cjs/props/create.js

@@ -57,7 +57,7 @@ const syncProps = (props, element, opts) => {
     }
     element.props = (0, import_utils.deepMerge)(
       mergedProps,
-      (0, import_utils.deepCloneWithExtend)(execProps, import_ignore.IGNORE_PROPS_PARAMS),
+      (0, import_utils.deepClone)(execProps, { ignore: import_ignore.IGNORE_PROPS_PARAMS }),
       import_ignore.IGNORE_PROPS_PARAMS
     );
   });

package/dist/cjs/update.js

@@ -46,7 +46,7 @@ const UPDATE_DEFAULT_OPTIONS = {
 };
 const update = function(params = {}, opts) {
   const calleeElementCache = opts == null ? void 0 : opts.calleeElement;
-  const options = (0, import_utils2.deepClone)((0, import_utils.isObject)(opts) ? (0, import_utils2.deepMerge)(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, ["calleeElement"]);
+  const options = (0, import_utils.deepClone)((0, import_utils.isObject)(opts) ? (0, import_utils2.deepMerge)(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, { exclude: ["calleeElement"] });
   options.calleeElement = calleeElementCache;
   const element = this;
   const { parent, node, key } = element;

package/dist/cjs/utils/extendUtils.js

@@ -103,7 +103,7 @@ const deepMergeExtend = (element, extend) => {
 };
 const cloneAndMergeArrayExtend = (stack) => {
   return stack.reduce((a, c) => {
-    return deepMergeExtend(a, (0, import_utils.deepCloneWithExtend)(c));
+    return deepMergeExtend(a, (0, import_utils.deepClone)(c));
   }, {});
 };
 const fallbackStringExtend = (extend, context, options = {}) => {

package/dist/cjs/utils/object.js

@@ -21,7 +21,6 @@ __export(object_exports, {
   METHODS: () => METHODS,
   METHODS_EXL: () => METHODS_EXL,
   clone: () => clone,
-  deepClone: () => deepClone,
   deepMerge: () => deepMerge,
   flattenRecursive: () => flattenRecursive,
   mergeAndCloneIfArray: () => mergeAndCloneIfArray,
@@ -113,31 +112,6 @@ const clone = (obj, exclude = METHODS_EXL) => {
   }
   return o;
 };
-const deepClone = (obj, exclude = METHODS_EXL, seen = /* @__PURE__ */ new WeakMap()) => {
-  if (obj === null || typeof obj !== "object") {
-    return obj;
-  }
-  if (obj instanceof window.Node || obj === window || obj instanceof window.Document) {
-    return obj;
-  }
-  if (seen.has(obj)) {
-    return seen.get(obj);
-  }
-  const o = Array.isArray(obj) ? [] : {};
-  seen.set(obj, o);
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (exclude.includes(key))
-        continue;
-      let value = obj[key];
-      if (key === "extend" && Array.isArray(value)) {
-        value = mergeArray(value, exclude);
-      }
-      o[key] = deepClone(value, exclude, seen);
-    }
-  }
-  return o;
-};
 const overwrite = (element, params, options) => {
   const changes = {};
   const { __ref } = element;
@@ -184,10 +158,10 @@ const mergeIfExisted = (a, b) => {
   return a || b;
 };
 const mergeArray = (arr, exclude = ["parent", "node", "__element", "state", "context", "__ref"]) => {
-  return arr.reduce((a, c) => deepMerge(a, (0, import_utils.deepCloneWithExtend)(c, exclude)), {});
+  return arr.reduce((a, c) => deepMerge(a, (0, import_utils.deepClone)(c, { exclude })), {});
 };
 const mergeAndCloneIfArray = (obj) => {
-  return (0, import_utils.isArray)(obj) ? mergeArray(obj) : (0, import_utils.deepCloneWithExtend)(obj);
+  return (0, import_utils.isArray)(obj) ? mergeArray(obj) : (0, import_utils.deepClone)(obj);
 };
 const flattenRecursive = (param, prop, stack = []) => {
   const objectized = mergeAndCloneIfArray(param);

package/methods/index.js

@@ -2,7 +2,7 @@
 
 import { isDefined, isObject, isFunction, isObjectLike, isProduction, removeValueFromArray, deepClone } from '@domql/utils'
 import { TREE } from '../tree'
-import { parseFilters, REGISTRY, registry } from '../mixins'
+import { parseFilters, REGISTRY } from '../mixins'
 const ENV = process.env.NODE_ENV
 
 // TODO: update these files

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.160",
+  "version": "2.5.161",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -26,12 +26,12 @@
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
   "dependencies": {
-    "@domql/event": "^2.5.159",
-    "@domql/render": "^2.5.159",
-    "@domql/state": "^2.5.159",
-    "@domql/utils": "^2.5.159"
+    "@domql/event": "^2.5.161",
+    "@domql/render": "^2.5.161",
+    "@domql/state": "^2.5.161",
+    "@domql/utils": "^2.5.161"
   },
-  "gitHead": "ab896b123edd1ec6d30fd01d28bd1a0ef4db735c",
+  "gitHead": "39a7af3d77c6b0257d5e1a0d6110850926d83c19",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/props/create.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { exec, isArray, isObject, deepCloneWithExtend, deepMerge } from '@domql/utils'
+import { exec, isArray, isObject, deepClone, deepMerge } from '@domql/utils'
 import { IGNORE_PROPS_PARAMS } from './ignore'
 
 import { inheritParentProps } from './inherit'
@@ -39,7 +39,7 @@ export const syncProps = (props, element, opts) => {
     // it was causing infinite loop at early days
     element.props = deepMerge(
       mergedProps,
-      deepCloneWithExtend(execProps, IGNORE_PROPS_PARAMS),
+      deepClone(execProps, { ignore: IGNORE_PROPS_PARAMS }),
       IGNORE_PROPS_PARAMS
     )
   })

package/update.js

@@ -12,7 +12,8 @@ import {
   merge,
   isVariant,
   overwriteDeep,
-  createSnapshotId
+  createSnapshotId,
+  deepClone
 } from '@domql/utils'
 
 import { applyEvent, triggerEventOn, triggerEventOnUpdate } from '@domql/event'
@@ -25,7 +26,7 @@ import { throughExecProps, throughUpdatedDefine, throughUpdatedExec } from './it
 import { REGISTRY } from './mixins'
 import { applyParam } from './utils/applyParam'
 import { OPTIONS } from './cache/options'
-import { METHODS_EXL, deepClone, deepMerge } from './utils' // old utils (current)
+import { METHODS_EXL, deepMerge } from './utils' // old utils (current)
 
 const snapshot = {
   snapshotId: createSnapshotId
@@ -42,7 +43,7 @@ const UPDATE_DEFAULT_OPTIONS = {
 
 export const update = function (params = {}, opts) {
   const calleeElementCache = opts?.calleeElement
-  const options = deepClone(isObject(opts) ? deepMerge(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, ['calleeElement'])
+  const options = deepClone(isObject(opts) ? deepMerge(opts, UPDATE_DEFAULT_OPTIONS) : UPDATE_DEFAULT_OPTIONS, { exclude: ['calleeElement'] })
   options.calleeElement = calleeElementCache
   const element = this
   const { parent, node, key } = element

package/utils/extendUtils.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isArray, isFunction, isObject, isString, deepCloneWithExtend } from '@domql/utils'
+import { isArray, isFunction, isObject, isString, deepClone } from '@domql/utils'
 const ENV = process.env.NODE_ENV
 
 export const generateHash = () => Math.random().toString(36).substring(2)
@@ -71,7 +71,7 @@ export const deepMergeExtend = (element, extend) => {
 
 export const cloneAndMergeArrayExtend = stack => {
   return stack.reduce((a, c) => {
-    return deepMergeExtend(a, deepCloneWithExtend(c))
+    return deepMergeExtend(a, deepClone(c))
   }, {})
 }
 

package/utils/object.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isArray, isObject, isObjectLike, joinArrays, deepCloneWithExtend } from '@domql/utils'
+import { isArray, isObject, isObjectLike, joinArrays, deepClone } from '@domql/utils'
 import { IGNORE_PROPS_PARAMS } from '../props'
 
 // breaks server build
@@ -68,48 +68,6 @@ export const clone = (obj, exclude = METHODS_EXL) => {
   return o
 }
 
-/**
- * Deep cloning of object
- */
-export const deepClone = (obj, exclude = METHODS_EXL, seen = new WeakMap()) => {
-  // Check for null or undefined
-  if (obj === null || typeof obj !== 'object') {
-    return obj
-  }
-
-  // Check for DOM nodes, Window, or Document
-  if (obj instanceof window.Node || obj === window || obj instanceof window.Document) {
-    return obj
-  }
-
-  // Check for circular references
-  if (seen.has(obj)) {
-    return seen.get(obj)
-  }
-
-  // Create a new object or array
-  const o = Array.isArray(obj) ? [] : {}
-
-  // Store this object in our circular reference map
-  seen.set(obj, o)
-
-  for (const key in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, key)) {
-      if (exclude.includes(key)) continue
-
-      let value = obj[key]
-
-      if (key === 'extend' && Array.isArray(value)) {
-        value = mergeArray(value, exclude)
-      }
-
-      o[key] = deepClone(value, exclude, seen)
-    }
-  }
-
-  return o
-}
-
 // export const deepClone = (obj, exclude = METHODS_EXL) => {
 //   const o = isArray(obj) ? [] : {}
 //   for (const e in obj) {
@@ -187,14 +145,14 @@ export const mergeIfExisted = (a, b) => {
  * Merges array extends
  */
 export const mergeArray = (arr, exclude = ['parent', 'node', '__element', 'state', 'context', '__ref']) => {
-  return arr.reduce((a, c) => deepMerge(a, deepCloneWithExtend(c, exclude)), {})
+  return arr.reduce((a, c) => deepMerge(a, deepClone(c, { exclude })), {})
 }
 
 /**
  * Merges array extends
  */
 export const mergeAndCloneIfArray = obj => {
-  return isArray(obj) ? mergeArray(obj) : deepCloneWithExtend(obj)
+  return isArray(obj) ? mergeArray(obj) : deepClone(obj)
 }
 
 /**