solid-js 2.0.0-beta.4 → 2.0.0-beta.5

package/types/client/flow.d.ts

@@ -1,5 +1,8 @@
 import type { Accessor } from "@solidjs/signals";
 import type { JSX } from "../jsx.js";
+type NonZeroParams<T extends (...args: any[]) => any> = Parameters<T>["length"] extends 0 ? never : T;
+type ConditionalRenderCallback<T> = (item: Accessor<NonNullable<T>>) => JSX.Element;
+type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = JSX.Element | NonZeroParams<F>;
 /**
  * Creates a list of elements from a list
  *
@@ -40,11 +43,11 @@ export declare function Repeat<T extends JSX.Element>(props: {
  * Conditionally render its children or an optional fallback component
  * @description https://docs.solidjs.com/reference/components/show
  */
-export declare function Show<T>(props: {
+export declare function Show<T, F extends ConditionalRenderCallback<T>>(props: {
     when: T | undefined | null | false;
     keyed?: boolean;
     fallback?: JSX.Element;
-    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+    children: ConditionalRenderChildren<T, F>;
 }): JSX.Element;
 /**
  * Switches between content based on mutually exclusive conditions
@@ -64,10 +67,10 @@ export declare function Switch(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
 }): JSX.Element;
-export type MatchProps<T> = {
+export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = {
     when: T | undefined | null | false;
     keyed?: boolean;
-    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+    children: ConditionalRenderChildren<T, F>;
 };
 /**
  * Selects a content based on condition when inside a `<Switch>` control flow
@@ -78,7 +81,7 @@ export type MatchProps<T> = {
  * ```
  * @description https://docs.solidjs.com/reference/components/switch-and-match
  */
-export declare function Match<T>(props: MatchProps<T>): JSX.Element;
+export declare function Match<T, F extends ConditionalRenderCallback<T>>(props: MatchProps<T, F>): JSX.Element;
 /**
  * Catches uncaught errors inside components and renders a fallback content
  *
@@ -98,3 +101,20 @@ export declare function Errored(props: {
     fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);
     children: JSX.Element;
 }): JSX.Element;
+/**
+ * Tracks all resources inside a component and renders a fallback until they are all resolved
+ * ```typescript
+ * const AsyncComponent = lazy(() => import('./component'));
+ *
+ * <Loading fallback={<LoadingIndicator />}>
+ *   <AsyncComponent />
+ * </Loading>
+ * ```
+ * @description https://docs.solidjs.com/reference/components/suspense
+ */
+export declare function Loading(props: {
+    fallback?: JSX.Element;
+    on?: any;
+    children: JSX.Element;
+}): JSX.Element;
+export {};

package/types/client/hydration.d.ts

@@ -1,17 +1,15 @@
 import { createErrorBoundary as coreErrorBoundary, createMemo as coreMemo, createSignal as coreSignal, createOptimistic as coreOptimistic, createRenderEffect as coreRenderEffect, createEffect as coreEffect, $REFRESH, type ProjectionOptions, type Store, type StoreSetter, type Context } from "@solidjs/signals";
 import { JSX } from "../jsx.js";
+type HydrationSsrFields = {
+    deferStream?: boolean;
+    ssrSource?: "server" | "hybrid" | "initial" | "client";
+};
 declare module "@solidjs/signals" {
-    interface MemoOptions<T> {
-        deferStream?: boolean;
-        ssrSource?: "server" | "hybrid" | "initial" | "client";
+    interface MemoOptions<T> extends HydrationSsrFields {
     }
-    interface SignalOptions<T> {
-        deferStream?: boolean;
-        ssrSource?: "server" | "hybrid" | "initial" | "client";
+    interface SignalOptions<T> extends HydrationSsrFields {
     }
-    interface EffectOptions {
-        deferStream?: boolean;
-        ssrSource?: "server" | "hybrid" | "initial" | "client";
+    interface EffectOptions extends HydrationSsrFields {
     }
 }
 export type HydrationProjectionOptions = ProjectionOptions & {
@@ -76,11 +74,9 @@ export declare const createEffect: typeof coreEffect;
  * ```
  * @description https://docs.solidjs.com/reference/components/suspense
  */
-export declare function Loading(props: {
-    fallback?: JSX.Element;
+export declare function createLoadingBoundary(fn: () => any, fallback: () => any, options?: {
     on?: () => any;
-    children: JSX.Element;
-}): JSX.Element;
+}): () => unknown;
 /**
  * Disables hydration for its children on the client.
  * During hydration, skips the subtree entirely (returns undefined so DOM is left untouched).

package/types/index.d.ts

@@ -1,10 +1,10 @@
-export { $PROXY, $REFRESH, $TRACK, action, createErrorBoundary, createLoadingBoundary, 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, enableExternalSource, enforceLoadingBoundary, snapshot, storePath, untrack } from "@solidjs/signals";
+export { $PROXY, $REFRESH, $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, enableExternalSource, enforceLoadingBoundary, snapshot, storePath, untrack } from "@solidjs/signals";
 export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, 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, createRenderEffect, createEffect, NoHydration, Hydration, NoHydrateContext } from "./client/hydration.js";
+export { sharedConfig, enableHydration, createErrorBoundary, createLoadingBoundary, createMemo, createSignal, createStore, createProjection, createOptimistic, createOptimisticStore, createRenderEffect, createEffect, NoHydration, Hydration, NoHydrateContext } 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

@@ -277,12 +277,16 @@ export namespace JSX {
 
   type BooleanAttribute = true | false | "";
 
+  type BooleanProperty = true | false;
+
   type EnumeratedPseudoBoolean = "false" | "true";
 
   type EnumeratedAcceptsEmpty = "" | true;
 
   type RemoveAttribute = undefined | false;
 
+  type RemoveProperty = undefined;
+
   // ARIA
 
   // All the WAI-ARIA 1.1 attributes from https://www.w3.org/TR/wai-aria-1.1/
@@ -1523,6 +1527,7 @@ export namespace JSX {
     autocomplete?: HTMLAutocomplete | RemoveAttribute;
     capture?: "user" | "environment" | RemoveAttribute;
     checked?: BooleanAttribute | RemoveAttribute;
+    "prop:checked"?: BooleanProperty | RemoveProperty;
     colorspace?: string | RemoveAttribute;
     dirname?: string | RemoveAttribute;
     disabled?: BooleanAttribute | RemoveAttribute;
@@ -1577,6 +1582,7 @@ export namespace JSX {
       | (string & {})
       | RemoveAttribute;
     value?: string | string[] | number | RemoveAttribute;
+    "prop:value"?: string | string[] | number | RemoveProperty;
     width?: number | string | RemoveAttribute;
 
     /** @non-standard */
@@ -1656,6 +1662,7 @@ export namespace JSX {
     disableremoteplayback?: BooleanAttribute | RemoveAttribute;
     loop?: BooleanAttribute | RemoveAttribute;
     muted?: BooleanAttribute | RemoveAttribute;
+    "prop:muted"?: BooleanProperty | RemoveProperty;
     preload?: "none" | "metadata" | "auto" | EnumeratedAcceptsEmpty | RemoveAttribute;
     src?: string | RemoveAttribute;
 
@@ -1759,7 +1766,9 @@ export namespace JSX {
     disabled?: BooleanAttribute | RemoveAttribute;
     label?: string | RemoveAttribute;
     selected?: BooleanAttribute | RemoveAttribute;
+    "prop:selected"?: BooleanProperty | RemoveProperty;
     value?: string | string[] | number | RemoveAttribute;
+    "prop:value"?: string | string[] | number | RemoveProperty;
   }
   interface OutputHTMLAttributes<T> extends HTMLAttributes<T> {
     for?: string | RemoveAttribute;
@@ -1812,6 +1821,7 @@ export namespace JSX {
     required?: BooleanAttribute | RemoveAttribute;
     size?: number | string | RemoveAttribute;
     value?: string | string[] | number | RemoveAttribute;
+    "prop:value"?: string | string[] | number | RemoveProperty;
   }
   interface HTMLSlotElementAttributes<T> extends HTMLAttributes<T> {
     name?: string | RemoveAttribute;
@@ -1886,6 +1896,7 @@ export namespace JSX {
     required?: BooleanAttribute | RemoveAttribute;
     rows?: number | string | RemoveAttribute;
     value?: string | string[] | number | RemoveAttribute;
+    "prop:value"?: string | string[] | number | RemoveProperty;
     wrap?: "hard" | "soft" | "off" | RemoveAttribute;
   }
   interface ThHTMLAttributes<T> extends HTMLAttributes<T> {

package/types/server/flow.d.ts

@@ -1,5 +1,8 @@
 import type { Accessor } from "./signals.js";
 import type { JSX } from "../jsx.js";
+type NonZeroParams<T extends (...args: any[]) => any> = Parameters<T>["length"] extends 0 ? never : T;
+type ConditionalRenderCallback<T> = (item: Accessor<NonNullable<T>>) => JSX.Element;
+type ConditionalRenderChildren<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = JSX.Element | NonZeroParams<F>;
 /**
  * Creates a list of elements from a list
  *
@@ -26,11 +29,11 @@ export declare function Repeat<T extends JSX.Element>(props: {
  * Conditionally render its children or an optional fallback component
  * @description https://docs.solidjs.com/reference/components/show
  */
-export declare function Show<T>(props: {
+export declare function Show<T, F extends ConditionalRenderCallback<T>>(props: {
     when: T | undefined | null | false;
     keyed?: boolean;
     fallback?: JSX.Element;
-    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+    children: ConditionalRenderChildren<T, F>;
 }): JSX.Element;
 /**
  * Switches between content based on mutually exclusive conditions
@@ -40,16 +43,16 @@ export declare function Switch(props: {
     fallback?: JSX.Element;
     children: JSX.Element;
 }): JSX.Element;
-export type MatchProps<T> = {
+export type MatchProps<T, F extends ConditionalRenderCallback<T> = ConditionalRenderCallback<T>> = {
     when: T | undefined | null | false;
     keyed?: boolean;
-    children: JSX.Element | ((item: Accessor<NonNullable<T>>) => JSX.Element);
+    children: ConditionalRenderChildren<T, F>;
 };
 /**
  * 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: MatchProps<T>): JSX.Element;
+export declare function Match<T, F extends ConditionalRenderCallback<T>>(props: MatchProps<T, F>): JSX.Element;
 /**
  * Catches uncaught errors inside components and renders a fallback content
  * @description https://docs.solidjs.com/reference/components/error-boundary
@@ -58,3 +61,13 @@ export declare function Errored(props: {
     fallback: JSX.Element | ((err: any, reset: () => void) => JSX.Element);
     children: JSX.Element;
 }): JSX.Element;
+/**
+ * Tracks all resources inside a component and renders a fallback until they are all resolved
+ * @description https://docs.solidjs.com/reference/components/suspense
+ */
+export declare function Loading(props: {
+    fallback?: JSX.Element;
+    on?: any;
+    children: JSX.Element;
+}): JSX.Element;
+export {};

package/types/server/hydration.d.ts

@@ -15,11 +15,9 @@ export declare function ssrHandleError(err: any): Promise<any> | undefined;
  *
  * @description https://docs.solidjs.com/reference/components/suspense
  */
-export declare function Loading(props: {
-    fallback?: JSX.Element;
+export declare function createLoadingBoundary(fn: () => any, fallback: () => any, options?: {
     on?: () => any;
-    children: JSX.Element;
-}): JSX.Element;
+}): () => unknown;
 /**
  * Disables hydration for its children during SSR.
  * Elements inside will not receive hydration keys (`_hk`) and signals will not be serialized.

package/types/server/index.d.ts

@@ -1,10 +1,10 @@
-export { $PROXY, $REFRESH, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createErrorBoundary, createLoadingBoundary, 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, enableExternalSource, enforceLoadingBoundary, untrack } from "./signals.js";
+export { $PROXY, $REFRESH, $TRACK, action, createEffect, createMemo, createOptimistic, createOptimisticStore, createErrorBoundary, 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, enableExternalSource, enforceLoadingBoundary, untrack } from "./signals.js";
 export type { Accessor, ComputeFunction, EffectFunction, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, 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";
 export * from "./flow.js";
-export { sharedConfig, Loading, ssrHandleError, NoHydration, Hydration, NoHydrateContext } from "./hydration.js";
+export { sharedConfig, createLoadingBoundary, ssrHandleError, NoHydration, Hydration, NoHydrateContext } from "./hydration.js";
 export type { HydrationContext } from "./hydration.js";
 import type { JSX } from "../jsx.js";
 type JSXElement = JSX.Element;

package/types/server/signals.d.ts

@@ -3,7 +3,7 @@ export { flatten } from "@solidjs/signals";
 export { snapshot, merge, omit, storePath, $PROXY, $REFRESH, $TRACK } from "@solidjs/signals";
 export type { Accessor, ComputeFunction, EffectFunction, EffectBundle, EffectOptions, ExternalSource, ExternalSourceConfig, ExternalSourceFactory, 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";
-import { NoHydrateContext } from "./shared.js";
+import { sharedConfig, NoHydrateContext } from "./shared.js";
 interface ServerComputation<T = any> {
     owner: Owner;
     value: T;
@@ -47,6 +47,7 @@ export declare function repeat<T>(count: Accessor<number>, mapFn: (i: number) =>
 }): () => T[];
 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 createLoadingBoundary(fn: () => any, fallback: () => any, options?: {