@domql/state 2.5.53 → 2.5.64

package/create.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { triggerEventOn } from '@domql/event'
-import { deepCloneWithExtnd, exec, is, isArray, isFunction, isObject, isUndefined } from '@domql/utils'
+import { deepCloneWithExtend, exec, is, isArray, isFunction, isObject, isUndefined } from '@domql/utils'
 import { IGNORE_STATE_PARAMS } from './ignore'
 import {
   add,
@@ -27,7 +27,7 @@ export const createState = function (element, parent, options) {
 export const applyInitialState = function (element, parent, options) {
   const objectizeState = checkForTypes(element)
   if (objectizeState === false) return parent.state || {}
-  else element.state = deepCloneWithExtnd(objectizeState, IGNORE_STATE_PARAMS)
+  else element.state = deepCloneWithExtend(objectizeState, IGNORE_STATE_PARAMS)
 
   const whatInitReturns = triggerEventOn('stateInit', element, options)
   if (whatInitReturns === false) return element.state
@@ -51,7 +51,7 @@ export const applyInitialState = function (element, parent, options) {
 const applyDependentState = (element, state) => {
   const { __ref: ref } = state
   if (!ref) return
-  const dependentState = deepCloneWithExtnd(ref, IGNORE_STATE_PARAMS)
+  const dependentState = deepCloneWithExtend(ref, IGNORE_STATE_PARAMS)
   const newDepends = { [element.key]: dependentState }
   ref.__depends = isObject(ref.__depends)
     ? { ...ref.__depends, ...newDepends }

package/dist/cjs/create.js

@@ -37,7 +37,7 @@ const applyInitialState = function(element, parent, options) {
   if (objectizeState === false)
     return parent.state || {};
   else
-    element.state = (0, import_utils.deepCloneWithExtnd)(objectizeState, import_ignore.IGNORE_STATE_PARAMS);
+    element.state = (0, import_utils.deepCloneWithExtend)(objectizeState, import_ignore.IGNORE_STATE_PARAMS);
   const whatInitReturns = (0, import_event.triggerEventOn)("stateInit", element, options);
   if (whatInitReturns === false)
     return element.state;
@@ -56,7 +56,7 @@ const applyDependentState = (element, state) => {
   const { __ref: ref } = state;
   if (!ref)
     return;
-  const dependentState = (0, import_utils.deepCloneWithExtnd)(ref, import_ignore.IGNORE_STATE_PARAMS);
+  const dependentState = (0, import_utils.deepCloneWithExtend)(ref, import_ignore.IGNORE_STATE_PARAMS);
   const newDepends = { [element.key]: dependentState };
   ref.__depends = (0, import_utils.isObject)(ref.__depends) ? { ...ref.__depends, ...newDepends } : newDepends;
   return dependentState;

package/dist/cjs/inherit.js

@@ -19,16 +19,24 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var inherit_exports = {};
 __export(inherit_exports, {
   checkIfInherits: () => checkIfInherits,
-  createChangesByKey: () => createChangesByKey,
   createInheritedState: () => createInheritedState,
+  createNestedObjectByKeyPath: () => createNestedObjectByKeyPath,
   findInheritedState: () => findInheritedState,
   getChildStateInKey: () => getChildStateInKey,
   getParentStateInKey: () => getParentStateInKey,
+  getRootStateInKey: () => getRootStateInKey,
   isState: () => isState
 });
 module.exports = __toCommonJS(inherit_exports);
 var import_utils = require("@domql/utils");
 var import_ignore = require("./ignore");
+const getRootStateInKey = (stateKey, parentState) => {
+  if (!stateKey.includes("~/"))
+    return;
+  const arr = stateKey.split("~/");
+  if (arr.length > 1)
+    return parentState.__root;
+};
 const getParentStateInKey = (stateKey, parentState) => {
   if (!stateKey.includes("../"))
     return;
@@ -66,11 +74,17 @@ const findInheritedState = (element, parent, options = {}) => {
   let stateKey = ref.__state;
   if (!checkIfInherits(element))
     return;
+  const rootState = getRootStateInKey(stateKey, parent.state);
   let parentState = parent.state;
-  const findGrandParentState = getParentStateInKey(stateKey, parent.state);
-  if (findGrandParentState) {
-    parentState = findGrandParentState;
-    stateKey = stateKey.replaceAll("../", "");
+  if (rootState) {
+    parentState = rootState;
+    stateKey = stateKey.replaceAll("~/", "");
+  } else {
+    const findGrandParentState = getParentStateInKey(stateKey, parent.state);
+    if (findGrandParentState) {
+      parentState = findGrandParentState;
+      stateKey = stateKey.replaceAll("../", "");
+    }
   }
   if (!parentState)
     return;
@@ -82,7 +96,7 @@ const createInheritedState = (element, parent) => {
   if ((0, import_utils.isUndefined)(inheritedState))
     return element.state;
   if ((0, import_utils.is)(inheritedState)("object", "array")) {
-    return (0, import_utils.deepCloneWithExtnd)(inheritedState, import_ignore.IGNORE_STATE_PARAMS);
+    return (0, import_utils.deepCloneWithExtend)(inheritedState, import_ignore.IGNORE_STATE_PARAMS);
   } else if ((0, import_utils.is)(inheritedState)("string", "number", "boolean")) {
     ref.__stateType = typeof inheritedState;
     return { value: inheritedState };
@@ -101,7 +115,7 @@ const isState = function(state) {
     return false;
   return state.update && state.parse && state.clean && state.create && state.parent && state.destroy && state.rootUpdate && state.parentUpdate && state.toggle && state.add && state.apply && state.__element && state.__children;
 };
-const createChangesByKey = (path, value) => {
+const createNestedObjectByKeyPath = (path, value) => {
   if (!path) {
     return value || {};
   }

package/dist/cjs/methods.js

@@ -112,7 +112,7 @@ const add = function(value, options = {}) {
   const state = this;
   if ((0, import_utils.isArray)(state)) {
     state.push(value);
-    state.update(state.parse(), { overwrite: "replace", ...options });
+    state.update(state.parse(), { overwrite: true, ...options });
   } else if ((0, import_utils.isObject)(state)) {
     const key = Object.keys(state).length;
     state.update({ [key]: value }, options);
@@ -132,12 +132,12 @@ const remove = function(key, options = {}) {
 };
 const set = function(val, options = {}) {
   const state = this;
-  const value = (0, import_utils.deepCloneWithExtnd)(val);
+  const value = (0, import_utils.deepCloneWithExtend)(val);
   return state.clean({ preventStateUpdate: true, ...options }).update(value, { replace: true, ...options });
 };
 const reset = function(options = {}) {
   const state = this;
-  const value = (0, import_utils.deepCloneWithExtnd)(state.parse());
+  const value = (0, import_utils.deepCloneWithExtend)(state.parse());
   return state.set(value, { replace: true, ...options });
 };
 const apply = function(func, options = {}) {

package/dist/cjs/updateState.js

@@ -90,9 +90,10 @@ const hoistStateUpdate = (state, obj, options) => {
   const isStringState = stateType === "string" || stateType === "number" || stateType === "boolean";
   const value = isStringState ? state.value : state.parse();
   const passedValue = isStringState ? state.value : obj;
+  const findRootState = (0, import_inherit.getRootStateInKey)(stateKey, parent.state);
   const findGrandParentState = (0, import_inherit.getParentStateInKey)(stateKey, parent.state);
-  const changesValue = (0, import_inherit.createChangesByKey)(stateKey, passedValue);
-  const targetParent = findGrandParentState || parent.state;
+  const changesValue = (0, import_inherit.createNestedObjectByKeyPath)(stateKey, passedValue);
+  const targetParent = findRootState || findGrandParentState || parent.state;
   if (options.replace)
     (0, import_utils.overwriteDeep)(targetParent, changesValue || value);
   targetParent.update(changesValue, {

package/inherit.js

@@ -1,8 +1,14 @@
 'use strict'
 
-import { deepCloneWithExtnd, is, isObjectLike, isUndefined } from '@domql/utils'
+import { deepCloneWithExtend, is, isObjectLike, isUndefined } from '@domql/utils'
 import { IGNORE_STATE_PARAMS } from './ignore'
 
+export const getRootStateInKey = (stateKey, parentState) => {
+  if (!stateKey.includes('~/')) return
+  const arr = stateKey.split('~/')
+  if (arr.length > 1) return parentState.__root
+}
+
 export const getParentStateInKey = (stateKey, parentState) => {
   if (!stateKey.includes('../')) return
   const arr = stateKey.split('../')
@@ -39,11 +45,18 @@ export const findInheritedState = (element, parent, options = {}) => {
   let stateKey = ref.__state
   if (!checkIfInherits(element)) return
 
+  const rootState = getRootStateInKey(stateKey, parent.state)
   let parentState = parent.state
-  const findGrandParentState = getParentStateInKey(stateKey, parent.state)
-  if (findGrandParentState) {
-    parentState = findGrandParentState
-    stateKey = stateKey.replaceAll('../', '')
+
+  if (rootState) {
+    parentState = rootState
+    stateKey = stateKey.replaceAll('~/', '')
+  } else {
+    const findGrandParentState = getParentStateInKey(stateKey, parent.state)
+    if (findGrandParentState) {
+      parentState = findGrandParentState
+      stateKey = stateKey.replaceAll('../', '')
+    }
   }
 
   if (!parentState) return
@@ -56,7 +69,7 @@ export const createInheritedState = (element, parent) => {
   if (isUndefined(inheritedState)) return element.state
 
   if (is(inheritedState)('object', 'array')) {
-    return deepCloneWithExtnd(inheritedState, IGNORE_STATE_PARAMS)
+    return deepCloneWithExtend(inheritedState, IGNORE_STATE_PARAMS)
   } else if (is(inheritedState)('string', 'number', 'boolean')) {
     ref.__stateType = typeof inheritedState
     return { value: inheritedState }
@@ -91,7 +104,7 @@ export const isState = function (state) {
   // return arrayContainsOtherArray(keys, ['update', 'parse', 'clean', 'create', 'parent', 'rootUpdate'])
 }
 
-export const createChangesByKey = (path, value) => {
+export const createNestedObjectByKeyPath = (path, value) => {
   if (!path) {
     return value || {}
   }

package/methods.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { isArray, deepCloneWithExtnd, isFunction, isObject, isString, removeFromArray, removeFromObject } from '@domql/utils'
+import { isArray, deepCloneWithExtend, isFunction, isObject, isString, removeFromArray, removeFromObject } from '@domql/utils'
 
 import { IGNORE_STATE_PARAMS } from './ignore'
 
@@ -88,7 +88,7 @@ export const add = function (value, options = {}) {
   const state = this
   if (isArray(state)) {
     state.push(value)
-    state.update(state.parse(), { overwrite: 'replace', ...options })
+    state.update(state.parse(), { overwrite: true, ...options })
   } else if (isObject(state)) {
     const key = Object.keys(state).length
     state.update({ [key]: value }, options)
@@ -109,14 +109,14 @@ export const remove = function (key, options = {}) {
 
 export const set = function (val, options = {}) {
   const state = this
-  const value = deepCloneWithExtnd(val)
+  const value = deepCloneWithExtend(val)
   return state.clean({ preventStateUpdate: true, ...options })
     .update(value, { replace: true, ...options })
 }
 
 export const reset = function (options = {}) {
   const state = this
-  const value = deepCloneWithExtnd(state.parse())
+  const value = deepCloneWithExtend(state.parse())
   return state.set(value, { replace: true, ...options })
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/state",
-  "version": "2.5.53",
+  "version": "2.5.64",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -31,5 +31,5 @@
     "@domql/report": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "aafcffa2ebe3d9c2fb96bd3adcb05325b62e68ff"
+  "gitHead": "ed8570ce73011589d920684013958c081147a39c"
 }

package/updateState.js

@@ -4,7 +4,7 @@ import { report } from '@domql/report'
 import { triggerEventOnUpdate } from '@domql/event'
 import { IGNORE_STATE_PARAMS } from './ignore'
 import { deepMerge, merge, overwriteDeep, overwriteShallow } from '@domql/utils'
-import { checkIfInherits, createChangesByKey, findInheritedState, getParentStateInKey } from './inherit'
+import { checkIfInherits, createNestedObjectByKeyPath, findInheritedState, getParentStateInKey, getRootStateInKey } from './inherit'
 
 const STATE_UPDATE_OPTIONS = {
   overwrite: true,
@@ -78,10 +78,11 @@ const hoistStateUpdate = (state, obj, options) => {
   const value = isStringState ? state.value : state.parse()
   const passedValue = isStringState ? state.value : obj
 
+  const findRootState = getRootStateInKey(stateKey, parent.state)
   const findGrandParentState = getParentStateInKey(stateKey, parent.state)
-  const changesValue = createChangesByKey(stateKey, passedValue)
-  const targetParent = findGrandParentState || parent.state
-  if (options.replace) overwriteDeep(targetParent, changesValue || value) // check with createChangesByKey
+  const changesValue = createNestedObjectByKeyPath(stateKey, passedValue)
+  const targetParent = findRootState || findGrandParentState || parent.state
+  if (options.replace) overwriteDeep(targetParent, changesValue || value) // check with createNestedObjectByKeyPath
   targetParent.update(changesValue, {
     execStateFunction: false,
     isHoisted: true,