domql 1.4.1 → 1.4.4

package/package.json

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

package/src/element/create.js

@@ -27,29 +27,17 @@ 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 KEY is PROTO
   if (options.components) {
     const { components } = options
-
-    const k = element.key || key
-    const keyIsProto = isString(k) && k.charAt(0) === k.charAt(0).toUpperCase()
-    let component
-    if (keyIsProto) component = key
-
-    // if proto comes from library as string
-    const fromLibrary = component || isString(element.proto) ? element.proto : element.component
-    const isInLibrary = components[fromLibrary]
-    if (isInLibrary) element = { proto: isInLibrary, props: element }
+    const { proto, component } = element
+    if (isString(proto))
+      if (components[proto]) element.proto = components[proto]
+      else console.warn(proto, 'is not in library', components, element)
   }
 
   // define KEY
@@ -75,6 +63,11 @@ const create = (element, parent, key, options = {}) => {
   // create PROTOtypal inheritance
   applyPrototype(element, parent, options)
 
+  if (Object.keys(options).length) {
+    registry.defaultOptions = options
+    if (options.ignoreChildProto) delete options.ignoreChildProto
+  }
+
   // enable STATE
   element.state = createState(element, parent)
 

package/src/element/proto.js

@@ -62,7 +62,13 @@ export const applyPrototype = (element, parent, options = {}) => {
   }
 
   element.__proto = stack
-  const mergedProto = cloneAndMergeArrayProto(stack)
+  let mergedProto = cloneAndMergeArrayProto(stack)
+
+  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)
+  }
 
   // console.log(mergedProto)
   return deepMergeProto(element, mergedProto)