domql 1.4.8 → 1.4.9

package/package.json

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

package/src/element/create.js

@@ -44,13 +44,9 @@ const create = (element, parent, key, options = {}) => {
   const assignedKey = element.key || key || createID.next().value
 
   // if PARENT is not given
-  // if (parent === null) parent = root
-  // if (parent === undefined) parent = root
   if (!parent) parent = root
   if (isNode(parent)) parent = root[`${key}_parent`] = { node: parent }
 
-  // if (assignedKey === 'all') debugger
-
   // if element is STRING
   if (isString(element) || isNumber(element)) {
     element = {
@@ -61,6 +57,7 @@ const create = (element, parent, key, options = {}) => {
   }
 
   // create PROTOtypal inheritance
+
   applyPrototype(element, parent, options)
 
   if (Object.keys(options).length) {
@@ -71,9 +68,6 @@ const create = (element, parent, key, options = {}) => {
   // enable STATE
   element.state = createState(element, parent)
 
-  // console.groupCollapsed('Create:', assignedKey)
-  // console.log(element)
-
   // create and assign a KEY
   element.key = assignedKey
 
@@ -87,16 +81,14 @@ const create = (element, parent, key, options = {}) => {
     }
   }
 
-  // set the PATH
+  // set the PATH array
   if (ENV === 'test' || ENV === 'development') {
     if (!parent.path) parent.path = []
     element.path = parent.path.concat(assignedKey)
   }
 
-  // if it already HAS A NODE
-  if (element.node) { // TODO: check on if
-    // console.log('hasNode!')
-    // console.groupEnd('Create:')
+  // if it already HAS a NODE
+  if (element.node && !element.__ifFalsy) { // TODO: check on if
     return assignNode(element, parent, assignedKey)
   }
 
@@ -139,15 +131,6 @@ const create = (element, parent, key, options = {}) => {
   // generate a CLASS name
   assignClass(element)
 
-  // console.log('cache.props:')
-  // console.log(cache.props)
-  // console.log('applied props:')
-  // console.log(element.props)
-  // console.log('element:')
-  // console.log(element)
-  // console.groupEnd('Create:')
-
-
   // console.group('create')
   // console.log(element.path)
   // console.log(element)

package/src/element/proto.js

@@ -12,26 +12,10 @@ export const applyPrototype = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
   const { proto } = element
-
-  // merge if proto is array
-  // const proto = mergeAndCloneIfArray(element.proto, v => {
-  //   if (v.props) cache.props.push(v.props)
-  // console.log('v.propsIN_PROTO:')
-  // console.log(v.props)
-  // })
-
-  // console.log(proto)
   const protoStack = getProtoStack(proto)
 
   if (ENV !== 'test' || ENV !== 'development') delete element.proto
 
-  // console.log(parent.childProto)
-
-  // console.log(element)
-  // console.log(proto)
-  // console.log(protoStack)
-  // debugger
-
   let childProtoStack = []
   if (parent) {
     // Assign parent attr to the element
@@ -41,18 +25,9 @@ export const applyPrototype = (element, parent, options = {}) => {
     }
   }
 
-  // console.log(proto, parent && parent.childProto)
-  // console.log(protoStack, childProtoStack)
-
   const protoLength = protoStack.length
   const childProtoLength = childProtoStack.length
 
-  // console.group('proto')
-  // console.log(protoLength)
-  // console.log(childProtoLength)
-  // console.log(element)
-  // console.groupEnd('proto')
-
   let stack = []
   if (protoLength && childProtoLength) {
     stack = jointStacks(protoStack, childProtoStack)
@@ -73,11 +48,8 @@ export const applyPrototype = (element, parent, options = {}) => {
   const component = exec(element.component || mergedProto.component, element)
   if (component && options.components && options.components[component]) {
     const componentProto = cloneAndMergeArrayProto(getProtoStack(options.components[component]))
-    mergedProto = deepMergeProto(mergedProto, componentProto)
+    mergedProto = deepMergeProto(componentProto, mergedProto)
   }
 
-  // console.log(mergedProto)
   return deepMergeProto(element, mergedProto)
-
-  // final merging with prototype
 }