domql 1.6.53 → 1.6.56

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
-  "version": "1.6.53",
+  "version": "1.6.56",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "module": "dist/esm/index.js",
-  "main": "dist/cjs/index.js",
   "exports": "./dist/cjs/index.js",
+  "main": "src/index.js",
   "source": "src/index.js",
   "files": [
     "dist",

package/src/element/extend.js

@@ -1,7 +1,13 @@
 'use strict'
 
 import { isFunction, exec, isString } from '@domql/utils'
-import { getExtendStack, jointStacks, cloneAndMergeArrayExtend, deepMergeExtend, replaceStringsWithComponents } from './utils'
+import {
+  getExtendStack,
+  jointStacks,
+  cloneAndMergeArrayExtend,
+  deepMergeExtend,
+  replaceStringsWithComponents
+} from './utils'
 
 const ENV = process.env.NODE_ENV
 

package/src/element/iterate.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { isObject, exec, isFunction, isNumber, isString } from '@domql/utils'
-import { METHODS_EXL, isVariant, overwrite } from './utils'
+import { METHODS_EXL, checkIfKeyIsComponent, extendizeByKey, isVariant, overwrite } from './utils'
 import { isMethod } from '@domql/methods'
 
 export const throughInitialExec = (element, exclude = {}) => {
@@ -12,6 +12,7 @@ export const throughInitialExec = (element, exclude = {}) => {
     if (isFunction(prop) && !isMethod(param) && !isVariant(param)) {
       ref.__exec[param] = prop
       element[param] = prop(element, element.state)
+      // if (isComponent)
     }
   }
 }
@@ -28,9 +29,14 @@ export const throughUpdatedExec = (element, options = { excludes: METHODS_EXL })
 
     const newExec = ref.__exec[param](element, element.state, element.context)
     const execReturnsString = isString(newExec) || isNumber(newExec)
-    if (prop && prop.node && execReturnsString) {
-      overwrite(prop, { text: newExec }, options)
-    } else if (newExec !== prop) {
+    if (prop && prop.node) {
+      if (execReturnsString) {
+        overwrite(prop, { text: newExec }, options)
+      } else if (checkIfKeyIsComponent(param)) {
+        const { extend, ...newElem } = extendizeByKey(newExec)
+        overwrite(prop, newElem, options)
+      }
+    } else if (!execReturnsString && newExec !== prop) {
       ref.__cached[param] = changes[param] = prop
       element[param] = newExec
     }