solid-js 1.5.1 → 1.5.4

package/dist/dev.cjs

@@ -255,8 +255,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -265,6 +264,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -274,7 +274,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -291,25 +291,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -326,11 +327,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -339,7 +339,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -349,27 +349,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }

package/dist/dev.js

@@ -251,8 +251,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -261,6 +260,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -270,7 +270,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -287,25 +287,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -322,11 +323,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -335,7 +335,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -345,27 +345,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }

package/dist/server.cjs

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
@@ -489,7 +490,6 @@ function lazy(fn) {
     return p;
   };
   const contexts = new Set();
-  setTimeout(load);
   const wrap = props => {
     load();
     const id = sharedConfig.context.id.slice(0, -1);
@@ -503,21 +503,22 @@ function lazy(fn) {
       ctx.resources.set(id, track);
       contexts.add(ctx);
     }
-    if (sharedConfig.context.async) p.then(() => {
-      track.loading = false;
-      notifySuspense(contexts);
-    });
+    if (sharedConfig.context.async) {
+      sharedConfig.context.block(p.then(() => {
+        track.loading = false;
+        notifySuspense(contexts);
+      }));
+    }
     return "";
   };
   wrap.preload = load;
   return wrap;
 }
 function suspenseComplete(c) {
-  if (c.complete) return true;
   for (const r of c.resources.values()) {
     if (r.loading) return false;
   }
-  return c.complete = true;
+  return true;
 }
 function notifySuspense(contexts) {
   for (const c of contexts) {
@@ -556,8 +557,7 @@ function Suspense(props) {
       if (suspenseComplete(value)) {
         done(resolveSSRNode(res));
       }
-    },
-    complete: false
+    }
   });
   function runSuspense() {
     setHydrateContext({ ...ctx,
@@ -584,7 +584,11 @@ function Suspense(props) {
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {
-    setHydrateContext(undefined);
+    setHydrateContext({ ...ctx,
+      count: 0,
+      id: ctx.id + "0.f",
+      noHydrate: true
+    });
     const res = {
       t: `<span id="pl-${id}">${resolveSSRNode(props.fallback)}</span>`
     };
@@ -601,6 +605,7 @@ function Suspense(props) {
 
 exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
+exports.$TRACK = $TRACK;
 exports.DEV = DEV;
 exports.ErrorBoundary = ErrorBoundary;
 exports.For = For;

package/dist/server.js

@@ -1,5 +1,6 @@
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $TRACK = Symbol("solid-track");
 const $DEVCOMP = Symbol("solid-dev-component");
 const DEV = {};
 const ERROR = Symbol("error");
@@ -485,7 +486,6 @@ function lazy(fn) {
     return p;
   };
   const contexts = new Set();
-  setTimeout(load);
   const wrap = props => {
     load();
     const id = sharedConfig.context.id.slice(0, -1);
@@ -499,21 +499,22 @@ function lazy(fn) {
       ctx.resources.set(id, track);
       contexts.add(ctx);
     }
-    if (sharedConfig.context.async) p.then(() => {
-      track.loading = false;
-      notifySuspense(contexts);
-    });
+    if (sharedConfig.context.async) {
+      sharedConfig.context.block(p.then(() => {
+        track.loading = false;
+        notifySuspense(contexts);
+      }));
+    }
     return "";
   };
   wrap.preload = load;
   return wrap;
 }
 function suspenseComplete(c) {
-  if (c.complete) return true;
   for (const r of c.resources.values()) {
     if (r.loading) return false;
   }
-  return c.complete = true;
+  return true;
 }
 function notifySuspense(contexts) {
   for (const c of contexts) {
@@ -552,8 +553,7 @@ function Suspense(props) {
       if (suspenseComplete(value)) {
         done(resolveSSRNode(res));
       }
-    },
-    complete: false
+    }
   });
   function runSuspense() {
     setHydrateContext({ ...ctx,
@@ -580,7 +580,11 @@ function Suspense(props) {
   });
   done = ctx.async ? ctx.registerFragment(id) : undefined;
   if (ctx.async) {
-    setHydrateContext(undefined);
+    setHydrateContext({ ...ctx,
+      count: 0,
+      id: ctx.id + "0.f",
+      noHydrate: true
+    });
     const res = {
       t: `<span id="pl-${id}">${resolveSSRNode(props.fallback)}</span>`
     };
@@ -595,4 +599,4 @@ function Suspense(props) {
   return props.fallback;
 }
 
-export { $DEVCOMP, $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $PROXY, $TRACK, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createReaction, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, resetErrorBoundaries, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -247,8 +247,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -257,6 +256,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -266,7 +266,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -283,25 +283,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -318,11 +319,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -331,7 +331,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -341,27 +341,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }

package/dist/solid.js

@@ -243,8 +243,7 @@ function createResource(pSource, pFetcher, pOptions) {
     fetcher = pFetcher;
     options = pOptions || {};
   }
-  let err = undefined,
-      pr = null,
+  let pr = null,
       initP = NO_INIT,
       id = null,
       loadedUnderTransition = false,
@@ -253,6 +252,7 @@ function createResource(pSource, pFetcher, pOptions) {
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
         [value, setValue] = (options.storage || createSignal)(options.initialValue),
+        [error, setError] = createSignal(undefined),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -262,7 +262,7 @@ function createResource(pSource, pFetcher, pOptions) {
     let v;
     if (options.ssrLoadFrom === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
-  function loadEnd(p, v, success, key) {
+  function loadEnd(p, v, error, key) {
     if (pr === p) {
       pr = null;
       resolved = true;
@@ -279,25 +279,26 @@ function createResource(pSource, pFetcher, pOptions) {
             Effects.push.apply(Effects, Transition.effects);
             Transition.effects = [];
           }
-          completeLoad(v, success);
+          completeLoad(v, error);
         }, false);
-      } else completeLoad(v, success);
+      } else completeLoad(v, error);
     }
     return v;
   }
-  function completeLoad(v, success) {
-    !success && (err = castError(v));
+  function completeLoad(v, err) {
     runUpdates(() => {
-      setValue(() => v);
-      setState(success ? "ready" : "errored");
+      if (!err) setValue(() => v);
+      setError(err);
+      setState(err ? "errored" : "ready");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
   }
   function read() {
     const c = SuspenseContext && lookup(Owner, SuspenseContext.id),
-          v = value();
-    if (err) throw err;
+          v = value(),
+          err = error();
+    if (err && !pr) throw err;
     if (Listener && !Listener.user && c) {
       createComputed(() => {
         track();
@@ -314,11 +315,10 @@ function createResource(pSource, pFetcher, pOptions) {
   function load(refetching = true) {
     if (refetching !== false && scheduled) return;
     scheduled = false;
-    err = undefined;
     const lookup = dynamic ? dynamic() : source;
     loadedUnderTransition = Transition && Transition.running;
     if (lookup == null || lookup === false) {
-      loadEnd(pr, untrack(value), true);
+      loadEnd(pr, untrack(value));
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
@@ -327,7 +327,7 @@ function createResource(pSource, pFetcher, pOptions) {
       refetching
     }));
     if (typeof p !== "object" || !("then" in p)) {
-      loadEnd(pr, p, true);
+      loadEnd(pr, p);
       return p;
     }
     pr = p;
@@ -337,27 +337,26 @@ function createResource(pSource, pFetcher, pOptions) {
       setState(resolved ? "refreshing" : "pending");
       trigger();
     }, false);
-    return p.then(v => loadEnd(p, v, true, lookup), e => loadEnd(p, e, false));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, undefined, castError(e)));
   }
   Object.defineProperties(read, {
     state: {
       get: () => state()
     },
+    error: {
+      get: () => error()
+    },
     loading: {
       get() {
         const s = state();
         return s === "pending" || s === "refreshing";
       }
     },
-    error: {
-      get() {
-        return state() === "errored" ? err : undefined;
-      }
-    },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "errored") throw err;
+        const err = error();
+        if (err && !pr) throw err;
         return value();
       }
     }

package/h/jsx-runtime/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "solid-js/h/jsx-runtime",
+  "main": "./dist/jsx.cjs",
+  "module": "./dist/jsx.js",
+  "types": "./types/index.d.ts",
+  "type": "module",
+  "sideEffects": false
+}