@graphql-box/cache-manager 2.3.0 → 2.4.1

package/src/__snapshots__/index.test.ts.snap

@@ -14590,6 +14590,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -15918,6 +15919,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -17215,6 +17217,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -18468,6 +18471,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -19690,6 +19694,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -19947,6 +19952,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -20204,6 +20210,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -21271,6 +21278,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -22321,6 +22329,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -23302,6 +23311,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -24266,6 +24276,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -24426,6 +24437,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -24586,6 +24598,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -24915,6 +24928,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -25244,6 +25258,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -25490,6 +25505,7 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;
 
@@ -25736,5 +25752,6 @@ Object {
     },
   },
   "hasNext": undefined,
+  "paths": undefined,
 }
 `;

package/src/helpers/normalizeResponseData.ts

@@ -1,9 +1,10 @@
 import { RawResponseDataWithMaybeCacheMetadata } from "@graphql-box/core";
 import { set } from "lodash";
 
-export default ({ data, path, ...rest }: RawResponseDataWithMaybeCacheMetadata) => {
+export default ({ data, paths, ...rest }: RawResponseDataWithMaybeCacheMetadata) => {
   return {
     ...rest,
-    data: set({}, path as (string | number)[], data),
+    data: set({}, (paths as string[])[0], data),
+    paths,
   };
 };

package/src/main/index.ts

@@ -113,17 +113,6 @@ export class CacheManager implements CacheManagerDef {
     return cacheability ? cacheability.printCacheControl() : defaultCacheControl;
   }
 
-  private static _getResponseCacheMetadata(
-    cacheMetadata: CacheMetadata,
-    partialQueryResponse?: PartialQueryResponse,
-  ): CacheMetadata {
-    if (!partialQueryResponse) {
-      return cacheMetadata;
-    }
-
-    return new Map([...partialQueryResponse.cacheMetadata, ...cacheMetadata]);
-  }
-
   private static _isNodeEntity(fieldTypeInfo?: FieldTypeInfo): boolean {
     if (!fieldTypeInfo) {
       return false;
@@ -145,6 +134,17 @@ export class CacheManager implements CacheManagerDef {
     return !noCache && cacheability.checkTTL();
   }
 
+  private static _mergeResponseCacheMetadata(
+    cacheMetadata: CacheMetadata,
+    partialQueryResponse?: PartialQueryResponse,
+  ): CacheMetadata {
+    if (!partialQueryResponse) {
+      return cacheMetadata;
+    }
+
+    return new Map([...partialQueryResponse.cacheMetadata, ...cacheMetadata]);
+  }
+
   private static _setCachedData(
     requestData: PlainObjectMap,
     { data }: MergedCachedFieldData,
@@ -330,7 +330,7 @@ export class CacheManager implements CacheManagerDef {
 
     const dataCaching: Promise<void>[] = [];
 
-    const { cacheMetadata, data, hasNext } = await this._resolveRequest(
+    const { cacheMetadata, data, hasNext, paths } = await this._resolveRequest(
       updatedRequestData,
       rawResponseData,
       options,
@@ -340,35 +340,41 @@ export class CacheManager implements CacheManagerDef {
     let partialQueryResponse: PartialQueryResponse | undefined;
 
     if (cacheManagerContext.queryFiltered) {
+      if (!(rawResponseData.hasNext || rawResponseData.paths)) {
+        dataCaching.push(
+          this._setQueryResponseCacheEntry(
+            updatedRequestData.hash,
+            { cacheMetadata, data },
+            options,
+            cacheManagerContext,
+          ),
+        );
+      }
+
+      if (!rawResponseData.paths) {
+        partialQueryResponse = this._getPartialQueryResponse(requestData.hash);
+      }
+    }
+
+    const responseCacheMetadata = CacheManager._mergeResponseCacheMetadata(cacheMetadata, partialQueryResponse);
+    const responseData = this._mergeResponseData(data, partialQueryResponse);
+
+    if (!(rawResponseData.hasNext || rawResponseData.paths)) {
       dataCaching.push(
         this._setQueryResponseCacheEntry(
-          updatedRequestData.hash,
-          { cacheMetadata, data },
+          requestData.hash,
+          { cacheMetadata: responseCacheMetadata, data: responseData },
           options,
           cacheManagerContext,
         ),
       );
-
-      partialQueryResponse = this._getPartialQueryResponse(requestData.hash);
     }
 
-    const responseCacheMetadata = CacheManager._getResponseCacheMetadata(cacheMetadata, partialQueryResponse);
-    const responseData = this._getResponseData(data, partialQueryResponse);
-
-    dataCaching.push(
-      this._setQueryResponseCacheEntry(
-        requestData.hash,
-        { cacheMetadata: responseCacheMetadata, data: responseData },
-        options,
-        cacheManagerContext,
-      ),
-    );
-
     if (options.awaitDataCaching) {
       await Promise.all(dataCaching);
     }
 
-    return { cacheMetadata: responseCacheMetadata, data: responseData, hasNext };
+    return { cacheMetadata: responseCacheMetadata, data: responseData, hasNext, paths };
   }
 
   public async resolveRequest(
@@ -616,14 +622,6 @@ export class CacheManager implements CacheManagerDef {
     return partialQueryResponse;
   }
 
-  private _getResponseData(responseData: PlainObjectMap, partialQueryResponse?: PartialQueryResponse): PlainObjectMap {
-    if (!partialQueryResponse) {
-      return responseData;
-    }
-
-    return this._mergeObjects(partialQueryResponse.data, responseData);
-  }
-
   private async _hasCacheEntry(cacheType: CacheTypes, hash: string): Promise<Cacheability | false> {
     try {
       return await this._cache.has(`${cacheType}::${hash}`);
@@ -654,6 +652,17 @@ export class CacheManager implements CacheManagerDef {
     });
   }
 
+  private _mergeResponseData(
+    responseData: PlainObjectMap,
+    partialQueryResponse?: PartialQueryResponse,
+  ): PlainObjectMap {
+    if (!partialQueryResponse) {
+      return responseData;
+    }
+
+    return this._mergeObjects(partialQueryResponse.data, responseData);
+  }
+
   private async _parseEntityAndRequestFieldPathCacheEntryData(
     field: FieldNode,
     ancestorKeysAndPaths: AncestorKeysAndPaths,
@@ -714,10 +723,10 @@ export class CacheManager implements CacheManagerDef {
     options: RequestOptions,
     context: CacheManagerContext,
   ): Promise<ResponseData> {
-    const normalizedResponseData = rawResponseData.path ? normalizeResponseData(rawResponseData) : rawResponseData;
+    const normalizedResponseData = rawResponseData.paths ? normalizeResponseData(rawResponseData) : rawResponseData;
     const dataCaching: Promise<void>[] = [];
     const cacheMetadata = this._buildCacheMetadata(requestData, normalizedResponseData, options, context);
-    const { data, hasNext } = normalizedResponseData;
+    const { data, hasNext, paths } = normalizedResponseData;
 
     dataCaching.push(
       this._setEntityAndRequestFieldPathCacheEntries(
@@ -732,7 +741,7 @@ export class CacheManager implements CacheManagerDef {
       await Promise.all(dataCaching);
     }
 
-    return { cacheMetadata, data, hasNext };
+    return { cacheMetadata, data, hasNext, paths };
   }
 
   private async _retrieveCachedEntityData(