@domql/state 2.3.123 → 2.3.125

package/createState.js

@@ -3,7 +3,7 @@
 import { triggerEventOn } from '@domql/event'
 import { deepClone, exec, is, isFunction, isObject } from '@domql/utils'
 import { IGNORE_STATE_PARAMS } from './ignore'
-import { add, apply, clean, destroy, parse, remove, rootUpdate, toggle } from './methods'
+import { add, apply, clean, destroy, parse, remove, rootUpdate, set, toggle } from './methods'
 import { updateState } from './updateState'
 import { checkIfInherits, createInheritedState } from './inherit'
 
@@ -84,6 +84,7 @@ const applyMethods = (element) => {
   state.remove = remove
   state.apply = apply
   state.parent = element.parent.state
+  state.set = set
   state.__element = element
   state.__children = {}
   state.__root = ref.__root ? ref.__root.state : state

package/dist/cjs/createState.js

@@ -93,6 +93,7 @@ const applyMethods = (element) => {
   state.remove = import_methods.remove;
   state.apply = import_methods.apply;
   state.parent = element.parent.state;
+  state.set = import_methods.set;
   state.__element = element;
   state.__children = {};
   state.__root = ref.__root ? ref.__root.state : state;

package/dist/cjs/ignore.js

@@ -31,6 +31,7 @@ const IGNORE_STATE_PARAMS = [
   "toggle",
   "remove",
   "apply",
+  "set",
   "rootUpdate",
   "parent",
   "__element",

package/dist/cjs/methods.js

@@ -25,6 +25,7 @@ __export(methods_exports, {
   parse: () => parse,
   remove: () => remove,
   rootUpdate: () => rootUpdate,
+  set: () => set,
   toggle: () => toggle
 });
 module.exports = __toCommonJS(methods_exports);
@@ -51,7 +52,9 @@ const clean = function(options = {}) {
       delete state[param];
     }
   }
-  state.update(state, { skipOverwrite: true, options });
+  if (!options.preventStateUpdate) {
+    state.update(state, { replace: true, skipOverwrite: true, options });
+  }
   return state;
 };
 const destroy = function() {
@@ -77,6 +80,7 @@ const rootUpdate = function(obj, options = {}) {
   const state = this;
   if (!state)
     return;
+  console.log(options);
   const rootState = state.__element.__ref.__root.state;
   return rootState.update(obj, options);
 };
@@ -96,12 +100,18 @@ const toggle = function(key, options = {}) {
 };
 const remove = function(key, options = {}) {
   const state = this;
+  console.log(state);
   if ((0, import_utils.isArray)(state))
     (0, import_utils.removeFromArray)(state, key);
   if ((0, import_utils.isObject)(state))
     (0, import_utils.removeFromObject)(state, key);
   return state.update(state.parse(), { replace: true, ...options });
 };
+const set = function(value, options = {}) {
+  const state = this;
+  state.clean({ preventStateUpdate: true });
+  return state.update(value, { replace: true, ...options });
+};
 const apply = function(func, options = {}) {
   const state = this;
   if ((0, import_utils.isFunction)(func)) {

package/dist/cjs/updateState.js

@@ -27,20 +27,27 @@ var import_ignore = require("./ignore");
 var import_utils = require("@domql/utils");
 var import_inherit = require("./inherit");
 const STATE_UPDATE_OPTIONS = {
-  preventHoistElementUpdate: true
+  preventHoistElementUpdate: false,
+  updateByState: true
 };
 const updateState = function(obj, options = STATE_UPDATE_OPTIONS) {
   const state = this;
   const element = state.__element;
   if (!state.__element)
     (0, import_report.report)("ElementOnStateIsNotDefined");
+  if (options.preventInheritAtCurrentState === true) {
+    options.preventInheritAtCurrentState = state;
+  } else if (options.preventInheritAtCurrentState)
+    return;
   if (!options.preventInitStateUpdateListener) {
     const initStateUpdateReturns = (0, import_event.triggerEventOn)("initStateUpdated", element, obj);
     if (initStateUpdateReturns === false)
       return element;
   }
   applyOverwrite(state, obj, options);
-  hoistStateUpdate(state, obj, options);
+  const updateIsHousted = hoistStateUpdate(state, obj, options);
+  if (updateIsHousted)
+    return state;
   updateDependentState(state, obj, options);
   applyElementUpdate(state, obj, options);
   if (!options.preventStateUpdateListener) {
@@ -83,6 +90,7 @@ const hoistStateUpdate = (state, obj, options) => {
     preventUpdate: options.preventHoistElementUpdate,
     skipOverwrite: options.replace
   });
+  return true;
 };
 const updateDependentState = (state, obj, options) => {
   if (!state.__depends)
@@ -97,13 +105,11 @@ const applyElementUpdate = (state, obj, options) => {
   if (!options.preventUpdate) {
     element.update({}, {
       ...options,
-      updateByState: true,
-      preventUpdateTriggerStateUpdate: true
+      updateByState: true
     });
   } else if (options.preventUpdate === "recursive") {
     element.update({}, {
       ...options,
-      preventUpdateTriggerStateUpdate: true,
       updateByState: true,
       preventUpdate: true
     });

package/ignore.js

@@ -1,6 +1,6 @@
 'use strict'
 
 export const IGNORE_STATE_PARAMS = [
-  'update', 'parse', 'clean', 'create', 'destroy', 'add', 'toggle', 'remove', 'apply',
+  'update', 'parse', 'clean', 'create', 'destroy', 'add', 'toggle', 'remove', 'apply', 'set',
   'rootUpdate', 'parent', '__element', '__depends', '__ref', '__children', '__root'
 ]

package/methods.js

@@ -26,7 +26,9 @@ export const clean = function (options = {}) {
       delete state[param]
     }
   }
-  state.update(state, { skipOverwrite: true, options })
+  if (!options.preventStateUpdate) {
+    state.update(state, { replace: true, skipOverwrite: true, options })
+  }
   return state
 }
 
@@ -56,6 +58,7 @@ export const destroy = function () {
 export const rootUpdate = function (obj, options = {}) {
   const state = this
   if (!state) return
+  console.log(options)
   const rootState = (state.__element.__ref.__root).state
   return rootState.update(obj, options)
 }
@@ -65,8 +68,7 @@ export const add = function (value, options = {}) {
   if (isArray(state)) {
     state.push(value)
     state.update(state.parse(), { replace: true, ...options })
-  }
-  else if (isObject(state)) {
+  } else if (isObject(state)) {
     const key = Object.keys(state).length
     state.update({ [key]: value }, options)
   }
@@ -79,11 +81,18 @@ export const toggle = function (key, options = {}) {
 
 export const remove = function (key, options = {}) {
   const state = this
+  console.log(state)
   if (isArray(state)) removeFromArray(state, key)
   if (isObject(state)) removeFromObject(state, key)
   return state.update(state.parse(), { replace: true, ...options })
 }
 
+export const set = function (value, options = {}) {
+  const state = this
+  state.clean({ preventStateUpdate: true })
+  return state.update(value, { replace: true, ...options })
+}
+
 export const apply = function (func, options = {}) {
   const state = this
   if (isFunction(func)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/state",
-  "version": "2.3.123",
+  "version": "2.3.125",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -26,5 +26,5 @@
     "@domql/report": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "feb0d24eb5924f0f9ebea660a93afffc7d6a2059"
+  "gitHead": "c62e01157f488334d07a8bbd67f892d617d48f06"
 }

package/updateState.js

@@ -7,7 +7,8 @@ import { deepMerge, overwriteDeep, overwriteShallow } from '@domql/utils'
 import { checkIfInherits, createChangesByKey, findInheritedState, getParentStateInKey } from './inherit'
 
 const STATE_UPDATE_OPTIONS = {
-  preventHoistElementUpdate: true
+  preventHoistElementUpdate: false,
+  updateByState: true
 }
 
 export const updateState = function (obj, options = STATE_UPDATE_OPTIONS) {
@@ -15,6 +16,9 @@ export const updateState = function (obj, options = STATE_UPDATE_OPTIONS) {
   const element = state.__element
 
   if (!state.__element) report('ElementOnStateIsNotDefined')
+  if (options.preventInheritAtCurrentState === true) {
+    options.preventInheritAtCurrentState = state
+  } else if (options.preventInheritAtCurrentState) return
 
   if (!options.preventInitStateUpdateListener) {
     const initStateUpdateReturns = triggerEventOn('initStateUpdated', element, obj)
@@ -23,7 +27,8 @@ export const updateState = function (obj, options = STATE_UPDATE_OPTIONS) {
 
   applyOverwrite(state, obj, options)
 
-  hoistStateUpdate(state, obj, options)
+  const updateIsHousted = hoistStateUpdate(state, obj, options)
+  if (updateIsHousted) return state
 
   updateDependentState(state, obj, options)
 
@@ -44,6 +49,11 @@ const applyOverwrite = (state, obj, options) => {
     return
   }
 
+  // if (skipOverwrite === 'skipOverwrite') {
+  //   deepMerge(state, obj, IGNORE_STATE_PARAMS)
+  //   return
+  // }
+
   if (!skipOverwrite) {
     const overwriteFunc = shallow ? overwriteShallow : overwriteDeep
     overwriteFunc(state, obj, IGNORE_STATE_PARAMS)
@@ -74,6 +84,7 @@ const hoistStateUpdate = (state, obj, options) => {
     preventUpdate: options.preventHoistElementUpdate,
     skipOverwrite: options.replace
   })
+  return true
 }
 
 const updateDependentState = (state, obj, options) => {
@@ -89,13 +100,11 @@ const applyElementUpdate = (state, obj, options) => {
   if (!options.preventUpdate) {
     element.update({}, {
       ...options,
-      updateByState: true,
-      preventUpdateTriggerStateUpdate: true
+      updateByState: true
     })
   } else if (options.preventUpdate === 'recursive') {
     element.update({}, {
       ...options,
-      preventUpdateTriggerStateUpdate: true,
       updateByState: true,
       preventUpdate: true
     })