@graphql-box/cache-manager 2.4.2 → 3.1.0

package/src/index.test.ts

@@ -4,6 +4,7 @@ import {
   DEFAULT_TYPE_ID_KEY,
   DehydratedCacheMetadata,
   MUTATION,
+  RawResponseDataWithMaybeCacheMetadata,
   RequestData,
   ResponseData,
   SUBSCRIPTION,
@@ -31,13 +32,15 @@ describe("@graphql-box/cache-manager >>", () => {
   });
 
   describe("resolveRequest >>", () => {
-    let responseData: ResponseData;
+    let responseData: ResponseData | undefined;
     let requestData: RequestData;
 
     describe("mutation >> nested interface >>", () => {
       describe("cascading cache control >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          responseData = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -49,7 +52,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           requestData = getRequestData(parsedRequests.nestedInterfaceMutation);
 
-          responseData = await cacheManager.resolveRequest(
+          responseData = await cacheManager.cacheResponse(
             requestData,
             responses.nestedInterfaceMutation,
             { awaitDataCaching: true },
@@ -68,7 +71,9 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("type cache directives >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          responseData = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -86,7 +91,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           requestData = getRequestData(parsedRequests.nestedInterfaceMutation);
 
-          responseData = await cacheManager.resolveRequest(
+          responseData = await cacheManager.cacheResponse(
             requestData,
             responses.nestedInterfaceMutation,
             { awaitDataCaching: true },
@@ -107,7 +112,9 @@ describe("@graphql-box/cache-manager >>", () => {
     describe("subscription >> nested type >>", () => {
       describe("cascading cache control >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          responseData = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -119,7 +126,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           requestData = getRequestData(parsedRequests.nestedTypeSubscription);
 
-          responseData = await cacheManager.resolveRequest(
+          responseData = await cacheManager.cacheResponse(
             requestData,
             responses.nestedTypeSubscription,
             { awaitDataCaching: true },
@@ -138,7 +145,9 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("type cache directives >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          responseData = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -153,7 +162,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           requestData = getRequestData(parsedRequests.nestedTypeSubscription);
 
-          responseData = await cacheManager.resolveRequest(
+          responseData = await cacheManager.cacheResponse(
             requestData,
             responses.nestedTypeSubscription,
             { awaitDataCaching: true },
@@ -173,14 +182,16 @@ describe("@graphql-box/cache-manager >>", () => {
   });
 
   describe("resolveQuery >>", () => {
-    let responseData: ResponseData;
+    let responseData: ResponseData | undefined;
     let requestData: RequestData;
 
     describe("not filtered >>", () => {
       describe("single type >>", () => {
         describe("cascading cache control >>", () => {
           beforeAll(async () => {
-            cacheManager = await CacheManager.init({
+            responseData = undefined;
+
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -192,7 +203,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.singleTypeQuery);
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.singleTypeQuery,
@@ -212,7 +223,9 @@ describe("@graphql-box/cache-manager >>", () => {
 
         describe("type cache directives >>", () => {
           beforeAll(async () => {
-            cacheManager = await CacheManager.init({
+            responseData = undefined;
+
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -226,7 +239,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.singleTypeQuery);
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.singleTypeQuery,
@@ -248,7 +261,9 @@ describe("@graphql-box/cache-manager >>", () => {
       describe("nested type with edges >>", () => {
         describe("cascading cache control >>", () => {
           beforeAll(async () => {
-            cacheManager = await CacheManager.init({
+            responseData = undefined;
+
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -260,7 +275,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedTypeQuery);
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedTypeQuery,
@@ -280,7 +295,9 @@ describe("@graphql-box/cache-manager >>", () => {
 
         describe("type cache directives >>", () => {
           beforeAll(async () => {
-            cacheManager = await CacheManager.init({
+            responseData = undefined;
+
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -297,7 +314,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedTypeQuery);
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedTypeQuery,
@@ -319,7 +336,9 @@ describe("@graphql-box/cache-manager >>", () => {
       describe("nested union with edges >>", () => {
         describe("cascading cache control >>", () => {
           beforeAll(async () => {
-            cacheManager = await CacheManager.init({
+            responseData = undefined;
+
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -331,7 +350,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedUnionQuery);
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedUnionQuery,
@@ -351,7 +370,9 @@ describe("@graphql-box/cache-manager >>", () => {
 
         describe("type cache directives >>", () => {
           beforeAll(async () => {
-            cacheManager = await CacheManager.init({
+            responseData = undefined;
+
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -366,7 +387,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedUnionQuery);
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedUnionQuery,
@@ -390,10 +411,11 @@ describe("@graphql-box/cache-manager >>", () => {
       describe("single type >>", () => {
         describe("cascading cache control >>", () => {
           beforeAll(async () => {
+            responseData = undefined;
             // @ts-ignore
             jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-            cacheManager = await CacheManager.init({
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -405,7 +427,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.singleTypeQuerySet.initial);
 
-            responseData = await cacheManager.resolveQuery(
+            await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.singleTypeQuerySet.initial,
@@ -421,10 +443,10 @@ describe("@graphql-box/cache-manager >>", () => {
               data,
             });
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               getRequestData(parsedRequests.singleTypeQuerySet.full),
               getRequestData(parsedRequests.singleTypeQuerySet.updated),
-              responses.singleTypeQuerySet.updated,
+              responses.singleTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
               getRequestContext({ fieldTypeMap: requestFieldTypeMaps.singleTypeQuery, queryFiltered: true }),
             );
@@ -441,10 +463,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
         describe("type cache directives >>", () => {
           beforeAll(async () => {
+            responseData = undefined;
             // @ts-ignore
             jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-            cacheManager = await CacheManager.init({
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -458,7 +481,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.singleTypeQuerySet.initial);
 
-            responseData = await cacheManager.resolveQuery(
+            await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.singleTypeQuerySet.initial,
@@ -474,10 +497,10 @@ describe("@graphql-box/cache-manager >>", () => {
               data,
             });
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               getRequestData(parsedRequests.singleTypeQuerySet.full),
               getRequestData(parsedRequests.singleTypeQuerySet.updated),
-              responses.singleTypeQuerySet.updated,
+              responses.singleTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
               getRequestContext({ fieldTypeMap: requestFieldTypeMaps.singleTypeQuery, queryFiltered: true }),
             );
@@ -496,10 +519,11 @@ describe("@graphql-box/cache-manager >>", () => {
       describe("nested type with edges >>", () => {
         describe("cascading cache control >>", () => {
           beforeAll(async () => {
+            responseData = undefined;
             // @ts-ignore
             jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-            cacheManager = await CacheManager.init({
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -511,7 +535,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedTypeQuerySet.initial);
 
-            responseData = await cacheManager.resolveQuery(
+            await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedTypeQuerySet.initial,
@@ -527,10 +551,10 @@ describe("@graphql-box/cache-manager >>", () => {
               data,
             });
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               getRequestData(parsedRequests.nestedTypeQuerySet.full),
               getRequestData(parsedRequests.nestedTypeQuerySet.updated),
-              responses.nestedTypeQuerySet.updated,
+              responses.nestedTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
               getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedTypeQuery, queryFiltered: true }),
             );
@@ -547,10 +571,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
         describe("type cache directives >>", () => {
           beforeAll(async () => {
+            responseData = undefined;
             // @ts-ignore
             jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-            cacheManager = await CacheManager.init({
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -567,7 +592,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedTypeQuerySet.initial);
 
-            responseData = await cacheManager.resolveQuery(
+            await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedTypeQuerySet.initial,
@@ -583,10 +608,10 @@ describe("@graphql-box/cache-manager >>", () => {
               data,
             });
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               getRequestData(parsedRequests.nestedTypeQuerySet.full),
               getRequestData(parsedRequests.nestedTypeQuerySet.updated),
-              responses.nestedTypeQuerySet.updated,
+              responses.nestedTypeQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
               getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedTypeQuery, queryFiltered: true }),
             );
@@ -605,10 +630,11 @@ describe("@graphql-box/cache-manager >>", () => {
       describe("nested union with edges >>", () => {
         describe("cascading cache control >>", () => {
           beforeAll(async () => {
+            responseData = undefined;
             // @ts-ignore
             jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-            cacheManager = await CacheManager.init({
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -620,7 +646,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedUnionQuerySet.initial);
 
-            responseData = await cacheManager.resolveQuery(
+            await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedUnionQuerySet.initial,
@@ -636,10 +662,10 @@ describe("@graphql-box/cache-manager >>", () => {
               data,
             });
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               getRequestData(parsedRequests.nestedUnionQuerySet.full),
               getRequestData(parsedRequests.nestedUnionQuerySet.updated),
-              responses.nestedUnionQuerySet.updated,
+              responses.nestedUnionQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
               getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedUnionQuery, queryFiltered: true }),
             );
@@ -656,10 +682,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
         describe("type cache directives >>", () => {
           beforeAll(async () => {
+            responseData = undefined;
             // @ts-ignore
             jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-            cacheManager = await CacheManager.init({
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -674,7 +701,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.nestedUnionQuerySet.initial);
 
-            responseData = await cacheManager.resolveQuery(
+            await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.nestedUnionQuerySet.initial,
@@ -690,10 +717,10 @@ describe("@graphql-box/cache-manager >>", () => {
               data,
             });
 
-            responseData = await cacheManager.resolveQuery(
+            responseData = await cacheManager.cacheQuery(
               getRequestData(parsedRequests.nestedUnionQuerySet.full),
               getRequestData(parsedRequests.nestedUnionQuerySet.updated),
-              responses.nestedUnionQuerySet.updated,
+              responses.nestedUnionQuerySet.updated as RawResponseDataWithMaybeCacheMetadata,
               { awaitDataCaching: true },
               getRequestContext({ fieldTypeMap: requestFieldTypeMaps.nestedUnionQuery, queryFiltered: true }),
             );
@@ -711,11 +738,13 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("defer >>", () => {
         describe("cascading cache control >>", () => {
+          const responseDataSet: ResponseData[] = [];
+
           beforeAll(async () => {
             // @ts-ignore
             jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-            cacheManager = await CacheManager.init({
+            cacheManager = new CacheManager({
               cache: new Cachemap({
                 name: "cachemap",
                 store: map(),
@@ -727,12 +756,12 @@ describe("@graphql-box/cache-manager >>", () => {
 
             requestData = getRequestData(parsedRequests.deferQuerySet.initial);
 
-            responseData = await cacheManager.resolveQuery(
+            await cacheManager.cacheQuery(
               requestData,
               requestData,
               responses.deferQuerySet.initial,
               { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery }),
+              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
             );
 
             const { cacheMetadata, data } = responses.deferQuerySet.partial;
@@ -743,17 +772,34 @@ describe("@graphql-box/cache-manager >>", () => {
               data,
             });
 
-            responseData = await cacheManager.resolveQuery(
-              getRequestData(parsedRequests.deferQuerySet.full),
-              getRequestData(parsedRequests.deferQuerySet.updated),
-              responses.deferQuerySet.updated,
-              { awaitDataCaching: true },
-              getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, queryFiltered: true }),
-            );
+            await new Promise((resolve: (value: void) => void) => {
+              const updateResponses = [...(responses.deferQuerySet.updated as RawResponseDataWithMaybeCacheMetadata[])];
+
+              const interval = setInterval(async () => {
+                const result = await cacheManager.cacheQuery(
+                  getRequestData(parsedRequests.deferQuerySet.full),
+                  getRequestData(parsedRequests.deferQuerySet.updated),
+                  updateResponses.shift() as RawResponseDataWithMaybeCacheMetadata,
+                  { awaitDataCaching: true },
+                  getRequestContext({
+                    fieldTypeMap: requestFieldTypeMaps.deferQuery,
+                    hasDeferOrStream: true,
+                    queryFiltered: true,
+                  }),
+                );
+
+                responseDataSet.push(result);
+
+                if (!updateResponses.length) {
+                  clearInterval(interval);
+                  resolve();
+                }
+              }, 50);
+            });
           });
 
           it("correct response data", () => {
-            expect(responseData).toMatchSnapshot();
+            expect(responseDataSet).toMatchSnapshot();
           });
 
           it("correct cache data", async () => {
@@ -765,12 +811,14 @@ describe("@graphql-box/cache-manager >>", () => {
   });
 
   describe("analyzeQuery >>", () => {
-    let analyzeQueryResult: AnalyzeQueryResult;
+    let analyzeQueryResult: AnalyzeQueryResult | undefined;
 
     describe("no matching data >>", () => {
       describe("single type >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          analyzeQueryResult = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -787,18 +835,20 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
       });
 
       describe("nested type with edges >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          analyzeQueryResult = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -815,18 +865,20 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
       });
 
       describe("nested union with edges >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          analyzeQueryResult = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -843,18 +895,20 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
       });
 
       describe("defer >>", () => {
         beforeAll(async () => {
-          cacheManager = await CacheManager.init({
+          analyzeQueryResult = undefined;
+
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -866,17 +920,17 @@ describe("@graphql-box/cache-manager >>", () => {
           analyzeQueryResult = await cacheManager.analyzeQuery(
             getRequestData(parsedRequests.deferQuery),
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery }),
+            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
           );
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
       });
     });
@@ -884,10 +938,11 @@ describe("@graphql-box/cache-manager >>", () => {
     describe("entire matching data >>", () => {
       describe("single type >>", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -901,7 +956,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           const requestData = getRequestData(parsedRequests.singleTypeQuery);
 
-          await cacheManager.resolveQuery(
+          await cacheManager.cacheQuery(
             requestData,
             requestData,
             responses.singleTypeQuery,
@@ -917,11 +972,11 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("no request data", () => {
-          expect(analyzeQueryResult.updated).toBeUndefined();
+          expect(analyzeQueryResult?.updated).toBeUndefined();
         });
 
         it("correct response data", () => {
-          expect(analyzeQueryResult.response).toMatchSnapshot();
+          expect(analyzeQueryResult?.response).toMatchSnapshot();
         });
 
         it("correct cache data", async () => {
@@ -931,10 +986,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("nested type with edges >>", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -951,7 +1007,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           const requestData = getRequestData(parsedRequests.nestedTypeQuery);
 
-          await cacheManager.resolveQuery(
+          await cacheManager.cacheQuery(
             requestData,
             requestData,
             responses.nestedTypeQuery,
@@ -967,11 +1023,11 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("no request data", () => {
-          expect(analyzeQueryResult.updated).toBeUndefined();
+          expect(analyzeQueryResult?.updated).toBeUndefined();
         });
 
         it("correct response data", () => {
-          expect(analyzeQueryResult.response).toMatchSnapshot();
+          expect(analyzeQueryResult?.response).toMatchSnapshot();
         });
 
         it("correct cache data", async () => {
@@ -981,10 +1037,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("nested union with edges >>", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -999,7 +1056,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           const requestData = getRequestData(parsedRequests.nestedUnionQuery);
 
-          await cacheManager.resolveQuery(
+          await cacheManager.cacheQuery(
             requestData,
             requestData,
             responses.nestedUnionQuery,
@@ -1015,11 +1072,11 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("no request data", () => {
-          expect(analyzeQueryResult.updated).toBeUndefined();
+          expect(analyzeQueryResult?.updated).toBeUndefined();
         });
 
         it("correct response data", () => {
-          expect(analyzeQueryResult.response).toMatchSnapshot();
+          expect(analyzeQueryResult?.response).toMatchSnapshot();
         });
 
         it("correct cache data", async () => {
@@ -1029,10 +1086,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("defer >>", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -1042,29 +1100,43 @@ describe("@graphql-box/cache-manager >>", () => {
             typeIDKey: DEFAULT_TYPE_ID_KEY,
           });
 
-          const requestData = getRequestData(parsedRequests.deferQuery);
-
-          await cacheManager.resolveQuery(
-            requestData,
-            requestData,
-            responses.deferQuery,
-            { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery }),
-          );
+          const requestData = getRequestData(parsedRequests.deferQuerySet.updated);
+
+          await new Promise((resolve: (value: void) => void) => {
+            const updateResponses = [...(responses.deferQuerySet.updated as RawResponseDataWithMaybeCacheMetadata[])];
+
+            const interval = setInterval(async () => {
+              await cacheManager.cacheQuery(
+                requestData,
+                requestData,
+                updateResponses.shift() as RawResponseDataWithMaybeCacheMetadata,
+                { awaitDataCaching: true },
+                getRequestContext({
+                  fieldTypeMap: requestFieldTypeMaps.deferQuery,
+                  hasDeferOrStream: true,
+                }),
+              );
+
+              if (!updateResponses.length) {
+                clearInterval(interval);
+                resolve();
+              }
+            }, 50);
+          });
 
           analyzeQueryResult = await cacheManager.analyzeQuery(
-            getRequestData(parsedRequests.deferQuery),
+            requestData,
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery }),
+            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
           );
         });
 
         it("no request data", () => {
-          expect(analyzeQueryResult.updated).toBeUndefined();
+          expect(analyzeQueryResult?.updated).toBeUndefined();
         });
 
         it("correct response data", () => {
-          expect(analyzeQueryResult.response).toMatchSnapshot();
+          expect(analyzeQueryResult?.response).toMatchSnapshot();
         });
 
         it("correct cache data", async () => {
@@ -1076,10 +1148,11 @@ describe("@graphql-box/cache-manager >>", () => {
     describe("some matching data >>", () => {
       describe("single type >>", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -1093,7 +1166,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           const requestData = getRequestData(parsedRequests.singleTypeQuerySet.initial);
 
-          await cacheManager.resolveQuery(
+          await cacheManager.cacheQuery(
             requestData,
             requestData,
             responses.singleTypeQuerySet.initial,
@@ -1109,12 +1182,12 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
 
         it("correct cache data", async () => {
@@ -1129,10 +1202,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("nested type with edges >", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -1149,7 +1223,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           const requestData = getRequestData(parsedRequests.nestedTypeQuerySet.initial);
 
-          await cacheManager.resolveQuery(
+          await cacheManager.cacheQuery(
             requestData,
             requestData,
             responses.nestedTypeQuerySet.initial,
@@ -1165,12 +1239,12 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
 
         it("correct cache data", async () => {
@@ -1185,10 +1259,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("nested union with edges >>", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -1203,7 +1278,7 @@ describe("@graphql-box/cache-manager >>", () => {
 
           const requestData = getRequestData(parsedRequests.nestedUnionQuerySet.initial);
 
-          await cacheManager.resolveQuery(
+          await cacheManager.cacheQuery(
             requestData,
             requestData,
             responses.nestedUnionQuerySet.initial,
@@ -1219,12 +1294,12 @@ describe("@graphql-box/cache-manager >>", () => {
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
 
         it("correct cache data", async () => {
@@ -1239,10 +1314,11 @@ describe("@graphql-box/cache-manager >>", () => {
 
       describe("defer >>", () => {
         beforeAll(async () => {
+          analyzeQueryResult = undefined;
           // @ts-ignore
           jest.spyOn(CacheManager, "_isValid").mockReturnValue(true);
 
-          cacheManager = await CacheManager.init({
+          cacheManager = new CacheManager({
             cache: new Cachemap({
               name: "cachemap",
               store: map(),
@@ -1254,28 +1330,28 @@ describe("@graphql-box/cache-manager >>", () => {
 
           const requestData = getRequestData(parsedRequests.deferQuerySet.initial);
 
-          await cacheManager.resolveQuery(
+          await cacheManager.cacheQuery(
             requestData,
             requestData,
             responses.deferQuerySet.initial,
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery }),
+            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
           );
 
           analyzeQueryResult = await cacheManager.analyzeQuery(
             getRequestData(parsedRequests.deferQuery),
             { awaitDataCaching: true },
-            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery }),
+            getRequestContext({ fieldTypeMap: requestFieldTypeMaps.deferQuery, hasDeferOrStream: true }),
           );
         });
 
         it("correct request data", () => {
-          const { ast, ...otherProps } = analyzeQueryResult.updated as RequestData;
+          const { ast, ...otherProps } = analyzeQueryResult?.updated as RequestData;
           expect(otherProps).toMatchSnapshot();
         });
 
         it("no response data", () => {
-          expect(analyzeQueryResult.response).toBeUndefined();
+          expect(analyzeQueryResult?.response).toBeUndefined();
         });
 
         it("correct cache data", async () => {