solid-js 2.0.0-beta.1 → 2.0.0-beta.3

package/dist/server.cjs

@@ -30,25 +30,12 @@ function getObserver() {
 }
 function createSignal(first, second, third) {
   if (typeof first === "function") {
-    const ssrSource = third?.ssrSource;
-    if (ssrSource === "initial" || ssrSource === "client") {
-      signals.createOwner();
-      let value = second;
-      return [() => value, v => {
-        return value = typeof v === "function" ? v(value) : v;
-      }];
-    }
-    const memoOpts = third?.deferStream || ssrSource ? {
+    const opts = third?.deferStream || third?.ssrSource ? {
       deferStream: third?.deferStream,
-      ssrSource
+      ssrSource: third?.ssrSource
     } : undefined;
-    const memo = createMemo(p => {
-      let value = first(p ? p[0]() : second);
-      return [() => value, v => {
-        return value = typeof v === "function" ? v(value) : v;
-      }];
-    }, undefined, memoOpts);
-    return [() => memo()[0](), v => memo()[1](v)];
+    const memo = createMemo(prev => first(prev), second, opts);
+    return [memo, () => undefined];
   }
   return [() => first, v => {
     return first = typeof v === "function" ? v(first) : v;
@@ -185,42 +172,39 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
       const promise = iter.next().then(v => {
         promise.s = 1;
         promise.v = v.value;
-        if (comp.disposed) return;
+        if (comp.disposed) return v.value;
         comp.value = v.value;
         comp.error = undefined;
+        return v.value;
       }, () => {});
       if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, promise, deferStream);
-      if (uninitialized) {
-        comp.error = new signals.NotReadyError(promise);
-      }
+      comp.error = new signals.NotReadyError(promise);
     } else {
       const firstNext = iter.next();
       const firstReady = firstNext.then(r => {
         if (comp.disposed) return;
         if (!r.done) {
           comp.value = r.value;
-          comp.error = undefined;
         }
+        comp.error = undefined;
+        return Promise.resolve();
       }, () => {});
-      let servedFirst = false;
-      const tapped = {
-        [Symbol.asyncIterator]: () => ({
-          next() {
-            if (!servedFirst) {
-              servedFirst = true;
-              return firstNext.then(r => {
-                if (!r.done && !comp.disposed) comp.value = r.value;
-                return r;
-              });
+      if (ctx?.async && ctx.serialize && id && !noHydrate) {
+        let tappedFirst = true;
+        const tapped = {
+          [Symbol.asyncIterator]: () => ({
+            next() {
+              if (tappedFirst) {
+                tappedFirst = false;
+                return firstNext.then(r => r);
+              }
+              return iter.next().then(r => r);
             }
-            return iter.next().then(r => r);
-          }
-        })
-      };
-      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, tapped, deferStream);
-      if (uninitialized) {
-        comp.error = new signals.NotReadyError(firstReady);
+          })
+        };
+        ctx.serialize(id, tapped, deferStream);
       }
+      comp.error = new signals.NotReadyError(firstReady);
     }
     return;
   }
@@ -329,13 +313,14 @@ function createProjection(fn, initialValue = {}, options) {
         promise.s = 1;
         if (disposed) {
           promise.v = state;
-          return;
+          return state;
         }
         if (r.value !== undefined && r.value !== state) {
           Object.assign(state, r.value);
         }
         promise.v = state;
         markReady();
+        return state;
       }, () => {});
       if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, promise, options?.deferStream);
       const [pending, markReady] = createPendingProxy(state, promise);
@@ -351,50 +336,53 @@ function createProjection(fn, initialValue = {}, options) {
           }
         }
         markReady(JSON.parse(JSON.stringify(state)));
+        return Promise.resolve();
       }, () => {
         markReady();
       });
-      let servedFirst = false;
-      const tapped = {
-        [Symbol.asyncIterator]: () => ({
-          next() {
-            if (!servedFirst) {
-              servedFirst = true;
-              return firstNext.then(r => {
-                if (!r.done && !disposed) return {
-                  done: false,
-                  value: state
+      if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) {
+        let tappedFirst = true;
+        const tapped = {
+          [Symbol.asyncIterator]: () => ({
+            next() {
+              if (tappedFirst) {
+                tappedFirst = false;
+                return firstNext.then(r => {
+                  if (r.done) return {
+                    done: true,
+                    value: undefined
+                  };
+                  return {
+                    done: false,
+                    value: JSON.parse(JSON.stringify(state))
+                  };
+                });
+              }
+              return iter.next().then(r => {
+                if (disposed) return {
+                  done: true,
+                  value: undefined
                 };
+                const flushed = patches.splice(0);
+                if (!r.done) {
+                  if (r.value !== undefined && r.value !== draft) {
+                    Object.assign(state, r.value);
+                  }
+                  return {
+                    done: false,
+                    value: flushed
+                  };
+                }
                 return {
-                  done: r.done,
+                  done: true,
                   value: undefined
                 };
               });
             }
-            return iter.next().then(r => {
-              if (disposed) return {
-                done: true,
-                value: undefined
-              };
-              const flushed = patches.splice(0);
-              if (!r.done) {
-                if (r.value !== undefined && r.value !== draft) {
-                  Object.assign(state, r.value);
-                }
-                return {
-                  done: false,
-                  value: flushed
-                };
-              }
-              return {
-                done: true,
-                value: undefined
-              };
-            });
-          }
-        })
-      };
-      if (ctx?.async && !signals.getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, tapped, options?.deferStream);
+          })
+        };
+        ctx.serialize(owner.id, tapped, options?.deferStream);
+      }
       const [pending, markReady] = createPendingProxy(state, firstReady);
       return pending;
     }
@@ -505,7 +493,7 @@ function createErrorBoundary(fn, fallback) {
     return () => result;
   });
 }
-function createLoadBoundary(fn, fallback) {
+function createLoadingBoundary(fn, fallback, options) {
   try {
     const result = fn();
     return () => result;
@@ -713,7 +701,7 @@ function ssrHandleError(err) {
 function Loading(props) {
   const ctx = sharedConfig.context;
   if (!ctx) {
-    return createLoadBoundary(() => props.children, () => props.fallback);
+    return createLoadingBoundary(() => props.children, () => props.fallback);
   }
   const o = signals.createOwner();
   const id = o.id;
@@ -806,6 +794,10 @@ Object.defineProperty(exports, "$PROXY", {
   enumerable: true,
   get: function () { return signals.$PROXY; }
 });
+Object.defineProperty(exports, "$REFRESH", {
+  enumerable: true,
+  get: function () { return signals.$REFRESH; }
+});
 Object.defineProperty(exports, "$TRACK", {
   enumerable: true,
   get: function () { return signals.$TRACK; }
@@ -822,6 +814,14 @@ Object.defineProperty(exports, "createRoot", {
   enumerable: true,
   get: function () { return signals.createRoot; }
 });
+Object.defineProperty(exports, "enableExternalSource", {
+  enumerable: true,
+  get: function () { return signals.enableExternalSource; }
+});
+Object.defineProperty(exports, "enforceLoadingBoundary", {
+  enumerable: true,
+  get: function () { return signals.enforceLoadingBoundary; }
+});
 Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
@@ -884,6 +884,8 @@ exports.createComponent = createComponent;
 exports.createContext = createContext;
 exports.createDeepProxy = createDeepProxy;
 exports.createEffect = createEffect;
+exports.createErrorBoundary = createErrorBoundary;
+exports.createLoadingBoundary = createLoadingBoundary;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;

package/dist/server.js

@@ -1,5 +1,5 @@
-import { getOwner, getContext, getNextChildId, createOwner, runWithOwner, onCleanup, NotReadyError, isWrappable, setContext, flatten, createRoot } from '@solidjs/signals';
-export { $PROXY, $TRACK, NotReadyError, createOwner, createRoot, flatten, getNextChildId, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
+import { getOwner, getContext, getNextChildId, createOwner, runWithOwner, setContext, NotReadyError, onCleanup, isWrappable, flatten, createRoot } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, createOwner, createRoot, enableExternalSource, enforceLoadingBoundary, flatten, getNextChildId, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
 
 const NoHydrateContext = {
   id: Symbol("NoHydrateContext"),
@@ -29,25 +29,12 @@ function getObserver() {
 }
 function createSignal(first, second, third) {
   if (typeof first === "function") {
-    const ssrSource = third?.ssrSource;
-    if (ssrSource === "initial" || ssrSource === "client") {
-      createOwner();
-      let value = second;
-      return [() => value, v => {
-        return value = typeof v === "function" ? v(value) : v;
-      }];
-    }
-    const memoOpts = third?.deferStream || ssrSource ? {
+    const opts = third?.deferStream || third?.ssrSource ? {
       deferStream: third?.deferStream,
-      ssrSource
+      ssrSource: third?.ssrSource
     } : undefined;
-    const memo = createMemo(p => {
-      let value = first(p ? p[0]() : second);
-      return [() => value, v => {
-        return value = typeof v === "function" ? v(value) : v;
-      }];
-    }, undefined, memoOpts);
-    return [() => memo()[0](), v => memo()[1](v)];
+    const memo = createMemo(prev => first(prev), second, opts);
+    return [memo, () => undefined];
   }
   return [() => first, v => {
     return first = typeof v === "function" ? v(first) : v;
@@ -184,42 +171,39 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
       const promise = iter.next().then(v => {
         promise.s = 1;
         promise.v = v.value;
-        if (comp.disposed) return;
+        if (comp.disposed) return v.value;
         comp.value = v.value;
         comp.error = undefined;
+        return v.value;
       }, () => {});
       if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, promise, deferStream);
-      if (uninitialized) {
-        comp.error = new NotReadyError(promise);
-      }
+      comp.error = new NotReadyError(promise);
     } else {
       const firstNext = iter.next();
       const firstReady = firstNext.then(r => {
         if (comp.disposed) return;
         if (!r.done) {
           comp.value = r.value;
-          comp.error = undefined;
         }
+        comp.error = undefined;
+        return Promise.resolve();
       }, () => {});
-      let servedFirst = false;
-      const tapped = {
-        [Symbol.asyncIterator]: () => ({
-          next() {
-            if (!servedFirst) {
-              servedFirst = true;
-              return firstNext.then(r => {
-                if (!r.done && !comp.disposed) comp.value = r.value;
-                return r;
-              });
+      if (ctx?.async && ctx.serialize && id && !noHydrate) {
+        let tappedFirst = true;
+        const tapped = {
+          [Symbol.asyncIterator]: () => ({
+            next() {
+              if (tappedFirst) {
+                tappedFirst = false;
+                return firstNext.then(r => r);
+              }
+              return iter.next().then(r => r);
             }
-            return iter.next().then(r => r);
-          }
-        })
-      };
-      if (ctx?.async && ctx.serialize && id && !noHydrate) ctx.serialize(id, tapped, deferStream);
-      if (uninitialized) {
-        comp.error = new NotReadyError(firstReady);
+          })
+        };
+        ctx.serialize(id, tapped, deferStream);
       }
+      comp.error = new NotReadyError(firstReady);
     }
     return;
   }
@@ -328,13 +312,14 @@ function createProjection(fn, initialValue = {}, options) {
         promise.s = 1;
         if (disposed) {
           promise.v = state;
-          return;
+          return state;
         }
         if (r.value !== undefined && r.value !== state) {
           Object.assign(state, r.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);
@@ -350,50 +335,53 @@ function createProjection(fn, initialValue = {}, options) {
           }
         }
         markReady(JSON.parse(JSON.stringify(state)));
+        return Promise.resolve();
       }, () => {
         markReady();
       });
-      let servedFirst = false;
-      const tapped = {
-        [Symbol.asyncIterator]: () => ({
-          next() {
-            if (!servedFirst) {
-              servedFirst = true;
-              return firstNext.then(r => {
-                if (!r.done && !disposed) return {
-                  done: false,
-                  value: state
+      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) {
+        let tappedFirst = true;
+        const tapped = {
+          [Symbol.asyncIterator]: () => ({
+            next() {
+              if (tappedFirst) {
+                tappedFirst = false;
+                return firstNext.then(r => {
+                  if (r.done) return {
+                    done: true,
+                    value: undefined
+                  };
+                  return {
+                    done: false,
+                    value: JSON.parse(JSON.stringify(state))
+                  };
+                });
+              }
+              return iter.next().then(r => {
+                if (disposed) return {
+                  done: true,
+                  value: undefined
                 };
+                const flushed = patches.splice(0);
+                if (!r.done) {
+                  if (r.value !== undefined && r.value !== draft) {
+                    Object.assign(state, r.value);
+                  }
+                  return {
+                    done: false,
+                    value: flushed
+                  };
+                }
                 return {
-                  done: r.done,
+                  done: true,
                   value: undefined
                 };
               });
             }
-            return iter.next().then(r => {
-              if (disposed) return {
-                done: true,
-                value: undefined
-              };
-              const flushed = patches.splice(0);
-              if (!r.done) {
-                if (r.value !== undefined && r.value !== draft) {
-                  Object.assign(state, r.value);
-                }
-                return {
-                  done: false,
-                  value: flushed
-                };
-              }
-              return {
-                done: true,
-                value: undefined
-              };
-            });
-          }
-        })
-      };
-      if (ctx?.async && !getContext(NoHydrateContext) && owner.id) ctx.serialize(owner.id, tapped, options?.deferStream);
+          })
+        };
+        ctx.serialize(owner.id, tapped, options?.deferStream);
+      }
       const [pending, markReady] = createPendingProxy(state, firstReady);
       return pending;
     }
@@ -504,7 +492,7 @@ function createErrorBoundary(fn, fallback) {
     return () => result;
   });
 }
-function createLoadBoundary(fn, fallback) {
+function createLoadingBoundary(fn, fallback, options) {
   try {
     const result = fn();
     return () => result;
@@ -712,7 +700,7 @@ function ssrHandleError(err) {
 function Loading(props) {
   const ctx = sharedConfig.context;
   if (!ctx) {
-    return createLoadBoundary(() => props.children, () => props.fallback);
+    return createLoadingBoundary(() => props.children, () => props.fallback);
   }
   const o = createOwner();
   const id = o.id;
@@ -801,4 +789,4 @@ function Hydration(props) {
 
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };