solid-js 1.5.0-beta.2 → 1.5.0-beta.5

package/dist/server.cjs

@@ -144,7 +144,12 @@ function getOwner() {
   return Owner;
 }
 function children(fn) {
-  return createMemo(() => resolveChildren(fn()));
+  const memo = createMemo(() => resolveChildren(fn()));
+  memo.toArray = () => {
+    const c = memo();
+    return Array.isArray(c) ? c : c != null ? [c] : [];
+  };
+  return memo;
 }
 function runWithOwner(o, fn) {
   const prev = Owner;
@@ -391,10 +396,10 @@ function createResource(source, fetcher, options = {}) {
   const contexts = new Set();
   const id = sharedConfig.context.id + sharedConfig.context.count++;
   let resource = {};
-  let value = options.initialValue;
+  let value = options.storage ? options.storage(options.initialValue)[0]() : options.initialValue;
   let p;
   let error;
-  if (sharedConfig.context.async) {
+  if (sharedConfig.context.async && options.ssrValue !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
       if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
@@ -404,7 +409,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
+    const resolved = options.ssrValue !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -416,6 +421,7 @@ function createResource(source, fetcher, options = {}) {
   };
   read.loading = false;
   read.error = undefined;
+  read.state = "initialValue" in options ? "resolved" : "unresolved";
   Object.defineProperty(read, "latest", {
     get() {
       return read();
@@ -444,15 +450,18 @@ function createResource(source, fetcher, options = {}) {
     }
     if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
+      read.state = "pending";
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
         read.loading = false;
+        read.state = "resolved";
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
         return res;
       }).catch(err => {
         read.loading = false;
+        read.state = "errored";
         read.error = error = castError(err);
         p = null;
         notifySuspense(contexts);
@@ -463,7 +472,7 @@ function createResource(source, fetcher, options = {}) {
     p = null;
     return ctx.resources[id].data;
   }
-  load();
+  if (options.ssrValue !== "initial") load();
   return resource.ref = [read, {
     refetch: load,
     mutate: v => value = v

package/dist/server.js

@@ -140,7 +140,12 @@ function getOwner() {
   return Owner;
 }
 function children(fn) {
-  return createMemo(() => resolveChildren(fn()));
+  const memo = createMemo(() => resolveChildren(fn()));
+  memo.toArray = () => {
+    const c = memo();
+    return Array.isArray(c) ? c : c != null ? [c] : [];
+  };
+  return memo;
 }
 function runWithOwner(o, fn) {
   const prev = Owner;
@@ -387,10 +392,10 @@ function createResource(source, fetcher, options = {}) {
   const contexts = new Set();
   const id = sharedConfig.context.id + sharedConfig.context.count++;
   let resource = {};
-  let value = options.initialValue;
+  let value = options.storage ? options.storage(options.initialValue)[0]() : options.initialValue;
   let p;
   let error;
-  if (sharedConfig.context.async) {
+  if (sharedConfig.context.async && options.ssrValue !== "initial") {
     resource = sharedConfig.context.resources[id] || (sharedConfig.context.resources[id] = {});
     if (resource.ref) {
       if (!resource.data && !resource.ref[0].loading && !resource.ref[0].error) resource.ref[1].refetch();
@@ -400,7 +405,7 @@ function createResource(source, fetcher, options = {}) {
   const read = () => {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
-    const resolved = sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
+    const resolved = options.ssrValue !== "initial" && sharedConfig.context.async && "data" in sharedConfig.context.resources[id];
     if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
@@ -412,6 +417,7 @@ function createResource(source, fetcher, options = {}) {
   };
   read.loading = false;
   read.error = undefined;
+  read.state = "initialValue" in options ? "resolved" : "unresolved";
   Object.defineProperty(read, "latest", {
     get() {
       return read();
@@ -440,15 +446,18 @@ function createResource(source, fetcher, options = {}) {
     }
     if (p != undefined && typeof p === "object" && "then" in p) {
       read.loading = true;
+      read.state = "pending";
       if (ctx.writeResource) ctx.writeResource(id, p, undefined, options.deferStream);
       return p.then(res => {
         read.loading = false;
+        read.state = "resolved";
         ctx.resources[id].data = res;
         p = null;
         notifySuspense(contexts);
         return res;
       }).catch(err => {
         read.loading = false;
+        read.state = "errored";
         read.error = error = castError(err);
         p = null;
         notifySuspense(contexts);
@@ -459,7 +468,7 @@ function createResource(source, fetcher, options = {}) {
     p = null;
     return ctx.resources[id].data;
   }
-  load();
+  if (options.ssrValue !== "initial") load();
   return resource.ref = [read, {
     refetch: load,
     mutate: v => value = v

package/dist/solid.cjs

@@ -166,7 +166,7 @@ function createRoot(fn, detachedOwner) {
     context: null,
     owner: detachedOwner || owner
   },
-        updateFn = unowned ? fn : () => fn(() => cleanNode(root));
+        updateFn = unowned ? fn : () => fn(() => untrack(() => cleanNode(root)));
   Owner = root;
   Listener = null;
   try {
@@ -256,7 +256,7 @@ function createResource(pSource, pFetcher, pOptions) {
       resolved = ("initialValue" in options),
       dynamic = typeof source === "function" && createMemo(source);
   const contexts = new Set(),
-        [value, setValue] = options.store ? options.store(options.initialValue) : createSignal(options.initialValue),
+        [value, setValue] = (options.storage || createSignal)(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -264,7 +264,7 @@ function createResource(pSource, pFetcher, pOptions) {
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     let v;
-    if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
+    if (options.ssrValue === "initial") initP = options.initialValue;else if (sharedConfig.load && (v = sharedConfig.load(id))) initP = v[0];
   }
   function loadEnd(p, v, success, key) {
     if (pr === p) {
@@ -293,7 +293,7 @@ function createResource(pSource, pFetcher, pOptions) {
     !success && (err = castError(v));
     runUpdates(() => {
       setValue(() => v);
-      setState(success ? "ready" : "error");
+      setState(success ? "ready" : "errored");
       for (const c of contexts.keys()) c.decrement();
       contexts.clear();
     }, false);
@@ -345,9 +345,7 @@ function createResource(pSource, pFetcher, pOptions) {
   }
   Object.defineProperties(read, {
     state: {
-      get() {
-        return state();
-      }
+      get: () => state()
     },
     loading: {
       get() {
@@ -357,13 +355,13 @@ function createResource(pSource, pFetcher, pOptions) {
     },
     error: {
       get() {
-        return state() === "error" ? err : undefined;
+        return state() === "errored" ? err : undefined;
       }
     },
     latest: {
       get() {
         if (!resolved) return read();
-        if (state() === "error") throw err;
+        if (state() === "errored") throw err;
         return value();
       }
     }
@@ -392,9 +390,8 @@ function createSelector(source, fn = equalFn, options) {
   const subs = new Map();
   const node = createComputation(p => {
     const v = source();
-    for (const key of subs.keys()) if (fn(key, v) !== fn(key, p)) {
-      const l = subs.get(key);
-      for (const c of l.values()) {
+    for (const [key, val] of subs.entries()) if (fn(key, v) !== fn(key, p)) {
+      for (const c of val.values()) {
         c.state = STALE;
         if (c.pure) Updates.push(c);else Effects.push(c);
       }
@@ -403,8 +400,8 @@ function createSelector(source, fn = equalFn, options) {
   }, undefined, true, STALE);
   updateComputation(node);
   return key => {
-    let listener;
-    if (listener = Listener) {
+    const listener = Listener;
+    if (listener) {
       let l;
       if (l = subs.get(key)) l.add(listener);else subs.set(key, l = new Set([listener]));
       onCleanup(() => {
@@ -525,7 +522,12 @@ function useContext(context) {
 }
 function children(fn) {
   const children = createMemo(fn);
-  return createMemo(() => resolveChildren(children()));
+  const memo = createMemo(() => resolveChildren(children()));
+  memo.toArray = () => {
+    const c = memo();
+    return Array.isArray(c) ? c : c != null ? [c] : [];
+  };
+  return memo;
 }
 let SuspenseContext;
 function getSuspenseContext() {
@@ -640,7 +642,7 @@ function runComputation(node, value, time) {
     handleError(err);
   }
   if (!node.updatedAt || node.updatedAt <= time) {
-    if (node.updatedAt && "observers" in node) {
+    if (node.updatedAt != null && "observers" in node) {
       writeSignal(node, nextValue, true);
     } else if (Transition && Transition.running && node.pure) {
       Transition.sources.add(node);
@@ -907,7 +909,7 @@ function resolveChildren(children) {
 function createProvider(id) {
   return function provider(props) {
     let res;
-    createComputed(() => res = untrack(() => {
+    createRenderEffect(() => res = untrack(() => {
       Owner.context = {
         [id]: props.value
       };
@@ -1282,6 +1284,7 @@ function Index(props) {
 }
 function Show(props) {
   let strictEqual = false;
+  const keyed = props.keyed;
   const condition = createMemo(() => props.when, undefined, {
     equals: (a, b) => strictEqual ? a === b : !a === !b
   });
@@ -1289,20 +1292,26 @@ function Show(props) {
     const c = condition();
     if (c) {
       const child = props.children;
-      return (strictEqual = typeof child === "function" && child.length > 0) ? untrack(() => child(c)) : child;
+      const fn = typeof child === "function" && child.length > 0;
+      strictEqual = keyed || fn;
+      return fn ? untrack(() => child(c)) : child;
     }
     return props.fallback;
   });
 }
 function Switch(props) {
   let strictEqual = false;
+  let keyed = false;
   const conditions = children(() => props.children),
         evalConditions = createMemo(() => {
     let conds = conditions();
     if (!Array.isArray(conds)) conds = [conds];
     for (let i = 0; i < conds.length; i++) {
       const c = conds[i].when;
-      if (c) return [i, c, conds[i]];
+      if (c) {
+        keyed = !!conds[i].keyed;
+        return [i, c, conds[i]];
+      }
     }
     return [-1];
   }, undefined, {
@@ -1312,7 +1321,9 @@ function Switch(props) {
     const [index, when, cond] = evalConditions();
     if (index < 0) return props.fallback;
     const c = cond.children;
-    return (strictEqual = typeof c === "function" && c.length > 0) ? untrack(() => c(when)) : c;
+    const fn = typeof c === "function" && c.length > 0;
+    strictEqual = keyed || fn;
+    return fn ? untrack(() => c(when)) : c;
   });
 }
 function Match(props) {
@@ -1343,74 +1354,85 @@ function ErrorBoundary(props) {
   });
 }
 
+const suspenseListEquals = (a, b) => a.showContent === b.showContent && a.showFallback === b.showFallback;
 const SuspenseListContext = createContext();
 function SuspenseList(props) {
-  let suspenseSetter, showContent, showFallback;
+  let [wrapper, setWrapper] = createSignal(() => ({
+    inFallback: false
+  })),
+      show;
   const listContext = useContext(SuspenseListContext);
+  const [registry, setRegistry] = createSignal([]);
   if (listContext) {
-    const [inFallback, setFallback] = createSignal(false);
-    suspenseSetter = setFallback;
-    [showContent, showFallback] = listContext.register(inFallback);
+    show = listContext.register(createMemo(() => wrapper()().inFallback));
   }
-  const [registry, setRegistry] = createSignal([]),
-        comp = createComponent(SuspenseListContext.Provider, {
-    value: {
-      register: inFallback => {
-        const [showingContent, showContent] = createSignal(false),
-              [showingFallback, showFallback] = createSignal(false);
-        setRegistry(registry => [...registry, {
-          inFallback,
-          showContent,
-          showFallback
-        }]);
-        return [showingContent, showingFallback];
-      }
-    },
-    get children() {
-      return props.children;
-    }
-  });
-  createComputed(() => {
+  const resolved = createMemo(prev => {
     const reveal = props.revealOrder,
           tail = props.tail,
-          visibleContent = showContent ? showContent() : true,
-          visibleFallback = showFallback ? showFallback() : true,
+          {
+      showContent = true,
+      showFallback = true
+    } = show ? show() : {},
           reg = registry(),
           reverse = reveal === "backwards";
     if (reveal === "together") {
-      const all = reg.every(i => !i.inFallback());
-      suspenseSetter && suspenseSetter(!all);
-      reg.forEach(i => {
-        i.showContent(all && visibleContent);
-        i.showFallback(visibleFallback);
-      });
-      return;
+      const all = reg.every(inFallback => !inFallback());
+      const res = reg.map(() => ({
+        showContent: all && showContent,
+        showFallback
+      }));
+      res.inFallback = !all;
+      return res;
     }
     let stop = false;
+    let inFallback = prev.inFallback;
+    const res = [];
     for (let i = 0, len = reg.length; i < len; i++) {
       const n = reverse ? len - i - 1 : i,
-            s = reg[n].inFallback();
+            s = reg[n]();
       if (!stop && !s) {
-        reg[n].showContent(visibleContent);
-        reg[n].showFallback(visibleFallback);
+        res[n] = {
+          showContent,
+          showFallback
+        };
       } else {
         const next = !stop;
-        if (next && suspenseSetter) suspenseSetter(true);
-        if (!tail || next && tail === "collapsed") {
-          reg[n].showFallback(visibleFallback);
-        } else reg[n].showFallback(false);
+        if (next) inFallback = true;
+        res[n] = {
+          showContent: next,
+          showFallback: !tail || next && tail === "collapsed" ? showFallback : false
+        };
         stop = true;
-        reg[n].showContent(next);
       }
     }
-    if (!stop && suspenseSetter) suspenseSetter(false);
+    if (!stop) inFallback = false;
+    res.inFallback = inFallback;
+    return res;
+  }, {
+    inFallback: false
+  });
+  setWrapper(() => resolved);
+  return createComponent(SuspenseListContext.Provider, {
+    value: {
+      register: inFallback => {
+        let index;
+        setRegistry(registry => {
+          index = registry.length;
+          return [...registry, inFallback];
+        });
+        return createMemo(() => resolved()[index], undefined, {
+          equals: suspenseListEquals
+        });
+      }
+    },
+    get children() {
+      return props.children;
+    }
   });
-  return comp;
 }
 function Suspense(props) {
   let counter = 0,
-      showContent,
-      showFallback,
+      show,
       ctx,
       p,
       flicker,
@@ -1451,7 +1473,7 @@ function Suspense(props) {
     }
   }
   const listContext = useContext(SuspenseListContext);
-  if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);
+  if (listContext) show = listContext.register(store.inFallback);
   let dispose;
   onCleanup(() => dispose && dispose());
   return createComponent(SuspenseContext.Provider, {
@@ -1466,18 +1488,21 @@ function Suspense(props) {
         }
         if (ctx && p === "$$f") setHydrateContext();
         const rendered = createMemo(() => props.children);
-        return createMemo(() => {
+        return createMemo(prev => {
           const inFallback = store.inFallback(),
-                visibleContent = showContent ? showContent() : true,
-                visibleFallback = showFallback ? showFallback() : true;
-          dispose && dispose();
-          if ((!inFallback || p && p !== "$$f") && visibleContent) {
+                {
+            showContent = true,
+            showFallback = true
+          } = show ? show() : {};
+          if ((!inFallback || p && p !== "$$f") && showContent) {
             store.resolved = true;
-            ctx = p = undefined;
+            dispose && dispose();
+            dispose = ctx = p = undefined;
             resumeEffects(store.effects);
             return rendered();
           }
-          if (!visibleFallback) return;
+          if (!showFallback) return;
+          if (dispose) return prev;
           return createRoot(disposer => {
             dispose = disposer;
             if (ctx) {