solid-js 1.3.0-beta.9 → 1.3.0-rc.3

package/dist/dev.cjs

@@ -131,6 +131,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const signalOptions = {
   equals: equalFn
 };
@@ -236,11 +237,14 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  Resources || (Resources = new Set());
-  Resources.add(load);
-  onCleanup(() => Resources.delete(load));
+  options ||= {};
+  if (options.globalRefetch !== false) {
+    Resources || (Resources = new Set());
+    Resources.add(load);
+    onCleanup(() => Resources.delete(load));
+  }
   const contexts = new Set(),
-        [s, set] = createSignal((options || {}).initialValue),
+        [s, set] = createSignal(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -256,10 +260,14 @@ function createResource(source, fetcher, options) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
-  function loadEnd(p, v, e) {
+  function loadEnd(p, v, e, key) {
     if (pr === p) {
-      setError(err = e);
       pr = null;
+      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+        value: v
+      });
+      initP = null;
+      setError(err = e);
       if (Transition && p && loadedUnderTransition) {
         Transition.promises.delete(p);
         loadedUnderTransition = false;
@@ -313,17 +321,16 @@ function createResource(source, fetcher, options) {
       value: s(),
       refetching
     }));
-    initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
-      return;
+      return p;
     }
     pr = p;
     batch(() => {
       setLoading(true);
       trigger();
     });
-    p.then(v => loadEnd(p, v), e => loadEnd(p, e, e));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, e, e));
   }
   Object.defineProperties(read, {
     loading: {
@@ -344,7 +351,7 @@ function createResource(source, fetcher, options) {
   }];
 }
 let Resources;
-function refreshResources(info) {
+function refetchResources(info) {
   Resources && Resources.forEach(fn => fn(info));
 }
 function createDeferred(source, options) {
@@ -459,7 +466,7 @@ function runWithOwner(o, fn) {
   const prev = Owner;
   Owner = o;
   try {
-    return fn();
+    return runUpdates(fn, true);
   } finally {
     Owner = prev;
   }
@@ -467,28 +474,31 @@ function runWithOwner(o, fn) {
 function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
-function startTransition(fn, cb) {
+function startTransition(fn) {
   if (Transition && Transition.running) {
     fn();
-    cb && Transition.cb.push(cb);
-    return;
+    return Transition.done;
   }
-  queueMicrotask(() => {
+  const l = Listener;
+  const o = Owner;
+  return Promise.resolve().then(() => {
+    Listener = l;
+    Owner = o;
+    let t;
     if (Scheduler || SuspenseContext) {
-      Transition || (Transition = {
+      t = Transition || (Transition = {
         sources: new Set(),
         effects: [],
         promises: new Set(),
         disposed: new Set(),
         queue: new Set(),
-        running: true,
-        cb: []
+        running: true
       });
-      cb && Transition.cb.push(cb);
-      Transition.running = true;
+      t.done ||= new Promise(res => t.resolve = res);
+      t.running = true;
     }
     batch(fn);
-    if (!Scheduler && !SuspenseContext && cb) cb();
+    return t ? t.done : undefined;
   });
 }
 function useTransition() {
@@ -499,7 +509,12 @@ function resumeEffects(e) {
   e.length = 0;
 }
 function devComponent(Comp, props) {
-  const c = createComputation(() => untrack(() => Comp(props)), undefined, true);
+  const c = createComputation(() => untrack(() => {
+    Object.assign(Comp, {
+      [$DEVCOMP]: true
+    });
+    return Comp(props);
+  }), undefined, true);
   c.pending = NOTPENDING;
   c.observers = null;
   c.observerSlots = null;
@@ -717,7 +732,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     });
     const ordinary = ExternalSourceFactory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
-    const triggerInTransition = () => startTransition(trigger, () => inTransition.dispose());
+    const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
     const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
@@ -775,7 +790,7 @@ function completeUpdates(wait) {
     Updates = null;
   }
   if (wait) return;
-  let cbs;
+  let res;
   if (Transition && Transition.running) {
     if (Transition.promises.size || Transition.queue.size) {
       Transition.running = false;
@@ -785,7 +800,7 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
-    cbs = Transition.cb;
+    res = Transition.resolve;
     Effects.forEach(e => {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
@@ -812,7 +827,7 @@ function completeUpdates(wait) {
     Effects = null;
     globalThis._$afterUpdate && globalThis._$afterUpdate();
   }
-  if (cbs) cbs.forEach(cb => cb());
+  if (res) res();
 }
 function runQueue(queue) {
   for (let i = 0; i < queue.length; i++) runTop(queue[i]);
@@ -1295,7 +1310,9 @@ function lazy(fn) {
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default), {
+        globalRefetch: false
+      });
       comp = s;
     } else {
       const c = comp();
@@ -1478,19 +1495,21 @@ function Suspense(props) {
   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;
-      });
+    if (p) {
+      if (typeof p !== "object" || !("then" in p)) error = p;else {
+        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);
@@ -1550,6 +1569,7 @@ 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.");
 }
 
+exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
 exports.ErrorBoundary = ErrorBoundary;
 exports.For = For;
@@ -1590,7 +1610,7 @@ exports.on = on;
 exports.onCleanup = onCleanup;
 exports.onError = onError;
 exports.onMount = onMount;
-exports.refreshResources = refreshResources;
+exports.refetchResources = refetchResources;
 exports.requestCallback = requestCallback;
 exports.runWithOwner = runWithOwner;
 exports.sharedConfig = sharedConfig;

package/dist/dev.js

@@ -127,6 +127,7 @@ function nextHydrateContext() {
 
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const signalOptions = {
   equals: equalFn
 };
@@ -232,11 +233,14 @@ function createResource(source, fetcher, options) {
     fetcher = source;
     source = true;
   }
-  Resources || (Resources = new Set());
-  Resources.add(load);
-  onCleanup(() => Resources.delete(load));
+  options ||= {};
+  if (options.globalRefetch !== false) {
+    Resources || (Resources = new Set());
+    Resources.add(load);
+    onCleanup(() => Resources.delete(load));
+  }
   const contexts = new Set(),
-        [s, set] = createSignal((options || {}).initialValue),
+        [s, set] = createSignal(options.initialValue),
         [track, trigger] = createSignal(undefined, {
     equals: false
   }),
@@ -252,10 +256,14 @@ function createResource(source, fetcher, options) {
     id = `${sharedConfig.context.id}${sharedConfig.context.count++}`;
     if (sharedConfig.load) initP = sharedConfig.load(id);
   }
-  function loadEnd(p, v, e) {
+  function loadEnd(p, v, e, key) {
     if (pr === p) {
-      setError(err = e);
       pr = null;
+      if (initP && p === initP && options.onHydrated) options.onHydrated(key, {
+        value: v
+      });
+      initP = null;
+      setError(err = e);
       if (Transition && p && loadedUnderTransition) {
         Transition.promises.delete(p);
         loadedUnderTransition = false;
@@ -309,17 +317,16 @@ function createResource(source, fetcher, options) {
       value: s(),
       refetching
     }));
-    initP = null;
     if (typeof p !== "object" || !("then" in p)) {
       loadEnd(pr, p);
-      return;
+      return p;
     }
     pr = p;
     batch(() => {
       setLoading(true);
       trigger();
     });
-    p.then(v => loadEnd(p, v), e => loadEnd(p, e, e));
+    return p.then(v => loadEnd(p, v, undefined, lookup), e => loadEnd(p, e, e));
   }
   Object.defineProperties(read, {
     loading: {
@@ -340,7 +347,7 @@ function createResource(source, fetcher, options) {
   }];
 }
 let Resources;
-function refreshResources(info) {
+function refetchResources(info) {
   Resources && Resources.forEach(fn => fn(info));
 }
 function createDeferred(source, options) {
@@ -455,7 +462,7 @@ function runWithOwner(o, fn) {
   const prev = Owner;
   Owner = o;
   try {
-    return fn();
+    return runUpdates(fn, true);
   } finally {
     Owner = prev;
   }
@@ -463,28 +470,31 @@ function runWithOwner(o, fn) {
 function enableScheduling(scheduler = requestCallback) {
   Scheduler = scheduler;
 }
-function startTransition(fn, cb) {
+function startTransition(fn) {
   if (Transition && Transition.running) {
     fn();
-    cb && Transition.cb.push(cb);
-    return;
+    return Transition.done;
   }
-  queueMicrotask(() => {
+  const l = Listener;
+  const o = Owner;
+  return Promise.resolve().then(() => {
+    Listener = l;
+    Owner = o;
+    let t;
     if (Scheduler || SuspenseContext) {
-      Transition || (Transition = {
+      t = Transition || (Transition = {
         sources: new Set(),
         effects: [],
         promises: new Set(),
         disposed: new Set(),
         queue: new Set(),
-        running: true,
-        cb: []
+        running: true
       });
-      cb && Transition.cb.push(cb);
-      Transition.running = true;
+      t.done ||= new Promise(res => t.resolve = res);
+      t.running = true;
     }
     batch(fn);
-    if (!Scheduler && !SuspenseContext && cb) cb();
+    return t ? t.done : undefined;
   });
 }
 function useTransition() {
@@ -495,7 +505,12 @@ function resumeEffects(e) {
   e.length = 0;
 }
 function devComponent(Comp, props) {
-  const c = createComputation(() => untrack(() => Comp(props)), undefined, true);
+  const c = createComputation(() => untrack(() => {
+    Object.assign(Comp, {
+      [$DEVCOMP]: true
+    });
+    return Comp(props);
+  }), undefined, true);
   c.pending = NOTPENDING;
   c.observers = null;
   c.observerSlots = null;
@@ -713,7 +728,7 @@ function createComputation(fn, init, pure, state = STALE, options) {
     });
     const ordinary = ExternalSourceFactory(c.fn, trigger);
     onCleanup(() => ordinary.dispose());
-    const triggerInTransition = () => startTransition(trigger, () => inTransition.dispose());
+    const triggerInTransition = () => startTransition(trigger).then(() => inTransition.dispose());
     const inTransition = ExternalSourceFactory(c.fn, triggerInTransition);
     c.fn = x => {
       track();
@@ -771,7 +786,7 @@ function completeUpdates(wait) {
     Updates = null;
   }
   if (wait) return;
-  let cbs;
+  let res;
   if (Transition && Transition.running) {
     if (Transition.promises.size || Transition.queue.size) {
       Transition.running = false;
@@ -781,7 +796,7 @@ function completeUpdates(wait) {
       return;
     }
     const sources = Transition.sources;
-    cbs = Transition.cb;
+    res = Transition.resolve;
     Effects.forEach(e => {
       "tState" in e && (e.state = e.tState);
       delete e.tState;
@@ -808,7 +823,7 @@ function completeUpdates(wait) {
     Effects = null;
     globalThis._$afterUpdate && globalThis._$afterUpdate();
   }
-  if (cbs) cbs.forEach(cb => cb());
+  if (res) res();
 }
 function runQueue(queue) {
   for (let i = 0; i < queue.length; i++) runTop(queue[i]);
@@ -1291,7 +1306,9 @@ function lazy(fn) {
       });
       comp = s;
     } else if (!comp) {
-      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default));
+      const [s] = createResource(() => (p || (p = fn())).then(mod => mod.default), {
+        globalRefetch: false
+      });
       comp = s;
     } else {
       const c = comp();
@@ -1474,19 +1491,21 @@ function Suspense(props) {
   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;
-      });
+    if (p) {
+      if (typeof p !== "object" || !("then" in p)) error = p;else {
+        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);
@@ -1546,4 +1565,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, enableExternalSource, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, indexArray, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, refreshResources, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $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/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 $DEVCOMP = Symbol('solid-dev-component');
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -381,7 +382,7 @@ function createResource(fn, fetcher, options = {}) {
     read.loading = true;
     if ("then" in p) {
       if (ctx.writeResource) ctx.writeResource(id, p);
-      p.then(res => {
+      return p.then(res => {
         read.loading = false;
         ctx.resources[id].data = res;
         p = null;
@@ -393,10 +394,10 @@ function createResource(fn, fetcher, options = {}) {
         p = null;
         notifySuspense(contexts);
       });
-      return;
     }
     ctx.resources[id].data = p;
     p = null;
+    return ctx.resources[id].data;
   }
   load();
   return resource.ref = [read, {
@@ -442,6 +443,7 @@ function notifySuspense(contexts) {
   contexts.clear();
 }
 function enableScheduling() {}
+function enableHydration() {}
 function startTransition(fn) {
   fn();
 }
@@ -482,7 +484,7 @@ function Suspense(props) {
   }
   const res = runSuspense();
   if (suspenseComplete(value)) {
-    ctx.writeResource(id, true);
+    ctx.writeResource(id, null);
     return res;
   }
   onError(err => {
@@ -508,6 +510,7 @@ function Suspense(props) {
   return props.fallback;
 }
 
+exports.$DEVCOMP = $DEVCOMP;
 exports.$PROXY = $PROXY;
 exports.DEV = DEV;
 exports.ErrorBoundary = ErrorBoundary;
@@ -533,6 +536,7 @@ 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/server.js

@@ -1,5 +1,6 @@
 const equalFn = (a, b) => a === b;
 const $PROXY = Symbol("solid-proxy");
+const $DEVCOMP = Symbol('solid-dev-component');
 const DEV = {};
 const ERROR = Symbol("error");
 const UNOWNED = {
@@ -377,7 +378,7 @@ function createResource(fn, fetcher, options = {}) {
     read.loading = true;
     if ("then" in p) {
       if (ctx.writeResource) ctx.writeResource(id, p);
-      p.then(res => {
+      return p.then(res => {
         read.loading = false;
         ctx.resources[id].data = res;
         p = null;
@@ -389,10 +390,10 @@ function createResource(fn, fetcher, options = {}) {
         p = null;
         notifySuspense(contexts);
       });
-      return;
     }
     ctx.resources[id].data = p;
     p = null;
+    return ctx.resources[id].data;
   }
   load();
   return resource.ref = [read, {
@@ -438,6 +439,7 @@ function notifySuspense(contexts) {
   contexts.clear();
 }
 function enableScheduling() {}
+function enableHydration() {}
 function startTransition(fn) {
   fn();
 }
@@ -478,7 +480,7 @@ function Suspense(props) {
   }
   const res = runSuspense();
   if (suspenseComplete(value)) {
-    ctx.writeResource(id, true);
+    ctx.writeResource(id, null);
     return res;
   }
   onError(err => {
@@ -504,4 +506,4 @@ function Suspense(props) {
   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, enableExternalSource, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };
+export { $DEVCOMP, $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, enableHydration, enableScheduling, equalFn, from, getListener, getOwner, lazy, mapArray, mergeProps, observable, on, onCleanup, onError, onMount, requestCallback, runWithOwner, sharedConfig, splitProps, startTransition, untrack, useContext, useTransition };