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

package/dist/solid.js

@@ -1,6 +1,7 @@
 import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadBoundary, getOwner, 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, untrack, 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';
+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 IS_DEV = false;
 const $DEVCOMP = Symbol(0);
 function createContext(defaultValue, options) {
   const id = Symbol(options && options.name || "");
@@ -131,11 +132,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) {
@@ -152,24 +183,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";
 }
@@ -177,34 +190,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") {
@@ -356,14 +420,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) {
@@ -636,15 +702,10 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? untrack(() => {
-        try {
-          return child(() => {
-            if (!untrack(condition)) throw narrowedError("Show");
-            return conditionValue();
-          });
-        } finally {
-        }
-      }) : child;
+      return fn ? untrack(() => child(() => {
+        if (!untrack(condition)) throw narrowedError("Show");
+        return conditionValue();
+      }), IS_DEV) : child;
     }
     return props.fallback;
   }, undefined, undefined);
@@ -672,15 +733,10 @@ function Switch(props) {
     const [index, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? untrack(() => {
-      try {
-        return child(() => {
-          if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
-          return conditionValue();
-        });
-      } finally {
-      }
-    }) : child;
+    return fn ? untrack(() => child(() => {
+      if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
+      return conditionValue();
+    }), IS_DEV) : child;
   }, undefined, undefined);
 }
 function Match(props) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-beta.2",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,7 +79,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.11.3",
+    "@solidjs/signals": "^0.12.0",
     "csstype": "^3.1.0",
     "seroval": "~1.5.0",
     "seroval-plugins": "~1.5.0"

package/types/client/hydration.d.ts

@@ -1,4 +1,4 @@
-import { createErrorBoundary as coreErrorBoundary, createMemo as coreMemo, createSignal as coreSignal, createOptimistic as coreOptimistic, createRenderEffect as coreRenderEffect, createEffect as coreEffect, type ProjectionOptions, type Store, type StoreSetter, type Context } from "@solidjs/signals";
+import { createErrorBoundary as coreErrorBoundary, createMemo as coreMemo, createSignal as coreSignal, createOptimistic as coreOptimistic, createRenderEffect as coreRenderEffect, createEffect as coreEffect, $REFRESH, type ProjectionOptions, type Store, type StoreSetter, type Context } from "@solidjs/signals";
 import { JSX } from "../jsx.js";
 declare module "@solidjs/signals" {
     interface MemoOptions<T> {
@@ -47,15 +47,21 @@ export declare const createMemo: typeof coreMemo;
 export declare const createSignal: typeof coreSignal;
 export declare const createErrorBoundary: typeof coreErrorBoundary;
 export declare const createOptimistic: typeof coreOptimistic;
-export declare const createProjection: <T extends object = {}>(fn: (draft: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, initialValue?: T, options?: HydrationProjectionOptions) => Store<T>;
+export declare const createProjection: <T extends object = {}>(fn: (draft: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, initialValue?: T, options?: HydrationProjectionOptions) => Store<T> & {
+    [$REFRESH]: any;
+};
 type NoFn<T> = T extends Function ? never : T;
 export declare const createStore: {
     <T extends object = {}>(store: NoFn<T> | Store<NoFn<T>>): [get: Store<T>, set: StoreSetter<T>];
-    <T extends object = {}>(fn: (store: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, store?: NoFn<T> | Store<NoFn<T>>, options?: HydrationProjectionOptions): [get: Store<T>, set: StoreSetter<T>];
+    <T extends object = {}>(fn: (store: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, store?: NoFn<T> | Store<NoFn<T>>, options?: HydrationProjectionOptions): [get: Store<T> & {
+        [$REFRESH]: any;
+    }, set: StoreSetter<T>];
 };
 export declare const createOptimisticStore: {
     <T extends object = {}>(store: NoFn<T> | Store<NoFn<T>>): [get: Store<T>, set: StoreSetter<T>];
-    <T extends object = {}>(fn: (store: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, store?: NoFn<T> | Store<NoFn<T>>, options?: HydrationProjectionOptions): [get: Store<T>, set: StoreSetter<T>];
+    <T extends object = {}>(fn: (store: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, store?: NoFn<T> | Store<NoFn<T>>, options?: HydrationProjectionOptions): [get: Store<T> & {
+        [$REFRESH]: any;
+    }, set: StoreSetter<T>];
 };
 export declare const createRenderEffect: typeof coreRenderEffect;
 export declare const createEffect: typeof coreEffect;

package/types/index.d.ts

@@ -1,4 +1,4 @@
-export { $PROXY, $TRACK, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, snapshot, storePath, untrack } from "@solidjs/signals";
+export { $PROXY, $REFRESH, $TRACK, action, createOwner, createReaction, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, setOnUnhandledAsync, snapshot, storePath, untrack } from "@solidjs/signals";
 export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
 export { $DEVCOMP, children, createContext, useContext } from "./client/core.js";
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./client/core.js";

package/types/server/index.d.ts

@@ -1,4 +1,4 @@
-export { $PROXY, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createOwner, createProjection, createReaction, createRenderEffect, createRoot, createSignal, createStore, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, snapshot, storePath, createDeepProxy, untrack } from "./signals.js";
+export { $PROXY, $REFRESH, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createOwner, createProjection, createReaction, createRenderEffect, createRoot, createSignal, createStore, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, snapshot, storePath, createDeepProxy, setOnUnhandledAsync, untrack } from "./signals.js";
 export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter, PatchOp } from "./signals.js";
 export { $DEVCOMP, children, createContext, useContext, ssrRunInScope } from "./core.js";
 export type { ChildrenReturn, Context, ContextProviderComponent, ResolvedChildren, ResolvedJSXElement } from "./core.js";

package/types/server/signals.d.ts

@@ -1,6 +1,6 @@
-export { createRoot, createOwner, runWithOwner, getOwner, onCleanup, getNextChildId, createContext, setContext, getContext, NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY } from "@solidjs/signals";
+export { createRoot, createOwner, runWithOwner, getOwner, onCleanup, getNextChildId, createContext, setContext, getContext, NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY, setOnUnhandledAsync } from "@solidjs/signals";
 export { flatten } from "@solidjs/signals";
-export { snapshot, merge, omit, storePath, $PROXY, $TRACK } from "@solidjs/signals";
+export { snapshot, merge, omit, storePath, $PROXY, $REFRESH, $TRACK } from "@solidjs/signals";
 export type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, NoInfer, SignalOptions, Setter, Signal, Owner, Maybe, Store, StoreSetter, StoreNode, NotWrappable, SolidStore, Merge, Omit, Context, ContextRecord, IQueue, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
 import type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, SignalOptions, Signal, Owner, Store, StoreSetter, Context } from "@solidjs/signals";
 import { NoHydrateContext } from "./shared.js";