@graphql-box/cache-manager 3.2.1 → 3.4.0

package/src/consts/index.ts

@@ -4,7 +4,3 @@ export const NO_CACHE = "noCache";
 
 export const HEADER_CACHE_CONTROL = "cache-control";
 export const HEADER_NO_CACHE = "no-cache";
-
-export const CACHE_ENTRY_ADDED = "cache_entry_added";
-export const CACHE_ENTRY_QUERIED = "cache_entry_queried";
-export const PARTIAL_QUERY_COMPILED = "partial_query_compiled";

package/src/debug/log-cache-entry/index.ts

@@ -1,5 +1,4 @@
-import { RequestContext } from "@graphql-box/core";
-import { CACHE_ENTRY_ADDED } from "../../consts";
+import { CACHE_ENTRY_ADDED, RequestContext } from "@graphql-box/core";
 
 export default function logCacheEntry() {
   return (
@@ -32,14 +31,14 @@ export default function logCacheEntry() {
           cachemapOptions: args[3],
           cacheType: args[0],
           context: otherContext,
-          hash: args[1],
           options: args[4],
+          requestHash: args[1],
           stats: { duration, endTime, startTime },
           value: args[2],
           ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),
         };
 
-        debugManager.emit(CACHE_ENTRY_ADDED, payload);
+        debugManager.log(CACHE_ENTRY_ADDED, payload);
       });
     };
   };

package/src/debug/log-cache-query/index.ts

@@ -1,5 +1,4 @@
-import { RequestContext } from "@graphql-box/core";
-import { CACHE_ENTRY_QUERIED } from "../../consts";
+import { CACHE_ENTRY_QUERIED, RequestContext } from "@graphql-box/core";
 
 export default function logCacheQuery() {
   return (
@@ -31,14 +30,14 @@ export default function logCacheQuery() {
           const payload = {
             cacheType: args[0],
             context: otherContext,
-            hash: args[1],
             options: args[2],
+            requestHash: args[1],
             result,
             stats: { duration, endTime, startTime },
             ...(requestFieldCacheKey ? { decryptedCacheKey: requestFieldCacheKey } : {}),
           };
 
-          debugManager.emit(CACHE_ENTRY_QUERIED, payload);
+          debugManager.log(CACHE_ENTRY_QUERIED, payload);
         });
       } catch (error) {
         return Promise.reject(error);

package/src/debug/log-partial-compiled/index.ts

@@ -1,5 +1,4 @@
-import { RequestContext } from "@graphql-box/core";
-import { PARTIAL_QUERY_COMPILED } from "../../consts";
+import { PARTIAL_QUERY_COMPILED, RequestContext } from "@graphql-box/core";
 
 export default function logPartialCompiled() {
   return (
@@ -26,11 +25,11 @@ export default function logPartialCompiled() {
         const duration = endTime - startTime;
         resolve();
 
-        debugManager.emit(PARTIAL_QUERY_COMPILED, {
+        debugManager.log(PARTIAL_QUERY_COMPILED, {
           context: otherContext,
-          hash: args[0],
           options: args[2],
-          partialQueryResponse: args[1],
+          requestHash: args[0],
+          result: args[1],
           stats: { duration, endTime, startTime },
         });
       });

package/src/defs/index.ts

@@ -1,4 +1,4 @@
-import Cachemap, { CacheHeaders } from "@cachemap/core";
+import Cachemap from "@cachemap/core";
 import { Metadata } from "@cachemap/types";
 import {
   CacheMetadata,
@@ -159,11 +159,6 @@ export interface QueryResponseCacheEntry {
   data: PlainObjectMap;
 }
 
-export interface CachemapOptions {
-  cacheHeaders: CacheHeaders;
-  tag?: any;
-}
-
 export interface CacheManagerDef {
   cache: Cachemap;
   analyzeQuery(requestData: RequestData, options: RequestOptions, context: RequestContext): Promise<AnalyzeQueryResult>;

package/src/index.ts

@@ -1,3 +1,2 @@
-export { CACHE_ENTRY_ADDED, CACHE_ENTRY_QUERIED, PARTIAL_QUERY_COMPILED } from "./consts";
 export * from "./defs";
 export { default, CacheManager } from "./main";

package/src/main/index.ts

@@ -2,6 +2,7 @@ import Cachemap from "@cachemap/core";
 import {
   CacheMetadata,
   CacheTypes,
+  CachemapOptions,
   DATA_ENTITIES,
   FieldTypeInfo,
   PlainObjectMap,
@@ -43,7 +44,6 @@ import {
   CacheManagerInit,
   CachedAncestorFieldData,
   CachedResponseData,
-  CachemapOptions,
   CheckCacheEntryResult,
   ClientOptions,
   ConstructorOptions,
@@ -906,10 +906,10 @@ export class CacheManager implements CacheManagerDef {
     context: CacheManagerContext,
   ) {
     const responseChunks = this._responseChunksAwaitingCaching.get(
-      context.boxID,
+      context.requestID,
     ) as RawResponseDataWithMaybeCacheMetadata[];
 
-    this._responseChunksAwaitingCaching.delete(context.boxID);
+    this._responseChunksAwaitingCaching.delete(context.requestID);
     return mergeResponseDataSets([...responseChunks, normalizedResponseData]);
   }
 
@@ -1170,12 +1170,12 @@ export class CacheManager implements CacheManagerDef {
     normalizedResponseData: RawResponseDataWithMaybeCacheMetadata,
     context: CacheManagerContext,
   ) {
-    const responseChunks = this._responseChunksAwaitingCaching.get(context.boxID);
+    const responseChunks = this._responseChunksAwaitingCaching.get(context.requestID);
 
     if (responseChunks) {
-      this._responseChunksAwaitingCaching.set(context.boxID, [...responseChunks, normalizedResponseData]);
+      this._responseChunksAwaitingCaching.set(context.requestID, [...responseChunks, normalizedResponseData]);
     } else {
-      this._responseChunksAwaitingCaching.set(context.boxID, [normalizedResponseData]);
+      this._responseChunksAwaitingCaching.set(context.requestID, [normalizedResponseData]);
     }
   }
 }