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

package/dist/dev.cjs

@@ -38,17 +38,10 @@ function devComponent(Comp, props) {
     owner._props = props;
     owner._name = Comp.name;
     owner._component = Comp;
-    return signals.untrack(() => {
-      Object.assign(Comp, {
-        [$DEVCOMP]: true
-      });
-      signals.setStrictRead(`<${Comp.name || "Anonymous"}>`);
-      try {
-        return Comp(props);
-      } finally {
-        signals.setStrictRead(false);
-      }
+    Object.assign(Comp, {
+      [$DEVCOMP]: true
     });
+    return signals.untrack(() => Comp(props), `<${Comp.name || "Anonymous"}>`);
   }, {
     transparent: true
   });
@@ -161,11 +154,41 @@ function subFetch(fn, prev) {
     Promise = ogPromise;
   }
 }
-function consumeFirstSync(ai) {
-  const iter = ai[Symbol.asyncIterator]();
-  const r = iter.next();
-  const value = !(r instanceof Promise) && !r.done ? r.value : undefined;
-  return [value, iter];
+function syncThenable(value) {
+  return {
+    then(fn) {
+      fn(value);
+    }
+  };
+}
+function normalizeIterator(it) {
+  let first = true;
+  let buffered = null;
+  return {
+    next() {
+      if (first) {
+        first = false;
+        const r = it.next();
+        return r && typeof r.then === "function" ? r : syncThenable(r);
+      }
+      if (buffered) {
+        const b = buffered;
+        buffered = null;
+        return b;
+      }
+      let latest = it.next();
+      if (latest && typeof latest.then === "function") return latest;
+      while (!latest.done) {
+        const peek = it.next();
+        if (peek && typeof peek.then === "function") {
+          buffered = peek;
+          break;
+        }
+        latest = peek;
+      }
+      return Promise.resolve(latest);
+    }
+  };
 }
 function applyPatches(target, patches) {
   for (const patch of patches) {
@@ -182,24 +205,6 @@ function applyPatches(target, patches) {
     }
   }
 }
-function scheduleIteratorConsumption(iter, apply) {
-  const consume = () => {
-    while (true) {
-      const n = iter.next();
-      if (n instanceof Promise) {
-        n.then(r => {
-          if (r.done) return;
-          apply(r.value);
-          consume();
-        });
-        return;
-      }
-      if (n.done) break;
-      apply(n.value);
-    }
-  };
-  consume();
-}
 function isAsyncIterable(v) {
   return v != null && typeof v[Symbol.asyncIterator] === "function";
 }
@@ -207,34 +212,85 @@ function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
   const parent = signals.getOwner();
   const expectedId = signals.peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
-  const initP = sharedConfig.load(expectedId);
-  if (!isAsyncIterable(initP)) return null;
-  const [firstValue, iter] = consumeFirstSync(initP);
-  const [get, set] = signals.createSignal(firstValue);
-  const result = coreFn(() => get(), firstValue, options);
-  scheduleIteratorConsumption(iter, v => {
-    set(() => v);
-    signals.flush();
-  });
-  return result;
+  const loaded = sharedConfig.load(expectedId);
+  if (!isAsyncIterable(loaded)) return null;
+  const it = normalizeIterator(loaded[Symbol.asyncIterator]());
+  const iterable = {
+    [Symbol.asyncIterator]() {
+      return it;
+    }
+  };
+  return coreFn(() => iterable, value, options);
 }
 function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   const parent = signals.getOwner();
   const expectedId = signals.peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
-  const initP = sharedConfig.load(expectedId);
-  if (!isAsyncIterable(initP)) return null;
-  const [firstState, iter] = consumeFirstSync(initP);
-  const [store, setStore] = coreFn(() => {}, firstState ?? initialValue, options);
-  scheduleIteratorConsumption(iter, patches => {
-    setStore(d => {
-      applyPatches(d, patches);
-    });
-  });
-  return [store, setStore];
+  const loaded = sharedConfig.load(expectedId);
+  if (!isAsyncIterable(loaded)) return null;
+  const srcIt = loaded[Symbol.asyncIterator]();
+  let isFirst = true;
+  let buffered = null;
+  return coreFn(draft => {
+    const process = res => {
+      if (res.done) return {
+        done: true,
+        value: undefined
+      };
+      if (isFirst) {
+        isFirst = false;
+        if (Array.isArray(res.value)) {
+          for (let i = 0; i < res.value.length; i++) draft[i] = res.value[i];
+          draft.length = res.value.length;
+        } else {
+          Object.assign(draft, res.value);
+        }
+      } else {
+        applyPatches(draft, res.value);
+      }
+      return {
+        done: false,
+        value: undefined
+      };
+    };
+    return {
+      [Symbol.asyncIterator]() {
+        return {
+          next() {
+            if (isFirst) {
+              const r = srcIt.next();
+              return r && typeof r.then === "function" ? r.then(process) : syncThenable(process(r));
+            }
+            if (buffered) {
+              const b = buffered;
+              buffered = null;
+              return b.then(process);
+            }
+            let r = srcIt.next();
+            if (r && typeof r.then === "function") {
+              return r.then(process);
+            }
+            let result = process(r);
+            while (!r.done) {
+              const peek = srcIt.next();
+              if (peek && typeof peek.then === "function") {
+                buffered = peek;
+                break;
+              }
+              r = peek;
+              if (!r.done) result = process(r);
+            }
+            return Promise.resolve(result);
+          }
+        };
+      }
+    };
+  }, initialValue, options);
 }
 function hydratedCreateMemo(compute, value, options) {
-  if (!sharedConfig.hydrating) return signals.createMemo(compute, value, options);
+  if (!sharedConfig.hydrating) {
+    return signals.createMemo(compute, value, options);
+  }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
@@ -386,14 +442,16 @@ function hydratedCreateOptimisticStore(first, second, third) {
   return signals.createOptimisticStore(wrapStoreFn(first, ssrSource), second, third);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
-  if (!sharedConfig.hydrating) return signals.createProjection(fn, initialValue, options);
+  if (!sharedConfig.hydrating) {
+    return signals.createProjection(fn, initialValue, options);
+  }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client" || ssrSource === "initial") {
     return signals.createProjection(draft => draft, initialValue, options);
   }
-  const aiResult = hydrateStoreFromAsyncIterable(signals.createStore, initialValue, options);
-  if (aiResult !== null) return aiResult[0];
+  const aiResult = hydrateStoreFromAsyncIterable(signals.createProjection, initialValue, options);
+  if (aiResult !== null) return aiResult;
   return signals.createProjection(wrapStoreFn(fn, ssrSource), initialValue, options);
 }
 function hydratedEffect(coreFn, compute, effectFn, value, options) {
@@ -674,17 +732,10 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? signals.untrack(() => {
-        signals.setStrictRead("<Show>");
-        try {
-          return child(() => {
-            if (!signals.untrack(condition)) throw narrowedError("Show");
-            return conditionValue();
-          });
-        } finally {
-          signals.setStrictRead(false);
-        }
-      }) : child;
+      return fn ? signals.untrack(() => child(() => {
+        if (!signals.untrack(condition)) throw narrowedError("Show");
+        return conditionValue();
+      }), "<Show>") : child;
     }
     return props.fallback;
   }, undefined, {
@@ -717,17 +768,10 @@ function Switch(props) {
     const [index, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? signals.untrack(() => {
-      signals.setStrictRead("<Match>");
-      try {
-        return child(() => {
-          if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
-          return conditionValue();
-        });
-      } finally {
-        signals.setStrictRead(false);
-      }
-    }) : child;
+    return fn ? signals.untrack(() => child(() => {
+      if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    }), "<Match>") : child;
   }, undefined, {
     name: "eval conditions"
   } );
@@ -758,6 +802,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; }
@@ -870,6 +918,10 @@ Object.defineProperty(exports, "runWithOwner", {
   enumerable: true,
   get: function () { return signals.runWithOwner; }
 });
+Object.defineProperty(exports, "setOnUnhandledAsync", {
+  enumerable: true,
+  get: function () { return signals.setOnUnhandledAsync; }
+});
 Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }

package/dist/dev.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, setStrictRead, createLoadBoundary, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, mapArray, repeat } from '@solidjs/signals';
-export { $PROXY, $TRACK, NotReadyError, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, storePath, untrack } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, createLoadBoundary, onCleanup, isDisposed, runWithOwner, createOwner, createEffect as createEffect$1, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$1, createRenderEffect as createRenderEffect$1, createSignal as createSignal$1, createStore as createStore$1, setSnapshotCapture, releaseSnapshotScope, getNextChildId, createErrorBoundary as createErrorBoundary$1, markSnapshotScope, flush, clearSnapshots, peekNextChildId, mapArray, repeat } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, latest, mapArray, merge, omit, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, setOnUnhandledAsync, snapshot, storePath, untrack } from '@solidjs/signals';
 
 const $DEVCOMP = Symbol("COMPONENT_DEV" );
 function createContext(defaultValue, options) {
@@ -37,17 +37,10 @@ function devComponent(Comp, props) {
     owner._props = props;
     owner._name = Comp.name;
     owner._component = Comp;
-    return untrack(() => {
-      Object.assign(Comp, {
-        [$DEVCOMP]: true
-      });
-      setStrictRead(`<${Comp.name || "Anonymous"}>`);
-      try {
-        return Comp(props);
-      } finally {
-        setStrictRead(false);
-      }
+    Object.assign(Comp, {
+      [$DEVCOMP]: true
     });
+    return untrack(() => Comp(props), `<${Comp.name || "Anonymous"}>`);
   }, {
     transparent: true
   });
@@ -160,11 +153,41 @@ function subFetch(fn, prev) {
     Promise = ogPromise;
   }
 }
-function consumeFirstSync(ai) {
-  const iter = ai[Symbol.asyncIterator]();
-  const r = iter.next();
-  const value = !(r instanceof Promise) && !r.done ? r.value : undefined;
-  return [value, iter];
+function syncThenable(value) {
+  return {
+    then(fn) {
+      fn(value);
+    }
+  };
+}
+function normalizeIterator(it) {
+  let first = true;
+  let buffered = null;
+  return {
+    next() {
+      if (first) {
+        first = false;
+        const r = it.next();
+        return r && typeof r.then === "function" ? r : syncThenable(r);
+      }
+      if (buffered) {
+        const b = buffered;
+        buffered = null;
+        return b;
+      }
+      let latest = it.next();
+      if (latest && typeof latest.then === "function") return latest;
+      while (!latest.done) {
+        const peek = it.next();
+        if (peek && typeof peek.then === "function") {
+          buffered = peek;
+          break;
+        }
+        latest = peek;
+      }
+      return Promise.resolve(latest);
+    }
+  };
 }
 function applyPatches(target, patches) {
   for (const patch of patches) {
@@ -181,24 +204,6 @@ function applyPatches(target, patches) {
     }
   }
 }
-function scheduleIteratorConsumption(iter, apply) {
-  const consume = () => {
-    while (true) {
-      const n = iter.next();
-      if (n instanceof Promise) {
-        n.then(r => {
-          if (r.done) return;
-          apply(r.value);
-          consume();
-        });
-        return;
-      }
-      if (n.done) break;
-      apply(n.value);
-    }
-  };
-  consume();
-}
 function isAsyncIterable(v) {
   return v != null && typeof v[Symbol.asyncIterator] === "function";
 }
@@ -206,34 +211,85 @@ function hydrateSignalFromAsyncIterable(coreFn, compute, value, options) {
   const parent = getOwner();
   const expectedId = peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
-  const initP = sharedConfig.load(expectedId);
-  if (!isAsyncIterable(initP)) return null;
-  const [firstValue, iter] = consumeFirstSync(initP);
-  const [get, set] = createSignal$1(firstValue);
-  const result = coreFn(() => get(), firstValue, options);
-  scheduleIteratorConsumption(iter, v => {
-    set(() => v);
-    flush();
-  });
-  return result;
+  const loaded = sharedConfig.load(expectedId);
+  if (!isAsyncIterable(loaded)) return null;
+  const it = normalizeIterator(loaded[Symbol.asyncIterator]());
+  const iterable = {
+    [Symbol.asyncIterator]() {
+      return it;
+    }
+  };
+  return coreFn(() => iterable, value, options);
 }
 function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   const parent = getOwner();
   const expectedId = peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
-  const initP = sharedConfig.load(expectedId);
-  if (!isAsyncIterable(initP)) return null;
-  const [firstState, iter] = consumeFirstSync(initP);
-  const [store, setStore] = coreFn(() => {}, firstState ?? initialValue, options);
-  scheduleIteratorConsumption(iter, patches => {
-    setStore(d => {
-      applyPatches(d, patches);
-    });
-  });
-  return [store, setStore];
+  const loaded = sharedConfig.load(expectedId);
+  if (!isAsyncIterable(loaded)) return null;
+  const srcIt = loaded[Symbol.asyncIterator]();
+  let isFirst = true;
+  let buffered = null;
+  return coreFn(draft => {
+    const process = res => {
+      if (res.done) return {
+        done: true,
+        value: undefined
+      };
+      if (isFirst) {
+        isFirst = false;
+        if (Array.isArray(res.value)) {
+          for (let i = 0; i < res.value.length; i++) draft[i] = res.value[i];
+          draft.length = res.value.length;
+        } else {
+          Object.assign(draft, res.value);
+        }
+      } else {
+        applyPatches(draft, res.value);
+      }
+      return {
+        done: false,
+        value: undefined
+      };
+    };
+    return {
+      [Symbol.asyncIterator]() {
+        return {
+          next() {
+            if (isFirst) {
+              const r = srcIt.next();
+              return r && typeof r.then === "function" ? r.then(process) : syncThenable(process(r));
+            }
+            if (buffered) {
+              const b = buffered;
+              buffered = null;
+              return b.then(process);
+            }
+            let r = srcIt.next();
+            if (r && typeof r.then === "function") {
+              return r.then(process);
+            }
+            let result = process(r);
+            while (!r.done) {
+              const peek = srcIt.next();
+              if (peek && typeof peek.then === "function") {
+                buffered = peek;
+                break;
+              }
+              r = peek;
+              if (!r.done) result = process(r);
+            }
+            return Promise.resolve(result);
+          }
+        };
+      }
+    };
+  }, initialValue, options);
 }
 function hydratedCreateMemo(compute, value, options) {
-  if (!sharedConfig.hydrating) return createMemo$1(compute, value, options);
+  if (!sharedConfig.hydrating) {
+    return createMemo$1(compute, value, options);
+  }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client") {
@@ -385,14 +441,16 @@ function hydratedCreateOptimisticStore(first, second, third) {
   return createOptimisticStore$1(wrapStoreFn(first, ssrSource), second, third);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
-  if (!sharedConfig.hydrating) return createProjection$1(fn, initialValue, options);
+  if (!sharedConfig.hydrating) {
+    return createProjection$1(fn, initialValue, options);
+  }
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
   if (ssrSource === "client" || ssrSource === "initial") {
     return createProjection$1(draft => draft, initialValue, options);
   }
-  const aiResult = hydrateStoreFromAsyncIterable(createStore$1, initialValue, options);
-  if (aiResult !== null) return aiResult[0];
+  const aiResult = hydrateStoreFromAsyncIterable(createProjection$1, initialValue, options);
+  if (aiResult !== null) return aiResult;
   return createProjection$1(wrapStoreFn(fn, ssrSource), initialValue, options);
 }
 function hydratedEffect(coreFn, compute, effectFn, value, options) {
@@ -673,17 +731,10 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? untrack(() => {
-        setStrictRead("<Show>");
-        try {
-          return child(() => {
-            if (!untrack(condition)) throw narrowedError("Show");
-            return conditionValue();
-          });
-        } finally {
-          setStrictRead(false);
-        }
-      }) : child;
+      return fn ? untrack(() => child(() => {
+        if (!untrack(condition)) throw narrowedError("Show");
+        return conditionValue();
+      }), "<Show>") : child;
     }
     return props.fallback;
   }, undefined, {
@@ -716,17 +767,10 @@ function Switch(props) {
     const [index, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? untrack(() => {
-      setStrictRead("<Match>");
-      try {
-        return child(() => {
-          if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
-          return conditionValue();
-        });
-      } finally {
-        setStrictRead(false);
-      }
-    }) : child;
+    return fn ? untrack(() => child(() => {
+      if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    }), "<Match>") : child;
   }, undefined, {
     name: "eval conditions"
   } );