@domql/utils 2.5.151 → 2.5.153

package/component.js

@@ -6,10 +6,8 @@ import {
   isArray,
   isFunction,
   isObject,
-  isObjectLike,
   isString,
-  joinArrays,
-  overwriteDeep
+  joinArrays
 } from '.'
 const ENV = process.env.NODE_ENV
 
@@ -36,13 +34,13 @@ export const addAdditionalExtend = (newExtend, element) => {
   return { ...element, extend }
 }
 
-const checkIfSugar = (element, parent, key) => {
+export const checkIfSugar = (element, parent, key) => {
   const {
     extend,
     props,
     childExtend,
     extends: extendProps,
-    childrenExtends,
+    childExtends,
     childProps,
     children,
     on,
@@ -51,15 +49,16 @@ const checkIfSugar = (element, parent, key) => {
     $propsCollection
   } = element
   const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection
-  if (hasComponentAttrs && (childProps || extendProps || children || childrenExtends)) {
-    parent.error('Sugar component includes params for builtin components', { verbose: true })
+  if (hasComponentAttrs && (childProps || extendProps || children || childExtends)) {
+    const logErr = (parent || element)?.error
+    if (logErr) logErr('Sugar component includes params for builtin components', { verbose: true })
   }
-  return !hasComponentAttrs || childProps || extendProps || children || childrenExtends
+  return !hasComponentAttrs || childProps || extendProps || children || childExtends
 }
 
 export const extendizeByKey = (element, parent, key) => {
   const { context } = parent
-  const { tag, extend, childrenExtends } = element
+  const { tag, extend, childExtends } = element
   const isSugar = checkIfSugar(element, parent, key)
 
   const extendFromKey = key.includes('+')
@@ -78,7 +77,7 @@ export const extendizeByKey = (element, parent, key) => {
       tag,
       props: { ...element }
     })
-    if (childrenExtends) newElem.childExtend = childrenExtends
+    if (childExtends) newElem.childExtend = childExtends
     return newElem
   } else if (!extend || extend === true) {
     return {
@@ -97,7 +96,7 @@ export const extendizeByKey = (element, parent, key) => {
   }
 }
 
-function getCapitalCaseKeys (obj) {
+export function getCapitalCaseKeys (obj) {
   return Object.keys(obj).filter(key => /^[A-Z]/.test(key))
 }
 
@@ -109,20 +108,22 @@ export const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i]
     const childElem = element[childKey]
     const newChild = element.props[childKey]
+
+    const assignChild = (val) => {
+      element[childKey] = val
+      delete element.props[childKey]
+    }
+
     if (newChild?.ignoreExtend) continue
-    if (!childElem) element[childKey] = deepCloneWithExtend(newChild)
+    if (newChild === null) assignChild(null)
+    else if (!childElem) assignChild(deepCloneWithExtend(newChild))
     else {
-      const isSugar = checkIfSugar(childElem, parent, key)
-      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
-        }
-      }
+      const isSugarChildElem = checkIfSugar(childElem, parent, key)
+      if (isSugarChildElem) continue
+      assignChild({
+        extend: element[childKey],
+        props: newChild
+      })
     }
   }
 }

package/dist/cjs/component.js

@@ -24,7 +24,9 @@ __export(component_exports, {
   applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
   checkIfKeyIsComponent: () => checkIfKeyIsComponent,
   checkIfKeyIsProperty: () => checkIfKeyIsProperty,
+  checkIfSugar: () => checkIfSugar,
   extendizeByKey: () => extendizeByKey,
+  getCapitalCaseKeys: () => getCapitalCaseKeys,
   getChildrenComponentsByKey: () => getChildrenComponentsByKey,
   getExtendsInElement: () => getExtendsInElement,
   hasVariantProp: () => hasVariantProp,
@@ -58,12 +60,13 @@ const addAdditionalExtend = (newExtend, element) => {
   return { ...element, extend };
 };
 const checkIfSugar = (element, parent, key) => {
+  var _a;
   const {
     extend,
     props,
     childExtend,
     extends: extendProps,
-    childrenExtends,
+    childExtends,
     childProps,
     children,
     on,
@@ -72,14 +75,16 @@ const checkIfSugar = (element, parent, key) => {
     $propsCollection
   } = element;
   const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
-  if (hasComponentAttrs && (childProps || extendProps || children || childrenExtends)) {
-    parent.error("Sugar component includes params for builtin components", { verbose: true });
+  if (hasComponentAttrs && (childProps || extendProps || children || childExtends)) {
+    const logErr = (_a = parent || element) == null ? void 0 : _a.error;
+    if (logErr)
+      logErr("Sugar component includes params for builtin components", { verbose: true });
   }
-  return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+  return !hasComponentAttrs || childProps || extendProps || children || childExtends;
 };
 const extendizeByKey = (element, parent, key) => {
   const { context } = parent;
-  const { tag, extend, childrenExtends } = element;
+  const { tag, extend, childExtends } = element;
   const isSugar = checkIfSugar(element, parent, key);
   const extendFromKey = key.includes("+") ? key.split("+") : key.includes("_") ? [key.split("_")[0]] : key.includes(".") && !checkIfKeyIsComponent(key.split(".")[1]) ? [key.split(".")[0]] : [key];
   const isExtendKeyComponent = context && context.components[extendFromKey];
@@ -91,8 +96,8 @@ const extendizeByKey = (element, parent, key) => {
       tag,
       props: { ...element }
     });
-    if (childrenExtends)
-      newElem.childExtend = childrenExtends;
+    if (childExtends)
+      newElem.childExtend = childExtends;
     return newElem;
   } else if (!extend || extend === true) {
     return {
@@ -121,23 +126,24 @@ const addChildrenIfNotInOriginal = (element, parent, key) => {
     const childKey = childElems[i];
     const childElem = element[childKey];
     const newChild = element.props[childKey];
+    const assignChild = (val) => {
+      element[childKey] = val;
+      delete element.props[childKey];
+    };
     if (newChild == null ? void 0 : newChild.ignoreExtend)
       continue;
-    if (!childElem)
-      element[childKey] = (0, import__.deepCloneWithExtend)(newChild);
+    if (newChild === null)
+      assignChild(null);
+    else if (!childElem)
+      assignChild((0, import__.deepCloneWithExtend)(newChild));
     else {
-      const isSugar = checkIfSugar(childElem, parent, key);
-      if (!isSugar)
+      const isSugarChildElem = checkIfSugar(childElem, parent, key);
+      if (isSugarChildElem)
         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
-        };
-      }
+      assignChild({
+        extend: element[childKey],
+        props: newChild
+      });
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.151",
+  "version": "2.5.153",
   "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": "f37b51f84b8bca80b8bce7887e83d61ac25eb3d5",
+  "gitHead": "ebf5debf658fdae4ec5a99b541b2518c7767e6a8",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }