@apollo/client 4.3.8 → 4.4.0-alpha.0

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 (97) hide show
  1. package/CHANGELOG.md +37 -3
  2. package/__cjs/cache/inmemory/policies.cjs +2 -2
  3. package/__cjs/cache/inmemory/policies.cjs.map +1 -1
  4. package/__cjs/cache/inmemory/policies.d.cts +1 -1
  5. package/__cjs/cache/inmemory/readFromStore.cjs +43 -5
  6. package/__cjs/cache/inmemory/readFromStore.cjs.map +1 -1
  7. package/__cjs/cache/inmemory/types.d.cts +2 -0
  8. package/__cjs/cache/inmemory/writeToStore.cjs +40 -13
  9. package/__cjs/cache/inmemory/writeToStore.cjs.map +1 -1
  10. package/__cjs/cache/inmemory/writeToStore.d.cts +4 -1
  11. package/__cjs/link/batch-http/BaseBatchHttpLink.cjs +9 -18
  12. package/__cjs/link/batch-http/BaseBatchHttpLink.cjs.map +1 -1
  13. package/__cjs/link/batch-http/BaseBatchHttpLink.d.cts +0 -7
  14. package/__cjs/local-state/LocalState.cjs +12 -1
  15. package/__cjs/local-state/LocalState.cjs.map +1 -1
  16. package/__cjs/utilities/internal/argumentsObjectFromField.cjs.map +1 -1
  17. package/__cjs/utilities/internal/argumentsObjectFromField.d.cts +2 -2
  18. package/__cjs/utilities/internal/createFragmentArgumentNode.cjs +13 -0
  19. package/__cjs/utilities/internal/createFragmentArgumentNode.cjs.map +1 -0
  20. package/__cjs/utilities/internal/createFragmentArgumentNode.d.cts +3 -0
  21. package/__cjs/utilities/internal/createFragmentSpreadNode.cjs +17 -0
  22. package/__cjs/utilities/internal/createFragmentSpreadNode.cjs.map +1 -0
  23. package/__cjs/utilities/internal/createFragmentSpreadNode.d.cts +5 -0
  24. package/__cjs/utilities/internal/createNameNode.cjs +8 -0
  25. package/__cjs/utilities/internal/createNameNode.cjs.map +1 -0
  26. package/__cjs/utilities/internal/createNameNode.d.cts +3 -0
  27. package/__cjs/utilities/internal/createVariableNode.cjs +9 -0
  28. package/__cjs/utilities/internal/createVariableNode.cjs.map +1 -0
  29. package/__cjs/utilities/internal/createVariableNode.d.cts +3 -0
  30. package/__cjs/utilities/internal/equalByQuery.cjs +14 -1
  31. package/__cjs/utilities/internal/equalByQuery.cjs.map +1 -1
  32. package/__cjs/utilities/internal/getDefaultValues.cjs.map +1 -1
  33. package/__cjs/utilities/internal/getDefaultValues.d.cts +2 -2
  34. package/__cjs/utilities/internal/getFragmentQueryDocument.cjs +10 -7
  35. package/__cjs/utilities/internal/getFragmentQueryDocument.cjs.map +1 -1
  36. package/__cjs/utilities/internal/getFragmentVariables.cjs +34 -0
  37. package/__cjs/utilities/internal/getFragmentVariables.cjs.map +1 -0
  38. package/__cjs/utilities/internal/getFragmentVariables.d.cts +8 -0
  39. package/__cjs/utilities/internal/index.cjs +4 -2
  40. package/__cjs/utilities/internal/index.cjs.map +1 -1
  41. package/__cjs/utilities/internal/index.d.cts +1 -0
  42. package/__cjs/utilities/internal/removeDirectivesFromDocument.cjs +120 -61
  43. package/__cjs/utilities/internal/removeDirectivesFromDocument.cjs.map +1 -1
  44. package/__cjs/utilities/internal/types/Mutable.cjs +3 -0
  45. package/__cjs/utilities/internal/types/Mutable.cjs.map +1 -0
  46. package/__cjs/utilities/internal/types/Mutable.d.cts +4 -0
  47. package/__cjs/version.cjs +1 -1
  48. package/__cjs/version.cjs.map +1 -1
  49. package/cache/inmemory/policies.d.ts +1 -1
  50. package/cache/inmemory/policies.js +2 -2
  51. package/cache/inmemory/policies.js.map +1 -1
  52. package/cache/inmemory/readFromStore.js +44 -6
  53. package/cache/inmemory/readFromStore.js.map +1 -1
  54. package/cache/inmemory/types.d.ts +2 -0
  55. package/cache/inmemory/types.js.map +1 -1
  56. package/cache/inmemory/writeToStore.d.ts +4 -1
  57. package/cache/inmemory/writeToStore.js +41 -14
  58. package/cache/inmemory/writeToStore.js.map +1 -1
  59. package/link/batch-http/BaseBatchHttpLink.d.ts +0 -7
  60. package/link/batch-http/BaseBatchHttpLink.js +9 -18
  61. package/link/batch-http/BaseBatchHttpLink.js.map +1 -1
  62. package/local-state/LocalState.js +13 -2
  63. package/local-state/LocalState.js.map +1 -1
  64. package/package.json +2 -2
  65. package/utilities/internal/argumentsObjectFromField.d.ts +2 -2
  66. package/utilities/internal/argumentsObjectFromField.js.map +1 -1
  67. package/utilities/internal/createFragmentArgumentNode.d.ts +3 -0
  68. package/utilities/internal/createFragmentArgumentNode.js +10 -0
  69. package/utilities/internal/createFragmentArgumentNode.js.map +1 -0
  70. package/utilities/internal/createFragmentSpreadNode.d.ts +5 -0
  71. package/utilities/internal/createFragmentSpreadNode.js +14 -0
  72. package/utilities/internal/createFragmentSpreadNode.js.map +1 -0
  73. package/utilities/internal/createNameNode.d.ts +3 -0
  74. package/utilities/internal/createNameNode.js +5 -0
  75. package/utilities/internal/createNameNode.js.map +1 -0
  76. package/utilities/internal/createVariableNode.d.ts +3 -0
  77. package/utilities/internal/createVariableNode.js +6 -0
  78. package/utilities/internal/createVariableNode.js.map +1 -0
  79. package/utilities/internal/equalByQuery.js +14 -1
  80. package/utilities/internal/equalByQuery.js.map +1 -1
  81. package/utilities/internal/getDefaultValues.d.ts +2 -2
  82. package/utilities/internal/getDefaultValues.js.map +1 -1
  83. package/utilities/internal/getFragmentQueryDocument.js +10 -7
  84. package/utilities/internal/getFragmentQueryDocument.js.map +1 -1
  85. package/utilities/internal/getFragmentVariables.d.ts +8 -0
  86. package/utilities/internal/getFragmentVariables.js +31 -0
  87. package/utilities/internal/getFragmentVariables.js.map +1 -0
  88. package/utilities/internal/index.d.ts +1 -0
  89. package/utilities/internal/index.js +1 -0
  90. package/utilities/internal/index.js.map +1 -1
  91. package/utilities/internal/removeDirectivesFromDocument.js +120 -61
  92. package/utilities/internal/removeDirectivesFromDocument.js.map +1 -1
  93. package/utilities/internal/types/Mutable.d.ts +4 -0
  94. package/utilities/internal/types/Mutable.js +2 -0
  95. package/utilities/internal/types/Mutable.js.map +1 -0
  96. package/version.js +1 -1
  97. package/version.js.map +1 -1
@@ -122,6 +122,7 @@ export interface MergeInfo {
122
122
  typename: string | undefined;
123
123
  merge: FieldMergeFunction;
124
124
  path: Array<string | number>;
125
+ variables: OperationVariables | undefined;
125
126
  }
126
127
  export interface MergeTree {
127
128
  info?: MergeInfo;
@@ -133,6 +134,7 @@ export interface ReadMergeModifyContext {
133
134
  varString?: string;
134
135
  extensions?: ExtensionsWithStreamInfo;
135
136
  isDeferPending?: (path: Incremental.Path, label: string | undefined) => boolean;
137
+ operationVariables?: OperationVariables;
136
138
  }
137
139
  type ListOf<T extends string> = `[${T}]`;
138
140
  type NestedScalarName<T extends string> = T | ListOf<T> | ListOf<ListOf<T>> | ListOf<ListOf<ListOf<T>>> | ListOf<ListOf<ListOf<ListOf<T>>>>;
@@ -16,9 +16,10 @@ const helpers_js_1 = require("./helpers.cjs");
16
16
  const policies_js_1 = require("./policies.cjs");
17
17
  // Since there are only four possible combinations of context.clientOnly and
18
18
  // context.deferred values, we should need at most four "flavors" of any given
19
- // WriteContext. To avoid creating multiple copies of the same context, we cache
20
- // the contexts in the context.flavors Map (shared by all flavors) according to
21
- // their clientOnly and deferred values (always in that order).
19
+ // WriteContext (per fragment argument scope). To avoid creating multiple copies
20
+ // of the same context, we cache the contexts in the context.flavors Map (shared
21
+ // by all flavors) according to their clientOnly and deferred values (always in
22
+ // that order).
22
23
  function getContextFlavor(context, clientOnly, deferred) {
23
24
  const key = `${clientOnly}${deferred}`;
24
25
  let flavored = context.flavors.get(key);
@@ -58,6 +59,7 @@ class StoreWriter {
58
59
  },
59
60
  variables: variables,
60
61
  varString: (0, utilities_1.canonicalStringify)(variables),
62
+ operationVariables: variables,
61
63
  ...(0, helpers_js_1.extractFragmentContext)(query, this.fragments),
62
64
  overwrite: !!overwrite,
63
65
  incomingById: new Map(),
@@ -216,6 +218,7 @@ class StoreWriter {
216
218
  typename,
217
219
  merge,
218
220
  path,
221
+ variables: context.variables,
219
222
  };
220
223
  }
221
224
  else if (context.extensions?.[internal_1.streamInfoSymbol] &&
@@ -226,6 +229,7 @@ class StoreWriter {
226
229
  typename,
227
230
  merge: policies_js_1.defaultStreamFieldMergeFn,
228
231
  path,
232
+ variables: context.variables,
229
233
  };
230
234
  }
231
235
  else {
@@ -277,12 +281,17 @@ class StoreWriter {
277
281
  // Avoid processing the same entity object using the same selection
278
282
  // set more than once. We use an array instead of a Set since most
279
283
  // entity IDs will be written using only one selection set, so the
280
- // size of this array is likely to be very small, meaning indexOf is
281
- // likely to be faster than Set.prototype.has.
284
+ // size of this array is likely to be very small, meaning a linear
285
+ // search is likely to be faster than a Map or Set lookup. The same
286
+ // selection set inside a fragment can be reached with different
287
+ // fragment arguments, so the variables are part of the check.
288
+ const { varString } = context;
282
289
  const sets = context.written[dataId] || (context.written[dataId] = []);
283
- if (sets.indexOf(selectionSet) >= 0)
290
+ if (sets.some((written) => written.selectionSet === selectionSet &&
291
+ written.varString === varString)) {
284
292
  return dataRef;
285
- sets.push(selectionSet);
293
+ }
294
+ sets.push({ selectionSet, varString });
286
295
  // If we're about to write a result object into the store, but we
287
296
  // happen to know that the exact same (===) result object would be
288
297
  // returned if we were to reread the result with the same inputs,
@@ -351,7 +360,7 @@ class StoreWriter {
351
360
  return;
352
361
  visitedNode.visited = true;
353
362
  selectionSet.selections.forEach((selection) => {
354
- if (!(0, internal_1.shouldInclude)(selection, context.variables))
363
+ if (!(0, internal_1.shouldInclude)(selection, inheritedContext.variables))
355
364
  return;
356
365
  let { clientOnly, deferred } = inheritedContext;
357
366
  if (
@@ -365,7 +374,7 @@ class StoreWriter {
365
374
  if (name === "client")
366
375
  clientOnly = true;
367
376
  if (name === "defer") {
368
- const args = (0, internal_1.argumentsObjectFromField)(dir, context.variables);
377
+ const args = (0, internal_1.argumentsObjectFromField)(dir, inheritedContext.variables);
369
378
  // The @defer directive takes an optional args.if boolean
370
379
  // argument, similar to @include(if: boolean). Note that
371
380
  // @defer(if: false) does not make context.deferred false, but
@@ -396,16 +405,34 @@ class StoreWriter {
396
405
  clientOnly = clientOnly && existing.clientOnly;
397
406
  deferred = deferred && existing.deferred;
398
407
  }
399
- fieldMap.set(selection, getContextFlavor(context, clientOnly, deferred));
408
+ fieldMap.set(selection, getContextFlavor(inheritedContext, clientOnly, deferred));
400
409
  }
401
410
  else {
402
411
  const fragment = (0, internal_1.getFragmentFromSelection)(selection, context.lookupFragment);
403
412
  if (!fragment && selection.kind === graphql_1.Kind.FRAGMENT_SPREAD) {
404
413
  throw (0, invariant_1.newInvariantError)(126, selection.name.value);
405
414
  }
406
- if (fragment &&
407
- policies.fragmentMatches(fragment, typename, result, context.variables)) {
408
- flatten(fragment.selectionSet, getContextFlavor(context, clientOnly, deferred));
415
+ if (!fragment)
416
+ return;
417
+ const variables = (selection.kind === graphql_1.Kind.FRAGMENT_SPREAD &&
418
+ fragment.kind === graphql_1.Kind.FRAGMENT_DEFINITION) ?
419
+ (0, internal_1.getFragmentVariables)(selection, {
420
+ fragment,
421
+ variables: context.operationVariables,
422
+ parentScope: inheritedContext.variables,
423
+ })
424
+ : inheritedContext.variables;
425
+ if (policies.fragmentMatches(fragment, typename, result, variables)) {
426
+ let fragmentContext = getContextFlavor(inheritedContext, clientOnly, deferred);
427
+ if (variables !== inheritedContext.variables) {
428
+ fragmentContext = {
429
+ ...fragmentContext,
430
+ variables,
431
+ varString: (0, utilities_1.canonicalStringify)(variables),
432
+ flavors: new Map(),
433
+ };
434
+ }
435
+ flatten(fragment.selectionSet, fragmentContext);
409
436
  }
410
437
  }
411
438
  });