domql 1.5.98 → 1.5.99

package/package.json

@@ -2,7 +2,7 @@
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
   "author": "symbo.ls",
-  "version": "1.5.98",
+  "version": "1.5.99",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/create.js

@@ -30,7 +30,9 @@ const create = (element, parent, key, options = OPTIONS.create || {}) => {
 
   // if ELEMENT is not given
   if (element === undefined) {
-    if (ENV === 'test' || ENV === 'development') { console.warn(key, 'element is undefined in', parent && parent.path) }
+    if (ENV === 'test' || ENV === 'development') {
+      console.warn(key, 'element is undefined in', parent && parent.__ref && parent.__ref.path)
+    }
     element = {}
   }
   if (element === null) return
@@ -189,6 +191,7 @@ const checkIf = (element, parent) => {
 
 const addCaching = (element, parent) => {
   const { __ref } = element
+  let { __ref: __parentRef } = parent
 
   // enable TRANSFORM in data
   if (!element.transform) element.transform = {}
@@ -214,12 +217,13 @@ const addCaching = (element, parent) => {
 
   // Add _root element property
   const hasRoot = parent && parent.key === ':root'
-  if (!element.__root) element.__root = hasRoot ? element : parent.__root
+  if (!__ref.__root) __ref.__root = hasRoot ? element : parent.__ref.__root
 
   // set the PATH array
   if (ENV === 'test' || ENV === 'development') {
-    if (!parent.path) parent.path = []
-    element.path = parent.path.concat(element.key)
+    if (!__parentRef) __parentRef = parent.__ref = {}
+    if (!__parentRef.__path) __parentRef.__path = []
+    __ref.__path = __parentRef.__path.concat(element.key)
   }
 }
 

package/src/element/methods.js

@@ -98,11 +98,12 @@ export const parseDeep = function () {
 
 export const log = function (...args) {
   const element = this
+  const { __ref } = element
   console.group(element.key)
   if (args.length) {
     args.forEach(v => console.log(`%c${v}:\n`, 'font-weight: bold', element[v]))
   } else {
-    console.log(element.path)
+    console.log(__ref.path)
     const keys = element.keys()
     keys.forEach(v => console.log(`%c${v}:\n`, 'font-weight: bold', element[v]))
   }

package/src/element/mixins/registry.js

@@ -26,7 +26,6 @@ export default {
   transform: {},
   __ref: {},
   __hash: {},
-  __root: {},
   __text: {},
   nextElement: {},
   previousElement: {},

package/src/element/state.js

@@ -35,7 +35,7 @@ export const cleanState = function () {
 export const projectSystemUpdate = function (obj, options = {}) {
   const state = this
   if (!state) return
-  const rootState = (state.__element.__root || state.__element).state
+  const rootState = (state.__element.__ref.__root || state.__element).state
   rootState.update({ PROJECT_SYSTEM: obj }, options)
   return state
 }
@@ -43,7 +43,7 @@ export const projectSystemUpdate = function (obj, options = {}) {
 export const projectStateUpdate = function (obj, options = {}) {
   const state = this
   if (!state) return
-  const rootState = (state.__element.__root || state.__element).state
+  const rootState = (state.__element.__ref.__root || state.__element).state
   rootState.update({ PROJECT_STATE: obj }, options)
   return state
 }
@@ -100,7 +100,7 @@ export const updateState = function (obj, options = {}) {
 export const createState = function (element, parent, opts) {
   const skip = (opts && opts.skip) ? opts.skip : false
 
-  let { state, __root, __ref: __elementRef } = element
+  let { state, __ref: __elementRef } = element
 
   if (isFunction(state)) state = exec(state, element)
 
@@ -179,7 +179,7 @@ export const createState = function (element, parent, opts) {
   state.create = createState
   state.parent = element.parent.state
   state.__element = element
-  state.__root = __root ? __root.state : state
+  state.__root = __elementRef.__root ? __elementRef.__root.state : state
 
   // editor stuff
   state.projectSystemUpdate = projectSystemUpdate

package/src/element/update.js

@@ -53,7 +53,8 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     if (ifPassed) __ref.__if = true
     if (itWasFalse && ifPassed) {
       delete element.__hash
-      if (!__ref.__hasRootState || __ref.__state) delete element.state
+      if (!__ref.__hasRootState) delete element.state
+      if (__ref.__state) element.state = __ref.__state
       const created = create(element, element.parent, element.key)
       if (!options.preventUpdate && element.on && isFunction(element.on.update)) {
         on.update(element.on.update, created, created.state)

package/src/utils/extendUtils.js

@@ -50,7 +50,7 @@ export const flattenExtend = (extend, stack) => {
 export const deepCloneExtend = obj => {
   const o = {}
   for (const prop in obj) {
-    if (['parent', 'node', '__element', '__root', '__key'].indexOf(prop) > -1) continue
+    if (['parent', 'node', '__element'].indexOf(prop) > -1) continue
     const objProp = obj[prop]
     if (isObject(objProp)) {
       o[prop] = deepCloneExtend(objProp)
@@ -63,7 +63,7 @@ export const deepCloneExtend = obj => {
 
 export const deepMergeExtend = (element, extend) => {
   for (const e in extend) {
-    if (['parent', 'node', '__element', '__root', '__key'].indexOf(e) > -1) continue
+    if (['parent', 'node', '__element'].indexOf(e) > -1) continue
     const elementProp = element[e]
     const extendProp = extend[e]
     if (elementProp === undefined) {

package/src/utils/object.js

@@ -121,7 +121,7 @@ export const clone = obj => {
 /**
  * Deep cloning of object
  */
-export const deepClone = (obj, excluding = ['parent', 'node', '__element', 'state', '__root', '__cached', 'context', 'extend', '__ref']) => {
+export const deepClone = (obj, excluding = ['parent', 'node', '__element', 'state', 'context', 'extend', '__ref']) => {
   const o = isArray(obj) ? [] : {}
   for (const prop in obj) {
     if (excluding.indexOf(prop) > -1) continue
@@ -181,7 +181,7 @@ export const overwrite = (element, params, options) => {
   return changes
 }
 
-export const overwriteShallow = (obj, params, excluding = ['node', '__root', '__ref']) => {
+export const overwriteShallow = (obj, params, excluding = ['node', '__ref']) => {
   for (const e in params) {
     if (excluding.indexOf(e) > -1) continue
     obj[e] = params[e]
@@ -192,7 +192,7 @@ export const overwriteShallow = (obj, params, excluding = ['node', '__root', '__
 /**
  * Overwrites DEEPly object properties with another
  */
-export const overwriteDeep = (obj, params, excluding = ['node', '__root', '__ref']) => {
+export const overwriteDeep = (obj, params, excluding = ['node', '__ref']) => {
   for (const e in params) {
     if (excluding.indexOf(e) > -1) continue
     const objProp = obj[e]
@@ -217,7 +217,7 @@ export const mergeIfExisted = (a, b) => {
 /**
  * Merges array extends
  */
-export const mergeArray = (arr, excluding = ['parent', 'node', '__element', 'state', '__root', '__cached', 'context', '__ref']) => {
+export const mergeArray = (arr, excluding = ['parent', 'node', '__element', 'state', 'context', '__ref']) => {
   return arr.reduce((a, c) => deepMerge(a, deepClone(c, excluding)), {})
 }