remove react/context|hooks|parser entry points, remove parser utils completely

.api-reports/api-report-core.api.md

@@ -2022,7 +2022,7 @@ interface WriteContext extends ReadMergeModifyContext {
 // src/cache/inmemory/types.ts:133:3 - (ae-forgotten-export) The symbol "KeyFieldsFunction" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:130:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:131:5 - (ae-forgotten-export) The symbol "QueryInfo" needs to be exported by the entry point index.d.ts
-// src/core/QueryManager.ts:187:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
+// src/core/QueryManager.ts:185:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 // src/core/QueryManager.ts:455:7 - (ae-forgotten-export) The symbol "UpdateQueries" needs to be exported by the entry point index.d.ts
 
 // (No @packageDocumentation comment for this package)

.api-reports/api-report-react_internal.api.md

@@ -18,13 +18,13 @@ import type { OperationVariables } from '@apollo/client/core';
 import type { PromiseWithState } from '@apollo/client/utilities';
 import type { QueryResult } from '@apollo/client/core';
 import type { Unmasked } from '@apollo/client/core';
-import type { useBackgroundQuery } from '@apollo/client/react/hooks';
-import type { useFragment } from '@apollo/client/react/hooks';
-import type { useQuery } from '@apollo/client/react/hooks';
-import type { useQueryRefHandlers } from '@apollo/client/react/hooks';
-import type { useReadQuery } from '@apollo/client/react/hooks';
-import type { useSuspenseFragment } from '@apollo/client/react/hooks';
-import type { useSuspenseQuery } from '@apollo/client/react/hooks';
+import type { useBackgroundQuery } from '@apollo/client/react';
+import type { useFragment } from '@apollo/client/react';
+import type { useQuery } from '@apollo/client/react';
+import type { useQueryRefHandlers } from '@apollo/client/react';
+import type { useReadQuery } from '@apollo/client/react';
+import type { useSuspenseFragment } from '@apollo/client/react';
+import type { useSuspenseQuery } from '@apollo/client/react';
 import type { WatchFragmentOptions } from '@apollo/client/core';
 import type { WatchFragmentOptions as WatchFragmentOptions_2 } from '@apollo/client/cache';
 import type { WatchFragmentResult } from '@apollo/client/cache';

.api-reports/api-report-utilities.api.md

@@ -25,6 +25,7 @@ import type { MutationOptions } from '@apollo/client/core';
 import type { NameNode } from 'graphql';
 import { Observable } from 'rxjs';
 import type { OperationDefinitionNode } from 'graphql';
+import type { OperationTypeNode } from 'graphql';
 import type { OperationVariables } from '@apollo/client/core';
 import type { QueryOptions } from '@apollo/client/core';
 import type { Reference as Reference_2 } from '@apollo/client/cache';
@@ -84,7 +85,6 @@ export interface CacheSizes {
     "queryManager.getDocumentInfo": number;
     "removeTypenameFromVariables.getVariableDefinitions": number;
     canonicalStringify: number;
-    parser: number;
     print: number;
 }
 
@@ -103,7 +103,7 @@ export const canUseDOM: boolean;
 export const canUseLayoutEffect: boolean;
 
 // @public (undocumented)
-export function checkDocument(doc: DocumentNode): DocumentNode;
+export function checkDocument(doc: DocumentNode, expectedType?: OperationTypeNode): DocumentNode;
 
 // @public
 export function cloneDeep<T>(value: T): T;
@@ -213,8 +213,6 @@ export const enum defaultCacheSizes {
     // (undocumented)
     canonicalStringify = 1000,
     // (undocumented)
-    parser = 1000,
-    // (undocumented)
     print = 2000
 }
 

.api-reports/api-report-utilities_internal.api.md

@@ -38,7 +38,6 @@ export const getApolloClientMemoryInternals: (() => {
             transform: number | undefined;
         } | undefined;
         print: number | undefined;
-        parser: number | undefined;
         canonicalStringify: number | undefined;
         links: unknown[];
         queryManager: {

.api-reports/api-report.api.md

@@ -962,7 +962,6 @@ const getApolloClientMemoryInternals: (() => {
             transform: number | undefined;
         } | undefined;
         print: number | undefined;
-        parser: number | undefined;
         canonicalStringify: number | undefined;
         links: unknown[];
         queryManager: {
@@ -2482,7 +2481,7 @@ interface WriteContext extends ReadMergeModifyContext {
 // src/cache/inmemory/types.ts:133:3 - (ae-forgotten-export) The symbol "KeyFieldsFunction" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:130:5 - (ae-forgotten-export) The symbol "QueryManager" needs to be exported by the entry point index.d.ts
 // src/core/ObservableQuery.ts:131:5 - (ae-forgotten-export) The symbol "QueryInfo" needs to be exported by the entry point index.d.ts
-// src/core/QueryManager.ts:187:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
+// src/core/QueryManager.ts:185:5 - (ae-forgotten-export) The symbol "MutationStoreValue" needs to be exported by the entry point index.d.ts
 // src/core/QueryManager.ts:455:7 - (ae-forgotten-export) The symbol "UpdateQueries" needs to be exported by the entry point index.d.ts
 // src/link/http/selectHttpOptionsAndBody.ts:128:1 - (ae-forgotten-export) The symbol "HttpQueryOptions" needs to be exported by the entry point index.d.ts
 

.changeset/dirty-eagles-poke.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Removed the `@apollo/client/react/context` and `@apollo/client/react/hooks` entry points. Please use `@apollo/client/react` instead.

.changeset/nice-dots-matter.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": patch
+---
+
+Removed the `parser` cache. The functionality has been replaced in a way that doesn't need caching.

.changeset/purple-bears-flash.md

@@ -0,0 +1,5 @@
+---
+"@apollo/client": major
+---
+
+Removed the `@apollo/client/react/parser` entry point. There is no replacement.

.size-limits.json

@@ -1,6 +1,6 @@
 {
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 42953,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 38324,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 32954,
-  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27724
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (CJS)": 42819,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production) (CJS)": 38357,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\"": 32736,
+  "import { ApolloClient, InMemoryCache, HttpLink } from \"@apollo/client\" (production)": 27747
 }

package.json

@@ -53,10 +53,7 @@
       "react-server": "./src/react/index.react-server.ts",
       "default": "./src/react/index.ts"
     },
-    "./react/context": "./src/react/context/index.ts",
-    "./react/hooks": "./src/react/hooks/index.ts",
     "./react/internal": "./src/react/internal/index.ts",
-    "./react/parser": "./src/react/parser/index.ts",
     "./react/ssr": "./src/react/ssr/index.ts",
     "./testing": "./src/testing/index.ts",
     "./testing/core": "./src/testing/core/index.ts",

src/__tests__/__snapshots__/exports.ts.snap

@@ -248,11 +248,8 @@ exports[`exports of public entry points @apollo/client/react 1`] = `
 Array [
   "ApolloConsumer",
   "ApolloProvider",
-  "DocumentType",
   "createQueryPreloader",
   "getApolloContext",
-  "operationName",
-  "parser",
   "skipToken",
   "useApolloClient",
   "useBackgroundQuery",
@@ -274,38 +271,8 @@ exports[`exports of public entry points @apollo/client/react with conditions [re
 Array [
   "ApolloConsumer",
   "ApolloProvider",
-  "DocumentType",
   "createQueryPreloader",
   "getApolloContext",
-  "operationName",
-  "parser",
-  "useApolloClient",
-  "useBackgroundQuery",
-  "useFragment",
-  "useLazyQuery",
-  "useLoadableQuery",
-  "useMutation",
-  "useQuery",
-  "useQueryRefHandlers",
-  "useReactiveVar",
-  "useReadQuery",
-  "useSubscription",
-  "useSuspenseFragment",
-  "useSuspenseQuery",
-]
-`;
-
-exports[`exports of public entry points @apollo/client/react/context 1`] = `
-Array [
-  "ApolloConsumer",
-  "ApolloProvider",
-  "getApolloContext",
-]
-`;
-
-exports[`exports of public entry points @apollo/client/react/hooks 1`] = `
-Array [
-  "skipToken",
   "useApolloClient",
   "useBackgroundQuery",
   "useFragment",
@@ -335,15 +302,6 @@ Array [
 ]
 `;
 
-exports[`exports of public entry points @apollo/client/react/parser 1`] = `
-Array [
-  "DocumentType",
-  "operationName",
-  "parser",
-  "verifyDocumentType",
-]
-`;
-
 exports[`exports of public entry points @apollo/client/react/ssr 1`] = `
 Array [
   "getDataFromTree",

src/__tests__/exports.ts

@@ -27,10 +27,7 @@ import * as linkUtils from "@apollo/client/link/utils";
 import * as linkWS from "@apollo/client/link/ws";
 import * as masking from "@apollo/client/masking";
 import * as react from "@apollo/client/react";
-import * as reactContext from "@apollo/client/react/context";
-import * as reactHooks from "@apollo/client/react/hooks";
 import * as reactInternal from "@apollo/client/react/internal";
-import * as reactParser from "@apollo/client/react/parser";
 import * as reactSSR from "@apollo/client/react/ssr";
 import * as testing from "@apollo/client/testing";
 import * as testingCore from "@apollo/client/testing/core";
@@ -90,10 +87,7 @@ describe("exports of public entry points", () => {
   check("@apollo/client/link/ws", linkWS);
   check("@apollo/client/masking", masking);
   check("@apollo/client/react", react);
-  check("@apollo/client/react/context", reactContext);
-  check("@apollo/client/react/hooks", reactHooks);
   check("@apollo/client/react/internal", reactInternal);
-  check("@apollo/client/react/parser", reactParser);
   check("@apollo/client/react/ssr", reactSSR);
   check("@apollo/client/testing", testing);
   check("@apollo/client/testing/core", testingCore);

src/core/ApolloClient.ts

@@ -891,7 +891,6 @@ export class ApolloClient implements DataProxy {
    * ```json
    *{
    *  limits:     {
-   *    parser: 1000,
    *    canonicalStringify: 1000,
    *    print: 2000,
    *    'documentTransform.cache': 2000,
@@ -907,7 +906,6 @@ export class ApolloClient implements DataProxy {
    *    'inMemoryCache.executeSubSelectedArray': 5000
    *  },
    *  sizes: {
-   *    parser: 26,
    *    canonicalStringify: 4,
    *    print: 14,
    *    addTypenameDocumentTransform: [

src/core/QueryManager.ts

@@ -1,5 +1,6 @@
 import { Trie } from "@wry/trie";
 import type { DocumentNode } from "graphql";
+import { OperationTypeNode } from "graphql";
 import type { Subscription } from "rxjs";
 import {
   catchError,
@@ -32,7 +33,7 @@ import { execute } from "@apollo/client/link/core";
 import type { MaybeMasked, Unmasked } from "@apollo/client/masking";
 import { maskFragment, maskOperation } from "@apollo/client/masking";
 import type { DeepPartial } from "@apollo/client/utilities";
-import { print } from "@apollo/client/utilities";
+import { checkDocument, print } from "@apollo/client/utilities";
 import { AutoCleanedWeakCache, cacheSizes } from "@apollo/client/utilities";
 import {
   addNonReactiveToNamedFragments,
@@ -102,9 +103,6 @@ import type {
 
 const { hasOwnProperty } = Object.prototype;
 
-// TODO(brian): A hack until this issue is resolved (https://github.com/graphql/graphql-js/issues/3356)
-type OperationTypeNode = any;
-
 const IGNORE = {} as IgnoreModifier;
 
 interface MutationStoreValue {
@@ -276,6 +274,8 @@ export class QueryManager {
       "mutation option is required. You must specify your GraphQL document in the mutation option."
     );
 
+    checkDocument(mutation, OperationTypeNode.MUTATION);
+
     invariant(
       fetchPolicy === "network-only" || fetchPolicy === "no-cache",
       "Mutations support only 'network-only' or 'no-cache' fetchPolicy strings. The default `network-only` behavior automatically writes mutation results to the cache. Passing `no-cache` skips the cache write."
@@ -788,6 +788,8 @@ export class QueryManager {
     T,
     TVariables extends OperationVariables = OperationVariables,
   >(options: WatchQueryOptions<TVariables, T>): ObservableQuery<T, TVariables> {
+    checkDocument(options.query, OperationTypeNode.QUERY);
+
     const query = this.transform(options.query);
 
     // assign variable default values if supplied
@@ -824,6 +826,8 @@ export class QueryManager {
     options: QueryOptions<TVars, TData>,
     queryId = this.generateQueryId()
   ): Promise<QueryResult<MaybeMasked<TData>>> {
+    checkDocument(options.query, OperationTypeNode.QUERY);
+
     const query = this.transform(options.query);
 
     return this.fetchQuery<TData, TVars>(queryId, { ...options, query })
@@ -1027,6 +1031,8 @@ export class QueryManager {
       extensions = {},
     } = options;
 
+    checkDocument(query, OperationTypeNode.SUBSCRIPTION);
+
     query = this.transform(query);
     variables = this.getVariables(query, variables);
 

src/link/persisted-queries/__tests__/react.test.tsx

@@ -15,8 +15,7 @@ import {
   createPersistedQueryLink as createPersistedQuery,
   VERSION,
 } from "@apollo/client/link/persisted-queries";
-import { useQuery } from "@apollo/client/react";
-import { ApolloProvider } from "@apollo/client/react/context";
+import { ApolloProvider, useQuery } from "@apollo/client/react";
 import { getDataFromTree } from "@apollo/client/react/ssr";
 import { addTypenameToDocument } from "@apollo/client/utilities";
 

src/react/context/ApolloConsumer.tsx

@@ -6,11 +6,13 @@ import { invariant } from "@apollo/client/utilities/invariant";
 
 import { getApolloContext } from "./ApolloContext.js";
 
-export interface ApolloConsumerProps {
-  children: (client: ApolloClient) => ReactTypes.ReactNode;
+declare namespace ApolloConsumer {
+  export interface Props {
+    children: (client: ApolloClient) => ReactTypes.ReactNode;
+  }
 }
 
-export const ApolloConsumer: ReactTypes.FC<ApolloConsumerProps> = (props) => {
+export const ApolloConsumer: ReactTypes.FC<ApolloConsumer.Props> = (props) => {
   const ApolloContext = getApolloContext();
   return (
     <ApolloContext.Consumer>

src/react/context/ApolloProvider.tsx

@@ -6,12 +6,14 @@ import { invariant } from "@apollo/client/utilities/invariant";
 
 import { getApolloContext } from "./ApolloContext.js";
 
-export interface ApolloProviderProps {
-  client: ApolloClient;
-  children: ReactTypes.ReactNode | ReactTypes.ReactNode[] | null;
+export declare namespace ApolloProvider {
+  interface Props {
+    client: ApolloClient;
+    children: ReactTypes.ReactNode | ReactTypes.ReactNode[] | null;
+  }
 }
 
-export const ApolloProvider: ReactTypes.FC<ApolloProviderProps> = ({
+export const ApolloProvider: ReactTypes.FC<ApolloProvider.Props> = ({
   client,
   children,
 }) => {

src/react/context/__tests__/ApolloConsumer.test.tsx

@@ -8,7 +8,7 @@ import {
   ApolloConsumer,
   ApolloProvider,
   getApolloContext,
-} from "@apollo/client/react/context";
+} from "@apollo/client/react";
 
 const client = new ApolloClient({
   cache: new Cache(),

src/react/context/__tests__/ApolloProvider.test.tsx

@@ -4,10 +4,9 @@ import React, { useContext } from "react";
 import { InMemoryCache as Cache } from "@apollo/client/cache";
 import { ApolloClient } from "@apollo/client/core";
 import { ApolloLink } from "@apollo/client/link/core";
-import { ApolloProvider, getApolloContext } from "@apollo/client/react/context";
+import { ApolloProvider, getApolloContext } from "@apollo/client/react";
 
 import type { ApolloContextValue } from "../ApolloContext.js";
-import type { ApolloProviderProps } from "../ApolloProvider.js";
 
 describe("<ApolloProvider /> Component", () => {
   const client = new ApolloClient({
@@ -115,8 +114,8 @@ describe("<ApolloProvider /> Component", () => {
   describe.each<
     [
       string,
-      Omit<ApolloProviderProps, "children">,
-      Omit<ApolloProviderProps, "children">,
+      Omit<ApolloProvider.Props, "children">,
+      Omit<ApolloProvider.Props, "children">,
     ]
   >([["client", { client }, { client: anotherClient }]])(
     "context value stability, %s prop",

src/react/hooks/__tests__/useApolloClient.test.tsx

@@ -4,8 +4,7 @@ import React from "react";
 import { InMemoryCache } from "@apollo/client/cache";
 import { ApolloClient } from "@apollo/client/core";
 import { ApolloLink } from "@apollo/client/link/core";
-import { ApolloProvider } from "@apollo/client/react/context";
-import { useApolloClient } from "@apollo/client/react/hooks";
+import { ApolloProvider, useApolloClient } from "@apollo/client/react";
 import { InvariantError } from "@apollo/client/utilities/invariant";
 
 describe("useApolloClient Hook", () => {