@domql/state 2.5.15 → 2.5.18

package/create.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { triggerEventOn } from '@domql/event'
-import { deepClone, exec, is, isArray, isFunction, isObject } from '@domql/utils'
+import { deepClone, exec, is, isArray, isFunction, isObject, isUndefined } from '@domql/utils'
 import { IGNORE_STATE_PARAMS } from './ignore'
 import { add, apply, clean, destroy, parentUpdate, parse, remove, rootUpdate, set, toggle } from './methods'
 import { updateState } from './updateState'
@@ -22,7 +22,7 @@ export const applyInitialState = function (element, parent, options) {
 
   if (checkIfInherits(element)) {
     const inheritedState = createInheritedState(element, parent)
-    element.state = inheritedState || {}
+    element.state = isUndefined(inheritedState) ? {} : inheritedState
   }
 
   const dependentState = applyDependentState(element, element.state)
@@ -62,7 +62,7 @@ const checkForTypes = (element) => {
   } else if (state) {
     ref.__hasRootState = true
     return state
-  } else  {
+  } else {
     return false
   }
 }

package/dist/cjs/create.js

@@ -43,7 +43,7 @@ const applyInitialState = function(element, parent, options) {
     return element.state;
   if ((0, import_inherit.checkIfInherits)(element)) {
     const inheritedState = (0, import_inherit.createInheritedState)(element, parent);
-    element.state = inheritedState || {};
+    element.state = (0, import_utils.isUndefined)(inheritedState) ? {} : inheritedState;
   }
   const dependentState = applyDependentState(element, element.state);
   if (dependentState)

package/dist/cjs/inherit.js

@@ -79,12 +79,12 @@ const findInheritedState = (element, parent, options = {}) => {
 const createInheritedState = (element, parent) => {
   const ref = element.__ref;
   const inheritedState = findInheritedState(element, parent);
-  if (!inheritedState)
+  if ((0, import_utils.isUndefined)(inheritedState))
     return element.state;
   if ((0, import_utils.is)(inheritedState)("object", "array")) {
     return (0, import_utils.deepClone)(inheritedState, import_ignore.IGNORE_STATE_PARAMS);
-  } else if ((0, import_utils.is)(inheritedState)("string", "number")) {
-    ref.__stateType = "string";
+  } else if ((0, import_utils.is)(inheritedState)("string", "number", "boolean")) {
+    ref.__stateType = typeof inheritedState;
     return { value: inheritedState };
   }
   console.warn(ref.__state, "is not present. Replacing with", {});
@@ -92,9 +92,9 @@ const createInheritedState = (element, parent) => {
 const checkIfInherits = (element) => {
   const ref = element.__ref;
   const stateKey = ref.__state;
-  if (!stateKey || (0, import_utils.isNot)(stateKey)("number", "string"))
-    return false;
-  return true;
+  if (stateKey && (0, import_utils.is)(stateKey)("number", "string", "boolean"))
+    return true;
+  return false;
 };
 const isState = function(state) {
   if (!(0, import_utils.isObjectLike)(state))

package/dist/cjs/methods.js

@@ -75,7 +75,19 @@ const destroy = function(options = {}) {
     for (const key in state.__children) {
       const child = state.__children[key];
       if (child.state) {
-        child.parent = state.parent;
+        if ((0, import_utils.isArray)(child.state)) {
+          Object.defineProperty(child.state, "parent", {
+            value: state.parent,
+            enumerable: false,
+            // Set this to true if you want the method to appear in for...in loops
+            configurable: true,
+            // Set this to true if you want to allow redefining/removing the property later
+            writable: true
+            // Set this to true if you want to allow changing the function later
+          });
+        } else {
+          Object.setPrototypeOf(child, { parent: state.parent });
+        }
       }
     }
   }

package/dist/cjs/updateState.js

@@ -31,8 +31,7 @@ const STATE_UPDATE_OPTIONS = {
   preventHoistElementUpdate: false,
   updateByState: true,
   isHoisted: true,
-  execStateFunction: true,
-  stateFunctionOverwrite: true
+  execStateFunction: true
 };
 const updateState = function(obj, options = STATE_UPDATE_OPTIONS) {
   const state = this;
@@ -78,6 +77,7 @@ const hoistStateUpdate = (state, obj, options) => {
   const element = state.__element;
   const { parent, __ref: ref } = element;
   const stateKey = ref.__state;
+  const stateType = ref.__stateType;
   if (!stateKey)
     return;
   const asksForInherit = (0, import_inherit.checkIfInherits)(element);
@@ -85,7 +85,7 @@ const hoistStateUpdate = (state, obj, options) => {
   const shouldPropagateState = asksForInherit && inheritedState && !options.stopStatePropagation;
   if (!shouldPropagateState)
     return;
-  const isStringState = ref.__stateType === "string";
+  const isStringState = stateType === "string" || stateType === "number" || stateType === "boolean";
   const value = isStringState ? state.value : state.parse();
   const passedValue = isStringState ? state.value : obj;
   const findGrandParentState = (0, import_inherit.getParentStateInKey)(stateKey, parent.state);
@@ -95,7 +95,6 @@ const hoistStateUpdate = (state, obj, options) => {
     targetParent[stateKey] = value;
   targetParent.update(changesValue, {
     execStateFunction: false,
-    stateFunctionOverwrite: false,
     isHoisted: true,
     ...options,
     preventUpdate: options.preventHoistElementUpdate,

package/inherit.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { deepClone, is, isNot, isObjectLike } from '@domql/utils'
+import { deepClone, is, isObjectLike, isUndefined } from '@domql/utils'
 import { IGNORE_STATE_PARAMS } from './ignore'
 
 export const getParentStateInKey = (stateKey, parentState) => {
@@ -53,12 +53,12 @@ export const findInheritedState = (element, parent, options = {}) => {
 export const createInheritedState = (element, parent) => {
   const ref = element.__ref
   const inheritedState = findInheritedState(element, parent)
-  if (!inheritedState) return element.state
+  if (isUndefined(inheritedState)) return element.state
 
   if (is(inheritedState)('object', 'array')) {
     return deepClone(inheritedState, IGNORE_STATE_PARAMS)
-  } else if (is(inheritedState)('string', 'number')) {
-    ref.__stateType = 'string'
+  } else if (is(inheritedState)('string', 'number', 'boolean')) {
+    ref.__stateType = typeof inheritedState
     return { value: inheritedState }
   }
 
@@ -69,8 +69,8 @@ export const checkIfInherits = (element) => {
   const ref = element.__ref
   const stateKey = ref.__state
 
-  if (!stateKey || isNot(stateKey)('number', 'string')) return false
-  return true
+  if (stateKey && is(stateKey)('number', 'string', 'boolean')) return true
+  return false
 }
 
 export const isState = function (state) {

package/methods.js

@@ -53,7 +53,16 @@ export const destroy = function (options = {}) {
     for (const key in state.__children) {
       const child = state.__children[key]
       if (child.state) {
-        child.parent = state.parent
+        if (isArray(child.state)) {
+          Object.defineProperty(child.state, 'parent', {
+            value: state.parent,
+            enumerable: false, // Set this to true if you want the method to appear in for...in loops
+            configurable: true, // Set this to true if you want to allow redefining/removing the property later
+            writable: true // Set this to true if you want to allow changing the function later
+          })
+        } else {
+          Object.setPrototypeOf(child, { parent: state.parent })
+        }
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/state",
-  "version": "2.5.15",
+  "version": "2.5.18",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -31,5 +31,5 @@
     "@domql/report": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "2d858d6237f30594a8bbe97c6aca8bc6dc925f85"
+  "gitHead": "4aeead0b153d4cd5430694ecf45a5d3052f9f9f5"
 }

package/updateState.js

@@ -11,8 +11,7 @@ const STATE_UPDATE_OPTIONS = {
   preventHoistElementUpdate: false,
   updateByState: true,
   isHoisted: true,
-  execStateFunction: true,
-  stateFunctionOverwrite: true
+  execStateFunction: true
 }
 
 export const updateState = function (obj, options = STATE_UPDATE_OPTIONS) {
@@ -66,6 +65,7 @@ const hoistStateUpdate = (state, obj, options) => {
   const element = state.__element
   const { parent, __ref: ref } = element
   const stateKey = ref.__state
+  const stateType = ref.__stateType
   if (!stateKey) return
 
   const asksForInherit = checkIfInherits(element)
@@ -73,7 +73,7 @@ const hoistStateUpdate = (state, obj, options) => {
   const shouldPropagateState = asksForInherit && inheritedState && !options.stopStatePropagation
   if (!shouldPropagateState) return
 
-  const isStringState = (ref.__stateType === 'string')
+  const isStringState = (stateType === 'string' || stateType === 'number' || stateType === 'boolean')
   const value = isStringState ? state.value : state.parse()
   const passedValue = isStringState ? state.value : obj
 
@@ -83,7 +83,6 @@ const hoistStateUpdate = (state, obj, options) => {
   if (options.replace) targetParent[stateKey] = value
   targetParent.update(changesValue, {
     execStateFunction: false,
-    stateFunctionOverwrite: false,
     isHoisted: true,
     ...options,
     preventUpdate: options.preventHoistElementUpdate,