@apollo/client 4.4.0-alpha.0 → 4.4.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +39 -0
- package/__cjs/cache/core/cache.cjs +50 -15
- package/__cjs/cache/core/cache.cjs.map +1 -1
- package/__cjs/cache/core/cache.d.cts +22 -4
- package/__cjs/cache/index.cjs.map +1 -1
- package/__cjs/cache/index.d.cts +1 -1
- package/__cjs/cache/inmemory/entityStore.cjs +4 -4
- package/__cjs/cache/inmemory/helpers.cjs +12 -0
- package/__cjs/cache/inmemory/helpers.cjs.map +1 -1
- package/__cjs/cache/inmemory/helpers.d.cts +10 -5
- package/__cjs/cache/inmemory/inMemoryCache.cjs +13 -2
- package/__cjs/cache/inmemory/inMemoryCache.cjs.map +1 -1
- package/__cjs/cache/inmemory/inMemoryCache.d.cts +19 -4
- package/__cjs/cache/inmemory/key-extractor.cjs +1 -1
- package/__cjs/cache/inmemory/policies.cjs +7 -7
- package/__cjs/cache/inmemory/policies.cjs.map +1 -1
- package/__cjs/cache/inmemory/readFromStore.cjs +86 -31
- package/__cjs/cache/inmemory/readFromStore.cjs.map +1 -1
- package/__cjs/cache/inmemory/types.d.cts +11 -2
- package/__cjs/cache/inmemory/writeToStore.cjs +27 -24
- package/__cjs/cache/inmemory/writeToStore.cjs.map +1 -1
- package/__cjs/cache/inmemory/writeToStore.d.cts +5 -4
- package/__cjs/core/ApolloClient.cjs +19 -15
- package/__cjs/core/ApolloClient.cjs.map +1 -1
- package/__cjs/core/ApolloClient.d.cts +1 -0
- package/__cjs/core/ObservableQuery.cjs +8 -8
- package/__cjs/core/QueryInfo.cjs +1 -1
- package/__cjs/core/QueryManager.cjs +12 -12
- package/__cjs/core/RefetchEventManager.cjs +3 -3
- package/__cjs/errors/CombinedGraphQLErrors.cjs +3 -7
- package/__cjs/errors/CombinedGraphQLErrors.cjs.map +1 -1
- package/__cjs/errors/CombinedGraphQLErrors.d.cts +2 -2
- package/__cjs/errors/CombinedProtocolErrors.cjs +3 -8
- package/__cjs/errors/CombinedProtocolErrors.cjs.map +1 -1
- package/__cjs/errors/CombinedProtocolErrors.d.cts +2 -2
- package/__cjs/incremental/handlers/graphql17Alpha9.cjs +2 -2
- package/__cjs/incremental/handlers/notImplemented.cjs +1 -1
- package/__cjs/invariantErrorCodes.cjs +125 -120
- package/__cjs/link/core/ApolloLink.cjs +3 -3
- package/__cjs/link/http/checkFetcher.cjs +1 -1
- package/__cjs/link/http/parseAndCheckHttpResponse.cjs +1 -1
- package/__cjs/link/persisted-queries/index.cjs +2 -2
- package/__cjs/link/ws/index.cjs +1 -1
- package/__cjs/local-state/LocalState.cjs +23 -22
- package/__cjs/local-state/LocalState.cjs.map +1 -1
- package/__cjs/masking/maskDefinition.cjs +20 -2
- package/__cjs/masking/maskDefinition.cjs.map +1 -1
- package/__cjs/masking/maskFragment.cjs +2 -2
- package/__cjs/masking/maskOperation.cjs +1 -1
- package/__cjs/masking/utils.cjs +3 -3
- package/__cjs/react/context/ApolloContext.cjs +1 -1
- package/__cjs/react/context/ApolloProvider.cjs +1 -1
- package/__cjs/react/hooks/internal/validateSuspenseHookOptions.cjs +2 -2
- package/__cjs/react/hooks/useApolloClient.cjs +1 -1
- package/__cjs/react/hooks/useFragment.cjs +8 -2
- package/__cjs/react/hooks/useFragment.cjs.map +1 -1
- package/__cjs/react/hooks/useLazyQuery.cjs +2 -2
- package/__cjs/react/hooks/useLoadableQuery.cjs +2 -2
- package/__cjs/react/hooks/useSubscription.cjs +1 -1
- package/__cjs/react/hooks/useSuspenseFragment.cjs +10 -4
- package/__cjs/react/hooks/useSuspenseFragment.cjs.map +1 -1
- package/__cjs/react/hooks/useSyncExternalStore.cjs +1 -1
- package/__cjs/react/internal/cache/FragmentReference.cjs +2 -2
- package/__cjs/react/internal/cache/FragmentReference.cjs.map +1 -1
- package/__cjs/react/internal/cache/FragmentReference.d.cts +4 -5
- package/__cjs/react/internal/cache/QueryReference.cjs +1 -1
- package/__cjs/react/internal/cache/SuspenseCache.cjs +3 -3
- package/__cjs/react/internal/cache/SuspenseCache.cjs.map +1 -1
- package/__cjs/react/internal/cache/SuspenseCache.d.cts +4 -5
- package/__cjs/react/internal/cache/types.d.cts +0 -5
- package/__cjs/react/ssr/prerenderStatic.cjs +2 -2
- package/__cjs/testing/core/mocking/mockLink.cjs +4 -4
- package/__cjs/utilities/graphql/DocumentTransform.cjs +1 -1
- package/__cjs/utilities/internal/DeepMerger.cjs +6 -2
- package/__cjs/utilities/internal/DeepMerger.cjs.map +1 -1
- package/__cjs/utilities/internal/DeepMerger.d.cts +13 -3
- package/__cjs/utilities/internal/constants.cjs +33 -1
- package/__cjs/utilities/internal/constants.cjs.map +1 -1
- package/__cjs/utilities/internal/constants.d.cts +32 -0
- package/__cjs/utilities/internal/createArgumentNode.cjs +14 -0
- package/__cjs/utilities/internal/createArgumentNode.cjs.map +1 -0
- package/__cjs/utilities/internal/createArgumentNode.d.cts +3 -0
- package/__cjs/utilities/internal/createDirectiveNode.cjs +14 -0
- package/__cjs/utilities/internal/createDirectiveNode.cjs.map +1 -0
- package/__cjs/utilities/internal/createDirectiveNode.d.cts +3 -0
- package/__cjs/utilities/internal/createFragmentSpreadNode.cjs +4 -1
- package/__cjs/utilities/internal/createFragmentSpreadNode.cjs.map +1 -1
- package/__cjs/utilities/internal/createFragmentSpreadNode.d.cts +3 -2
- package/__cjs/utilities/internal/createValueNode.cjs +27 -0
- package/__cjs/utilities/internal/createValueNode.cjs.map +1 -0
- package/__cjs/utilities/internal/createValueNode.d.cts +12 -0
- package/__cjs/utilities/internal/equalByQuery.cjs +8 -8
- package/__cjs/utilities/internal/equalByQuery.cjs.map +1 -1
- package/__cjs/utilities/internal/equalByQuery.d.cts +2 -3
- package/__cjs/utilities/internal/getFragmentDefinition.cjs +3 -3
- package/__cjs/utilities/internal/getFragmentDefinition.cjs.map +1 -1
- package/__cjs/utilities/internal/getFragmentFromSelection.cjs +1 -1
- package/__cjs/utilities/internal/getFragmentQueryDocument.cjs +10 -2
- package/__cjs/utilities/internal/getFragmentQueryDocument.cjs.map +1 -1
- package/__cjs/utilities/internal/getFragmentScope.cjs +23 -0
- package/__cjs/utilities/internal/getFragmentScope.cjs.map +1 -0
- package/__cjs/utilities/internal/getFragmentScope.d.cts +13 -0
- package/__cjs/utilities/internal/getFragmentVariables.cjs +14 -15
- package/__cjs/utilities/internal/getFragmentVariables.cjs.map +1 -1
- package/__cjs/utilities/internal/getFragmentVariables.d.cts +8 -4
- package/__cjs/utilities/internal/getMainDefinition.cjs +1 -1
- package/__cjs/utilities/internal/getQueryDefinition.cjs +1 -1
- package/__cjs/utilities/internal/index.cjs +9 -2
- package/__cjs/utilities/internal/index.cjs.map +1 -1
- package/__cjs/utilities/internal/index.d.cts +5 -1
- package/__cjs/utilities/internal/isNonEmptyObject.cjs +13 -0
- package/__cjs/utilities/internal/isNonEmptyObject.cjs.map +1 -0
- package/__cjs/utilities/internal/isNonEmptyObject.d.cts +7 -0
- package/__cjs/utilities/internal/isNonNullObject.cjs.map +1 -1
- package/__cjs/utilities/internal/isNonNullObject.d.cts +1 -1
- package/__cjs/utilities/internal/mapObservableFragment.cjs +14 -9
- package/__cjs/utilities/internal/mapObservableFragment.cjs.map +1 -1
- package/__cjs/utilities/internal/mapObservableFragment.d.cts +5 -1
- package/__cjs/utilities/internal/mergeDeepArray.cjs +2 -2
- package/__cjs/utilities/internal/mergeDeepArray.cjs.map +1 -1
- package/__cjs/utilities/internal/mergeDeepArray.d.cts +2 -1
- package/__cjs/utilities/internal/removeDirectivesFromDocument.cjs +1 -1
- package/__cjs/utilities/internal/removeFragmentSpreads.cjs +55 -2
- package/__cjs/utilities/internal/removeFragmentSpreads.cjs.map +1 -1
- package/__cjs/utilities/internal/removeFragmentSpreads.d.cts +17 -1
- package/__cjs/utilities/internal/shouldInclude.cjs +4 -4
- package/__cjs/utilities/internal/types/FragmentInfo.cjs +3 -0
- package/__cjs/utilities/internal/types/FragmentInfo.cjs.map +1 -0
- package/__cjs/utilities/internal/types/FragmentInfo.d.cts +14 -0
- package/__cjs/utilities/internal/types/ObjectWithFragmentInfo.cjs +3 -0
- package/__cjs/utilities/internal/types/ObjectWithFragmentInfo.cjs.map +1 -0
- package/__cjs/utilities/internal/types/ObjectWithFragmentInfo.d.cts +13 -0
- package/__cjs/utilities/internal/valueToObjectRepresentation.cjs +1 -1
- package/__cjs/version.cjs +1 -1
- package/cache/core/cache.d.ts +22 -4
- package/cache/core/cache.js +51 -16
- package/cache/core/cache.js.map +1 -1
- package/cache/index.d.ts +1 -1
- package/cache/index.js.map +1 -1
- package/cache/inmemory/entityStore.js +4 -4
- package/cache/inmemory/helpers.d.ts +10 -5
- package/cache/inmemory/helpers.js +12 -1
- package/cache/inmemory/helpers.js.map +1 -1
- package/cache/inmemory/inMemoryCache.d.ts +19 -4
- package/cache/inmemory/inMemoryCache.js +14 -3
- package/cache/inmemory/inMemoryCache.js.map +1 -1
- package/cache/inmemory/key-extractor.js +1 -1
- package/cache/inmemory/policies.js +7 -7
- package/cache/inmemory/policies.js.map +1 -1
- package/cache/inmemory/readFromStore.js +89 -34
- package/cache/inmemory/readFromStore.js.map +1 -1
- package/cache/inmemory/types.d.ts +11 -2
- package/cache/inmemory/types.js.map +1 -1
- package/cache/inmemory/writeToStore.d.ts +5 -4
- package/cache/inmemory/writeToStore.js +30 -27
- package/cache/inmemory/writeToStore.js.map +1 -1
- package/core/ApolloClient.d.ts +1 -0
- package/core/ApolloClient.js +20 -16
- package/core/ApolloClient.js.map +1 -1
- package/core/ObservableQuery.js +8 -8
- package/core/QueryInfo.js +1 -1
- package/core/QueryManager.js +12 -12
- package/core/RefetchEventManager.js +3 -3
- package/errors/CombinedGraphQLErrors.d.ts +2 -2
- package/errors/CombinedGraphQLErrors.js +3 -7
- package/errors/CombinedGraphQLErrors.js.map +1 -1
- package/errors/CombinedProtocolErrors.d.ts +2 -2
- package/errors/CombinedProtocolErrors.js +3 -8
- package/errors/CombinedProtocolErrors.js.map +1 -1
- package/incremental/handlers/graphql17Alpha9.js +2 -2
- package/incremental/handlers/notImplemented.js +1 -1
- package/invariantErrorCodes.js +125 -120
- package/link/core/ApolloLink.js +3 -3
- package/link/http/checkFetcher.js +1 -1
- package/link/http/parseAndCheckHttpResponse.js +1 -1
- package/link/persisted-queries/index.js +2 -2
- package/link/ws/index.js +1 -1
- package/local-state/LocalState.js +24 -23
- package/local-state/LocalState.js.map +1 -1
- package/masking/maskDefinition.js +21 -3
- package/masking/maskDefinition.js.map +1 -1
- package/masking/maskFragment.js +2 -2
- package/masking/maskOperation.js +1 -1
- package/masking/utils.js +3 -3
- package/package.json +1 -1
- package/react/context/ApolloContext.js +1 -1
- package/react/context/ApolloProvider.js +1 -1
- package/react/hooks/internal/validateSuspenseHookOptions.js +2 -2
- package/react/hooks/useApolloClient.js +1 -1
- package/react/hooks/useFragment.js +8 -2
- package/react/hooks/useFragment.js.map +1 -1
- package/react/hooks/useLazyQuery.js +2 -2
- package/react/hooks/useLoadableQuery.js +2 -2
- package/react/hooks/useSubscription.js +1 -1
- package/react/hooks/useSuspenseFragment.js +10 -4
- package/react/hooks/useSuspenseFragment.js.map +1 -1
- package/react/hooks/useSyncExternalStore.js +1 -1
- package/react/hooks-compiled/internal/validateSuspenseHookOptions.js +2 -2
- package/react/hooks-compiled/useApolloClient.js +1 -1
- package/react/hooks-compiled/useFragment.js +56 -32
- package/react/hooks-compiled/useFragment.js.map +1 -1
- package/react/hooks-compiled/useLazyQuery.js +2 -2
- package/react/hooks-compiled/useLoadableQuery.js +2 -2
- package/react/hooks-compiled/useSubscription.js +1 -1
- package/react/hooks-compiled/useSuspenseFragment.js +10 -4
- package/react/hooks-compiled/useSuspenseFragment.js.map +1 -1
- package/react/hooks-compiled/useSyncExternalStore.js +1 -1
- package/react/internal/cache/FragmentReference.d.ts +4 -5
- package/react/internal/cache/FragmentReference.js +2 -2
- package/react/internal/cache/FragmentReference.js.map +1 -1
- package/react/internal/cache/QueryReference.js +1 -1
- package/react/internal/cache/SuspenseCache.d.ts +4 -5
- package/react/internal/cache/SuspenseCache.js +3 -3
- package/react/internal/cache/SuspenseCache.js.map +1 -1
- package/react/internal/cache/types.d.ts +0 -5
- package/react/internal/cache/types.js.map +1 -1
- package/react/ssr/prerenderStatic.js +2 -2
- package/testing/core/mocking/mockLink.js +4 -4
- package/utilities/graphql/DocumentTransform.js +1 -1
- package/utilities/internal/DeepMerger.d.ts +13 -3
- package/utilities/internal/DeepMerger.js +6 -2
- package/utilities/internal/DeepMerger.js.map +1 -1
- package/utilities/internal/constants.d.ts +32 -0
- package/utilities/internal/constants.js +32 -0
- package/utilities/internal/constants.js.map +1 -1
- package/utilities/internal/createArgumentNode.d.ts +3 -0
- package/utilities/internal/createArgumentNode.js +11 -0
- package/utilities/internal/createArgumentNode.js.map +1 -0
- package/utilities/internal/createDirectiveNode.d.ts +3 -0
- package/utilities/internal/createDirectiveNode.js +11 -0
- package/utilities/internal/createDirectiveNode.js.map +1 -0
- package/utilities/internal/createFragmentSpreadNode.d.ts +3 -2
- package/utilities/internal/createFragmentSpreadNode.js +4 -1
- package/utilities/internal/createFragmentSpreadNode.js.map +1 -1
- package/utilities/internal/createValueNode.d.ts +12 -0
- package/utilities/internal/createValueNode.js +24 -0
- package/utilities/internal/createValueNode.js.map +1 -0
- package/utilities/internal/equalByQuery.d.ts +2 -3
- package/utilities/internal/equalByQuery.js +8 -8
- package/utilities/internal/equalByQuery.js.map +1 -1
- package/utilities/internal/getFragmentDefinition.js +3 -3
- package/utilities/internal/getFragmentDefinition.js.map +1 -1
- package/utilities/internal/getFragmentFromSelection.js +1 -1
- package/utilities/internal/getFragmentQueryDocument.js +10 -2
- package/utilities/internal/getFragmentQueryDocument.js.map +1 -1
- package/utilities/internal/getFragmentScope.d.ts +13 -0
- package/utilities/internal/getFragmentScope.js +20 -0
- package/utilities/internal/getFragmentScope.js.map +1 -0
- package/utilities/internal/getFragmentVariables.d.ts +9 -5
- package/utilities/internal/getFragmentVariables.js +15 -16
- package/utilities/internal/getFragmentVariables.js.map +1 -1
- package/utilities/internal/getMainDefinition.js +1 -1
- package/utilities/internal/getQueryDefinition.js +1 -1
- package/utilities/internal/index.d.ts +5 -1
- package/utilities/internal/index.js +3 -1
- package/utilities/internal/index.js.map +1 -1
- package/utilities/internal/isNonEmptyObject.d.ts +7 -0
- package/utilities/internal/isNonEmptyObject.js +10 -0
- package/utilities/internal/isNonEmptyObject.js.map +1 -0
- package/utilities/internal/isNonNullObject.d.ts +1 -1
- package/utilities/internal/isNonNullObject.js.map +1 -1
- package/utilities/internal/mapObservableFragment.d.ts +5 -1
- package/utilities/internal/mapObservableFragment.js +14 -9
- package/utilities/internal/mapObservableFragment.js.map +1 -1
- package/utilities/internal/mergeDeepArray.d.ts +2 -1
- package/utilities/internal/mergeDeepArray.js +2 -2
- package/utilities/internal/mergeDeepArray.js.map +1 -1
- package/utilities/internal/removeDirectivesFromDocument.js +1 -1
- package/utilities/internal/removeFragmentSpreads.d.ts +18 -2
- package/utilities/internal/removeFragmentSpreads.js +56 -3
- package/utilities/internal/removeFragmentSpreads.js.map +1 -1
- package/utilities/internal/shouldInclude.js +4 -4
- package/utilities/internal/types/FragmentInfo.d.ts +14 -0
- package/utilities/internal/types/FragmentInfo.js +2 -0
- package/utilities/internal/types/FragmentInfo.js.map +1 -0
- package/utilities/internal/types/ObjectWithFragmentInfo.d.ts +13 -0
- package/utilities/internal/types/ObjectWithFragmentInfo.js +2 -0
- package/utilities/internal/types/ObjectWithFragmentInfo.js.map +1 -0
- package/utilities/internal/valueToObjectRepresentation.js +1 -1
- package/version.js +1 -1
|
@@ -2,13 +2,13 @@ import { equal } from "@wry/equality";
|
|
|
2
2
|
import { Trie } from "@wry/trie";
|
|
3
3
|
import { Kind } from "graphql";
|
|
4
4
|
import { wrap } from "optimism";
|
|
5
|
-
import { addTypenameToDocument, cacheSizes,
|
|
5
|
+
import { addTypenameToDocument, cacheSizes, isReference, } from "@apollo/client/utilities";
|
|
6
6
|
import { __DEV__ } from "@apollo/client/utilities/environment";
|
|
7
|
-
import { compact, DeepMerger, getDefaultValues, getDirectiveArgValue, getFragmentFromSelection, getFragmentVariables, getMainDefinition, getQueryDefinition, handleIncrementalSymbol, isArray, isDeferredFragment, isField, isNonNullObject, isStreamField, makeReference, maybeDeepFreeze, mergeDeepArray, resultKeyNameFromField, shouldInclude, } from "@apollo/client/utilities/internal";
|
|
7
|
+
import { compact, DeepMerger, fragmentInfoSymbol, getDefaultValues, getDirectiveArgValue, getFragmentFromSelection, getFragmentScope, getFragmentVariables, getMainDefinition, getQueryDefinition, handleIncrementalSymbol, isArray, isDeferredFragment, isField, isNonEmptyObject, isNonNullObject, isStreamField, makeReference, maybeDeepFreeze, mergeDeepArray, resultKeyNameFromField, rootFragmentVariablesSymbol, shouldInclude, } from "@apollo/client/utilities/internal";
|
|
8
8
|
import { invariant, newInvariantError, } from "@apollo/client/utilities/invariant";
|
|
9
9
|
import { MissingFieldError } from "../core/types/common.js";
|
|
10
10
|
import { maybeDependOnExistenceOfEntity, supportsResultCaching, } from "./entityStore.js";
|
|
11
|
-
import { extractFragmentContext, getTypenameFromStoreObject, } from "./helpers.js";
|
|
11
|
+
import { extractFragmentContext, getTypenameFromStoreObject, makeVarString, } from "./helpers.js";
|
|
12
12
|
function execSelectionSetKeyArgs(options) {
|
|
13
13
|
return [options.selectionSet, options.objectOrReference, options.context];
|
|
14
14
|
}
|
|
@@ -75,7 +75,7 @@ export class StoreReader {
|
|
|
75
75
|
});
|
|
76
76
|
this.prunePartialStreamArray = wrap((options) => {
|
|
77
77
|
const { field, context, path } = options;
|
|
78
|
-
if (isStreamField(field, context.
|
|
78
|
+
if (isStreamField(field, context.variablesScope)) {
|
|
79
79
|
context.streamInfo?.lookupArray(path).state.depend();
|
|
80
80
|
}
|
|
81
81
|
return this.prunePartialStreamArrayImpl(options);
|
|
@@ -89,7 +89,7 @@ export class StoreReader {
|
|
|
89
89
|
},
|
|
90
90
|
});
|
|
91
91
|
}
|
|
92
|
-
diffQueryAgainstStore({ store, query, rootId = "ROOT_QUERY", variables, returnPartialData = true, ...options }) {
|
|
92
|
+
diffQueryAgainstStore({ store, query, rootId = "ROOT_QUERY", variables, returnPartialData = true, [rootFragmentVariablesSymbol]: rootFragmentVariables, ...options }) {
|
|
93
93
|
const returnIncremental = Object.hasOwn(options, handleIncrementalSymbol);
|
|
94
94
|
const policies = this.config.cache.policies;
|
|
95
95
|
variables = compact(getDefaultValues(getQueryDefinition(query)), variables);
|
|
@@ -99,8 +99,8 @@ export class StoreReader {
|
|
|
99
99
|
query,
|
|
100
100
|
policies,
|
|
101
101
|
variables,
|
|
102
|
-
|
|
103
|
-
|
|
102
|
+
variablesScope: rootFragmentVariables ?? variables,
|
|
103
|
+
varString: makeVarString({ variables, scope: rootFragmentVariables }),
|
|
104
104
|
...extractFragmentContext(query, this.config.fragments),
|
|
105
105
|
...options[handleIncrementalSymbol],
|
|
106
106
|
};
|
|
@@ -206,7 +206,7 @@ export class StoreReader {
|
|
|
206
206
|
partialBoundaries: new PartialBoundaries(),
|
|
207
207
|
};
|
|
208
208
|
}
|
|
209
|
-
const {
|
|
209
|
+
const { variablesScope, policies, store } = context;
|
|
210
210
|
const typename = store.getFieldValue(objectOrReference, "__typename");
|
|
211
211
|
const objectsToMerge = [];
|
|
212
212
|
let dataState;
|
|
@@ -227,17 +227,19 @@ export class StoreReader {
|
|
|
227
227
|
}
|
|
228
228
|
return result;
|
|
229
229
|
}
|
|
230
|
+
let fragments;
|
|
231
|
+
let hasFragmentSpread = false;
|
|
230
232
|
const workSet = new Set(selectionSet.selections);
|
|
231
233
|
workSet.forEach((selection) => {
|
|
232
234
|
// Omit fields with directives @skip(if: <truthy value>) or
|
|
233
235
|
// @include(if: <falsy value>).
|
|
234
|
-
if (!shouldInclude(selection,
|
|
236
|
+
if (!shouldInclude(selection, variablesScope))
|
|
235
237
|
return;
|
|
236
238
|
if (isField(selection)) {
|
|
237
239
|
let fieldValue = policies.readField({
|
|
238
240
|
fieldName: selection.name.value,
|
|
239
241
|
field: selection,
|
|
240
|
-
variables: context.
|
|
242
|
+
variables: context.variablesScope,
|
|
241
243
|
from: objectOrReference,
|
|
242
244
|
}, context);
|
|
243
245
|
const resultName = resultKeyNameFromField(selection);
|
|
@@ -283,7 +285,7 @@ export class StoreReader {
|
|
|
283
285
|
if (typename) {
|
|
284
286
|
const policy = policies["getFieldPolicy"](typename, fieldName);
|
|
285
287
|
if (policy?.scalar) {
|
|
286
|
-
__DEV__ && invariant.warn(
|
|
288
|
+
__DEV__ && invariant.warn(122, `${typename}.${fieldName}`, policy.scalar);
|
|
287
289
|
}
|
|
288
290
|
}
|
|
289
291
|
}
|
|
@@ -320,26 +322,53 @@ export class StoreReader {
|
|
|
320
322
|
else {
|
|
321
323
|
const fragment = getFragmentFromSelection(selection, context.lookupFragment);
|
|
322
324
|
if (!fragment && selection.kind === Kind.FRAGMENT_SPREAD) {
|
|
323
|
-
throw newInvariantError(
|
|
325
|
+
throw newInvariantError(123, selection.name.value);
|
|
324
326
|
}
|
|
325
327
|
if (fragment && policies.fragmentMatches(fragment, typename)) {
|
|
326
328
|
let fragmentContext = context;
|
|
327
329
|
if (selection.kind === Kind.FRAGMENT_SPREAD &&
|
|
328
330
|
fragment.kind === Kind.FRAGMENT_DEFINITION) {
|
|
329
|
-
const
|
|
331
|
+
const fragmentVariables = getFragmentVariables(selection, {
|
|
330
332
|
fragment,
|
|
331
|
-
|
|
332
|
-
parentScope: context.variables,
|
|
333
|
+
scope: context.variablesScope,
|
|
333
334
|
});
|
|
334
|
-
|
|
335
|
+
const isRoot = isFragmentRoot(selection);
|
|
336
|
+
if (!isRoot) {
|
|
337
|
+
hasFragmentSpread = true;
|
|
338
|
+
}
|
|
339
|
+
if (!isRoot &&
|
|
340
|
+
fragmentVariables &&
|
|
341
|
+
// Always add an empty fragmentVariables if operation variables
|
|
342
|
+
// are non-empty. If operation variables are non-empty, we can
|
|
343
|
+
// omit fragment variables from the symbol so that we can omit
|
|
344
|
+
// the symbol altogether if no fragments include variables. This
|
|
345
|
+
// only works when operation variables are empty, otherwise the
|
|
346
|
+
// fallback variablesScope in diffQueryAgainstStore will be wrong.
|
|
347
|
+
(isNonEmptyObject(context.variables) ||
|
|
348
|
+
isNonEmptyObject(fragmentVariables))) {
|
|
349
|
+
fragments ||= {};
|
|
350
|
+
fragments[fragment.name.value] = { variables: fragmentVariables };
|
|
351
|
+
}
|
|
352
|
+
if (isMaskedSpread(selection)) {
|
|
353
|
+
return;
|
|
354
|
+
}
|
|
355
|
+
const variablesScope = getFragmentScope(selection, {
|
|
356
|
+
fragment,
|
|
357
|
+
variables: context.variables,
|
|
358
|
+
parentScope: context.variablesScope,
|
|
359
|
+
});
|
|
360
|
+
if (variablesScope !== context.variablesScope) {
|
|
335
361
|
fragmentContext = {
|
|
336
362
|
...fragmentContext,
|
|
337
|
-
|
|
338
|
-
varString:
|
|
363
|
+
variablesScope,
|
|
364
|
+
varString: makeVarString({
|
|
365
|
+
variables: context.variables,
|
|
366
|
+
scope: variablesScope,
|
|
367
|
+
}),
|
|
339
368
|
};
|
|
340
369
|
}
|
|
341
370
|
}
|
|
342
|
-
const isDeferBoundary = isDeferredFragment(selection, context.
|
|
371
|
+
const isDeferBoundary = isDeferredFragment(selection, context.variablesScope);
|
|
343
372
|
// Prior to 4.3, this branch just flattened the fragment's
|
|
344
373
|
// selectionSet into the existing workSet so that it continued
|
|
345
374
|
// iterating as if the fragment didn't exist. The cache is
|
|
@@ -383,7 +412,21 @@ export class StoreReader {
|
|
|
383
412
|
}
|
|
384
413
|
});
|
|
385
414
|
dataState ||= "complete";
|
|
386
|
-
|
|
415
|
+
let result = mergeDeepArray(objectsToMerge, { includeSymbols: true });
|
|
416
|
+
const childFragments = result[fragmentInfoSymbol]?.fragments;
|
|
417
|
+
if (childFragments ||
|
|
418
|
+
fragments ||
|
|
419
|
+
(hasFragmentSpread && isNonEmptyObject(context.variables))) {
|
|
420
|
+
// Always copy since `result` might be a frozen fragment result when
|
|
421
|
+
// `objectsToMerge` contains a single object.
|
|
422
|
+
result = {
|
|
423
|
+
...result,
|
|
424
|
+
[fragmentInfoSymbol]: {
|
|
425
|
+
operationVariables: context.variables ?? {},
|
|
426
|
+
fragments: { ...childFragments, ...fragments },
|
|
427
|
+
},
|
|
428
|
+
};
|
|
429
|
+
}
|
|
387
430
|
const finalResult = {
|
|
388
431
|
result,
|
|
389
432
|
missing,
|
|
@@ -404,7 +447,7 @@ export class StoreReader {
|
|
|
404
447
|
let missing;
|
|
405
448
|
let missingMerger = new DeepMerger();
|
|
406
449
|
const partialBoundaries = new PartialBoundaries();
|
|
407
|
-
const isStreamed = isStreamField(field, context.
|
|
450
|
+
const isStreamed = isStreamField(field, context.variablesScope);
|
|
408
451
|
function handleMissing(childResult, i) {
|
|
409
452
|
if (childResult.missing) {
|
|
410
453
|
missing = missingMerger.merge(missing, { [i]: childResult.missing });
|
|
@@ -482,8 +525,8 @@ export class StoreReader {
|
|
|
482
525
|
}
|
|
483
526
|
const workSet = new Map(selectionSet.selections.map((selection) => [selection, context]));
|
|
484
527
|
workSet.forEach((context, selection) => {
|
|
485
|
-
const {
|
|
486
|
-
if (!shouldInclude(selection,
|
|
528
|
+
const { variablesScope } = context;
|
|
529
|
+
if (!shouldInclude(selection, variablesScope))
|
|
487
530
|
return;
|
|
488
531
|
if (isField(selection)) {
|
|
489
532
|
const resultName = resultKeyNameFromField(selection);
|
|
@@ -549,7 +592,8 @@ export class StoreReader {
|
|
|
549
592
|
// dropped or not.
|
|
550
593
|
const fragment = getFragmentFromSelection(selection, lookupFragment);
|
|
551
594
|
let prune = false;
|
|
552
|
-
if (context.isDeferPending &&
|
|
595
|
+
if (context.isDeferPending &&
|
|
596
|
+
isDeferredFragment(selection, variablesScope)) {
|
|
553
597
|
const directive = selection.directives?.find((d) => d.name.value === "defer");
|
|
554
598
|
const label = directive && getDirectiveArgValue(directive, "label", Kind.STRING);
|
|
555
599
|
prune = context.isDeferPending(path, label);
|
|
@@ -562,17 +606,13 @@ export class StoreReader {
|
|
|
562
606
|
let fragmentContext = context;
|
|
563
607
|
if (selection.kind === Kind.FRAGMENT_SPREAD &&
|
|
564
608
|
fragment.kind === Kind.FRAGMENT_DEFINITION) {
|
|
565
|
-
const
|
|
609
|
+
const variablesScope = getFragmentScope(selection, {
|
|
566
610
|
fragment,
|
|
567
|
-
variables: context.
|
|
568
|
-
parentScope: context.
|
|
611
|
+
variables: context.variables,
|
|
612
|
+
parentScope: context.variablesScope,
|
|
569
613
|
});
|
|
570
|
-
if (
|
|
571
|
-
fragmentContext = {
|
|
572
|
-
...context,
|
|
573
|
-
variables,
|
|
574
|
-
varString: canonicalStringify(variables),
|
|
575
|
-
};
|
|
614
|
+
if (variablesScope !== context.variablesScope) {
|
|
615
|
+
fragmentContext = { ...context, variablesScope };
|
|
576
616
|
}
|
|
577
617
|
}
|
|
578
618
|
fragment.selectionSet.selections.forEach((selection) => {
|
|
@@ -593,6 +633,9 @@ export class StoreReader {
|
|
|
593
633
|
// actually dropped by the partial @defer fragment.
|
|
594
634
|
changed = !equal(result, data);
|
|
595
635
|
}
|
|
636
|
+
if (Object.hasOwn(data, fragmentInfoSymbol)) {
|
|
637
|
+
result[fragmentInfoSymbol] = data[fragmentInfoSymbol];
|
|
638
|
+
}
|
|
596
639
|
return { result: changed ? result : data, dataState };
|
|
597
640
|
}
|
|
598
641
|
prunePartialStreamArrayImpl({ field, array, boundaries, context, path, }) {
|
|
@@ -672,7 +715,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
|
|
|
672
715
|
if (isNonNullObject(value)) {
|
|
673
716
|
invariant(
|
|
674
717
|
!isReference(value),
|
|
675
|
-
|
|
718
|
+
124,
|
|
676
719
|
getTypenameFromStoreObject(store, value),
|
|
677
720
|
field.name.value
|
|
678
721
|
);
|
|
@@ -779,4 +822,16 @@ function mergeDataState(current, next) {
|
|
|
779
822
|
}
|
|
780
823
|
return DATA_STATE_MERGES[current][next] || current;
|
|
781
824
|
}
|
|
825
|
+
function isFragmentRoot(fragmentSpread) {
|
|
826
|
+
return (fragmentSpread.directives?.some((directive) => directive.name.value === "_apollo" &&
|
|
827
|
+
directive.arguments?.some((arg) => arg.name.value === "fragmentRoot" &&
|
|
828
|
+
arg.value.kind === Kind.BOOLEAN &&
|
|
829
|
+
arg.value.value)) ?? false);
|
|
830
|
+
}
|
|
831
|
+
function isMaskedSpread(fragmentSpread) {
|
|
832
|
+
return (fragmentSpread.directives?.some((directive) => directive.name.value === "_apollo" &&
|
|
833
|
+
directive.arguments?.some((arg) => arg.name.value === "mask" &&
|
|
834
|
+
arg.value.kind === Kind.BOOLEAN &&
|
|
835
|
+
arg.value.value)) ?? false);
|
|
836
|
+
}
|
|
782
837
|
//# sourceMappingURL=readFromStore.js.map
|