solid-js 1.4.0-beta.5 → 1.4.0-beta.6

package/dist/server.cjs

@@ -398,7 +398,7 @@ function createResource(source, fetcher, options = {}) {
         value
       });
     }
-    if (p && "then" in p) {
+    if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
@@ -415,6 +415,7 @@ function createResource(source, fetcher, options = {}) {
       });
     }
     ctx.resources[id].data = p;
+    if (ctx.writeResource) ctx.writeResource(id, p);
     p = null;
     return ctx.resources[id].data;
   }

package/dist/server.js

@@ -394,7 +394,7 @@ function createResource(source, fetcher, options = {}) {
         value
       });
     }
-    if (p && "then" in p) {
+    if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
@@ -411,6 +411,7 @@ function createResource(source, fetcher, options = {}) {
       });
     }
     ctx.resources[id].data = p;
+    if (ctx.writeResource) ctx.writeResource(id, p);
     p = null;
     return ctx.resources[id].data;
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.4.0-beta.5",
+  "version": "1.4.0-beta.6",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -151,5 +151,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "6ada354ebee1245a1d060af8a11047d50e2845e1"
+  "gitHead": "dce1c4b0c4d7b47f6f8cb743173da3acfd831419"
 }

package/store/dist/dev.cjs

@@ -63,6 +63,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
@@ -81,8 +84,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = solidJs.createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = solidJs.createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -93,12 +98,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
@@ -115,15 +122,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -213,14 +220,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      const isFunction = typeof value !== "function";
+      if (solidJs.getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+        return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },

package/store/dist/dev.js

@@ -59,6 +59,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
@@ -77,8 +80,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -89,12 +94,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },
@@ -111,15 +118,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -209,14 +216,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      const isFunction = typeof value !== "function";
+      if (getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+        return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value, target[$NAME] && `${target[$NAME]}:${property.toString()}`) : value;
   },

package/store/dist/store.cjs

@@ -60,6 +60,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === solidJs.$PROXY || property === $NODE || property === $NAME) return desc;
@@ -78,8 +81,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = solidJs.createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = solidJs.createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -90,12 +95,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value) : value;
   },
@@ -110,15 +117,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -201,14 +208,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === solidJs.$PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === solidJs.$TRACK) return trackSelf(target);
-    if (solidJs.getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      const isFunction = typeof value !== "function";
+      if (solidJs.getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+        return (...args) => solidJs.batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value) : value;
   },

package/store/dist/store.js

@@ -56,6 +56,9 @@ function getDataNodes(target) {
   });
   return nodes;
 }
+function getDataNode(nodes, property, value) {
+  return nodes[property] || (nodes[property] = createDataNode(value, true));
+}
 function proxyDescriptor(target, property) {
   const desc = Reflect.getOwnPropertyDescriptor(target, property);
   if (!desc || desc.get || !desc.configurable || property === $PROXY || property === $NODE || property === $NAME) return desc;
@@ -74,8 +77,10 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target);
 }
-function createDataNode() {
-  const [s, set] = createSignal(undefined, {
+function createDataNode(value, equals) {
+  const [s, set] = createSignal(value, equals ? {
+    internal: true
+  } : {
     equals: false,
     internal: true
   });
@@ -86,12 +91,14 @@ const proxyTraps$1 = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();
     }
     return isWrappable(value) ? wrap$1(value) : value;
   },
@@ -106,15 +113,15 @@ const proxyTraps$1 = {
 };
 function setProperty(state, property, value) {
   if (state[property] === value) return;
-  const array = Array.isArray(state);
+  const prev = state[property];
   const len = state.length;
   if (value === undefined) {
     delete state[property];
   } else state[property] = value;
   let nodes = getDataNodes(state),
       node;
-  (node = nodes[property]) && node.$();
-  if (array && state.length !== len) (node = nodes.length) && node.$();
+  if (node = getDataNode(nodes, property, prev)) node.$(() => value);
+  if (Array.isArray(state) && state.length !== len) (node = getDataNode(nodes, "length", len)) && node.$(state.length);
   (node = nodes._) && node.$();
 }
 function mergeStoreNode(state, value) {
@@ -197,14 +204,17 @@ const proxyTraps = {
   get(target, property, receiver) {
     if (property === $RAW) return target;
     if (property === $PROXY) return receiver;
-    const value = target[property];
-    if (property === $NODE || property === "__proto__") return value;
     if (property === $TRACK) return trackSelf(target);
-    if (getListener() && (typeof value !== "function" || target.hasOwnProperty(property))) {
-      const nodes = getDataNodes(target);
-      (nodes[property] || (nodes[property] = createDataNode()))();
-    } else if (value != null && typeof value === "function" && value === Array.prototype[property]) {
-      return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+    const nodes = getDataNodes(target);
+    const tracked = nodes[property];
+    let value = tracked ? nodes[property]() : target[property];
+    if (property === $NODE || property === "__proto__") return value;
+    if (!tracked) {
+      const desc = Object.getOwnPropertyDescriptor(target, property);
+      const isFunction = typeof value !== "function";
+      if (getListener() && (isFunction || target.hasOwnProperty(property)) && !(desc && desc.get)) value = getDataNode(nodes, property, value)();else if (value != null && isFunction && value === Array.prototype[property]) {
+        return (...args) => batch(() => Array.prototype[property].apply(receiver, args));
+      }
     }
     return isWrappable(value) ? wrap(value) : value;
   },

package/store/types/store.d.ts

@@ -1,4 +1,3 @@
-import { Accessor } from "../..";
 export declare const $RAW: unique symbol, $NODE: unique symbol, $NAME: unique symbol;
 export declare type StoreNode = Record<PropertyKey, any>;
 export declare namespace SolidStore {
@@ -10,12 +9,10 @@ export declare type Store<T> = DeepReadonly<T>;
 export declare function isWrappable(obj: any): any;
 export declare function unwrap<T extends StoreNode>(item: any, set?: Set<unknown>): T;
 export declare function getDataNodes(target: StoreNode): any;
+export declare function getDataNode(nodes: Record<string, any>, property: string | symbol, value: any): any;
 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 createDataNode(): Accessor<void> & {
-    $: () => void;
-};
 export declare function setProperty(state: StoreNode, property: PropertyKey, value: any): void;
 export declare function updatePath(current: StoreNode, path: any[], traversed?: PropertyKey[]): void;
 export declare type DeepReadonly<T> = 0 extends 1 & T ? T : T extends NotWrappable ? T : {