solid-js 2.0.0-beta.3 → 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";