@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
|
@@ -82,7 +82,7 @@ class StoreReader {
|
|
|
82
82
|
});
|
|
83
83
|
this.prunePartialStreamArray = (0, optimism_1.wrap)((options) => {
|
|
84
84
|
const { field, context, path } = options;
|
|
85
|
-
if ((0, internal_1.isStreamField)(field, context.
|
|
85
|
+
if ((0, internal_1.isStreamField)(field, context.variablesScope)) {
|
|
86
86
|
context.streamInfo?.lookupArray(path).state.depend();
|
|
87
87
|
}
|
|
88
88
|
return this.prunePartialStreamArrayImpl(options);
|
|
@@ -96,7 +96,7 @@ class StoreReader {
|
|
|
96
96
|
},
|
|
97
97
|
});
|
|
98
98
|
}
|
|
99
|
-
diffQueryAgainstStore({ store, query, rootId = "ROOT_QUERY", variables, returnPartialData = true, ...options }) {
|
|
99
|
+
diffQueryAgainstStore({ store, query, rootId = "ROOT_QUERY", variables, returnPartialData = true, [internal_1.rootFragmentVariablesSymbol]: rootFragmentVariables, ...options }) {
|
|
100
100
|
const returnIncremental = Object.hasOwn(options, internal_1.handleIncrementalSymbol);
|
|
101
101
|
const policies = this.config.cache.policies;
|
|
102
102
|
variables = (0, internal_1.compact)((0, internal_1.getDefaultValues)((0, internal_1.getQueryDefinition)(query)), variables);
|
|
@@ -106,8 +106,8 @@ class StoreReader {
|
|
|
106
106
|
query,
|
|
107
107
|
policies,
|
|
108
108
|
variables,
|
|
109
|
-
|
|
110
|
-
|
|
109
|
+
variablesScope: rootFragmentVariables ?? variables,
|
|
110
|
+
varString: (0, helpers_js_1.makeVarString)({ variables, scope: rootFragmentVariables }),
|
|
111
111
|
...(0, helpers_js_1.extractFragmentContext)(query, this.config.fragments),
|
|
112
112
|
...options[internal_1.handleIncrementalSymbol],
|
|
113
113
|
};
|
|
@@ -213,7 +213,7 @@ class StoreReader {
|
|
|
213
213
|
partialBoundaries: new PartialBoundaries(),
|
|
214
214
|
};
|
|
215
215
|
}
|
|
216
|
-
const {
|
|
216
|
+
const { variablesScope, policies, store } = context;
|
|
217
217
|
const typename = store.getFieldValue(objectOrReference, "__typename");
|
|
218
218
|
const objectsToMerge = [];
|
|
219
219
|
let dataState;
|
|
@@ -234,17 +234,19 @@ class StoreReader {
|
|
|
234
234
|
}
|
|
235
235
|
return result;
|
|
236
236
|
}
|
|
237
|
+
let fragments;
|
|
238
|
+
let hasFragmentSpread = false;
|
|
237
239
|
const workSet = new Set(selectionSet.selections);
|
|
238
240
|
workSet.forEach((selection) => {
|
|
239
241
|
// Omit fields with directives @skip(if: <truthy value>) or
|
|
240
242
|
// @include(if: <falsy value>).
|
|
241
|
-
if (!(0, internal_1.shouldInclude)(selection,
|
|
243
|
+
if (!(0, internal_1.shouldInclude)(selection, variablesScope))
|
|
242
244
|
return;
|
|
243
245
|
if ((0, internal_1.isField)(selection)) {
|
|
244
246
|
let fieldValue = policies.readField({
|
|
245
247
|
fieldName: selection.name.value,
|
|
246
248
|
field: selection,
|
|
247
|
-
variables: context.
|
|
249
|
+
variables: context.variablesScope,
|
|
248
250
|
from: objectOrReference,
|
|
249
251
|
}, context);
|
|
250
252
|
const resultName = (0, internal_1.resultKeyNameFromField)(selection);
|
|
@@ -290,7 +292,7 @@ class StoreReader {
|
|
|
290
292
|
if (typename) {
|
|
291
293
|
const policy = policies["getFieldPolicy"](typename, fieldName);
|
|
292
294
|
if (policy?.scalar) {
|
|
293
|
-
__DEV__ && invariant_1.invariant.warn(
|
|
295
|
+
__DEV__ && invariant_1.invariant.warn(122, `${typename}.${fieldName}`, policy.scalar);
|
|
294
296
|
}
|
|
295
297
|
}
|
|
296
298
|
}
|
|
@@ -327,26 +329,53 @@ class StoreReader {
|
|
|
327
329
|
else {
|
|
328
330
|
const fragment = (0, internal_1.getFragmentFromSelection)(selection, context.lookupFragment);
|
|
329
331
|
if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
|
|
330
|
-
throw (0, invariant_1.newInvariantError)(
|
|
332
|
+
throw (0, invariant_1.newInvariantError)(123, selection.name.value);
|
|
331
333
|
}
|
|
332
334
|
if (fragment && policies.fragmentMatches(fragment, typename)) {
|
|
333
335
|
let fragmentContext = context;
|
|
334
336
|
if (selection.kind === graphql_1.Kind.FRAGMENT_SPREAD &&
|
|
335
337
|
fragment.kind === graphql_1.Kind.FRAGMENT_DEFINITION) {
|
|
336
|
-
const
|
|
338
|
+
const fragmentVariables = (0, internal_1.getFragmentVariables)(selection, {
|
|
337
339
|
fragment,
|
|
338
|
-
|
|
339
|
-
parentScope: context.variables,
|
|
340
|
+
scope: context.variablesScope,
|
|
340
341
|
});
|
|
341
|
-
|
|
342
|
+
const isRoot = isFragmentRoot(selection);
|
|
343
|
+
if (!isRoot) {
|
|
344
|
+
hasFragmentSpread = true;
|
|
345
|
+
}
|
|
346
|
+
if (!isRoot &&
|
|
347
|
+
fragmentVariables &&
|
|
348
|
+
// Always add an empty fragmentVariables if operation variables
|
|
349
|
+
// are non-empty. If operation variables are non-empty, we can
|
|
350
|
+
// omit fragment variables from the symbol so that we can omit
|
|
351
|
+
// the symbol altogether if no fragments include variables. This
|
|
352
|
+
// only works when operation variables are empty, otherwise the
|
|
353
|
+
// fallback variablesScope in diffQueryAgainstStore will be wrong.
|
|
354
|
+
((0, internal_1.isNonEmptyObject)(context.variables) ||
|
|
355
|
+
(0, internal_1.isNonEmptyObject)(fragmentVariables))) {
|
|
356
|
+
fragments ||= {};
|
|
357
|
+
fragments[fragment.name.value] = { variables: fragmentVariables };
|
|
358
|
+
}
|
|
359
|
+
if (isMaskedSpread(selection)) {
|
|
360
|
+
return;
|
|
361
|
+
}
|
|
362
|
+
const variablesScope = (0, internal_1.getFragmentScope)(selection, {
|
|
363
|
+
fragment,
|
|
364
|
+
variables: context.variables,
|
|
365
|
+
parentScope: context.variablesScope,
|
|
366
|
+
});
|
|
367
|
+
if (variablesScope !== context.variablesScope) {
|
|
342
368
|
fragmentContext = {
|
|
343
369
|
...fragmentContext,
|
|
344
|
-
|
|
345
|
-
varString: (0,
|
|
370
|
+
variablesScope,
|
|
371
|
+
varString: (0, helpers_js_1.makeVarString)({
|
|
372
|
+
variables: context.variables,
|
|
373
|
+
scope: variablesScope,
|
|
374
|
+
}),
|
|
346
375
|
};
|
|
347
376
|
}
|
|
348
377
|
}
|
|
349
|
-
const isDeferBoundary = (0, internal_1.isDeferredFragment)(selection, context.
|
|
378
|
+
const isDeferBoundary = (0, internal_1.isDeferredFragment)(selection, context.variablesScope);
|
|
350
379
|
// Prior to 4.3, this branch just flattened the fragment's
|
|
351
380
|
// selectionSet into the existing workSet so that it continued
|
|
352
381
|
// iterating as if the fragment didn't exist. The cache is
|
|
@@ -390,7 +419,21 @@ class StoreReader {
|
|
|
390
419
|
}
|
|
391
420
|
});
|
|
392
421
|
dataState ||= "complete";
|
|
393
|
-
|
|
422
|
+
let result = (0, internal_1.mergeDeepArray)(objectsToMerge, { includeSymbols: true });
|
|
423
|
+
const childFragments = result[internal_1.fragmentInfoSymbol]?.fragments;
|
|
424
|
+
if (childFragments ||
|
|
425
|
+
fragments ||
|
|
426
|
+
(hasFragmentSpread && (0, internal_1.isNonEmptyObject)(context.variables))) {
|
|
427
|
+
// Always copy since `result` might be a frozen fragment result when
|
|
428
|
+
// `objectsToMerge` contains a single object.
|
|
429
|
+
result = {
|
|
430
|
+
...result,
|
|
431
|
+
[internal_1.fragmentInfoSymbol]: {
|
|
432
|
+
operationVariables: context.variables ?? {},
|
|
433
|
+
fragments: { ...childFragments, ...fragments },
|
|
434
|
+
},
|
|
435
|
+
};
|
|
436
|
+
}
|
|
394
437
|
const finalResult = {
|
|
395
438
|
result,
|
|
396
439
|
missing,
|
|
@@ -411,7 +454,7 @@ class StoreReader {
|
|
|
411
454
|
let missing;
|
|
412
455
|
let missingMerger = new internal_1.DeepMerger();
|
|
413
456
|
const partialBoundaries = new PartialBoundaries();
|
|
414
|
-
const isStreamed = (0, internal_1.isStreamField)(field, context.
|
|
457
|
+
const isStreamed = (0, internal_1.isStreamField)(field, context.variablesScope);
|
|
415
458
|
function handleMissing(childResult, i) {
|
|
416
459
|
if (childResult.missing) {
|
|
417
460
|
missing = missingMerger.merge(missing, { [i]: childResult.missing });
|
|
@@ -489,8 +532,8 @@ class StoreReader {
|
|
|
489
532
|
}
|
|
490
533
|
const workSet = new Map(selectionSet.selections.map((selection) => [selection, context]));
|
|
491
534
|
workSet.forEach((context, selection) => {
|
|
492
|
-
const {
|
|
493
|
-
if (!(0, internal_1.shouldInclude)(selection,
|
|
535
|
+
const { variablesScope } = context;
|
|
536
|
+
if (!(0, internal_1.shouldInclude)(selection, variablesScope))
|
|
494
537
|
return;
|
|
495
538
|
if ((0, internal_1.isField)(selection)) {
|
|
496
539
|
const resultName = (0, internal_1.resultKeyNameFromField)(selection);
|
|
@@ -556,7 +599,8 @@ class StoreReader {
|
|
|
556
599
|
// dropped or not.
|
|
557
600
|
const fragment = (0, internal_1.getFragmentFromSelection)(selection, lookupFragment);
|
|
558
601
|
let prune = false;
|
|
559
|
-
if (context.isDeferPending &&
|
|
602
|
+
if (context.isDeferPending &&
|
|
603
|
+
(0, internal_1.isDeferredFragment)(selection, variablesScope)) {
|
|
560
604
|
const directive = selection.directives?.find((d) => d.name.value === "defer");
|
|
561
605
|
const label = directive && (0, internal_1.getDirectiveArgValue)(directive, "label", graphql_1.Kind.STRING);
|
|
562
606
|
prune = context.isDeferPending(path, label);
|
|
@@ -569,17 +613,13 @@ class StoreReader {
|
|
|
569
613
|
let fragmentContext = context;
|
|
570
614
|
if (selection.kind === graphql_1.Kind.FRAGMENT_SPREAD &&
|
|
571
615
|
fragment.kind === graphql_1.Kind.FRAGMENT_DEFINITION) {
|
|
572
|
-
const
|
|
616
|
+
const variablesScope = (0, internal_1.getFragmentScope)(selection, {
|
|
573
617
|
fragment,
|
|
574
|
-
variables: context.
|
|
575
|
-
parentScope: context.
|
|
618
|
+
variables: context.variables,
|
|
619
|
+
parentScope: context.variablesScope,
|
|
576
620
|
});
|
|
577
|
-
if (
|
|
578
|
-
fragmentContext = {
|
|
579
|
-
...context,
|
|
580
|
-
variables,
|
|
581
|
-
varString: (0, utilities_1.canonicalStringify)(variables),
|
|
582
|
-
};
|
|
621
|
+
if (variablesScope !== context.variablesScope) {
|
|
622
|
+
fragmentContext = { ...context, variablesScope };
|
|
583
623
|
}
|
|
584
624
|
}
|
|
585
625
|
fragment.selectionSet.selections.forEach((selection) => {
|
|
@@ -600,6 +640,9 @@ class StoreReader {
|
|
|
600
640
|
// actually dropped by the partial @defer fragment.
|
|
601
641
|
changed = !(0, equality_1.equal)(result, data);
|
|
602
642
|
}
|
|
643
|
+
if (Object.hasOwn(data, internal_1.fragmentInfoSymbol)) {
|
|
644
|
+
result[internal_1.fragmentInfoSymbol] = data[internal_1.fragmentInfoSymbol];
|
|
645
|
+
}
|
|
603
646
|
return { result: changed ? result : data, dataState };
|
|
604
647
|
}
|
|
605
648
|
prunePartialStreamArrayImpl({ field, array, boundaries, context, path, }) {
|
|
@@ -680,7 +723,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
|
|
|
680
723
|
if ((0, internal_1.isNonNullObject)(value)) {
|
|
681
724
|
(0, invariant_1.invariant)(
|
|
682
725
|
!(0, utilities_1.isReference)(value),
|
|
683
|
-
|
|
726
|
+
124,
|
|
684
727
|
(0, helpers_js_1.getTypenameFromStoreObject)(store, value),
|
|
685
728
|
field.name.value
|
|
686
729
|
);
|
|
@@ -787,4 +830,16 @@ function mergeDataState(current, next) {
|
|
|
787
830
|
}
|
|
788
831
|
return DATA_STATE_MERGES[current][next] || current;
|
|
789
832
|
}
|
|
833
|
+
function isFragmentRoot(fragmentSpread) {
|
|
834
|
+
return (fragmentSpread.directives?.some((directive) => directive.name.value === "_apollo" &&
|
|
835
|
+
directive.arguments?.some((arg) => arg.name.value === "fragmentRoot" &&
|
|
836
|
+
arg.value.kind === graphql_1.Kind.BOOLEAN &&
|
|
837
|
+
arg.value.value)) ?? false);
|
|
838
|
+
}
|
|
839
|
+
function isMaskedSpread(fragmentSpread) {
|
|
840
|
+
return (fragmentSpread.directives?.some((directive) => directive.name.value === "_apollo" &&
|
|
841
|
+
directive.arguments?.some((arg) => arg.name.value === "mask" &&
|
|
842
|
+
arg.value.kind === graphql_1.Kind.BOOLEAN &&
|
|
843
|
+
arg.value.value)) ?? false);
|
|
844
|
+
}
|
|
790
845
|
//# sourceMappingURL=readFromStore.cjs.map
|