@domql/state 2.5.122 → 2.5.133

package/create.js

@@ -19,7 +19,9 @@ import {
   replace,
   quietUpdate,
   quietReplace,
-  applyReplace
+  applyReplace,
+  keys,
+  values
 } from './methods'
 import { updateState } from './updateState'
 import { checkIfInherits, createInheritedState } from './inherit'
@@ -32,7 +34,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 = deepCloneWithExtend(objectizeState, IGNORE_STATE_PARAMS)
+  else element.state = objectizeState
 
   const whatInitReturns = triggerEventOn('stateInit', element, options)
   if (whatInitReturns === false) return element.state
@@ -54,14 +56,22 @@ export const applyInitialState = function (element, parent, options) {
 }
 
 const applyDependentState = (element, state) => {
-  const { __ref: ref } = state
-  if (!ref) return
-  const dependentState = deepCloneWithExtend(ref, IGNORE_STATE_PARAMS)
+  const { __ref, ref, __element } = state //
+  const origState = exec(__ref || ref || __element?.state, element)
+  if (!origState) return
+  const dependentState = deepCloneWithExtend(origState, IGNORE_STATE_PARAMS)
   const newDepends = { [element.key]: dependentState }
-  ref.__depends = isObject(ref.__depends)
-    ? { ...ref.__depends, ...newDepends }
+
+  const __depends = isObject(origState.__depends)
+    ? { ...origState.__depends, ...newDepends }
     : newDepends
 
+  if (Array.isArray(origState)) {
+    addProtoToArray(origState, { ...Object.getPrototypeOf(origState), __depends })
+  } else {
+    Object.setPrototypeOf(origState, { ...Object.getPrototypeOf(origState), __depends })
+  }
+
   return dependentState
 }
 
@@ -119,6 +129,8 @@ const applyMethods = (element) => {
     quietReplace: quietReplace.bind(state),
     reset: reset.bind(state),
     parent: element.parent.state || state,
+    keys: keys.bind(state),
+    values: values.bind(state),
     __element: element,
     __children: {},
     root: ref.root ? ref.root.state : state

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.deepCloneWithExtend)(objectizeState, import_ignore.IGNORE_STATE_PARAMS);
+    element.state = objectizeState;
   const whatInitReturns = (0, import_event.triggerEventOn)("stateInit", element, options);
   if (whatInitReturns === false)
     return element.state;
@@ -53,12 +53,18 @@ const applyInitialState = function(element, parent, options) {
   return element.state;
 };
 const applyDependentState = (element, state) => {
-  const { __ref: ref } = state;
-  if (!ref)
+  const { __ref, ref, __element } = state;
+  const origState = (0, import_utils.exec)(__ref || ref || (__element == null ? void 0 : __element.state), element);
+  if (!origState)
     return;
-  const dependentState = (0, import_utils.deepCloneWithExtend)(ref, import_ignore.IGNORE_STATE_PARAMS);
+  const dependentState = (0, import_utils.deepCloneWithExtend)(origState, import_ignore.IGNORE_STATE_PARAMS);
   const newDepends = { [element.key]: dependentState };
-  ref.__depends = (0, import_utils.isObject)(ref.__depends) ? { ...ref.__depends, ...newDepends } : newDepends;
+  const __depends = (0, import_utils.isObject)(origState.__depends) ? { ...origState.__depends, ...newDepends } : newDepends;
+  if (Array.isArray(origState)) {
+    addProtoToArray(origState, { ...Object.getPrototypeOf(origState), __depends });
+  } else {
+    Object.setPrototypeOf(origState, { ...Object.getPrototypeOf(origState), __depends });
+  }
   return dependentState;
 };
 const checkForTypes = (element) => {
@@ -115,6 +121,8 @@ const applyMethods = (element) => {
     quietReplace: import_methods.quietReplace.bind(state),
     reset: import_methods.reset.bind(state),
     parent: element.parent.state || state,
+    keys: import_methods.keys.bind(state),
+    values: import_methods.values.bind(state),
     __element: element,
     __children: {},
     root: ref.root ? ref.root.state : state

package/dist/cjs/ignore.js

@@ -38,6 +38,8 @@ const IGNORE_STATE_PARAMS = [
   "quietUpdate",
   "applyReplace",
   "applyFunction",
+  "keys",
+  "values",
   "rootUpdate",
   "parentUpdate",
   "parent",

package/dist/cjs/inherit.js

@@ -113,7 +113,7 @@ const checkIfInherits = (element) => {
 const isState = function(state) {
   if (!(0, import_utils.isObjectLike)(state))
     return false;
-  return state.update && state.parse && state.clean && state.create && state.parent && state.destroy && state.rootUpdate && state.parentUpdate && state.toggle && state.replace && state.quietUpdate && state.quietReplace && state.add && state.apply && state.applyReplace && state.applyFunction && state.__element && state.__children;
+  return state.update && state.parse && state.clean && state.create && state.parent && state.destroy && state.rootUpdate && state.parentUpdate && state.keys && state.values && state.toggle && state.replace && state.quietUpdate && state.quietReplace && state.add && state.apply && state.applyReplace && state.applyFunction && state.__element && state.__children;
 };
 const createNestedObjectByKeyPath = (path, value) => {
   if (!path) {

package/dist/cjs/methods.js

@@ -24,6 +24,7 @@ __export(methods_exports, {
   applyReplace: () => applyReplace,
   clean: () => clean,
   destroy: () => destroy,
+  keys: () => keys,
   parentUpdate: () => parentUpdate,
   parse: () => parse,
   quietReplace: () => quietReplace,
@@ -33,7 +34,8 @@ __export(methods_exports, {
   reset: () => reset,
   rootUpdate: () => rootUpdate,
   set: () => set,
-  toggle: () => toggle
+  toggle: () => toggle,
+  values: () => values
 });
 module.exports = __toCommonJS(methods_exports);
 var import_utils = require("@domql/utils");
@@ -178,3 +180,11 @@ const quietReplace = function(obj, options = {}) {
   const state = this;
   return state.replace(obj, { preventUpdate: true, ...options });
 };
+const keys = function(obj, options = {}) {
+  const state = this;
+  return Object.keys(state);
+};
+const values = function(obj, options = {}) {
+  const state = this;
+  return Object.values(state);
+};

package/ignore.js

@@ -2,6 +2,6 @@
 
 export const IGNORE_STATE_PARAMS = [
   'update', 'parse', 'clean', 'create', 'destroy', 'add', 'toggle', 'remove', 'apply', 'set', 'reset',
-  'replace', 'quietReplace', 'quietUpdate', 'applyReplace', 'applyFunction',
+  'replace', 'quietReplace', 'quietUpdate', 'applyReplace', 'applyFunction', 'keys', 'values',
   'rootUpdate', 'parentUpdate', 'parent', '__element', '__depends', '__ref', '__children', 'root'
 ]

package/inherit.js

@@ -96,6 +96,8 @@ export const isState = function (state) {
     state.destroy &&
     state.rootUpdate &&
     state.parentUpdate &&
+    state.keys &&
+    state.values &&
     state.toggle &&
     state.replace &&
     state.quietUpdate &&

package/methods.js

@@ -164,3 +164,13 @@ export const quietReplace = function (obj, options = {}) {
   const state = this
   return state.replace(obj, { preventUpdate: true, ...options })
 }
+
+export const keys = function (obj, options = {}) {
+  const state = this
+  return Object.keys(state)
+}
+
+export const values = function (obj, options = {}) {
+  const state = this
+  return Object.values(state)
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/state",
-  "version": "2.5.122",
+  "version": "2.5.133",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -31,5 +31,5 @@
     "@domql/report": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "2f048372ece4d808cfaca8e43491611dafe3ad5f"
+  "gitHead": "3c861b5f3e4974ecc985ec24fc8666d0fec6a7fb"
 }