solid-js 1.4.6 → 1.5.0-beta.1

package/store/dist/dev.js

@@ -1,4 +1,4 @@
-import { $PROXY, DEV, $TRACK, getListener, batch, createSignal } from 'solid-js';
+import { DEV, $PROXY, $TRACK, getListener, batch, createSignal } from 'solid-js';
 
 const $RAW = Symbol("store-raw"),
       $NODE = Symbol("store-node"),
@@ -9,15 +9,17 @@ function wrap$1(value, name) {
     Object.defineProperty(value, $PROXY, {
       value: p = new Proxy(value, proxyTraps$1)
     });
-    const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
-    for (let i = 0, l = keys.length; i < l; i++) {
-      const prop = keys[i];
-      if (desc[prop].get) {
-        const get = desc[prop].get.bind(p);
-        Object.defineProperty(value, prop, {
-          get
-        });
+    if (!Array.isArray(value)) {
+      const keys = Object.keys(value),
+            desc = Object.getOwnPropertyDescriptors(value);
+      for (let i = 0, l = keys.length; i < l; i++) {
+        const prop = keys[i];
+        if (desc[prop].get) {
+          const get = desc[prop].get.bind(p);
+          Object.defineProperty(value, prop, {
+            get
+          });
+        }
       }
     }
     if (name) Object.defineProperty(value, $NAME, {
@@ -61,7 +63,7 @@ function getDataNodes(target) {
   return nodes;
 }
 function getDataNode(nodes, property, value) {
-  return nodes[property] || (nodes[property] = createDataNode(value, true));
+  return nodes[property] || (nodes[property] = createDataNode(value));
 }
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
@@ -81,10 +83,8 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode(value, equals) {
-  const [s, set] = createSignal(value, equals ? {
-    internal: true
-  } : {
+function createDataNode(value) {
+  const [s, set] = createSignal(value, {
     equals: false,
     internal: true
   });
@@ -95,9 +95,12 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    if (property === $TRACK) return trackSelf(target);
+    if (property === $TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -106,6 +109,12 @@ const proxyTraps$1 = {
     }
     return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set() {
     console.warn("Cannot mutate a Store directly");
     return true;
@@ -117,8 +126,8 @@ const proxyTraps$1 = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function setProperty(state, property, value) {
-  if (state[property] === value) return;
+function setProperty(state, property, value, deleting = false) {
+  if (!deleting && state[property] === value) return;
   const prev = state[property];
   const len = state.length;
   if (value === undefined) {
@@ -219,9 +228,12 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    if (property === $TRACK) return trackSelf(target);
+    if (property === $TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -233,12 +245,18 @@ const proxyTraps = {
     }
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set(target, property, value) {
     batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    batch(() => setProperty(target, property, undefined));
+    batch(() => setProperty(target, property, undefined, true));
     return true;
   },
   ownKeys: ownKeys,
@@ -389,7 +407,7 @@ const setterTraps = {
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    setProperty(target, property, undefined, true);
     return true;
   }
 };

package/store/dist/store.cjs

@@ -13,15 +13,17 @@ function wrap$1(value, name) {
     Object.defineProperty(value, solidJs.$PROXY, {
       value: p = new Proxy(value, proxyTraps$1)
     });
-    const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
-    for (let i = 0, l = keys.length; i < l; i++) {
-      const prop = keys[i];
-      if (desc[prop].get) {
-        const get = desc[prop].get.bind(p);
-        Object.defineProperty(value, prop, {
-          get
-        });
+    if (!Array.isArray(value)) {
+      const keys = Object.keys(value),
+            desc = Object.getOwnPropertyDescriptors(value);
+      for (let i = 0, l = keys.length; i < l; i++) {
+        const prop = keys[i];
+        if (desc[prop].get) {
+          const get = desc[prop].get.bind(p);
+          Object.defineProperty(value, prop, {
+            get
+          });
+        }
       }
     }
   }
@@ -62,7 +64,7 @@ function getDataNodes(target) {
   return nodes;
 }
 function getDataNode(nodes, property, value) {
-  return nodes[property] || (nodes[property] = createDataNode(value, true));
+  return nodes[property] || (nodes[property] = createDataNode(value));
 }
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
@@ -82,10 +84,8 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode(value, equals) {
-  const [s, set] = solidJs.createSignal(value, equals ? {
-    internal: true
-  } : {
+function createDataNode(value) {
+  const [s, set] = solidJs.createSignal(value, {
     equals: false,
     internal: true
   });
@@ -96,9 +96,12 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    if (property === solidJs.$TRACK) return trackSelf(target);
+    if (property === solidJs.$TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -107,6 +110,12 @@ const proxyTraps$1 = {
     }
     return isWrappable(value) ? wrap$1(value) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set() {
     return true;
   },
@@ -116,8 +125,8 @@ const proxyTraps$1 = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function setProperty(state, property, value) {
-  if (state[property] === value) return;
+function setProperty(state, property, value, deleting = false) {
+  if (!deleting && state[property] === value) return;
   const prev = state[property];
   const len = state.length;
   if (value === undefined) {
@@ -211,9 +220,12 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    if (property === solidJs.$TRACK) return trackSelf(target);
+    if (property === solidJs.$TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -225,12 +237,18 @@ const proxyTraps = {
     }
     return isWrappable(value) ? wrap(value) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === solidJs.$PROXY || property === solidJs.$TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set(target, property, value) {
     solidJs.batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    solidJs.batch(() => setProperty(target, property, undefined));
+    solidJs.batch(() => setProperty(target, property, undefined, true));
     return true;
   },
   ownKeys: ownKeys,
@@ -371,7 +389,7 @@ const setterTraps = {
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    setProperty(target, property, undefined, true);
     return true;
   }
 };

package/store/dist/store.js

@@ -9,15 +9,17 @@ function wrap$1(value, name) {
     Object.defineProperty(value, $PROXY, {
       value: p = new Proxy(value, proxyTraps$1)
     });
-    const keys = Object.keys(value),
-          desc = Object.getOwnPropertyDescriptors(value);
-    for (let i = 0, l = keys.length; i < l; i++) {
-      const prop = keys[i];
-      if (desc[prop].get) {
-        const get = desc[prop].get.bind(p);
-        Object.defineProperty(value, prop, {
-          get
-        });
+    if (!Array.isArray(value)) {
+      const keys = Object.keys(value),
+            desc = Object.getOwnPropertyDescriptors(value);
+      for (let i = 0, l = keys.length; i < l; i++) {
+        const prop = keys[i];
+        if (desc[prop].get) {
+          const get = desc[prop].get.bind(p);
+          Object.defineProperty(value, prop, {
+            get
+          });
+        }
       }
     }
   }
@@ -58,7 +60,7 @@ function getDataNodes(target) {
   return nodes;
 }
 function getDataNode(nodes, property, value) {
-  return nodes[property] || (nodes[property] = createDataNode(value, true));
+  return nodes[property] || (nodes[property] = createDataNode(value));
 }
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
@@ -78,10 +80,8 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode(value, equals) {
-  const [s, set] = createSignal(value, equals ? {
-    internal: true
-  } : {
+function createDataNode(value) {
+  const [s, set] = createSignal(value, {
     equals: false,
     internal: true
   });
@@ -92,9 +92,12 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    if (property === $TRACK) return trackSelf(target);
+    if (property === $TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -103,6 +106,12 @@ const proxyTraps$1 = {
     }
     return isWrappable(value) ? wrap$1(value) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set() {
     return true;
   },
@@ -112,8 +121,8 @@ const proxyTraps$1 = {
   ownKeys: ownKeys,
   getOwnPropertyDescriptor: proxyDescriptor
 };
-function setProperty(state, property, value) {
-  if (state[property] === value) return;
+function setProperty(state, property, value, deleting = false) {
+  if (!deleting && state[property] === value) return;
   const prev = state[property];
   const len = state.length;
   if (value === undefined) {
@@ -207,9 +216,12 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    if (property === $TRACK) return trackSelf(target);
+    if (property === $TRACK) {
+      trackSelf(target);
+      return receiver;
+    }
     const nodes = getDataNodes(target);
-    const tracked = nodes[property];
+    const tracked = nodes.hasOwnProperty(property);
     let value = tracked ? nodes[property]() : target[property];
     if (property === $NODE || property === "__proto__") return value;
     if (!tracked) {
@@ -221,12 +233,18 @@ const proxyTraps = {
     }
     return isWrappable(value) ? wrap(value) : value;
   },
+  has(target, property) {
+    if (property === $RAW || property === $PROXY || property === $TRACK || property === $NODE || property === "__proto__") return true;
+    const tracked = getDataNodes(target)[property];
+    tracked && tracked();
+    return property in target;
+  },
   set(target, property, value) {
     batch(() => setProperty(target, property, unwrap(value)));
     return true;
   },
   deleteProperty(target, property) {
-    batch(() => setProperty(target, property, undefined));
+    batch(() => setProperty(target, property, undefined, true));
     return true;
   },
   ownKeys: ownKeys,
@@ -367,7 +385,7 @@ const setterTraps = {
     return true;
   },
   deleteProperty(target, property) {
-    setProperty(target, property, undefined);
+    setProperty(target, property, undefined, true);
     return true;
   }
 };

package/store/types/store.d.ts

@@ -13,7 +13,7 @@ export declare function getDataNode(nodes: Record<string, any>, property: string
 export declare function proxyDescriptor(target: StoreNode, property: PropertyKey): PropertyDescriptor | undefined;
 export declare function trackSelf(target: StoreNode): void;
 export declare function ownKeys(target: StoreNode): (string | symbol)[];
-export declare function setProperty(state: StoreNode, property: PropertyKey, value: any): void;
+export declare function setProperty(state: StoreNode, property: PropertyKey, value: any, deleting?: boolean): void;
 export declare function updatePath(current: StoreNode, path: any[], traversed?: PropertyKey[]): void;
 /** @deprecated */
 export declare type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {