@prismicio/react 2.0.0-beta.2 → 2.0.0-beta.6

package/src/{hooks.ts → clientHooks.ts}

@@ -1,5 +1,4 @@
-import * as prismic from "@prismicio/client";
-import * as prismicT from "@prismicio/types";
+import type * as prismicT from "@prismicio/types";
 
 import {
 	ClientHookReturnType,
@@ -8,23 +7,24 @@ import {
 	useStatefulPrismicClientMethod,
 } from "./useStatefulPrismicClientMethod";
 
-const proto = prismic.Client.prototype;
-
 /**
  * A hook that queries content from the Prismic repository.
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.get}
  */
 export const usePrismicDocuments = <TDocument extends prismicT.PrismicDocument>(
 	...args: [params?: ClientMethodParameters<"get">[0] & HookOnlyParameters]
 ): ClientHookReturnType<prismicT.Query<TDocument>> =>
-	useStatefulPrismicClientMethod(proto.get, args);
+	useStatefulPrismicClientMethod("get", args);
 
 /**
  * A hook that queries content from the Prismic repository and returns only the
@@ -32,10 +32,13 @@ export const usePrismicDocuments = <TDocument extends prismicT.PrismicDocument>(
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of the Prismic document returned
+ *
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getFirst}
  */
 export const useFirstPrismicDocument = <
@@ -43,7 +46,7 @@ export const useFirstPrismicDocument = <
 >(
 	...args: [params?: ClientMethodParameters<"getFirst">[0] & HookOnlyParameters]
 ): ClientHookReturnType<TDocument> =>
-	useStatefulPrismicClientMethod(proto.getFirst, args);
+	useStatefulPrismicClientMethod("getFirst", args);
 
 /**
  * A hook that queries content from the Prismic repository and returns all
@@ -51,29 +54,38 @@ export const useFirstPrismicDocument = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param params - Parameters to filter and sort results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getAll}
  */
-export const useAllPrismicDocuments = <
+export const useAllPrismicDocumentsDangerously = <
 	TDocument extends prismicT.PrismicDocument,
 >(
-	...args: [params?: ClientMethodParameters<"getAll">[0] & HookOnlyParameters]
+	...args: [
+		params?: ClientMethodParameters<"dangerouslyGetAll">[0] &
+			HookOnlyParameters,
+	]
 ): ClientHookReturnType<TDocument[]> =>
-	useStatefulPrismicClientMethod(proto.getAll, args);
+	useStatefulPrismicClientMethod("dangerouslyGetAll", args);
 
 /**
  * A hook that queries a document from the Prismic repository with a specific ID.
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of the Prismic document returned
+ *
  * @param id - ID of the document
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByID}
  */
 export const usePrismicDocumentByID = <
@@ -84,18 +96,21 @@ export const usePrismicDocumentByID = <
 		params?: ClientMethodParameters<"getByID">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument> =>
-	useStatefulPrismicClientMethod(proto.getByID, args);
+	useStatefulPrismicClientMethod("getByID", args);
 
 /**
  * A hook that queries documents from the Prismic repository with specific IDs.
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param ids - A list of document IDs
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByIDs}
  */
 export const usePrismicDocumentsByIDs = <
@@ -106,18 +121,21 @@ export const usePrismicDocumentsByIDs = <
 		params?: ClientMethodParameters<"getByIDs">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<prismicT.Query<TDocument>> =>
-	useStatefulPrismicClientMethod(proto.getByIDs, args);
+	useStatefulPrismicClientMethod("getByIDs", args);
 
 /**
  * A hook that queries all documents from the Prismic repository with specific IDs.
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param ids - A list of document IDs
  * @param params - Parameters to filter and sort results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getAllByIDs}
  */
 export const useAllPrismicDocumentsByIDs = <
@@ -128,7 +146,7 @@ export const useAllPrismicDocumentsByIDs = <
 		params?: ClientMethodParameters<"getAllByIDs">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument[]> =>
-	useStatefulPrismicClientMethod(proto.getAllByIDs, args);
+	useStatefulPrismicClientMethod("getAllByIDs", args);
 
 /**
  * A hook that queries a document from the Prismic repository with a specific
@@ -136,12 +154,15 @@ export const useAllPrismicDocumentsByIDs = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of the Prismic document returned
+ *
  * @param documentType - The API ID of the document's Custom Type
  * @param uid - UID of the document
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByUID}
  */
 export const usePrismicDocumentByUID = <
@@ -153,7 +174,7 @@ export const usePrismicDocumentByUID = <
 		params?: ClientMethodParameters<"getByUID">[2] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument> =>
-	useStatefulPrismicClientMethod(proto.getByUID, args);
+	useStatefulPrismicClientMethod("getByUID", args);
 
 /**
  * A hook that queries documents from the Prismic repository with specific UIDs
@@ -161,12 +182,15 @@ export const usePrismicDocumentByUID = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of the Prismic document returned
+ *
  * @param documentType - The API ID of the document's Custom Type
  * @param uids - A list of document UIDs.
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByUID}
  */
 export const usePrismicDocumentsByUIDs = <
@@ -178,7 +202,7 @@ export const usePrismicDocumentsByUIDs = <
 		params?: ClientMethodParameters<"getByUIDs">[2] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<prismicT.Query<TDocument>> =>
-	useStatefulPrismicClientMethod(proto.getByUIDs, args);
+	useStatefulPrismicClientMethod("getByUIDs", args);
 
 /**
  * A hook that queries all documents from the Prismic repository with specific
@@ -186,12 +210,15 @@ export const usePrismicDocumentsByUIDs = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of the Prismic document returned
+ *
  * @param documentType - The API ID of the document's Custom Type
  * @param uids - A list of document UIDs.
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByUID}
  */
 export const useAllPrismicDocumentsByUIDs = <
@@ -203,7 +230,7 @@ export const useAllPrismicDocumentsByUIDs = <
 		params?: ClientMethodParameters<"getByUIDs">[2] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument[]> =>
-	useStatefulPrismicClientMethod(proto.getAllByUIDs, args);
+	useStatefulPrismicClientMethod("getAllByUIDs", args);
 
 /**
  * A hook that queries a singleton document from the Prismic repository for a
@@ -211,11 +238,14 @@ export const useAllPrismicDocumentsByUIDs = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of the Prismic document returned
+ *
  * @param documentType - The API ID of the singleton Custom Type
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getSingle}
  */
 export const useSinglePrismicDocument = <
@@ -226,18 +256,21 @@ export const useSinglePrismicDocument = <
 		params?: ClientMethodParameters<"getSingle">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument> =>
-	useStatefulPrismicClientMethod(proto.getSingle, args);
+	useStatefulPrismicClientMethod("getSingle", args);
 
 /**
  * A hook that queries documents from the Prismic repository for a specific Custom Type.
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param documentType - The API ID of the Custom Type
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByType}
  */
 export const usePrismicDocumentsByType = <
@@ -248,7 +281,7 @@ export const usePrismicDocumentsByType = <
 		params?: ClientMethodParameters<"getByType">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<prismicT.Query<TDocument>> =>
-	useStatefulPrismicClientMethod(proto.getByType, args);
+	useStatefulPrismicClientMethod("getByType", args);
 
 /**
  * A hook that queries all documents from the Prismic repository for a specific
@@ -256,11 +289,14 @@ export const usePrismicDocumentsByType = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param documentType - The API ID of the Custom Type
  * @param params - Parameters to filter and sort results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getAllByType}
  */
 export const useAllPrismicDocumentsByType = <
@@ -271,18 +307,21 @@ export const useAllPrismicDocumentsByType = <
 		params?: ClientMethodParameters<"getAllByType">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument[]> =>
-	useStatefulPrismicClientMethod(proto.getAllByType, args);
+	useStatefulPrismicClientMethod("getAllByType", args);
 
 /**
  * A hook that queries documents from the Prismic repository with a specific tag.
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param tag - The tag that must be included on a document
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByTag}
  */
 export const usePrismicDocumentsByTag = <
@@ -293,18 +332,21 @@ export const usePrismicDocumentsByTag = <
 		params?: ClientMethodParameters<"getByTag">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<prismicT.Query<TDocument>> =>
-	useStatefulPrismicClientMethod(proto.getByTag, args);
+	useStatefulPrismicClientMethod("getByTag", args);
 
 /**
  * A hook that queries all documents from the Prismic repository with a specific tag.
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param tag - The tag that must be included on a document
  * @param params - Parameters to filter and sort results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getAllByTag}
  */
 export const useAllPrismicDocumentsByTag = <
@@ -315,7 +357,7 @@ export const useAllPrismicDocumentsByTag = <
 		params?: ClientMethodParameters<"getAllByTag">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument[]> =>
-	useStatefulPrismicClientMethod(proto.getAllByTag, args);
+	useStatefulPrismicClientMethod("getAllByTag", args);
 
 /**
  * A hook that queries documents from the Prismic repository with specific tags.
@@ -323,11 +365,14 @@ export const useAllPrismicDocumentsByTag = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param tags - A list of tags that must be included on a document
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByTags}
  */
 export const usePrismicDocumentsBySomeTags = <
@@ -338,7 +383,7 @@ export const usePrismicDocumentsBySomeTags = <
 		params?: ClientMethodParameters<"getBySomeTags">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<prismicT.Query<TDocument>> =>
-	useStatefulPrismicClientMethod(proto.getBySomeTags, args);
+	useStatefulPrismicClientMethod("getBySomeTags", args);
 
 /**
  * A hook that queries all documents from the Prismic repository with specific
@@ -346,11 +391,14 @@ export const usePrismicDocumentsBySomeTags = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param tags - A list of tags that must be included on a document
  * @param params - Parameters to filter and sort results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getAllByTags}
  */
 export const useAllPrismicDocumentsBySomeTags = <
@@ -361,7 +409,7 @@ export const useAllPrismicDocumentsBySomeTags = <
 		params?: ClientMethodParameters<"getAllBySomeTags">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument[]> =>
-	useStatefulPrismicClientMethod(proto.getAllBySomeTags, args);
+	useStatefulPrismicClientMethod("getAllBySomeTags", args);
 
 /**
  * A hook that queries documents from the Prismic repository with specific tags.
@@ -369,11 +417,14 @@ export const useAllPrismicDocumentsBySomeTags = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param tags - A list of tags that must be included on a document
  * @param params - Parameters to filter, sort, and paginate results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getByTags}
  */
 export const usePrismicDocumentsByEveryTag = <
@@ -384,7 +435,7 @@ export const usePrismicDocumentsByEveryTag = <
 		params?: ClientMethodParameters<"getByEveryTag">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<prismicT.Query<TDocument>> =>
-	useStatefulPrismicClientMethod(proto.getByEveryTag, args);
+	useStatefulPrismicClientMethod("getByEveryTag", args);
 
 /**
  * A hook that queries all documents from the Prismic repository with specific
@@ -392,11 +443,14 @@ export const usePrismicDocumentsByEveryTag = <
  *
  * @remarks
  * An additional `@prismicio/client` instance can be provided at `params.client`.
+ *
  * @typeParam TDocument - Type of Prismic documents returned
+ *
  * @param tags - A list of tags that must be included on a document
  * @param params - Parameters to filter and sort results
  *
  * @returns The composable payload {@link ClientHookReturnType}
+ *
  * @see Underlying `@prismicio/client` method {@link proto.getAllByTags}
  */
 export const useAllPrismicDocumentsByEveryTag = <
@@ -407,4 +461,4 @@ export const useAllPrismicDocumentsByEveryTag = <
 		params?: ClientMethodParameters<"getAllByEveryTag">[1] & HookOnlyParameters,
 	]
 ): ClientHookReturnType<TDocument[]> =>
-	useStatefulPrismicClientMethod(proto.getAllByEveryTag, args);
+	useStatefulPrismicClientMethod("getAllByEveryTag", args);

package/src/index.ts

@@ -25,13 +25,17 @@ export type {
 	SliceZoneComponents,
 	SliceZoneLike,
 	SliceZoneProps,
+	SliceZoneResolver,
 } from "./SliceZone";
 
 export { PrismicToolbar } from "./PrismicToolbar";
 export type { PrismicToolbarProps } from "./PrismicToolbar";
 
+export { usePrismicPreviewResolver } from "./usePrismicPreviewResolver";
+export type { UsePrismicPreviewResolverArgs } from "./usePrismicPreviewResolver";
+
 export {
-	useAllPrismicDocuments,
+	useAllPrismicDocumentsDangerously,
 	useAllPrismicDocumentsByEveryTag,
 	useAllPrismicDocumentsByIDs,
 	useAllPrismicDocumentsBySomeTags,
@@ -49,7 +53,7 @@ export {
 	usePrismicDocumentsByType,
 	usePrismicDocumentsByUIDs,
 	useSinglePrismicDocument,
-} from "./hooks";
+} from "./clientHooks";
 
 export type {
 	JSXMapSerializer,

package/src/usePrismicClient.ts

@@ -1,4 +1,4 @@
-import * as prismic from "@prismicio/client";
+import type * as prismic from "@prismicio/client";
 
 import { invariant } from "./lib/invariant";
 

package/src/usePrismicPreviewResolver.ts

@@ -0,0 +1,88 @@
+import type * as prismic from "@prismicio/client";
+
+import * as React from "react";
+
+import {
+	ClientHookReturnType,
+	useStatefulPrismicClientMethod,
+} from "./useStatefulPrismicClientMethod";
+
+export type UsePrismicPreviewResolverArgs = {
+	/**
+	 * An optional `@prismicio/client` instance to override the Client provided to
+	 * `<PrismicProvider>`
+	 */
+	client?: prismic.Client;
+
+	/**
+	 * A function that maps a Prismic document to a URL within your app.
+	 */
+	linkResolver?: Parameters<
+		prismic.Client["resolvePreviewURL"]
+	>[0]["linkResolver"];
+
+	/**
+	 * A fallback URL if the Link Resolver does not return a value.
+	 */
+	defaultURL?: Parameters<prismic.Client["resolvePreviewURL"]>[0]["defaultURL"];
+
+	/**
+	 * The preview token (also known as a ref) that will be used to query preview
+	 * content from the Prismic repository.
+	 */
+	previewToken?: Parameters<
+		prismic.Client["resolvePreviewURL"]
+	>[0]["previewToken"];
+
+	/**
+	 * The previewed document that will be used to determine the destination URL.
+	 */
+	documentID?: Parameters<prismic.Client["resolvePreviewURL"]>[0]["documentID"];
+
+	/**
+	 * A function to automatically navigate to the resolved URL. If a function is
+	 * not provded, `usePreviewResolver` will not navigate to the URL.
+	 *
+	 * @param url - The resolved preview URL.
+	 */
+	navigate?: (url: string) => unknown;
+};
+
+/**
+ * Resolve a preview session's URL. The resolved URL can be used to redirect to
+ * the previewed document.
+ *
+ * If a `navigate` function is provided, the hook will automatically navigate to
+ * the previewed document's URL.
+ *
+ * @param args - Arguments to configure how a URL is resolved.
+ *
+ * @returns A tuple containing the resolved URL and the hook's state.
+ */
+export const usePrismicPreviewResolver = (
+	args: UsePrismicPreviewResolverArgs = {},
+): ClientHookReturnType<string> => {
+	const result = useStatefulPrismicClientMethod(
+		"resolvePreviewURL",
+		[
+			{
+				linkResolver: args.linkResolver,
+				defaultURL: args.defaultURL || "/",
+				previewToken: args.previewToken,
+				documentID: args.documentID,
+			},
+		],
+		args.client,
+	);
+
+	const [resolvedURL] = result;
+	const { navigate } = args;
+
+	React.useEffect(() => {
+		if (resolvedURL && navigate) {
+			navigate(resolvedURL);
+		}
+	}, [resolvedURL, navigate]);
+
+	return result;
+};

package/src/useStatefulPrismicClientMethod.ts

@@ -1,5 +1,6 @@
+import type * as prismic from "@prismicio/client";
+
 import * as React from "react";
-import * as prismic from "@prismicio/client";
 
 import { PrismicClientHookState } from "./types";
 import { usePrismicClient } from "./usePrismicClient";
@@ -46,12 +47,25 @@ type UnwrapPromise<T> = T extends Promise<infer U> ? U : T;
 
 type ClientPrototype = typeof prismic.Client.prototype;
 
-export type ClientMethodParameters<MethodName extends keyof ClientPrototype> =
+type ClientMethod<MethodName extends keyof ClientPrototype> =
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	ClientPrototype[MethodName] extends (...args: any[]) => any
-		? Parameters<ClientPrototype[MethodName]>
+		? ClientPrototype[MethodName]
 		: never;
 
+type ClientMethodName = keyof {
+	[P in keyof prismic.Client as prismic.Client[P] extends (
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+		...args: any[]
+	) => // eslint-disable-next-line @typescript-eslint/no-explicit-any
+	Promise<any>
+		? P
+		: never]: unknown;
+};
+
+export type ClientMethodParameters<MethodName extends keyof ClientPrototype> =
+	Parameters<ClientMethod<MethodName>>;
+
 export type HookOnlyParameters = {
 	client?: prismic.Client;
 	skip?: boolean;
@@ -111,45 +125,49 @@ export type ClientHookReturnType<TData = unknown> = [
  * `@prismicio/client` instance. The created hook has its own internal state
  * manager to report async status, such as pending or error statuses.
  *
- * @param method - The `@prismicio/client` method to which hook arguments will
- *   be forwarded.
+ * @param methodName - The `@prismicio/client` method to which hook arguments
+ *   will be forwarded.
  *
  * @returns A new React hook configured for the provided method.
+ *
  * @internal
  */
 export const useStatefulPrismicClientMethod = <
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	TMethod extends (...args: any[]) => Promise<any>,
-	TArgs extends Parameters<TMethod>,
-	TData extends UnwrapPromise<ReturnType<TMethod>>,
+	TMethodName extends ClientMethodName,
+	TArgs extends Parameters<ClientMethod<TMethodName>>,
+	TData extends UnwrapPromise<ReturnType<ClientMethod<TMethodName>>>,
 >(
-	method: TMethod,
+	methodName: TMethodName,
 	args: TArgs,
+	explicitClient?: prismic.Client,
 ): ClientHookReturnType<TData> => {
 	const lastArg = args[args.length - 1];
 	const {
-		client: explicitClient,
+		client: lastArgExplicitClient,
 		skip,
 		...params
 	} = isParams(lastArg) ? lastArg : ({} as HookOnlyParameters);
 	const argsWithoutParams = isParams(lastArg) ? args.slice(0, -1) : args;
 
-	const client = usePrismicClient(explicitClient);
+	const client = usePrismicClient(explicitClient || lastArgExplicitClient);
 
 	const [state, dispatch] = React.useReducer<
-		React.Reducer<
-			StateMachineState<UnwrapPromise<ReturnType<TMethod>>>,
-			StateMachineAction<UnwrapPromise<ReturnType<TMethod>>>
-		>
+		React.Reducer<StateMachineState<TData>, StateMachineAction<TData>>
 	>(reducer, initialState);
 
 	React.useEffect(
 		() => {
 			if (state.state === "idle" && !skip) {
 				dispatch(["start"]);
-				method
-					.call(client, ...argsWithoutParams, params)
-					.then((result) => dispatch(["succeed", result]))
+
+				client[methodName]
+					.call(
+						client,
+						// @ts-expect-error - Merging method arg types is too complex
+						...argsWithoutParams,
+						params,
+					)
+					.then((result) => dispatch(["succeed", result as TData]))
 					.catch((error) => dispatch(["fail", error]));
 			}
 		},
@@ -159,7 +177,7 @@ export const useStatefulPrismicClientMethod = <
 			client,
 			state.state,
 			skip,
-			method,
+			methodName,
 			// eslint-disable-next-line react-hooks/exhaustive-deps
 			...args.slice(0, -1),
 			// eslint-disable-next-line react-hooks/exhaustive-deps
@@ -168,7 +186,13 @@ export const useStatefulPrismicClientMethod = <
 	);
 
 	return React.useMemo(
-		() => [state.data, { state: state.state, error: state.error }],
+		() => [
+			state.data,
+			{
+				state: state.state,
+				error: state.error,
+			},
+		],
 		[state],
 	);
 };