Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow QueryManager to intercept hook functionality #11617

Merged
merged 17 commits into from
Mar 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
397 changes: 391 additions & 6 deletions .api-reports/api-report-react_internal.md

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .changeset/curvy-maps-give.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@apollo/client": patch
---

Allow Apollo Client instance to intercept hook functionality
2 changes: 1 addition & 1 deletion .size-limits.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"dist/apollo-client.min.cjs": 39075,
"dist/apollo-client.min.cjs": 39209,
"import { ApolloClient, InMemoryCache, HttpLink } from \"dist/index.js\" (production)": 32584
}
4 changes: 3 additions & 1 deletion config/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import cleanup from "rollup-plugin-cleanup";
const entryPoints = require("./entryPoints");
const distDir = "./dist";

const removeComments = cleanup({});
const removeComments = cleanup({
comments: ["some", /#__PURE__/, /#__NO_SIDE_EFFECTS__/],
});
Comment on lines +11 to +13
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't strictly need this here anymore in this specific case, but it would be good to have this in our bundling config anyways, so I'll leave it here.


function isExternal(id, parentId, entryPointsAreExternal = true) {
let posixId = toPosixPath(id);
Expand Down
1 change: 1 addition & 0 deletions src/react/hooks/internal/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ export { useIsomorphicLayoutEffect } from "./useIsomorphicLayoutEffect.js";
export { useRenderGuard } from "./useRenderGuard.js";
export { useLazyRef } from "./useLazyRef.js";
export { __use } from "./__use.js";
export { wrapHook } from "./wrapHook.js";
88 changes: 88 additions & 0 deletions src/react/hooks/internal/wrapHook.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import type {
useQuery,
useSuspenseQuery,
useBackgroundQuery,
useReadQuery,
useFragment,
} from "../index.js";
import type { QueryManager } from "../../../core/QueryManager.js";
import type { ApolloClient } from "../../../core/ApolloClient.js";
import type { ObservableQuery } from "../../../core/ObservableQuery.js";

const wrapperSymbol = Symbol.for("apollo.hook.wrappers");

interface WrappableHooks {
useQuery: typeof useQuery;
useSuspenseQuery: typeof useSuspenseQuery;
useBackgroundQuery: typeof useBackgroundQuery;
useReadQuery: typeof useReadQuery;
useFragment: typeof useFragment;
}

/**
* @internal
* Can be used to correctly type the [Symbol.for("apollo.hook.wrappers")] property of
* `QueryManager`, to override/wrap hook functionality.
*/
export type HookWrappers = {
[K in keyof WrappableHooks]?: (
originalHook: WrappableHooks[K]
) => WrappableHooks[K];
};

interface QueryManagerWithWrappers<T> extends QueryManager<T> {
[wrapperSymbol]?: HookWrappers;
}

/**
* @internal
*
* Makes an Apollo Client hook "wrappable".
* That means that the Apollo Client instance can expose a "wrapper" that will be
* used to wrap the original hook implementation with additional logic.
* @example
* ```tsx
* // this is already done in `@apollo/client` for all wrappable hooks (see `WrappableHooks`)
* // following this pattern
* function useQuery() {
* return wrapHook('useQuery', _useQuery, options.client)(query, options);
* }
* function _useQuery(query, options) {
* // original implementation
* }
*
* // this is what a library like `@apollo/client-react-streaming` would do
* class ApolloClientWithStreaming extends ApolloClient {
* constructor(options) {
* super(options);
* this.queryManager[Symbol.for("apollo.hook.wrappers")] = {
* useQuery: (original) => (query, options) => {
* console.log("useQuery was called with options", options);
* return original(query, options);
* }
* }
* }
* }
*
* // this will now log the options and then call the original `useQuery`
* const client = new ApolloClientWithStreaming({ ... });
* useQuery(query, { client });
* ```
*/
export function wrapHook<Hook extends (...args: any[]) => any>(
hookName: keyof WrappableHooks,
useHook: Hook,
clientOrObsQuery: ObservableQuery<any> | ApolloClient<any>
phryneas marked this conversation as resolved.
Show resolved Hide resolved
): Hook {
const queryManager = (
clientOrObsQuery as unknown as {
// both `ApolloClient` and `ObservableQuery` have a `queryManager` property
// but they're both `private`, so we have to cast around for a bit here.
queryManager: QueryManagerWithWrappers<any>;
}
)["queryManager"];
const wrappers = queryManager && queryManager[wrapperSymbol];
const wrapper: undefined | ((wrap: Hook) => Hook) =
wrappers && (wrappers[hookName] as any);
return wrapper ? wrapper(useHook) : useHook;
}
22 changes: 21 additions & 1 deletion src/react/hooks/useBackgroundQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
} from "../internal/index.js";
import type { CacheKey, QueryReference } from "../internal/index.js";
import type { BackgroundQueryHookOptions, NoInfer } from "../types/types.js";
import { __use } from "./internal/index.js";
import { __use, wrapHook } from "./internal/index.js";
import { useWatchQueryOptions } from "./useSuspenseQuery.js";
import type { FetchMoreFunction, RefetchFunction } from "./useSuspenseQuery.js";
import { canonicalStringify } from "../../cache/index.js";
Expand Down Expand Up @@ -182,6 +182,26 @@ export function useBackgroundQuery<
): [
QueryReference<TData, TVariables> | undefined,
UseBackgroundQueryResult<TData, TVariables>,
] {
return wrapHook(
"useBackgroundQuery",
_useBackgroundQuery,
useApolloClient(typeof options === "object" ? options.client : undefined)
)(query, options);
}

function _useBackgroundQuery<
TData = unknown,
TVariables extends OperationVariables = OperationVariables,
>(
query: DocumentNode | TypedDocumentNode<TData, TVariables>,
options:
| (SkipToken &
Partial<BackgroundQueryHookOptionsNoInfer<TData, TVariables>>)
| BackgroundQueryHookOptionsNoInfer<TData, TVariables>
): [
QueryReference<TData, TVariables> | undefined,
UseBackgroundQueryResult<TData, TVariables>,
] {
const client = useApolloClient(options.client);
const suspenseCache = getSuspenseCache(client);
Expand Down
12 changes: 11 additions & 1 deletion src/react/hooks/useFragment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { useApolloClient } from "./useApolloClient.js";
import { useSyncExternalStore } from "./useSyncExternalStore.js";
import type { ApolloClient, OperationVariables } from "../../core/index.js";
import type { NoInfer } from "../types/types.js";
import { useDeepMemo, useLazyRef } from "./internal/index.js";
import { useDeepMemo, useLazyRef, wrapHook } from "./internal/index.js";

export interface UseFragmentOptions<TData, TVars>
extends Omit<
Expand Down Expand Up @@ -53,6 +53,16 @@ export type UseFragmentResult<TData> =

export function useFragment<TData = any, TVars = OperationVariables>(
options: UseFragmentOptions<TData, TVars>
): UseFragmentResult<TData> {
return wrapHook(
"useFragment",
_useFragment,
useApolloClient(options.client)
)(options);
}

function _useFragment<TData = any, TVars = OperationVariables>(
options: UseFragmentOptions<TData, TVars>
): UseFragmentResult<TData> {
const { cache } = useApolloClient(options.client);

Expand Down
15 changes: 15 additions & 0 deletions src/react/hooks/useQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import {
isNonEmptyArray,
maybeDeepFreeze,
} from "../../utilities/index.js";
import { wrapHook } from "./internal/index.js";

const {
prototype: { hasOwnProperty },
Expand Down Expand Up @@ -85,6 +86,20 @@ export function useQuery<
NoInfer<TVariables>
> = Object.create(null)
): QueryResult<TData, TVariables> {
return wrapHook(
"useQuery",
_useQuery,
useApolloClient(options && options.client)
)(query, options);
}

function _useQuery<
TData = any,
TVariables extends OperationVariables = OperationVariables,
>(
query: DocumentNode | TypedDocumentNode<TData, TVariables>,
options: QueryHookOptions<NoInfer<TData>, NoInfer<TVariables>>
) {
return useInternalState(useApolloClient(options.client), query).useQuery(
options
);
Expand Down
12 changes: 11 additions & 1 deletion src/react/hooks/useReadQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
updateWrappedQueryRef,
} from "../internal/index.js";
import type { QueryReference } from "../internal/index.js";
import { __use } from "./internal/index.js";
import { __use, wrapHook } from "./internal/index.js";
import { toApolloError } from "./useSuspenseQuery.js";
import { useSyncExternalStore } from "./useSyncExternalStore.js";
import type { ApolloError } from "../../errors/index.js";
Expand Down Expand Up @@ -38,6 +38,16 @@ export interface UseReadQueryResult<TData = unknown> {

export function useReadQuery<TData>(
queryRef: QueryReference<TData>
): UseReadQueryResult<TData> {
return wrapHook(
"useReadQuery",
_useReadQuery,
unwrapQueryRef(queryRef)["observable"]
)(queryRef);
}

function _useReadQuery<TData>(
queryRef: QueryReference<TData>
): UseReadQueryResult<TData> {
const internalQueryRef = React.useMemo(
() => unwrapQueryRef(queryRef),
Expand Down
18 changes: 17 additions & 1 deletion src/react/hooks/useSuspenseQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import type {
ObservableQueryFields,
NoInfer,
} from "../types/types.js";
import { __use, useDeepMemo } from "./internal/index.js";
import { __use, useDeepMemo, wrapHook } from "./internal/index.js";
import { getSuspenseCache } from "../internal/index.js";
import { canonicalStringify } from "../../cache/index.js";
import { skipToken } from "./constants.js";
Expand Down Expand Up @@ -174,6 +174,22 @@ export function useSuspenseQuery<
options:
| (SkipToken & Partial<SuspenseQueryHookOptions<TData, TVariables>>)
| SuspenseQueryHookOptions<TData, TVariables> = Object.create(null)
): UseSuspenseQueryResult<TData | undefined, TVariables> {
return wrapHook(
"useSuspenseQuery",
_useSuspenseQuery,
useApolloClient(typeof options === "object" ? options.client : undefined)
)(query, options);
}

function _useSuspenseQuery<
TData = unknown,
TVariables extends OperationVariables = OperationVariables,
>(
query: DocumentNode | TypedDocumentNode<TData, TVariables>,
options:
| (SkipToken & Partial<SuspenseQueryHookOptions<TData, TVariables>>)
| SuspenseQueryHookOptions<TData, TVariables>
): UseSuspenseQueryResult<TData | undefined, TVariables> {
const client = useApolloClient(options.client);
const suspenseCache = getSuspenseCache(client);
Expand Down
1 change: 1 addition & 0 deletions src/react/internal/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ export {
wrapQueryRef,
} from "./cache/QueryReference.js";
export type { SuspenseCacheOptions } from "./cache/SuspenseCache.js";
export type { HookWrappers } from "../hooks/internal/wrapHook.js";
Loading