@domql/utils 2.5.134 → 2.5.138

package/component.js

@@ -1,6 +1,15 @@
 'use strict'
 
-import { exec, isArray, isFunction, isObject, isString, joinArrays } from '.'
+import {
+  deepCloneWithExtend,
+  exec,
+  isArray,
+  isFunction,
+  isObject,
+  isString,
+  joinArrays,
+  overwriteDeep
+} from '.'
 const ENV = process.env.NODE_ENV
 
 export const checkIfKeyIsComponent = (key) => {
@@ -25,10 +34,16 @@ export const addAdditionalExtend = (newExtend, element) => {
   return { ...element, extend }
 }
 
+const checkIfSugar = (element, parent, key) => {
+  const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element
+  const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection
+  return !hasComponentAttrs || childProps || extendProps || children || childrenExtends
+}
+
 export const extendizeByKey = (element, parent, key) => {
   const { context } = parent
-  const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element
-  const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data
+  const { tag, extend, childrenExtends } = element
+  const isSugar = checkIfSugar(element)
 
   const extendFromKey = key.includes('+')
     ? key.split('+') // get array of componentKeys
@@ -44,9 +59,10 @@ export const extendizeByKey = (element, parent, key) => {
   const isExtendKeyComponent = context && context.components[extendFromKey]
 
   if (element === isExtendKeyComponent) return element
-  else if (!hasComponentAttrs || childProps) {
+  else if (isSugar) {
     return {
       extend: extendFromKey,
+      childExtend: childrenExtends,
       tag,
       props: { ...element }
     }
@@ -67,6 +83,27 @@ export const extendizeByKey = (element, parent, key) => {
   }
 }
 
+function getCapitalCaseKeys (obj) {
+  return Object.keys(obj).filter(key => /^[A-Z]/.test(key))
+}
+
+export const addChildrenIfNotInOriginal = (element, parent, key) => {
+  const childElems = getCapitalCaseKeys(element.props)
+  if (!childElems.length) return element
+
+  for (const i in childElems) {
+    const childKey = childElems[i]
+    const childElem = element[childKey]
+    const newChild = element.props[childKey]
+    if (newChild.ignoreExtend) continue
+    if (!childElem) element[childKey] = deepCloneWithExtend(newChild)
+    else {
+      const isSugar = checkIfSugar(childElem)
+      if (!isSugar) overwriteDeep(element[childKey].props, newChild)
+    }
+  }
+}
+
 export const applyKeyComponentAsExtend = (element, parent, key) => {
   return extendizeByKey(element, parent, key) || element
 }

package/dist/cjs/component.js

@@ -19,6 +19,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var component_exports = {};
 __export(component_exports, {
   addAdditionalExtend: () => addAdditionalExtend,
+  addChildrenIfNotInOriginal: () => addChildrenIfNotInOriginal,
   applyComponentFromContext: () => applyComponentFromContext,
   applyKeyComponentAsExtend: () => applyKeyComponentAsExtend,
   checkIfKeyIsComponent: () => checkIfKeyIsComponent,
@@ -53,17 +54,23 @@ const addAdditionalExtend = (newExtend, element) => {
   const extend = (0, import__.joinArrays)(receivedArray, originalArray);
   return { ...element, extend };
 };
+const checkIfSugar = (element, parent, key) => {
+  const { extend, props, childExtend, extends: extendProps, childrenExtends, childProps, children, on, $collection, $stateCollection, $propsCollection } = element;
+  const hasComponentAttrs = extend || childExtend || props || on || $collection || $stateCollection || $propsCollection;
+  return !hasComponentAttrs || childProps || extendProps || children || childrenExtends;
+};
 const extendizeByKey = (element, parent, key) => {
   const { context } = parent;
-  const { tag, extend, props, attr, state, childExtend, childProps, on, if: condition, data } = element;
-  const hasComponentAttrs = extend || childExtend || props || state || on || condition || attr || data;
+  const { tag, extend, childrenExtends } = element;
+  const isSugar = checkIfSugar(element);
   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];
   if (element === isExtendKeyComponent)
     return element;
-  else if (!hasComponentAttrs || childProps) {
+  else if (isSugar) {
     return {
       extend: extendFromKey,
+      childExtend: childrenExtends,
       tag,
       props: { ...element }
     };
@@ -83,6 +90,28 @@ const extendizeByKey = (element, parent, key) => {
     };
   }
 };
+function getCapitalCaseKeys(obj) {
+  return Object.keys(obj).filter((key) => /^[A-Z]/.test(key));
+}
+const addChildrenIfNotInOriginal = (element, parent, key) => {
+  const childElems = getCapitalCaseKeys(element.props);
+  if (!childElems.length)
+    return element;
+  for (const i in childElems) {
+    const childKey = childElems[i];
+    const childElem = element[childKey];
+    const newChild = element.props[childKey];
+    if (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);
+    }
+  }
+};
 const applyKeyComponentAsExtend = (element, parent, key) => {
   return extendizeByKey(element, parent, key) || element;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/utils",
-  "version": "2.5.134",
+  "version": "2.5.138",
   "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": "20e65426dc742448bd6dc85211dea3a48ed74ae0",
+  "gitHead": "91afb60b8354f1a95c3364be94ba74612f907918",
   "devDependencies": {
     "@babel/core": "^7.12.0"
   }