domql 1.5.57 → 1.5.59

package/package.json

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

package/src/element/methods.js

@@ -1,9 +1,8 @@
 'use strict'
 
 import { isFunction, isObject, isObjectLike } from '../utils'
-import { registry } from './mixins'
+import { registry, parseFilters } from './mixins'
 import root from './root'
-import { removeContentElement } from './set'
 
 const ENV = process.env.NODE_ENV
 
@@ -12,7 +11,7 @@ export const lookup = function (key) {
   const element = this
   let { parent } = element
 
-  while (parent.key !== key){
+  while (parent.key !== key) {
     if (parent[key]) return parent[key]
     parent = parent.parent
     if (!parent) return
@@ -74,9 +73,9 @@ export const keys = function () {
   const element = this
   const keys = []
   for (const param in element) {
-    if (!isObject(registry[param])) {
-      keys.push(param)
-    }
+    if (registry[param] && !parseFilters.elementKeys.includes(param))
+      continue
+    keys.push(param)
   }
   return keys
 }
@@ -93,8 +92,7 @@ export const parseDeep = function () {
   const element = this
   const obj = parse.call(element)
   for (const k in obj) {
-    if (isObjectLike(obj[k]))
-      obj[k] = parseDeep.call(obj[k])
+    if (isObjectLike(obj[k])) { obj[k] = parseDeep.call(obj[k]) }
   }
   return obj
 }
@@ -125,7 +123,7 @@ export const isMethod = function (param) {
     param === 'setProps' ||
     param === 'parseDeep' ||
     param === 'if' ||
-    param === 'log' || 
+    param === 'log' ||
     param === 'nextElement' ||
     param === 'previousElement'
 }

package/src/element/mixins/index.js

@@ -9,7 +9,6 @@ import style from './style'
 import text from './text'
 import state from './state'
 import registry from './registry'
-
 export {
   attr,
   classList,
@@ -19,5 +18,6 @@ export {
   text,
   html,
   state,
-  registry
+  registry,
 }
+export * from './registry'

package/src/element/mixins/registry.js

@@ -74,3 +74,15 @@ export default {
   component: {},
   context: {}
 }
+
+// List of keys for .parse() and .parseDeep() to include in the result.
+// Keys not in the array are excluded.
+export const parseFilters = {
+  elementKeys: [
+    'tag', 'text', 'style', 'attr', 'class', 'state', 'class',
+    'data', 'content', 'html',
+    // TODO: 'props' ?
+  ],
+  propsKeys: ['__element'],
+  stateKeys: [],
+}

package/src/element/state.js

@@ -60,7 +60,7 @@ export const updateState = function (obj, options = {}) {
   if (element.__state) {
     if (state.parent && state.parent[element.__state]) {
       const keyInParentState = state.parent[element.__state]
-      if (keyInParentState) {
+      if (keyInParentState && !options.stopStatePropogation) {
         return state.parent.update({ [element.__state]: obj }, options)
       }
     }
@@ -69,7 +69,7 @@ export const updateState = function (obj, options = {}) {
   }
 
   // TODO: try debounce
-  if (!options.preventUpdate) element.update({}, options)
+  if (!options.preventUpdate || options.preventUpdate === 'recursive') element.update({}, { ...options, preventUpdate: true })
 
   if (state.__depends) {
     for (const el in state.__depends) {
@@ -113,7 +113,7 @@ export default function (element, parent) {
   if (stateKey) {
     let parentState = parent.state
     let parentStateKey
-    if (stateKey.includes('../')) {
+    if (stateKey.includes('..')) {
       stateKey = stateKey.split('../')[1]
       parentState = parent.state.parent
     }

package/src/element/update.js

@@ -24,13 +24,13 @@ const UPDATE_DEFAULT_OPTIONS = {
 
 const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
   const element = this
-  const { define, parent, node, state } = element
+  const { define, parent, node } = element
 
   const { currentSnapshot, calleeElement } = options
   if (!calleeElement) {
     element.__currentSnapshot = snapshot.snapshotId()
   }
-  const snapshotOnCallee = element.__currentSnapshot || calleeElement && calleeElement.__currentSnapshot
+  const snapshotOnCallee = element.__currentSnapshot || (calleeElement && calleeElement.__currentSnapshot)
   if (snapshotOnCallee && currentSnapshot < snapshotOnCallee) {
     // console.log(calleeElement)
     // console.log(currentSnapshot, snapshotOnCallee, 'cancelling')
@@ -60,7 +60,7 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     if (keyInParentState) {
       element.state = createState(element, parent)
     }
-  } else if (!element.__hasRootState) element.state = parent && parent.state || {}
+  } else if (!element.__hasRootState) element.state = (parent && parent.state) || {}
 
   if (!element.__ifFalsy && !options.preventPropsUpdate) updateProps(params.props, element, parent)
 
@@ -88,9 +88,10 @@ const update = function (params = {}, options = UPDATE_DEFAULT_OPTIONS) {
     const prop = element[param]
 
     if (
-      options.preventDefineUpdate === true || options.preventDefineUpdate === param ||
-      options.preventContentUpdate && param === 'content' ||
-      options.preventStateUpdate && param === 'state' ||
+      options.preventDefineUpdate === true ||
+      options.preventDefineUpdate === param ||
+      (options.preventContentUpdate && param === 'content') ||
+      (options.preventStateUpdate && param) === 'state' ||
       isMethod(param) || isObject(registry[param]) || prop === undefined
     ) continue
     if (options.preventStateUpdate === 'once') options.preventStateUpdate = false