@graphql-box/cache-manager 2.4.0 → 2.5.0

package/lib/browser/production.analysis.txt

@@ -1,23 +1,23 @@
 -----------------------------
 Rollup File Analysis
 -----------------------------
-bundle size:    90.576 KB
-original size:  60.859 KB
+bundle size:    94.202 KB
+original size:  64.867 KB
 code reduction: 0 %
-module count:   21
+module count:   25
 
 ███████████████████████████████████░░░░░░░░░░░░░░░
 file:            /src/main/index.ts
-bundle space:    71.58 %
-rendered size:   64.837 KB
-original size:   35.978 KB
+bundle space:    70.22 %
+rendered size:   66.144 KB
+original size:   38.003 KB
 code reduction:  0 %
 dependents:      1
   - /src/index.ts
 
 ██░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-cache-query/index.ts
-bundle space:    4.24 %
+bundle space:    4.08 %
 rendered size:   3.839 KB
 original size:   1.282 KB
 code reduction:  0 %
@@ -26,7 +26,7 @@ dependents:      1
 
 █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-cache-entry/index.ts
-bundle space:    3.81 %
+bundle space:    3.66 %
 rendered size:   3.451 KB
 original size:   1.197 KB
 code reduction:  0 %
@@ -35,7 +35,7 @@ dependents:      1
 
 █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-partial-compiled/index.ts
-bundle space:    3.72 %
+bundle space:    3.58 %
 rendered size:   3.37 KB
 original size:   1.161 KB
 code reduction:  0 %
@@ -44,7 +44,7 @@ dependents:      1
 
 █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterField.ts
-bundle space:    3.13 %
+bundle space:    3.01 %
 rendered size:   2.834 KB
 original size:   2.914 KB
 code reduction:  2.75 %
@@ -54,7 +54,7 @@ dependents:      2
 
 █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/buildKeysAndPaths.ts
-bundle space:    2.72 %
+bundle space:    2.61 %
 rendered size:   2.461 KB
 original size:   2.196 KB
 code reduction:  0 %
@@ -64,9 +64,18 @@ dependents:      4
   - /src/helpers/filterQuery.ts
   - /src/main/index.ts
 
+░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+file:            /src/helpers/mergeResponseDataSets.ts
+bundle space:    1.82 %
+rendered size:   1.716 KB
+original size:   907 Bytes
+code reduction:  0 %
+dependents:      1
+  - /src/main/index.ts
+
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterFragmentDefinitions.ts
-bundle space:    1.59 %
+bundle space:    1.53 %
 rendered size:   1.441 KB
 original size:   1.5 KB
 code reduction:  3.93 %
@@ -74,17 +83,17 @@ dependents:      1
   - /src/helpers/filterQuery.ts
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-file:            /src/helpers/normalizeResponseData.ts
-bundle space:    1.27 %
-rendered size:   1.152 KB
-original size:   287 Bytes
+file:            /src/helpers/normalizePatchResponseData.ts
+bundle space:    1.39 %
+rendered size:   1.309 KB
+original size:   478 Bytes
 code reduction:  0 %
 dependents:      1
   - /src/main/index.ts
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterQuery.ts
-bundle space:    1.2 %
+bundle space:    1.15 %
 rendered size:   1.088 KB
 original size:   1.467 KB
 code reduction:  25.84 %
@@ -93,7 +102,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterIDsAndTypeNames.ts
-bundle space:    1.1 %
+bundle space:    1.06 %
 rendered size:   998 Bytes
 original size:   1.107 KB
 code reduction:  9.85 %
@@ -102,7 +111,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/checkFieldPathChecklist.ts
-bundle space:    1.06 %
+bundle space:    1.02 %
 rendered size:   957 Bytes
 original size:   828 Bytes
 code reduction:  0 %
@@ -111,7 +120,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterOutPropsWithArgsOrDirectives.ts
-bundle space:    1.02 %
+bundle space:    0.98 %
 rendered size:   927 Bytes
 original size:   1.119 KB
 code reduction:  17.16 %
@@ -120,7 +129,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterInlineFragments.ts
-bundle space:    0.87 %
+bundle space:    0.84 %
 rendered size:   788 Bytes
 original size:   941 Bytes
 code reduction:  16.26 %
@@ -129,7 +138,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/deriveOpCacheability.ts
-bundle space:    0.87 %
+bundle space:    0.83 %
 rendered size:   786 Bytes
 original size:   858 Bytes
 code reduction:  8.39 %
@@ -138,7 +147,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterFragmentSpreads.ts
-bundle space:    0.73 %
+bundle space:    0.7 %
 rendered size:   661 Bytes
 original size:   936 Bytes
 code reduction:  29.38 %
@@ -147,7 +156,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/createFragmentSpreadChecklist.ts
-bundle space:    0.4 %
+bundle space:    0.38 %
 rendered size:   362 Bytes
 original size:   470 Bytes
 code reduction:  22.98 %
@@ -156,7 +165,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/consts/index.ts
-bundle space:    0.35 %
+bundle space:    0.33 %
 rendered size:   315 Bytes
 original size:   390 Bytes
 code reduction:  19.23 %
@@ -170,18 +179,45 @@ dependents:      6
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/validTypeIDValue.ts
-bundle space:    0.34 %
+bundle space:    0.33 %
 rendered size:   309 Bytes
 original size:   426 Bytes
 code reduction:  27.46 %
 dependents:      1
   - /src/main/index.ts
 
+░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+file:            /src/helpers/isNotResponseChunk.ts
+bundle space:    0.17 %
+rendered size:   157 Bytes
+original size:   306 Bytes
+code reduction:  48.69 %
+dependents:      1
+  - /src/main/index.ts
+
+░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+file:            /src/helpers/isLastResponseChunk.ts
+bundle space:    0.17 %
+rendered size:   156 Bytes
+original size:   304 Bytes
+code reduction:  48.68 %
+dependents:      1
+  - /src/main/index.ts
+
+░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+file:            /src/helpers/isNotLastResponseChunk.ts
+bundle space:    0.14 %
+rendered size:   133 Bytes
+original size:   278 Bytes
+code reduction:  52.16 %
+dependents:      1
+  - /src/main/index.ts
+
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/defs/index.ts
 bundle space:    0 %
 rendered size:   0 Byte
-original size:   5.422 KB
+original size:   5.419 KB
 code reduction:  100 %
 dependents:      1
   - /src/index.ts

package/lib/main/helpers/isFirstResponseChunk.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _default = (rawResponseData, context) => context.hasDeferOrStream && rawResponseData.hasNext && !rawResponseData.paths;
+
+exports.default = _default;
+//# sourceMappingURL=isFirstResponseChunk.js.map

package/lib/main/helpers/isFirstResponseChunk.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/helpers/isFirstResponseChunk.ts"],"names":["rawResponseData","context","hasDeferOrStream","hasNext","paths"],"mappings":";;;;;;;eAGe,CAACA,eAAD,EAAyDC,OAAzD,KACbA,OAAO,CAACC,gBAAR,IAA4BF,eAAe,CAACG,OAA5C,IAAuD,CAACH,eAAe,CAACI,K","sourcesContent":["import { RawResponseDataWithMaybeCacheMetadata } from \"@graphql-box/core\";\nimport { CacheManagerContext } from \"..\";\n\nexport default (rawResponseData: RawResponseDataWithMaybeCacheMetadata, context: CacheManagerContext) =>\n  context.hasDeferOrStream && rawResponseData.hasNext && !rawResponseData.paths;\n"],"file":"isFirstResponseChunk.js"}

package/lib/main/helpers/isLastResponseChunk.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _default = (rawResponseData, context) => context.hasDeferOrStream && !rawResponseData.hasNext && rawResponseData.paths;
+
+exports.default = _default;
+//# sourceMappingURL=isLastResponseChunk.js.map

package/lib/main/helpers/isLastResponseChunk.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/helpers/isLastResponseChunk.ts"],"names":["rawResponseData","context","hasDeferOrStream","hasNext","paths"],"mappings":";;;;;;;eAGe,CAACA,eAAD,EAAyDC,OAAzD,KACbA,OAAO,CAACC,gBAAR,IAA4B,CAACF,eAAe,CAACG,OAA7C,IAAwDH,eAAe,CAACI,K","sourcesContent":["import { RawResponseDataWithMaybeCacheMetadata } from \"@graphql-box/core\";\nimport { CacheManagerContext } from \"..\";\n\nexport default (rawResponseData: RawResponseDataWithMaybeCacheMetadata, context: CacheManagerContext) =>\n  context.hasDeferOrStream && !rawResponseData.hasNext && rawResponseData.paths;\n"],"file":"isLastResponseChunk.js"}

package/lib/main/helpers/isNotLastResponseChunk.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _default = (rawResponseData, context) => context.hasDeferOrStream && rawResponseData.hasNext;
+
+exports.default = _default;
+//# sourceMappingURL=isNotLastResponseChunk.js.map

package/lib/main/helpers/isNotLastResponseChunk.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/helpers/isNotLastResponseChunk.ts"],"names":["rawResponseData","context","hasDeferOrStream","hasNext"],"mappings":";;;;;;;eAGe,CAACA,eAAD,EAAyDC,OAAzD,KACbA,OAAO,CAACC,gBAAR,IAA4BF,eAAe,CAACG,O","sourcesContent":["import { RawResponseDataWithMaybeCacheMetadata } from \"@graphql-box/core\";\nimport { CacheManagerContext } from \"..\";\n\nexport default (rawResponseData: RawResponseDataWithMaybeCacheMetadata, context: CacheManagerContext) =>\n  context.hasDeferOrStream && rawResponseData.hasNext;\n"],"file":"isNotLastResponseChunk.js"}

package/lib/main/helpers/isNotResponseChunk.js

@@ -0,0 +1,11 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _default = (rawResponseData, context) => !context.hasDeferOrStream && !rawResponseData.hasNext && !rawResponseData.paths;
+
+exports.default = _default;
+//# sourceMappingURL=isNotResponseChunk.js.map

package/lib/main/helpers/isNotResponseChunk.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/helpers/isNotResponseChunk.ts"],"names":["rawResponseData","context","hasDeferOrStream","hasNext","paths"],"mappings":";;;;;;;eAGe,CAACA,eAAD,EAAyDC,OAAzD,KACb,CAACA,OAAO,CAACC,gBAAT,IAA6B,CAACF,eAAe,CAACG,OAA9C,IAAyD,CAACH,eAAe,CAACI,K","sourcesContent":["import { RawResponseDataWithMaybeCacheMetadata } from \"@graphql-box/core\";\nimport { CacheManagerContext } from \"..\";\n\nexport default (rawResponseData: RawResponseDataWithMaybeCacheMetadata, context: CacheManagerContext) =>\n  !context.hasDeferOrStream && !rawResponseData.hasNext && !rawResponseData.paths;\n"],"file":"isNotResponseChunk.js"}

package/lib/main/helpers/mergeResponseDataSets.js

@@ -0,0 +1,53 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+
+var _merge2 = _interopRequireDefault(require("lodash/merge"));
+
+var _default = responseDataSets => {
+  return responseDataSets.reduce((acc, dataSet, index) => {
+    const {
+      _cacheMetadata,
+      data,
+      hasNext,
+      headers,
+      paths
+    } = dataSet;
+
+    if (_cacheMetadata) {
+      acc._cacheMetadata = acc._cacheMetadata ? { ...acc._cacheMetadata,
+        ..._cacheMetadata
+      } : _cacheMetadata;
+    }
+
+    acc.data = acc.data ? (0, _merge2.default)(acc.data, data) : data;
+
+    if (index === 0) {
+      acc.headers = headers;
+    }
+
+    if (index === responseDataSets.length - 1) {
+      acc.hasNext = hasNext;
+    }
+
+    if (paths) {
+      if (!acc.paths) {
+        acc.paths = [];
+      }
+
+      acc.paths.push(paths[0]);
+    }
+
+    return acc;
+  }, {
+    data: {}
+  });
+};
+
+exports.default = _default;
+//# sourceMappingURL=mergeResponseDataSets.js.map

package/lib/main/helpers/mergeResponseDataSets.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/helpers/mergeResponseDataSets.ts"],"names":["responseDataSets","reduce","acc","dataSet","index","_cacheMetadata","data","hasNext","headers","paths","length","push"],"mappings":";;;;;;;;;;;eAGgBA,gBAAD,IAA+D;AAC5E,SAAOA,gBAAgB,CAACC,MAAjB,CACL,CAACC,GAAD,EAA6CC,OAA7C,EAAsDC,KAAtD,KAAgE;AAC9D,UAAM;AAAEC,MAAAA,cAAF;AAAkBC,MAAAA,IAAlB;AAAwBC,MAAAA,OAAxB;AAAiCC,MAAAA,OAAjC;AAA0CC,MAAAA;AAA1C,QAAoDN,OAA1D;;AAEA,QAAIE,cAAJ,EAAoB;AAClBH,MAAAA,GAAG,CAACG,cAAJ,GAAqBH,GAAG,CAACG,cAAJ,GAAqB,EAAE,GAAGH,GAAG,CAACG,cAAT;AAAyB,WAAGA;AAA5B,OAArB,GAAoEA,cAAzF;AACD;;AAEDH,IAAAA,GAAG,CAACI,IAAJ,GAAWJ,GAAG,CAACI,IAAJ,GAAW,qBAAMJ,GAAG,CAACI,IAAV,EAAgBA,IAAhB,CAAX,GAAmCA,IAA9C;;AAEA,QAAIF,KAAK,KAAK,CAAd,EAAiB;AACfF,MAAAA,GAAG,CAACM,OAAJ,GAAcA,OAAd;AACD;;AAED,QAAIJ,KAAK,KAAKJ,gBAAgB,CAACU,MAAjB,GAA0B,CAAxC,EAA2C;AACzCR,MAAAA,GAAG,CAACK,OAAJ,GAAcA,OAAd;AACD;;AAED,QAAIE,KAAJ,EAAW;AACT,UAAI,CAACP,GAAG,CAACO,KAAT,EAAgB;AACdP,QAAAA,GAAG,CAACO,KAAJ,GAAY,EAAZ;AACD;;AAEDP,MAAAA,GAAG,CAACO,KAAJ,CAAUE,IAAV,CAAeF,KAAK,CAAC,CAAD,CAApB;AACD;;AAED,WAAOP,GAAP;AACD,GA3BI,EA4BL;AAAEI,IAAAA,IAAI,EAAE;AAAR,GA5BK,CAAP;AA8BD,C","sourcesContent":["import { RawResponseDataWithMaybeCacheMetadata } from \"@graphql-box/core\";\nimport { merge } from \"lodash\";\n\nexport default (responseDataSets: RawResponseDataWithMaybeCacheMetadata[]) => {\n  return responseDataSets.reduce(\n    (acc: RawResponseDataWithMaybeCacheMetadata, dataSet, index) => {\n      const { _cacheMetadata, data, hasNext, headers, paths } = dataSet;\n\n      if (_cacheMetadata) {\n        acc._cacheMetadata = acc._cacheMetadata ? { ...acc._cacheMetadata, ..._cacheMetadata } : _cacheMetadata;\n      }\n\n      acc.data = acc.data ? merge(acc.data, data) : data;\n\n      if (index === 0) {\n        acc.headers = headers;\n      }\n\n      if (index === responseDataSets.length - 1) {\n        acc.hasNext = hasNext;\n      }\n\n      if (paths) {\n        if (!acc.paths) {\n          acc.paths = [];\n        }\n\n        acc.paths.push(paths[0]);\n      }\n\n      return acc;\n    },\n    { data: {} },\n  );\n};\n"],"file":"mergeResponseDataSets.js"}

package/lib/main/helpers/{normalizeResponseData.js → normalizePatchResponseData.js}

@@ -9,16 +9,21 @@ exports.default = void 0;
 
 var _set2 = _interopRequireDefault(require("lodash/set"));
 
-var _default = ({
-  data,
-  path,
-  ...rest
-}) => {
+var _default = (rawResponseData, context) => {
+  if (!context.normalizePatchResponseData) {
+    return rawResponseData;
+  }
+
+  const {
+    data,
+    paths,
+    ...rest
+  } = rawResponseData;
   return { ...rest,
-    data: (0, _set2.default)({}, path, data),
-    path
+    data: (0, _set2.default)({}, paths[0], data),
+    paths
   };
 };
 
 exports.default = _default;
-//# sourceMappingURL=normalizeResponseData.js.map
+//# sourceMappingURL=normalizePatchResponseData.js.map

package/lib/main/helpers/normalizePatchResponseData.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/helpers/normalizePatchResponseData.ts"],"names":["rawResponseData","context","normalizePatchResponseData","data","paths","rest"],"mappings":";;;;;;;;;;;eAIe,CAACA,eAAD,EAAyDC,OAAzD,KAA0F;AACvG,MAAI,CAACA,OAAO,CAACC,0BAAb,EAAyC;AACvC,WAAOF,eAAP;AACD;;AAED,QAAM;AAAEG,IAAAA,IAAF;AAAQC,IAAAA,KAAR;AAAe,OAAGC;AAAlB,MAA2BL,eAAjC;AAEA,SAAO,EACL,GAAGK,IADE;AAELF,IAAAA,IAAI,EAAE,mBAAI,EAAJ,EAASC,KAAD,CAAoB,CAApB,CAAR,EAAgCD,IAAhC,CAFD;AAGLC,IAAAA;AAHK,GAAP;AAKD,C","sourcesContent":["import { RawResponseDataWithMaybeCacheMetadata } from \"@graphql-box/core\";\nimport { set } from \"lodash\";\nimport { CacheManagerContext } from \"..\";\n\nexport default (rawResponseData: RawResponseDataWithMaybeCacheMetadata, context: CacheManagerContext) => {\n  if (!context.normalizePatchResponseData) {\n    return rawResponseData;\n  }\n\n  const { data, paths, ...rest } = rawResponseData;\n\n  return {\n    ...rest,\n    data: set({}, (paths as string[])[0], data),\n    paths,\n  };\n};\n"],"file":"normalizePatchResponseData.js"}

package/lib/main/main/index.js

@@ -52,7 +52,15 @@ var _filterOutPropsWithArgsOrDirectives = _interopRequireDefault(require("../hel
 
 var _filterQuery = _interopRequireDefault(require("../helpers/filterQuery"));
 
-var _normalizeResponseData = _interopRequireDefault(require("../helpers/normalizeResponseData"));
+var _isLastResponseChunk = _interopRequireDefault(require("../helpers/isLastResponseChunk"));
+
+var _isNotLastResponseChunk = _interopRequireDefault(require("../helpers/isNotLastResponseChunk"));
+
+var _isNotResponseChunk = _interopRequireDefault(require("../helpers/isNotResponseChunk"));
+
+var _mergeResponseDataSets = _interopRequireDefault(require("../helpers/mergeResponseDataSets"));
+
+var _normalizePatchResponseData = _interopRequireDefault(require("../helpers/normalizePatchResponseData"));
 
 var _validTypeIDValue = require("../helpers/validTypeIDValue");
 
@@ -225,6 +233,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     (0, _defineProperty2.default)(this, "_cascadeCacheControl", void 0);
     (0, _defineProperty2.default)(this, "_fallbackOperationCacheability", void 0);
     (0, _defineProperty2.default)(this, "_partialQueryResponses", new Map());
+    (0, _defineProperty2.default)(this, "_responseChunksAwaitingCaching", new Map());
     (0, _defineProperty2.default)(this, "_typeCacheDirectives", void 0);
     (0, _defineProperty2.default)(this, "_typeIDKey", void 0);
     const {
@@ -312,6 +321,22 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     };
   }
 
+  async cacheQuery(requestData, updatedRequestData, rawResponseData, options, context) {
+    const cacheManagerContext = { ...context,
+      fragmentDefinitions: (0, _helpers.getFragmentDefinitions)(updatedRequestData.ast),
+      typeIDKey: this._typeIDKey
+    };
+    return this._cacheResponse(requestData, updatedRequestData, rawResponseData, options, cacheManagerContext);
+  }
+
+  async cacheResponse(requestData, rawResponseData, options, context) {
+    const cacheManagerContext = { ...context,
+      fragmentDefinitions: (0, _helpers.getFragmentDefinitions)(requestData.ast),
+      typeIDKey: this._typeIDKey
+    };
+    return this._cacheResponse(requestData, undefined, rawResponseData, options, cacheManagerContext);
+  }
+
   async checkCacheEntry(cacheType, hash, options, context) {
     return this._checkCacheEntry(cacheType, hash, options, context);
   }
@@ -337,66 +362,10 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     this._partialQueryResponses.delete(hash);
   }
 
-  async resolveQuery(requestData, updatedRequestData, rawResponseData, options, context) {
-    const cacheManagerContext = { ...context,
-      fragmentDefinitions: (0, _helpers.getFragmentDefinitions)(updatedRequestData.ast),
-      typeIDKey: this._typeIDKey
-    };
-    const dataCaching = [];
-    const {
-      cacheMetadata,
-      data,
-      hasNext,
-      path
-    } = await this._resolveRequest(updatedRequestData, rawResponseData, options, cacheManagerContext);
-    let partialQueryResponse;
-
-    if (cacheManagerContext.queryFiltered) {
-      if (!(rawResponseData.hasNext || rawResponseData.path)) {
-        dataCaching.push(this._setQueryResponseCacheEntry(updatedRequestData.hash, {
-          cacheMetadata,
-          data
-        }, options, cacheManagerContext));
-      }
-
-      if (!rawResponseData.path) {
-        partialQueryResponse = this._getPartialQueryResponse(requestData.hash);
-      }
-    }
-
-    const responseCacheMetadata = CacheManager._mergeResponseCacheMetadata(cacheMetadata, partialQueryResponse);
-
-    const responseData = this._mergeResponseData(data, partialQueryResponse);
-
-    if (!(rawResponseData.hasNext || rawResponseData.path)) {
-      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,
-      path
-    };
-  }
-
-  async resolveRequest(requestData, rawResponseData, options, context) {
-    const cacheManagerContext = { ...context,
-      fragmentDefinitions: (0, _helpers.getFragmentDefinitions)(requestData.ast),
-      typeIDKey: this._typeIDKey
-    };
-    return this._resolveRequest(requestData, rawResponseData, options, cacheManagerContext);
-  }
-
   async _analyzeFieldNode(fieldNode, cachedAncestorFieldData, cachedResponseData, options, context) {
-    if ((0, _helpers.hasChildFields)(fieldNode)) {
+    if ((0, _helpers.hasChildFields)(fieldNode, {
+      fragmentDefinitions: context.fragmentDefinitions
+    })) {
       await this._analyzeParentFieldNode(fieldNode, cachedAncestorFieldData, cachedResponseData, options, context);
     } else {
       await this._analyzeLeafFieldNode(fieldNode, cachedAncestorFieldData, cachedResponseData, options, context);
@@ -531,6 +500,81 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     return cacheMetadata;
   }
 
+  async _cacheResponse(requestData, updatedRequestData, rawResponseData, options, context) {
+    const normalizedResponseData = (0, _normalizePatchResponseData.default)(rawResponseData, context);
+    let responseDataForCaching = normalizedResponseData;
+
+    if ((0, _isNotLastResponseChunk.default)(rawResponseData, context)) {
+      this._setResponseChunksAwaitingCaching(normalizedResponseData, context);
+
+      responseDataForCaching = undefined;
+    }
+
+    if ((0, _isLastResponseChunk.default)(rawResponseData, context)) {
+      responseDataForCaching = this._retrieveResponseDataForCaching(normalizedResponseData, context);
+    }
+
+    const dataCaching = [];
+
+    if (responseDataForCaching) {
+      const {
+        data
+      } = responseDataForCaching;
+
+      const cacheMetadata = this._buildCacheMetadata(requestData, responseDataForCaching, options, context);
+
+      dataCaching.push(this._setEntityAndRequestFieldPathCacheEntries(requestData, {
+        cacheMetadata,
+        entityData: (0, _cloneDeep2.default)(data),
+        requestFieldPathData: (0, _cloneDeep2.default)(data)
+      }, options, context));
+      let queryCacheMetadata;
+      let queryData;
+
+      if (context.operation === _core.QUERY) {
+        let partialQueryResponse;
+
+        if (context.queryFiltered && updatedRequestData) {
+          dataCaching.push(this._setQueryResponseCacheEntry(updatedRequestData.hash, {
+            cacheMetadata,
+            data
+          }, options, context));
+          partialQueryResponse = this._getPartialQueryResponse(requestData.hash);
+        }
+
+        queryCacheMetadata = CacheManager._mergeResponseCacheMetadata(cacheMetadata, partialQueryResponse);
+        queryData = this._mergeResponseData(data, partialQueryResponse);
+        dataCaching.push(this._setQueryResponseCacheEntry(requestData.hash, {
+          cacheMetadata: queryCacheMetadata,
+          data: queryData
+        }, options, context));
+      }
+
+      if (options.awaitDataCaching) {
+        await Promise.all(dataCaching);
+      }
+
+      if ((0, _isNotResponseChunk.default)(normalizedResponseData, context) && queryCacheMetadata && queryData) {
+        return {
+          cacheMetadata: queryCacheMetadata,
+          data: queryData
+        };
+      }
+    }
+
+    const {
+      data,
+      hasNext,
+      paths
+    } = normalizedResponseData;
+    return {
+      cacheMetadata: this._buildCacheMetadata(requestData, normalizedResponseData, options, context),
+      data,
+      hasNext,
+      paths
+    };
+  }
+
   async _checkCacheEntry(cacheType, hash, options, context) {
     try {
       const cacheability = await this._hasCacheEntry(cacheType, hash);
@@ -674,35 +718,6 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     }, options, context);
   }
 
-  async _resolveRequest(requestData, rawResponseData, options, context) {
-    const normalizedResponseData = rawResponseData.path ? (0, _normalizeResponseData.default)(rawResponseData) : rawResponseData;
-    const dataCaching = [];
-
-    const cacheMetadata = this._buildCacheMetadata(requestData, normalizedResponseData, options, context);
-
-    const {
-      data,
-      hasNext,
-      path
-    } = normalizedResponseData;
-    dataCaching.push(this._setEntityAndRequestFieldPathCacheEntries(requestData, {
-      cacheMetadata,
-      entityData: (0, _cloneDeep2.default)(data),
-      requestFieldPathData: (0, _cloneDeep2.default)(data)
-    }, options, context));
-
-    if (options.awaitDataCaching) {
-      await Promise.all(dataCaching);
-    }
-
-    return {
-      cacheMetadata,
-      data,
-      hasNext,
-      path
-    };
-  }
-
   async _retrieveCachedEntityData(validTypeIDValue, {
     possibleTypes,
     typeName
@@ -821,6 +836,14 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     return cachedResponseData;
   }
 
+  _retrieveResponseDataForCaching(normalizedResponseData, context) {
+    const responseChunks = this._responseChunksAwaitingCaching.get(context.boxID);
+
+    this._responseChunksAwaitingCaching.delete(context.boxID);
+
+    return (0, _mergeResponseDataSets.default)([...responseChunks, normalizedResponseData]);
+  }
+
   async _setCacheEntry(cacheType, hash, value, cachemapOptions, _options, _context) {
     try {
       await this._cache.set(`${cacheType}::${hash}`, (0, _cloneDeep2.default)(value), cachemapOptions);
@@ -1032,7 +1055,9 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
         tag: options.tag
       }, options, context);
 
-      if ((0, _helpers.hasChildFields)(field)) {
+      if ((0, _helpers.hasChildFields)(field, {
+        fragmentDefinitions: context.fragmentDefinitions
+      })) {
         if (isEntity) {
           (0, _set2.default)(data, responseDataPath, {
             __cacheKey: `${_core.REQUEST_FIELD_PATHS}::${hashedRequestFieldCacheKey}`
@@ -1044,6 +1069,16 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     }
   }
 
+  _setResponseChunksAwaitingCaching(normalizedResponseData, context) {
+    const responseChunks = this._responseChunksAwaitingCaching.get(context.boxID);
+
+    if (responseChunks) {
+      this._responseChunksAwaitingCaching.set(context.boxID, [...responseChunks, normalizedResponseData]);
+    } else {
+      this._responseChunksAwaitingCaching.set(context.boxID, [normalizedResponseData]);
+    }
+  }
+
 }, ((0, _applyDecoratedDescriptor2.default)(_class.prototype, "_getCacheEntry", [_dec], Object.getOwnPropertyDescriptor(_class.prototype, "_getCacheEntry"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "_setCacheEntry", [_dec2], Object.getOwnPropertyDescriptor(_class.prototype, "_setCacheEntry"), _class.prototype), (0, _applyDecoratedDescriptor2.default)(_class.prototype, "_setPartialQueryResponse", [_dec3], Object.getOwnPropertyDescriptor(_class.prototype, "_setPartialQueryResponse"), _class.prototype)), _class));
 exports.CacheManager = CacheManager;