@domql/utils 3.0.0 → 3.0.6

package/dist/cjs/element.js

@@ -86,7 +86,7 @@ const createRoot = (element, parent) => {
   const { __ref: parentRef } = parent;
   const hasRoot = parent && parent.key === ":root";
   if (!(ref == null ? void 0 : ref.root)) {
-    return hasRoot ? element : parentRef == null ? void 0 : parentRef.root;
+    ref.root = hasRoot ? element : parentRef == null ? void 0 : parentRef.root;
   }
 };
 const createPath = (element, parent, key) => {
@@ -113,7 +113,6 @@ const addCaching = (element, parent, key) => {
   if (!ref.__children) ref.__children = [];
   ref.__extends = (0, import_extends.createExtends)(element, parent, key);
   ref.path = createPath(element, parent, key);
-  ref.root = createRoot(element, parent);
   return ref;
 };
 const createElement = (passedProps, parentEl, passedKey, opts, root) => {

package/dist/cjs/extends.js

@@ -161,7 +161,7 @@ const flattenExtend = (extend, stack, context, processed = /* @__PURE__ */ new S
   processed.add(extend);
   if (extend == null ? void 0 : extend.extends) {
     deepExtend(extend, stack, context, processed);
-  } else {
+  } else if (extend) {
     stack.push(extend);
   }
   return stack;
@@ -169,21 +169,28 @@ const flattenExtend = (extend, stack, context, processed = /* @__PURE__ */ new S
 const deepMergeExtends = (element, extend) => {
   extend = (0, import_object.deepClone)(extend);
   for (const e in extend) {
-    if (["parent", "node", "__ref"].indexOf(e) > -1) continue;
-    if (e === "__proto__") continue;
+    if (["parent", "node", "__ref", "__proto__"].indexOf(e) > -1) continue;
     const elementProp = element[e];
     const extendProp = extend[e];
     if (extendProp === void 0) continue;
     if (Object.prototype.hasOwnProperty.call(extend, e) && !["__proto__", "constructor", "prototype"].includes(e)) {
       if (elementProp === void 0) {
-        element[e] = (0, import_types.isObject)(extendProp) ? (0, import_object.deepClone)(extendProp) : extendProp;
+        element[e] = extendProp;
       } else if ((0, import_types.isObject)(elementProp) && (0, import_types.isObject)(extendProp)) {
         if ((0, import_component.matchesComponentNaming)(e)) {
-          element[e] = deepMergeExtends(elementProp, (0, import_object.deepClone)(extendProp));
+          element[e] = deepMergeExtends(elementProp, extendProp);
         } else {
           deepMergeExtends(elementProp, extendProp);
         }
       }
+      if (e === "extends" || e === "childExtends" || e === "childExtendsRecursive") {
+        if ((0, import_types.isArray)(elementProp) && (0, import_types.isArray)(extendProp)) {
+          element[e] = elementProp.concat(extendProp);
+        } else if ((0, import_types.isArray)(elementProp) && (0, import_types.isObject)(extendProp)) {
+          const obj = deepMergeExtends({}, elementProp);
+          element[e] = deepMergeExtends(obj, extendProp);
+        }
+      }
     }
   }
   return element;

package/dist/cjs/keys.js

@@ -30,12 +30,12 @@ __export(keys_exports, {
 module.exports = __toCommonJS(keys_exports);
 const DOMQ_PROPERTIES = [
   "attr",
-  "style",
+  "styles",
   "text",
   "html",
   "content",
   "data",
-  "class",
+  "classlist",
   "state",
   "scope",
   "deps",

package/dist/esm/element.js

@@ -74,7 +74,7 @@ const createRoot = (element, parent) => {
   const { __ref: parentRef } = parent;
   const hasRoot = parent && parent.key === ":root";
   if (!(ref == null ? void 0 : ref.root)) {
-    return hasRoot ? element : parentRef == null ? void 0 : parentRef.root;
+    ref.root = hasRoot ? element : parentRef == null ? void 0 : parentRef.root;
   }
 };
 const createPath = (element, parent, key) => {
@@ -101,7 +101,6 @@ const addCaching = (element, parent, key) => {
   if (!ref.__children) ref.__children = [];
   ref.__extends = createExtends(element, parent, key);
   ref.path = createPath(element, parent, key);
-  ref.root = createRoot(element, parent);
   return ref;
 };
 const createElement = (passedProps, parentEl, passedKey, opts, root) => {

package/dist/esm/extends.js

@@ -20,7 +20,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { joinArrays, removeDuplicatesInArray } from "./array.js";
 import { matchesComponentNaming } from "./component.js";
 import { deepClone, exec } from "./object.js";
-import { isArray, isFunction, isObject, isString } from "./types.js";
+import { isArray, isObject, isString } from "./types.js";
 const ENV = "development";
 const createExtendsFromKeys = (key) => {
   if (key.includes("+")) {
@@ -130,7 +130,7 @@ const flattenExtend = (extend, stack, context, processed = /* @__PURE__ */ new S
   processed.add(extend);
   if (extend == null ? void 0 : extend.extends) {
     deepExtend(extend, stack, context, processed);
-  } else {
+  } else if (extend) {
     stack.push(extend);
   }
   return stack;
@@ -138,21 +138,28 @@ const flattenExtend = (extend, stack, context, processed = /* @__PURE__ */ new S
 const deepMergeExtends = (element, extend) => {
   extend = deepClone(extend);
   for (const e in extend) {
-    if (["parent", "node", "__ref"].indexOf(e) > -1) continue;
-    if (e === "__proto__") continue;
+    if (["parent", "node", "__ref", "__proto__"].indexOf(e) > -1) continue;
     const elementProp = element[e];
     const extendProp = extend[e];
     if (extendProp === void 0) continue;
     if (Object.prototype.hasOwnProperty.call(extend, e) && !["__proto__", "constructor", "prototype"].includes(e)) {
       if (elementProp === void 0) {
-        element[e] = isObject(extendProp) ? deepClone(extendProp) : extendProp;
+        element[e] = extendProp;
       } else if (isObject(elementProp) && isObject(extendProp)) {
         if (matchesComponentNaming(e)) {
-          element[e] = deepMergeExtends(elementProp, deepClone(extendProp));
+          element[e] = deepMergeExtends(elementProp, extendProp);
         } else {
           deepMergeExtends(elementProp, extendProp);
         }
       }
+      if (e === "extends" || e === "childExtends" || e === "childExtendsRecursive") {
+        if (isArray(elementProp) && isArray(extendProp)) {
+          element[e] = elementProp.concat(extendProp);
+        } else if (isArray(elementProp) && isObject(extendProp)) {
+          const obj = deepMergeExtends({}, elementProp);
+          element[e] = deepMergeExtends(obj, extendProp);
+        }
+      }
     }
   }
   return element;

package/dist/esm/keys.js

@@ -1,11 +1,11 @@
 const DOMQ_PROPERTIES = [
   "attr",
-  "style",
+  "styles",
   "text",
   "html",
   "content",
   "data",
-  "class",
+  "classlist",
   "state",
   "scope",
   "deps",

package/element.js

@@ -69,7 +69,7 @@ export const createRoot = (element, parent) => {
 
   const hasRoot = parent && parent.key === ':root'
   if (!ref?.root) {
-    return hasRoot ? element : parentRef?.root
+    ref.root = hasRoot ? element : parentRef?.root
   }
 }
 
@@ -117,7 +117,6 @@ export const addCaching = (element, parent, key) => {
 
   ref.__extends = createExtends(element, parent, key)
   ref.path = createPath(element, parent, key)
-  ref.root = createRoot(element, parent) // Call createRoot after addCaching
 
   return ref
 }

package/extends.js

@@ -3,7 +3,7 @@
 import { joinArrays, removeDuplicatesInArray } from './array.js'
 import { matchesComponentNaming } from './component.js'
 import { deepClone, exec } from './object.js'
-import { isArray, isFunction, isObject, isString } from './types.js'
+import { isArray, isObject, isString } from './types.js'
 const ENV = process.env.NODE_ENV
 
 export const createExtendsFromKeys = key => {
@@ -159,7 +159,7 @@ export const flattenExtend = (
 
   if (extend?.extends) {
     deepExtend(extend, stack, context, processed)
-  } else {
+  } else if (extend) {
     stack.push(extend)
   }
 
@@ -171,8 +171,7 @@ export const deepMergeExtends = (element, extend) => {
   extend = deepClone(extend)
 
   for (const e in extend) {
-    if (['parent', 'node', '__ref'].indexOf(e) > -1) continue
-    if (e === '__proto__') continue
+    if (['parent', 'node', '__ref', '__proto__'].indexOf(e) > -1) continue
 
     const elementProp = element[e]
     const extendProp = extend[e]
@@ -187,21 +186,35 @@ export const deepMergeExtends = (element, extend) => {
     ) {
       if (elementProp === undefined) {
         // For undefined properties in element, copy from extend
-        element[e] = isObject(extendProp) ? deepClone(extendProp) : extendProp
+        element[e] = extendProp
       } else if (isObject(elementProp) && isObject(extendProp)) {
         // For objects, merge based on type
         if (matchesComponentNaming(e)) {
           // For components, override base properties with extended ones
-          element[e] = deepMergeExtends(elementProp, deepClone(extendProp))
+          element[e] = deepMergeExtends(elementProp, extendProp)
         } else {
           // For other objects, merge normally
           deepMergeExtends(elementProp, extendProp)
         }
       }
+
+      if (
+        e === 'extends' ||
+        e === 'childExtends' ||
+        e === 'childExtendsRecursive'
+      ) {
+        if (isArray(elementProp) && isArray(extendProp)) {
+          element[e] = elementProp.concat(extendProp)
+        } else if (isArray(elementProp) && isObject(extendProp)) {
+          const obj = deepMergeExtends({}, elementProp)
+          element[e] = deepMergeExtends(obj, extendProp)
+        }
+      }
       // If elementProp is defined and not an object, keep it (don't override)
       // This preserves properties from earlier in the extend chain
     }
   }
+
   return element
 }
 

package/keys.js

@@ -2,12 +2,12 @@
 
 export const DOMQ_PROPERTIES = [
   'attr',
-  'style',
+  'styles',
   'text',
   'html',
   'content',
   'data',
-  'class',
+  'classlist',
   'state',
   'scope',
   'deps',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "3.0.0",
+  "version": "3.0.6",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -24,7 +24,7 @@
     "build": "rimraf -I dist; npm run build:cjs; npm run build:esm",
     "prepublish": "npm run build; npm run copy:package:cjs"
   },
-  "gitHead": "bcbdc271a602b958de6a60ab387ea7715a935dc1",
+  "gitHead": "ef6f7abdb0a8cdaa28559e377bc10a12e76ef8f0",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }