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

package/README.md

@@ -2,222 +2,78 @@
   <img src="https://assets.solidjs.com/banner?project=Library&type=core" alt="SolidJS" />
 </p>
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/solidjs/solid/main-ci.yml?branch=main&logo=github&style=for-the-badge)](https://github.com/solidjs/solid/actions/workflows/main-ci.yml)
-[![Coverage Status](https://img.shields.io/coveralls/github/solidjs/solid.svg?style=for-the-badge)](https://coveralls.io/github/solidjs/solid?branch=main)
-
 [![NPM Version](https://img.shields.io/npm/v/solid-js.svg?style=for-the-badge)](https://www.npmjs.com/package/solid-js)
 [![](https://img.shields.io/npm/dm/solid-js.svg?style=for-the-badge)](https://www.npmjs.com/package/solid-js)
 [![Discord](https://img.shields.io/discord/722131463138705510?style=for-the-badge)](https://discord.com/invite/solidjs)
-[![Subreddit subscribers](https://img.shields.io/reddit/subreddit-subscribers/solidjs?style=for-the-badge)](https://www.reddit.com/r/solidjs/)
-
-**[Website](https://www.solidjs.com/) • [API Docs](https://docs.solidjs.com/) • [Features Tutorial](https://www.solidjs.com/tutorial/introduction_basics) • [Playground](https://playground.solidjs.com/?version=1.3.13#NobwRAdghgtgpmAXGGUCWEwBowBcCeADgsrgM4Ae2YZA9gK4BOAxiWGjIbY7gAQi9GcCABM4jXgF9eAM0a0YvADo1aAGzQiAtACsyAegDucAEYqA3EogcuPfr2ZCouOAGU0Ac2hqps+YpU6DW09CysrGXoIZlw0WgheAGEGCBdGAAoASn4rXgd4sj5gZhTcLF4yOFxkqNwAXV4AXgcnF3cvKDV0gAZMywT8iELeDEc4eFSm3iymgD4KqprU9JLamYBqXgBGPvCBoVwmBPTcvN4AHhN6XFx43gJiRpUrm-iVXnjEjWYAa0aQUZCCa4SSzU5nfirZaZSTgi76F63CBgga7CCwiBWISicTpGaNebnJZpXj6WblES0Zj0YEAOg8VQAompxsJcAAhfAASREJzAUEIhBUmTRYEkdSAA) • [Discord](https://discord.com/invite/solidjs)**
-
-Solid is a declarative JavaScript library for creating user interfaces. Instead of using a Virtual DOM, it compiles its templates to real DOM nodes and updates them with fine-grained reactions. Declare your state and use it throughout your app, and when a piece of state changes, only the code that depends on it will rerun. Check out our [intro video](https://www.youtube.com/watch?v=cELFZQAMdhQ) or read on!
-
-## Key Features
-
-- Fine-grained updates to the real DOM
-- Declarative data: model your state as a system with reactive primitives
-- Render-once mental model: your components are regular JavaScript functions that run once to set up your view
-- Automatic dependency tracking: accessing your reactive state subscribes to it
-- [Small](https://dev.to/this-is-learning/javascript-framework-todomvc-size-comparison-504f) and [fast](https://krausest.github.io/js-framework-benchmark/current.html)
-- Simple: learn a few powerful concepts that can be reused, combined, and built on top of
-- Provides modern framework features like JSX, fragments, Context, Portals, Suspense, streaming SSR, progressive hydration, Error Boundaries and concurrent rendering.
-- Naturally debuggable: A `<div>` is a real div, so you can use your browser's devtools to inspect the rendering
-- [Web component friendly](https://github.com/solidjs/solid/tree/main/packages/solid-element#readme) and can author custom elements
-- Isomorphic: render your components on the client and the server
-- Universal: write [custom renderers](https://github.com/solidjs/solid/releases/tag/v1.2.0) to use Solid anywhere
-- A growing community and ecosystem with active core team support
-
-<details>
-
-<summary>Quick Start</summary>
-
-You can get started with a simple app by running the following in your terminal:
-
-```sh
-> npx degit solidjs/templates/js my-app
-> cd my-app
-> npm i # or yarn or pnpm
-> npm run dev # or yarn or pnpm
-```
-
-Or for TypeScript:
-
-```sh
-> npx degit solidjs/templates/ts my-app
-> cd my-app
-> npm i # or yarn or pnpm
-> npm run dev # or yarn or pnpm
-```
-
-This will create a minimal, client-rendered application powered by [Vite](https://vitejs.dev/).
-
-Or you can install the dependencies in your own setup. To use Solid with JSX (_recommended_), run:
-
-```sh
-> npm i -D babel-preset-solid
-> npm i solid-js
-```
-
-The easiest way to get set up is to add `babel-preset-solid` to your `.babelrc`, babel config for webpack, or rollup configuration:
-
-```js
-"presets": ["solid"]
-```
-
-For TypeScript to work, remember to set your `.tsconfig` to handle Solid's JSX:
-
-```js
-"compilerOptions": {
-  "jsx": "preserve",
-  "jsxImportSource": "solid-js",
-}
-```
-
-</details>
 
-## Why Solid?
+**[Website](https://www.solidjs.com/) • [API Docs](https://docs.solidjs.com/) • [Tutorial](https://www.solidjs.com/tutorial/introduction_basics) • [GitHub](https://github.com/solidjs/solid) • [Discord](https://discord.com/invite/solidjs)**
 
-### Performant
+> **You are looking at Solid 2.0 (experimental beta).**
+> Public surface differs from 1.x — split-phase `createEffect`, microtask batching, `Loading`/`Errored` boundaries, draft-first store setters, async-in-computations, removed `solid-js/web` and `solid-js/store` subpaths, and more.
+>
+> - **Migrating from 1.x?** Read [MIGRATION.md](https://github.com/solidjs/solid/blob/next/documentation/solid-2.0/MIGRATION.md) (full guide).
+> - **Need a quick API reference?** See [CHEATSHEET.md](./CHEATSHEET.md) (one page, every public export — ships with this package).
+> - **Looking for stable Solid 1.x?** Use the default [`main` branch](https://github.com/solidjs/solid).
 
-Meticulously engineered for performance and with half a decade of research behind it, Solid's performance is almost indistinguishable from optimized vanilla JavaScript (See Solid on the [JS Framework Benchmark](https://krausest.github.io/js-framework-benchmark/current.html)). Solid is [small](https://bundlephobia.com/package/solid-js@1.3.15) and completely tree-shakable, and [fast](https://levelup.gitconnected.com/how-we-wrote-the-fastest-javascript-ui-framework-again-db097ddd99b6) when rendering on the server, too. Whether you're writing a fully client-rendered SPA or a server-rendered app, your users see it faster than ever. ([Read more about Solid's performance](https://dev.to/ryansolid/thinking-granular-how-is-solidjs-so-performant-4g37) from the library's creator.)
+Solid is a declarative JavaScript library for building user interfaces. Instead of a Virtual DOM, it compiles templates to real DOM nodes and updates them with fine-grained reactivity. Declare your state and use it throughout your app — when a piece of state changes, only the code that depends on it re-runs.
 
-### Powerful
+## At a glance (Solid 2.0)
 
-Solid is fully-featured with everything you can expect from a modern framework. Performant state management is built-in with Context and Stores: you don't have to reach for a third party library to manage global state (if you don't want to). With Resources, you can use data loaded from the server like any other piece of state and build a responsive UI for it thanks to Suspense and concurrent rendering. And when you're ready to move to the server, Solid has full SSR and serverless support, with streaming and progressive hydration to get to interactive as quickly as possible. (Check out our full [interactive features walkthrough](https://www.solidjs.com/tutorial/introduction_basics).)
-
-### Pragmatic
-
-Do more with less: use simple, composable primitives without hidden rules and gotchas. In Solid, components are just functions - rendering is determined purely by how your state is used - so you're free to organize your code how you like and you don't have to learn a new rendering system. Solid encourages patterns like declarative code and read-write segregation that help keep your project maintainable, but isn't opinionated enough to get in your way.
-
-### Productive
-
-Solid is built on established tools like JSX and TypeScript and integrates with the Vite ecosystem. Solid's bare-metal, minimal abstractions give you direct access to the DOM, making it easy to use your favorite native JavaScript libraries like D3. And the Solid ecosystem is growing fast, with [custom primitives](https://github.com/solidjs-community/solid-primitives), [component libraries](https://github.com/hope-ui/hope-ui), and build-time utilities that let you [write Solid code in new ways](https://github.com/LXSMNSYC/solid-labels).
-
-<details>
-<summary>Show Me!</summary>
-
-```jsx
-import { render } from "solid-js/web";
+```tsx
 import { createSignal } from "solid-js";
+import { render } from "@solidjs/web";
 
-// A component is just a function that (optionally) accepts properties and returns a DOM node
-const Counter = props => {
-  // Create a piece of reactive state, giving us a accessor, count(), and a setter, setCount()
-  const [count, setCount] = createSignal(props.startingCount || 1);
-
-  // The increment function calls the setter
-  const increment = () => setCount(count() + 1);
+function Counter() {
+  const [count, setCount] = createSignal(0);
+  const doubled = () => count() * 2;
 
-  console.log(
-    "The body of the function runs once, like you'd expect from calling any other function, so you only ever see this console log once."
-  );
-
-  // JSX allows us to write HTML within our JavaScript function and include dynamic expressions using the { } syntax
-  // The only part of this that will ever rerender is the count() text.
   return (
-    <button type="button" onClick={increment}>
-      Increment {count()}
+    <button onClick={() => setCount(c => c + 1)}>
+      {doubled()}
     </button>
   );
-};
+}
 
-// The render function mounts a component onto your page
-render(() => <Counter startingCount={2} />, document.getElementById("app"));
+render(() => <Counter />, document.getElementById("app")!);
 ```
 
-See it in action in our interactive [Playground](https://playground.solidjs.com/?hash=-894962706&version=1.3.13)!
-
-Solid compiles our JSX down to efficient real DOM expressions updates, still using the same reactive primitives (`createSignal`) at runtime but making sure there's as little rerendering as possible. Here's what that looks like in this example:
-
-```js
-import { render, createComponent, delegateEvents, insert, template } from "solid-js/web";
-import { createSignal } from "solid-js";
-
-const _tmpl$ = /*#__PURE__*/ template(`<button type="button">Increment </button>`, 2);
+Try it in our [Playground](https://playground.solidjs.com/). _(The hosted Playground currently runs Solid 1.x — a 2.0 build is on the way.)_
 
-const Counter = props => {
-  const [count, setCount] = createSignal(props.startingCount || 1);
-  const increment = () => setCount(count() + 1);
+The component body runs **once**. The `{doubled()}` expression is the only thing that re-renders when `count` changes — Solid compiles JSX to real DOM nodes and tracks the `count()` read at that one DOM position.
 
-  console.log("The body of the function runs once . . .");
+## Install
 
-  return (() => {
-    //_el$ is a real DOM node!
-    const _el$ = _tmpl$.cloneNode(true);
-    _el$.firstChild;
-
-    _el$.$$click = increment;
-
-    //This inserts the count as a child of the button in a way that allows count to update without rerendering the whole button
-    insert(_el$, count, null);
-
-    return _el$;
-  })();
-};
-
-render(
-  () =>
-    createComponent(Counter, {
-      startingCount: 2
-    }),
-  document.getElementById("app")
-);
-
-delegateEvents(["click"]);
+```sh
+npm i solid-js @solidjs/web
+npm i -D babel-preset-solid
 ```
 
-</details>
-
-## More
+Add `babel-preset-solid` to your Babel config (or use Vite's Solid plugin), and set `tsconfig.json`:
 
-Check out our official [documentation](https://www.solidjs.com/guide) or browse some [examples](https://github.com/solidjs/solid/blob/main/documentation/resources/examples.md)
-
-## Browser Support
-
-SolidJS Core is committed to supporting the last 2 years of modern browsers including Firefox, Safari, Chrome and Edge (for desktop and mobile devices). We do not support IE or similar sunset browsers. For server environments, we support Node LTS and the latest Deno and Cloudflare Worker runtimes.
-
-<img src="https://saucelabs.github.io/images/opensauce/powered-by-saucelabs-badge-gray.svg?sanitize=true" alt="Testing Powered By SauceLabs" width="300"/>
-
-## Community
-
-Come chat with us on [Discord](https://discord.com/invite/solidjs)! Solid's creator and the rest of the core team are active there, and we're always looking for contributions.
+```json
+{
+  "compilerOptions": {
+    "jsx": "preserve",
+    "jsxImportSource": "solid-js"
+  }
+}
+```
 
-### Contributors
+Existing 1.x starter templates target 1.x — 2.0 starter templates are tracked at [solidjs/templates](https://github.com/solidjs/templates).
 
-<a href="https://github.com/solidjs/solid/graphs/contributors"><img src="https://opencollective.com/solid/contributors.svg?width=890&amp;button=false" style="max-width:100%;"></a>
+## For LLMs / AI assistants
 
-### Open Collective
+If you're an AI tool or model generating Solid 2.0 code: the public API differs from any Solid examples that predate 2.0. Read [`CHEATSHEET.md`](./CHEATSHEET.md) before generating — it lives inside this package (`node_modules/solid-js/CHEATSHEET.md`) for that reason. The bottom of the cheatsheet enumerates the specific patterns that changed from 1.x.
 
-Support us with a donation and help us continue our activities. [[Contribute](https://opencollective.com/solid)]
+The full migration guide is [`MIGRATION.md`](https://github.com/solidjs/solid/blob/next/documentation/solid-2.0/MIGRATION.md). Eight RFCs covering each subsystem (reactivity, control flow, stores, async, actions, DOM, dev-mode diagnostics) live alongside it under [`documentation/solid-2.0/`](https://github.com/solidjs/solid/tree/next/documentation/solid-2.0).
 
-<a href="https://opencollective.com/solid/backer/0/website" target="_blank"><img src="https://opencollective.com/solid/backer/0/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/1/website" target="_blank"><img src="https://opencollective.com/solid/backer/1/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/2/website" target="_blank"><img src="https://opencollective.com/solid/backer/2/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/3/website" target="_blank"><img src="https://opencollective.com/solid/backer/3/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/4/website" target="_blank"><img src="https://opencollective.com/solid/backer/4/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/5/website" target="_blank"><img src="https://opencollective.com/solid/backer/5/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/6/website" target="_blank"><img src="https://opencollective.com/solid/backer/6/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/7/website" target="_blank"><img src="https://opencollective.com/solid/backer/7/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/8/website" target="_blank"><img src="https://opencollective.com/solid/backer/8/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/9/website" target="_blank"><img src="https://opencollective.com/solid/backer/9/avatar.svg"></a>
-<a href="https://opencollective.com/solid/backer/10/website" target="_blank"><img src="https://opencollective.com/solid/backer/10/avatar.svg"></a>
+## Learn more
 
-### Sponsors
+- **Why Solid, key features, browser support, community, sponsors** — see the [repository README](https://github.com/solidjs/solid#readme).
+- **Full documentation** — [docs.solidjs.com](https://docs.solidjs.com).
+- **Examples** — [documentation/resources/examples.md](https://github.com/solidjs/solid/blob/next/documentation/resources/examples.md).
+- **Discord** — [discord.com/invite/solidjs](https://discord.com/invite/solidjs).
 
-Become a sponsor and get your logo on our README on GitHub with a link to your site. [[Become a sponsor](https://opencollective.com/solid#sponsor)]
+---
 
-<a href="https://opencollective.com/solid/sponsor/0/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/0/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/1/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/1/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/2/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/2/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/3/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/3/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/4/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/4/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/5/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/5/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/6/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/6/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/7/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/7/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/8/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/8/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/9/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/9/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/10/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/10/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/11/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/11/avatar.svg"></a>
-<a href="https://opencollective.com/solid/sponsor/12/website" target="_blank"><img src="https://opencollective.com/solid/sponsor/12/avatar.svg"></a>
+_This is the npm package README for `solid-js`. The full repository README — including the monorepo layout, contributors, and sponsors — lives at [github.com/solidjs/solid](https://github.com/solidjs/solid#readme)._

package/dist/dev.cjs

@@ -294,9 +294,12 @@ function hydrateSignalFromAsyncIterable(coreFn, compute, options) {
       return it;
     }
   };
-  return coreFn(() => iterable, options);
+  return coreFn(prev => {
+    subFetch(compute, prev);
+    return iterable;
+  }, options);
 }
-function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
+function hydrateStoreFromAsyncIterable(coreFn, fn, initialValue, options) {
   const parent = signals.getOwner();
   const expectedId = signals.peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
@@ -306,6 +309,10 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   let isFirst = true;
   let buffered = null;
   return coreFn(draft => {
+    const {
+      proxy
+    } = createShadowDraft(draft);
+    subFetch(fn, proxy);
     const process = res => {
       if (res.done) return {
         done: true,
@@ -313,11 +320,16 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
       };
       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);
+        signals.setSnapshotCapture(false);
+        try {
+          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);
+          }
+        } finally {
+          signals.setSnapshotCapture(true);
         }
       } else {
         applyPatches(draft, res.value);
@@ -386,13 +398,6 @@ function hydratedCreateMemo(compute, options) {
     setHydrated(true);
     return memo;
   }
-  if (ssrSource === "initial") {
-    return signals.createMemo(prev => {
-      if (!sharedConfig.hydrating) return compute(prev);
-      subFetch(compute, prev);
-      return prev;
-    }, options);
-  }
   const aiResult = hydrateSignalFromAsyncIterable(signals.createMemo, compute, options);
   if (aiResult !== null) return aiResult;
   return signals.createMemo(prev => readSerializedOrCompute(compute, prev), options);
@@ -412,13 +417,6 @@ function hydratedCreateSignal(fn, second) {
     setHydrated(true);
     return sig;
   }
-  if (ssrSource === "initial") {
-    return signals.createSignal(prev => {
-      if (!sharedConfig.hydrating) return fn(prev);
-      subFetch(fn, prev);
-      return prev;
-    }, second);
-  }
   const aiResult = hydrateSignalFromAsyncIterable(signals.createSignal, fn, second);
   if (aiResult !== null) return aiResult;
   return signals.createSignal(prev => readSerializedOrCompute(fn, prev), second);
@@ -458,13 +456,6 @@ function hydratedCreateOptimistic(fn, second) {
     setHydrated(true);
     return sig;
   }
-  if (ssrSource === "initial") {
-    return signals.createOptimistic(prev => {
-      if (!sharedConfig.hydrating) return fn(prev);
-      subFetch(fn, prev);
-      return prev;
-    }, second);
-  }
   const aiResult = hydrateSignalFromAsyncIterable(signals.createOptimistic, fn, second);
   if (aiResult !== null) return aiResult;
   return signals.createOptimistic(prev => readSerializedOrCompute(fn, prev), second);
@@ -508,7 +499,7 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
     setHydrated(true);
     return result;
   }
-  const aiResult = hydrateStoreFromAsyncIterable(coreFn, initialValue, options);
+  const aiResult = hydrateStoreFromAsyncIterable(coreFn, fn, initialValue, options);
   if (aiResult !== null) return aiResult;
   return coreFn(wrapStoreFn(fn), initialValue, options);
 }
@@ -516,21 +507,18 @@ function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return signals.createStore(second ?? {});
   return hydrateStoreLikeFn(signals.createStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return signals.createOptimisticStore(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return signals.createOptimisticStore(second ?? {});
   return hydrateStoreLikeFn(signals.createOptimisticStore, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
   if (!sharedConfig.hydrating) return signals.createProjection(fn, initialValue, options);
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "initial") return signals.createProjection(draft => draft, initialValue, options);
   return hydrateStoreLikeFn(signals.createProjection, fn, initialValue, options, ssrSource);
 }
 function hydratedEffect(coreFn, compute, effectFn, options) {
@@ -552,14 +540,6 @@ function hydratedEffect(coreFn, compute, effectFn, options) {
     setHydrated(true);
     return;
   }
-  if (ssrSource === "initial") {
-    coreFn(prev => {
-      if (!sharedConfig.hydrating) return compute(prev);
-      subFetch(compute, prev);
-      return prev;
-    }, effectFn, options);
-    return;
-  }
   markTopLevelSnapshotScope();
   coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, options);
 }
@@ -887,7 +867,7 @@ function Loading(props) {
 }
 function Reveal(props) {
   return signals.createRevealOrder(() => props.children, {
-    together: () => !!props.together,
+    order: () => props.order ?? "sequential",
     collapsed: () => !!props.collapsed
   });
 }

package/dist/dev.js

@@ -293,9 +293,12 @@ function hydrateSignalFromAsyncIterable(coreFn, compute, options) {
       return it;
     }
   };
-  return coreFn(() => iterable, options);
+  return coreFn(prev => {
+    subFetch(compute, prev);
+    return iterable;
+  }, options);
 }
-function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
+function hydrateStoreFromAsyncIterable(coreFn, fn, initialValue, options) {
   const parent = getOwner();
   const expectedId = peekNextChildId(parent);
   if (!sharedConfig.has(expectedId)) return null;
@@ -305,6 +308,10 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
   let isFirst = true;
   let buffered = null;
   return coreFn(draft => {
+    const {
+      proxy
+    } = createShadowDraft(draft);
+    subFetch(fn, proxy);
     const process = res => {
       if (res.done) return {
         done: true,
@@ -312,11 +319,16 @@ function hydrateStoreFromAsyncIterable(coreFn, initialValue, options) {
       };
       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);
+        setSnapshotCapture(false);
+        try {
+          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);
+          }
+        } finally {
+          setSnapshotCapture(true);
         }
       } else {
         applyPatches(draft, res.value);
@@ -385,13 +397,6 @@ function hydratedCreateMemo(compute, options) {
     setHydrated(true);
     return memo;
   }
-  if (ssrSource === "initial") {
-    return createMemo$1(prev => {
-      if (!sharedConfig.hydrating) return compute(prev);
-      subFetch(compute, prev);
-      return prev;
-    }, options);
-  }
   const aiResult = hydrateSignalFromAsyncIterable(createMemo$1, compute, options);
   if (aiResult !== null) return aiResult;
   return createMemo$1(prev => readSerializedOrCompute(compute, prev), options);
@@ -411,13 +416,6 @@ function hydratedCreateSignal(fn, second) {
     setHydrated(true);
     return sig;
   }
-  if (ssrSource === "initial") {
-    return createSignal$1(prev => {
-      if (!sharedConfig.hydrating) return fn(prev);
-      subFetch(fn, prev);
-      return prev;
-    }, second);
-  }
   const aiResult = hydrateSignalFromAsyncIterable(createSignal$1, fn, second);
   if (aiResult !== null) return aiResult;
   return createSignal$1(prev => readSerializedOrCompute(fn, prev), second);
@@ -457,13 +455,6 @@ function hydratedCreateOptimistic(fn, second) {
     setHydrated(true);
     return sig;
   }
-  if (ssrSource === "initial") {
-    return createOptimistic$1(prev => {
-      if (!sharedConfig.hydrating) return fn(prev);
-      subFetch(fn, prev);
-      return prev;
-    }, second);
-  }
   const aiResult = hydrateSignalFromAsyncIterable(createOptimistic$1, fn, second);
   if (aiResult !== null) return aiResult;
   return createOptimistic$1(prev => readSerializedOrCompute(fn, prev), second);
@@ -507,7 +498,7 @@ function hydrateStoreLikeFn(coreFn, fn, initialValue, options, ssrSource) {
     setHydrated(true);
     return result;
   }
-  const aiResult = hydrateStoreFromAsyncIterable(coreFn, initialValue, options);
+  const aiResult = hydrateStoreFromAsyncIterable(coreFn, fn, initialValue, options);
   if (aiResult !== null) return aiResult;
   return coreFn(wrapStoreFn(fn), initialValue, options);
 }
@@ -515,21 +506,18 @@ function hydratedCreateStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return createStore$1(second ?? {});
   return hydrateStoreLikeFn(createStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateOptimisticStore(first, second, third) {
   if (typeof first !== "function" || !sharedConfig.hydrating) return createOptimisticStore$1(first, second, third);
   markTopLevelSnapshotScope();
   const ssrSource = third?.ssrSource;
-  if (ssrSource === "initial") return createOptimisticStore$1(second ?? {});
   return hydrateStoreLikeFn(createOptimisticStore$1, first, second ?? {}, third, ssrSource);
 }
 function hydratedCreateProjection(fn, initialValue, options) {
   if (!sharedConfig.hydrating) return createProjection$1(fn, initialValue, options);
   markTopLevelSnapshotScope();
   const ssrSource = options?.ssrSource;
-  if (ssrSource === "initial") return createProjection$1(draft => draft, initialValue, options);
   return hydrateStoreLikeFn(createProjection$1, fn, initialValue, options, ssrSource);
 }
 function hydratedEffect(coreFn, compute, effectFn, options) {
@@ -551,14 +539,6 @@ function hydratedEffect(coreFn, compute, effectFn, options) {
     setHydrated(true);
     return;
   }
-  if (ssrSource === "initial") {
-    coreFn(prev => {
-      if (!sharedConfig.hydrating) return compute(prev);
-      subFetch(compute, prev);
-      return prev;
-    }, effectFn, options);
-    return;
-  }
   markTopLevelSnapshotScope();
   coreFn(prev => readSerializedOrCompute(compute, prev), effectFn, options);
 }
@@ -886,7 +866,7 @@ function Loading(props) {
 }
 function Reveal(props) {
   return createRevealOrder(() => props.children, {
-    together: () => !!props.together,
+    order: () => props.order ?? "sequential",
     collapsed: () => !!props.collapsed
   });
 }