solid-js 1.2.4 → 1.3.0-beta.2

package/dist/solid.cjs

@@ -184,18 +184,21 @@ function createSignal(value, options) {
     pending: NOTPENDING,
     comparator: options.equals || undefined
   };
-  return [readSignal.bind(s), value => {
+  const setter = value => {
     if (typeof value === "function") {
       if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.pending !== NOTPENDING ? s.pending : s.tValue);else value = value(s.pending !== NOTPENDING ? s.pending : s.value);
     }
     return writeSignal(s, value);
-  }];
+  };
+  return [readSignal.bind(s), setter];
 }
 function createComputed(fn, value, options) {
-  updateComputation(createComputation(fn, value, true, STALE));
+  const c = createComputation(fn, value, true, STALE);
+  if (Scheduler && Transition && Transition.running) Updates.push(c);else updateComputation(c);
 }
 function createRenderEffect(fn, value, options) {
-  updateComputation(createComputation(fn, value, false, STALE));
+  const c = createComputation(fn, value, false, STALE);
+  if (Scheduler && Transition && Transition.running) Updates.push(c);else updateComputation(c);
 }
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
@@ -212,7 +215,10 @@ function createMemo(fn, value, options) {
   c.observers = null;
   c.observerSlots = null;
   c.comparator = options.equals || undefined;
-  updateComputation(c);
+  if (Scheduler && Transition && Transition.running) {
+    c.tState = STALE;
+    Updates.push(c);
+  } else updateComputation(c);
   return readSignal.bind(c);
 }
 function createResource(source, fetcher, options) {
@@ -241,12 +247,7 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    if (sharedConfig.context.loadResource) {
-      initP = sharedConfig.context.loadResource(id);
-    } else if (sharedConfig.resources && id && id in sharedConfig.resources) {
-      initP = sharedConfig.resources[id];
-      delete sharedConfig.resources[id];
-    }
+    if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
     if (pr === p) {
@@ -350,7 +351,7 @@ 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) || p !== undefined && fn(key, p)) {
+    for (const key of subs.keys()) if (fn(key, v) !== (p !== undefined && fn(key, p))) {
       const l = subs.get(key);
       for (const c of l.values()) {
         c.state = STALE;
@@ -401,7 +402,8 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn, options) {
+function on(deps, fn,
+options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;
@@ -654,7 +656,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookDownstream(node);
+      lookDownstream(node, ancestors[0]);
       Updates = updates;
     }
   }
@@ -752,13 +754,15 @@ function runUserEffects(queue) {
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
 }
-function lookDownstream(node) {
+function lookDownstream(node, ignore) {
   node.state = 0;
   const runningTransition = Transition && Transition.running;
   for (let i = 0; i < node.sources.length; i += 1) {
     const source = node.sources[i];
     if (source.sources) {
-      if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) runTop(source);else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source);
+      if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
+        if (source !== ignore) runTop(source);
+      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source, ignore);
     }
   }
 }
@@ -1156,7 +1160,7 @@ function lazy(fn) {
   let comp;
   const wrap = props => {
     const ctx = sharedConfig.context;
-    if (ctx && sharedConfig.resources) {
+    if (ctx) {
       ctx.count++;
       const [s, set] = createSignal();
       fn().then(mod => {
@@ -1229,7 +1233,7 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a && a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
+    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
   });
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
@@ -1323,7 +1327,10 @@ function SuspenseList(props) {
 function Suspense(props) {
   let counter = 0,
       showContent,
-      showFallback;
+      showFallback,
+      ctx,
+      waitingHydration,
+      flicker;
   const [inFallback, setFallback] = createSignal(false),
         SuspenseContext = getSuspenseContext(),
         store = {
@@ -1338,6 +1345,24 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
+  if (sharedConfig.context && sharedConfig.load) {
+    const key = sharedConfig.context.id + sharedConfig.context.count;
+    const p = sharedConfig.load(key);
+    if (p) {
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(() => {
+        sharedConfig.gather(key);
+        waitingHydration = true;
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext(undefined);
+        waitingHydration = false;
+      });
+    }
+  }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);
   let dispose;
@@ -1345,28 +1370,35 @@ function Suspense(props) {
   return createComponent(SuspenseContext.Provider, {
     value: store,
     get children() {
-      const rendered = untrack(() => props.children);
       return createMemo(() => {
-        const inFallback = store.inFallback(),
-              visibleContent = showContent ? showContent() : true,
-              visibleFallback = showFallback ? showFallback() : true;
-        dispose && dispose();
-        if (!inFallback && visibleContent) {
-          store.resolved = true;
-          resumeEffects(store.effects);
-          return rendered;
+        if (flicker) {
+          ctx = sharedConfig.context;
+          flicker();
+          return flicker = undefined;
         }
-        if (!visibleFallback) return;
-        return createRoot(disposer => {
-          dispose = disposer;
-          return props.fallback;
-        }, owner);
+        const rendered = untrack(() => props.children);
+        return createMemo(() => {
+          const inFallback = store.inFallback(),
+                visibleContent = showContent ? showContent() : true,
+                visibleFallback = showFallback ? showFallback() : true;
+          dispose && dispose();
+          if ((!inFallback || waitingHydration) && visibleContent) {
+            store.resolved = true;
+            resumeEffects(store.effects);
+            return rendered;
+          }
+          if (!visibleFallback) return;
+          return createRoot(disposer => {
+            dispose = disposer;
+            if (sharedConfig.context) sharedConfig.context.count = 0;
+            return props.fallback;
+          }, owner);
+        });
       });
     }
   });
 }
 
-function awaitSuspense() {}
 let DEV;
 
 exports.$PROXY = $PROXY;
@@ -1379,7 +1411,6 @@ exports.Show = Show;
 exports.Suspense = Suspense;
 exports.SuspenseList = SuspenseList;
 exports.Switch = Switch;
-exports.awaitSuspense = awaitSuspense;
 exports.batch = batch;
 exports.cancelCallback = cancelCallback;
 exports.children = children;

package/dist/solid.js

@@ -180,18 +180,21 @@ function createSignal(value, options) {
     pending: NOTPENDING,
     comparator: options.equals || undefined
   };
-  return [readSignal.bind(s), value => {
+  const setter = value => {
     if (typeof value === "function") {
       if (Transition && Transition.running && Transition.sources.has(s)) value = value(s.pending !== NOTPENDING ? s.pending : s.tValue);else value = value(s.pending !== NOTPENDING ? s.pending : s.value);
     }
     return writeSignal(s, value);
-  }];
+  };
+  return [readSignal.bind(s), setter];
 }
 function createComputed(fn, value, options) {
-  updateComputation(createComputation(fn, value, true, STALE));
+  const c = createComputation(fn, value, true, STALE);
+  if (Scheduler && Transition && Transition.running) Updates.push(c);else updateComputation(c);
 }
 function createRenderEffect(fn, value, options) {
-  updateComputation(createComputation(fn, value, false, STALE));
+  const c = createComputation(fn, value, false, STALE);
+  if (Scheduler && Transition && Transition.running) Updates.push(c);else updateComputation(c);
 }
 function createEffect(fn, value, options) {
   runEffects = runUserEffects;
@@ -208,7 +211,10 @@ function createMemo(fn, value, options) {
   c.observers = null;
   c.observerSlots = null;
   c.comparator = options.equals || undefined;
-  updateComputation(c);
+  if (Scheduler && Transition && Transition.running) {
+    c.tState = STALE;
+    Updates.push(c);
+  } else updateComputation(c);
   return readSignal.bind(c);
 }
 function createResource(source, fetcher, options) {
@@ -237,12 +243,7 @@ function createResource(source, fetcher, options) {
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
-    if (sharedConfig.context.loadResource) {
-      initP = sharedConfig.context.loadResource(id);
-    } else if (sharedConfig.resources && id && id in sharedConfig.resources) {
-      initP = sharedConfig.resources[id];
-      delete sharedConfig.resources[id];
-    }
+    if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
     if (pr === p) {
@@ -346,7 +347,7 @@ 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) || p !== undefined && fn(key, p)) {
+    for (const key of subs.keys()) if (fn(key, v) !== (p !== undefined && fn(key, p))) {
       const l = subs.get(key);
       for (const c of l.values()) {
         c.state = STALE;
@@ -397,7 +398,8 @@ function untrack(fn) {
   Listener = listener;
   return result;
 }
-function on(deps, fn, options) {
+function on(deps, fn,
+options) {
   const isArray = Array.isArray(deps);
   let prevInput;
   let defer = options && options.defer;
@@ -650,7 +652,7 @@ function runTop(node) {
     } else if (!runningTransition && node.state === PENDING || runningTransition && node.tState === PENDING) {
       const updates = Updates;
       Updates = null;
-      lookDownstream(node);
+      lookDownstream(node, ancestors[0]);
       Updates = updates;
     }
   }
@@ -748,13 +750,15 @@ function runUserEffects(queue) {
   for (i = 0; i < userLength; i++) runTop(queue[i]);
   for (i = resume; i < queue.length; i++) runTop(queue[i]);
 }
-function lookDownstream(node) {
+function lookDownstream(node, ignore) {
   node.state = 0;
   const runningTransition = Transition && Transition.running;
   for (let i = 0; i < node.sources.length; i += 1) {
     const source = node.sources[i];
     if (source.sources) {
-      if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) runTop(source);else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source);
+      if (!runningTransition && source.state === STALE || runningTransition && source.tState === STALE) {
+        if (source !== ignore) runTop(source);
+      } else if (!runningTransition && source.state === PENDING || runningTransition && source.tState === PENDING) lookDownstream(source, ignore);
     }
   }
 }
@@ -1152,7 +1156,7 @@ function lazy(fn) {
   let comp;
   const wrap = props => {
     const ctx = sharedConfig.context;
-    if (ctx && sharedConfig.resources) {
+    if (ctx) {
       ctx.count++;
       const [s, set] = createSignal();
       fn().then(mod => {
@@ -1225,7 +1229,7 @@ function Switch(props) {
     }
     return [-1];
   }, undefined, {
-    equals: (a, b) => a && a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
+    equals: (a, b) => a[0] === b[0] && (strictEqual ? a[1] === b[1] : !a[1] === !b[1]) && a[2] === b[2]
   });
   return createMemo(() => {
     const [index, when, cond] = evalConditions();
@@ -1319,7 +1323,10 @@ function SuspenseList(props) {
 function Suspense(props) {
   let counter = 0,
       showContent,
-      showFallback;
+      showFallback,
+      ctx,
+      waitingHydration,
+      flicker;
   const [inFallback, setFallback] = createSignal(false),
         SuspenseContext = getSuspenseContext(),
         store = {
@@ -1334,6 +1341,24 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
+  if (sharedConfig.context && sharedConfig.load) {
+    const key = sharedConfig.context.id + sharedConfig.context.count;
+    const p = sharedConfig.load(key);
+    if (p) {
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(() => {
+        sharedConfig.gather(key);
+        waitingHydration = true;
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext(undefined);
+        waitingHydration = false;
+      });
+    }
+  }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);
   let dispose;
@@ -1341,28 +1366,35 @@ function Suspense(props) {
   return createComponent(SuspenseContext.Provider, {
     value: store,
     get children() {
-      const rendered = untrack(() => props.children);
       return createMemo(() => {
-        const inFallback = store.inFallback(),
-              visibleContent = showContent ? showContent() : true,
-              visibleFallback = showFallback ? showFallback() : true;
-        dispose && dispose();
-        if (!inFallback && visibleContent) {
-          store.resolved = true;
-          resumeEffects(store.effects);
-          return rendered;
+        if (flicker) {
+          ctx = sharedConfig.context;
+          flicker();
+          return flicker = undefined;
         }
-        if (!visibleFallback) return;
-        return createRoot(disposer => {
-          dispose = disposer;
-          return props.fallback;
-        }, owner);
+        const rendered = untrack(() => props.children);
+        return createMemo(() => {
+          const inFallback = store.inFallback(),
+                visibleContent = showContent ? showContent() : true,
+                visibleFallback = showFallback ? showFallback() : true;
+          dispose && dispose();
+          if ((!inFallback || waitingHydration) && visibleContent) {
+            store.resolved = true;
+            resumeEffects(store.effects);
+            return rendered;
+          }
+          if (!visibleFallback) return;
+          return createRoot(disposer => {
+            dispose = disposer;
+            if (sharedConfig.context) sharedConfig.context.count = 0;
+            return props.fallback;
+          }, owner);
+        });
       });
     }
   });
 }
 
-function awaitSuspense() {}
 let DEV;
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, awaitSuspense, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, cancelCallback, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.2.4",
+  "version": "1.3.0-beta.2",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://github.com/solidjs/solid#readme",
@@ -132,5 +132,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "2866e83def4f3a02c305277fa8f589e355ab8952"
+  "gitHead": "afe407af6463d4956c2c283370895b4d02b205e8"
 }

package/types/index.d.ts

@@ -7,7 +7,6 @@ export * from "./render";
 import type { JSX } from "./jsx";
 declare type JSXElement = JSX.Element;
 export type { JSXElement, JSX };
-export declare function awaitSuspense(): void;
 import { writeSignal, serializeGraph, registerGraph, hashValue } from "./reactive/signal";
 declare let DEV: {
     writeSignal: typeof writeSignal;