@apollo/client 4.3.3 → 4.3.5

package/cache/inmemory/readFromStore.js

@@ -69,7 +69,7 @@ export class StoreReader {
                 20000 /* defaultCacheSizes["inMemoryCache.prunePartialBoundaries"] */,
             makeCacheKey: ({ boundaries, context, selectionSet }) => {
                 if (supportsResultCaching(context.store)) {
-                    return this.keyMaker.lookup(selectionSet, boundaries, context.streamInfo, context.deferInfo);
+                    return this.keyMaker.lookup(selectionSet, boundaries, context.streamInfo, context.isDeferPending);
                 }
             },
         });
@@ -84,7 +84,7 @@ export class StoreReader {
                 20000 /* defaultCacheSizes["inMemoryCache.prunePartialStreamArray"] */,
             makeCacheKey: ({ field, context, boundaries }) => {
                 if (supportsResultCaching(context.store)) {
-                    return this.keyMaker.lookup(field, boundaries, context.streamInfo, context.deferInfo);
+                    return this.keyMaker.lookup(field, boundaries, context.streamInfo, context.isDeferPending);
                 }
             },
         });
@@ -282,7 +282,7 @@ export class StoreReader {
                         if (typename) {
                             const policy = policies["getFieldPolicy"](typename, fieldName);
                             if (policy?.scalar) {
-                                __DEV__ && invariant.warn(119, `${typename}.${fieldName}`, policy.scalar);
+                                __DEV__ && invariant.warn(120, `${typename}.${fieldName}`, policy.scalar);
                             }
                         }
                     }
@@ -319,7 +319,7 @@ export class StoreReader {
             else {
                 const fragment = getFragmentFromSelection(selection, context.lookupFragment);
                 if (!fragment && selection.kind === Kind.FRAGMENT_SPREAD) {
-                    throw newInvariantError(120, selection.name.value);
+                    throw newInvariantError(121, selection.name.value);
                 }
                 if (fragment && policies.fragmentMatches(fragment, typename)) {
                     const isDeferBoundary = isDeferredFragment(selection, context.variables);
@@ -450,7 +450,10 @@ export class StoreReader {
         if (data == null || !boundaries) {
             return { result: data, dataState: "complete" };
         }
-        const merger = new DeepMerger();
+        // `truncate` is only necessary for the Defer20220824 protocol. the
+        // `arrayMerge` option can be removed when we stop supporting the old
+        // protocol. See the comment below on array merging for more info.
+        const merger = new DeepMerger({ arrayMerge: "truncate" });
         let changed = false;
         let dataState = "complete";
         const result = {};
@@ -479,7 +482,22 @@ export class StoreReader {
                         path: path.concat(resultName),
                     });
                     changed ||= pruned.result !== fieldValue;
-                    result[resultName] = pruned.result;
+                    const previous = result[resultName];
+                    let merged = merger.merge(previous, pruned.result);
+                    // The Defer20220824 protocol allows more than one selection of a
+                    // list field with `@stream` when the `@stream` arguments are the
+                    // same. Each selection can prune the list to a different length, so
+                    // we keep the shortest length. The `truncate` option of the merger
+                    // handles a shorter later visit, and this check handles a shorter
+                    // earlier visit. GraphQL 17 rejects any overlapping `@stream` field,
+                    // so all visits give the same length. When we no longer support the
+                    // older protocol, we can remove this check and the `truncate` option,
+                    // and simplify to:
+                    // result[resultName] = merger.merge(result[resultName], pruned.result);
+                    if (previous && previous.length < merged.length) {
+                        merged = merged.slice(0, previous.length);
+                    }
+                    result[resultName] = merged;
                     dataState = mergeDataState(dataState, pruned.dataState);
                 }
                 else if (!selection.selectionSet) {
@@ -513,10 +531,10 @@ export class StoreReader {
             // dropped or not.
             const fragment = getFragmentFromSelection(selection, lookupFragment);
             let prune = false;
-            if (context.deferInfo && isDeferredFragment(selection, variables)) {
+            if (context.isDeferPending && isDeferredFragment(selection, variables)) {
                 const directive = selection.directives?.find((d) => d.name.value === "defer");
                 const label = directive && getDirectiveArgValue(directive, "label", Kind.STRING);
-                prune = !!context.deferInfo.peekArray(path.concat(label || []));
+                prune = context.isDeferPending(path, label);
             }
             if (fragment && policies.fragmentMatches(fragment, data.__typename)) {
                 if (boundaries.has(selection) || prune) {
@@ -616,7 +634,7 @@ function assertSelectionSetForIdValue(store, field, fieldValue) {
             if (isNonNullObject(value)) {
                 invariant(
                     !isReference(value),
-                    121,
+                    122,
                     getTypenameFromStoreObject(store, value),
                     field.name.value
                 );
@@ -680,7 +698,7 @@ function shouldPrune({ dataState }, context) {
         (context.streamInfo ||
             // The network hasn't delivered these @defer boundaries yet, so prune
             // the (possibly complete) cached data sitting at them.
-            context.deferInfo));
+            context.isDeferPending));
     }
     return false;
 }