domql 1.5.45 → 1.5.47

package/package.json

@@ -3,7 +3,7 @@
   "description": "DOM rendering Javascript framework at early stage.",
   "private": false,
   "author": "symbo.ls",
-  "version": "1.5.45",
+  "version": "1.5.47",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/create.js

@@ -59,18 +59,22 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
 
   if (isKeyComponent(assignedKey)) {
     const hasComponentAttrs = extend || childExtend || props || state || element.on
+    const [ component, key ] = assignedKey.split('_')
     if (!hasComponentAttrs || childProps) {
       parent[assignedKey] = element = {
-        extend: assignedKey.split('_')[0],
+        extend: component,
         props: {
-          fromKey: assignedKey.split('_')[1],
+          fromKey: key,
           ...element
         }
       }
     } else if (!extend || extend === true) {
       parent[assignedKey] = element = {
         ...element,
-        extend: assignedKey
+        extend: component,
+        props: {
+          fromKey: key
+        }
       }
     }
   }

package/src/element/state.js

@@ -42,7 +42,8 @@ export const updateState = function (obj, options = {}) {
 
   // run `on.stateUpdated`
   if (element.on && isFunction(element.on.initStateUpdated)) {
-    on.initStateUpdated(element.on.initStateUpdated, element, state)
+    const initReturns = on.initStateUpdated(element.on.initStateUpdated, element, state, obj)
+    if (initReturns === false) return
   }
 
   overwriteDeep(state, obj, IGNORE_STATE_PARAMS)

package/src/element/update.js

@@ -56,6 +56,11 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
 
   if (!element.__ifFalsy && !options.preventPropsUpdate) updateProps(params.props, element, parent)
 
+  if (element.on && isFunction(element.on.initUpdate) && !options.ignoreInitUpdate) {
+    const whatinitreturns = on.initUpdate(element.on.initUpdate, element, element.state)
+    if (whatinitreturns === false) return
+  }
+
   const overwriteChanges = overwrite(element, params, UPDATE_DEFAULT_OPTIONS)
   const execChanges = throughUpdatedExec(element, UPDATE_DEFAULT_OPTIONS)
   const definedChanges = throughUpdatedDefine(element, options)
@@ -71,11 +76,6 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     return
   }
 
-  if (element.on && isFunction(element.on.initUpdate) && !options.ignoreInitUpdate) {
-    const whatinitreturns = on.initUpdate(element.on.initUpdate, element, element.state)
-    if (whatinitreturns === false) return
-  }
-
   for (const param in element) {
     const prop = element[param]
 

package/src/event/on.js

@@ -1,41 +1,41 @@
 'use strict'
 
 export const beforeClassAssign = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }
 
 export const init = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }
 
 export const render = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }
 
 export const initUpdate = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }
 
 export const attachNode = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }
 
 export const stateInit = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }
 
 export const stateCreated = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }
 
-export const initStateUpdated = (param, element, state) => {
-  param(element, state)
+export const initStateUpdated = (param, element, state, changes) => {
+  return param(element, state, changes)
 }
 
 export const stateUpdated = (param, element, state, changes) => {
-  param(element, state, changes)
+  return param(element, state, changes)
 }
 
 export const update = (param, element, state) => {
-  param(element, state)
+  return param(element, state)
 }

package/src/utils/object.js

@@ -122,7 +122,7 @@ export const clone = obj => {
 /**
  * Deep cloning of object
  */
-export const deepClone = (obj, excluding = ['parent', 'node', '__element', '__root']) => {
+export const deepClone = (obj, excluding = ['parent', 'node', '__element', '__root', 'context']) => {
   const o = {}
   for (const prop in obj) {
     if (excluding.indexOf(prop) > -1) continue