domql 1.5.92 → 1.5.94

package/package.json

@@ -2,7 +2,7 @@
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
   "author": "symbo.ls",
-  "version": "1.5.92",
+  "version": "1.5.94",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/iterate.js

@@ -56,7 +56,7 @@ export const throughInitialDefine = (element) => {
 
   let obj = {}
   if (isObject(define)) obj = { ...define }
-  if (isObject(context.define)) obj = { ...obj, ...context.define }
+  if (context && isObject(context.define)) obj = { ...obj, ...context.define }
 
   for (const param in obj) {
     let prop = element[param]

package/src/element/node.js

@@ -75,11 +75,11 @@ export const createNode = (element, options) => {
       if (isMethod(param) || isObject(registry[param]) || prop === undefined) continue
 
       const DOMQLProperty = registry[param]
-      const DOMQLPropertyFromContext = context.registry && context.registry[param]
+      const DOMQLPropertyFromContext = context && context.registry && context.registry[param]
       const isGlobalTransformer = DOMQLPropertyFromContext || DOMQLProperty
 
       const hasDefine = element.define && element.define[param]
-      const hasContextDefine = context.define && context.define[param]
+      const hasContextDefine = context && context.define && context.define[param]
 
       // Check if param is in our method registry
       if (isGlobalTransformer && !hasContextDefine) {

package/src/element/props.js

@@ -60,7 +60,9 @@ export const syncProps = (props, element) => {
   const mergedProps = { update, __element: element }
   props.forEach(v => {
     if (v === 'update' || v === '__element') return
-    element.props = deepMerge(mergedProps, deepClone(exec(v, element)))
+    const execProps = exec(v, element)
+    if (isObject(execProps) && execProps.__element) return
+    element.props = deepMerge(mergedProps, deepClone(execProps))
   })
   element.props = mergedProps
   return element.props

package/src/element/state.js

@@ -127,15 +127,20 @@ export const createState = function (element, parent, opts) {
   let stateKey = element.__state
   if (stateKey) {
     let parentState = parent.state
-    let parentStateKey
-    const parents = stateKey.split('../')
-    for (let i = 1; i < parents.length; i++) {
-      stateKey = parents[i]
+    const parentKeysArr = stateKey.split('../')
+    for (let i = 1; i < parentKeysArr.length; i++) {
+      stateKey = parentKeysArr[i]
       parentState = parentState.parent
     }
-    if (stateKey.includes('.')) {
-      [parentStateKey, stateKey] = stateKey.split('.')
-      parentState = parentState[parentStateKey]
+    const childrenKeysArr = stateKey.split('.')
+    for (let i = 0; i < childrenKeysArr.length; i++) {
+      const childKey = childrenKeysArr[i]
+      const grandChildKey = childrenKeysArr[i + 1]
+      const childInParent = parentState[childKey]
+      if (childInParent && childInParent[grandChildKey]) {
+        stateKey = grandChildKey
+        parentState = childInParent
+      }
     }
     if (parentState && parentState[stateKey]) {
       const keyInParentState = parentState[stateKey]

package/src/element/update.js

@@ -114,11 +114,11 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     if (options.preventStateUpdate === 'once') options.preventStateUpdate = false
 
     const DOMQLProperty = registry[param]
-    const DOMQLPropertyFromContext = context.registry && context.registry[param]
+    const DOMQLPropertyFromContext = context && context.registry && context.registry[param]
     const isGlobalTransformer = DOMQLPropertyFromContext || DOMQLProperty
 
     const hasDefine = element.define && element.define[param]
-    const hasContextDefine = context.define && context.define[param]
+    const hasContextDefine = context && context.define && context.define[param]
 
     if (isGlobalTransformer && !hasContextDefine) {
       if (isFunction(isGlobalTransformer)) isGlobalTransformer(prop, element, node, options)