domql 1.2.12 → 1.3.0

package/package.json

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

package/src/element/create.js

@@ -46,12 +46,12 @@ const create = (element, parent, key, options = {}) => {
     }
   }
 
-  // enable STATE
-  element.state = createState(element, parent)
-
   // create PROTOtypal inheritance
   applyPrototype(element, parent, options)
 
+  // enable STATE
+  element.state = createState(element, parent)
+
   // console.groupCollapsed('Create:', assignedKey)
   // console.log(element)
 

package/src/element/createState.js

@@ -34,7 +34,11 @@ export const updateState = function (obj, options = {}) {
 
 export default function (element, parent) {
   let { state } = element
-  if (!state) return (parent && parent.state) || {}
+  // if (!state) return (parent && parent.state) || {}
+  if (!state) {
+    if (parent && parent.state) return parent.state
+    return {}
+  }
   if (isFunction(state)) state = exec(state, element)
 
   state = deepClone(state, ['update', 'parse', '__element'])

package/src/element/update.js

@@ -9,6 +9,7 @@ import { merge } from '../utils/object'
 import { appendNode } from './assign'
 import { createNode } from '.'
 import { updateProps } from './createProps'
+import createState from './createState'
 
 const UPDATE_DEFAULT_OPTIONS = {
   stackChanges: false,
@@ -20,17 +21,6 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
   const element = this
   const { define, parent, node } = element
 
-  // console.groupCollapsed('Update:', element.path)
-  // console.log('params:')
-  // console.log(params)
-  // console.log('props:')
-  // console.log(element.props)
-  // console.log('element:')
-  // console.log(element)
-  // console.log('PARAMS.PROPS:')
-  // console.log(params.props)
-  // console.groupEnd('Update:')
-  // if params is string
   if (isString(params) || isNumber(params)) {
     params = { text: params }
   }
@@ -39,14 +29,10 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     on.initUpdate(element.on.initUpdate, element, element.state)
   }
 
-  // console.log(element, parent)
   updateProps(params.props, element, parent)
-  // // console.log(element.path)
-  // // console.log(element)
 
-  // console.groupCollapsed('UPDATE:')
-  // console.log(element)
-  // console.groupEnd('UPDATE:')
+  // const state = params.state || element.state
+  // element.state = createState({ state }, parent)
 
   const overwriteChanges = overwrite(element, params, UPDATE_DEFAULT_OPTIONS)
   const execChanges = throughUpdatedExec(element, UPDATE_DEFAULT_OPTIONS)
@@ -70,9 +56,6 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     }
   }
 
-  // console.log(node)
-  // console.groupEnd('Update:')
-
   if (!node || options.preventRecursive) return
 
   for (const param in element) {

package/src/utils/object.js

@@ -77,7 +77,7 @@ export const deepMerge = (element, proto) => {
     const elementProp = element[e]
     const protoProp = proto[e]
     // const cachedProps = cache.props
-    if (e === 'parent' || e === 'props') continue
+    if (e === 'parent' || e === 'props' || e === 'state') continue
     if (elementProp === undefined) {
       element[e] = protoProp
     } else if (isObjectLike(elementProp) && isObject(protoProp)) {
@@ -122,7 +122,7 @@ export const overwrite = (element, params, options) => {
   const changes = {}
 
   for (const e in params) {
-    if (e === 'props') continue
+    if (e === 'props' || e === 'state') continue
 
     const elementProp = element[e]
     const paramsProp = params[e]

package/src/utils/protoUtils.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isArray, isFunction, isObject } from './object'
+import { exec, isArray, isFunction, isObject } from './object'
 
 export const generateHash = () => Math.random().toString(36).substring(2)