domql 1.4.9 → 1.4.12

package/package.json

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

package/packages/emotion/index.js

@@ -1,50 +1,54 @@
 'use strict'
 
 import DOM from '../../src'
-import { isObjectLike, exec } from '../../src/utils'
+import { isObjectLike, exec, isObject } from '../../src/utils'
 import { classList } from '../../src/element/mixins'
 import createEmotion from '@emotion/css/create-instance'
 const ENV = process.env.NODE_ENV
 
-const {
-  flush,
-  hydrate,
-  cx,
-  merge,
-  getRegisteredStyles,
-  injectGlobal,
-  keyframes,
-  css,
-  sheet,
-  cache
-} = createEmotion({ key: 'smbls' })
+export const initEmotion = (container, options) => {
+  const {
+    flush,
+    hydrate,
+    cx,
+    merge,
+    getRegisteredStyles,
+    injectGlobal,
+    keyframes,
+    css,
+    sheet,
+    cache
+  } = createEmotion({ key: 'smbls', container })
 
-const style = (params, element, node) => {
-  const execPareams = exec(params, element)
-  if (params) {
-    if (isObjectLike(element.class)) element.class.style = execPareams
-    else element.class = { style: execPareams }
+  const style = (params, element, node) => {
+    const execPareams = exec(params, element)
+    if (params) {
+      if (isObjectLike(element.class)) element.class.style = execPareams
+      else element.class = { style: execPareams }
+    }
+    classf(element.class, element, node)
   }
-  classf(element.class, element, node)
-}
 
-const classf = (params, element, node) => {
-  if (isObjectLike(params)) {
-    const classObjHelper = {}
-    for (const key in params) {
-      const prop = exec(params[key], element)
-      if (!prop) continue
-      if (ENV === 'test' || ENV === 'development') prop.label = key || element.key
-      const CSSed = css(prop)
-      classObjHelper[key] = CSSed
+  const classf = (params, element, node) => {
+    if (isObjectLike(params)) {
+      const classObjHelper = {}
+      for (const key in params) {
+        const prop = exec(params[key], element)
+        if (!prop) continue
+        if ((ENV === 'test' || ENV === 'development') && isObject(prop)) prop.label = key || element.key
+        const CSSed = css(prop)
+        classObjHelper[key] = CSSed
+      }
+      classList(classObjHelper, element, node)
     }
-    classList(classObjHelper, element, node)
   }
+
+  DOM.define({
+    style,
+    class: classf
+  }, {
+    overwrite: true
+  })
 }
 
-DOM.define({
-  style,
-  class: classf
-}, {
-  overwrite: true
-})
+initEmotion()

package/src/element/create.js

@@ -12,7 +12,7 @@ import update from './update'
 import * as on from '../event/on'
 import { assignClass } from './mixins/classList'
 import { isFunction, isNumber, isString, createID, isNode } from '../utils'
-import { remove, lookup, log, keys, parse, parseDeep } from './methods'
+import { remove, lookup, setProps, log, keys, parse, parseDeep } from './methods'
 import cacheNode from './cache'
 import { registry } from './mixins'
 // import { overwrite, clone, fillTheRest } from '../utils'
@@ -96,6 +96,7 @@ const create = (element, parent, key, options = {}) => {
   element.set = set
   element.update = update
   element.remove = remove
+  element.setProps = setProps
   element.lookup = lookup
   element.parse = parse
   element.parseDeep = parseDeep
@@ -116,7 +117,7 @@ const create = (element, parent, key, options = {}) => {
   // enable CHANGES storing
   if (!element.__changes) element.__changes = []
 
-  // enable CHANGES storing
+  // Add _root element property
   const hasRoot = parent.parent && parent.parent.key === ':root'
   if (!element.__root) element.__root = hasRoot ? parent : parent.__root
 

package/src/element/createProps.js

@@ -6,7 +6,7 @@ const initProps = (element, parent) => {
   const { props } = element
   const propsStack = []
 
-  const hasMatch = isString(props) && props.indexOf('match') > -1
+  const isMatch = isString(props) && props.indexOf('match') > -1
   const matchParent = parent.props && parent.props[element.key]
 
   const objectizeStringProperty = propValue => {
@@ -18,10 +18,12 @@ const initProps = (element, parent) => {
     propsStack.push(props)
   } else if (props === 'inherit') {
     if (parent.props) propsStack.push(parent.props)
-  } else if (hasMatch) {
+  } else if (isMatch) {
     const hasArg = props.split(' ')
     let matchParentValue
+    //console.log('hasArg', hasArg)
     if (hasArg[1] && parent.props[hasArg[1]]) {
+      console.log('hasArg[1]', hasArg[1])
       const secondArgasParentMatchProp = parent.props[hasArg[1]]
       propsStack.push(
         objectizeStringProperty(secondArgasParentMatchProp)

package/src/element/index.js

@@ -12,7 +12,7 @@ import update from './update'
 import parse from './parse'
 import set from './set'
 
-import { lookup, remove, get, log, keys } from './methods'
+import { lookup, remove, get, setProps, log, keys } from './methods'
 
 export {
   nodes,
@@ -27,6 +27,7 @@ export {
   update,
   parse,
   lookup,
+  setProps,
   set,
   get,
   log,

package/src/element/methods.js

@@ -33,6 +33,13 @@ export const set = function () {
 export const update = function () {
 }
 
+export const setProps = function (param, options) {
+  const element = this
+  if (!param || !element.props) return
+  element.update({ props: param }, options)
+  return element.props
+}
+
 export const defineSetter = (element, key, get, set) =>
   Object.defineProperty(element, key, { get, set })
 
@@ -90,6 +97,7 @@ export const isMethod = function (param) {
     param === 'lookup' ||
     param === 'keys' ||
     param === 'parse' ||
+    param === 'setProps' ||
     param === 'parseDeep' ||
     param === 'if' ||
     param === 'log'

package/src/element/mixins/registry.js

@@ -45,6 +45,7 @@ export default {
   node: {},
   set: {},
   update: {},
+  setProps: {},
   remove: {},
   lookup: {},
   keys: {},

package/src/element/update.js

@@ -77,7 +77,7 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
   // else console.log(element.path, '\n\n', stackChanges)
 
   // console.log(element.key, element.__ifFalsy)
-  if (element.__ifFalsy || options.preventRecursive) return element
+  if (element.__ifFalsy) return element
   if (!node) {
     return
     // return createNode(element, options)
@@ -101,12 +101,12 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     const hasDefined = define && define[param]
     const ourParam = registry[param]
 
-    // // console.log(prop)
+    if (options.preventContentUpdate && param === 'content') console.log(param)
 
     if (ourParam) {
       if (isFunction(ourParam)) ourParam(prop, element, node)
     } else if (prop && isObject(prop) && !hasDefined) {
-      if (!options.preventChildrenUpdate) update.call(prop, params[prop], UPDATE_DEFAULT_OPTIONS)
+      if (!options.preventRecursive) update.call(prop, params[prop], UPDATE_DEFAULT_OPTIONS)
     }
   }