@domql/state 2.3.130 → 2.3.137

package/dist/cjs/inherit.js

@@ -29,10 +29,10 @@ __export(inherit_exports, {
 module.exports = __toCommonJS(inherit_exports);
 var import_utils = require("@domql/utils");
 var import_ignore = require("./ignore");
-const getParentStateInKey = (stateKey2, parentState) => {
-  if (!stateKey2.includes("../"))
+const getParentStateInKey = (stateKey, parentState) => {
+  if (!stateKey.includes("../"))
     return;
-  const arr = stateKey2.split("../");
+  const arr = stateKey.split("../");
   const arrLength = arr.length - 1;
   for (let i = 0; i < arrLength; i++) {
     if (!parentState.parent)
@@ -41,37 +41,37 @@ const getParentStateInKey = (stateKey2, parentState) => {
   }
   return parentState;
 };
-const getChildStateInKey = (stateKey2, parentState, options) => {
-  const arr = stateKey2.split("/");
+const getChildStateInKey = (stateKey, parentState, options) => {
+  const arr = stateKey.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]) {
-      stateKey2 = grandChildKey;
+      stateKey = grandChildKey;
       parentState = childInParent;
     } else
       return;
   }
   if (options.returnParent)
     return parentState;
-  return parentState[stateKey2];
+  return parentState[stateKey];
 };
 const findInheritedState = (element, parent, options = {}) => {
   const ref = element.__ref;
-  let stateKey2 = ref.__state;
+  let stateKey = ref.__state;
   if (!checkIfInherits(element))
     return;
   let parentState = parent.state;
-  const findGrandParentState = getParentStateInKey(stateKey2, parent.state);
+  const findGrandParentState = getParentStateInKey(stateKey, parent.state);
   if (findGrandParentState) {
     parentState = findGrandParentState;
-    stateKey2 = stateKey2.replaceAll("../", "");
+    stateKey = stateKey.replaceAll("../", "");
   }
   if (!parentState)
     return;
-  return getChildStateInKey(stateKey2, parentState, options);
+  return getChildStateInKey(stateKey, parentState, options);
 };
 const createInheritedState = (element, parent) => {
   const ref = element.__ref;
@@ -84,12 +84,12 @@ const createInheritedState = (element, parent) => {
     ref.__stateType = "string";
     return { value: inheritedState };
   }
-  console.warn(stateKey, "is not present. Replacing with", {});
+  console.warn(ref.__state, "is not present. Replacing with", {});
 };
 const checkIfInherits = (element) => {
   const ref = element.__ref;
-  const stateKey2 = ref.__state;
-  if (!stateKey2 || (0, import_utils.isNot)(stateKey2)("number", "string"))
+  const stateKey = ref.__state;
+  if (!stateKey || (0, import_utils.isNot)(stateKey)("number", "string"))
     return false;
   return true;
 };
@@ -104,7 +104,7 @@ const createChangesByKey = (path, value) => {
     return value || {};
   }
   const keys = path.split("/");
-  let obj = {};
+  const obj = {};
   let ref = obj;
   keys.forEach((key, index) => {
     ref[key] = index === keys.length - 1 ? value || {} : {};

package/dist/cjs/methods.js

@@ -125,6 +125,6 @@ const apply = function(func, options = {}) {
   const state = this;
   if ((0, import_utils.isFunction)(func)) {
     func(state);
-    return state.update(state, { overwrite: "replace", ...options });
+    return state.update(state, { replace: true, ...options });
   }
 };

package/dist/cjs/updateState.js

@@ -37,6 +37,7 @@ const STATE_UPDATE_OPTIONS = {
 const updateState = function(obj, options = STATE_UPDATE_OPTIONS) {
   const state = this;
   const element = state.__element;
+  console.log(options);
   if (!options.updateByState)
     (0, import_utils.merge)(options, STATE_UPDATE_OPTIONS);
   if (!state.__element)
@@ -101,7 +102,7 @@ const hoistStateUpdate = (state, obj, options) => {
     preventUpdate: options.preventHoistElementUpdate,
     overwrite: !options.replace
   });
-  const hasNotUpdated = !options.preventUpdate || !options.preventHoistElementUpdate;
+  const hasNotUpdated = options.preventUpdate !== true || !options.preventHoistElementUpdate;
   if (!options.preventStateUpdateListener && hasNotUpdated) {
     (0, import_event.triggerEventOnUpdate)("stateUpdated", obj, element, options);
   }
@@ -117,7 +118,8 @@ const updateDependentState = (state, obj, options) => {
 };
 const applyElementUpdate = (state, obj, options) => {
   const element = state.__element;
-  if (!options.preventUpdate) {
+  console.log("update", element.key);
+  if (options.preventUpdate !== true) {
     element.update({}, {
       ...options,
       updateByState: true

package/inherit.js

@@ -58,7 +58,7 @@ export const createInheritedState = (element, parent) => {
     return { value: inheritedState }
   }
 
-  console.warn(stateKey, 'is not present. Replacing with', {})
+  console.warn(ref.__state, 'is not present. Replacing with', {})
 }
 
 export const checkIfInherits = (element) => {
@@ -76,14 +76,14 @@ export const isState = function (state) {
 
 export const createChangesByKey = (path, value) => {
   if (!path) {
-    return value || {};
+    return value || {}
   }
-  const keys = path.split('/');
-  let obj = {};
-  let ref = obj;
+  const keys = path.split('/')
+  const obj = {}
+  let ref = obj
   keys.forEach((key, index) => {
-    ref[key] = index === keys.length - 1 ? value || {} : {};
-    ref = ref[key];
-  });
-  return obj;
+    ref[key] = index === keys.length - 1 ? value || {} : {}
+    ref = ref[key]
+  })
+  return obj
 }

package/methods.js

@@ -108,6 +108,6 @@ export const apply = function (func, options = {}) {
   const state = this
   if (isFunction(func)) {
     func(state)
-    return state.update(state, { overwrite: 'replace', ...options })
+    return state.update(state, { replace: true, ...options })
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/state",
-  "version": "2.3.130",
+  "version": "2.3.137",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -26,5 +26,5 @@
     "@domql/report": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "6160195e1279dda74af7a092e863e4bbf397e81e"
+  "gitHead": "07ca3db13100667ebe3915db37a18b6e694a3ce3"
 }

package/updateState.js

@@ -18,6 +18,7 @@ const STATE_UPDATE_OPTIONS = {
 export const updateState = function (obj, options = STATE_UPDATE_OPTIONS) {
   const state = this
   const element = state.__element
+  console.log(options)
 
   if (!options.updateByState) merge(options, STATE_UPDATE_OPTIONS)
 
@@ -32,7 +33,6 @@ export const updateState = function (obj, options = STATE_UPDATE_OPTIONS) {
   }
 
   applyOverwrite(state, obj, options)
-
   const updateIsHoisted = hoistStateUpdate(state, obj, options)
   if (updateIsHoisted) return state
 
@@ -90,7 +90,7 @@ const hoistStateUpdate = (state, obj, options) => {
     preventUpdate: options.preventHoistElementUpdate,
     overwrite: !options.replace
   })
-  const hasNotUpdated = !options.preventUpdate || !options.preventHoistElementUpdate
+  const hasNotUpdated = options.preventUpdate !== true || !options.preventHoistElementUpdate
   if (!options.preventStateUpdateListener && hasNotUpdated) {
     triggerEventOnUpdate('stateUpdated', obj, element, options)
   }
@@ -107,7 +107,8 @@ const updateDependentState = (state, obj, options) => {
 
 const applyElementUpdate = (state, obj, options) => {
   const element = state.__element
-  if (!options.preventUpdate) {
+  console.log('update', element.key)
+  if (options.preventUpdate !== true) {
     element.update({}, {
       ...options,
       updateByState: true