@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.
Files changed (280) hide show
  1. package/CHANGELOG.md +39 -0
  2. package/__cjs/cache/core/cache.cjs +50 -15
  3. package/__cjs/cache/core/cache.cjs.map +1 -1
  4. package/__cjs/cache/core/cache.d.cts +22 -4
  5. package/__cjs/cache/index.cjs.map +1 -1
  6. package/__cjs/cache/index.d.cts +1 -1
  7. package/__cjs/cache/inmemory/entityStore.cjs +4 -4
  8. package/__cjs/cache/inmemory/helpers.cjs +12 -0
  9. package/__cjs/cache/inmemory/helpers.cjs.map +1 -1
  10. package/__cjs/cache/inmemory/helpers.d.cts +10 -5
  11. package/__cjs/cache/inmemory/inMemoryCache.cjs +13 -2
  12. package/__cjs/cache/inmemory/inMemoryCache.cjs.map +1 -1
  13. package/__cjs/cache/inmemory/inMemoryCache.d.cts +19 -4
  14. package/__cjs/cache/inmemory/key-extractor.cjs +1 -1
  15. package/__cjs/cache/inmemory/policies.cjs +7 -7
  16. package/__cjs/cache/inmemory/policies.cjs.map +1 -1
  17. package/__cjs/cache/inmemory/readFromStore.cjs +86 -31
  18. package/__cjs/cache/inmemory/readFromStore.cjs.map +1 -1
  19. package/__cjs/cache/inmemory/types.d.cts +11 -2
  20. package/__cjs/cache/inmemory/writeToStore.cjs +27 -24
  21. package/__cjs/cache/inmemory/writeToStore.cjs.map +1 -1
  22. package/__cjs/cache/inmemory/writeToStore.d.cts +5 -4
  23. package/__cjs/core/ApolloClient.cjs +19 -15
  24. package/__cjs/core/ApolloClient.cjs.map +1 -1
  25. package/__cjs/core/ApolloClient.d.cts +1 -0
  26. package/__cjs/core/ObservableQuery.cjs +8 -8
  27. package/__cjs/core/QueryInfo.cjs +1 -1
  28. package/__cjs/core/QueryManager.cjs +12 -12
  29. package/__cjs/core/RefetchEventManager.cjs +3 -3
  30. package/__cjs/errors/CombinedGraphQLErrors.cjs +3 -7
  31. package/__cjs/errors/CombinedGraphQLErrors.cjs.map +1 -1
  32. package/__cjs/errors/CombinedGraphQLErrors.d.cts +2 -2
  33. package/__cjs/errors/CombinedProtocolErrors.cjs +3 -8
  34. package/__cjs/errors/CombinedProtocolErrors.cjs.map +1 -1
  35. package/__cjs/errors/CombinedProtocolErrors.d.cts +2 -2
  36. package/__cjs/incremental/handlers/graphql17Alpha9.cjs +2 -2
  37. package/__cjs/incremental/handlers/notImplemented.cjs +1 -1
  38. package/__cjs/invariantErrorCodes.cjs +125 -120
  39. package/__cjs/link/core/ApolloLink.cjs +3 -3
  40. package/__cjs/link/http/checkFetcher.cjs +1 -1
  41. package/__cjs/link/http/parseAndCheckHttpResponse.cjs +1 -1
  42. package/__cjs/link/persisted-queries/index.cjs +2 -2
  43. package/__cjs/link/ws/index.cjs +1 -1
  44. package/__cjs/local-state/LocalState.cjs +23 -22
  45. package/__cjs/local-state/LocalState.cjs.map +1 -1
  46. package/__cjs/masking/maskDefinition.cjs +20 -2
  47. package/__cjs/masking/maskDefinition.cjs.map +1 -1
  48. package/__cjs/masking/maskFragment.cjs +2 -2
  49. package/__cjs/masking/maskOperation.cjs +1 -1
  50. package/__cjs/masking/utils.cjs +3 -3
  51. package/__cjs/react/context/ApolloContext.cjs +1 -1
  52. package/__cjs/react/context/ApolloProvider.cjs +1 -1
  53. package/__cjs/react/hooks/internal/validateSuspenseHookOptions.cjs +2 -2
  54. package/__cjs/react/hooks/useApolloClient.cjs +1 -1
  55. package/__cjs/react/hooks/useFragment.cjs +8 -2
  56. package/__cjs/react/hooks/useFragment.cjs.map +1 -1
  57. package/__cjs/react/hooks/useLazyQuery.cjs +2 -2
  58. package/__cjs/react/hooks/useLoadableQuery.cjs +2 -2
  59. package/__cjs/react/hooks/useSubscription.cjs +1 -1
  60. package/__cjs/react/hooks/useSuspenseFragment.cjs +10 -4
  61. package/__cjs/react/hooks/useSuspenseFragment.cjs.map +1 -1
  62. package/__cjs/react/hooks/useSyncExternalStore.cjs +1 -1
  63. package/__cjs/react/internal/cache/FragmentReference.cjs +2 -2
  64. package/__cjs/react/internal/cache/FragmentReference.cjs.map +1 -1
  65. package/__cjs/react/internal/cache/FragmentReference.d.cts +4 -5
  66. package/__cjs/react/internal/cache/QueryReference.cjs +1 -1
  67. package/__cjs/react/internal/cache/SuspenseCache.cjs +3 -3
  68. package/__cjs/react/internal/cache/SuspenseCache.cjs.map +1 -1
  69. package/__cjs/react/internal/cache/SuspenseCache.d.cts +4 -5
  70. package/__cjs/react/internal/cache/types.d.cts +0 -5
  71. package/__cjs/react/ssr/prerenderStatic.cjs +2 -2
  72. package/__cjs/testing/core/mocking/mockLink.cjs +4 -4
  73. package/__cjs/utilities/graphql/DocumentTransform.cjs +1 -1
  74. package/__cjs/utilities/internal/DeepMerger.cjs +6 -2
  75. package/__cjs/utilities/internal/DeepMerger.cjs.map +1 -1
  76. package/__cjs/utilities/internal/DeepMerger.d.cts +13 -3
  77. package/__cjs/utilities/internal/constants.cjs +33 -1
  78. package/__cjs/utilities/internal/constants.cjs.map +1 -1
  79. package/__cjs/utilities/internal/constants.d.cts +32 -0
  80. package/__cjs/utilities/internal/createArgumentNode.cjs +14 -0
  81. package/__cjs/utilities/internal/createArgumentNode.cjs.map +1 -0
  82. package/__cjs/utilities/internal/createArgumentNode.d.cts +3 -0
  83. package/__cjs/utilities/internal/createDirectiveNode.cjs +14 -0
  84. package/__cjs/utilities/internal/createDirectiveNode.cjs.map +1 -0
  85. package/__cjs/utilities/internal/createDirectiveNode.d.cts +3 -0
  86. package/__cjs/utilities/internal/createFragmentSpreadNode.cjs +4 -1
  87. package/__cjs/utilities/internal/createFragmentSpreadNode.cjs.map +1 -1
  88. package/__cjs/utilities/internal/createFragmentSpreadNode.d.cts +3 -2
  89. package/__cjs/utilities/internal/createValueNode.cjs +27 -0
  90. package/__cjs/utilities/internal/createValueNode.cjs.map +1 -0
  91. package/__cjs/utilities/internal/createValueNode.d.cts +12 -0
  92. package/__cjs/utilities/internal/equalByQuery.cjs +8 -8
  93. package/__cjs/utilities/internal/equalByQuery.cjs.map +1 -1
  94. package/__cjs/utilities/internal/equalByQuery.d.cts +2 -3
  95. package/__cjs/utilities/internal/getFragmentDefinition.cjs +3 -3
  96. package/__cjs/utilities/internal/getFragmentDefinition.cjs.map +1 -1
  97. package/__cjs/utilities/internal/getFragmentFromSelection.cjs +1 -1
  98. package/__cjs/utilities/internal/getFragmentQueryDocument.cjs +10 -2
  99. package/__cjs/utilities/internal/getFragmentQueryDocument.cjs.map +1 -1
  100. package/__cjs/utilities/internal/getFragmentScope.cjs +23 -0
  101. package/__cjs/utilities/internal/getFragmentScope.cjs.map +1 -0
  102. package/__cjs/utilities/internal/getFragmentScope.d.cts +13 -0
  103. package/__cjs/utilities/internal/getFragmentVariables.cjs +14 -15
  104. package/__cjs/utilities/internal/getFragmentVariables.cjs.map +1 -1
  105. package/__cjs/utilities/internal/getFragmentVariables.d.cts +8 -4
  106. package/__cjs/utilities/internal/getMainDefinition.cjs +1 -1
  107. package/__cjs/utilities/internal/getQueryDefinition.cjs +1 -1
  108. package/__cjs/utilities/internal/index.cjs +9 -2
  109. package/__cjs/utilities/internal/index.cjs.map +1 -1
  110. package/__cjs/utilities/internal/index.d.cts +5 -1
  111. package/__cjs/utilities/internal/isNonEmptyObject.cjs +13 -0
  112. package/__cjs/utilities/internal/isNonEmptyObject.cjs.map +1 -0
  113. package/__cjs/utilities/internal/isNonEmptyObject.d.cts +7 -0
  114. package/__cjs/utilities/internal/isNonNullObject.cjs.map +1 -1
  115. package/__cjs/utilities/internal/isNonNullObject.d.cts +1 -1
  116. package/__cjs/utilities/internal/mapObservableFragment.cjs +14 -9
  117. package/__cjs/utilities/internal/mapObservableFragment.cjs.map +1 -1
  118. package/__cjs/utilities/internal/mapObservableFragment.d.cts +5 -1
  119. package/__cjs/utilities/internal/mergeDeepArray.cjs +2 -2
  120. package/__cjs/utilities/internal/mergeDeepArray.cjs.map +1 -1
  121. package/__cjs/utilities/internal/mergeDeepArray.d.cts +2 -1
  122. package/__cjs/utilities/internal/removeDirectivesFromDocument.cjs +1 -1
  123. package/__cjs/utilities/internal/removeFragmentSpreads.cjs +55 -2
  124. package/__cjs/utilities/internal/removeFragmentSpreads.cjs.map +1 -1
  125. package/__cjs/utilities/internal/removeFragmentSpreads.d.cts +17 -1
  126. package/__cjs/utilities/internal/shouldInclude.cjs +4 -4
  127. package/__cjs/utilities/internal/types/FragmentInfo.cjs +3 -0
  128. package/__cjs/utilities/internal/types/FragmentInfo.cjs.map +1 -0
  129. package/__cjs/utilities/internal/types/FragmentInfo.d.cts +14 -0
  130. package/__cjs/utilities/internal/types/ObjectWithFragmentInfo.cjs +3 -0
  131. package/__cjs/utilities/internal/types/ObjectWithFragmentInfo.cjs.map +1 -0
  132. package/__cjs/utilities/internal/types/ObjectWithFragmentInfo.d.cts +13 -0
  133. package/__cjs/utilities/internal/valueToObjectRepresentation.cjs +1 -1
  134. package/__cjs/version.cjs +1 -1
  135. package/cache/core/cache.d.ts +22 -4
  136. package/cache/core/cache.js +51 -16
  137. package/cache/core/cache.js.map +1 -1
  138. package/cache/index.d.ts +1 -1
  139. package/cache/index.js.map +1 -1
  140. package/cache/inmemory/entityStore.js +4 -4
  141. package/cache/inmemory/helpers.d.ts +10 -5
  142. package/cache/inmemory/helpers.js +12 -1
  143. package/cache/inmemory/helpers.js.map +1 -1
  144. package/cache/inmemory/inMemoryCache.d.ts +19 -4
  145. package/cache/inmemory/inMemoryCache.js +14 -3
  146. package/cache/inmemory/inMemoryCache.js.map +1 -1
  147. package/cache/inmemory/key-extractor.js +1 -1
  148. package/cache/inmemory/policies.js +7 -7
  149. package/cache/inmemory/policies.js.map +1 -1
  150. package/cache/inmemory/readFromStore.js +89 -34
  151. package/cache/inmemory/readFromStore.js.map +1 -1
  152. package/cache/inmemory/types.d.ts +11 -2
  153. package/cache/inmemory/types.js.map +1 -1
  154. package/cache/inmemory/writeToStore.d.ts +5 -4
  155. package/cache/inmemory/writeToStore.js +30 -27
  156. package/cache/inmemory/writeToStore.js.map +1 -1
  157. package/core/ApolloClient.d.ts +1 -0
  158. package/core/ApolloClient.js +20 -16
  159. package/core/ApolloClient.js.map +1 -1
  160. package/core/ObservableQuery.js +8 -8
  161. package/core/QueryInfo.js +1 -1
  162. package/core/QueryManager.js +12 -12
  163. package/core/RefetchEventManager.js +3 -3
  164. package/errors/CombinedGraphQLErrors.d.ts +2 -2
  165. package/errors/CombinedGraphQLErrors.js +3 -7
  166. package/errors/CombinedGraphQLErrors.js.map +1 -1
  167. package/errors/CombinedProtocolErrors.d.ts +2 -2
  168. package/errors/CombinedProtocolErrors.js +3 -8
  169. package/errors/CombinedProtocolErrors.js.map +1 -1
  170. package/incremental/handlers/graphql17Alpha9.js +2 -2
  171. package/incremental/handlers/notImplemented.js +1 -1
  172. package/invariantErrorCodes.js +125 -120
  173. package/link/core/ApolloLink.js +3 -3
  174. package/link/http/checkFetcher.js +1 -1
  175. package/link/http/parseAndCheckHttpResponse.js +1 -1
  176. package/link/persisted-queries/index.js +2 -2
  177. package/link/ws/index.js +1 -1
  178. package/local-state/LocalState.js +24 -23
  179. package/local-state/LocalState.js.map +1 -1
  180. package/masking/maskDefinition.js +21 -3
  181. package/masking/maskDefinition.js.map +1 -1
  182. package/masking/maskFragment.js +2 -2
  183. package/masking/maskOperation.js +1 -1
  184. package/masking/utils.js +3 -3
  185. package/package.json +1 -1
  186. package/react/context/ApolloContext.js +1 -1
  187. package/react/context/ApolloProvider.js +1 -1
  188. package/react/hooks/internal/validateSuspenseHookOptions.js +2 -2
  189. package/react/hooks/useApolloClient.js +1 -1
  190. package/react/hooks/useFragment.js +8 -2
  191. package/react/hooks/useFragment.js.map +1 -1
  192. package/react/hooks/useLazyQuery.js +2 -2
  193. package/react/hooks/useLoadableQuery.js +2 -2
  194. package/react/hooks/useSubscription.js +1 -1
  195. package/react/hooks/useSuspenseFragment.js +10 -4
  196. package/react/hooks/useSuspenseFragment.js.map +1 -1
  197. package/react/hooks/useSyncExternalStore.js +1 -1
  198. package/react/hooks-compiled/internal/validateSuspenseHookOptions.js +2 -2
  199. package/react/hooks-compiled/useApolloClient.js +1 -1
  200. package/react/hooks-compiled/useFragment.js +56 -32
  201. package/react/hooks-compiled/useFragment.js.map +1 -1
  202. package/react/hooks-compiled/useLazyQuery.js +2 -2
  203. package/react/hooks-compiled/useLoadableQuery.js +2 -2
  204. package/react/hooks-compiled/useSubscription.js +1 -1
  205. package/react/hooks-compiled/useSuspenseFragment.js +10 -4
  206. package/react/hooks-compiled/useSuspenseFragment.js.map +1 -1
  207. package/react/hooks-compiled/useSyncExternalStore.js +1 -1
  208. package/react/internal/cache/FragmentReference.d.ts +4 -5
  209. package/react/internal/cache/FragmentReference.js +2 -2
  210. package/react/internal/cache/FragmentReference.js.map +1 -1
  211. package/react/internal/cache/QueryReference.js +1 -1
  212. package/react/internal/cache/SuspenseCache.d.ts +4 -5
  213. package/react/internal/cache/SuspenseCache.js +3 -3
  214. package/react/internal/cache/SuspenseCache.js.map +1 -1
  215. package/react/internal/cache/types.d.ts +0 -5
  216. package/react/internal/cache/types.js.map +1 -1
  217. package/react/ssr/prerenderStatic.js +2 -2
  218. package/testing/core/mocking/mockLink.js +4 -4
  219. package/utilities/graphql/DocumentTransform.js +1 -1
  220. package/utilities/internal/DeepMerger.d.ts +13 -3
  221. package/utilities/internal/DeepMerger.js +6 -2
  222. package/utilities/internal/DeepMerger.js.map +1 -1
  223. package/utilities/internal/constants.d.ts +32 -0
  224. package/utilities/internal/constants.js +32 -0
  225. package/utilities/internal/constants.js.map +1 -1
  226. package/utilities/internal/createArgumentNode.d.ts +3 -0
  227. package/utilities/internal/createArgumentNode.js +11 -0
  228. package/utilities/internal/createArgumentNode.js.map +1 -0
  229. package/utilities/internal/createDirectiveNode.d.ts +3 -0
  230. package/utilities/internal/createDirectiveNode.js +11 -0
  231. package/utilities/internal/createDirectiveNode.js.map +1 -0
  232. package/utilities/internal/createFragmentSpreadNode.d.ts +3 -2
  233. package/utilities/internal/createFragmentSpreadNode.js +4 -1
  234. package/utilities/internal/createFragmentSpreadNode.js.map +1 -1
  235. package/utilities/internal/createValueNode.d.ts +12 -0
  236. package/utilities/internal/createValueNode.js +24 -0
  237. package/utilities/internal/createValueNode.js.map +1 -0
  238. package/utilities/internal/equalByQuery.d.ts +2 -3
  239. package/utilities/internal/equalByQuery.js +8 -8
  240. package/utilities/internal/equalByQuery.js.map +1 -1
  241. package/utilities/internal/getFragmentDefinition.js +3 -3
  242. package/utilities/internal/getFragmentDefinition.js.map +1 -1
  243. package/utilities/internal/getFragmentFromSelection.js +1 -1
  244. package/utilities/internal/getFragmentQueryDocument.js +10 -2
  245. package/utilities/internal/getFragmentQueryDocument.js.map +1 -1
  246. package/utilities/internal/getFragmentScope.d.ts +13 -0
  247. package/utilities/internal/getFragmentScope.js +20 -0
  248. package/utilities/internal/getFragmentScope.js.map +1 -0
  249. package/utilities/internal/getFragmentVariables.d.ts +9 -5
  250. package/utilities/internal/getFragmentVariables.js +15 -16
  251. package/utilities/internal/getFragmentVariables.js.map +1 -1
  252. package/utilities/internal/getMainDefinition.js +1 -1
  253. package/utilities/internal/getQueryDefinition.js +1 -1
  254. package/utilities/internal/index.d.ts +5 -1
  255. package/utilities/internal/index.js +3 -1
  256. package/utilities/internal/index.js.map +1 -1
  257. package/utilities/internal/isNonEmptyObject.d.ts +7 -0
  258. package/utilities/internal/isNonEmptyObject.js +10 -0
  259. package/utilities/internal/isNonEmptyObject.js.map +1 -0
  260. package/utilities/internal/isNonNullObject.d.ts +1 -1
  261. package/utilities/internal/isNonNullObject.js.map +1 -1
  262. package/utilities/internal/mapObservableFragment.d.ts +5 -1
  263. package/utilities/internal/mapObservableFragment.js +14 -9
  264. package/utilities/internal/mapObservableFragment.js.map +1 -1
  265. package/utilities/internal/mergeDeepArray.d.ts +2 -1
  266. package/utilities/internal/mergeDeepArray.js +2 -2
  267. package/utilities/internal/mergeDeepArray.js.map +1 -1
  268. package/utilities/internal/removeDirectivesFromDocument.js +1 -1
  269. package/utilities/internal/removeFragmentSpreads.d.ts +18 -2
  270. package/utilities/internal/removeFragmentSpreads.js +56 -3
  271. package/utilities/internal/removeFragmentSpreads.js.map +1 -1
  272. package/utilities/internal/shouldInclude.js +4 -4
  273. package/utilities/internal/types/FragmentInfo.d.ts +14 -0
  274. package/utilities/internal/types/FragmentInfo.js +2 -0
  275. package/utilities/internal/types/FragmentInfo.js.map +1 -0
  276. package/utilities/internal/types/ObjectWithFragmentInfo.d.ts +13 -0
  277. package/utilities/internal/types/ObjectWithFragmentInfo.js +2 -0
  278. package/utilities/internal/types/ObjectWithFragmentInfo.js.map +1 -0
  279. package/utilities/internal/valueToObjectRepresentation.js +1 -1
  280. package/version.js +1 -1
@@ -131,13 +131,22 @@ export interface MergeTree {
131
131
  export interface ReadMergeModifyContext {
132
132
  store: NormalizedCache;
133
133
  variables?: OperationVariables;
134
- varString?: string;
134
+ variablesScope?: OperationVariables;
135
+ varString?: VarString;
135
136
  extensions?: ExtensionsWithStreamInfo;
136
137
  isDeferPending?: (path: Incremental.Path, label: string | undefined) => boolean;
137
- operationVariables?: OperationVariables;
138
138
  }
139
139
  type ListOf<T extends string> = `[${T}]`;
140
140
  type NestedScalarName<T extends string> = T | ListOf<T> | ListOf<ListOf<T>> | ListOf<ListOf<ListOf<T>>> | ListOf<ListOf<ListOf<ListOf<T>>>>;
141
141
  export type KnownScalars = RemoveIndexSignature<ApolloCache.Scalars>;
142
142
  export type ScalarType = NestedScalarName<keyof KnownScalars & string> | (string extends keyof ApolloCache.Scalars ? string & {} : never);
143
+ declare const varStringBrand: unique symbol;
144
+ /**
145
+ * @internal
146
+ *
147
+ * @deprecated This is an internal API and should not be used directly. This can be removed or changed at any time.
148
+ */
149
+ export type VarString = string & {
150
+ readonly [varStringBrand]: true;
151
+ };
143
152
  //# sourceMappingURL=types.d.cts.map
@@ -44,7 +44,7 @@ class StoreWriter {
44
44
  this.reader = reader;
45
45
  this.fragments = fragments;
46
46
  }
47
- writeToStore(store, { query, result, dataId, variables, overwrite, extensions, [internal_1.handleIncrementalSymbol]: incrementalInfo, }) {
47
+ writeToStore(store, { query, result, dataId, variables, overwrite, extensions, [internal_1.handleIncrementalSymbol]: incrementalInfo, [internal_1.rootFragmentVariablesSymbol]: rootFragmentVariables, }) {
48
48
  const operationDefinition = (0, internal_1.getOperationDefinition)(query);
49
49
  const merger = (0, helpers_js_1.makeProcessedFieldsMerger)();
50
50
  variables = {
@@ -57,9 +57,9 @@ class StoreWriter {
57
57
  merge(existing, incoming) {
58
58
  return merger.merge(existing, incoming);
59
59
  },
60
- variables: variables,
61
- varString: (0, utilities_1.canonicalStringify)(variables),
62
- operationVariables: variables,
60
+ variables,
61
+ variablesScope: rootFragmentVariables ?? variables,
62
+ varString: (0, helpers_js_1.makeVarString)({ variables, scope: rootFragmentVariables }),
63
63
  ...(0, helpers_js_1.extractFragmentContext)(query, this.fragments),
64
64
  overwrite: !!overwrite,
65
65
  incomingById: new Map(),
@@ -78,7 +78,7 @@ class StoreWriter {
78
78
  path: [],
79
79
  });
80
80
  if (!(0, utilities_1.isReference)(ref)) {
81
- throw (0, invariant_1.newInvariantError)(124, result);
81
+ throw (0, invariant_1.newInvariantError)(125, result);
82
82
  }
83
83
  // So far, the store has not been modified, so now it's time to process
84
84
  // context.incomingById and merge those incoming fields into context.store.
@@ -156,7 +156,7 @@ class StoreWriter {
156
156
  // need to be extracted from a child object that processSelectionSet has
157
157
  // turned into a Reference.
158
158
  const readField = (...args) => {
159
- const options = (0, policies_js_1.normalizeReadFieldOptions)(args, incoming, context.variables);
159
+ const options = (0, policies_js_1.normalizeReadFieldOptions)(args, incoming, context.variablesScope);
160
160
  if ((0, utilities_1.isReference)(options.from)) {
161
161
  const info = context.incomingById.get(options.from.__ref);
162
162
  if (info) {
@@ -186,7 +186,7 @@ class StoreWriter {
186
186
  typename,
187
187
  fieldName: field.name.value,
188
188
  field,
189
- variables: context.variables,
189
+ variables: context.variablesScope,
190
190
  });
191
191
  const childTree = getChildMergeTree(mergeTree, storeFieldName);
192
192
  let incomingValue = this.processFieldValue(value, field,
@@ -218,18 +218,18 @@ class StoreWriter {
218
218
  typename,
219
219
  merge,
220
220
  path,
221
- variables: context.variables,
221
+ variables: context.variablesScope,
222
222
  };
223
223
  }
224
224
  else if (context.extensions?.[internal_1.streamInfoSymbol] &&
225
225
  Array.isArray(incomingValue) &&
226
- (0, internal_1.isStreamField)(field, context.variables)) {
226
+ (0, internal_1.isStreamField)(field, context.variablesScope)) {
227
227
  childTree.info = {
228
228
  field,
229
229
  typename,
230
230
  merge: policies_js_1.defaultStreamFieldMergeFn,
231
231
  path,
232
- variables: context.variables,
232
+ variables: context.variablesScope,
233
233
  };
234
234
  }
235
235
  else {
@@ -247,7 +247,7 @@ class StoreWriter {
247
247
  // provide a default value, so its absence from the written data should
248
248
  // not be cause for alarm.
249
249
  !policies.getReadFunction(typename, field.name.value)) {
250
- invariant_1.invariant.error(125, (0, internal_1.resultKeyNameFromField)(field), result);
250
+ invariant_1.invariant.error(126, (0, internal_1.resultKeyNameFromField)(field), result);
251
251
  }
252
252
  });
253
253
  // Identify the result object, even if dataId was already provided,
@@ -360,7 +360,7 @@ class StoreWriter {
360
360
  return;
361
361
  visitedNode.visited = true;
362
362
  selectionSet.selections.forEach((selection) => {
363
- if (!(0, internal_1.shouldInclude)(selection, inheritedContext.variables))
363
+ if (!(0, internal_1.shouldInclude)(selection, inheritedContext.variablesScope))
364
364
  return;
365
365
  let { clientOnly, deferred } = inheritedContext;
366
366
  if (
@@ -374,7 +374,7 @@ class StoreWriter {
374
374
  if (name === "client")
375
375
  clientOnly = true;
376
376
  if (name === "defer") {
377
- const args = (0, internal_1.argumentsObjectFromField)(dir, inheritedContext.variables);
377
+ const args = (0, internal_1.argumentsObjectFromField)(dir, inheritedContext.variablesScope);
378
378
  // The @defer directive takes an optional args.if boolean
379
379
  // argument, similar to @include(if: boolean). Note that
380
380
  // @defer(if: false) does not make context.deferred false, but
@@ -410,25 +410,28 @@ class StoreWriter {
410
410
  else {
411
411
  const fragment = (0, internal_1.getFragmentFromSelection)(selection, context.lookupFragment);
412
412
  if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
413
- throw (0, invariant_1.newInvariantError)(126, selection.name.value);
413
+ throw (0, invariant_1.newInvariantError)(127, selection.name.value);
414
414
  }
415
415
  if (!fragment)
416
416
  return;
417
- const variables = (selection.kind === graphql_1.Kind.FRAGMENT_SPREAD &&
417
+ const variablesScope = (selection.kind === graphql_1.Kind.FRAGMENT_SPREAD &&
418
418
  fragment.kind === graphql_1.Kind.FRAGMENT_DEFINITION) ?
419
- (0, internal_1.getFragmentVariables)(selection, {
419
+ (0, internal_1.getFragmentScope)(selection, {
420
420
  fragment,
421
- variables: context.operationVariables,
422
- parentScope: inheritedContext.variables,
421
+ variables: context.variables,
422
+ parentScope: inheritedContext.variablesScope,
423
423
  })
424
- : inheritedContext.variables;
425
- if (policies.fragmentMatches(fragment, typename, result, variables)) {
424
+ : inheritedContext.variablesScope;
425
+ if (policies.fragmentMatches(fragment, typename, result, variablesScope)) {
426
426
  let fragmentContext = getContextFlavor(inheritedContext, clientOnly, deferred);
427
- if (variables !== inheritedContext.variables) {
427
+ if (variablesScope !== inheritedContext.variablesScope) {
428
428
  fragmentContext = {
429
429
  ...fragmentContext,
430
- variables,
431
- varString: (0, utilities_1.canonicalStringify)(variables),
430
+ variablesScope,
431
+ varString: (0, helpers_js_1.makeVarString)({
432
+ variables: context.variables,
433
+ scope: variablesScope,
434
+ }),
432
435
  flavors: new Map(),
433
436
  };
434
437
  }
@@ -601,7 +604,7 @@ function warnAboutDataLoss(existingRef, incomingObj, storeFieldName, store) {
601
604
  }
602
605
  });
603
606
  }
604
- __DEV__ && invariant_1.invariant.warn(127, fieldName, parentType, childTypenames.length ?
607
+ __DEV__ && invariant_1.invariant.warn(128, fieldName, parentType, childTypenames.length ?
605
608
  "either ensure all objects of type " +
606
609
  childTypenames.join(" and ") +
607
610
  " have an ID or a custom merge function, or "