@domql/state 3.2.3 → 3.2.8

package/create.js

@@ -1,15 +1,15 @@
 'use strict'
 
-import { triggerEventOn } from '@domql/event'
 import {
   applyDependentState,
   checkForStateTypes,
   checkIfInherits,
   createInheritedState,
-  isUndefined
+  isUndefined,
+  triggerEventOn
 } from '@domql/utils'
 
-import { applyStateMethods } from './methods'
+import { applyStateMethods } from './methods.js'
 
 export const createState = function (element, parent, options) {
   element.state = applyInitialState(element, parent, options)

package/dist/cjs/create.js

@@ -22,9 +22,8 @@ __export(create_exports, {
   createState: () => createState
 });
 module.exports = __toCommonJS(create_exports);
-var import_event = require("@domql/event");
 var import_utils = require("@domql/utils");
-var import_methods = require("./methods");
+var import_methods = require("./methods.js");
 const createState = function(element, parent, options) {
   element.state = applyInitialState(element, parent, options);
   return element.state;
@@ -33,7 +32,7 @@ const applyInitialState = function(element, parent, options) {
   const objectizeState = (0, import_utils.checkForStateTypes)(element);
   if (objectizeState === false) return parent.state || {};
   else element.state = objectizeState;
-  const whatInitReturns = (0, import_event.triggerEventOn)("stateInit", element, options);
+  const whatInitReturns = (0, import_utils.triggerEventOn)("stateInit", element, options);
   if (whatInitReturns === false) return element.state;
   if ((0, import_utils.checkIfInherits)(element)) {
     const inheritedState = (0, import_utils.createInheritedState)(element, parent);
@@ -45,6 +44,6 @@ const applyInitialState = function(element, parent, options) {
   );
   if (dependentState) element.state = dependentState;
   (0, import_methods.applyStateMethods)(element);
-  (0, import_event.triggerEventOn)("stateCreated", element);
+  (0, import_utils.triggerEventOn)("stateCreated", element);
   return element.state;
 };

package/dist/cjs/methods.js

@@ -52,19 +52,19 @@ const parse = function() {
   if ((0, import_utils.isObject)(state)) {
     const obj = {};
     for (const param in state) {
-      if (!import_utils.STATE_METHODS.includes(param)) {
+      if (!import_utils.STATE_METHODS.has(param)) {
         obj[param] = state[param];
       }
     }
     return obj;
   } else if ((0, import_utils.isArray)(state)) {
-    return state.filter((item) => !import_utils.STATE_METHODS.includes(item));
+    return state.filter((item) => !import_utils.STATE_METHODS.has(item));
   }
 };
 const clean = function(options = {}) {
   const state = this;
   for (const param in state) {
-    if (!import_utils.STATE_METHODS.includes(param) && Object.hasOwnProperty.call(state, param)) {
+    if (!import_utils.STATE_METHODS.has(param) && Object.prototype.hasOwnProperty.call(state, param)) {
       delete state[param];
     }
   }
@@ -137,7 +137,7 @@ const toggle = function(key, options = {}) {
 const remove = function(key, options = {}) {
   const state = this;
   if ((0, import_utils.isArray)(state)) (0, import_utils.removeFromArray)(state, key);
-  if ((0, import_utils.isObject)(state)) (0, import_utils.removeFromObject)(state, key);
+  else if ((0, import_utils.isObject)(state)) (0, import_utils.removeFromObject)(state, key);
   if (options.applyReset) {
     return state.set(state.parse(), { replace: true, ...options });
   }
@@ -159,8 +159,7 @@ const setByPath = function(path, val, options = {}) {
 };
 const setPathCollection = function(changes, options = {}) {
   const state = this;
-  const update = changes.reduce((promise, change) => {
-    const acc = promise;
+  const update = changes.reduce((acc, change) => {
     if (change[0] === "update") {
       const result = setByPath.call(state, change[1], change[2], {
         preventStateUpdate: true
@@ -173,7 +172,7 @@ const setPathCollection = function(changes, options = {}) {
       });
     }
     return acc;
-  }, Promise.resolve({}));
+  }, {});
   return state.update(update, options);
 };
 const removeByPath = function(path, options = {}) {
@@ -184,9 +183,9 @@ const removeByPath = function(path, options = {}) {
 };
 const removePathCollection = function(changes, options = {}) {
   const state = this;
-  changes.forEach((item) => {
-    removeByPath(item, { preventUpdate: true });
-  });
+  for (let i = 0; i < changes.length; i++) {
+    removeByPath(changes[i], { preventUpdate: true });
+  }
   return state.update({}, options);
 };
 const getByPath = function(path, options = {}) {
@@ -243,7 +242,6 @@ const values = function(obj, options = {}) {
   return Object.values(state);
 };
 const applyStateMethods = (element) => {
-  var _a;
   const state = element.state;
   const ref = element.__ref;
   const proto = {
@@ -265,7 +263,7 @@ const applyStateMethods = (element) => {
     replace: replace.bind(state),
     quietReplace: quietReplace.bind(state),
     reset: reset.bind(state),
-    parent: ((_a = element.parent) == null ? void 0 : _a.state) || state,
+    parent: element.parent?.state || state,
     setByPath: setByPath.bind(state),
     setPathCollection: setPathCollection.bind(state),
     removeByPath: removeByPath.bind(state),
@@ -275,7 +273,7 @@ const applyStateMethods = (element) => {
     values: values.bind(state),
     __element: element,
     __children: {},
-    root: (ref == null ? void 0 : ref.root) ? ref.root.state : state
+    root: ref?.root ? ref.root.state : state
   };
   if ((0, import_utils.isArray)(state)) {
     (0, import_utils.addProtoToArray)(state, proto);

package/dist/cjs/updateState.js

@@ -23,7 +23,6 @@ __export(updateState_exports, {
 });
 module.exports = __toCommonJS(updateState_exports);
 var import_report = require("@domql/report");
-var import_event = require("@domql/event");
 var import_utils = require("@domql/utils");
 const STATE_UPDATE_OPTIONS = {
   overwrite: true,
@@ -42,7 +41,7 @@ const updateState = function(obj, options = STATE_UPDATE_OPTIONS) {
     options.preventInheritAtCurrentState = state;
   } else if (options.preventInheritAtCurrentState) return;
   if (!options.preventBeforeStateUpdateListener) {
-    const beforeStateUpdateReturns = (0, import_event.triggerEventOnUpdate)(
+    const beforeStateUpdateReturns = (0, import_utils.triggerEventOnUpdate)(
       "beforeStateUpdate",
       obj,
       element,
@@ -56,15 +55,15 @@ const updateState = function(obj, options = STATE_UPDATE_OPTIONS) {
   updateDependentState(state, obj, options);
   applyElementUpdate(state, obj, options);
   if (!options.preventStateUpdateListener) {
-    (0, import_event.triggerEventOnUpdate)("stateUpdate", obj, element, options);
+    (0, import_utils.triggerEventOnUpdate)("stateUpdate", obj, element, options);
   }
   return state;
 };
 const hoistStateUpdate = (state, obj, options) => {
   const element = state.__element;
   const { parent, __ref: ref } = element;
-  const stateKey = ref == null ? void 0 : ref.__state;
-  const stateType = ref == null ? void 0 : ref.__stateType;
+  const stateKey = ref?.__state;
+  const stateType = ref?.__stateType;
   if (!stateKey) return;
   const asksForInherit = (0, import_utils.checkIfInherits)(element);
   const inheritedState = (0, import_utils.findInheritedState)(element, parent, {
@@ -89,7 +88,7 @@ const hoistStateUpdate = (state, obj, options) => {
   });
   const hasNotUpdated = options.preventUpdate !== true || !options.preventHoistElementUpdate;
   if (!options.preventStateUpdateListener && hasNotUpdated) {
-    (0, import_event.triggerEventOnUpdate)("stateUpdate", obj, element, options);
+    (0, import_utils.triggerEventOnUpdate)("stateUpdate", obj, element, options);
   }
   return true;
 };

package/dist/esm/create.js

@@ -1,12 +1,12 @@
-import { triggerEventOn } from "@domql/event";
 import {
   applyDependentState,
   checkForStateTypes,
   checkIfInherits,
   createInheritedState,
-  isUndefined
+  isUndefined,
+  triggerEventOn
 } from "@domql/utils";
-import { applyStateMethods } from "./methods";
+import { applyStateMethods } from "./methods.js";
 const createState = function(element, parent, options) {
   element.state = applyInitialState(element, parent, options);
   return element.state;

package/dist/esm/methods.js

@@ -1,22 +1,3 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import {
   isArray,
   deepClone,
@@ -40,24 +21,24 @@ const parse = function() {
   if (isObject(state)) {
     const obj = {};
     for (const param in state) {
-      if (!STATE_METHODS.includes(param)) {
+      if (!STATE_METHODS.has(param)) {
         obj[param] = state[param];
       }
     }
     return obj;
   } else if (isArray(state)) {
-    return state.filter((item) => !STATE_METHODS.includes(item));
+    return state.filter((item) => !STATE_METHODS.has(item));
   }
 };
 const clean = function(options = {}) {
   const state = this;
   for (const param in state) {
-    if (!STATE_METHODS.includes(param) && Object.hasOwnProperty.call(state, param)) {
+    if (!STATE_METHODS.has(param) && Object.prototype.hasOwnProperty.call(state, param)) {
       delete state[param];
     }
   }
   if (!options.preventStateUpdate) {
-    state.update(state, __spreadValues({ replace: true }, options));
+    state.update(state, { replace: true, ...options });
   }
   return state;
 };
@@ -66,7 +47,7 @@ const destroy = function(options = {}) {
   const element = state.__element;
   const stateKey = element.__ref.__state;
   if (isString(stateKey)) {
-    element.parent.state.remove(stateKey, __spreadValues({ isHoisted: true }, options));
+    element.parent.state.remove(stateKey, { isHoisted: true, ...options });
     return element.state;
   }
   delete element.state;
@@ -94,25 +75,25 @@ const destroy = function(options = {}) {
       }
     }
   }
-  element.state.update({}, __spreadValues({ isHoisted: true }, options));
+  element.state.update({}, { isHoisted: true, ...options });
   return element.state;
 };
 const parentUpdate = function(obj, options = {}) {
   const state = this;
   if (!state || !state.parent) return;
-  return state.parent.update(obj, __spreadValues({ isHoisted: true }, options));
+  return state.parent.update(obj, { isHoisted: true, ...options });
 };
 const rootUpdate = function(obj, options = {}) {
   const state = this;
   if (!state) return;
   const rootState = state.__element.__ref.root.state;
-  return rootState.update(obj, __spreadValues({ isHoisted: false }, options));
+  return rootState.update(obj, { isHoisted: false, ...options });
 };
 const add = function(value, options = {}) {
   const state = this;
   if (isArray(state)) {
     state.push(value);
-    state.update(state.parse(), __spreadValues({ overwrite: true }, options));
+    state.update(state.parse(), { overwrite: true, ...options });
   } else if (isObject(state)) {
     const key = Object.keys(state).length;
     state.update({ [key]: value }, options);
@@ -125,17 +106,17 @@ const toggle = function(key, options = {}) {
 const remove = function(key, options = {}) {
   const state = this;
   if (isArray(state)) removeFromArray(state, key);
-  if (isObject(state)) removeFromObject(state, key);
+  else if (isObject(state)) removeFromObject(state, key);
   if (options.applyReset) {
-    return state.set(state.parse(), __spreadValues({ replace: true }, options));
+    return state.set(state.parse(), { replace: true, ...options });
   }
   return state.update({}, options);
 };
 const set = function(val, options = {}) {
   const state = this;
   const value = deepClone(val);
-  const cleanState = state.clean(__spreadValues({ preventStateUpdate: true }, options));
-  return cleanState.update(value, __spreadValues({ replace: true }, options));
+  const cleanState = state.clean({ preventStateUpdate: true, ...options });
+  return cleanState.update(value, { replace: true, ...options });
 };
 const setByPath = function(path, val, options = {}) {
   const state = this;
@@ -147,20 +128,20 @@ const setByPath = function(path, val, options = {}) {
 };
 const setPathCollection = function(changes, options = {}) {
   const state = this;
-  const update = changes.reduce((promise, change) => {
-    const acc = promise;
+  const update = changes.reduce((acc, change) => {
     if (change[0] === "update") {
       const result = setByPath.call(state, change[1], change[2], {
         preventStateUpdate: true
       });
       return overwriteDeep(acc, result);
     } else if (change[0] === "delete") {
-      removeByPath.call(state, change[1], __spreadProps(__spreadValues({}, options), {
+      removeByPath.call(state, change[1], {
+        ...options,
         preventUpdate: true
-      }));
+      });
     }
     return acc;
-  }, Promise.resolve({}));
+  }, {});
   return state.update(update, options);
 };
 const removeByPath = function(path, options = {}) {
@@ -171,9 +152,9 @@ const removeByPath = function(path, options = {}) {
 };
 const removePathCollection = function(changes, options = {}) {
   const state = this;
-  changes.forEach((item) => {
-    removeByPath(item, { preventUpdate: true });
-  });
+  for (let i = 0; i < changes.length; i++) {
+    removeByPath(changes[i], { preventUpdate: true });
+  }
   return state.update({}, options);
 };
 const getByPath = function(path, options = {}) {
@@ -183,13 +164,13 @@ const getByPath = function(path, options = {}) {
 const reset = function(options = {}) {
   const state = this;
   const value = deepClone(state.parse());
-  return state.set(value, __spreadValues({ replace: true }, options));
+  return state.set(value, { replace: true, ...options });
 };
 const apply = function(func, options = {}) {
   const state = this;
   if (isFunction(func)) {
     const value = func(state);
-    return state.update(value, __spreadValues({ replace: true }, options));
+    return state.update(value, { replace: true, ...options });
   }
 };
 const applyReplace = function(func, options = {}) {
@@ -203,12 +184,12 @@ const applyFunction = function(func, options = {}) {
   const state = this;
   if (isFunction(func)) {
     func(state);
-    return state.update(state.parse(), __spreadValues({ replace: true }, options));
+    return state.update(state.parse(), { replace: true, ...options });
   }
 };
 const quietUpdate = function(obj, options = {}) {
   const state = this;
-  return state.update(obj, __spreadValues({ preventUpdate: true }, options));
+  return state.update(obj, { preventUpdate: true, ...options });
 };
 const replace = function(obj, options = {}) {
   const state = this;
@@ -219,7 +200,7 @@ const replace = function(obj, options = {}) {
 };
 const quietReplace = function(obj, options = {}) {
   const state = this;
-  return state.replace(obj, __spreadValues({ preventUpdate: true }, options));
+  return state.replace(obj, { preventUpdate: true, ...options });
 };
 const keys = function(obj, options = {}) {
   const state = this;
@@ -230,7 +211,6 @@ const values = function(obj, options = {}) {
   return Object.values(state);
 };
 const applyStateMethods = (element) => {
-  var _a;
   const state = element.state;
   const ref = element.__ref;
   const proto = {
@@ -252,7 +232,7 @@ const applyStateMethods = (element) => {
     replace: replace.bind(state),
     quietReplace: quietReplace.bind(state),
     reset: reset.bind(state),
-    parent: ((_a = element.parent) == null ? void 0 : _a.state) || state,
+    parent: element.parent?.state || state,
     setByPath: setByPath.bind(state),
     setPathCollection: setPathCollection.bind(state),
     removeByPath: removeByPath.bind(state),
@@ -262,7 +242,7 @@ const applyStateMethods = (element) => {
     values: values.bind(state),
     __element: element,
     __children: {},
-    root: (ref == null ? void 0 : ref.root) ? ref.root.state : state
+    root: ref?.root ? ref.root.state : state
   };
   if (isArray(state)) {
     addProtoToArray(state, proto);

package/dist/esm/updateState.js

@@ -1,24 +1,4 @@
-var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 import { report } from "@domql/report";
-import { triggerEventOnUpdate } from "@domql/event";
 import {
   checkIfInherits,
   createNestedObjectByKeyPath,
@@ -27,7 +7,8 @@ import {
   getRootStateInKey,
   merge,
   overwriteDeep,
-  overwriteState
+  overwriteState,
+  triggerEventOnUpdate
 } from "@domql/utils";
 const STATE_UPDATE_OPTIONS = {
   overwrite: true,
@@ -67,8 +48,8 @@ const updateState = function(obj, options = STATE_UPDATE_OPTIONS) {
 const hoistStateUpdate = (state, obj, options) => {
   const element = state.__element;
   const { parent, __ref: ref } = element;
-  const stateKey = ref == null ? void 0 : ref.__state;
-  const stateType = ref == null ? void 0 : ref.__stateType;
+  const stateKey = ref?.__state;
+  const stateType = ref?.__stateType;
   if (!stateKey) return;
   const asksForInherit = checkIfInherits(element);
   const inheritedState = findInheritedState(element, parent, {
@@ -84,12 +65,13 @@ const hoistStateUpdate = (state, obj, options) => {
   const changesValue = createNestedObjectByKeyPath(stateKey, passedValue);
   const targetParent = findRootState || findGrandParentState || parent.state;
   if (options.replace) overwriteDeep(targetParent, changesValue || value);
-  targetParent.update(changesValue, __spreadValues({
+  targetParent.update(changesValue, {
     execStateFunction: false,
     isHoisted: true,
     preventUpdate: options.preventHoistElementUpdate,
-    overwrite: !options.replace
-  }, options));
+    overwrite: !options.replace,
+    ...options
+  });
   const hasNotUpdated = options.preventUpdate !== true || !options.preventHoistElementUpdate;
   if (!options.preventStateUpdateListener && hasNotUpdated) {
     triggerEventOnUpdate("stateUpdate", obj, element, options);
@@ -109,18 +91,20 @@ const applyElementUpdate = (state, obj, options) => {
   if (options.preventUpdate !== true) {
     element.update(
       {},
-      __spreadProps(__spreadValues({}, options), {
+      {
+        ...options,
         updateByState: true
-      })
+      }
     );
   } else if (options.preventUpdate === "recursive") {
     element.update(
       {},
-      __spreadProps(__spreadValues({}, options), {
+      {
+        ...options,
         isHoisted: false,
         updateByState: true,
         preventUpdate: true
-      })
+      }
     );
   }
 };