domql 1.3.4 → 1.4.2

package/package.json

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

package/packages/emotion/index.js

@@ -32,6 +32,7 @@ const classf = (params, element, node) => {
     const classObjHelper = {}
     for (const key in params) {
       const prop = exec(params[key], element)
+      if (!prop) continue
       const CSSed = css(prop)
       classObjHelper[key] = CSSed
     }

package/src/element/create.js

@@ -14,6 +14,7 @@ import { assignClass } from './mixins/classList'
 import { isFunction, isNumber, isString, createID, isNode } from '../utils'
 import { remove, lookup, log, keys, parse, parseDeep } from './methods'
 import cacheNode from './cache'
+import { registry } from './mixins'
 // import { overwrite, clone, fillTheRest } from '../utils'
 
 const ENV = process.env.NODE_ENV
@@ -26,6 +27,33 @@ const create = (element, parent, key, options = {}) => {
   if (element === undefined) element = {}
   if (element === null) return
 
+  if (Object.keys(options).length) {
+    registry.defaultOptions = 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
 
@@ -128,7 +156,7 @@ const create = (element, parent, key, options = {}) => {
   }
 
   // CREATE a real NODE
-  createNode(element)
+  createNode(element, options)
 
   // assign NODE
   assignNode(element, parent, key)

package/src/element/createNode.js

@@ -28,7 +28,7 @@ const ENV = process.env.NODE_ENV
 //   }
 // })
 
-const createNode = (element) => {
+const createNode = (element, options) => {
   // create and assign a node
   let { node, tag } = element
 
@@ -78,9 +78,9 @@ const createNode = (element) => {
       const ourParam = registry[param]
 
       if (ourParam) { // Check if param is in our method registry
-        if (isFunction(ourParam)) ourParam(prop, element, node)
+        if (isFunction(ourParam)) ourParam(prop, element, node, options)
       } else if (element[param] && !hasDefined) {
-        create(prop, element, param) // Create element
+        create(prop, element, param, options) // Create element
       }
     }
   }

package/src/element/createProps.js

@@ -1,15 +1,25 @@
 'use strict'
 
-import { deepClone, deepMerge, exec, isArray } from '../utils'
+import { deepClone, deepMerge, exec, isArray, isObject, isString } from '../utils'
 
 const initProps = (element, parent) => {
+  const { props } = element
   const propsStack = []
 
-  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/element/mixins/content.js

@@ -6,12 +6,12 @@ import set from '../set'
  * Appends anything as content
  * an original one as a child
  */
-export default (param, element, node) => {
+export default (param, element, node, options) => {
   if (param && element) {
     if (param.__hash === element.content.__hash && element.content.update) {
       element.content.update(param)
     } else {
-      set.call(element, param)
+      set.call(element, param, options)
     }
   }
 }

package/src/element/proto.js

@@ -54,7 +54,12 @@ export const applyPrototype = (element, parent, options = {}) => {
     stack = protoStack
   } else if (childProtoLength) {
     stack = childProtoStack
-  } else return element
+  } else if (!options.proto) return element
+
+  if (options.proto) {
+    const defaultOptionsProto = getProtoStack(options.proto)
+    stack = [].concat(stack, defaultOptionsProto)
+  }
 
   element.__proto = stack
   const mergedProto = cloneAndMergeArrayProto(stack)

package/src/element/set.js

@@ -1,6 +1,7 @@
 'use strict'
 
 import create from './create'
+import { registry } from './mixins'
 
 const removeContentElement = (params, element) => {
   if (params && element.content) {
@@ -18,7 +19,7 @@ const removeContentElement = (params, element) => {
   }
 }
 
-const set = function (params, enter, leave) {
+const set = function (params, options) {
   const element = this
 
   removeContentElement(params, element)
@@ -27,7 +28,8 @@ const set = function (params, enter, leave) {
     const { childProto } = params
     if (!childProto && element.childProto) params.childProto = element.childProto
     create(params, element, 'content', {
-      ignoreChildProto: true
+      ignoreChildProto: true,
+      ...registry.defaultOptions
     })
   }
 

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