@domql/element 2.5.116 → 2.5.118

package/dist/cjs/extend.js

@@ -28,7 +28,8 @@ let mainExtend;
 const applyExtend = (element, parent, options = {}) => {
   if ((0, import_utils.isFunction)(element))
     element = (0, import_utils.exec)(element, parent);
-  let { extend, props, __ref } = element;
+  const { props, __ref } = element;
+  let extend = (props == null ? void 0 : props.extends) || element.extend;
   const context = element.context || parent.context;
   extend = (0, import_utils2.fallbackStringExtend)(extend, context, options);
   const extendStack = (0, import_utils2.getExtendStack)(extend, context);

package/dist/cjs/utils/component.js

@@ -33,20 +33,8 @@ __export(component_exports, {
 module.exports = __toCommonJS(component_exports);
 var import_utils = require("@domql/utils");
 var import_extend = require("../extend");
+var import_mixins = require("../mixins");
 const ENV = "development";
-const DOMQL_BUILTINS = [
-  "extend",
-  "childExtend",
-  "childExtendRecursive",
-  "define",
-  "props",
-  "state",
-  "on",
-  "if",
-  "attr",
-  "key",
-  "tag"
-];
 const checkIfKeyIsComponent = (key) => {
   const isFirstKeyString = (0, import_utils.isString)(key);
   if (!isFirstKeyString)
@@ -77,17 +65,16 @@ const createValidDomqlObjectFromSugar = (el, parent, key, options) => {
   for (const k in el) {
     const prop = el[k];
     const isEvent = k.startsWith("on");
-    const isMethod = k.startsWith("$");
     if (isEvent) {
       const onKey = replaceOnKeys(prop);
       newElem.on[onKey] = prop;
-    } else if (!isMethod && checkIfKeyIsProperty(k)) {
-      if (!DOMQL_BUILTINS.includes(k))
-        newElem.props[k] = prop;
-    } else if (checkIfKeyIsComponent(k)) {
+    }
+    const isComponent = checkIfKeyIsComponent(k);
+    const isRegistry = import_mixins.registry[k];
+    if (isComponent || isRegistry) {
       newElem[k] = prop;
     } else {
-      newElem[k] = prop;
+      newElem.props[k] = prop;
     }
   }
   return newElem;

package/dist/cjs/utils/object.js

@@ -64,19 +64,28 @@ const clone = (obj, exclude = METHODS_EXL) => {
   }
   return o;
 };
-const deepClone = (obj, exclude = METHODS_EXL) => {
-  const o = (0, import_utils.isArray)(obj) ? [] : {};
-  for (const e in obj) {
-    if (exclude.includes(e))
-      continue;
-    let objProp = obj[e];
-    if (e === "extend" && (0, import_utils.isArray)(objProp)) {
-      objProp = mergeArray(objProp, exclude);
+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);
     }
-    if ((0, import_utils.isObjectLike)(objProp)) {
-      o[e] = deepClone(objProp, exclude);
-    } else
-      o[e] = objProp;
   }
   return o;
 };

package/extend.js

@@ -20,7 +20,8 @@ let mainExtend
 export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
-  let { extend, props, __ref } = element
+  const { props, __ref } = element
+  let extend = props?.extends || element.extend
   const context = element.context || parent.context
 
   extend = fallbackStringExtend(extend, context, options)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/element",
-  "version": "2.5.116",
+  "version": "2.5.118",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -31,7 +31,7 @@
     "@domql/state": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "cff7d465161d804f31e3b350081bb751da209eeb",
+  "gitHead": "984906ba70b23710f6f1a1895b41b4e8710e4c3d",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }

package/utils/component.js

@@ -2,22 +2,9 @@
 
 import { exec, isArray, isFunction, isObject, isString, joinArrays, overwriteDeep } from '@domql/utils'
 import { applyExtend } from '../extend'
+import { registry } from '../mixins'
 const ENV = process.env.NODE_ENV
 
-const DOMQL_BUILTINS = [
-  'extend',
-  'childExtend',
-  'childExtendRecursive',
-  'define',
-  'props',
-  'state',
-  'on',
-  'if',
-  'attr',
-  'key',
-  'tag'
-]
-
 export const checkIfKeyIsComponent = (key) => {
   const isFirstKeyString = isString(key)
   if (!isFirstKeyString) return
@@ -50,16 +37,18 @@ export const createValidDomqlObjectFromSugar = (el, parent, key, options) => {
   for (const k in el) {
     const prop = el[k]
     const isEvent = k.startsWith('on')
-    const isMethod = k.startsWith('$')
     if (isEvent) {
       const onKey = replaceOnKeys(prop)
       newElem.on[onKey] = prop
-    } else if (!isMethod && checkIfKeyIsProperty(k)) {
-      if (!DOMQL_BUILTINS.includes(k)) newElem.props[k] = prop
-    } else if (checkIfKeyIsComponent(k)) {
+    // } else if (!isMethod && checkIfKeyIsProperty(k)) {
+    }
+
+    const isComponent = checkIfKeyIsComponent(k)
+    const isRegistry = registry[k]
+    if (isComponent || isRegistry) {
       newElem[k] = prop
     } else {
-      newElem[k] = prop
+      newElem.props[k] = prop
     }
   }
   return newElem

package/utils/object.js

@@ -38,21 +38,60 @@ export const clone = (obj, exclude = METHODS_EXL) => {
 /**
  * Deep cloning of object
  */
-export const deepClone = (obj, exclude = METHODS_EXL) => {
-  const o = isArray(obj) ? [] : {}
-  for (const e in obj) {
-    if (exclude.includes(e)) continue
-    let objProp = obj[e]
-    if (e === 'extend' && isArray(objProp)) {
-      objProp = mergeArray(objProp, exclude)
+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)
     }
-    if (isObjectLike(objProp)) {
-      o[e] = deepClone(objProp, exclude)
-    } else o[e] = objProp
   }
+
   return o
 }
 
+// export const deepClone = (obj, exclude = METHODS_EXL) => {
+//   const o = isArray(obj) ? [] : {}
+//   for (const e in obj) {
+//     if (exclude.includes(e)) continue
+//     let objProp = obj[e]
+//     if (e === 'extend' && isArray(objProp)) {
+//       objProp = mergeArray(objProp, exclude)
+//     }
+//     if (isObjectLike(objProp)) {
+//       o[e] = deepClone(objProp, exclude)
+//     } else o[e] = objProp
+//   }
+//   return o
+// }
+
 /**
  * Overwrites object properties with another
  */