@domql/utils 2.5.138 → 2.5.140

package/component.js

@@ -6,6 +6,7 @@ import {
   isArray,
   isFunction,
   isObject,
+  isObjectLike,
   isString,
   joinArrays,
   overwriteDeep
@@ -60,12 +61,13 @@ export const extendizeByKey = (element, parent, key) => {
 
   if (element === isExtendKeyComponent) return element
   else if (isSugar) {
-    return {
+    const newElem = {
       extend: extendFromKey,
-      childExtend: childrenExtends,
       tag,
       props: { ...element }
     }
+    if (childrenExtends) newElem.childExtend = childrenExtends
+    return newElem
   } else if (!extend || extend === true) {
     return {
       ...element,
@@ -95,11 +97,20 @@ export const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i]
     const childElem = element[childKey]
     const newChild = element.props[childKey]
-    if (newChild.ignoreExtend) continue
+    if (newChild?.ignoreExtend) continue
     if (!childElem) element[childKey] = deepCloneWithExtend(newChild)
     else {
       const isSugar = checkIfSugar(childElem)
-      if (!isSugar) overwriteDeep(element[childKey].props, newChild)
+      if (!isSugar) continue
+      const inheritedChildElem = element[childKey].props
+      if (isObjectLike(newChild)) {
+        overwriteDeep(inheritedChildElem, newChild)
+      } else if (isFunction(newChild)) {
+        element[childKey] = {
+          extend: element[childKey],
+          props: newChild
+        }
+      }
     }
   }
 }
@@ -194,3 +205,13 @@ export const getExtendsInElement = (obj) => {
   traverse(obj)
   return result
 }
+
+export const setContentKey = (el, opts = {}) => {
+  const { __ref: ref } = el
+  const contentElementKey = opts.contentElementKey
+  if ((contentElementKey !== 'content' && contentElementKey !== ref.contentElementKey) || !ref.contentElementKey) {
+    ref.contentElementKey = contentElementKey || 'content'
+  } else ref.contentElementKey = 'content'
+  if (contentElementKey !== 'content') opts.contentElementKey = 'content'
+  return ref.contentElementKey
+}

package/dist/cjs/component.js

@@ -28,7 +28,8 @@ __export(component_exports, {
   getChildrenComponentsByKey: () => getChildrenComponentsByKey,
   getExtendsInElement: () => getExtendsInElement,
   hasVariantProp: () => hasVariantProp,
-  isVariant: () => isVariant
+  isVariant: () => isVariant,
+  setContentKey: () => setContentKey
 });
 module.exports = __toCommonJS(component_exports);
 var import__ = require(".");
@@ -68,12 +69,14 @@ const extendizeByKey = (element, parent, key) => {
   if (element === isExtendKeyComponent)
     return element;
   else if (isSugar) {
-    return {
+    const newElem = {
       extend: extendFromKey,
-      childExtend: childrenExtends,
       tag,
       props: { ...element }
     };
+    if (childrenExtends)
+      newElem.childExtend = childrenExtends;
+    return newElem;
   } else if (!extend || extend === true) {
     return {
       ...element,
@@ -101,14 +104,23 @@ const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i];
     const childElem = element[childKey];
     const newChild = element.props[childKey];
-    if (newChild.ignoreExtend)
+    if (newChild == null ? void 0 : newChild.ignoreExtend)
       continue;
     if (!childElem)
       element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
     else {
       const isSugar = checkIfSugar(childElem);
       if (!isSugar)
-        (0, import__.overwriteDeep)(element[childKey].props, newChild);
+        continue;
+      const inheritedChildElem = element[childKey].props;
+      if ((0, import__.isObjectLike)(newChild)) {
+        (0, import__.overwriteDeep)(inheritedChildElem, newChild);
+      } else if ((0, import__.isFunction)(newChild)) {
+        element[childKey] = {
+          extend: element[childKey],
+          props: newChild
+        };
+      }
     }
   }
 };
@@ -187,3 +199,14 @@ const getExtendsInElement = (obj) => {
   traverse(obj);
   return result;
 };
+const setContentKey = (el, opts = {}) => {
+  const { __ref: ref } = el;
+  const contentElementKey = opts.contentElementKey;
+  if (contentElementKey !== "content" && contentElementKey !== ref.contentElementKey || !ref.contentElementKey) {
+    ref.contentElementKey = contentElementKey || "content";
+  } else
+    ref.contentElementKey = "content";
+  if (contentElementKey !== "content")
+    opts.contentElementKey = "content";
+  return ref.contentElementKey;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.138",
+  "version": "2.5.140",
   "license": "MIT",
   "type": "module",
   "module": "index.js",
@@ -25,7 +25,7 @@
     "build": "yarn build:cjs",
     "prepublish": "rimraf -I dist && yarn build && yarn copy:package:cjs"
   },
-  "gitHead": "91afb60b8354f1a95c3364be94ba74612f907918",
+  "gitHead": "2fc2e5d07523014581b0747b4201cc6afea32860",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }