solid-js 1.2.5 → 1.3.0-beta.10

package/dist/solid.js

@@ -145,6 +145,7 @@ const [transPending, setTransPending] = /*@__PURE__*/createSignal(false);
 var Owner = null;
 let Transition = null;
 let Scheduler = null;
+let ExternalSourceFactory = null;
 let Listener = null;
 let Pending = null;
 let Updates = null;
@@ -180,12 +181,13 @@ 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) {
   const c = createComputation(fn, value, true, STALE);
@@ -227,6 +229,9 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
+  Resources || (Resources = new Set());
+  Resources.add(load);
+  onCleanup(() => Resources.delete(load));
   const contexts = new Set(),
         [s, set] = createSignal((options || {}).initialValue),
         [track, trigger] = createSignal(undefined, {
@@ -242,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) {
@@ -293,7 +293,7 @@ function createResource(source, fetcher, options) {
     }
     return v;
   }
-  function load() {
+  function load(refetching = true) {
     setError(err = undefined);
     const lookup = dynamic ? source() : source;
     loadedUnderTransition = Transition && Transition.running;
@@ -302,7 +302,10 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = initP || untrack(() => fetcher(lookup, s));
+    const p = initP || untrack(() => fetcher(lookup, {
+      value: s(),
+      refetching
+    }));
     initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
@@ -327,12 +330,16 @@ function createResource(source, fetcher, options) {
       }
     }
   });
-  if (dynamic) createComputed(load);else load();
+  if (dynamic) createComputed(() => load(false));else load(false);
   return [read, {
     refetch: load,
     mutate: set
   }];
 }
+let Resources;
+function refetchResources(info) {
+  Resources && Resources.forEach(fn => fn(info));
+}
 function createDeferred(source, options) {
   let t,
       timeout = options ? options.timeoutMs : undefined;
@@ -351,7 +358,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;
@@ -402,7 +409,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;
@@ -502,6 +510,24 @@ let SuspenseContext;
 function getSuspenseContext() {
   return SuspenseContext || (SuspenseContext = createContext({}));
 }
+function enableExternalSource(factory) {
+  if (ExternalSourceFactory) {
+    const oldFactory = ExternalSourceFactory;
+    ExternalSourceFactory = (fn, trigger) => {
+      const oldSource = oldFactory(fn, trigger);
+      const source = factory(x => oldSource.track(x), trigger);
+      return {
+        track: x => source.track(x),
+        dispose() {
+          source.dispose();
+          oldSource.dispose();
+        }
+      };
+    };
+  } else {
+    ExternalSourceFactory = factory;
+  }
+}
 function readSignal() {
   const runningTransition = Transition && Transition.running;
   if (this.sources && (!runningTransition && this.state || runningTransition && this.tState)) {
@@ -629,6 +655,19 @@ function createComputation(fn, init, pure, state = STALE, options) {
       if (!Owner.owned) Owner.owned = [c];else Owner.owned.push(c);
     }
   }
+  if (ExternalSourceFactory) {
+    const [track, trigger] = createSignal(undefined, {
+      equals: false
+    });
+    const ordinary = ExternalSourceFactory(c.fn, trigger);
+    onCleanup(() => ordinary.dispose());
+    const triggerInTransition = () => startTransition(trigger, () => inTransition.dispose());
+    const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
+    c.fn = x => {
+      track();
+      return Transition && Transition.running ? inTransition.track(x) : ordinary.track(x);
+    };
+  }
   return c;
 }
 function runTop(node) {
@@ -655,7 +694,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;
     }
   }
@@ -753,13 +792,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);
     }
   }
 }
@@ -1060,13 +1101,19 @@ function indexArray(list, mapFn, options = {}) {
   };
 }
 
+let hydrationEnabled = false;
+function enableHydration() {
+  hydrationEnabled = true;
+}
 function createComponent(Comp, props) {
-  if (sharedConfig.context) {
-    const c = sharedConfig.context;
-    setHydrateContext(nextHydrateContext());
-    const r = untrack(() => Comp(props));
-    setHydrateContext(c);
-    return r;
+  if (hydrationEnabled) {
+    if (sharedConfig.context) {
+      const c = sharedConfig.context;
+      setHydrateContext(nextHydrateContext());
+      const r = untrack(() => Comp(props));
+      setHydrateContext(c);
+      return r;
+    }
   }
   return untrack(() => Comp(props));
 }
@@ -1155,19 +1202,20 @@ function splitProps(props, ...keys) {
 }
 function lazy(fn) {
   let comp;
+  let p;
   const wrap = props => {
     const ctx = sharedConfig.context;
-    if (ctx && sharedConfig.resources) {
+    if (ctx) {
       ctx.count++;
       const [s, set] = createSignal();
-      fn().then(mod => {
+      (p || (p = fn())).then(mod => {
         setHydrateContext(ctx);
         set(() => mod.default);
-        setHydrateContext(undefined);
+        setHydrateContext();
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => fn().then(mod => mod.default));
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     } else {
       const c = comp();
@@ -1183,7 +1231,7 @@ function lazy(fn) {
       return r;
     }));
   };
-  wrap.preload = () => comp || fn().then(mod => comp = () => mod.default);
+  wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   return wrap;
 }
 let counter = 0;
@@ -1230,7 +1278,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();
@@ -1243,7 +1291,11 @@ function Match(props) {
   return props;
 }
 function ErrorBoundary(props) {
-  const [errored, setErrored] = createSignal();
+  let err = undefined;
+  if (sharedConfig.context && sharedConfig.load) {
+    err = sharedConfig.load(sharedConfig.context.id + sharedConfig.context.count);
+  }
+  const [errored, setErrored] = createSignal(err);
   let e;
   return createMemo(() => {
     if ((e = errored()) != null) {
@@ -1324,7 +1376,11 @@ function SuspenseList(props) {
 function Suspense(props) {
   let counter = 0,
       showContent,
-      showFallback;
+      showFallback,
+      ctx,
+      p,
+      flicker,
+      error;
   const [inFallback, setFallback] = createSignal(false),
         SuspenseContext = getSuspenseContext(),
         store = {
@@ -1339,6 +1395,24 @@ function Suspense(props) {
     resolved: false
   },
         owner = getOwner();
+  if (sharedConfig.context) {
+    const key = sharedConfig.context.id + sharedConfig.context.count;
+    p = sharedConfig.load(key);
+    if (p && typeof p === "object") {
+      const [s, set] = createSignal(undefined, {
+        equals: false
+      });
+      flicker = s;
+      p.then(err => {
+        if (error = err) return set();
+        sharedConfig.gather(key);
+        setHydrateContext(ctx);
+        set();
+        setHydrateContext();
+        p = undefined;
+      });
+    }
+  }
   const listContext = useContext(SuspenseListContext);
   if (listContext) [showContent, showFallback] = listContext.register(store.inFallback);
   let dispose;
@@ -1346,28 +1420,43 @@ 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 (error) throw error;
+        ctx = sharedConfig.context;
+        if (flicker) {
+          flicker();
+          return flicker = undefined;
         }
-        if (!visibleFallback) return;
-        return createRoot(disposer => {
-          dispose = disposer;
-          return props.fallback;
-        }, owner);
+        if (ctx && p === undefined) setHydrateContext();
+        const rendered = untrack(() => props.children);
+        return createMemo(() => {
+          const inFallback = store.inFallback(),
+                visibleContent = showContent ? showContent() : true,
+                visibleFallback = showFallback ? showFallback() : true;
+          dispose && dispose();
+          if ((!inFallback || p !== undefined) && visibleContent) {
+            store.resolved = true;
+            resumeEffects(store.effects);
+            return rendered;
+          }
+          if (!visibleFallback) return;
+          return createRoot(disposer => {
+            dispose = disposer;
+            if (ctx) {
+              setHydrateContext({
+                id: ctx.id + "f",
+                count: 0
+              });
+              ctx = undefined;
+            }
+            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, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refetchResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "1.2.5",
+  "version": "1.3.0-beta.10",
   "author": "Ryan Carniato",
   "license": "MIT",
-  "homepage": "https://github.com/solidjs/solid#readme",
+  "homepage": "https://solidjs.com",
   "repository": {
     "type": "git",
     "url": "https://github.com/solidjs/solid"
@@ -36,11 +36,11 @@
   ],
   "exports": {
     ".": {
-      "development": {
-        "import": "./dist/dev.js",
-        "require": "./dist/dev.cjs"
-      },
       "browser": {
+        "development": {
+          "import": "./dist/dev.js",
+          "require": "./dist/dev.cjs"
+        },
         "import": "./dist/solid.js",
         "require": "./dist/solid.cjs"
       },
@@ -48,16 +48,20 @@
         "import": "./dist/server.js",
         "require": "./dist/server.cjs"
       },
+      "development": {
+        "import": "./dist/dev.js",
+        "require": "./dist/dev.cjs"
+      },
       "import": "./dist/solid.js",
       "require": "./dist/solid.cjs"
     },
     "./dist/*": "./dist/*",
     "./store": {
-      "development": {
-        "import": "./store/dist/dev.js",
-        "require": "./store/dist/dev.cjs"
-      },
       "browser": {
+        "development": {
+          "import": "./store/dist/dev.js",
+          "require": "./store/dist/dev.cjs"
+        },
         "import": "./store/dist/store.js",
         "require": "./store/dist/store.cjs"
       },
@@ -65,16 +69,20 @@
         "import": "./store/dist/server.js",
         "require": "./store/dist/server.cjs"
       },
+      "development": {
+        "import": "./store/dist/dev.js",
+        "require": "./store/dist/dev.cjs"
+      },
       "import": "./store/dist/store.js",
       "require": "./store/dist/store.cjs"
     },
     "./store/dist/*": "./store/dist/*",
     "./web": {
-      "development": {
-        "import": "./web/dist/dev.js",
-        "require": "./web/dist/dev.cjs"
-      },
       "browser": {
+        "development": {
+          "import": "./web/dist/dev.js",
+          "require": "./web/dist/dev.cjs"
+        },
         "import": "./web/dist/web.js",
         "require": "./web/dist/web.cjs"
       },
@@ -82,6 +90,10 @@
         "import": "./web/dist/server.js",
         "require": "./web/dist/server.cjs"
       },
+      "development": {
+        "import": "./web/dist/dev.js",
+        "require": "./web/dist/dev.cjs"
+      },
       "import": "./web/dist/web.js",
       "require": "./web/dist/web.cjs"
     },
@@ -132,5 +144,5 @@
     "compiler",
     "performance"
   ],
-  "gitHead": "faf884b19acc078f1e202030bbd6b22c49a5ae6b"
+  "gitHead": "58fd1f992d5ce333a8803cc6880cb431155fda5c"
 }

package/types/index.d.ts

@@ -1,5 +1,5 @@
-export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, startTransition, useTransition, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $PROXY } from "./reactive/signal";
-export type { Accessor, Setter, Resource, ResourceReturn, Context, ReturnTypes } from "./reactive/signal";
+export { createRoot, createSignal, createEffect, createRenderEffect, createComputed, createDeferred, createSelector, createMemo, createResource, onMount, onCleanup, onError, untrack, batch, on, enableScheduling, enableExternalSource, startTransition, useTransition, refetchResources, createContext, useContext, children, getListener, getOwner, runWithOwner, equalFn, $PROXY } from "./reactive/signal";
+export type { Accessor, Setter, Resource, ResourceReturn, ResourceFetcher, ResourceFetcherInfo, Context, ReturnTypes } from "./reactive/signal";
 export * from "./reactive/observable";
 export * from "./reactive/scheduler";
 export * from "./reactive/array";
@@ -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;