solid-js 1.3.0-beta.3 → 1.3.0-beta.7

package/dist/dev.cjs

@@ -149,6 +149,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;
@@ -246,10 +247,13 @@ function createResource(source, fetcher, options) {
       pr = null,
       initP = null,
       id = null,
+      ctx,
       loadedUnderTransition = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
+    ctx = { ...sharedConfig.context
+    };
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -267,7 +271,14 @@ function createResource(source, fetcher, options) {
           }
           completeLoad(v);
         }, false);
-      } else completeLoad(v);
+      } else {
+        if (p === initP) setHydrateContext(ctx);
+        completeLoad(v);
+        if (p === initP) {
+          initP = null;
+          setHydrateContext();
+        }
+      }
     }
     return v;
   }
@@ -305,8 +316,7 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = initP || untrack(() => fetcher(lookup, s));
-    initP = null;
+    const p = sharedConfig.context && initP || untrack(() => fetcher(lookup, s));
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
       return;
@@ -554,6 +564,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)) {
@@ -682,6 +710,19 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
     c.name = options && options.name || `${Owner.name || "c"}-${(Owner.owned || Owner.tOwned).length}`;
   }
+  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) {
@@ -1139,13 +1180,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 = devComponent(Comp, props) ;
-    setHydrateContext(c);
-    return r;
+  if (hydrationEnabled) {
+    if (sharedConfig.context) {
+      const c = sharedConfig.context;
+      setHydrateContext(nextHydrateContext());
+      const r = devComponent(Comp, props) ;
+      setHydrateContext(c);
+      return r;
+    }
   }
   return devComponent(Comp, props);
 }
@@ -1234,19 +1281,20 @@ function splitProps(props, ...keys) {
 }
 function lazy(fn) {
   let comp;
+  let p;
   const wrap = props => {
     const ctx = sharedConfig.context;
     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();
@@ -1262,7 +1310,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;
@@ -1473,7 +1521,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });
@@ -1519,6 +1570,8 @@ exports.createRoot = createRoot;
 exports.createSelector = createSelector;
 exports.createSignal = createSignal;
 exports.createUniqueId = createUniqueId;
+exports.enableExternalSource = enableExternalSource;
+exports.enableHydration = enableHydration;
 exports.enableScheduling = enableScheduling;
 exports.equalFn = equalFn;
 exports.from = from;

package/dist/dev.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;
@@ -242,10 +243,13 @@ function createResource(source, fetcher, options) {
       pr = null,
       initP = null,
       id = null,
+      ctx,
       loadedUnderTransition = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
+    ctx = { ...sharedConfig.context
+    };
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -263,7 +267,14 @@ function createResource(source, fetcher, options) {
           }
           completeLoad(v);
         }, false);
-      } else completeLoad(v);
+      } else {
+        if (p === initP) setHydrateContext(ctx);
+        completeLoad(v);
+        if (p === initP) {
+          initP = null;
+          setHydrateContext();
+        }
+      }
     }
     return v;
   }
@@ -301,8 +312,7 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = initP || untrack(() => fetcher(lookup, s));
-    initP = null;
+    const p = sharedConfig.context && initP || untrack(() => fetcher(lookup, s));
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
       return;
@@ -550,6 +560,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)) {
@@ -678,6 +706,19 @@ function createComputation(fn, init, pure, state = STALE, options) {
     }
     c.name = options && options.name || `${Owner.name || "c"}-${(Owner.owned || Owner.tOwned).length}`;
   }
+  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) {
@@ -1135,13 +1176,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 = devComponent(Comp, props) ;
-    setHydrateContext(c);
-    return r;
+  if (hydrationEnabled) {
+    if (sharedConfig.context) {
+      const c = sharedConfig.context;
+      setHydrateContext(nextHydrateContext());
+      const r = devComponent(Comp, props) ;
+      setHydrateContext(c);
+      return r;
+    }
   }
   return devComponent(Comp, props);
 }
@@ -1230,19 +1277,20 @@ function splitProps(props, ...keys) {
 }
 function lazy(fn) {
   let comp;
+  let p;
   const wrap = props => {
     const ctx = sharedConfig.context;
     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();
@@ -1258,7 +1306,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;
@@ -1469,7 +1517,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });
@@ -1491,4 +1542,4 @@ if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-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 };
+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, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/server.cjs

@@ -208,6 +208,7 @@ function from(producer) {
   }
   return s;
 }
+function enableExternalSource(factory) {}
 
 function resolveSSRNode(node) {
   const t = typeof node;
@@ -350,7 +351,7 @@ function createResource(fn, fetcher, options = {}) {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -362,7 +363,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -425,7 +426,7 @@ function lazy(fn) {
     });
     return "";
   };
-  wrap.preload = () => {};
+  wrap.preload = () => p;
   return wrap;
 }
 function suspenseComplete(c) {
@@ -501,9 +502,10 @@ function Suspense(props) {
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
 exports.$PROXY = $PROXY;
@@ -530,6 +532,7 @@ exports.createRoot = createRoot;
 exports.createSelector = createSelector;
 exports.createSignal = createSignal;
 exports.createUniqueId = createUniqueId;
+exports.enableExternalSource = enableExternalSource;
 exports.enableScheduling = enableScheduling;
 exports.equalFn = equalFn;
 exports.from = from;

package/dist/server.js

@@ -204,6 +204,7 @@ function from(producer) {
   }
   return s;
 }
+function enableExternalSource(factory) {}
 
 function resolveSSRNode(node) {
   const t = typeof node;
@@ -346,7 +347,7 @@ function createResource(fn, fetcher, options = {}) {
     if (error) throw error;
     if (resourceContext && p) resourceContext.push(p);
     const resolved = sharedConfig.context.async && sharedConfig.context.resources[id].data;
-    if (!resolved) {
+    if (!resolved && read.loading) {
       const ctx = useContext(SuspenseContext);
       if (ctx) {
         ctx.resources.set(id, read);
@@ -358,7 +359,7 @@ function createResource(fn, fetcher, options = {}) {
   read.loading = false;
   function load() {
     const ctx = sharedConfig.context;
-    if (!ctx.async) return read.loading = true;
+    if (!ctx.async) return read.loading = !!(typeof fn === "function" ? fn() : fn);
     if (ctx.resources && id in ctx.resources && ctx.resources[id].data) {
       value = ctx.resources[id].data;
       return;
@@ -421,7 +422,7 @@ function lazy(fn) {
     });
     return "";
   };
-  wrap.preload = () => {};
+  wrap.preload = () => p;
   return wrap;
 }
 function suspenseComplete(c) {
@@ -497,9 +498,10 @@ function Suspense(props) {
     };
   }
   setHydrateContext({ ...ctx,
-    count: 0
+    count: 0,
+    id: ctx.id + "0.f"
   });
-  return createComponent(() => props.fallback, {});
+  return props.fallback;
 }
 
-export { $PROXY, DEV, ErrorBoundary, For, Index, Match, Show, Suspense, SuspenseList, Switch, batch, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableScheduling, equalFn, from, getListener, getOwner, 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, children, createComponent, createComputed, createContext, createDeferred, createEffect, createMemo, createRenderEffect, createResource, createRoot, createSelector, createSignal, createUniqueId, enableExternalSource, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };

package/dist/solid.cjs

@@ -149,6 +149,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;
@@ -243,10 +244,13 @@ function createResource(source, fetcher, options) {
       pr = null,
       initP = null,
       id = null,
+      ctx,
       loadedUnderTransition = false,
       dynamic = typeof source === "function";
   if (sharedConfig.context) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
+    ctx = { ...sharedConfig.context
+    };
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
   function loadEnd(p, v, e) {
@@ -264,7 +268,14 @@ function createResource(source, fetcher, options) {
           }
           completeLoad(v);
         }, false);
-      } else completeLoad(v);
+      } else {
+        if (p === initP) setHydrateContext(ctx);
+        completeLoad(v);
+        if (p === initP) {
+          initP = null;
+          setHydrateContext();
+        }
+      }
     }
     return v;
   }
@@ -302,8 +313,7 @@ function createResource(source, fetcher, options) {
       return;
     }
     if (Transition && pr) Transition.promises.delete(pr);
-    const p = initP || untrack(() => fetcher(lookup, s));
-    initP = null;
+    const p = sharedConfig.context && initP || untrack(() => fetcher(lookup, s));
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
       return;
@@ -503,6 +513,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)) {
@@ -630,6 +658,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) {
@@ -1063,13 +1104,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));
 }
@@ -1158,19 +1205,20 @@ function splitProps(props, ...keys) {
 }
 function lazy(fn) {
   let comp;
+  let p;
   const wrap = props => {
     const ctx = sharedConfig.context;
     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();
@@ -1186,7 +1234,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;
@@ -1397,7 +1445,10 @@ function Suspense(props) {
           if (!visibleFallback) return;
           return createRoot(disposer => {
             dispose = disposer;
-            if (sharedConfig.context) sharedConfig.context.count = 0;
+            if (sharedConfig.context) setHydrateContext({
+              id: sharedConfig.context.id + "f",
+              count: 0
+            });
             return props.fallback;
           }, owner);
         });
@@ -1433,6 +1484,8 @@ exports.createRoot = createRoot;
 exports.createSelector = createSelector;
 exports.createSignal = createSignal;
 exports.createUniqueId = createUniqueId;
+exports.enableExternalSource = enableExternalSource;
+exports.enableHydration = enableHydration;
 exports.enableScheduling = enableScheduling;
 exports.equalFn = equalFn;
 exports.from = from;