domql 1.5.30 → 1.5.32

package/package.json

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

package/packages/emotion/index.js

@@ -6,19 +6,8 @@ import { classList } from '../../src/element/mixins'
 import createEmotion from '@emotion/css/create-instance'
 const ENV = process.env.NODE_ENV
 
-export const initEmotion = (container, options) => {
-  const {
-    flush,
-    hydrate,
-    cx,
-    merge,
-    getRegisteredStyles,
-    injectGlobal,
-    keyframes,
-    css,
-    sheet,
-    cache
-  } = createEmotion({ key: 'smbls', container })
+export const initDOMQLEmotion = (emotion, options) => {
+  if (!emotion) emotion = createEmotion(options || { key: 'smbls'})
 
   const style = (params, element, node) => {
     const execPareams = exec(params, element)
@@ -46,7 +35,7 @@ export const initEmotion = (container, options) => {
       const isEqual = isEqualDeep(__class[key], prop)
       if (!isEqual) {
         if ((ENV === 'test' || ENV === 'development') && isObject(prop)) prop.label = key || element.key
-        const CSSed = css(prop)
+        const CSSed = emotion.css(prop)
         __class[key] = prop
         __classNames[key] = CSSed
       }
@@ -61,5 +50,3 @@ export const initEmotion = (container, options) => {
     overwrite: true
   })
 }
-
-initEmotion()

package/src/element/extend.js

@@ -11,7 +11,7 @@ const ENV = process.env.NODE_ENV
 export const applyExtend = (element, parent, options = {}) => {
   if (isFunction(element)) element = exec(element, parent)
 
-  const { extend } = element
+  let { extend } = element
   if (isString(extend)) extend = options.components[extend]
   const extendStack = getExtendStack(extend)
 

package/src/element/mixins/registry.js

@@ -48,6 +48,7 @@ export default {
   __className: {},
   __classNames: {},
   __attr: {},
+  __currentSnapshot: {},
   key: {},
   tag: {},
   parent: {},

package/src/element/update.js

@@ -1,26 +1,41 @@
 'use strict'
 
-import { overwrite, isFunction, isObject, isString, isNumber, isEqualDeep } from '../utils'
+import { overwrite, isFunction, isObject, isString, isNumber, createSnapshotId, merge } from '../utils'
 import { registry } from './mixins'
-import * as on from '../event/on'
+import { on } from '../event'
 import { isMethod } from './methods'
 import { throughUpdatedDefine, throughUpdatedExec } from './iterate'
-import { merge } from '../utils/object'
 import { appendNode } from './assign'
-import { createNode } from '.'
+import { createNode } from './node'
 import { updateProps } from './props'
-import createState from './state'
+
+const snapshot = {
+  snapshotId: createSnapshotId()
+}
 
 const UPDATE_DEFAULT_OPTIONS = {
   stackChanges: false,
   cleanExec: true,
-  preventRecursive: false
+  preventRecursive: false,
+  currentSnapshot: false,
+  calleeElement: false
 }
 
 const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
   const element = this
   const { define, parent, node } = element
 
+  const { currentSnapshot, calleeElement } = options
+  if (!calleeElement) {
+    element.__currentSnapshot = snapshot.snapshotId.next().value
+  }
+  const snapshotOnCallee = element.__currentSnapshot || calleeElement && calleeElement.__currentSnapshot
+  if (snapshotOnCallee && currentSnapshot < snapshotOnCallee) {
+    // console.log(calleeElement)
+    // console.log(currentSnapshot, snapshotOnCallee, 'cancelling')
+    // return
+  }
+
   if (isString(params) || isNumber(params)) {
     params = { text: params }
   }
@@ -44,22 +59,21 @@ 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)
-  // console.log(execChanges)
-  // console.log(definedChanges)
 
   if (options.stackChanges && element.__stackChanges) {
     const stackChanges = merge(definedChanges, merge(execChanges, overwriteChanges))
     element.__stackChanges.push(stackChanges)
   }
 
-  if (element.__ifFalsy) return element
+  if (element.__ifFalsy) return false
   if (!node) {
     // return createNode(element, options)
     return
   }
 
   if (element.on && isFunction(element.on.initUpdate) && !options.ignoreInitUpdate) {
-    on.initUpdate(element.on.initUpdate, element, element.state)
+    const whatinitreturns = on.initUpdate(element.on.initUpdate, element, element.state)
+    if (whatinitreturns === false) return
   }
 
   for (const param in element) {
@@ -78,20 +92,23 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
 
     if (ourParam) {
       if (isFunction(ourParam)) {
-        // console.log(param)
         ourParam(prop, element, node)
       }
     } else if (prop && isObject(prop) && !hasDefined) {
       if (!options.preventRecursive) {
-        const callChildUpdate = () => update.call(prop, params[prop], options)
+        const childUpdateCall = () => update.call(prop, params[prop], {  
+          ...options,
+          currentSnapshot: snapshotOnCallee,
+          calleeElement: element 
+        })
         if (element.props.lazyLoad || options.lazyLoad) {
-          window.requestAnimationFrame(() => callChildUpdate())
-        } else callChildUpdate()
+          window.requestAnimationFrame(() => childUpdateCall())
+        } else childUpdateCall()
       }
     }
   }
 
-  if (element.on && isFunction(element.on.update)) {
+  if (!options.preventUpdate && element.on && isFunction(element.on.update)) {
     on.update(element.on.update, element, element.state)
   }
 }

package/src/utils/node.js

@@ -2,9 +2,11 @@
 
 export const cleanWithNode = extend => delete extend.node && extend
 
-export const createID = (function * () {
+export const createSnapshotId = function * () {
   let index = 1
   while (index < index + 1) {
     yield index++
   }
-}())
+}
+
+export const createID = (createSnapshotId())

package/src/element/id.js

@@ -1,10 +0,0 @@
-'use strict'
-
-const createID = function * () {
-  let index = 1
-  while (index < index + 1) {
-    yield index++
-  }
-}
-
-export default createID()