domql 1.6.7 → 1.6.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "domql",
   "description": "DOM rendering Javascript framework at early stage.",
-  "version": "1.6.7",
+  "version": "1.6.9",
   "repository": "https://github.com/domql/domql",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/src/element/state.js

@@ -1,12 +1,23 @@
 'use strict'
 
 import { triggerEventOn } from '@domql/event'
-import { is, isObject, exec, isFunction, isUndefined, arrayContainsOtherArray, isObjectLike, isArray, removeFromArray, removeFromObject } from '@domql/utils'
+import {
+  is,
+  isObject,
+  exec,
+  isFunction,
+  arrayContainsOtherArray,
+  isObjectLike,
+  isArray,
+  removeFromArray,
+  removeFromObject,
+  isNot
+} from '@domql/utils'
 import { deepClone, overwriteShallow, overwriteDeep } from '../utils'
 import { create } from '.'
 
 export const IGNORE_STATE_PARAMS = [
-  'update', 'parse', 'clean', 'create', 'destroy', 'remove', 'apply', 'rootUpdate',
+  'update', 'parse', 'clean', 'create', 'destroy', 'add', 'remove', 'apply', 'rootUpdate',
   'parent', '__element', '__depends', '__ref', '__children', '__root'
 ]
 
@@ -73,15 +84,7 @@ export const updateState = function (obj, options = {}) {
   const parentState = element.parent.state
   state.parent = parentState
 
-  for (const param in state) {
-    if (isUndefined(state[param])) {
-      delete state[param]
-    }
-  }
-
-  if (!state.__element) {
-    create(element, element.parent)
-  }
+  if (!state.__element && options.createElementFallback) { create(element, element.parent) }
 
   const initStateUpdateReturns = triggerEventOn('initStateUpdated', element, obj)
   if (initStateUpdateReturns === false) return element
@@ -99,9 +102,20 @@ export const updateState = function (obj, options = {}) {
   if (shouldPropagateState) {
     const isStringState = (__elementRef.__stateType === 'string')
     const value = isStringState ? state.value : state.parse()
+    const passedValue = isStringState ? state.value : obj
+
     parentState[stateKey] = value
-    parentState.update(value, { skipOverwrite: true, ...options })
-    return state
+    parentState.update({ [stateKey]: passedValue }, {
+      skipOverwrite: true,
+      preventUpdate: options.preventHoistElementUpdate,
+      ...options
+    })
+
+    if (!options.preventUpdateListener) {
+      triggerEventOn('stateUpdated', element, value)
+    }
+
+    if (!options.preventHoistElementUpdate) return state
   }
 
   if (!options.preventUpdate) {
@@ -124,18 +138,27 @@ export const updateState = function (obj, options = {}) {
   return state
 }
 
-export const remove = function (key, options) {
+export const add = function (value, options = {}) {
+  const state = this
+  if (isArray(state)) {
+    state.push(value)
+    console.log(state)
+    state.update(state.parse(), { skipOverwrite: true, ...options })
+  }
+}
+
+export const remove = function (key, options = {}) {
   const state = this
   if (isArray(state)) removeFromArray(state, key)
   if (isObject(state)) removeFromObject(state, key)
-  return state.update(state, { skipOverwrite: true, options })
+  return state.update(state.parse(), { skipOverwrite: true, ...options })
 }
 
-export const apply = function (func, options) {
+export const apply = function (func, options = {}) {
   const state = this
   if (isFunction(func)) {
     func(state)
-    return state.update(state, { skipOverwrite: true, options })
+    return state.update(state, { skipOverwrite: true, ...options })
   }
 }
 
@@ -167,7 +190,7 @@ const getChildStateInKey = (stateKey, parentState) => {
 const createInheritedState = function (element, parent) {
   const __elementRef = element.__ref
   let stateKey = __elementRef.__state
-  if (!stateKey) return element.state
+  if (!stateKey || isNot(stateKey)('number', 'string')) return element.state
 
   let parentState = parent.state
   if (stateKey.includes('../')) {
@@ -194,7 +217,10 @@ export const createState = function (element, parent, opts) {
   const skip = (opts && opts.skip) ? opts.skip : false
   let { state, __ref: __elementRef } = element
 
-  if (isFunction(state)) element.state = exec(state, element)
+  if (isFunction(state)) {
+    __elementRef.__state = state
+    state = element.state = exec(state, element)
+  }
 
   if (is(state)('string', 'number')) {
     __elementRef.__state = state
@@ -258,6 +284,7 @@ const applyMethods = (element, state) => {
   state.update = updateState
   state.rootUpdate = rootUpdate
   state.create = createState
+  state.add = add
   state.remove = remove
   state.apply = apply
   state.parent = element.parent.state

package/src/element/update.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { window } from '@domql/globals'
-import { isFunction, isNumber, isObject, isString } from '@domql/utils'
+import { exec, isFunction, isNumber, isObject, isString } from '@domql/utils'
 import { applyEvent, triggerEventOn } from '@domql/event'
 import { isMethod } from '@domql/methods'
 import { createSnapshotId } from '@domql/key'
@@ -158,13 +158,21 @@ const checkIfOnUpdate = (element, options) => {
 const inheritStateUpdates = (element, options) => {
   const { __ref } = element
   const stateKey = __ref.__state
-  const { parent } = element
+  const { parent, state } = element
+
+  if (options.preventUpdateTriggerStateUpdate) return
 
   if (!stateKey && !__ref.__hasRootState) {
     element.state = (parent && parent.state) || {}
     return
   }
 
+  if (isFunction(stateKey)) {
+    const execState = exec(stateKey, element)
+    state.update(execState, { preventUpdateTriggerStateUpdate: true, ...options })
+    return false
+  }
+
   const parentState = (parent && parent.state) || {}
   const keyInParentState = parentState[stateKey]