solid-js 2.0.0-experimental.5 → 2.0.0-experimental.7

package/dist/dev.cjs

@@ -98,7 +98,7 @@ function from(producer, initialValue = undefined) {
 }
 
 const sharedConfig = {
-  context: undefined,
+  hydrating: false,
   registry: undefined,
   done: false,
   getNextContextId() {
@@ -107,8 +107,90 @@ const sharedConfig = {
     return o.getNextChildId();
   }
 };
-function setHydrateContext(context) {
-  sharedConfig.context = context;
+function Suspense(props) {
+  if (!sharedConfig.hydrating) return signals.createSuspense(() => props.children, () => props.fallback);
+  return signals.createMemo(() => {
+    const o = signals.getOwner();
+    const id = o.id;
+    if (sharedConfig.hydrating && sharedConfig.has(id)) {
+      let ref = sharedConfig.load(id);
+      let p;
+      if (ref) {
+        if (typeof ref !== "object" || ref.s !== "success") p = ref;else sharedConfig.gather(id);
+      }
+      if (p) {
+        const [s, set] = signals.createSignal(undefined, {
+          equals: false
+        });
+        s();
+        if (p !== "$$f") {
+          p.then(() => {
+            sharedConfig.gather(id);
+            sharedConfig.hydrating = true;
+            set();
+            signals.flush();
+            sharedConfig.hydrating = false;
+          }, err => signals.runWithObserver(o, () => {
+            throw err;
+          }));
+        } else queueMicrotask(set);
+        return props.fallback;
+      }
+    }
+    return signals.createSuspense(() => props.children, () => props.fallback);
+  });
+}
+function createAsync(compute, value, options) {
+  if (!sharedConfig.hydrating) return signals.createAsync(compute, value, options);
+  return signals.createAsync(prev => {
+    if (!sharedConfig.hydrating) return compute(prev);
+    const o = signals.getOwner();
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.value || initP;
+    return init ? (subFetch(compute, prev), init) : compute(prev);
+  }, value, options);
+}
+class MockPromise {
+  static all() {
+    return new MockPromise();
+  }
+  static allSettled() {
+    return new MockPromise();
+  }
+  static any() {
+    return new MockPromise();
+  }
+  static race() {
+    return new MockPromise();
+  }
+  static reject() {
+    return new MockPromise();
+  }
+  static resolve() {
+    return new MockPromise();
+  }
+  catch() {
+    return new MockPromise();
+  }
+  then() {
+    return new MockPromise();
+  }
+  finally() {
+    return new MockPromise();
+  }
+}
+function subFetch(fn, prev) {
+  const ogFetch = fetch;
+  const ogPromise = Promise;
+  try {
+    window.fetch = () => new MockPromise();
+    Promise = MockPromise;
+    return fn(prev);
+  } finally {
+    window.fetch = ogFetch;
+    Promise = ogPromise;
+  }
 }
 
 function enableHydration() {
@@ -120,19 +202,7 @@ function lazy(fn) {
   let comp;
   let p;
   const wrap = props => {
-    const ctx = sharedConfig.context;
-    if (ctx) {
-      const [s, set] = signals.createSignal();
-      sharedConfig.count || (sharedConfig.count = 0);
-      sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
-        !sharedConfig.done && setHydrateContext(ctx);
-        sharedConfig.count--;
-        set(() => mod.default);
-        setHydrateContext();
-      });
-      comp = s;
-    } else if (!comp) {
+    if (!comp) {
       const s = signals.createAsync(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     }
@@ -141,12 +211,7 @@ function lazy(fn) {
       Object.assign(Comp, {
         [$DEVCOMP]: true
       });
-      if (!ctx || sharedConfig.done) return Comp(props);
-      const c = sharedConfig.context;
-      setHydrateContext(ctx);
-      const r = Comp(props);
-      setHydrateContext(c);
-      return r;
+      return Comp(props);
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
@@ -154,8 +219,7 @@ function lazy(fn) {
 }
 let counter = 0;
 function createUniqueId() {
-  const ctx = sharedConfig.context;
-  return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
+  return sharedConfig.hydrating ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
 const narrowedError = name => `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.` ;
@@ -248,9 +312,6 @@ function ErrorBoundary(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
-function Suspense(props) {
-  return signals.createSuspense(() => props.children, () => props.fallback);
-}
 function Boundary(props) {
   return signals.createBoundary(() => props.children, () => props.mode);
 }
@@ -270,18 +331,10 @@ Object.defineProperty(exports, "$PROXY", {
   enumerable: true,
   get: function () { return signals.$PROXY; }
 });
-Object.defineProperty(exports, "$RAW", {
-  enumerable: true,
-  get: function () { return signals.$RAW; }
-});
 Object.defineProperty(exports, "$TRACK", {
   enumerable: true,
   get: function () { return signals.$TRACK; }
 });
-Object.defineProperty(exports, "createAsync", {
-  enumerable: true,
-  get: function () { return signals.createAsync; }
-});
 Object.defineProperty(exports, "createEffect", {
   enumerable: true,
   get: function () { return signals.createEffect; }
@@ -290,6 +343,10 @@ Object.defineProperty(exports, "createMemo", {
   enumerable: true,
   get: function () { return signals.createMemo; }
 });
+Object.defineProperty(exports, "createOptimistic", {
+  enumerable: true,
+  get: function () { return signals.createOptimistic; }
+});
 Object.defineProperty(exports, "createProjection", {
   enumerable: true,
   get: function () { return signals.createProjection; }
@@ -310,13 +367,17 @@ Object.defineProperty(exports, "createStore", {
   enumerable: true,
   get: function () { return signals.createStore; }
 });
+Object.defineProperty(exports, "deep", {
+  enumerable: true,
+  get: function () { return signals.deep; }
+});
 Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
 });
-Object.defineProperty(exports, "flushSync", {
+Object.defineProperty(exports, "flush", {
   enumerable: true,
-  get: function () { return signals.flushSync; }
+  get: function () { return signals.flush; }
 });
 Object.defineProperty(exports, "getObserver", {
   enumerable: true,
@@ -378,6 +439,14 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
+Object.defineProperty(exports, "snapshot", {
+  enumerable: true,
+  get: function () { return signals.snapshot; }
+});
+Object.defineProperty(exports, "transition", {
+  enumerable: true,
+  get: function () { return signals.transition; }
+});
 Object.defineProperty(exports, "tryCatch", {
   enumerable: true,
   get: function () { return signals.tryCatch; }
@@ -386,10 +455,6 @@ Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return signals.untrack; }
 });
-Object.defineProperty(exports, "unwrap", {
-  enumerable: true,
-  get: function () { return signals.unwrap; }
-});
 exports.$DEVCOMP = $DEVCOMP;
 exports.Boundary = Boundary;
 exports.DEV = DEV;
@@ -401,6 +466,7 @@ exports.Show = Show;
 exports.Suspense = Suspense;
 exports.Switch = Switch;
 exports.children = children;
+exports.createAsync = createAsync;
 exports.createComponent = createComponent;
 exports.createContext = createContext;
 exports.createUniqueId = createUniqueId;

package/dist/dev.js

@@ -1,5 +1,5 @@
-import { createEffect, getContext, createMemo, flatten, createRoot, setContext, getOwner, untrack, onCleanup, createSignal, createAsync, mapArray, repeat, createErrorBoundary, createSuspense, createBoundary } from '@solidjs/signals';
-export { $PROXY, $RAW, $TRACK, createAsync, createEffect, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, flatten, flushSync, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, tryCatch, untrack, unwrap } from '@solidjs/signals';
+import { createEffect, getContext, createMemo, flatten, createRoot, setContext, getOwner, untrack, onCleanup, createSignal, createSuspense, flush, runWithObserver, createAsync as createAsync$1, mapArray, repeat, createErrorBoundary, createBoundary } from '@solidjs/signals';
+export { $PROXY, $TRACK, createEffect, createMemo, createOptimistic, createProjection, createRenderEffect, createRoot, createSignal, createStore, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, repeat, resolve, runWithObserver, runWithOwner, snapshot, transition, tryCatch, untrack } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol("COMPONENT_DEV" );
 function onMount(fn) {
@@ -97,7 +97,7 @@ function from(producer, initialValue = undefined) {
 }
 
 const sharedConfig = {
-  context: undefined,
+  hydrating: false,
   registry: undefined,
   done: false,
   getNextContextId() {
@@ -106,8 +106,90 @@ const sharedConfig = {
     return o.getNextChildId();
   }
 };
-function setHydrateContext(context) {
-  sharedConfig.context = context;
+function Suspense(props) {
+  if (!sharedConfig.hydrating) return createSuspense(() => props.children, () => props.fallback);
+  return createMemo(() => {
+    const o = getOwner();
+    const id = o.id;
+    if (sharedConfig.hydrating && sharedConfig.has(id)) {
+      let ref = sharedConfig.load(id);
+      let p;
+      if (ref) {
+        if (typeof ref !== "object" || ref.s !== "success") p = ref;else sharedConfig.gather(id);
+      }
+      if (p) {
+        const [s, set] = createSignal(undefined, {
+          equals: false
+        });
+        s();
+        if (p !== "$$f") {
+          p.then(() => {
+            sharedConfig.gather(id);
+            sharedConfig.hydrating = true;
+            set();
+            flush();
+            sharedConfig.hydrating = false;
+          }, err => runWithObserver(o, () => {
+            throw err;
+          }));
+        } else queueMicrotask(set);
+        return props.fallback;
+      }
+    }
+    return createSuspense(() => props.children, () => props.fallback);
+  });
+}
+function createAsync(compute, value, options) {
+  if (!sharedConfig.hydrating) return createAsync$1(compute, value, options);
+  return createAsync$1(prev => {
+    if (!sharedConfig.hydrating) return compute(prev);
+    const o = getOwner();
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.value || initP;
+    return init ? (subFetch(compute, prev), init) : compute(prev);
+  }, value, options);
+}
+class MockPromise {
+  static all() {
+    return new MockPromise();
+  }
+  static allSettled() {
+    return new MockPromise();
+  }
+  static any() {
+    return new MockPromise();
+  }
+  static race() {
+    return new MockPromise();
+  }
+  static reject() {
+    return new MockPromise();
+  }
+  static resolve() {
+    return new MockPromise();
+  }
+  catch() {
+    return new MockPromise();
+  }
+  then() {
+    return new MockPromise();
+  }
+  finally() {
+    return new MockPromise();
+  }
+}
+function subFetch(fn, prev) {
+  const ogFetch = fetch;
+  const ogPromise = Promise;
+  try {
+    window.fetch = () => new MockPromise();
+    Promise = MockPromise;
+    return fn(prev);
+  } finally {
+    window.fetch = ogFetch;
+    Promise = ogPromise;
+  }
 }
 
 function enableHydration() {
@@ -119,20 +201,8 @@ function lazy(fn) {
   let comp;
   let p;
   const wrap = props => {
-    const ctx = sharedConfig.context;
-    if (ctx) {
-      const [s, set] = createSignal();
-      sharedConfig.count || (sharedConfig.count = 0);
-      sharedConfig.count++;
-      (p || (p = fn())).then(mod => {
-        !sharedConfig.done && setHydrateContext(ctx);
-        sharedConfig.count--;
-        set(() => mod.default);
-        setHydrateContext();
-      });
-      comp = s;
-    } else if (!comp) {
-      const s = createAsync(() => (p || (p = fn())).then(mod => mod.default));
+    if (!comp) {
+      const s = createAsync$1(() => (p || (p = fn())).then(mod => mod.default));
       comp = s;
     }
     let Comp;
@@ -140,12 +210,7 @@ function lazy(fn) {
       Object.assign(Comp, {
         [$DEVCOMP]: true
       });
-      if (!ctx || sharedConfig.done) return Comp(props);
-      const c = sharedConfig.context;
-      setHydrateContext(ctx);
-      const r = Comp(props);
-      setHydrateContext(c);
-      return r;
+      return Comp(props);
     }) : "");
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
@@ -153,8 +218,7 @@ function lazy(fn) {
 }
 let counter = 0;
 function createUniqueId() {
-  const ctx = sharedConfig.context;
-  return ctx ? sharedConfig.getNextContextId() : `cl-${counter++}`;
+  return sharedConfig.hydrating ? sharedConfig.getNextContextId() : `cl-${counter++}`;
 }
 
 const narrowedError = name => `Attempting to access a stale value from <${name}> that could possibly be undefined. This may occur because you are reading the accessor returned from the component at a time where it has already been unmounted. We recommend cleaning up any stale timers or async, or reading from the initial condition.` ;
@@ -247,9 +311,6 @@ function ErrorBoundary(props) {
     return typeof f === "function" && f.length ? f(err, reset) : f;
   });
 }
-function Suspense(props) {
-  return createSuspense(() => props.children, () => props.fallback);
-}
 function Boundary(props) {
   return createBoundary(() => props.children, () => props.mode);
 }
@@ -265,4 +326,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 { $DEVCOMP, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createComponent, createContext, createUniqueId, enableHydration, from, lazy, observable, onMount, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, Boundary, DEV, ErrorBoundary, For, Match, Repeat, Show, Suspense, Switch, children, createAsync, createComponent, createContext, createUniqueId, enableHydration, from, lazy, observable, onMount, sharedConfig, ssrHandleError, ssrRunInScope, useContext };