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

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,22 @@ 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;
+/**
+ * Coordinates the reveal timing of sibling `<Loading>` boundaries during SSR.
+ * @description https://docs.solidjs.com/reference/components/reveal
+ */
+export declare function Reveal(props: {
+    together?: boolean;
+    collapsed?: boolean;
+    children: JSX.Element;
+}): JSX.Element;
+export {};

package/types/server/hydration.d.ts

@@ -1,6 +1,15 @@
+import type { Context } from "./signals.js";
 import type { JSX } from "../jsx.js";
 export { sharedConfig, NoHydrateContext } from "./shared.js";
 export type { HydrationContext, SSRTemplateObject } from "./shared.js";
+export type ServerRevealGroup = {
+    id: string;
+    register(key: string, options?: {
+        onActivate?: () => void;
+    }): boolean;
+    onResolved(key: string): void;
+};
+export declare const RevealGroupContext: Context<ServerRevealGroup | null>;
 /**
  * Handles errors during SSR rendering.
  * Returns the promise source for NotReadyError (for async handling),
@@ -15,11 +24,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, createRevealOrder, createRoot, createSignal, createStore, createTrackedEffect, deep, flatten, flush, getNextChildId, getObserver, getOwner, isDisposed, 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/shared.d.ts

@@ -19,7 +19,11 @@ export type HydrationContext = {
     escape(value: any): string;
     replace: (id: string, replacement: () => any) => void;
     block: (p: Promise<any>) => void;
-    registerFragment: (v: string) => (v?: string, err?: any) => boolean;
+    registerFragment: (v: string, options?: {
+        revealGroup?: string;
+    }) => (v?: string, err?: any) => boolean;
+    revealFragments?: (groupOrKeys: string | string[]) => void;
+    revealFallbacks?: (groupOrKeys: string | string[]) => void;
     /** Register a client-side asset URL discovered during SSR (e.g. from lazy()). */
     registerAsset?: (type: "module" | "style", url: string) => void;
     /** Register a moduleUrl-to-entryUrl mapping for the current boundary. */

package/types/server/signals.d.ts

@@ -1,9 +1,9 @@
-export { createRoot, createOwner, runWithOwner, getOwner, onCleanup, getNextChildId, createContext, setContext, getContext, NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY, enableExternalSource, enforceLoadingBoundary } from "@solidjs/signals";
+export { createRoot, createOwner, runWithOwner, getOwner, isDisposed, onCleanup, getNextChildId, createContext, setContext, getContext, NotReadyError, NoOwnerError, ContextNotFoundError, isEqual, isWrappable, SUPPORTS_PROXY, enableExternalSource, enforceLoadingBoundary } from "@solidjs/signals";
 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,11 +47,16 @@ 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?: {
     on?: () => any;
 }): () => unknown;
+export declare function createRevealOrder<T>(fn: () => T, _options?: {
+    together?: () => boolean;
+    collapsed?: () => boolean;
+}): T;
 export declare function untrack<T>(fn: () => T): T;
 export declare function flush(): void;
 export declare function resolve<T>(fn: () => T): Promise<T>;