@graphql-yoga/plugin-response-cache 2.1.1 → 2.1.2-rc-20230908124130-6372febf

package/cjs/index.js

@@ -4,15 +4,20 @@ exports.createInMemoryCache = exports.useResponseCache = void 0;
 const response_cache_1 = require("@envelop/response-cache");
 Object.defineProperty(exports, "createInMemoryCache", { enumerable: true, get: function () { return response_cache_1.createInMemoryCache; } });
 const operationIdByRequest = new WeakMap();
-// We trick Envelop plugin by passing operationId as sessionId so we can take it from cache key builder we pass to Envelop
+const sessionByRequest = new WeakMap();
 function sessionFactoryForEnvelop({ request }) {
-    return operationIdByRequest.get(request);
+    return sessionByRequest.get(request);
 }
-const cacheKeyFactoryForEnvelop = async function cacheKeyFactoryForEnvelop({ sessionId }) {
-    if (sessionId == null) {
+const cacheKeyFactoryForEnvelop = async function cacheKeyFactoryForEnvelop({ context }) {
+    const request = context.request;
+    if (request == null) {
         throw new Error('[useResponseCache] This plugin is not configured correctly. Make sure you use this plugin with GraphQL Yoga');
     }
-    return sessionId;
+    const operationId = operationIdByRequest.get(request);
+    if (operationId == null) {
+        throw new Error('[useResponseCache] This plugin is not configured correctly. Make sure you use this plugin with GraphQL Yoga');
+    }
+    return operationId;
 };
 const getDocumentStringForEnvelop = executionArgs => {
     const context = executionArgs.contextValue;
@@ -86,13 +91,15 @@ function useResponseCache(options) {
             }
         },
         async onParams({ params, request, setResult }) {
+            const sessionId = await options.session(request);
             const operationId = await buildResponseCacheKey({
                 documentString: params.query || '',
                 variableValues: params.variables,
                 operationName: params.operationName,
-                sessionId: await options.session(request),
+                sessionId,
             });
             operationIdByRequest.set(request, operationId);
+            sessionByRequest.set(request, sessionId);
             if (enabled(request)) {
                 const cachedResponse = await cache.get(operationId);
                 if (cachedResponse) {

package/esm/index.js

@@ -1,14 +1,19 @@
 import { createInMemoryCache, defaultBuildResponseCacheKey, useResponseCache as useEnvelopResponseCache, } from '@envelop/response-cache';
 const operationIdByRequest = new WeakMap();
-// We trick Envelop plugin by passing operationId as sessionId so we can take it from cache key builder we pass to Envelop
+const sessionByRequest = new WeakMap();
 function sessionFactoryForEnvelop({ request }) {
-    return operationIdByRequest.get(request);
+    return sessionByRequest.get(request);
 }
-const cacheKeyFactoryForEnvelop = async function cacheKeyFactoryForEnvelop({ sessionId }) {
-    if (sessionId == null) {
+const cacheKeyFactoryForEnvelop = async function cacheKeyFactoryForEnvelop({ context }) {
+    const request = context.request;
+    if (request == null) {
         throw new Error('[useResponseCache] This plugin is not configured correctly. Make sure you use this plugin with GraphQL Yoga');
     }
-    return sessionId;
+    const operationId = operationIdByRequest.get(request);
+    if (operationId == null) {
+        throw new Error('[useResponseCache] This plugin is not configured correctly. Make sure you use this plugin with GraphQL Yoga');
+    }
+    return operationId;
 };
 const getDocumentStringForEnvelop = executionArgs => {
     const context = executionArgs.contextValue;
@@ -82,13 +87,15 @@ export function useResponseCache(options) {
             }
         },
         async onParams({ params, request, setResult }) {
+            const sessionId = await options.session(request);
             const operationId = await buildResponseCacheKey({
                 documentString: params.query || '',
                 variableValues: params.variables,
                 operationName: params.operationName,
-                sessionId: await options.session(request),
+                sessionId,
             });
             operationIdByRequest.set(request, operationId);
+            sessionByRequest.set(request, sessionId);
             if (enabled(request)) {
                 const cachedResponse = await cache.get(operationId);
                 if (cachedResponse) {

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@graphql-yoga/plugin-response-cache",
-  "version": "2.1.1",
+  "version": "2.1.2-rc-20230908124130-6372febf",
   "description": "",
   "peerDependencies": {
     "graphql": "^15.2.0 || ^16.0.0",
     "graphql-yoga": "^4.0.4"
   },
   "dependencies": {
-    "@envelop/response-cache": "^5.1.0"
+    "@envelop/response-cache": "5.3.0-alpha-20230908121255-f3c216b2"
   },
   "repository": {
     "type": "git",

package/typings/index.d.cts

@@ -1,10 +1,12 @@
 import { ExecutionResult } from 'graphql';
 import { Maybe, Plugin, PromiseOrValue } from 'graphql-yoga';
-import { createInMemoryCache, Cache as EnvelopCache, ResponseCacheExtensions as EnvelopResponseCacheExtensions, UseResponseCacheParameter as UseEnvelopResponseCacheParameter } from '@envelop/response-cache';
-export type UseResponseCacheParameter = Omit<UseEnvelopResponseCacheParameter, 'getDocumentString' | 'session' | 'cache' | 'enabled'> & {
+import { createInMemoryCache, BuildResponseCacheKeyFunction as EnvelopBuildResponseCacheKeyFunction, Cache as EnvelopCache, ResponseCacheExtensions as EnvelopResponseCacheExtensions, UseResponseCacheParameter as UseEnvelopResponseCacheParameter } from '@envelop/response-cache';
+export type BuildResponseCacheKeyFunction = (params: Omit<Parameters<EnvelopBuildResponseCacheKeyFunction>[0], 'context'>) => ReturnType<EnvelopBuildResponseCacheKeyFunction>;
+export type UseResponseCacheParameter = Omit<UseEnvelopResponseCacheParameter, 'getDocumentString' | 'session' | 'cache' | 'enabled' | 'buildResponseCacheKey'> & {
     cache?: Cache;
     session: (request: Request) => PromiseOrValue<Maybe<string>>;
     enabled?: (request: Request) => boolean;
+    buildResponseCacheKey?: BuildResponseCacheKeyFunction;
 };
 export interface ResponseCachePluginExtensions {
     http?: {

package/typings/index.d.ts

@@ -1,10 +1,12 @@
 import { ExecutionResult } from 'graphql';
 import { Maybe, Plugin, PromiseOrValue } from 'graphql-yoga';
-import { createInMemoryCache, Cache as EnvelopCache, ResponseCacheExtensions as EnvelopResponseCacheExtensions, UseResponseCacheParameter as UseEnvelopResponseCacheParameter } from '@envelop/response-cache';
-export type UseResponseCacheParameter = Omit<UseEnvelopResponseCacheParameter, 'getDocumentString' | 'session' | 'cache' | 'enabled'> & {
+import { createInMemoryCache, BuildResponseCacheKeyFunction as EnvelopBuildResponseCacheKeyFunction, Cache as EnvelopCache, ResponseCacheExtensions as EnvelopResponseCacheExtensions, UseResponseCacheParameter as UseEnvelopResponseCacheParameter } from '@envelop/response-cache';
+export type BuildResponseCacheKeyFunction = (params: Omit<Parameters<EnvelopBuildResponseCacheKeyFunction>[0], 'context'>) => ReturnType<EnvelopBuildResponseCacheKeyFunction>;
+export type UseResponseCacheParameter = Omit<UseEnvelopResponseCacheParameter, 'getDocumentString' | 'session' | 'cache' | 'enabled' | 'buildResponseCacheKey'> & {
     cache?: Cache;
     session: (request: Request) => PromiseOrValue<Maybe<string>>;
     enabled?: (request: Request) => boolean;
+    buildResponseCacheKey?: BuildResponseCacheKeyFunction;
 };
 export interface ResponseCachePluginExtensions {
     http?: {