solid-js 2.0.0-beta.6 → 2.0.0-beta.7

package/dist/server.js

@@ -27,25 +27,82 @@ function runWithObserver(comp, fn) {
 function getObserver() {
   return Observer;
 }
-function createSignal(first, second, third) {
+function createDeferredPromise() {
+  let settled = false;
+  let resolvePromise;
+  let rejectPromise;
+  const promise = new Promise((resolve, reject) => {
+    resolvePromise = resolve;
+    rejectPromise = reject;
+  });
+  return {
+    promise,
+    resolve(value) {
+      if (settled) return;
+      settled = true;
+      promise.s = 1;
+      promise.v = value;
+      resolvePromise(value);
+    },
+    reject(error) {
+      if (settled) return;
+      settled = true;
+      promise.s = 2;
+      promise.v = error;
+      rejectPromise(error);
+    }
+  };
+}
+function subscribePendingRetry(error, retry) {
+  if (!(error instanceof NotReadyError)) return false;
+  error.source?.then(() => retry(), () => retry());
+  return true;
+}
+function settleServerAsync(initial, rerun, deferred, onSuccess, onError, isDisposed) {
+  let first = true;
+  const attempt = () => {
+    if (isDisposed()) return;
+    let current;
+    try {
+      current = first ? initial : rerun();
+      first = false;
+    } catch (error) {
+      if (subscribePendingRetry(error, attempt)) return;
+      onError(error);
+      deferred.reject(error);
+      return;
+    }
+    Promise.resolve(current).then(value => {
+      if (isDisposed()) return;
+      deferred.resolve(onSuccess(value));
+    }, error => {
+      if (isDisposed()) return;
+      if (subscribePendingRetry(error, attempt)) return;
+      onError(error);
+      deferred.reject(error);
+    });
+  };
+  attempt();
+}
+function createSignal(first, second) {
   if (typeof first === "function") {
-    const opts = third?.deferStream || third?.ssrSource ? {
-      deferStream: third?.deferStream,
-      ssrSource: third?.ssrSource
+    const opts = second?.deferStream || second?.ssrSource ? {
+      deferStream: second?.deferStream,
+      ssrSource: second?.ssrSource
     } : undefined;
-    const memo = createMemo(prev => first(prev), second, opts);
+    const memo = createMemo(prev => first(prev), opts);
     return [memo, () => undefined];
   }
   return [() => first, v => {
     return first = typeof v === "function" ? v(first) : v;
   }];
 }
-function createMemo(compute, value, options) {
+function createMemo(compute, options) {
   const ctx = sharedConfig.context;
   const owner = createOwner();
   const comp = {
     owner,
-    value: value,
+    value: undefined,
     compute: compute,
     error: undefined,
     computed: false,
@@ -56,14 +113,15 @@ function createMemo(compute, value, options) {
   }));
   function update() {
     if (comp.disposed) return;
+    const run = () => runWithOwner(owner, () => runWithObserver(comp, () => comp.compute(comp.value)));
     try {
       comp.error = undefined;
-      const result = runWithOwner(owner, () => runWithObserver(comp, () => comp.compute(comp.value)));
+      const result = run();
       comp.computed = true;
-      processResult(comp, result, owner, ctx, options?.deferStream, options?.ssrSource);
+      processResult(comp, result, owner, ctx, options?.deferStream, options?.ssrSource, run);
     } catch (err) {
       if (err instanceof NotReadyError) {
-        err.source?.then(() => update(), () => update());
+        subscribePendingRetry(err, update);
       }
       comp.error = err;
       comp.computed = true;
@@ -145,7 +203,7 @@ function createDeepProxy(target, patches, basePath = []) {
   };
   return new Proxy(target, handler);
 }
-function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
+function processResult(comp, result, owner, ctx, deferStream, ssrSource, rerun) {
   if (comp.disposed) return;
   const id = owner.id;
   const noHydrate = getContext(NoHydrateContext, owner);
@@ -159,47 +217,78 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
       comp.error = result.v;
       return;
     }
-    result.then(v => {
+    const deferred = createDeferredPromise();
+    if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, deferred.promise, deferStream);
+    settleServerAsync(result, () => rerun ? rerun() : result, deferred, value => {
       result.s = 1;
-      result.v = v;
-      if (comp.disposed) return;
-      comp.value = v;
+      result.v = value;
+      comp.value = value;
       comp.error = undefined;
-    }, err => {
+      return value;
+    }, error => {
       result.s = 2;
-      result.v = err;
-      if (comp.disposed) return;
-      comp.error = err;
-    });
-    if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, result, deferStream);
-    comp.error = new NotReadyError(result);
+      result.v = error;
+      comp.error = error;
+    }, () => comp.disposed);
+    comp.error = new NotReadyError(deferred.promise);
     return;
   }
   const iterator = result?.[Symbol.asyncIterator];
   if (typeof iterator === "function") {
-    const iter = iterator.call(result);
     if (ssrSource === "hybrid") {
-      const promise = iter.next().then(v => {
-        promise.s = 1;
-        promise.v = v.value;
-        if (!v.done) closeAsyncIterator(iter);
-        if (comp.disposed) return v.value;
-        comp.value = v.value;
+      let currentResult = result;
+      let iter;
+      const deferred = createDeferredPromise();
+      const runFirst = () => {
+        const source = currentResult ?? (rerun ? rerun() : result);
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createMemo");
+        }
+        iter = nextIterator.call(source);
+        return iter.next().then(value => {
+          if (!value.done) closeAsyncIterator(iter);
+          return value.value;
+        });
+      };
+      settleServerAsync(runFirst(), runFirst, deferred, value => {
+        comp.value = value;
         comp.error = undefined;
-        return v.value;
-      }, () => {});
-      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, promise, deferStream);
-      comp.error = new NotReadyError(promise);
+        return value;
+      }, error => {
+        comp.error = error;
+      }, () => comp.disposed);
+      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, deferred.promise, deferStream);
+      comp.error = new NotReadyError(deferred.promise);
     } else {
-      const firstNext = iter.next();
-      const firstReady = firstNext.then(r => {
-        if (comp.disposed) return;
-        if (!r.done) {
-          comp.value = r.value;
+      let currentResult = result;
+      let iter;
+      let firstResult;
+      const deferred = createDeferredPromise();
+      const runFirst = () => {
+        const source = currentResult ?? (rerun ? rerun() : result);
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createMemo");
+        }
+        iter = nextIterator.call(source);
+        return iter.next().then(value => {
+          firstResult = value;
+          return Promise.resolve();
+        });
+      };
+      settleServerAsync(runFirst(), runFirst, deferred, () => {
+        const resolved = firstResult;
+        if (resolved && !resolved.done) {
+          comp.value = resolved.value;
         }
         comp.error = undefined;
-        return Promise.resolve();
-      }, () => {});
+        return undefined;
+      }, error => {
+        comp.error = error;
+      }, () => comp.disposed);
       if (ctx?.async && ctx.serialize && id && !noHydrate) {
         let tappedFirst = true;
         const tapped = {
@@ -207,7 +296,10 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
             next() {
               if (tappedFirst) {
                 tappedFirst = false;
-                return firstNext.then(r => r);
+                return deferred.promise.then(() => firstResult?.done ? {
+                  done: true,
+                  value: undefined
+                } : firstResult);
               }
               return iter.next().then(r => r);
             },
@@ -218,7 +310,7 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
         };
         ctx.serialize(id, tapped, deferStream);
       }
-      comp.error = new NotReadyError(firstReady);
+      comp.error = new NotReadyError(deferred.promise);
     }
     return;
   }
@@ -230,7 +322,7 @@ function closeAsyncIterator(iter, value) {
     returned.then(undefined, () => {});
   }
 }
-function serverEffect(compute, effectFn, value, options) {
+function serverEffect(compute, effectFn, options) {
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client" || ssrSource === "initial") {
     createOwner();
@@ -240,7 +332,7 @@ function serverEffect(compute, effectFn, value, options) {
   const owner = createOwner();
   const comp = {
     owner,
-    value: value,
+    value: undefined,
     compute: compute,
     error: undefined,
     computed: true,
@@ -252,19 +344,19 @@ function serverEffect(compute, effectFn, value, options) {
     }));
   }
   try {
-    const result = runWithOwner(owner, () => runWithObserver(comp, () => compute(value)));
+    const result = runWithOwner(owner, () => runWithObserver(comp, () => compute(undefined)));
     if (ssrSource) {
       processResult(comp, result, owner, ctx, options?.deferStream, ssrSource);
     }
-    effectFn?.(ssrSource ? comp.value ?? result : result, value);
+    effectFn?.(ssrSource ? comp.value ?? result : result, undefined);
   } catch (err) {
   }
 }
-function createEffect(compute, effect, value, options) {
-  serverEffect(compute, undefined, value, options);
+function createEffect(compute, effect, options) {
+  serverEffect(compute, undefined, options);
 }
-function createRenderEffect(compute, effectFn, value, options) {
-  serverEffect(compute, effectFn, value, options);
+function createRenderEffect(compute, effectFn, options) {
+  serverEffect(compute, effectFn, options);
 }
 function createTrackedEffect(compute, options) {
   const o = getOwner();
@@ -275,8 +367,8 @@ function createReaction(effectFn, options) {
     tracking();
   };
 }
-function createOptimistic(first, second, third) {
-  return createSignal(first, second, third);
+function createOptimistic(first, second) {
+  return createSignal(first, second);
 }
 function setProperty(state, property, value) {
   if (state[property] === value) return;
@@ -286,7 +378,7 @@ function setProperty(state, property, value) {
 }
 function createStore(first, second) {
   if (typeof first === "function") {
-    const store = createProjection(first, second ?? {});
+    const store = createProjection(first, second);
     return [store, fn => fn(store)];
   }
   const state = first;
@@ -309,7 +401,7 @@ function createPendingProxy(state, source) {
     pending = false;
   }];
 }
-function createProjection(fn, initialValue = {}, options) {
+function createProjection(fn, initialValue, options) {
   const ctx = sharedConfig.context;
   const owner = createOwner();
   const [state] = createStore(initialValue);
@@ -324,43 +416,69 @@ function createProjection(fn, initialValue = {}, options) {
   const useProxy = ssrSource !== "hybrid";
   const patches = [];
   const draft = useProxy ? createDeepProxy(state, patches) : state;
-  const result = runWithOwner(owner, () => fn(draft));
+  const runProjection = () => runWithOwner(owner, () => fn(draft));
+  const result = runProjection();
   const iteratorFn = result?.[Symbol.asyncIterator];
   if (typeof iteratorFn === "function") {
-    const iter = iteratorFn.call(result);
     if (ssrSource === "hybrid") {
-      const promise = iter.next().then(r => {
-        promise.s = 1;
-        if (!r.done) closeAsyncIterator(iter);
-        if (disposed) {
-          promise.v = state;
-          return state;
+      let currentResult = result;
+      let iter;
+      const deferred = createDeferredPromise();
+      const [pending, markReady] = createPendingProxy(state, deferred.promise);
+      const runFirst = () => {
+        const source = currentResult ?? runProjection();
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createProjection");
         }
-        if (r.value !== undefined && r.value !== state) {
-          Object.assign(state, r.value);
+        iter = nextIterator.call(source);
+        return iter.next().then(r => {
+          if (!r.done) closeAsyncIterator(iter);
+          return r.value;
+        });
+      };
+      settleServerAsync(runFirst(), runFirst, deferred, value => {
+        if (value !== undefined && value !== state) {
+          Object.assign(state, value);
         }
-        promise.v = state;
         markReady();
         return state;
-      }, () => {});
-      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
-      const [pending, markReady] = createPendingProxy(state, promise);
+      }, error => {
+        markReady();
+      }, () => disposed);
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
       return pending;
     } else {
-      const firstNext = iter.next();
-      const firstReady = firstNext.then(r => {
-        if (disposed) return;
+      let currentResult = result;
+      let iter;
+      let firstResult;
+      const deferred = createDeferredPromise();
+      const [pending, markReady] = createPendingProxy(state, deferred.promise);
+      const runFirst = () => {
+        const source = currentResult ?? runProjection();
+        currentResult = undefined;
+        const nextIterator = source?.[Symbol.asyncIterator];
+        if (typeof nextIterator !== "function") {
+          throw new Error("Expected async iterator while retrying server createProjection");
+        }
+        iter = nextIterator.call(source);
+        return iter.next().then(value => {
+          firstResult = value;
+          return Promise.resolve();
+        });
+      };
+      settleServerAsync(runFirst(), runFirst, deferred, () => {
         patches.length = 0;
-        if (!r.done) {
-          if (r.value !== undefined && r.value !== draft) {
-            Object.assign(state, r.value);
-          }
+        const resolved = firstResult;
+        if (resolved && !resolved.done && resolved.value !== undefined && resolved.value !== draft) {
+          Object.assign(state, resolved.value);
         }
         markReady(JSON.parse(JSON.stringify(state)));
-        return Promise.resolve();
-      }, () => {
+        return undefined;
+      }, error => {
         markReady();
-      });
+      }, () => disposed);
       if (ctx?.async && !getContext(NoHydrateContext) && owner.id) {
         let tappedFirst = true;
         const tapped = {
@@ -368,8 +486,8 @@ function createProjection(fn, initialValue = {}, options) {
             next() {
               if (tappedFirst) {
                 tappedFirst = false;
-                return firstNext.then(r => {
-                  if (r.done) return {
+                return deferred.promise.then(() => {
+                  if (firstResult?.done) return {
                     done: true,
                     value: undefined
                   };
@@ -407,26 +525,22 @@ function createProjection(fn, initialValue = {}, options) {
         };
         ctx.serialize(owner.id, tapped, options?.deferStream);
       }
-      const [pending, markReady] = createPendingProxy(state, firstReady);
       return pending;
     }
   }
   if (result instanceof Promise) {
-    const promise = result.then(v => {
-      promise.s = 1;
-      if (disposed) {
-        promise.v = state;
-        return state;
-      }
-      if (v !== undefined && v !== state) {
-        Object.assign(state, v);
+    const deferred = createDeferredPromise();
+    const [pending, markReady] = createPendingProxy(state, deferred.promise);
+    settleServerAsync(result, () => runProjection(), deferred, value => {
+      if (value !== undefined && value !== state) {
+        Object.assign(state, value);
       }
-      promise.v = state;
       markReady();
       return state;
-    }, () => {});
-    if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
-    const [pending, markReady] = createPendingProxy(state, promise);
+    }, error => {
+      markReady();
+    }, () => disposed);
+    if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, deferred.promise, options?.deferStream);
     return pending;
   }
   if (result !== undefined && result !== state && result !== draft) {
@@ -624,10 +738,10 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const c = createMemo(fn, undefined, {
+  const c = createMemo(fn, {
     lazy: true
   });
-  const memo = createMemo(() => flatten(c()), undefined, {
+  const memo = createMemo(() => flatten(c()), {
     lazy: true
   });
   memo.toArray = () => {