@domql/state 2.3.121 → 2.3.122

package/createState.js

@@ -5,7 +5,7 @@ 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 { updateState } from './updateState'
-import { checkIfInherits, createInheritedState } from './utils'
+import { checkIfInherits, createInheritedState } from './inherit'
 
 export const createState = function (element, parent, opts) {
   const skip = (opts && opts.skip) ? opts.skip : false

package/dist/cjs/createState.js

@@ -26,7 +26,7 @@ var import_utils = require("@domql/utils");
 var import_ignore = require("./ignore");
 var import_methods = require("./methods");
 var import_updateState = require("./updateState");
-var import_utils2 = require("./utils");
+var import_inherit = require("./inherit");
 const createState = function(element, parent, opts) {
   const skip = opts && opts.skip ? opts.skip : false;
   const objectizeState = checkForTypes(element);
@@ -37,8 +37,8 @@ const createState = function(element, parent, opts) {
   const whatInitReturns = (0, import_event.triggerEventOn)("stateInit", element);
   if (whatInitReturns === false)
     return element.state;
-  if ((0, import_utils2.checkIfInherits)(element)) {
-    element.state = (0, import_utils2.createInheritedState)(element, parent) || {};
+  if ((0, import_inherit.checkIfInherits)(element)) {
+    element.state = (0, import_inherit.createInheritedState)(element, parent) || {};
   }
   const dependentState = applyDependentState(element, state);
   if (dependentState)

package/dist/cjs/index.js

@@ -19,4 +19,4 @@ __reExport(state_exports, require("./ignore"), module.exports);
 __reExport(state_exports, require("./createState"), module.exports);
 __reExport(state_exports, require("./updateState"), module.exports);
 __reExport(state_exports, require("./methods"), module.exports);
-__reExport(state_exports, require("./utils"), module.exports);
+__reExport(state_exports, require("./inherit"), module.exports);

package/dist/cjs/{utils.js → inherit.js}

@@ -16,18 +16,19 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var utils_exports = {};
-__export(utils_exports, {
+var inherit_exports = {};
+__export(inherit_exports, {
   checkIfInherits: () => checkIfInherits,
   createInheritedState: () => createInheritedState,
+  findInheritedState: () => findInheritedState,
   getChildStateInKey: () => getChildStateInKey,
   getParentStateInKey: () => getParentStateInKey,
   isState: () => isState
 });
-module.exports = __toCommonJS(utils_exports);
+module.exports = __toCommonJS(inherit_exports);
 var import_utils = require("@domql/utils");
-const getParentStateInKey = (stateKey, parentState) => {
-  const arr = stateKey.split("../");
+const getParentStateInKey = (stateKey2, parentState) => {
+  const arr = stateKey2.split("../");
   const arrLength = arr.length - 1;
   for (let i = 0; i < arrLength; i++) {
     if (!parentState.parent)
@@ -36,48 +37,52 @@ const getParentStateInKey = (stateKey, parentState) => {
   }
   return parentState;
 };
-const getChildStateInKey = (stateKey, parentState) => {
-  const arr = stateKey.split("/");
+const getChildStateInKey = (stateKey2, parentState) => {
+  const arr = stateKey2.split("/");
   const arrLength = arr.length - 1;
   for (let i = 0; i < arrLength; i++) {
     const childKey = arr[i];
     const grandChildKey = arr[i + 1];
     const childInParent = parentState[childKey];
     if (childInParent && childInParent[grandChildKey]) {
-      stateKey = grandChildKey;
+      stateKey2 = grandChildKey;
       parentState = childInParent;
     } else
       return;
   }
-  return parentState[stateKey];
+  return parentState[stateKey2];
 };
-const createInheritedState = (element, parent) => {
-  const __elementRef = element.__ref;
-  let stateKey = __elementRef.__state;
-  if (!stateKey || (0, import_utils.isNot)(stateKey)("number", "string"))
+const findInheritedState = (element, parent) => {
+  const ref = element.__ref;
+  let stateKey2 = ref.__state;
+  if (!stateKey2 || (0, import_utils.isNot)(stateKey2)("number", "string"))
     return element.state;
   let parentState = parent.state;
-  if (stateKey.includes("../")) {
-    parentState = getParentStateInKey(stateKey, parent.state);
-    stateKey = stateKey.replaceAll("../", "");
+  if (stateKey2.includes("../")) {
+    parentState = getParentStateInKey(stateKey2, parent.state);
+    stateKey2 = stateKey2.replaceAll("../", "");
   }
   if (!parentState)
     return;
-  const keyInParentState = getChildStateInKey(stateKey, parentState);
-  if (!keyInParentState)
+  return getChildStateInKey(stateKey2, parentState);
+};
+const createInheritedState = (element, parent) => {
+  const ref = element.__ref;
+  const inheritedState = findInheritedState(element, parent);
+  if (!inheritedState)
     return;
-  if ((0, import_utils.is)(keyInParentState)("object", "array")) {
-    return (0, import_utils.deepClone)(keyInParentState);
-  } else if ((0, import_utils.is)(keyInParentState)("string", "number")) {
-    __elementRef.__stateType = "string";
-    return { value: keyInParentState };
+  if ((0, import_utils.is)(inheritedState)("object", "array")) {
+    return (0, import_utils.deepClone)(inheritedState);
+  } else if ((0, import_utils.is)(inheritedState)("string", "number")) {
+    ref.__stateType = "string";
+    return { value: inheritedState };
   }
   console.warn(stateKey, "is not present. Replacing with", {});
 };
 const checkIfInherits = (element) => {
-  const __elementRef = element.__ref;
-  const stateKey = __elementRef.__state;
-  if (!stateKey || (0, import_utils.isNot)(stateKey)("number", "string"))
+  const ref = element.__ref;
+  const stateKey2 = ref.__state;
+  if (!stateKey2 || (0, import_utils.isNot)(stateKey2)("number", "string"))
     return false;
   return true;
 };

package/dist/cjs/updateState.js

@@ -25,7 +25,7 @@ var import_report = require("@domql/report");
 var import_event = require("@domql/event");
 var import_ignore = require("./ignore");
 var import_utils = require("@domql/utils");
-var import_utils2 = require("./utils");
+var import_inherit = require("./inherit");
 const updateState = function(obj, options = {}) {
   const state = this;
   const element = state.__element;
@@ -58,20 +58,21 @@ const applyOverwrite = (state, obj, options) => {
 };
 const hoistStateUpdate = (state, obj, options) => {
   const element = state.__element;
-  const __elementRef = element.__ref;
-  const stateKey = __elementRef.__state;
+  const { parent, __ref: ref } = element;
+  const stateKey = ref.__state;
   if (!stateKey)
     return;
-  const asksForInherit = (0, import_utils2.checkIfInherits)(element);
-  const shouldPropagateState = asksForInherit && !options.stopStatePropagation;
-  const parentState = element.parent.state;
+  const asksForInherit = (0, import_inherit.checkIfInherits)(element);
+  const inheritedState = (0, import_inherit.findInheritedState)(element, parent);
+  const shouldPropagateState = asksForInherit && inheritedState && !options.stopStatePropagation;
   if (!shouldPropagateState)
     return;
-  const isStringState = __elementRef.__stateType === "string";
+  console.log(inheritedState);
+  const isStringState = ref.__stateType === "string";
   const value = isStringState ? state.value : state.parse();
   const passedValue = isStringState ? state.value : obj;
-  parentState[stateKey] = value;
-  parentState.update({ [stateKey]: passedValue }, {
+  inheritedState[stateKey] = value;
+  inheritedState.update({ [stateKey]: passedValue }, {
     skipOverwrite: true,
     preventUpdate: options.preventHoistElementUpdate,
     ...options

package/index.js

@@ -4,4 +4,4 @@ export * from './ignore'
 export * from './createState'
 export * from './updateState'
 export * from './methods'
-export * from './utils'
+export * from './inherit'

package/{utils.js → inherit.js}

@@ -27,9 +27,9 @@ export const getChildStateInKey = (stateKey, parentState) => {
   return parentState[stateKey]
 }
 
-export const createInheritedState = (element, parent) => {
-  const __elementRef = element.__ref
-  let stateKey = __elementRef.__state
+export const findInheritedState = (element, parent) => {
+  const ref = element.__ref
+  let stateKey = ref.__state
   if (!stateKey || isNot(stateKey)('number', 'string')) return element.state
 
   let parentState = parent.state
@@ -38,23 +38,27 @@ export const createInheritedState = (element, parent) => {
     stateKey = stateKey.replaceAll('../', '')
   }
   if (!parentState) return
+  return getChildStateInKey(stateKey, parentState)
+}
 
-  const keyInParentState = getChildStateInKey(stateKey, parentState)
-  if (!keyInParentState) return
+export const createInheritedState = (element, parent) => {
+  const ref = element.__ref
+  const inheritedState = findInheritedState(element, parent)
+  if (!inheritedState) return
 
-  if (is(keyInParentState)('object', 'array')) {
-    return deepClone(keyInParentState)
-  } else if (is(keyInParentState)('string', 'number')) {
-    __elementRef.__stateType = 'string'
-    return { value: keyInParentState }
+  if (is(inheritedState)('object', 'array')) {
+    return deepClone(inheritedState)
+  } else if (is(inheritedState)('string', 'number')) {
+    ref.__stateType = 'string'
+    return { value: inheritedState }
   }
 
   console.warn(stateKey, 'is not present. Replacing with', {})
 }
 
 export const checkIfInherits = (element) => {
-  const __elementRef = element.__ref
-  const stateKey = __elementRef.__state
+  const ref = element.__ref
+  const stateKey = ref.__state
   if (!stateKey || isNot(stateKey)('number', 'string')) return false
   return true
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/state",
-  "version": "2.3.121",
+  "version": "2.3.122",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -26,5 +26,5 @@
     "@domql/report": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "7bb63fd5aab7bfa92c0aaa3a7205ff9a002fac1c"
+  "gitHead": "e599b1dc425a72bd3ec989b909f47bb51bf4dbac"
 }

package/updateState.js

@@ -4,7 +4,7 @@ import { report } from '@domql/report'
 import { triggerEventOn } from '@domql/event'
 import { IGNORE_STATE_PARAMS } from './ignore'
 import { deepMerge, overwriteDeep, overwriteShallow } from '@domql/utils'
-import { checkIfInherits } from './utils'
+import { checkIfInherits, findInheritedState } from './inherit'
 
 export const updateState = function (obj, options = {}) {
   const state = this
@@ -48,21 +48,22 @@ const applyOverwrite = (state, obj, options) => {
 
 const hoistStateUpdate = (state, obj, options) => {
   const element = state.__element
-  const __elementRef = element.__ref
-  const stateKey = __elementRef.__state
+  const { parent, __ref: ref } = element
+  const stateKey = ref.__state
   if (!stateKey) return
 
   const asksForInherit = checkIfInherits(element)
-  const shouldPropagateState = asksForInherit && !options.stopStatePropagation
-  const parentState = element.parent.state
-
+  const inheritedState = findInheritedState(element, parent)
+  const shouldPropagateState = asksForInherit && inheritedState && !options.stopStatePropagation
   if (!shouldPropagateState) return
-  const isStringState = (__elementRef.__stateType === 'string')
+  console.log(inheritedState)
+
+  const isStringState = (ref.__stateType === 'string')
   const value = isStringState ? state.value : state.parse()
   const passedValue = isStringState ? state.value : obj
 
-  parentState[stateKey] = value
-  parentState.update({ [stateKey]: passedValue }, {
+  inheritedState[stateKey] = value
+  inheritedState.update({ [stateKey]: passedValue }, {
     skipOverwrite: true,
     preventUpdate: options.preventHoistElementUpdate,
     ...options