domql 1.4.8 → 1.4.11

package/package.json

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

package/packages/emotion/index.js

@@ -1,7 +1,7 @@
 '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
@@ -34,7 +34,7 @@ const classf = (params, element, node) => {
     for (const key in params) {
       const prop = exec(params[key], element)
       if (!prop) continue
-      if (ENV === 'test' || ENV === 'development') prop.label = key || element.key
+      if ((ENV === 'test' || ENV === 'development') && isObject(prop)) prop.label = key || element.key
       const CSSed = css(prop)
       classObjHelper[key] = CSSed
     }

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'
@@ -44,13 +44,9 @@ const create = (element, parent, key, options = {}) => {
   const assignedKey = element.key || key || createID.next().value
 
   // if PARENT is not given
-  // if (parent === null) parent = root
-  // if (parent === undefined) parent = root
   if (!parent) parent = root
   if (isNode(parent)) parent = root[`${key}_parent`] = { node: parent }
 
-  // if (assignedKey === 'all') debugger
-
   // if element is STRING
   if (isString(element) || isNumber(element)) {
     element = {
@@ -61,6 +57,7 @@ const create = (element, parent, key, options = {}) => {
   }
 
   // create PROTOtypal inheritance
+
   applyPrototype(element, parent, options)
 
   if (Object.keys(options).length) {
@@ -71,9 +68,6 @@ const create = (element, parent, key, options = {}) => {
   // enable STATE
   element.state = createState(element, parent)
 
-  // console.groupCollapsed('Create:', assignedKey)
-  // console.log(element)
-
   // create and assign a KEY
   element.key = assignedKey
 
@@ -87,16 +81,14 @@ const create = (element, parent, key, options = {}) => {
     }
   }
 
-  // set the PATH
+  // set the PATH array
   if (ENV === 'test' || ENV === 'development') {
     if (!parent.path) parent.path = []
     element.path = parent.path.concat(assignedKey)
   }
 
-  // if it already HAS A NODE
-  if (element.node) { // TODO: check on if
-    // console.log('hasNode!')
-    // console.groupEnd('Create:')
+  // if it already HAS a NODE
+  if (element.node && !element.__ifFalsy) { // TODO: check on if
     return assignNode(element, parent, assignedKey)
   }
 
@@ -104,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
@@ -139,15 +132,6 @@ const create = (element, parent, key, options = {}) => {
   // generate a CLASS name
   assignClass(element)
 
-  // console.log('cache.props:')
-  // console.log(cache.props)
-  // console.log('applied props:')
-  // console.log(element.props)
-  // console.log('element:')
-  // console.log(element)
-  // console.groupEnd('Create:')
-
-
   // console.group('create')
   // console.log(element.path)
   // console.log(element)

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/proto.js

@@ -12,26 +12,10 @@ export const applyPrototype = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
   const { proto } = element
-
-  // merge if proto is array
-  // const proto = mergeAndCloneIfArray(element.proto, v => {
-  //   if (v.props) cache.props.push(v.props)
-  // console.log('v.propsIN_PROTO:')
-  // console.log(v.props)
-  // })
-
-  // console.log(proto)
   const protoStack = getProtoStack(proto)
 
   if (ENV !== 'test' || ENV !== 'development') delete element.proto
 
-  // console.log(parent.childProto)
-
-  // console.log(element)
-  // console.log(proto)
-  // console.log(protoStack)
-  // debugger
-
   let childProtoStack = []
   if (parent) {
     // Assign parent attr to the element
@@ -41,18 +25,9 @@ export const applyPrototype = (element, parent, options = {}) => {
     }
   }
 
-  // console.log(proto, parent && parent.childProto)
-  // console.log(protoStack, childProtoStack)
-
   const protoLength = protoStack.length
   const childProtoLength = childProtoStack.length
 
-  // console.group('proto')
-  // console.log(protoLength)
-  // console.log(childProtoLength)
-  // console.log(element)
-  // console.groupEnd('proto')
-
   let stack = []
   if (protoLength && childProtoLength) {
     stack = jointStacks(protoStack, childProtoStack)
@@ -73,11 +48,8 @@ export const applyPrototype = (element, parent, options = {}) => {
   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)
+    mergedProto = deepMergeProto(componentProto, mergedProto)
   }
 
-  // console.log(mergedProto)
   return deepMergeProto(element, mergedProto)
-
-  // final merging with prototype
 }

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)
     }
   }