@domql/state 2.3.151 → 2.4.0

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 symbo.ls
+Copyright (c) 2023 symbo.ls
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/createState.js

@@ -1,7 +1,7 @@
 'use strict'
 
 import { triggerEventOn } from '@domql/event'
-import { deepClone, exec, is, isFunction, isObject } from '@domql/utils'
+import { deepClone, exec, is, isArray, isFunction, isObject } 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'
@@ -72,6 +72,17 @@ const checkForTypes = (element) => {
   return false
 }
 
+const addProtoToArray = (state, proto) => {
+  for (const key in proto) {
+    Object.defineProperty(state, key, {
+      value: proto[key],
+      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
+    })
+  }
+}
+
 const applyMethods = (element) => {
   const state = element.state
   const ref = element.__ref
@@ -95,7 +106,11 @@ const applyMethods = (element) => {
     __root: ref.__root ? ref.__root.state : state
   }
 
-  Object.setPrototypeOf(state, proto)
+  if (isArray(state)) {
+    addProtoToArray(state, proto)
+  } else {
+    Object.setPrototypeOf(state, proto)
+  }
 
   if (state.parent) state.parent.__children[element.key] = state
 }

package/dist/cjs/createState.js

@@ -85,6 +85,19 @@ const checkForTypes = (element) => {
   }
   return false;
 };
+const addProtoToArray = (state, proto) => {
+  for (const key in proto) {
+    Object.defineProperty(state, key, {
+      value: proto[key],
+      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
+    });
+  }
+};
 const applyMethods = (element) => {
   const state = element.state;
   const ref = element.__ref;
@@ -106,7 +119,11 @@ const applyMethods = (element) => {
     __children: {},
     __root: ref.__root ? ref.__root.state : state
   };
-  Object.setPrototypeOf(state, proto);
+  if ((0, import_utils.isArray)(state)) {
+    addProtoToArray(state, proto);
+  } else {
+    Object.setPrototypeOf(state, proto);
+  }
   if (state.parent)
     state.parent.__children[element.key] = state;
 };

package/dist/cjs/inherit.js

@@ -47,6 +47,8 @@ const getChildStateInKey = (stateKey, parentState, options = {}) => {
   for (let i = 0; i < arrLength; i++) {
     const childKey = arr[i];
     const grandChildKey = arr[i + 1];
+    if (childKey === "__proto__" || grandChildKey === "__proto__")
+      return;
     let childInParent = parentState[childKey];
     if (!childInParent)
       childInParent = parentState[childKey] = {};
@@ -97,8 +99,7 @@ const checkIfInherits = (element) => {
 const isState = function(state) {
   if (!(0, import_utils.isObjectLike)(state))
     return false;
-  const keys = Object.keys(state);
-  return (0, import_utils.arrayContainsOtherArray)(keys, ["update", "parse", "clean", "create", "parent", "rootUpdate"]);
+  return state.update && state.parse && state.clean && state.create && state.parent && state.destroy && state.rootUpdate && state.parentUpdate && state.toggle && state.add && state.apply && state.__element && state.__children;
 };
 const createChangesByKey = (path, value) => {
   if (!path) {

package/inherit.js

@@ -1,6 +1,6 @@
 'use strict'
 
-import { arrayContainsOtherArray, deepClone, is, isNot, isObjectLike } from '@domql/utils'
+import { deepClone, is, isNot, isObjectLike } from '@domql/utils'
 import { IGNORE_STATE_PARAMS } from './ignore'
 
 export const getParentStateInKey = (stateKey, parentState) => {
@@ -21,6 +21,8 @@ export const getChildStateInKey = (stateKey, parentState, options = {}) => {
     const childKey = arr[i]
     const grandChildKey = arr[i + 1]
 
+    if (childKey === '__proto__' || grandChildKey === '__proto__') return
+
     let childInParent = parentState[childKey]
     if (!childInParent) childInParent = parentState[childKey] = {} // check for array
     if (!childInParent[grandChildKey]) childInParent[grandChildKey] = {} // check for array
@@ -72,8 +74,20 @@ export const checkIfInherits = (element) => {
 
 export const isState = function (state) {
   if (!isObjectLike(state)) return false
-  const keys = Object.keys(state)
-  return arrayContainsOtherArray(keys, ['update', 'parse', 'clean', 'create', 'parent', 'rootUpdate'])
+  return state.update &&
+    state.parse &&
+    state.clean &&
+    state.create &&
+    state.parent &&
+    state.destroy &&
+    state.rootUpdate &&
+    state.parentUpdate &&
+    state.toggle &&
+    state.add &&
+    state.apply &&
+    state.__element &&
+    state.__children
+  // return arrayContainsOtherArray(keys, ['update', 'parse', 'clean', 'create', 'parent', 'rootUpdate'])
 }
 
 export const createChangesByKey = (path, value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@domql/state",
-  "version": "2.3.151",
+  "version": "2.4.0",
   "license": "MIT",
   "type": "module",
   "module": "dist/esm/index.js",
@@ -19,7 +19,7 @@
     "dist"
   ],
   "scripts": {
-    "copy:package:cjs": "cp ../../.build/package-cjs.json dist/cjs/package.json",
+    "copy:package:cjs": "cp ../../build/package-cjs.json dist/cjs/package.json",
     "build:esm": "npx esbuild *.js --target=es2019 --format=esm --outdir=dist/esm",
     "build:cjs": "npx esbuild *.js --target=node16 --format=cjs --outdir=dist/cjs",
     "build:iife": "npx esbuild *.js --target=node16 --format=iife --outdir=dist/iife",
@@ -31,5 +31,5 @@
     "@domql/report": "latest",
     "@domql/utils": "latest"
   },
-  "gitHead": "2b240bcbceb25fc4ffda75c25232c66a8e183614"
+  "gitHead": "d01a7237a0065a5a439a03062064076c5fdc91b7"
 }