@graphql-box/cache-manager 3.2.0 → 3.2.1

package/lib/browser/production.analysis.txt

@@ -1,41 +1,41 @@
 -----------------------------
 Rollup File Analysis
 -----------------------------
-bundle size:    91.643 KB
-original size:  62.603 KB
+bundle size:    94.706 KB
+original size:  63.429 KB
 code reduction: 0 %
 module count:   24
 
 ███████████████████████████████████░░░░░░░░░░░░░░░
 file:            /src/main/index.ts
-bundle space:    71.96 %
-rendered size:   65.946 KB
-original size:   38.051 KB
+bundle space:    70.35 %
+rendered size:   66.625 KB
+original size:   38.471 KB
 code reduction:  0 %
 dependents:      1
   - /src/index.ts
 
 ██░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-cache-query/index.ts
-bundle space:    4.19 %
-rendered size:   3.839 KB
-original size:   1.282 KB
+bundle space:    5.31 %
+rendered size:   5.03 KB
+original size:   1.489 KB
 code reduction:  0 %
 dependents:      1
   - /src/debug/index.ts
 
-█░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
+██░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-cache-entry/index.ts
-bundle space:    3.77 %
-rendered size:   3.451 KB
-original size:   1.197 KB
+bundle space:    4.89 %
+rendered size:   4.632 KB
+original size:   1.396 KB
 code reduction:  0 %
 dependents:      1
   - /src/debug/index.ts
 
 █░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/debug/log-partial-compiled/index.ts
-bundle space:    3.68 %
+bundle space:    3.56 %
 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.09 %
+bundle space:    2.99 %
 rendered size:   2.834 KB
 original size:   2.94 KB
 code reduction:  3.61 %
@@ -54,8 +54,8 @@ dependents:      2
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/mergeResponseDataSets.ts
-bundle space:    1.87 %
-rendered size:   1.716 KB
+bundle space:    1.82 %
+rendered size:   1.728 KB
 original size:   907 Bytes
 code reduction:  0 %
 dependents:      1
@@ -63,7 +63,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterFragmentDefinitions.ts
-bundle space:    1.6 %
+bundle space:    1.54 %
 rendered size:   1.462 KB
 original size:   1.517 KB
 code reduction:  3.63 %
@@ -72,7 +72,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/normalizePatchResponseData.ts
-bundle space:    1.43 %
+bundle space:    1.38 %
 rendered size:   1.309 KB
 original size:   478 Bytes
 code reduction:  0 %
@@ -81,7 +81,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterQuery.ts
-bundle space:    1.22 %
+bundle space:    1.18 %
 rendered size:   1.117 KB
 original size:   1.49 KB
 code reduction:  25.03 %
@@ -90,7 +90,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterIDsAndTypeNames.ts
-bundle space:    1.09 %
+bundle space:    1.05 %
 rendered size:   998 Bytes
 original size:   1.165 KB
 code reduction:  14.33 %
@@ -99,7 +99,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/checkFieldPathChecklist.ts
-bundle space:    1.04 %
+bundle space:    1.01 %
 rendered size:   957 Bytes
 original size:   828 Bytes
 code reduction:  0 %
@@ -108,7 +108,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterOutPropsWithArgsOrDirectives.ts
-bundle space:    1.01 %
+bundle space:    0.98 %
 rendered size:   927 Bytes
 original size:   1.081 KB
 code reduction:  14.25 %
@@ -117,7 +117,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterInlineFragments.ts
-bundle space:    0.86 %
+bundle space:    0.83 %
 rendered size:   788 Bytes
 original size:   999 Bytes
 code reduction:  21.12 %
@@ -126,7 +126,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/deriveOpCacheability.ts
-bundle space:    0.86 %
+bundle space:    0.83 %
 rendered size:   786 Bytes
 original size:   858 Bytes
 code reduction:  8.39 %
@@ -135,7 +135,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/filterFragmentSpreads.ts
-bundle space:    0.67 %
+bundle space:    0.65 %
 rendered size:   616 Bytes
 original size:   942 Bytes
 code reduction:  34.61 %
@@ -144,7 +144,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/createFragmentSpreadChecklist.ts
-bundle space:    0.5 %
+bundle space:    0.48 %
 rendered size:   457 Bytes
 original size:   572 Bytes
 code reduction:  20.1 %
@@ -153,7 +153,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/consts/index.ts
-bundle space:    0.34 %
+bundle space:    0.33 %
 rendered size:   315 Bytes
 original size:   390 Bytes
 code reduction:  19.23 %
@@ -167,7 +167,7 @@ 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 %
@@ -185,7 +185,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/isLastResponseChunk.ts
-bundle space:    0.17 %
+bundle space:    0.16 %
 rendered size:   156 Bytes
 original size:   304 Bytes
 code reduction:  48.68 %
@@ -194,7 +194,7 @@ dependents:      1
 
 ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
 file:            /src/helpers/isNotLastResponseChunk.ts
-bundle space:    0.15 %
+bundle space:    0.14 %
 rendered size:   133 Bytes
 original size:   278 Bytes
 code reduction:  52.16 %

package/lib/main/debug/log-cache-entry/index.js

@@ -18,6 +18,7 @@ function logCacheEntry() {
       return new Promise(async resolve => {
         const {
           debugManager,
+          requestFieldCacheKey,
           ...otherContext
         } = args[5];
 
@@ -32,7 +33,7 @@ function logCacheEntry() {
         const endTime = debugManager.now();
         const duration = endTime - startTime;
         resolve();
-        debugManager.emit(_consts.CACHE_ENTRY_ADDED, {
+        const payload = {
           cachemapOptions: args[3],
           cacheType: args[0],
           context: otherContext,
@@ -43,8 +44,12 @@ function logCacheEntry() {
             endTime,
             startTime
           },
-          value: args[2]
-        });
+          value: args[2],
+          ...(requestFieldCacheKey ? {
+            decryptedCacheKey: requestFieldCacheKey
+          } : {})
+        };
+        debugManager.emit(_consts.CACHE_ENTRY_ADDED, payload);
       });
     };
   };

package/lib/main/debug/log-cache-entry/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/debug/log-cache-entry/index.ts"],"names":["logCacheEntry","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","otherContext","apply","startTime","now","endTime","duration","emit","CACHE_ENTRY_ADDED","cachemapOptions","cacheType","context","hash","options","stats"],"mappings":";;;;;;;;;AACA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,aAAO,IAAIC,OAAJ,CAAkB,MAAMC,OAAN,IAAiB;AACxC,cAAM;AAAEC,UAAAA,YAAF;AAAgB,aAAGC;AAAnB,YAAoCJ,IAAI,CAAC,CAAD,CAA9C;;AAEA,YAAI,CAACG,YAAL,EAAmB;AACjB,gBAAMN,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAN;AACAE,UAAAA,OAAO;AACP;AACD;;AAED,cAAMI,SAAS,GAAGH,YAAY,CAACI,GAAb,EAAlB;AACA,cAAMV,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAN;AACA,cAAMQ,OAAO,GAAGL,YAAY,CAACI,GAAb,EAAhB;AACA,cAAME,QAAQ,GAAGD,OAAO,GAAGF,SAA3B;AACAJ,QAAAA,OAAO;AAEPC,QAAAA,YAAY,CAACO,IAAb,CAAkBC,yBAAlB,EAAqC;AACnCC,UAAAA,eAAe,EAAEZ,IAAI,CAAC,CAAD,CADc;AAEnCa,UAAAA,SAAS,EAAEb,IAAI,CAAC,CAAD,CAFoB;AAGnCc,UAAAA,OAAO,EAAEV,YAH0B;AAInCW,UAAAA,IAAI,EAAEf,IAAI,CAAC,CAAD,CAJyB;AAKnCgB,UAAAA,OAAO,EAAEhB,IAAI,CAAC,CAAD,CALsB;AAMnCiB,UAAAA,KAAK,EAAE;AAAER,YAAAA,QAAF;AAAYD,YAAAA,OAAZ;AAAqBF,YAAAA;AAArB,WAN4B;AAOnCR,UAAAA,KAAK,EAAEE,IAAI,CAAC,CAAD;AAPwB,SAArC;AASD,OAxBM,CAAP;AAyBD,KA1BD;AA2BD,GAnCD;AAoCD","sourcesContent":["import { RequestContext } from \"@graphql-box/core\";\nimport { CACHE_ENTRY_ADDED } from \"../../consts\";\n\nexport default function logCacheEntry() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      return new Promise<void>(async resolve => {\n        const { debugManager, ...otherContext } = args[5] as RequestContext;\n\n        if (!debugManager) {\n          await method.apply(this, args);\n          resolve();\n          return;\n        }\n\n        const startTime = debugManager.now();\n        await method.apply(this, args);\n        const endTime = debugManager.now();\n        const duration = endTime - startTime;\n        resolve();\n\n        debugManager.emit(CACHE_ENTRY_ADDED, {\n          cachemapOptions: args[3],\n          cacheType: args[0],\n          context: otherContext,\n          hash: args[1],\n          options: args[4],\n          stats: { duration, endTime, startTime },\n          value: args[2],\n        });\n      });\n    };\n  };\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../../src/debug/log-cache-entry/index.ts"],"names":["logCacheEntry","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","requestFieldCacheKey","otherContext","apply","startTime","now","endTime","duration","payload","cachemapOptions","cacheType","context","hash","options","stats","decryptedCacheKey","emit","CACHE_ENTRY_ADDED"],"mappings":";;;;;;;;;AACA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,aAAO,IAAIC,OAAJ,CAAkB,MAAMC,OAAN,IAAiB;AACxC,cAAM;AAAEC,UAAAA,YAAF;AAAgBC,UAAAA,oBAAhB;AAAsC,aAAGC;AAAzC,YAA0DL,IAAI,CAAC,CAAD,CAApE;;AAIA,YAAI,CAACG,YAAL,EAAmB;AACjB,gBAAMN,MAAM,CAACS,KAAP,CAAa,IAAb,EAAmBN,IAAnB,CAAN;AACAE,UAAAA,OAAO;AACP;AACD;;AAED,cAAMK,SAAS,GAAGJ,YAAY,CAACK,GAAb,EAAlB;AACA,cAAMX,MAAM,CAACS,KAAP,CAAa,IAAb,EAAmBN,IAAnB,CAAN;AACA,cAAMS,OAAO,GAAGN,YAAY,CAACK,GAAb,EAAhB;AACA,cAAME,QAAQ,GAAGD,OAAO,GAAGF,SAA3B;AACAL,QAAAA,OAAO;AAEP,cAAMS,OAAO,GAAG;AACdC,UAAAA,eAAe,EAAEZ,IAAI,CAAC,CAAD,CADP;AAEda,UAAAA,SAAS,EAAEb,IAAI,CAAC,CAAD,CAFD;AAGdc,UAAAA,OAAO,EAAET,YAHK;AAIdU,UAAAA,IAAI,EAAEf,IAAI,CAAC,CAAD,CAJI;AAKdgB,UAAAA,OAAO,EAAEhB,IAAI,CAAC,CAAD,CALC;AAMdiB,UAAAA,KAAK,EAAE;AAAEP,YAAAA,QAAF;AAAYD,YAAAA,OAAZ;AAAqBF,YAAAA;AAArB,WANO;AAOdT,UAAAA,KAAK,EAAEE,IAAI,CAAC,CAAD,CAPG;AAQd,cAAII,oBAAoB,GAAG;AAAEc,YAAAA,iBAAiB,EAAEd;AAArB,WAAH,GAAiD,EAAzE;AARc,SAAhB;AAWAD,QAAAA,YAAY,CAACgB,IAAb,CAAkBC,yBAAlB,EAAqCT,OAArC;AACD,OA7BM,CAAP;AA8BD,KA/BD;AAgCD,GAxCD;AAyCD","sourcesContent":["import { RequestContext } from \"@graphql-box/core\";\nimport { CACHE_ENTRY_ADDED } from \"../../consts\";\n\nexport default function logCacheEntry() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      return new Promise<void>(async resolve => {\n        const { debugManager, requestFieldCacheKey, ...otherContext } = args[5] as RequestContext & {\n          requestFieldCacheKey?: string;\n        };\n\n        if (!debugManager) {\n          await method.apply(this, args);\n          resolve();\n          return;\n        }\n\n        const startTime = debugManager.now();\n        await method.apply(this, args);\n        const endTime = debugManager.now();\n        const duration = endTime - startTime;\n        resolve();\n\n        const payload = {\n          cachemapOptions: args[3],\n          cacheType: args[0],\n          context: otherContext,\n          hash: args[1],\n          options: args[4],\n          stats: { duration, endTime, startTime },\n          value: args[2],\n          ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),\n        };\n\n        debugManager.emit(CACHE_ENTRY_ADDED, payload);\n      });\n    };\n  };\n}\n"],"file":"index.js"}

package/lib/main/debug/log-cache-query/index.js

@@ -19,6 +19,7 @@ function logCacheQuery() {
         return new Promise(async resolve => {
           const {
             debugManager,
+            requestFieldCacheKey,
             ...otherContext
           } = args[3];
 
@@ -32,7 +33,7 @@ function logCacheQuery() {
           const endTime = debugManager.now();
           const duration = endTime - startTime;
           resolve(result);
-          debugManager.emit(_consts.CACHE_ENTRY_QUERIED, {
+          const payload = {
             cacheType: args[0],
             context: otherContext,
             hash: args[1],
@@ -42,8 +43,12 @@ function logCacheQuery() {
               duration,
               endTime,
               startTime
-            }
-          });
+            },
+            ...(requestFieldCacheKey ? {
+              decryptedCacheKey: requestFieldCacheKey
+            } : {})
+          };
+          debugManager.emit(_consts.CACHE_ENTRY_QUERIED, payload);
         });
       } catch (error) {
         return Promise.reject(error);

package/lib/main/debug/log-cache-query/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/debug/log-cache-query/index.ts"],"names":["logCacheQuery","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","otherContext","apply","startTime","now","result","endTime","duration","emit","CACHE_ENTRY_QUERIED","cacheType","context","hash","options","stats","error","reject"],"mappings":";;;;;;;;;AACA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,UAAI;AACF,eAAO,IAAIC,OAAJ,CAAY,MAAMC,OAAN,IAAiB;AAClC,gBAAM;AAAEC,YAAAA,YAAF;AAAgB,eAAGC;AAAnB,cAAoCJ,IAAI,CAAC,CAAD,CAA9C;;AAEA,cAAI,CAACG,YAAL,EAAmB;AACjBD,YAAAA,OAAO,CAAC,MAAML,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAAP,CAAP;AACA;AACD;;AAED,gBAAMM,SAAS,GAAGH,YAAY,CAACI,GAAb,EAAlB;AACA,gBAAMC,MAAM,GAAG,MAAMX,MAAM,CAACQ,KAAP,CAAa,IAAb,EAAmBL,IAAnB,CAArB;AACA,gBAAMS,OAAO,GAAGN,YAAY,CAACI,GAAb,EAAhB;AACA,gBAAMG,QAAQ,GAAGD,OAAO,GAAGH,SAA3B;AACAJ,UAAAA,OAAO,CAACM,MAAD,CAAP;AAEAL,UAAAA,YAAY,CAACQ,IAAb,CAAkBC,2BAAlB,EAAuC;AACrCC,YAAAA,SAAS,EAAEb,IAAI,CAAC,CAAD,CADsB;AAErCc,YAAAA,OAAO,EAAEV,YAF4B;AAGrCW,YAAAA,IAAI,EAAEf,IAAI,CAAC,CAAD,CAH2B;AAIrCgB,YAAAA,OAAO,EAAEhB,IAAI,CAAC,CAAD,CAJwB;AAKrCQ,YAAAA,MALqC;AAMrCS,YAAAA,KAAK,EAAE;AAAEP,cAAAA,QAAF;AAAYD,cAAAA,OAAZ;AAAqBH,cAAAA;AAArB;AAN8B,WAAvC;AAQD,SAtBM,CAAP;AAuBD,OAxBD,CAwBE,OAAOY,KAAP,EAAc;AACd,eAAOjB,OAAO,CAACkB,MAAR,CAAeD,KAAf,CAAP;AACD;AACF,KA5BD;AA6BD,GArCD;AAsCD","sourcesContent":["import { RequestContext } from \"@graphql-box/core\";\nimport { CACHE_ENTRY_QUERIED } from \"../../consts\";\n\nexport default function logCacheQuery() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      try {\n        return new Promise(async resolve => {\n          const { debugManager, ...otherContext } = args[3] as RequestContext;\n\n          if (!debugManager) {\n            resolve(await method.apply(this, args));\n            return;\n          }\n\n          const startTime = debugManager.now();\n          const result = await method.apply(this, args);\n          const endTime = debugManager.now();\n          const duration = endTime - startTime;\n          resolve(result);\n\n          debugManager.emit(CACHE_ENTRY_QUERIED, {\n            cacheType: args[0],\n            context: otherContext,\n            hash: args[1],\n            options: args[2],\n            result,\n            stats: { duration, endTime, startTime },\n          });\n        });\n      } catch (error) {\n        return Promise.reject(error);\n      }\n    };\n  };\n}\n"],"file":"index.js"}
+{"version":3,"sources":["../../../../src/debug/log-cache-query/index.ts"],"names":["logCacheQuery","_target","_propertyName","descriptor","method","value","descriptorValue","args","Promise","resolve","debugManager","requestFieldCacheKey","otherContext","apply","startTime","now","result","endTime","duration","payload","cacheType","context","hash","options","stats","decryptedCacheKey","emit","CACHE_ENTRY_QUERIED","error","reject"],"mappings":";;;;;;;;;AACA;;AAEe,SAASA,aAAT,GAAyB;AACtC,SAAO,CACLC,OADK,EAELC,aAFK,EAGLC,UAHK,KAII;AACT,UAAMC,MAAM,GAAGD,UAAU,CAACE,KAA1B;AACA,QAAI,CAACD,MAAL,EAAa;;AAEbD,IAAAA,UAAU,CAACE,KAAX,GAAmB,eAAeC,eAAf,CAA+B,GAAGC,IAAlC,EAA6D;AAC9E,UAAI;AACF,eAAO,IAAIC,OAAJ,CAAY,MAAMC,OAAN,IAAiB;AAClC,gBAAM;AAAEC,YAAAA,YAAF;AAAgBC,YAAAA,oBAAhB;AAAsC,eAAGC;AAAzC,cAA0DL,IAAI,CAAC,CAAD,CAApE;;AAIA,cAAI,CAACG,YAAL,EAAmB;AACjBD,YAAAA,OAAO,CAAC,MAAML,MAAM,CAACS,KAAP,CAAa,IAAb,EAAmBN,IAAnB,CAAP,CAAP;AACA;AACD;;AAED,gBAAMO,SAAS,GAAGJ,YAAY,CAACK,GAAb,EAAlB;AACA,gBAAMC,MAAM,GAAG,MAAMZ,MAAM,CAACS,KAAP,CAAa,IAAb,EAAmBN,IAAnB,CAArB;AACA,gBAAMU,OAAO,GAAGP,YAAY,CAACK,GAAb,EAAhB;AACA,gBAAMG,QAAQ,GAAGD,OAAO,GAAGH,SAA3B;AACAL,UAAAA,OAAO,CAACO,MAAD,CAAP;AAEA,gBAAMG,OAAO,GAAG;AACdC,YAAAA,SAAS,EAAEb,IAAI,CAAC,CAAD,CADD;AAEdc,YAAAA,OAAO,EAAET,YAFK;AAGdU,YAAAA,IAAI,EAAEf,IAAI,CAAC,CAAD,CAHI;AAIdgB,YAAAA,OAAO,EAAEhB,IAAI,CAAC,CAAD,CAJC;AAKdS,YAAAA,MALc;AAMdQ,YAAAA,KAAK,EAAE;AAAEN,cAAAA,QAAF;AAAYD,cAAAA,OAAZ;AAAqBH,cAAAA;AAArB,aANO;AAOd,gBAAIH,oBAAoB,GAAG;AAAEc,cAAAA,iBAAiB,EAAEd;AAArB,aAAH,GAAiD,EAAzE;AAPc,WAAhB;AAUAD,UAAAA,YAAY,CAACgB,IAAb,CAAkBC,2BAAlB,EAAuCR,OAAvC;AACD,SA3BM,CAAP;AA4BD,OA7BD,CA6BE,OAAOS,KAAP,EAAc;AACd,eAAOpB,OAAO,CAACqB,MAAR,CAAeD,KAAf,CAAP;AACD;AACF,KAjCD;AAkCD,GA1CD;AA2CD","sourcesContent":["import { RequestContext } from \"@graphql-box/core\";\nimport { CACHE_ENTRY_QUERIED } from \"../../consts\";\n\nexport default function logCacheQuery() {\n  return (\n    _target: any,\n    _propertyName: string,\n    descriptor: TypedPropertyDescriptor<(...args: any[]) => Promise<any>>,\n  ): void => {\n    const method = descriptor.value;\n    if (!method) return;\n\n    descriptor.value = async function descriptorValue(...args: any[]): Promise<any> {\n      try {\n        return new Promise(async resolve => {\n          const { debugManager, requestFieldCacheKey, ...otherContext } = args[3] as RequestContext & {\n            requestFieldCacheKey?: string;\n          };\n\n          if (!debugManager) {\n            resolve(await method.apply(this, args));\n            return;\n          }\n\n          const startTime = debugManager.now();\n          const result = await method.apply(this, args);\n          const endTime = debugManager.now();\n          const duration = endTime - startTime;\n          resolve(result);\n\n          const payload = {\n            cacheType: args[0],\n            context: otherContext,\n            hash: args[1],\n            options: args[2],\n            result,\n            stats: { duration, endTime, startTime },\n            ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),\n          };\n\n          debugManager.emit(CACHE_ENTRY_QUERIED, payload);\n        });\n      } catch (error) {\n        return Promise.reject(error);\n      }\n    };\n  };\n}\n"],"file":"index.js"}

package/lib/main/main/index.js

@@ -368,6 +368,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     const {
       hashedRequestFieldCacheKey,
       propNameOrIndex,
+      requestFieldCacheKey,
       requestFieldPath
     } = keysAndPaths;
     const fieldTypeInfo = context.fieldTypeMap.get(requestFieldPath);
@@ -389,7 +390,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
       const {
         cacheability,
         entry
-      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, options, context);
+      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, requestFieldCacheKey, options, context);
 
       CacheManager._setCachedResponseData({
         cacheability,
@@ -742,7 +743,8 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     requestFieldPathData: ancestorRequestFieldPathData
   }, {
     hashedRequestFieldCacheKey,
-    propNameOrIndex
+    propNameOrIndex,
+    requestFieldCacheKey
   }, fieldTypeInfo, options, context) {
     var _entityData;
 
@@ -756,7 +758,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
       const {
         cacheability: entryCacheability,
         entry
-      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, options, context);
+      } = await this._retrieveCachedRequestFieldPathData(hashedRequestFieldCacheKey, requestFieldCacheKey, options, context);
 
       if (entry) {
         requestFieldPathData = this._mergeObjects(requestFieldPathData, entry);
@@ -795,8 +797,10 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
     };
   }
 
-  async _retrieveCachedRequestFieldPathData(hash, options, context) {
-    return this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hash, options, context) || {};
+  async _retrieveCachedRequestFieldPathData(hash, requestFieldCacheKey, options, context) {
+    return this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hash, options, { ...context,
+      requestFieldCacheKey
+    }) || {};
   }
 
   async _retrieveCachedResponseData({
@@ -1018,6 +1022,7 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
   }, options, context) {
     const {
       hashedRequestFieldCacheKey,
+      requestFieldCacheKey,
       responseDataPath
     } = keysAndPaths;
     let fieldData = (0, _get2.default)(data, responseDataPath);
@@ -1033,7 +1038,9 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
         fieldData = (0, _filterOutPropsWithArgsOrDirectives.default)(fieldData, field.selectionSet.selections, keysAndPaths, context);
       }
 
-      const result = await this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hashedRequestFieldCacheKey, options, context);
+      const result = await this._checkCacheEntry(_core.REQUEST_FIELD_PATHS, hashedRequestFieldCacheKey, options, { ...context,
+        requestFieldCacheKey
+      });
 
       if (result && (0, _isObjectLike2.default)(fieldData)) {
         fieldData = this._mergeObjects(result.entry, fieldData);
@@ -1044,7 +1051,9 @@ let CacheManager = (_dec = (0, _debug.logCacheQuery)(), _dec2 = (0, _debug.logCa
           cacheControl: cacheability.printCacheControl()
         },
         tag: options.tag
-      }, options, context);
+      }, options, { ...context,
+        requestFieldCacheKey
+      });
 
       if ((0, _helpers.hasChildFields)(field, {
         fragmentDefinitions: context.fragmentDefinitions