solid-js 2.0.0-beta.10 → 2.0.0-beta.11

package/dist/server.js

@@ -1,5 +1,5 @@
-import { getOwner, getContext, getNextChildId, createOwner, NotReadyError, runWithOwner, onCleanup, isWrappable, setContext, flatten, createRoot } from '@solidjs/signals';
-export { $PROXY, $REFRESH, $TRACK, NotReadyError, createOwner, createRoot, enableExternalSource, enforceLoadingBoundary, flatten, getNextChildId, getOwner, isDisposed, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
+import { NotReadyError, $REFRESH, isWrappable, NoOwnerError, ContextNotFoundError, flatten } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, enableExternalSource, enforceLoadingBoundary, flatten, isEqual, isWrappable, merge, omit, snapshot, storePath } from '@solidjs/signals';
 
 const NoHydrateContext = {
   id: Symbol("NoHydrateContext"),
@@ -14,6 +14,142 @@ const sharedConfig = {
   }
 };
 
+const defaultSSRContext = {};
+let currentOwner = null;
+const OWNER_POOL_MAX = 4096;
+const ownerPool = [];
+function formatChildId(prefix, id) {
+  const num = id.toString(36);
+  const len = num.length - 1;
+  return prefix + (len ? String.fromCharCode(64 + len) : "") + num;
+}
+function nextChildIdFor(owner, consume) {
+  let counter = owner;
+  while (counter._transparent && counter._parent) counter = counter._parent;
+  if (counter.id != null) {
+    return formatChildId(counter.id, counter._childCount++ );
+  }
+  throw new Error("Cannot get child id from owner without an id");
+}
+function getNextChildId(owner) {
+  return nextChildIdFor(owner);
+}
+function createOwner(options) {
+  const parent = currentOwner;
+  const transparent = options?.transparent ?? false;
+  const id = options?.id ?? (transparent ? parent?.id : parent?.id != null ? nextChildIdFor(parent) : undefined);
+  const ctx = parent?._context ?? defaultSSRContext;
+  let owner;
+  if (ownerPool.length) {
+    owner = ownerPool.pop();
+    owner.id = id;
+    owner._transparent = transparent;
+    owner._disposal = null;
+    owner._parent = parent;
+    owner._context = ctx;
+    owner._childCount = 0;
+    owner._firstChild = null;
+    owner._nextSibling = null;
+    owner._disposed = false;
+  } else {
+    owner = {
+      id,
+      _transparent: transparent,
+      _disposal: null,
+      _parent: parent,
+      _context: ctx,
+      _childCount: 0,
+      _firstChild: null,
+      _nextSibling: null,
+      _disposed: false
+    };
+  }
+  if (parent) {
+    const lastChild = parent._firstChild;
+    if (lastChild) owner._nextSibling = lastChild;
+    parent._firstChild = owner;
+  }
+  return owner;
+}
+function runWithOwner(owner, fn) {
+  const prev = currentOwner;
+  currentOwner = owner;
+  try {
+    return fn();
+  } finally {
+    currentOwner = prev;
+  }
+}
+function getOwner() {
+  return currentOwner;
+}
+function isDisposed(owner) {
+  return owner._disposed;
+}
+function onCleanup(fn) {
+  const o = currentOwner;
+  if (!o) return fn;
+  if (!o._disposal) o._disposal = fn;else if (Array.isArray(o._disposal)) o._disposal.push(fn);else o._disposal = [o._disposal, fn];
+  return fn;
+}
+function getContext(context, owner = currentOwner) {
+  if (!owner) throw new NoOwnerError();
+  const map = owner._context;
+  const stored = map[context.id];
+  const value = stored !== undefined ? stored : context.defaultValue;
+  if (value === undefined) throw new ContextNotFoundError();
+  return value;
+}
+function setContext(context, value, owner = currentOwner) {
+  if (!owner) throw new NoOwnerError();
+  const o = owner;
+  o._context = {
+    ...o._context,
+    [context.id]: value === undefined ? context.defaultValue : value
+  };
+}
+function disposeOwner(owner, self = true) {
+  const node = owner;
+  if (node._disposed) return;
+  if (!node._firstChild && !node._disposal) {
+    if (self) {
+      node._disposed = true;
+      if (ownerPool.length < OWNER_POOL_MAX) {
+        node._parent = null;
+        node._nextSibling = null;
+        ownerPool.push(node);
+      }
+    }
+    return;
+  }
+  if (self) node._disposed = true;
+  let child = node._firstChild;
+  while (child) {
+    const next = child._nextSibling;
+    disposeOwner(child, true);
+    child = next;
+  }
+  node._firstChild = null;
+  node._childCount = 0;
+  const d = node._disposal;
+  if (d) {
+    if (Array.isArray(d)) {
+      for (let i = 0, len = d.length; i < len; i++) d[i]();
+    } else {
+      d();
+    }
+    node._disposal = null;
+  }
+  if (self && ownerPool.length < OWNER_POOL_MAX) {
+    node._parent = null;
+    node._nextSibling = null;
+    ownerPool.push(node);
+  }
+}
+function createRoot(init, options) {
+  const owner = createOwner(options);
+  return runWithOwner(owner, () => init(() => disposeOwner(owner)));
+}
 let Observer = null;
 function runWithObserver(comp, fn) {
   const prev = Observer;
@@ -98,6 +234,9 @@ function createSignal(first, second) {
   }];
 }
 function createMemo(compute, options) {
+  if (options?.sync) {
+    return createSyncMemo(compute, options);
+  }
   const ctx = sharedConfig.context;
   const owner = createOwner();
   const comp = {
@@ -133,7 +272,7 @@ function createMemo(compute, options) {
   } else if (!options?.lazy) {
     update();
   }
-  return () => {
+  const read = () => {
     if (!comp.computed) {
       update();
     }
@@ -142,6 +281,44 @@ function createMemo(compute, options) {
     }
     return comp.value;
   };
+  read[$REFRESH] = comp;
+  return read;
+}
+function createSyncMemo(compute, options) {
+  const owner = createOwner();
+  let value;
+  let error;
+  let cached = false;
+  function pull() {
+    const prev = currentOwner;
+    currentOwner = owner;
+    try {
+      value = compute(value);
+      error = undefined;
+      cached = true;
+      return value;
+    } catch (err) {
+      if (err instanceof NotReadyError) throw err;
+      error = err;
+      cached = true;
+      throw err;
+    } finally {
+      currentOwner = prev;
+    }
+  }
+  if (!options?.lazy) {
+    try {
+      pull();
+    } catch {
+    }
+  }
+  return () => {
+    if (cached) {
+      if (error !== undefined) throw error;
+      return value;
+    }
+    return pull();
+  };
 }
 function createDeepProxy(target, patches, basePath = []) {
   const childProxies = new Map();
@@ -567,44 +744,62 @@ function deep(store) {
   return store;
 }
 function mapArray(list, mapFn, options = {}) {
-  const parent = createOwner();
   return createMemo(() => {
     const items = list();
-    let s = [];
+    const s = [];
     if (items && items.length) {
-      runWithOwner(parent, () => {
+      const parent = currentOwner;
+      const origId = parent.id;
+      const origChildCount = parent._childCount;
+      try {
         for (let i = 0, len = items.length; i < len; i++) {
-          const o = createOwner();
-          s.push(runWithOwner(o, () => mapFn(() => items[i], () => i)));
+          if (origId !== undefined) {
+            parent.id = formatChildId(origId, origChildCount + i);
+          }
+          parent._childCount = 0;
+          s.push(mapFn(() => items[i], () => i));
         }
-      });
+      } finally {
+        parent.id = origId;
+        parent._childCount = origChildCount + items.length;
+      }
     } else if (options.fallback) {
-      s = [runWithOwner(parent, () => {
-        const fo = createOwner();
-        return runWithOwner(fo, () => options.fallback());
-      })];
+      const fo = createOwner();
+      s.push(runWithOwner(fo, () => options.fallback()));
     }
     return s;
+  }, {
+    sync: true
   });
 }
 function repeat(count, mapFn, options = {}) {
-  const owner = createOwner();
   return createMemo(() => {
     const len = count();
     const offset = options.from?.() || 0;
     if (!len) {
       if (!options.fallback) return [];
-      return [runWithOwner(owner, () => {
-        const fallbackOwner = createOwner();
-        return runWithOwner(fallbackOwner, () => options.fallback());
-      })];
+      const fo = createOwner();
+      return [runWithOwner(fo, () => options.fallback())];
     }
-    return runWithOwner(owner, () => Array.from({
-      length: len
-    }, (_, i) => {
-      const itemOwner = createOwner();
-      return runWithOwner(itemOwner, () => mapFn(i + offset));
-    }));
+    const out = new Array(len);
+    const parent = currentOwner;
+    const origId = parent.id;
+    const origChildCount = parent._childCount;
+    try {
+      for (let i = 0; i < len; i++) {
+        if (origId !== undefined) {
+          parent.id = formatChildId(origId, origChildCount + i);
+        }
+        parent._childCount = 0;
+        out[i] = mapFn(i + offset);
+      }
+    } finally {
+      parent.id = origId;
+      parent._childCount = origChildCount + len;
+    }
+    return out;
+  }, {
+    sync: true
   });
 }
 const ErrorContext = {
@@ -656,7 +851,7 @@ function createErrorBoundary(fn, fallback) {
   return () => {
     let result;
     let handled = false;
-    if (ctx) owner.dispose(false);
+    if (ctx) disposeOwner(owner, false);
     try {
       result = ctx ? runWithBoundaryErrorContext(owner, resolve, err => {
         if (err instanceof NotReadyError) throw err;
@@ -710,8 +905,8 @@ function latest(fn) {
 function isRefreshing() {
   return false;
 }
-function refresh(fn) {
-  return fn();
+function refresh(_target) {
+  return undefined;
 }
 function action(fn) {
   return fn;
@@ -742,7 +937,8 @@ function children(fn) {
     lazy: true
   });
   const memo = createMemo(() => flatten(c()), {
-    lazy: true
+    lazy: true,
+    sync: true
   });
   memo.toArray = () => {
     const v = memo();
@@ -750,11 +946,6 @@ function children(fn) {
   };
   return memo;
 }
-function ssrRunInScope(fn) {
-  const owner = getOwner();
-  if (!owner) return fn;
-  return Array.isArray(fn) ? fn.map(hole => () => runWithOwner(owner, hole)) : () => runWithOwner(owner, fn);
-}
 
 function enableHydration() {}
 function createComponent(Comp, props) {
@@ -798,6 +989,8 @@ function lazy(fn, moduleUrl) {
     return createMemo(() => {
       if (!p.v) throw new NotReadyError(p);
       return p.v(props);
+    }, {
+      sync: true
     });
   };
   wrap.preload = load;
@@ -881,7 +1074,7 @@ function createLoadingBoundary(fn, fallback, options) {
     }
   }
   function runDiscovery() {
-    o.dispose(false);
+    disposeOwner(o, false);
     serializeBuffer = [];
     retryPromise = undefined;
     return runLoadingPhase(() => {
@@ -928,12 +1121,13 @@ function createLoadingBoundary(fn, fallback, options) {
           ret = runDiscovery();
         }
         commitBoundaryState();
-        while (ret.p.length) {
-          await Promise.all(ret.p).catch(() => {});
-          ret = runLoadingPhase(() => ctx.ssr(ret.t, ...ret.h));
+        while (ret && ret.p && ret.p.length) {
+          const pending = ret;
+          await Promise.all(pending.p).catch(() => {});
+          ret = runLoadingPhase(() => ctx.ssr(pending.t, ...pending.h));
         }
         flushSerializeBuffer();
-        done(ret.t[0]);
+        done(ret && Array.isArray(ret.t) ? ret.t[0] : ret && ret.t);
         if (revealGroup) revealGroup.onResolved(id);
       } catch (err) {
         finalizeError(err);
@@ -995,6 +1189,8 @@ function Show(props) {
       return child;
     }
     return props.fallback;
+  }, {
+    sync: true
   });
 }
 function Switch(props) {
@@ -1012,6 +1208,8 @@ function Switch(props) {
       }
     }
     return props.fallback;
+  }, {
+    sync: true
   });
 }
 function Match(props) {
@@ -1201,4 +1399,4 @@ function Reveal(props) {
 
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createRevealOrder, 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, Reveal, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createOwner, createProjection, createReaction, createRenderEffect, createRevealOrder, createRoot, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getNextChildId, getObserver, getOwner, isDisposed, isPending, isRefreshing, latest, lazy, mapArray, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, sharedConfig, ssrHandleError, untrack, useContext };

package/dist/solid.cjs

@@ -24,7 +24,8 @@ function children(fn) {
     lazy: true
   });
   const memo = signals.createMemo(() => signals.flatten(c()), {
-    lazy: true
+    lazy: true,
+    sync: true
   });
   memo.toArray = () => {
     const v = memo();
@@ -741,7 +742,9 @@ function lazy(fn, moduleUrl) {
     let Comp;
     return signals.createMemo(() => (Comp = comp()) ? signals.untrack(() => {
       return Comp(props);
-    }) : "");
+    }) : "", {
+      sync: true
+    });
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   wrap.moduleUrl = moduleUrl;
@@ -773,7 +776,8 @@ function Show(props) {
   const keyed = props.keyed;
   const conditionValue = signals.createMemo(() => props.when, undefined);
   const condition = keyed ? conditionValue : signals.createMemo(conditionValue, {
-    equals: (a, b) => !a === !b
+    equals: (a, b) => !a === !b,
+    sync: true
   });
   return signals.createMemo(() => {
     const c = condition();
@@ -786,7 +790,9 @@ function Show(props) {
       }), IS_DEV) : child;
     }
     return props.fallback;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -799,11 +805,14 @@ function Switch(props) {
       const prevFunc = func;
       const conditionValue = signals.createMemo(() => prevFunc() ? undefined : mp.when, undefined);
       const condition = mp.keyed ? conditionValue : signals.createMemo(conditionValue, {
-        equals: (a, b) => !a === !b
+        equals: (a, b) => !a === !b,
+        sync: true
       });
       func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
     }
     return func;
+  }, {
+    sync: true
   });
   return signals.createMemo(() => {
     const sel = switchFunc()();
@@ -815,7 +824,9 @@ function Switch(props) {
       if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Match(props) {
   return props;
@@ -840,7 +851,6 @@ function Reveal(props) {
 }
 
 function ssrHandleError() {}
-function ssrRunInScope() {}
 const DEV = undefined;
 
 Object.defineProperty(exports, "$PROXY", {
@@ -1022,5 +1032,4 @@ exports.enableHydration = enableHydration;
 exports.lazy = lazy;
 exports.sharedConfig = sharedConfig;
 exports.ssrHandleError = ssrHandleError;
-exports.ssrRunInScope = ssrRunInScope;
 exports.useContext = useContext;

package/dist/solid.js

@@ -23,7 +23,8 @@ function children(fn) {
     lazy: true
   });
   const memo = createMemo$1(() => flatten(c()), {
-    lazy: true
+    lazy: true,
+    sync: true
   });
   memo.toArray = () => {
     const v = memo();
@@ -740,7 +741,9 @@ function lazy(fn, moduleUrl) {
     let Comp;
     return createMemo$1(() => (Comp = comp()) ? untrack(() => {
       return Comp(props);
-    }) : "");
+    }) : "", {
+      sync: true
+    });
   };
   wrap.preload = () => p || ((p = fn()).then(mod => comp = () => mod.default), p);
   wrap.moduleUrl = moduleUrl;
@@ -772,7 +775,8 @@ function Show(props) {
   const keyed = props.keyed;
   const conditionValue = createMemo$1(() => props.when, undefined);
   const condition = keyed ? conditionValue : createMemo$1(conditionValue, {
-    equals: (a, b) => !a === !b
+    equals: (a, b) => !a === !b,
+    sync: true
   });
   return createMemo$1(() => {
     const c = condition();
@@ -785,7 +789,9 @@ function Show(props) {
       }), IS_DEV) : child;
     }
     return props.fallback;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Switch(props) {
   const chs = children(() => props.children);
@@ -798,11 +804,14 @@ function Switch(props) {
       const prevFunc = func;
       const conditionValue = createMemo$1(() => prevFunc() ? undefined : mp.when, undefined);
       const condition = mp.keyed ? conditionValue : createMemo$1(conditionValue, {
-        equals: (a, b) => !a === !b
+        equals: (a, b) => !a === !b,
+        sync: true
       });
       func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
     }
     return func;
+  }, {
+    sync: true
   });
   return createMemo$1(() => {
     const sel = switchFunc()();
@@ -814,7 +823,9 @@ function Switch(props) {
       if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;
-  }, undefined);
+  }, {
+    sync: true
+  });
 }
 function Match(props) {
   return props;
@@ -839,7 +850,6 @@ function Reveal(props) {
 }
 
 function ssrHandleError() {}
-function ssrRunInScope() {}
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, children, createComponent, createContext, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, DEV, Errored, For, Hydration, Loading, Match, NoHydrateContext, NoHydration, Repeat, Reveal, Show, Switch, children, createComponent, createContext, createEffect, createErrorBoundary, createLoadingBoundary, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, useContext };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "Reactive JavaScript library for building user interfaces. Compiles JSX to real DOM with fine-grained signal-based updates — no virtual DOM.",
-  "version": "2.0.0-beta.10",
+  "version": "2.0.0-beta.11",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -107,7 +107,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^2.0.0-beta.10",
+    "@solidjs/signals": "^2.0.0-beta.11",
     "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, createRenderEffect as coreRenderEffect, createEffect as coreEffect, type Accessor, type ComputeFunction, type MemoOptions, type NoInfer, type ProjectionOptions, type Refreshable, type Signal, type SignalOptions, type Store, type StoreSetter, type Context } from "@solidjs/signals";
+import { createErrorBoundary as coreErrorBoundary, createRenderEffect as coreRenderEffect, createEffect as coreEffect, type ComputeFunction, type MemoOptions, type NoInfer, type ProjectionOptions, type Refreshable, type Signal, type SignalOptions, type SourceAccessor, type Store, type StoreSetter, type Context } from "@solidjs/signals";
 import type { Element as SolidElement } from "../types.js";
 type HydrationSsrFields = {
     /**
@@ -34,11 +34,12 @@ declare module "@solidjs/signals" {
     }
     interface EffectOptions extends HydrationSsrFields {
     }
+    interface ProjectionOptions extends HydrationSsrFields {
+    }
 }
 /**
  * Options for `createProjection`, `createStore(fn, ...)`, and
- * `createOptimisticStore(fn, ...)` — `ProjectionOptions` plus a
- * hydration-aware `ssrSource` field.
+ * `createOptimisticStore(fn, ...)`.
  *
  * `ssrSource` controls what initial value the client uses and whether
  * the projection's compute re-runs:
@@ -52,9 +53,6 @@ declare module "@solidjs/signals" {
  *
  * See {@link HydrationSsrFields} for the fuller explanation.
  */
-export type HydrationProjectionOptions = ProjectionOptions & {
-    ssrSource?: "server" | "hybrid" | "client";
-};
 type HydrationClientMemoOptions<T> = Omit<MemoOptions<T>, "ssrSource"> & {
     ssrSource: "client";
 };
@@ -157,8 +155,8 @@ export declare function enableHydration(): void;
  * @description https://docs.solidjs.com/reference/basic-reactivity/create-memo
  */
 export declare const createMemo: {
-    <T>(compute: ComputeFunction<undefined | NoInfer<T>, T>, options: HydrationClientMemoOptions<T>): Accessor<T | undefined>;
-    <T>(compute: ComputeFunction<undefined | NoInfer<T>, T>, options?: HydrationMemoOptions<T>): Accessor<T>;
+    <T>(compute: ComputeFunction<undefined | NoInfer<T>, T>, options: HydrationClientMemoOptions<T>): SourceAccessor<T | undefined>;
+    <T>(compute: ComputeFunction<undefined | NoInfer<T>, T>, options?: HydrationMemoOptions<T>): SourceAccessor<T>;
 };
 /**
  * Creates a simple reactive state with a getter and setter.
@@ -302,11 +300,11 @@ export declare const createOptimistic: {
  * );
  * ```
  *
- * **Hydration:** {@link HydrationProjectionOptions} adds `ssrSource`
+ * **Hydration:** `ProjectionOptions` accepts an `ssrSource` field
  * (`"server"` | `"hybrid"` | `"client"`) for the same client-vs-server
  * tradeoffs as the other primitives. See {@link HydrationSsrFields}.
  */
-export declare const createProjection: <T extends object = {}>(fn: (draft: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, initialValue: T, options?: HydrationProjectionOptions) => Refreshable<Store<T>>;
+export declare const createProjection: <T extends object = {}>(fn: (draft: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, initialValue: T, options?: ProjectionOptions) => Refreshable<Store<T>>;
 type NoFn<T> = T extends Function ? never : T;
 /**
  * Creates a deeply-reactive store backed by a Proxy. Reads track each
@@ -362,15 +360,15 @@ type NoFn<T> = T extends Function ? never : T;
  * );
  * ```
  *
- * **Hydration:** the derived form accepts
- * {@link HydrationProjectionOptions}, which adds an `ssrSource` field
+ * **Hydration:** the derived form accepts `ProjectionOptions`, including
+ * an `ssrSource` field
  * (`"server"` | `"hybrid"` | `"client"`). See {@link HydrationSsrFields}.
  *
  * @returns `[store: Store<T>, setStore: StoreSetter<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: Refreshable<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?: ProjectionOptions): [get: Refreshable<Store<T>>, set: StoreSetter<T>];
 };
 /**
  * The store equivalent of `createOptimistic`. Writes inside an
@@ -412,15 +410,15 @@ export declare const createStore: {
  * });
  * ```
  *
- * **Hydration:** the derived form accepts
- * {@link HydrationProjectionOptions}, which adds an `ssrSource` field
+ * **Hydration:** the derived form accepts `ProjectionOptions`, including
+ * an `ssrSource` field
  * (`"server"` | `"hybrid"` | `"client"`). See {@link HydrationSsrFields}.
  *
  * @returns `[store: Store<T>, setStore: 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: Refreshable<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?: ProjectionOptions): [get: Refreshable<Store<T>>, set: StoreSetter<T>];
 };
 /**
  * Creates a reactive computation that runs during the render phase as

package/types/index.d.ts

@@ -1,5 +1,5 @@
 export { $PROXY, $REFRESH, $TRACK, action, createOwner, createReaction, createRevealOrder, createRoot, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isDisposed, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, latest, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, enableExternalSource, enforceLoadingBoundary, snapshot, storePath, untrack } from "@solidjs/signals";
-export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, Merge, NoInfer, NotWrappable, Omit, Owner, Refreshable, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
+export type { Accessor, ComputeFunction, EffectBundle, EffectFunction, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, Merge, MemoOptions, NoInfer, NotWrappable, Omit, Owner, ProjectionOptions, Refreshable, Signal, SignalOptions, SourceAccessor, Setter, Store, StoreOptions, 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, ResolvedElement } from "./client/core.js";
 export * from "./client/component.js";
@@ -8,8 +8,6 @@ export type { ArrayElement, Element } from "./types.js";
 export { sharedConfig, enableHydration, createErrorBoundary, createLoadingBoundary, createMemo, createSignal, createStore, createProjection, createOptimistic, createOptimisticStore, createRenderEffect, createEffect, NoHydration, Hydration, NoHydrateContext } from "./client/hydration.js";
 /** @internal */
 export declare function ssrHandleError(): void;
-/** @internal */
-export declare function ssrRunInScope(): void;
 import { type Dev } from "@solidjs/signals";
 export declare const DEV: Dev | undefined;
 declare global {