solid-js 2.0.0-experimental.15 → 2.0.0-experimental.16

package/dist/dev.cjs

@@ -19,13 +19,16 @@ function useContext(context) {
   return signals.getContext(context);
 }
 function children(fn) {
-  const children = signals.createMemo(fn);
-  const memo = signals.createMemo(() => signals.flatten(children()), undefined, {
-    name: "children"
-  }) ;
+  const c = signals.createMemo(fn, undefined, {
+    lazy: true
+  });
+  const memo = signals.createMemo(() => signals.flatten(c()), undefined, {
+    name: "children",
+    lazy: true
+  } );
   memo.toArray = () => {
-    const c = memo();
-    return Array.isArray(c) ? c : c != null ? [c] : [];
+    const v = memo();
+    return Array.isArray(v) ? v : v != null ? [v] : [];
   };
   return memo;
 }
@@ -90,6 +93,7 @@ function drainHydrationCallbacks() {
   _hydrationEndCallbacks = null;
   if (cbs) for (const cb of cbs) cb();
   setTimeout(() => {
+    if (sharedConfig.verifyHydration) sharedConfig.verifyHydration();
     if (globalThis._$HY) globalThis._$HY.done = true;
   });
 }
@@ -105,6 +109,8 @@ let _createOptimistic;
 let _createProjection;
 let _createStore;
 let _createOptimisticStore;
+let _createRenderEffect;
+let _createEffect;
 class MockPromise {
   static all() {
     return new MockPromise();
@@ -385,6 +391,47 @@ function hydratedCreateProjection(fn, initialValue, options) {
   if (aiResult !== null) return aiResult[0];
   return signals.createProjection(wrapStoreFn(fn, ssrSource), initialValue, options);
 }
+function hydratedEffect(coreFn, compute, effectFn, value, options) {
+  if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
+  const ssrSource = options?.ssrSource;
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = signals.createSignal(false);
+    let active = false;
+    coreFn(prev => {
+      if (!hydrated()) return value;
+      active = true;
+      return compute(prev);
+    }, (next, prev) => {
+      if (!active) return;
+      return effectFn(next, prev);
+    }, value, options);
+    setHydrated(true);
+    return;
+  }
+  if (ssrSource === "initial") {
+    coreFn(prev => {
+      if (!sharedConfig.hydrating) return compute(prev);
+      subFetch(compute, prev);
+      return prev ?? value;
+    }, effectFn, value, options);
+    return;
+  }
+  markTopLevelSnapshotScope();
+  coreFn(prev => {
+    const o = signals.getOwner();
+    if (!sharedConfig.hydrating) return compute(prev);
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(compute, prev), init) : compute(prev);
+  }, effectFn, value, options);
+}
+function hydratedCreateRenderEffect(compute, effectFn, value, options) {
+  return hydratedEffect(signals.createRenderEffect, compute, effectFn, value, options);
+}
+function hydratedCreateEffect(compute, effectFn, value, options) {
+  return hydratedEffect(signals.createEffect, compute, effectFn, value, options);
+}
 function enableHydration() {
   _createMemo = hydratedCreateMemo;
   _createSignal = hydratedCreateSignal;
@@ -393,6 +440,8 @@ function enableHydration() {
   _createProjection = hydratedCreateProjection;
   _createStore = hydratedCreateStore;
   _createOptimisticStore = hydratedCreateOptimisticStore;
+  _createRenderEffect = hydratedCreateRenderEffect;
+  _createEffect = hydratedCreateEffect;
   _hydratingValue = sharedConfig.hydrating;
   _doneValue = sharedConfig.done;
   Object.defineProperty(sharedConfig, "hydrating", {
@@ -438,6 +487,8 @@ const createOptimistic = (...args) => (_createOptimistic || signals.createOptimi
 const createProjection = (...args) => (_createProjection || signals.createProjection)(...args);
 const createStore = (...args) => (_createStore || signals.createStore)(...args);
 const createOptimisticStore = (...args) => (_createOptimisticStore || signals.createOptimisticStore)(...args);
+const createRenderEffect = (...args) => (_createRenderEffect || signals.createRenderEffect)(...args);
+const createEffect = (...args) => (_createEffect || signals.createEffect)(...args);
 function loadModuleAssets(mapping) {
   const hy = globalThis._$HY;
   if (!hy) return;
@@ -702,18 +753,14 @@ Object.defineProperty(exports, "action", {
   enumerable: true,
   get: function () { return signals.action; }
 });
-Object.defineProperty(exports, "createEffect", {
+Object.defineProperty(exports, "createOwner", {
   enumerable: true,
-  get: function () { return signals.createEffect; }
+  get: function () { return signals.createOwner; }
 });
 Object.defineProperty(exports, "createReaction", {
   enumerable: true,
   get: function () { return signals.createReaction; }
 });
-Object.defineProperty(exports, "createRenderEffect", {
-  enumerable: true,
-  get: function () { return signals.createRenderEffect; }
-});
 Object.defineProperty(exports, "createRoot", {
   enumerable: true,
   get: function () { return signals.createRoot; }
@@ -734,6 +781,10 @@ Object.defineProperty(exports, "flush", {
   enumerable: true,
   get: function () { return signals.flush; }
 });
+Object.defineProperty(exports, "getNextChildId", {
+  enumerable: true,
+  get: function () { return signals.getNextChildId; }
+});
 Object.defineProperty(exports, "getObserver", {
   enumerable: true,
   get: function () { return signals.getObserver; }
@@ -758,6 +809,10 @@ Object.defineProperty(exports, "isWrappable", {
   enumerable: true,
   get: function () { return signals.isWrappable; }
 });
+Object.defineProperty(exports, "latest", {
+  enumerable: true,
+  get: function () { return signals.latest; }
+});
 Object.defineProperty(exports, "mapArray", {
   enumerable: true,
   get: function () { return signals.mapArray; }
@@ -778,10 +833,6 @@ Object.defineProperty(exports, "onSettled", {
   enumerable: true,
   get: function () { return signals.onSettled; }
 });
-Object.defineProperty(exports, "pending", {
-  enumerable: true,
-  get: function () { return signals.pending; }
-});
 Object.defineProperty(exports, "reconcile", {
   enumerable: true,
   get: function () { return signals.reconcile; }
@@ -806,6 +857,10 @@ Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }
 });
+Object.defineProperty(exports, "storePath", {
+  enumerable: true,
+  get: function () { return signals.storePath; }
+});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return signals.untrack; }
@@ -822,10 +877,12 @@ exports.Switch = Switch;
 exports.children = children;
 exports.createComponent = createComponent;
 exports.createContext = createContext;
+exports.createEffect = createEffect;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;
 exports.createProjection = createProjection;
+exports.createRenderEffect = createRenderEffect;
 exports.createSignal = createSignal;
 exports.createStore = createStore;
 exports.createUniqueId = createUniqueId;

package/dist/dev.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, setStrictRead, createLoadBoundary, onCleanup, isDisposed, runWithOwner, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$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, createEffect, createReaction, createRenderEffect, createRoot, createTrackedEffect, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, mapArray, merge, omit, onCleanup, onSettled, pending, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, untrack } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, getOwner, createRoot, setContext, untrack, setStrictRead, createLoadBoundary, onCleanup, isDisposed, runWithOwner, 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';
 
 const $DEVCOMP = Symbol("COMPONENT_DEV" );
 function createContext(defaultValue, options) {
@@ -18,13 +18,16 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const children = createMemo$1(fn);
-  const memo = createMemo$1(() => flatten(children()), undefined, {
-    name: "children"
-  }) ;
+  const c = createMemo$1(fn, undefined, {
+    lazy: true
+  });
+  const memo = createMemo$1(() => flatten(c()), undefined, {
+    name: "children",
+    lazy: true
+  } );
   memo.toArray = () => {
-    const c = memo();
-    return Array.isArray(c) ? c : c != null ? [c] : [];
+    const v = memo();
+    return Array.isArray(v) ? v : v != null ? [v] : [];
   };
   return memo;
 }
@@ -89,6 +92,7 @@ function drainHydrationCallbacks() {
   _hydrationEndCallbacks = null;
   if (cbs) for (const cb of cbs) cb();
   setTimeout(() => {
+    if (sharedConfig.verifyHydration) sharedConfig.verifyHydration();
     if (globalThis._$HY) globalThis._$HY.done = true;
   });
 }
@@ -104,6 +108,8 @@ let _createOptimistic;
 let _createProjection;
 let _createStore;
 let _createOptimisticStore;
+let _createRenderEffect;
+let _createEffect;
 class MockPromise {
   static all() {
     return new MockPromise();
@@ -384,6 +390,47 @@ function hydratedCreateProjection(fn, initialValue, options) {
   if (aiResult !== null) return aiResult[0];
   return createProjection$1(wrapStoreFn(fn, ssrSource), initialValue, options);
 }
+function hydratedEffect(coreFn, compute, effectFn, value, options) {
+  if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
+  const ssrSource = options?.ssrSource;
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = createSignal$1(false);
+    let active = false;
+    coreFn(prev => {
+      if (!hydrated()) return value;
+      active = true;
+      return compute(prev);
+    }, (next, prev) => {
+      if (!active) return;
+      return effectFn(next, prev);
+    }, value, options);
+    setHydrated(true);
+    return;
+  }
+  if (ssrSource === "initial") {
+    coreFn(prev => {
+      if (!sharedConfig.hydrating) return compute(prev);
+      subFetch(compute, prev);
+      return prev ?? value;
+    }, effectFn, value, options);
+    return;
+  }
+  markTopLevelSnapshotScope();
+  coreFn(prev => {
+    const o = getOwner();
+    if (!sharedConfig.hydrating) return compute(prev);
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(compute, prev), init) : compute(prev);
+  }, effectFn, value, options);
+}
+function hydratedCreateRenderEffect(compute, effectFn, value, options) {
+  return hydratedEffect(createRenderEffect$1, compute, effectFn, value, options);
+}
+function hydratedCreateEffect(compute, effectFn, value, options) {
+  return hydratedEffect(createEffect$1, compute, effectFn, value, options);
+}
 function enableHydration() {
   _createMemo = hydratedCreateMemo;
   _createSignal = hydratedCreateSignal;
@@ -392,6 +439,8 @@ function enableHydration() {
   _createProjection = hydratedCreateProjection;
   _createStore = hydratedCreateStore;
   _createOptimisticStore = hydratedCreateOptimisticStore;
+  _createRenderEffect = hydratedCreateRenderEffect;
+  _createEffect = hydratedCreateEffect;
   _hydratingValue = sharedConfig.hydrating;
   _doneValue = sharedConfig.done;
   Object.defineProperty(sharedConfig, "hydrating", {
@@ -437,6 +486,8 @@ const createOptimistic = (...args) => (_createOptimistic || createOptimistic$1)(
 const createProjection = (...args) => (_createProjection || createProjection$1)(...args);
 const createStore = (...args) => (_createStore || createStore$1)(...args);
 const createOptimisticStore = (...args) => (_createOptimisticStore || createOptimisticStore$1)(...args);
+const createRenderEffect = (...args) => (_createRenderEffect || createRenderEffect$1)(...args);
+const createEffect = (...args) => (_createEffect || createEffect$1)(...args);
 function loadModuleAssets(mapping) {
   const hy = globalThis._$HY;
   if (!hy) return;
@@ -685,4 +736,4 @@ if (globalThis) {
   if (!globalThis.Solid$$) globalThis.Solid$$ = true;else console.warn("You appear to have multiple instances of Solid. This can lead to unexpected behavior.");
 }
 
-export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createMemo, createOptimistic, createOptimisticStore, createProjection, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };

package/dist/server.cjs

@@ -220,25 +220,42 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
   }
   comp.value = result;
 }
-function createEffect(compute, effect, value, options) {
-  const o = signals.getOwner();
-  if (o?.id != null) signals.getNextChildId(o);
-}
-function createRenderEffect(compute, effectFn, value, options) {
+function serverEffect(compute, effectFn, value, options) {
+  const ssrSource = options?.ssrSource;
+  if (ssrSource === "client" || ssrSource === "initial") {
+    signals.createOwner();
+    return;
+  }
+  const ctx = sharedConfig.context;
   const owner = signals.createOwner();
+  const comp = {
+    owner,
+    value: value,
+    compute: compute,
+    error: undefined,
+    computed: true,
+    disposed: false
+  };
+  if (ssrSource) {
+    signals.runWithOwner(owner, () => signals.onCleanup(() => {
+      comp.disposed = true;
+    }));
+  }
   try {
-    const result = signals.runWithOwner(owner, () => runWithObserver({
-      owner,
-      value: value,
-      compute: compute,
-      error: undefined,
-      computed: true,
-      disposed: false
-    }, () => compute(value)));
-    effectFn(result, value);
+    const result = signals.runWithOwner(owner, () => runWithObserver(comp, () => compute(value)));
+    if (ssrSource) {
+      processResult(comp, result, owner, ctx, options?.deferStream, ssrSource);
+    }
+    effectFn?.(ssrSource ? comp.value ?? result : result, value);
   } catch (err) {
   }
 }
+function createEffect(compute, effect, value, options) {
+  serverEffect(compute, undefined, value, options);
+}
+function createRenderEffect(compute, effectFn, value, options) {
+  serverEffect(compute, effectFn, value, options);
+}
 function createTrackedEffect(compute, options) {
   const o = signals.getOwner();
   if (o?.id != null) signals.getNextChildId(o);
@@ -434,12 +451,23 @@ function mapArray(list, mapFn, options = {}) {
   };
 }
 function repeat(count, mapFn, options = {}) {
+  const owner = signals.createOwner();
   const len = count();
   const offset = options.from?.() || 0;
   let s = [];
   if (len) {
-    for (let i = 0; i < len; i++) s.push(mapFn(i + offset));
-  } else if (options.fallback) s = [options.fallback()];
+    signals.runWithOwner(owner, () => {
+      for (let i = 0; i < len; i++) {
+        const itemOwner = signals.createOwner();
+        s.push(signals.runWithOwner(itemOwner, () => mapFn(i + offset)));
+      }
+    });
+  } else if (options.fallback) {
+    s = [signals.runWithOwner(owner, () => {
+      const fo = signals.createOwner();
+      return signals.runWithOwner(fo, () => options.fallback());
+    })];
+  }
   return () => s;
 }
 const ErrorContext = {
@@ -449,6 +477,9 @@ const ErrorContext = {
 function createErrorBoundary(fn, fallback) {
   const ctx = sharedConfig.context;
   const owner = signals.createOwner();
+  const parent = signals.getOwner();
+  if (parent?.id != null) signals.getNextChildId(parent);
+  owner.id = owner.id + "0";
   return signals.runWithOwner(owner, () => {
     let result;
     signals.setContext(ErrorContext, err => {
@@ -493,7 +524,7 @@ function isPending(fn, fallback) {
     throw err;
   }
 }
-function pending(fn) {
+function latest(fn) {
   return fn();
 }
 function isRefreshing() {
@@ -527,20 +558,20 @@ function useContext(context) {
   return signals.getContext(context);
 }
 function children(fn) {
-  const childrenMemo = createMemo(fn);
-  const memo = createMemo(() => signals.flatten(childrenMemo()));
+  const c = createMemo(fn, undefined, {
+    lazy: true
+  });
+  const memo = createMemo(() => signals.flatten(c()), undefined, {
+    lazy: true
+  });
   memo.toArray = () => {
-    const c = memo();
-    return Array.isArray(c) ? c : c != null ? [c] : [];
+    const v = memo();
+    return Array.isArray(v) ? v : v != null ? [v] : [];
   };
   return memo;
 }
 function ssrRunInScope(fn) {
-  if (Array.isArray(fn)) {
-    const o = signals.createOwner();
-    return fn.map(f => signals.runWithOwner.bind(null, o, f));
-  }
-  return signals.runWithOwner.bind(null, signals.createOwner(), fn);
+  return fn;
 }
 
 function enableHydration() {}
@@ -608,20 +639,27 @@ function Repeat(props) {
   return repeat(() => props.count, index => typeof props.children === "function" ? props.children(index) : props.children, options);
 }
 function Show(props) {
-  const when = props.when;
-  if (when) {
-    const child = props.children;
-    if (typeof child === "function" && child.length > 0) {
-      return child(() => when);
-    }
-    return child;
+  const o = signals.getOwner();
+  if (o?.id != null) {
+    signals.getNextChildId(o);
+    if (!props.keyed) signals.getNextChildId(o);
   }
-  return props.fallback;
+  return createMemo(() => {
+    const when = props.when;
+    if (when) {
+      const child = props.children;
+      if (typeof child === "function" && child.length > 0) {
+        return child(() => when);
+      }
+      return child;
+    }
+    return props.fallback;
+  });
 }
 function Switch(props) {
   const chs = children(() => props.children);
   const o = signals.getOwner();
-  if (o) signals.getNextChildId(o);
+  if (o?.id != null) signals.getNextChildId(o);
   return createMemo(() => {
     let conds = chs();
     if (!Array.isArray(conds)) conds = [conds];
@@ -743,6 +781,10 @@ Object.defineProperty(exports, "NotReadyError", {
   enumerable: true,
   get: function () { return signals.NotReadyError; }
 });
+Object.defineProperty(exports, "createOwner", {
+  enumerable: true,
+  get: function () { return signals.createOwner; }
+});
 Object.defineProperty(exports, "createRoot", {
   enumerable: true,
   get: function () { return signals.createRoot; }
@@ -751,6 +793,10 @@ Object.defineProperty(exports, "flatten", {
   enumerable: true,
   get: function () { return signals.flatten; }
 });
+Object.defineProperty(exports, "getNextChildId", {
+  enumerable: true,
+  get: function () { return signals.getNextChildId; }
+});
 Object.defineProperty(exports, "getOwner", {
   enumerable: true,
   get: function () { return signals.getOwner; }
@@ -783,6 +829,10 @@ Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }
 });
+Object.defineProperty(exports, "storePath", {
+  enumerable: true,
+  get: function () { return signals.storePath; }
+});
 exports.$DEVCOMP = $DEVCOMP;
 exports.DEV = DEV;
 exports.Errored = Errored;
@@ -814,10 +864,10 @@ exports.flush = flush;
 exports.getObserver = getObserver;
 exports.isPending = isPending;
 exports.isRefreshing = isRefreshing;
+exports.latest = latest;
 exports.lazy = lazy;
 exports.mapArray = mapArray;
 exports.onSettled = onSettled;
-exports.pending = pending;
 exports.reconcile = reconcile;
 exports.refresh = refresh;
 exports.repeat = repeat;

package/dist/server.js

@@ -1,5 +1,5 @@
-import { getOwner, getNextChildId, createOwner, runWithOwner, onCleanup, NotReadyError, isWrappable, setContext, getContext, createRoot, flatten } from '@solidjs/signals';
-export { $PROXY, $TRACK, NotReadyError, createRoot, flatten, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot } from '@solidjs/signals';
+import { getOwner, getNextChildId, createOwner, runWithOwner, onCleanup, NotReadyError, isWrappable, setContext, getContext, flatten, createRoot } from '@solidjs/signals';
+export { $PROXY, $TRACK, NotReadyError, createOwner, createRoot, flatten, getNextChildId, getOwner, isEqual, isWrappable, merge, omit, onCleanup, runWithOwner, snapshot, storePath } from '@solidjs/signals';
 
 const sharedConfig = {
   getNextContextId() {
@@ -219,25 +219,42 @@ function processResult(comp, result, owner, ctx, deferStream, ssrSource) {
   }
   comp.value = result;
 }
-function createEffect(compute, effect, value, options) {
-  const o = getOwner();
-  if (o?.id != null) getNextChildId(o);
-}
-function createRenderEffect(compute, effectFn, value, options) {
+function serverEffect(compute, effectFn, value, options) {
+  const ssrSource = options?.ssrSource;
+  if (ssrSource === "client" || ssrSource === "initial") {
+    createOwner();
+    return;
+  }
+  const ctx = sharedConfig.context;
   const owner = createOwner();
+  const comp = {
+    owner,
+    value: value,
+    compute: compute,
+    error: undefined,
+    computed: true,
+    disposed: false
+  };
+  if (ssrSource) {
+    runWithOwner(owner, () => onCleanup(() => {
+      comp.disposed = true;
+    }));
+  }
   try {
-    const result = runWithOwner(owner, () => runWithObserver({
-      owner,
-      value: value,
-      compute: compute,
-      error: undefined,
-      computed: true,
-      disposed: false
-    }, () => compute(value)));
-    effectFn(result, value);
+    const result = runWithOwner(owner, () => runWithObserver(comp, () => compute(value)));
+    if (ssrSource) {
+      processResult(comp, result, owner, ctx, options?.deferStream, ssrSource);
+    }
+    effectFn?.(ssrSource ? comp.value ?? result : result, value);
   } catch (err) {
   }
 }
+function createEffect(compute, effect, value, options) {
+  serverEffect(compute, undefined, value, options);
+}
+function createRenderEffect(compute, effectFn, value, options) {
+  serverEffect(compute, effectFn, value, options);
+}
 function createTrackedEffect(compute, options) {
   const o = getOwner();
   if (o?.id != null) getNextChildId(o);
@@ -433,12 +450,23 @@ function mapArray(list, mapFn, options = {}) {
   };
 }
 function repeat(count, mapFn, options = {}) {
+  const owner = createOwner();
   const len = count();
   const offset = options.from?.() || 0;
   let s = [];
   if (len) {
-    for (let i = 0; i < len; i++) s.push(mapFn(i + offset));
-  } else if (options.fallback) s = [options.fallback()];
+    runWithOwner(owner, () => {
+      for (let i = 0; i < len; i++) {
+        const itemOwner = createOwner();
+        s.push(runWithOwner(itemOwner, () => mapFn(i + offset)));
+      }
+    });
+  } else if (options.fallback) {
+    s = [runWithOwner(owner, () => {
+      const fo = createOwner();
+      return runWithOwner(fo, () => options.fallback());
+    })];
+  }
   return () => s;
 }
 const ErrorContext = {
@@ -448,6 +476,9 @@ const ErrorContext = {
 function createErrorBoundary(fn, fallback) {
   const ctx = sharedConfig.context;
   const owner = createOwner();
+  const parent = getOwner();
+  if (parent?.id != null) getNextChildId(parent);
+  owner.id = owner.id + "0";
   return runWithOwner(owner, () => {
     let result;
     setContext(ErrorContext, err => {
@@ -492,7 +523,7 @@ function isPending(fn, fallback) {
     throw err;
   }
 }
-function pending(fn) {
+function latest(fn) {
   return fn();
 }
 function isRefreshing() {
@@ -526,20 +557,20 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const childrenMemo = createMemo(fn);
-  const memo = createMemo(() => flatten(childrenMemo()));
+  const c = createMemo(fn, undefined, {
+    lazy: true
+  });
+  const memo = createMemo(() => flatten(c()), undefined, {
+    lazy: true
+  });
   memo.toArray = () => {
-    const c = memo();
-    return Array.isArray(c) ? c : c != null ? [c] : [];
+    const v = memo();
+    return Array.isArray(v) ? v : v != null ? [v] : [];
   };
   return memo;
 }
 function ssrRunInScope(fn) {
-  if (Array.isArray(fn)) {
-    const o = createOwner();
-    return fn.map(f => runWithOwner.bind(null, o, f));
-  }
-  return runWithOwner.bind(null, createOwner(), fn);
+  return fn;
 }
 
 function enableHydration() {}
@@ -607,20 +638,27 @@ function Repeat(props) {
   return repeat(() => props.count, index => typeof props.children === "function" ? props.children(index) : props.children, options);
 }
 function Show(props) {
-  const when = props.when;
-  if (when) {
-    const child = props.children;
-    if (typeof child === "function" && child.length > 0) {
-      return child(() => when);
-    }
-    return child;
+  const o = getOwner();
+  if (o?.id != null) {
+    getNextChildId(o);
+    if (!props.keyed) getNextChildId(o);
   }
-  return props.fallback;
+  return createMemo(() => {
+    const when = props.when;
+    if (when) {
+      const child = props.children;
+      if (typeof child === "function" && child.length > 0) {
+        return child(() => when);
+      }
+      return child;
+    }
+    return props.fallback;
+  });
 }
 function Switch(props) {
   const chs = children(() => props.children);
   const o = getOwner();
-  if (o) getNextChildId(o);
+  if (o?.id != null) getNextChildId(o);
   return createMemo(() => {
     let conds = chs();
     if (!Array.isArray(conds)) conds = [conds];
@@ -730,4 +768,4 @@ function Loading(props) {
 
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, lazy, mapArray, onSettled, pending, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };
+export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, action, children, createComponent, createContext, createDeepProxy, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createSignal, createStore, createTrackedEffect, createUniqueId, deep, enableHydration, flush, getObserver, isPending, isRefreshing, latest, lazy, mapArray, onSettled, reconcile, refresh, repeat, resolve, sharedConfig, ssrHandleError, ssrRunInScope, untrack, useContext };

package/dist/solid.cjs

@@ -19,11 +19,15 @@ function useContext(context) {
   return signals.getContext(context);
 }
 function children(fn) {
-  const children = signals.createMemo(fn);
-  const memo = signals.createMemo(() => signals.flatten(children()));
+  const c = signals.createMemo(fn, undefined, {
+    lazy: true
+  });
+  const memo = signals.createMemo(() => signals.flatten(c()), undefined, {
+    lazy: true
+  });
   memo.toArray = () => {
-    const c = memo();
-    return Array.isArray(c) ? c : c != null ? [c] : [];
+    const v = memo();
+    return Array.isArray(v) ? v : v != null ? [v] : [];
   };
   return memo;
 }
@@ -76,6 +80,8 @@ let _createOptimistic;
 let _createProjection;
 let _createStore;
 let _createOptimisticStore;
+let _createRenderEffect;
+let _createEffect;
 class MockPromise {
   static all() {
     return new MockPromise();
@@ -356,6 +362,47 @@ function hydratedCreateProjection(fn, initialValue, options) {
   if (aiResult !== null) return aiResult[0];
   return signals.createProjection(wrapStoreFn(fn, ssrSource), initialValue, options);
 }
+function hydratedEffect(coreFn, compute, effectFn, value, options) {
+  if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
+  const ssrSource = options?.ssrSource;
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = signals.createSignal(false);
+    let active = false;
+    coreFn(prev => {
+      if (!hydrated()) return value;
+      active = true;
+      return compute(prev);
+    }, (next, prev) => {
+      if (!active) return;
+      return effectFn(next, prev);
+    }, value, options);
+    setHydrated(true);
+    return;
+  }
+  if (ssrSource === "initial") {
+    coreFn(prev => {
+      if (!sharedConfig.hydrating) return compute(prev);
+      subFetch(compute, prev);
+      return prev ?? value;
+    }, effectFn, value, options);
+    return;
+  }
+  markTopLevelSnapshotScope();
+  coreFn(prev => {
+    const o = signals.getOwner();
+    if (!sharedConfig.hydrating) return compute(prev);
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(compute, prev), init) : compute(prev);
+  }, effectFn, value, options);
+}
+function hydratedCreateRenderEffect(compute, effectFn, value, options) {
+  return hydratedEffect(signals.createRenderEffect, compute, effectFn, value, options);
+}
+function hydratedCreateEffect(compute, effectFn, value, options) {
+  return hydratedEffect(signals.createEffect, compute, effectFn, value, options);
+}
 function enableHydration() {
   _createMemo = hydratedCreateMemo;
   _createSignal = hydratedCreateSignal;
@@ -364,6 +411,8 @@ function enableHydration() {
   _createProjection = hydratedCreateProjection;
   _createStore = hydratedCreateStore;
   _createOptimisticStore = hydratedCreateOptimisticStore;
+  _createRenderEffect = hydratedCreateRenderEffect;
+  _createEffect = hydratedCreateEffect;
   _hydratingValue = sharedConfig.hydrating;
   _doneValue = sharedConfig.done;
   Object.defineProperty(sharedConfig, "hydrating", {
@@ -409,6 +458,8 @@ const createOptimistic = (...args) => (_createOptimistic || signals.createOptimi
 const createProjection = (...args) => (_createProjection || signals.createProjection)(...args);
 const createStore = (...args) => (_createStore || signals.createStore)(...args);
 const createOptimisticStore = (...args) => (_createOptimisticStore || signals.createOptimisticStore)(...args);
+const createRenderEffect = (...args) => (_createRenderEffect || signals.createRenderEffect)(...args);
+const createEffect = (...args) => (_createEffect || signals.createEffect)(...args);
 function loadModuleAssets(mapping) {
   const hy = globalThis._$HY;
   if (!hy) return;
@@ -646,18 +697,14 @@ Object.defineProperty(exports, "action", {
   enumerable: true,
   get: function () { return signals.action; }
 });
-Object.defineProperty(exports, "createEffect", {
+Object.defineProperty(exports, "createOwner", {
   enumerable: true,
-  get: function () { return signals.createEffect; }
+  get: function () { return signals.createOwner; }
 });
 Object.defineProperty(exports, "createReaction", {
   enumerable: true,
   get: function () { return signals.createReaction; }
 });
-Object.defineProperty(exports, "createRenderEffect", {
-  enumerable: true,
-  get: function () { return signals.createRenderEffect; }
-});
 Object.defineProperty(exports, "createRoot", {
   enumerable: true,
   get: function () { return signals.createRoot; }
@@ -678,6 +725,10 @@ Object.defineProperty(exports, "flush", {
   enumerable: true,
   get: function () { return signals.flush; }
 });
+Object.defineProperty(exports, "getNextChildId", {
+  enumerable: true,
+  get: function () { return signals.getNextChildId; }
+});
 Object.defineProperty(exports, "getObserver", {
   enumerable: true,
   get: function () { return signals.getObserver; }
@@ -702,6 +753,10 @@ Object.defineProperty(exports, "isWrappable", {
   enumerable: true,
   get: function () { return signals.isWrappable; }
 });
+Object.defineProperty(exports, "latest", {
+  enumerable: true,
+  get: function () { return signals.latest; }
+});
 Object.defineProperty(exports, "mapArray", {
   enumerable: true,
   get: function () { return signals.mapArray; }
@@ -722,10 +777,6 @@ Object.defineProperty(exports, "onSettled", {
   enumerable: true,
   get: function () { return signals.onSettled; }
 });
-Object.defineProperty(exports, "pending", {
-  enumerable: true,
-  get: function () { return signals.pending; }
-});
 Object.defineProperty(exports, "reconcile", {
   enumerable: true,
   get: function () { return signals.reconcile; }
@@ -750,6 +801,10 @@ Object.defineProperty(exports, "snapshot", {
   enumerable: true,
   get: function () { return signals.snapshot; }
 });
+Object.defineProperty(exports, "storePath", {
+  enumerable: true,
+  get: function () { return signals.storePath; }
+});
 Object.defineProperty(exports, "untrack", {
   enumerable: true,
   get: function () { return signals.untrack; }
@@ -766,10 +821,12 @@ exports.Switch = Switch;
 exports.children = children;
 exports.createComponent = createComponent;
 exports.createContext = createContext;
+exports.createEffect = createEffect;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;
 exports.createProjection = createProjection;
+exports.createRenderEffect = createRenderEffect;
 exports.createSignal = createSignal;
 exports.createStore = createStore;
 exports.createUniqueId = createUniqueId;

package/dist/solid.js

@@ -1,5 +1,5 @@
-import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadBoundary, getOwner, onCleanup, isDisposed, runWithOwner, createOptimistic as createOptimistic$1, createOptimisticStore as createOptimisticStore$1, createProjection as createProjection$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, createEffect, createReaction, createRenderEffect, createRoot, createTrackedEffect, deep, flatten, flush, getObserver, getOwner, isEqual, isPending, isRefreshing, isWrappable, mapArray, merge, omit, onCleanup, onSettled, pending, reconcile, refresh, repeat, resolve, runWithOwner, snapshot, untrack } from '@solidjs/signals';
+import { getContext, createMemo as createMemo$1, flatten, createRoot, setContext, createLoadBoundary, getOwner, onCleanup, isDisposed, runWithOwner, 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';
 
 const $DEVCOMP = Symbol(0);
 function createContext(defaultValue, options) {
@@ -18,11 +18,15 @@ function useContext(context) {
   return getContext(context);
 }
 function children(fn) {
-  const children = createMemo$1(fn);
-  const memo = createMemo$1(() => flatten(children()));
+  const c = createMemo$1(fn, undefined, {
+    lazy: true
+  });
+  const memo = createMemo$1(() => flatten(c()), undefined, {
+    lazy: true
+  });
   memo.toArray = () => {
-    const c = memo();
-    return Array.isArray(c) ? c : c != null ? [c] : [];
+    const v = memo();
+    return Array.isArray(v) ? v : v != null ? [v] : [];
   };
   return memo;
 }
@@ -75,6 +79,8 @@ let _createOptimistic;
 let _createProjection;
 let _createStore;
 let _createOptimisticStore;
+let _createRenderEffect;
+let _createEffect;
 class MockPromise {
   static all() {
     return new MockPromise();
@@ -355,6 +361,47 @@ function hydratedCreateProjection(fn, initialValue, options) {
   if (aiResult !== null) return aiResult[0];
   return createProjection$1(wrapStoreFn(fn, ssrSource), initialValue, options);
 }
+function hydratedEffect(coreFn, compute, effectFn, value, options) {
+  if (!sharedConfig.hydrating) return coreFn(compute, effectFn, value, options);
+  const ssrSource = options?.ssrSource;
+  if (ssrSource === "client") {
+    const [hydrated, setHydrated] = createSignal$1(false);
+    let active = false;
+    coreFn(prev => {
+      if (!hydrated()) return value;
+      active = true;
+      return compute(prev);
+    }, (next, prev) => {
+      if (!active) return;
+      return effectFn(next, prev);
+    }, value, options);
+    setHydrated(true);
+    return;
+  }
+  if (ssrSource === "initial") {
+    coreFn(prev => {
+      if (!sharedConfig.hydrating) return compute(prev);
+      subFetch(compute, prev);
+      return prev ?? value;
+    }, effectFn, value, options);
+    return;
+  }
+  markTopLevelSnapshotScope();
+  coreFn(prev => {
+    const o = getOwner();
+    if (!sharedConfig.hydrating) return compute(prev);
+    let initP;
+    if (sharedConfig.has(o.id)) initP = sharedConfig.load(o.id);
+    const init = initP?.v ?? initP;
+    return init != null ? (subFetch(compute, prev), init) : compute(prev);
+  }, effectFn, value, options);
+}
+function hydratedCreateRenderEffect(compute, effectFn, value, options) {
+  return hydratedEffect(createRenderEffect$1, compute, effectFn, value, options);
+}
+function hydratedCreateEffect(compute, effectFn, value, options) {
+  return hydratedEffect(createEffect$1, compute, effectFn, value, options);
+}
 function enableHydration() {
   _createMemo = hydratedCreateMemo;
   _createSignal = hydratedCreateSignal;
@@ -363,6 +410,8 @@ function enableHydration() {
   _createProjection = hydratedCreateProjection;
   _createStore = hydratedCreateStore;
   _createOptimisticStore = hydratedCreateOptimisticStore;
+  _createRenderEffect = hydratedCreateRenderEffect;
+  _createEffect = hydratedCreateEffect;
   _hydratingValue = sharedConfig.hydrating;
   _doneValue = sharedConfig.done;
   Object.defineProperty(sharedConfig, "hydrating", {
@@ -408,6 +457,8 @@ const createOptimistic = (...args) => (_createOptimistic || createOptimistic$1)(
 const createProjection = (...args) => (_createProjection || createProjection$1)(...args);
 const createStore = (...args) => (_createStore || createStore$1)(...args);
 const createOptimisticStore = (...args) => (_createOptimisticStore || createOptimisticStore$1)(...args);
+const createRenderEffect = (...args) => (_createRenderEffect || createRenderEffect$1)(...args);
+const createEffect = (...args) => (_createEffect || createEffect$1)(...args);
 function loadModuleAssets(mapping) {
   const hy = globalThis._$HY;
   if (!hy) return;
@@ -629,4 +680,4 @@ function ssrHandleError() {}
 function ssrRunInScope() {}
 const DEV = undefined;
 
-export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createMemo, createOptimistic, createOptimisticStore, createProjection, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };
+export { $DEVCOMP, DEV, Errored, For, Loading, Match, Repeat, Show, Switch, children, createComponent, createContext, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createRenderEffect, createSignal, createStore, createUniqueId, enableHydration, lazy, sharedConfig, ssrHandleError, ssrRunInScope, useContext };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-js",
   "description": "A declarative JavaScript library for building user interfaces.",
-  "version": "2.0.0-experimental.15",
+  "version": "2.0.0-experimental.16",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -79,7 +79,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^0.10.8",
+    "@solidjs/signals": "^0.11.1",
     "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, type ProjectionOptions, type Store, type StoreSetter } from "@solidjs/signals";
+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 } from "@solidjs/signals";
 import { JSX } from "../jsx.js";
 declare module "@solidjs/signals" {
     interface MemoOptions<T> {
@@ -9,6 +9,10 @@ declare module "@solidjs/signals" {
         deferStream?: boolean;
         ssrSource?: "server" | "hybrid" | "initial" | "client";
     }
+    interface EffectOptions {
+        deferStream?: boolean;
+        ssrSource?: "server" | "hybrid" | "initial" | "client";
+    }
 }
 export type HydrationProjectionOptions = ProjectionOptions & {
     ssrSource?: "server" | "hybrid" | "initial" | "client";
@@ -24,6 +28,9 @@ type SharedConfig = {
     gather?: (key: string) => void;
     cleanupFragment?: (id: string) => void;
     registry?: Map<string, Element>;
+    completed?: WeakSet<Element> | null;
+    events?: any[] | null;
+    verifyHydration?: () => void;
     done: boolean;
     getNextContextId(): string;
 };
@@ -49,6 +56,8 @@ 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>];
 };
+export declare const createRenderEffect: typeof coreRenderEffect;
+export declare const createEffect: typeof coreEffect;
 /**
  * Tracks all resources inside a component and renders a fallback until they are all resolved
  * ```typescript

package/types/index.d.ts

@@ -1,10 +1,10 @@
-export { $PROXY, $TRACK, action, createEffect, createReaction, createRenderEffect, createRoot, createTrackedEffect, deep, flatten, flush, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, pending, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, snapshot, untrack } from "@solidjs/signals";
-export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter } from "@solidjs/signals";
+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 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";
 export * from "./client/component.js";
 export * from "./client/flow.js";
-export { sharedConfig, Loading, enableHydration, createMemo, createSignal, createStore, createProjection, createOptimistic, createOptimisticStore } from "./client/hydration.js";
+export { sharedConfig, Loading, enableHydration, createMemo, createSignal, createStore, createProjection, createOptimistic, createOptimisticStore, createRenderEffect, createEffect } from "./client/hydration.js";
 export declare function ssrHandleError(): void;
 export declare function ssrRunInScope(): void;
 import type { JSX } from "./jsx.js";

package/types/jsx.d.ts

@@ -232,40 +232,19 @@ export namespace JSX {
     [SERIALIZABLE]: never;
   }
 
+  type RefCallback<T> = (el: T) => void;
+  type Ref<T> = T | RefCallback<T> | (RefCallback<T> | Ref<T>)[];
+
   interface IntrinsicAttributes {
-    ref?: unknown | ((e: unknown) => void) | undefined;
+    ref?: Ref<unknown> | undefined;
   }
   interface CustomAttributes<T> {
-    ref?: T | ((el: T) => void) | undefined;
+    ref?: Ref<T> | undefined;
     children?: Element | undefined;
     $ServerOnly?: boolean | undefined;
   }
-  type Accessor<T> = () => T;
-  interface Directives {}
-  interface DirectiveFunctions {
-    [x: string]: (el: DOMElement, accessor: Accessor<any>) => void;
-  }
   interface ExplicitProperties {}
   interface CustomEvents {}
-  type DirectiveAttributes = {
-    [Key in keyof Directives as `use:${Key}`]?: Directives[Key];
-  };
-  type DirectiveFunctionAttributes<T> = {
-    [K in keyof DirectiveFunctions as string extends K
-      ? never
-      : `use:${K}`]?: DirectiveFunctions[K] extends (
-      el: infer E, // will be unknown if not provided
-      ...rest: infer R // use rest so that we can check whether it's provided or not
-    ) => void
-      ? T extends E // everything extends unknown if E is unknown
-        ? R extends [infer A] // check if has accessor provided
-          ? A extends Accessor<infer V>
-            ? V // it's an accessor
-            : never // it isn't, type error
-          : true // no accessor provided
-        : never // T is the wrong element
-      : never; // it isn't a function
-  };
   type PropAttributes = {
     [Key in keyof ExplicitProperties as `prop:${Key}`]?: ExplicitProperties[Key];
   };
@@ -1033,8 +1012,6 @@ export namespace JSX {
    */
   interface ElementAttributes<T>
     extends CustomAttributes<T>,
-      DirectiveAttributes,
-      DirectiveFunctionAttributes<T>,
       PropAttributes,
       OnAttributes<T>,
       EventHandlersElement<T>,

package/types/server/core.d.ts

@@ -36,8 +36,9 @@ export type ChildrenReturn = Accessor<ResolvedChildren> & {
  */
 export declare function children(fn: Accessor<JSX.Element>): ChildrenReturn;
 /**
- * Runs functions with an isolated owner scope for SSR.
- * Used by dom-expressions to run event handlers and other code in scope.
+ * Pass-through for SSR dynamic expressions.
+ * On the client, insert() render effects are transparent (0 owner slots),
+ * so the server doesn't need to create owners for these either.
  */
 export declare function ssrRunInScope(fn: () => any): () => any;
 export declare function ssrRunInScope(array: (() => any)[]): (() => any)[];

package/types/server/index.d.ts

@@ -1,5 +1,5 @@
-export { $PROXY, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createProjection, createReaction, createRenderEffect, createRoot, createSignal, createStore, createTrackedEffect, deep, flatten, flush, getObserver, getOwner, isEqual, isRefreshing, isPending, isWrappable, mapArray, merge, omit, onCleanup, onSettled, pending, reconcile, refresh, repeat, resolve, NotReadyError, runWithOwner, snapshot, createDeepProxy, untrack } from "./signals.js";
-export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, Merge, NoInfer, NotWrappable, Omit, Owner, Signal, SignalOptions, Setter, Store, SolidStore, StoreNode, StoreSetter, PatchOp } from "./signals.js";
+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 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";
 export * from "./component.js";

package/types/server/signals.d.ts

@@ -1,7 +1,7 @@
 export { createRoot, createOwner, runWithOwner, getOwner, onCleanup, getNextChildId, createContext, setContext, getContext, NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY } from "@solidjs/signals";
 export { flatten } from "@solidjs/signals";
-export { snapshot, merge, omit, $PROXY, $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 } from "@solidjs/signals";
+export { snapshot, merge, omit, storePath, $PROXY, $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";
 interface ServerComputation<T = any> {
     owner: Owner;
@@ -52,7 +52,7 @@ export declare function untrack<T>(fn: () => T): T;
 export declare function flush(): void;
 export declare function resolve<T>(fn: () => T): Promise<T>;
 export declare function isPending(fn: () => any, fallback?: boolean): boolean;
-export declare function pending<T>(fn: () => T): T;
+export declare function latest<T>(fn: () => T): T;
 export declare function isRefreshing(): boolean;
 export declare function refresh<T>(fn: () => T): T;
 export declare function action<T extends (...args: any[]) => any>(fn: T): T;