domql 1.5.33 → 1.5.35

package/package.json

@@ -2,9 +2,9 @@
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
   "private": false,
-  "author": "rackai",
-  "version": "1.5.33",
-  "repository": "https://github.com/rackai/domql",
+  "author": "symbo.ls",
+  "version": "1.5.35",
+  "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/packages/emotion/index.js

@@ -6,19 +6,19 @@ import { classList } from '../../src/element/mixins'
 import createEmotion from '@emotion/css/create-instance'
 const ENV = process.env.NODE_ENV
 
-export const initDOMQLEmotion = (emotion, options) => {
-  if (!emotion) emotion = createEmotion(options || { key: 'smbls'})
-
-  const style = (params, element, node) => {
+export const transformEmotionStyle = (emotion, live) => {
+  return  (params, element, node) => {
     const execPareams = exec(params, element)
     if (params) {
       if (isObjectLike(element.class)) element.class.elementStyle = execPareams
       else element.class = { elementStyle: execPareams }
     }
-    classf(element.class, element, node, true)
+    transformEmotionClass(emotion, live)(element.class, element, node, true)
   }
+}
 
-  const classf = (params, element, node, flag) => {
+export const transformEmotionClass = (emotion, live) => {
+  return (params, element, state, flag) => {
     if (element.style && !flag) return
     const { __class, __classNames } = element
     if (!isObjectLike(params)) return
@@ -40,12 +40,16 @@ export const initDOMQLEmotion = (emotion, options) => {
         __classNames[key] = CSSed
       }
     }
-    classList(__classNames, element, node)
+    classList(__classNames, element, element.node, live)
   }
+}
+
+export const initDOMQLEmotion = (emotion, options) => {
+  if (!emotion) emotion = createEmotion(options || { key: 'smbls' })
 
   DOM.define({
-    style,
-    class: classf
+    style: transformEmotionStyle(emotion),
+    class: transformEmotionClass(emotion)
   }, {
     overwrite: true
   })

package/src/element/iterate.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { exec, isFunction, isNumber, isString, overwrite } from '../utils'
+import { isObject, exec, isFunction, isNumber, isString, overwrite } from '../utils'
 import { isMethod } from './methods'
 
 export const applyEvents = element => {
@@ -51,9 +51,20 @@ export const throughUpdatedExec = (element, options) => {
   return changes
 }
 
-export const throughInitialDefine = element => {
+export const throughInitialDefine = (element, options) => {
   const { define } = element
-  for (const param in define) {
+  let obj = {}
+  
+  if (isObject(define)) {
+    obj = { ...define }
+  }
+  if (isObject(options.define)) {
+    // console.log('==============')
+    // console.log(options.define)
+    obj = { ...obj, ...options.define }
+  }
+
+  for (const param in obj) {
     let prop = element[param]
 
     if (isFunction(prop) && !isMethod(param)) {
@@ -62,19 +73,28 @@ export const throughInitialDefine = element => {
     }
 
     element.__cached[param] = prop
-    element[param] = define[param](prop, element, element.state)
+    element[param] = obj[param](prop, element, element.state)
   }
   return element
 }
 
-export const throughUpdatedDefine = element => {
+export const throughUpdatedDefine = (element, options) => {
   const { define, __exec } = element
   const changes = {}
-  for (const param in define) {
+  let obj = {}
+  
+  if (isObject(define)) {
+    obj = { ...define }
+  }
+  if (isObject(options.define)) {
+    obj = { ...obj, ...options.define }
+  }
+
+  for (const param in obj) {
     const execParam = __exec[param]
     if (execParam) element.__cached[param] = execParam(element, element.state)
     const cached = exec(element.__cached[param], element)
-    element[param] = define[param](cached, element, element.state)
+    element[param] = obj[param](cached, element, element.state)
   }
   return changes
 }

package/src/element/mixins/classList.js

@@ -24,7 +24,7 @@ export const classify = (obj, element) => {
   return className
 }
 
-export default (params, element, node) => {
+export default (params, element, node, live) => {
   if (!params) return
   const { key, __className } = element
   if (params === true) params = element.class = { key }

package/src/element/node.js

@@ -61,7 +61,7 @@ const createNode = (element, options) => {
   // iterate through all given params
   if (element.tag !== 'string' || element.tag !== 'fragment') {
     // iterate through define
-    if (isObject(element.define)) throughInitialDefine(element)
+    throughInitialDefine(element, options)
 
     // iterate through exec
     throughInitialExec(element)
@@ -76,10 +76,18 @@ const createNode = (element, options) => {
 
       const hasDefined = element.define && element.define[param]
       const ourParam = registry[param]
+      const hasOptionsDefine = options.define && options.define[param]
 
-      if (ourParam) { // Check if param is in our method registry
+      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)
-      } else if (element[param] && !hasDefined) {
+      } else if (element[param] && !hasDefined&& !hasOptionsDefine) {
         create(prop, element, param, options) // Create element
       }
     }

package/src/element/update.js

@@ -58,7 +58,7 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
 
   const overwriteChanges = overwrite(element, params, UPDATE_DEFAULT_OPTIONS)
   const execChanges = throughUpdatedExec(element, UPDATE_DEFAULT_OPTIONS)
-  const definedChanges = throughUpdatedDefine(element)
+  const definedChanges = throughUpdatedDefine(element, options)
 
   if (options.stackChanges && element.__stackChanges) {
     const stackChanges = merge(definedChanges, merge(execChanges, overwriteChanges))
@@ -90,11 +90,20 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     const hasDefined = define && define[param]
     const ourParam = registry[param]
 
-    if (ourParam) {
+    const hasOptionsDefine = options.define && options.define[param]
+
+    if (options.define) {
+      console.group('update')
+      console.log(param, options.define)
+      console.log(prop, hasOptionsDefine)
+      console.groupEnd('update')
+    }
+
+    if (ourParam && !hasOptionsDefine) {
       if (isFunction(ourParam)) {
         ourParam(prop, element, node)
       }
-    } else if (prop && isObject(prop) && !hasDefined) {
+    } else if (prop && isObject(prop) && !hasDefined && !hasOptionsDefine) {
       if (!options.preventRecursive) {
         const childUpdateCall = () => update.call(prop, params[prop], {  
           ...options,

package/src/utils/object.js

@@ -169,7 +169,7 @@ export const overwrite = (element, params, options) => {
     const elementProp = element[e]
     const paramsProp = params[e]
 
-    if (paramsProp) {
+    if (paramsProp !== undefined) {
       element.__cached[e] = changes[e] = elementProp
       element[e] = paramsProp
     }