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

package/CHEATSHEET.md

@@ -255,12 +255,12 @@ Optimistic writes revert when the transition completes.
 ```tsx
 // List, keyed by identity (default)
 <For each={items()}>
-  {(item, i) => <Row item={item()} index={i()} />}
+  {(item, i) => <Row item={item} index={i()} />}
 </For>
 
 // List, non-keyed (replaces <Index>)
 <For each={items()} keyed={false}>
-  {(item, i) => <Row item={item()} index={i()} />}
+  {(item, i) => <Row item={item()} index={i} />}
 </For>
 
 // List with custom key
@@ -316,7 +316,8 @@ import { Dynamic } from "@solidjs/web";
 <Dynamic component={isEditing() ? Editor : Viewer} value={value()} />
 ```
 
-`<For>` non-keyed: `item` and `i` are **accessors** — call them: `item()`, `i()`.
+`<For>` non-keyed: `item` is an **accessor** and `i` is a plain number.
+`<For>` default/keyed-by-identity: `item` is a **plain value** and `i` is an accessor.
 `<Repeat>`: `i` is a **plain number**.
 
 ---
@@ -618,8 +619,8 @@ If your training data is 1.x, these are the corrections. **Read this before gene
 - **No top-level reactive reads in component body** — reading signals/props directly at the top of a component warns. Read inside JSX, a memo, or `untrack`.
 - **Props are values, not accessors** — at the call site call accessors (`<X v={count()} />`, not `<X v={count} />`). The single most common AI-generated bug.
 - **Don't destructure props** — `function Comp({ name })` warns; use `props.name` to keep reactivity. (Same root cause as above; see the Props section.)
-- **`<For>` non-keyed children are accessors** — `(item, i) => ...` where `item` and `i` are functions. Call them: `item()`, `i()`.
-- **`<Show>` / `<Match>` function children receive narrowed accessors** — also call them.
+- **`<For>` callback shape follows keying** — default/keyed-by-identity receives a raw item and index accessor; `keyed={false}` receives an item accessor and stable numeric index; custom keys receive accessors.
+- **`<Show>` / `<Match>` function children narrow values** — non-keyed children receive accessors; keyed children receive raw values.
 - **Stores: setters take a draft callback** — mutate the draft in place by default. Returning a new value is shallow (array index-replace, object top-level diff); reach for it for filter/remove. Keyed reconcile is a _projection-fn_ feature, not a setter feature.
 - **`undefined` is a real value in `merge`** — it overrides rather than "skip this key".
 - **Async lives in computations** — return a Promise/AsyncIterable from `createMemo`/`createStore(fn)`/`createProjection`. Reads suspend; wrap in `<Loading>`.

package/dist/dev.cjs

@@ -809,7 +809,7 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? signals.untrack(() => child(() => {
+      return fn ? keyed ? signals.untrack(() => child(c), "<Show>") : signals.untrack(() => child(() => {
         if (!signals.untrack(condition)) throw narrowedError("Show");
         return conditionValue();
       }), "<Show>") : child;
@@ -837,7 +837,12 @@ function Switch(props) {
         name: "condition",
         sync: true
       } );
-      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+      func = () => {
+        const prev = prevFunc();
+        if (prev) return prev;
+        const c = condition();
+        return c ? [index, c, conditionValue, mp] : undefined;
+      };
     }
     return func;
   }, {
@@ -846,10 +851,10 @@ function Switch(props) {
   return signals.createMemo(() => {
     const sel = switchFunc()();
     if (!sel) return props.fallback;
-    const [index, conditionValue, mp] = sel;
+    const [index, value, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? signals.untrack(() => child(() => {
+    return fn ? mp.keyed ? signals.untrack(() => child(value), "<Match>") : signals.untrack(() => child(() => {
       if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), "<Match>") : child;

package/dist/dev.js

@@ -808,7 +808,7 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? untrack(() => child(() => {
+      return fn ? keyed ? untrack(() => child(c), "<Show>") : untrack(() => child(() => {
         if (!untrack(condition)) throw narrowedError("Show");
         return conditionValue();
       }), "<Show>") : child;
@@ -836,7 +836,12 @@ function Switch(props) {
         name: "condition",
         sync: true
       } );
-      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+      func = () => {
+        const prev = prevFunc();
+        if (prev) return prev;
+        const c = condition();
+        return c ? [index, c, conditionValue, mp] : undefined;
+      };
     }
     return func;
   }, {
@@ -845,10 +850,10 @@ function Switch(props) {
   return createMemo$1(() => {
     const sel = switchFunc()();
     if (!sel) return props.fallback;
-    const [index, conditionValue, mp] = sel;
+    const [index, value, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? untrack(() => child(() => {
+    return fn ? mp.keyed ? untrack(() => child(value), "<Match>") : untrack(() => child(() => {
       if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), "<Match>") : child;

package/dist/server.cjs

@@ -32,6 +32,9 @@ function nextChildIdFor(owner, consume) {
   }
   throw new Error("Cannot get child id from owner without an id");
 }
+function consumeClientComputedSlot(owner) {
+  if (owner?.id != null) nextChildIdFor(owner);
+}
 function getNextChildId(owner) {
   return nextChildIdFor(owner);
 }
@@ -116,6 +119,7 @@ function disposeOwner(owner, self = true) {
     if (self) {
       node._disposed = true;
       if (ownerPool.length < OWNER_POOL_MAX) {
+        node.id = undefined;
         node._parent = null;
         node._nextSibling = null;
         ownerPool.push(node);
@@ -142,6 +146,7 @@ function disposeOwner(owner, self = true) {
     node._disposal = null;
   }
   if (self && ownerPool.length < OWNER_POOL_MAX) {
+    node.id = undefined;
     node._parent = null;
     node._nextSibling = null;
     ownerPool.push(node);
@@ -744,8 +749,43 @@ function reconcile(value) {
 function deep(store) {
   return store;
 }
+function proxySource(read) {
+  return new Proxy({}, {
+    get(_, property, receiver) {
+      if (property === signals.$PROXY) return receiver;
+      const source = read() || {};
+      return source[property];
+    },
+    has(_, property) {
+      if (property === signals.$PROXY) return true;
+      return property in (read() || {});
+    },
+    ownKeys() {
+      return Object.keys(read() || {});
+    },
+    getOwnPropertyDescriptor(_, property) {
+      return {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return (read() || {})[property];
+        }
+      };
+    }
+  });
+}
+function merge(...sources) {
+  for (let i = 0; i < sources.length; i++) {
+    if (typeof sources[i] === "function") {
+      sources[i] = proxySource(createMemo(sources[i]));
+    }
+  }
+  return signals.merge(...sources);
+}
 function mapArray(list, mapFn, options = {}) {
-  return createMemo(() => {
+  const indexes = mapFn.length > 1;
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const items = list();
     const s = [];
     if (items && items.length) {
@@ -758,7 +798,7 @@ function mapArray(list, mapFn, options = {}) {
             parent.id = formatChildId(origId, origChildCount + i);
           }
           parent._childCount = 0;
-          s.push(mapFn(() => items[i], () => i));
+          s.push(options.keyed === false ? indexes ? mapFn(() => items[i], i) : mapFn(() => items[i]) : typeof options.keyed === "function" ? indexes ? mapFn(() => items[i], () => i) : mapFn(() => items[i]) : indexes ? mapFn(items[i], () => i) : mapFn(items[i]));
         }
       } finally {
         parent.id = origId;
@@ -772,9 +812,12 @@ function mapArray(list, mapFn, options = {}) {
   }, {
     sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 function repeat(count, mapFn, options = {}) {
-  return createMemo(() => {
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const len = count();
     const offset = options.from?.() || 0;
     if (!len) {
@@ -802,6 +845,8 @@ function repeat(count, mapFn, options = {}) {
   }, {
     sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 const ErrorContext = {
   id: Symbol("ErrorContext"),
@@ -1185,7 +1230,7 @@ function Show(props) {
     if (when) {
       const child = props.children;
       if (typeof child === "function" && child.length > 0) {
-        return child(() => when);
+        return props.keyed ? child(when) : child(() => when);
       }
       return child;
     }
@@ -1205,7 +1250,7 @@ function Switch(props) {
       const w = conds[i].when;
       if (w) {
         const c = conds[i].children;
-        return typeof c === "function" && c.length > 0 ? c(() => w) : c;
+        return typeof c === "function" && c.length > 0 ? conds[i].keyed ? c(w) : c(() => w) : c;
       }
     }
     return props.fallback;
@@ -1436,10 +1481,6 @@ Object.defineProperty(exports, "isWrappable", {
   enumerable: true,
   get: function () { return signals.isWrappable; }
 });
-Object.defineProperty(exports, "merge", {
-  enumerable: true,
-  get: function () { return signals.merge; }
-});
 Object.defineProperty(exports, "omit", {
   enumerable: true,
   get: function () { return signals.omit; }
@@ -1498,6 +1539,7 @@ exports.isRefreshing = isRefreshing;
 exports.latest = latest;
 exports.lazy = lazy;
 exports.mapArray = mapArray;
+exports.merge = merge;
 exports.onCleanup = onCleanup;
 exports.onSettled = onSettled;
 exports.reconcile = reconcile;

package/dist/server.js

@@ -1,5 +1,5 @@
-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';
+import { NotReadyError, $REFRESH, merge as merge$1, isWrappable, NoOwnerError, ContextNotFoundError, $PROXY, flatten } from '@solidjs/signals';
+export { $PROXY, $REFRESH, $TRACK, NotReadyError, enableExternalSource, enforceLoadingBoundary, flatten, isEqual, isWrappable, omit, snapshot, storePath } from '@solidjs/signals';
 
 const NoHydrateContext = {
   id: Symbol("NoHydrateContext"),
@@ -31,6 +31,9 @@ function nextChildIdFor(owner, consume) {
   }
   throw new Error("Cannot get child id from owner without an id");
 }
+function consumeClientComputedSlot(owner) {
+  if (owner?.id != null) nextChildIdFor(owner);
+}
 function getNextChildId(owner) {
   return nextChildIdFor(owner);
 }
@@ -115,6 +118,7 @@ function disposeOwner(owner, self = true) {
     if (self) {
       node._disposed = true;
       if (ownerPool.length < OWNER_POOL_MAX) {
+        node.id = undefined;
         node._parent = null;
         node._nextSibling = null;
         ownerPool.push(node);
@@ -141,6 +145,7 @@ function disposeOwner(owner, self = true) {
     node._disposal = null;
   }
   if (self && ownerPool.length < OWNER_POOL_MAX) {
+    node.id = undefined;
     node._parent = null;
     node._nextSibling = null;
     ownerPool.push(node);
@@ -743,8 +748,43 @@ function reconcile(value) {
 function deep(store) {
   return store;
 }
+function proxySource(read) {
+  return new Proxy({}, {
+    get(_, property, receiver) {
+      if (property === $PROXY) return receiver;
+      const source = read() || {};
+      return source[property];
+    },
+    has(_, property) {
+      if (property === $PROXY) return true;
+      return property in (read() || {});
+    },
+    ownKeys() {
+      return Object.keys(read() || {});
+    },
+    getOwnPropertyDescriptor(_, property) {
+      return {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return (read() || {})[property];
+        }
+      };
+    }
+  });
+}
+function merge(...sources) {
+  for (let i = 0; i < sources.length; i++) {
+    if (typeof sources[i] === "function") {
+      sources[i] = proxySource(createMemo(sources[i]));
+    }
+  }
+  return merge$1(...sources);
+}
 function mapArray(list, mapFn, options = {}) {
-  return createMemo(() => {
+  const indexes = mapFn.length > 1;
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const items = list();
     const s = [];
     if (items && items.length) {
@@ -757,7 +797,7 @@ function mapArray(list, mapFn, options = {}) {
             parent.id = formatChildId(origId, origChildCount + i);
           }
           parent._childCount = 0;
-          s.push(mapFn(() => items[i], () => i));
+          s.push(options.keyed === false ? indexes ? mapFn(() => items[i], i) : mapFn(() => items[i]) : typeof options.keyed === "function" ? indexes ? mapFn(() => items[i], () => i) : mapFn(() => items[i]) : indexes ? mapFn(items[i], () => i) : mapFn(items[i]));
         }
       } finally {
         parent.id = origId;
@@ -771,9 +811,12 @@ function mapArray(list, mapFn, options = {}) {
   }, {
     sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 function repeat(count, mapFn, options = {}) {
-  return createMemo(() => {
+  const parent = currentOwner;
+  const read = createMemo(() => {
     const len = count();
     const offset = options.from?.() || 0;
     if (!len) {
@@ -801,6 +844,8 @@ function repeat(count, mapFn, options = {}) {
   }, {
     sync: true
   });
+  consumeClientComputedSlot(parent);
+  return read;
 }
 const ErrorContext = {
   id: Symbol("ErrorContext"),
@@ -1184,7 +1229,7 @@ function Show(props) {
     if (when) {
       const child = props.children;
       if (typeof child === "function" && child.length > 0) {
-        return child(() => when);
+        return props.keyed ? child(when) : child(() => when);
       }
       return child;
     }
@@ -1204,7 +1249,7 @@ function Switch(props) {
       const w = conds[i].when;
       if (w) {
         const c = conds[i].children;
-        return typeof c === "function" && c.length > 0 ? c(() => w) : c;
+        return typeof c === "function" && c.length > 0 ? conds[i].keyed ? c(w) : c(() => w) : c;
       }
     }
     return props.fallback;
@@ -1399,4 +1444,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, 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 };
+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, merge, onCleanup, onSettled, reconcile, refresh, repeat, resolve, runWithOwner, sharedConfig, ssrHandleError, untrack, useContext };

package/dist/solid.cjs

@@ -784,7 +784,7 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? signals.untrack(() => child(() => {
+      return fn ? keyed ? signals.untrack(() => child(c), IS_DEV) : signals.untrack(() => child(() => {
         if (!signals.untrack(condition)) throw narrowedError("Show");
         return conditionValue();
       }), IS_DEV) : child;
@@ -808,7 +808,12 @@ function Switch(props) {
         equals: (a, b) => !a === !b,
         sync: true
       });
-      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+      func = () => {
+        const prev = prevFunc();
+        if (prev) return prev;
+        const c = condition();
+        return c ? [index, c, conditionValue, mp] : undefined;
+      };
     }
     return func;
   }, {
@@ -817,10 +822,10 @@ function Switch(props) {
   return signals.createMemo(() => {
     const sel = switchFunc()();
     if (!sel) return props.fallback;
-    const [index, conditionValue, mp] = sel;
+    const [index, value, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? signals.untrack(() => child(() => {
+    return fn ? mp.keyed ? signals.untrack(() => child(value), IS_DEV) : signals.untrack(() => child(() => {
       if (signals.untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;

package/dist/solid.js

@@ -783,7 +783,7 @@ function Show(props) {
     if (c) {
       const child = props.children;
       const fn = typeof child === "function" && child.length > 0;
-      return fn ? untrack(() => child(() => {
+      return fn ? keyed ? untrack(() => child(c), IS_DEV) : untrack(() => child(() => {
         if (!untrack(condition)) throw narrowedError("Show");
         return conditionValue();
       }), IS_DEV) : child;
@@ -807,7 +807,12 @@ function Switch(props) {
         equals: (a, b) => !a === !b,
         sync: true
       });
-      func = () => prevFunc() || (condition() ? [index, conditionValue, mp] : undefined);
+      func = () => {
+        const prev = prevFunc();
+        if (prev) return prev;
+        const c = condition();
+        return c ? [index, c, conditionValue, mp] : undefined;
+      };
     }
     return func;
   }, {
@@ -816,10 +821,10 @@ function Switch(props) {
   return createMemo$1(() => {
     const sel = switchFunc()();
     if (!sel) return props.fallback;
-    const [index, conditionValue, mp] = sel;
+    const [index, value, conditionValue, mp] = sel;
     const child = mp.children;
     const fn = typeof child === "function" && child.length > 0;
-    return fn ? untrack(() => child(() => {
+    return fn ? mp.keyed ? untrack(() => child(value), IS_DEV) : untrack(() => child(() => {
       if (untrack(switchFunc)()?.[0] !== index) throw narrowedError("Match");
       return conditionValue();
     }), IS_DEV) : child;

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.11",
+  "version": "2.0.0-beta.12",
   "author": "Ryan Carniato",
   "license": "MIT",
   "homepage": "https://solidjs.com",
@@ -107,7 +107,7 @@
     "performance"
   ],
   "dependencies": {
-    "@solidjs/signals": "^2.0.0-beta.11",
+    "@solidjs/signals": "^2.0.0-beta.12",
     "csstype": "^3.1.0",
     "seroval": "~1.5.0",
     "seroval-plugins": "~1.5.0"

package/types/client/flow.d.ts

@@ -3,18 +3,26 @@ export type { RevealOrder };
 import type { Element as SolidElement } from "../types.js";
 type NonZeroParams<T extends (...args: any[]) => any> = Parameters<T>["length"] extends 0 ? never : T;
 type ConditionalRenderCallback<T> = (item: Accessor<NonNullable<T>>) => SolidElement;
+type KeyedConditionalRenderCallback<T> = (item: NonNullable<T>) => SolidElement;
 type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
+type KeyedConditionalRenderChildren<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
 /**
  * Creates a list of elements from a list.
  *
- * Receives a map function as its child that takes list element and index
- * accessors and returns a JSX element; if the list is empty, an optional
- * `fallback` is rendered instead.
+ * Receives a map function as its child and returns a JSX element for each
+ * list item; if the list is empty, an optional `fallback` is rendered instead.
+ *
+ * The child callback shape follows the keying mode:
+ * - default / `keyed={true}` receives `(item, index)` where `item` is the raw
+ *   row value and `index` is an accessor.
+ * - `keyed={false}` receives `(item, index)` where `item` is an accessor and
+ *   `index` is a stable number.
+ * - `keyed={(item) => key}` receives accessors for both arguments.
  *
  * @example
  * ```tsx
  * <For each={items} fallback={<div>No items</div>}>
- *   {(item, index) => <div data-index={index()}>{item()}</div>}
+ *   {(item, index) => <div data-index={index()}>{item.label}</div>}
  * </For>
  * ```
  *
@@ -23,7 +31,19 @@ type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = Condi
 export declare function For<T extends readonly any[], U extends SolidElement>(props: {
     each: T | undefined | null | false;
     fallback?: SolidElement;
-    keyed?: boolean | ((item: T[number]) => any);
+    keyed?: true;
+    children: (item: T[number], index: Accessor<number>) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: false;
+    children: (item: Accessor<T[number]>, index: number) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: (item: T[number]) => any;
     children: (item: Accessor<T[number]>, index: Accessor<number>) => U;
 }): SolidElement;
 /**
@@ -51,10 +71,10 @@ export declare function Repeat<T extends SolidElement>(props: {
  * Conditionally renders its children when `when` is truthy, otherwise renders
  * the optional `fallback`.
  *
- * The function-child form receives an accessor for the narrowed value — call
- * it to read. Without `keyed` (default), the child is preserved across
- * truthy values; with `keyed`, the child remounts whenever the value's
- * identity changes.
+ * The function-child form receives a narrowed value. Without `keyed`
+ * (default), it receives an accessor and the child is preserved across truthy
+ * values; with `keyed`, it receives the raw value and remounts whenever the
+ * value's identity changes.
  *
  * @example
  * ```tsx
@@ -65,11 +85,29 @@ export declare function Repeat<T extends SolidElement>(props: {
  *
  * @description https://docs.solidjs.com/reference/components/show
  */
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
+export declare function Show<T, F extends KeyedConditionalRenderCallback<T>>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: NonZeroParams<F>;
+}): SolidElement;
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
 export declare function Show<T, F extends ConditionalRenderCallback<T>>(props: {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     fallback?: SolidElement;
-    children: ConditionalRenderChildren<T, F>;
+    children: NonZeroParams<F>;
 }): SolidElement;
 /**
  * Switches between content based on mutually exclusive conditions. Renders
@@ -96,15 +134,26 @@ export declare function Switch(props: {
 }): SolidElement;
 export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     children: ConditionalRenderChildren<T, F>;
 };
+export type KeyedMatchProps<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: KeyedConditionalRenderChildren<T, F>;
+};
+export type AnyMatchProps<T> = MatchProps<T> | KeyedMatchProps<T> | {
+    when: T | undefined | null | false;
+    keyed?: boolean;
+    children: SolidElement;
+};
 /**
  * A branch inside a `<Switch>`. The first `<Match>` whose `when` is truthy
  * wins; remaining matches are skipped.
  *
- * Like `<Show>`, `<Match>` supports a function child that receives an
- * accessor for the narrowed value.
+ * Like `<Show>`, `<Match>` supports a function child. Non-keyed children
+ * receive an accessor for the narrowed value; keyed children receive the raw
+ * narrowed value.
  *
  * @example
  * ```tsx
@@ -120,7 +169,19 @@ export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRe
  *
  * @description https://docs.solidjs.com/reference/components/switch-and-match
  */
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: SolidElement;
+}): SolidElement;
+export declare function Match<T, F extends KeyedConditionalRenderCallback<T>>(props: KeyedMatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    children: SolidElement;
+}): SolidElement;
 export declare function Match<T, F extends ConditionalRenderCallback<T>>(props: MatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: AnyMatchProps<T>): SolidElement;
 /**
  * Catches uncaught errors inside its subtree and renders fallback content
  * instead. The `fallback` prop can be a JSX element, or a callback that

package/types/server/flow.d.ts

@@ -3,16 +3,29 @@ import type { Element as SolidElement } from "../types.js";
 export type { RevealOrder };
 type NonZeroParams<T extends (...args: any[]) => any> = Parameters<T>["length"] extends 0 ? never : T;
 type ConditionalRenderCallback<T> = (item: Accessor<NonNullable<T>>) => SolidElement;
+type KeyedConditionalRenderCallback<T> = (item: NonNullable<T>) => SolidElement;
 type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
+type KeyedConditionalRenderChildren<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
 /**
  * Creates a list of elements from a list
- *
  * @description https://docs.solidjs.com/reference/components/for
  */
 export declare function For<T extends readonly any[], U extends SolidElement>(props: {
     each: T | undefined | null | false;
     fallback?: SolidElement;
-    keyed?: boolean | ((item: T[number]) => any);
+    keyed?: true;
+    children: (item: T[number], index: Accessor<number>) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: false;
+    children: (item: Accessor<T[number]>, index: number) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: (item: T[number]) => any;
     children: (item: Accessor<T[number]>, index: Accessor<number>) => U;
 }): SolidElement;
 /**
@@ -30,11 +43,29 @@ export declare function Repeat<T extends SolidElement>(props: {
  * Conditionally render its children or an optional fallback component
  * @description https://docs.solidjs.com/reference/components/show
  */
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
+export declare function Show<T, F extends KeyedConditionalRenderCallback<T>>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: NonZeroParams<F>;
+}): SolidElement;
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
 export declare function Show<T, F extends ConditionalRenderCallback<T>>(props: {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     fallback?: SolidElement;
-    children: ConditionalRenderChildren<T, F>;
+    children: NonZeroParams<F>;
 }): SolidElement;
 /**
  * Switches between content based on mutually exclusive conditions
@@ -46,14 +77,36 @@ export declare function Switch(props: {
 }): SolidElement;
 export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     children: ConditionalRenderChildren<T, F>;
 };
+export type KeyedMatchProps<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: KeyedConditionalRenderChildren<T, F>;
+};
+export type AnyMatchProps<T> = MatchProps<T> | KeyedMatchProps<T> | {
+    when: T | undefined | null | false;
+    keyed?: boolean;
+    children: SolidElement;
+};
 /**
  * Selects a content based on condition when inside a `<Switch>` control flow
  * @description https://docs.solidjs.com/reference/components/switch-and-match
  */
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: SolidElement;
+}): SolidElement;
+export declare function Match<T, F extends KeyedConditionalRenderCallback<T>>(props: KeyedMatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    children: SolidElement;
+}): SolidElement;
 export declare function Match<T, F extends ConditionalRenderCallback<T>>(props: MatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: AnyMatchProps<T>): SolidElement;
 /**
  * Catches uncaught errors inside components and renders a fallback content
  * @description https://docs.solidjs.com/reference/components/error-boundary

package/types/server/signals.d.ts

@@ -2,11 +2,11 @@ import { $REFRESH } from "@solidjs/signals";
 export { $REFRESH };
 export { NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY, enableExternalSource, enforceLoadingBoundary } from "@solidjs/signals";
 export { flatten } from "@solidjs/signals";
-export { snapshot, merge, omit, storePath, $PROXY, $TRACK } from "@solidjs/signals";
+export { snapshot, omit, storePath, $PROXY, $TRACK } from "@solidjs/signals";
 import type { Accessor as SignalAccessor, Refreshable } from "@solidjs/signals";
 export type SourceAccessor<T> = Refreshable<SignalAccessor<T>>;
 export type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, MemoOptions, NoInfer, SignalOptions, Setter, Signal, Owner, Refreshable, Maybe, Store, StoreSetter, StoreNode, NotWrappable, SolidStore, Merge, Omit, Context, ContextRecord, IQueue, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
-import type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, SignalOptions, Signal, Owner, Store, StoreSetter, Context } from "@solidjs/signals";
+import type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, SignalOptions, Signal, Merge, Owner, Store, StoreSetter, Context } from "@solidjs/signals";
 import { sharedConfig, NoHydrateContext } from "./shared.js";
 type Disposable = () => void;
 export declare function getNextChildId(owner: Owner): string;
@@ -90,8 +90,17 @@ export declare const createOptimisticStore: typeof createStore;
 export declare function createProjection<T extends object>(fn: (draft: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, initialValue: Partial<T>, options?: ServerSsrOptions): Store<T>;
 export declare function reconcile<T extends U, U extends object>(value: T): (state: U) => T;
 export declare function deep<T extends object>(store: Store<T>): Store<T>;
-export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: Accessor<T>, i: Accessor<number>) => U, options?: {
-    keyed?: boolean | ((item: T) => any);
+export declare function merge<T extends unknown[]>(...sources: T): Merge<T>;
+export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: T, i: Accessor<number>) => U, options?: {
+    keyed?: true;
+    fallback?: Accessor<any>;
+}): () => U[];
+export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: Accessor<T>, i: number) => U, options: {
+    keyed: false;
+    fallback?: Accessor<any>;
+}): () => U[];
+export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: Accessor<T>, i: Accessor<number>) => U, options: {
+    keyed: (item: T) => any;
     fallback?: Accessor<any>;
 }): () => U[];
 export declare function repeat<T>(count: Accessor<number>, mapFn: (i: number) => T, options?: {

package/types-cjs/client/flow.d.cts

@@ -3,18 +3,26 @@ export type { RevealOrder };
 import type { Element as SolidElement } from "../types.cjs";
 type NonZeroParams<T extends (...args: any[]) => any> = Parameters<T>["length"] extends 0 ? never : T;
 type ConditionalRenderCallback<T> = (item: Accessor<NonNullable<T>>) => SolidElement;
+type KeyedConditionalRenderCallback<T> = (item: NonNullable<T>) => SolidElement;
 type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
+type KeyedConditionalRenderChildren<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
 /**
  * Creates a list of elements from a list.
  *
- * Receives a map function as its child that takes list element and index
- * accessors and returns a JSX element; if the list is empty, an optional
- * `fallback` is rendered instead.
+ * Receives a map function as its child and returns a JSX element for each
+ * list item; if the list is empty, an optional `fallback` is rendered instead.
+ *
+ * The child callback shape follows the keying mode:
+ * - default / `keyed={true}` receives `(item, index)` where `item` is the raw
+ *   row value and `index` is an accessor.
+ * - `keyed={false}` receives `(item, index)` where `item` is an accessor and
+ *   `index` is a stable number.
+ * - `keyed={(item) => key}` receives accessors for both arguments.
  *
  * @example
  * ```tsx
  * <For each={items} fallback={<div>No items</div>}>
- *   {(item, index) => <div data-index={index()}>{item()}</div>}
+ *   {(item, index) => <div data-index={index()}>{item.label}</div>}
  * </For>
  * ```
  *
@@ -23,7 +31,19 @@ type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = Condi
 export declare function For<T extends readonly any[], U extends SolidElement>(props: {
     each: T | undefined | null | false;
     fallback?: SolidElement;
-    keyed?: boolean | ((item: T[number]) => any);
+    keyed?: true;
+    children: (item: T[number], index: Accessor<number>) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: false;
+    children: (item: Accessor<T[number]>, index: number) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: (item: T[number]) => any;
     children: (item: Accessor<T[number]>, index: Accessor<number>) => U;
 }): SolidElement;
 /**
@@ -51,10 +71,10 @@ export declare function Repeat<T extends SolidElement>(props: {
  * Conditionally renders its children when `when` is truthy, otherwise renders
  * the optional `fallback`.
  *
- * The function-child form receives an accessor for the narrowed value — call
- * it to read. Without `keyed` (default), the child is preserved across
- * truthy values; with `keyed`, the child remounts whenever the value's
- * identity changes.
+ * The function-child form receives a narrowed value. Without `keyed`
+ * (default), it receives an accessor and the child is preserved across truthy
+ * values; with `keyed`, it receives the raw value and remounts whenever the
+ * value's identity changes.
  *
  * @example
  * ```tsx
@@ -65,11 +85,29 @@ export declare function Repeat<T extends SolidElement>(props: {
  *
  * @description https://docs.solidjs.com/reference/components/show
  */
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
+export declare function Show<T, F extends KeyedConditionalRenderCallback<T>>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: NonZeroParams<F>;
+}): SolidElement;
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
 export declare function Show<T, F extends ConditionalRenderCallback<T>>(props: {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     fallback?: SolidElement;
-    children: ConditionalRenderChildren<T, F>;
+    children: NonZeroParams<F>;
 }): SolidElement;
 /**
  * Switches between content based on mutually exclusive conditions. Renders
@@ -96,15 +134,26 @@ export declare function Switch(props: {
 }): SolidElement;
 export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     children: ConditionalRenderChildren<T, F>;
 };
+export type KeyedMatchProps<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: KeyedConditionalRenderChildren<T, F>;
+};
+export type AnyMatchProps<T> = MatchProps<T> | KeyedMatchProps<T> | {
+    when: T | undefined | null | false;
+    keyed?: boolean;
+    children: SolidElement;
+};
 /**
  * A branch inside a `<Switch>`. The first `<Match>` whose `when` is truthy
  * wins; remaining matches are skipped.
  *
- * Like `<Show>`, `<Match>` supports a function child that receives an
- * accessor for the narrowed value.
+ * Like `<Show>`, `<Match>` supports a function child. Non-keyed children
+ * receive an accessor for the narrowed value; keyed children receive the raw
+ * narrowed value.
  *
  * @example
  * ```tsx
@@ -120,7 +169,19 @@ export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRe
  *
  * @description https://docs.solidjs.com/reference/components/switch-and-match
  */
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: SolidElement;
+}): SolidElement;
+export declare function Match<T, F extends KeyedConditionalRenderCallback<T>>(props: KeyedMatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    children: SolidElement;
+}): SolidElement;
 export declare function Match<T, F extends ConditionalRenderCallback<T>>(props: MatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: AnyMatchProps<T>): SolidElement;
 /**
  * Catches uncaught errors inside its subtree and renders fallback content
  * instead. The `fallback` prop can be a JSX element, or a callback that

package/types-cjs/server/flow.d.cts

@@ -3,16 +3,29 @@ import type { Element as SolidElement } from "../types.cjs";
 export type { RevealOrder };
 type NonZeroParams<T extends (...args: any[]) => any> = Parameters<T>["length"] extends 0 ? never : T;
 type ConditionalRenderCallback<T> = (item: Accessor<NonNullable<T>>) => SolidElement;
+type KeyedConditionalRenderCallback<T> = (item: NonNullable<T>) => SolidElement;
 type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
+type KeyedConditionalRenderChildren<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = SolidElement | NonZeroParams<F>;
 /**
  * Creates a list of elements from a list
- *
  * @description https://docs.solidjs.com/reference/components/for
  */
 export declare function For<T extends readonly any[], U extends SolidElement>(props: {
     each: T | undefined | null | false;
     fallback?: SolidElement;
-    keyed?: boolean | ((item: T[number]) => any);
+    keyed?: true;
+    children: (item: T[number], index: Accessor<number>) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: false;
+    children: (item: Accessor<T[number]>, index: number) => U;
+}): SolidElement;
+export declare function For<T extends readonly any[], U extends SolidElement>(props: {
+    each: T | undefined | null | false;
+    fallback?: SolidElement;
+    keyed: (item: T[number]) => any;
     children: (item: Accessor<T[number]>, index: Accessor<number>) => U;
 }): SolidElement;
 /**
@@ -30,11 +43,29 @@ export declare function Repeat<T extends SolidElement>(props: {
  * Conditionally render its children or an optional fallback component
  * @description https://docs.solidjs.com/reference/components/show
  */
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
+export declare function Show<T, F extends KeyedConditionalRenderCallback<T>>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    fallback?: SolidElement;
+    children: NonZeroParams<F>;
+}): SolidElement;
+export declare function Show<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    fallback?: SolidElement;
+    children: SolidElement;
+}): SolidElement;
 export declare function Show<T, F extends ConditionalRenderCallback<T>>(props: {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     fallback?: SolidElement;
-    children: ConditionalRenderChildren<T, F>;
+    children: NonZeroParams<F>;
 }): SolidElement;
 /**
  * Switches between content based on mutually exclusive conditions
@@ -46,14 +77,36 @@ export declare function Switch(props: {
 }): SolidElement;
 export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = {
     when: T | undefined | null | false;
-    keyed?: boolean;
+    keyed?: false;
     children: ConditionalRenderChildren<T, F>;
 };
+export type KeyedMatchProps<T, F extends KeyedConditionalRenderCallback<T> = KeyedConditionalRenderCallback<T>> = {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: KeyedConditionalRenderChildren<T, F>;
+};
+export type AnyMatchProps<T> = MatchProps<T> | KeyedMatchProps<T> | {
+    when: T | undefined | null | false;
+    keyed?: boolean;
+    children: SolidElement;
+};
 /**
  * Selects a content based on condition when inside a `<Switch>` control flow
  * @description https://docs.solidjs.com/reference/components/switch-and-match
  */
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed: true;
+    children: SolidElement;
+}): SolidElement;
+export declare function Match<T, F extends KeyedConditionalRenderCallback<T>>(props: KeyedMatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: {
+    when: T | undefined | null | false;
+    keyed?: false;
+    children: SolidElement;
+}): SolidElement;
 export declare function Match<T, F extends ConditionalRenderCallback<T>>(props: MatchProps<T, F>): SolidElement;
+export declare function Match<T>(props: AnyMatchProps<T>): SolidElement;
 /**
  * Catches uncaught errors inside components and renders a fallback content
  * @description https://docs.solidjs.com/reference/components/error-boundary

package/types-cjs/server/signals.d.cts

@@ -2,11 +2,11 @@ import { $REFRESH } from "@solidjs/signals";
 export { $REFRESH };
 export { NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY, enableExternalSource, enforceLoadingBoundary } from "@solidjs/signals";
 export { flatten } from "@solidjs/signals";
-export { snapshot, merge, omit, storePath, $PROXY, $TRACK } from "@solidjs/signals";
+export { snapshot, omit, storePath, $PROXY, $TRACK } from "@solidjs/signals";
 import type { Accessor as SignalAccessor, Refreshable } from "@solidjs/signals";
 export type SourceAccessor<T> = Refreshable<SignalAccessor<T>>;
 export type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, MemoOptions, NoInfer, SignalOptions, Setter, Signal, Owner, Refreshable, Maybe, Store, StoreSetter, StoreNode, NotWrappable, SolidStore, Merge, Omit, Context, ContextRecord, IQueue, StorePathRange, ArrayFilterFn, CustomPartial, Part, PathSetter } from "@solidjs/signals";
-import type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, SignalOptions, Signal, Owner, Store, StoreSetter, Context } from "@solidjs/signals";
+import type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, MemoOptions, SignalOptions, Signal, Merge, Owner, Store, StoreSetter, Context } from "@solidjs/signals";
 import { sharedConfig, NoHydrateContext } from "./shared.cjs";
 type Disposable = () => void;
 export declare function getNextChildId(owner: Owner): string;
@@ -90,8 +90,17 @@ export declare const createOptimisticStore: typeof createStore;
 export declare function createProjection<T extends object>(fn: (draft: T) => void | T | Promise<void | T> | AsyncIterable<void | T>, initialValue: Partial<T>, options?: ServerSsrOptions): Store<T>;
 export declare function reconcile<T extends U, U extends object>(value: T): (state: U) => T;
 export declare function deep<T extends object>(store: Store<T>): Store<T>;
-export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: Accessor<T>, i: Accessor<number>) => U, options?: {
-    keyed?: boolean | ((item: T) => any);
+export declare function merge<T extends unknown[]>(...sources: T): Merge<T>;
+export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: T, i: Accessor<number>) => U, options?: {
+    keyed?: true;
+    fallback?: Accessor<any>;
+}): () => U[];
+export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: Accessor<T>, i: number) => U, options: {
+    keyed: false;
+    fallback?: Accessor<any>;
+}): () => U[];
+export declare function mapArray<T, U>(list: Accessor<readonly T[] | undefined | null | false>, mapFn: (v: Accessor<T>, i: Accessor<number>) => U, options: {
+    keyed: (item: T) => any;
     fallback?: Accessor<any>;
 }): () => U[];
 export declare function repeat<T>(count: Accessor<number>, mapFn: (i: number) => T, options?: {