domql 1.4.0 → 1.4.3

package/package.json

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

package/src/element/create.js

@@ -32,6 +32,28 @@ const create = (element, parent, key, options = {}) => {
     if (options.ignoreChildProto) delete options.ignoreChildProto
   }
 
+  // if element is proto
+  if (element.__hash) {
+    element = { proto: element }
+  }
+
+  if (options.components) {
+    const { components } = options
+    const { proto } = element
+    if (isString(proto))
+      if (components[proto]) element.proto = components[proto]
+      else console.warn(proto, 'is not in library', components, element)
+
+    // // if KEY is PROTO
+    // const k = element.key || key
+    // const keyIsProto = isString(k) && k.charAt(0) === k.charAt(0).toUpperCase()
+    // if (keyIsProto) component = key
+    // let { match, ...rest } = element
+    // if proto comes from library as string
+    // const fromLibrary = isString(match) ? components[match] : match
+    // if (fromLibrary) element = { proto: fromLibrary, ...rest }
+  }
+
   // define KEY
   const assignedKey = element.key || key || createID.next().value
 

package/src/element/createProps.js

@@ -1,17 +1,25 @@
 'use strict'
 
-import { deepClone, deepMerge, exec, isArray, isObject } from '../utils'
+import { deepClone, deepMerge, exec, isArray, isObject, isString } from '../utils'
 
 const initProps = (element, parent) => {
+  const { props } = element
   const propsStack = []
 
-  if (isObject(element.props)) {
-    propsStack.push(element.props)
-  } else if (element.props === 'inherit') {
-    if (parent && parent.props) propsStack.push(parent.props)
-  } else if (element.props === 'match') {
-    if (parent && parent.props) propsStack.push(parent.props[element.key])
-  } else if (element.props) propsStack.push(element.props)
+  const hasMatch = isString(props) && props.indexOf('match') > -1
+  const matchParent = parent.props && parent.props[element.key]
+
+  if (isObject(props)) {
+    propsStack.push(props)
+  } else if (props === 'inherit') {
+    if (parent.props) propsStack.push(parent.props)
+  } else if (hasMatch) {
+    const hasArg = props.split(' ')
+    if (hasArg[1] && parent.props[hasArg[1]]) propsStack.push(parent.props[hasArg[1]])
+    else if (matchParent) propsStack.push(matchParent)
+  } else if (props) propsStack.push(props)
+
+  if (matchParent && props !== 'match') propsStack.push(matchParent)
 
   if (isArray(element.__proto)) {
     element.__proto.map(proto => {

package/src/utils/protoUtils.js

@@ -19,16 +19,13 @@ export const setHashedProto = (proto, stack) => {
   const hash = generateHash()
   proto.__hash = hash
   protoStackRegistry[hash] = stack
-  return protoStackRegistry[hash]
+  return stack
 }
 
 export const getProtoStackRegistry = (proto, stack) => {
-  if (proto.__hash) {
+  if (proto.__hash)
     return stack.concat(getHashedProto(proto))
-  } else {
-    setHashedProto(proto, stack)
-  }
-  return stack // .concat(hashedProto)
+  return setHashedProto(proto, stack) // stack .concat(hashedProto)
 }
 
 // stacking