domql 1.5.71 → 1.5.73

package/package.json

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

package/src/element/create.js

@@ -15,6 +15,7 @@ import { isObject, isFunction, isNumber, isString, createID, isNode, exec } from
 import { remove, lookup, setProps, log, keys, parse, parseDeep, spotByPath, nextElement, previousElement, isMethod } from './methods'
 import cacheNode from './cache'
 import { registry } from './mixins'
+import { throughInitialExec } from './iterate'
 import OPTIONS from './options'
 // import { overwrite, clone, fillTheRest } from '../utils'
 
@@ -93,8 +94,13 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
     }
   }
 
-  if (options.components) {
-    const { components } = options
+  // assign context
+  if (options.context && !root.context) root.context = options.context
+  element.context = root.context
+  const { context } = element
+
+  if (context.components) {
+    const { components } = context
     const { extend } = element
     const execExtend = exec(extend, element)
     if (isString(execExtend)) {
@@ -111,8 +117,17 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
 
   // Only resolve extends, skip everything else
   if (options.onlyResolveExtends) {
+    // parent.appendChild = () => {}
+    // element.node = { setAttribute(){} }
+
     applyExtend(element, parent, options)
-    // if (!element.__attr) element.__attr = {}
+
+    if (!element.__exec) element.__exec = {}
+    if (!element.__attr) element.__attr = {}
+    if (!element.__ifFalsy) createProps(element, parent)
+    element.key = assignedKey
+
+    throughInitialExec(element)
 
     for (const param in element) {
       const prop = element[param]
@@ -122,20 +137,22 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
       const ourParam = registry[param]
       const hasOptionsDefine = options.define && options.define[param]
       if (ourParam && !hasOptionsDefine) {
-        continue
+        continue // if (isFunction(ourParam)) ourParam(prop, element, element.node, options)
       } else if (element[param] && !hasDefined && !hasOptionsDefine) {
         create(exec(prop, element), element, param, options)
       }
     }
 
     // createNode(element, options)
+    delete element.parent
+    delete element.__element
+    delete element.__props
+    delete element.props.__element
+    delete element.props.update
+    delete element.update
     return element
   }
 
-  // assign context
-  if (options.context && !root.context) root.context = options.context
-  element.context = root.context
-
   // create EXTEND inheritance
   applyExtend(element, parent, options)
 
@@ -170,8 +187,8 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
   if (!element.__children) element.__children = []
 
   // Add _root element property
-  const hasRoot = parent.parent && parent.parent.key === ':root'
-  if (!element.__root) element.__root = hasRoot ? parent : parent.__root
+  const hasRoot = parent && parent.key === ':root'
+  if (!element.__root) element.__root = hasRoot ? element : parent.__root
 
   // set the PATH array
   if (ENV === 'test' || ENV === 'development') {

package/src/element/extend.js

@@ -11,8 +11,10 @@ const ENV = process.env.NODE_ENV
 export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
-  let { extend, props } = element
-  if (isString(extend)) extend = options.components[extend]
+  let { extend, props, context } = element
+  const COMPONENTS = context.components || options.components
+
+  if (isString(extend)) extend = COMPONENTS[extend]
   const extendStack = getExtendStack(extend)
 
   if (ENV !== 'test' || ENV !== 'development') delete element.extend
@@ -55,8 +57,8 @@ export const applyExtend = (element, parent, options = {}) => {
   let mergedExtend = cloneAndMergeArrayExtend(stack)
 
   const component = exec(element.component || mergedExtend.component, element)
-  if (component && options.components && options.components[component]) {
-    const componentExtend = cloneAndMergeArrayExtend(getExtendStack(options.components[component]))
+  if (component && COMPONENTS && COMPONENTS[component]) {
+    const componentExtend = cloneAndMergeArrayExtend(getExtendStack(COMPONENTS[component]))
     mergedExtend = deepMergeExtend(componentExtend, mergedExtend)
   }
 

package/src/element/node.js

@@ -75,18 +75,11 @@ export const createNode = (element, options) => {
       if (isMethod(param) || isObject(registry[param]) || prop === undefined) continue
 
       const hasDefined = element.define && element.define[param]
-      const ourParam = registry[param]
+      const DOMQLProperty = registry[param]
       const hasOptionsDefine = options.define && options.define[param]
 
-      if (options.define) {
-      // console.group('create')
-      // console.log(param, options.define)
-      //   console.log(prop, hasOptionsDefine)
-      // console.groupEnd('create')
-      }
-
-      if (ourParam && !hasOptionsDefine) { // Check if param is in our method registry
-        if (isFunction(ourParam)) ourParam(prop, element, node, options)
+      if (DOMQLProperty && !hasOptionsDefine) { // Check if param is in our method registry
+        if (isFunction(DOMQLProperty)) DOMQLProperty(prop, element, node, options)
       } else if (element[param] && !hasDefined && !hasOptionsDefine) {
         create(exec(prop, element), element, param, options) // Create element
       }