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

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,20 +77,42 @@ 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
  */
 export declare function Errored(props: {
-    fallback: SolidElement | ((err: any, reset: () => void) => SolidElement);
+    fallback: SolidElement | ((err: () => any, reset: () => void) => SolidElement);
     children: SolidElement;
 }): SolidElement;
 /**

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?: {
@@ -102,7 +111,7 @@ declare const ErrorContext: Context<((err: any) => void) | null>;
 export { ErrorContext };
 export declare function runWithBoundaryErrorContext<T>(owner: Owner, render: () => T, onError: (err: any, parentHandler: ((err: any) => void) | null) => void, context?: NonNullable<typeof sharedConfig.context>, boundaryId?: string): T;
 export { NoHydrateContext };
-export declare function createErrorBoundary<U>(fn: () => any, fallback: (error: unknown, reset: () => void) => U): () => unknown;
+export declare function createErrorBoundary<U>(fn: () => any, fallback: (error: Accessor<unknown>, reset: () => void) => U): () => unknown;
 export declare function createLoadingBoundary(fn: () => any, fallback: () => any, options?: {
     on?: () => any;
 }): () => unknown;
@@ -114,7 +123,7 @@ export declare function createRevealOrder<T>(fn: () => T, _options?: {
 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 isPending(fn: () => any, loading?: boolean): boolean;
 export declare function latest<T>(fn: () => T): T;
 export declare function isRefreshing(): boolean;
 export declare function refresh<T>(_target: Refreshable<T>): void;