@envelop/response-cache 3.0.0-alpha-7c8ceda.0 → 3.0.0-alpha-cadd145.0

package/cjs/cache-document-str.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultGetDocumentString = exports.useCacheDocumentString = void 0;
+const graphql_1 = require("graphql");
+const documentStringByDocument = new WeakMap();
+function useCacheDocumentString() {
+    return {
+        onParse({ params: { source } }) {
+            return function onParseEnd({ result }) {
+                if (result != null && !(result instanceof Error)) {
+                    documentStringByDocument.set(result, source.toString());
+                }
+            };
+        },
+    };
+}
+exports.useCacheDocumentString = useCacheDocumentString;
+function defaultGetDocumentString(executionArgs) {
+    let documentString = documentStringByDocument.get(executionArgs.document);
+    if (documentString == null) {
+        documentString = (0, graphql_1.print)(executionArgs.document);
+        documentStringByDocument.set(executionArgs.document, documentString);
+    }
+    return documentString;
+}
+exports.defaultGetDocumentString = defaultGetDocumentString;

package/cjs/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useResponseCache = exports.defaultGetDocumentString = exports.defaultShouldCacheResult = exports.defaultBuildResponseCacheKey = void 0;
+exports.useResponseCache = exports.defaultShouldCacheResult = exports.defaultBuildResponseCacheKey = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@envelop/core");
 const utils_1 = require("@graphql-tools/utils");
@@ -8,6 +8,7 @@ const graphql_1 = require("graphql");
 const fast_json_stable_stringify_1 = tslib_1.__importDefault(require("fast-json-stable-stringify"));
 const in_memory_cache_js_1 = require("./in-memory-cache.js");
 const hashSHA256_js_1 = require("./hashSHA256.js");
+const cache_document_str_js_1 = require("./cache-document-str.js");
 const contextSymbol = Symbol('responseCache');
 /**
  * Default function used for building the response cache key.
@@ -40,17 +41,7 @@ const defaultShouldCacheResult = (params) => {
     return true;
 };
 exports.defaultShouldCacheResult = defaultShouldCacheResult;
-const documentStringByDocument = new WeakMap();
-function defaultGetDocumentString(executionArgs) {
-    let documentString = documentStringByDocument.get(executionArgs.document);
-    if (!documentString) {
-        documentString = (0, graphql_1.print)(executionArgs.document);
-        documentStringByDocument.set(executionArgs.document, documentString);
-    }
-    return documentString;
-}
-exports.defaultGetDocumentString = defaultGetDocumentString;
-function useResponseCache({ cache = (0, in_memory_cache_js_1.createInMemoryCache)(), ttl: globalTtl = Infinity, session = () => null, enabled, ignoredTypes = [], ttlPerType = {}, ttlPerSchemaCoordinate = {}, idFields = ['id'], invalidateViaMutation = true, buildResponseCacheKey = exports.defaultBuildResponseCacheKey, getDocumentString = defaultGetDocumentString, shouldCacheResult = exports.defaultShouldCacheResult, 
+function useResponseCache({ cache = (0, in_memory_cache_js_1.createInMemoryCache)(), ttl: globalTtl = Infinity, session = () => null, enabled, ignoredTypes = [], ttlPerType = {}, ttlPerSchemaCoordinate = {}, idFields = ['id'], invalidateViaMutation = true, buildResponseCacheKey = exports.defaultBuildResponseCacheKey, getDocumentString = cache_document_str_js_1.defaultGetDocumentString, shouldCacheResult = exports.defaultShouldCacheResult, 
 // eslint-disable-next-line dot-notation
 includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_ENV'] === 'development' : false, } = {}) {
     const appliedTransform = Symbol('responseCache.appliedTransform');
@@ -58,6 +49,11 @@ includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_EN
     // never cache Introspections
     ttlPerSchemaCoordinate = { 'Query.__schema': 0, ...ttlPerSchemaCoordinate };
     return {
+        onPluginInit({ addPlugin }) {
+            if (getDocumentString === cache_document_str_js_1.defaultGetDocumentString) {
+                addPlugin((0, cache_document_str_js_1.useCacheDocumentString)());
+            }
+        },
         onSchemaChange({ schema, replaceSchema }) {
             var _a;
             // @ts-expect-error See https://github.com/graphql/graphql-js/pull/3511 - remove this comments once merged
@@ -71,13 +67,6 @@ includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_EN
             };
             replaceSchema(patchedSchema);
         },
-        onParse({ params: { source } }) {
-            return function onParseEnd({ result }) {
-                if (result != null && !(result instanceof Error)) {
-                    documentStringByDocument.set(result, source.toString());
-                }
-            };
-        },
         async onExecute(ctx) {
             var _a;
             const identifier = new Map();
@@ -121,8 +110,9 @@ includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_EN
             }
             const operationId = await buildResponseCacheKey({
                 documentString: getDocumentString(ctx.args),
+                variableValues: ctx.args.variableValues,
+                operationName: ctx.args.operationName,
                 sessionId: session(ctx.args.contextValue),
-                ...ctx.args,
             });
             if (((_a = enabled === null || enabled === void 0 ? void 0 : enabled(ctx.args.contextValue)) !== null && _a !== void 0 ? _a : true) === true) {
                 const cachedResponse = await cache.get(operationId);

package/esm/cache-document-str.js

@@ -0,0 +1,21 @@
+import { print } from 'graphql';
+const documentStringByDocument = new WeakMap();
+export function useCacheDocumentString() {
+    return {
+        onParse({ params: { source } }) {
+            return function onParseEnd({ result }) {
+                if (result != null && !(result instanceof Error)) {
+                    documentStringByDocument.set(result, source.toString());
+                }
+            };
+        },
+    };
+}
+export function defaultGetDocumentString(executionArgs) {
+    let documentString = documentStringByDocument.get(executionArgs.document);
+    if (documentString == null) {
+        documentString = print(executionArgs.document);
+        documentStringByDocument.set(executionArgs.document, documentString);
+    }
+    return documentString;
+}

package/esm/plugin.js

@@ -1,9 +1,10 @@
 import { isAsyncIterable } from '@envelop/core';
 import { MapperKind, mapSchema } from '@graphql-tools/utils';
-import { visit, TypeInfo, visitWithTypeInfo, defaultFieldResolver, print, } from 'graphql';
+import { visit, TypeInfo, visitWithTypeInfo, defaultFieldResolver, } from 'graphql';
 import jsonStableStringify from 'fast-json-stable-stringify';
 import { createInMemoryCache } from './in-memory-cache.js';
 import { hashSHA256 } from './hashSHA256.js';
+import { defaultGetDocumentString, useCacheDocumentString } from './cache-document-str.js';
 const contextSymbol = Symbol('responseCache');
 /**
  * Default function used for building the response cache key.
@@ -34,15 +35,6 @@ export const defaultShouldCacheResult = (params) => {
     }
     return true;
 };
-const documentStringByDocument = new WeakMap();
-export function defaultGetDocumentString(executionArgs) {
-    let documentString = documentStringByDocument.get(executionArgs.document);
-    if (!documentString) {
-        documentString = print(executionArgs.document);
-        documentStringByDocument.set(executionArgs.document, documentString);
-    }
-    return documentString;
-}
 export function useResponseCache({ cache = createInMemoryCache(), ttl: globalTtl = Infinity, session = () => null, enabled, ignoredTypes = [], ttlPerType = {}, ttlPerSchemaCoordinate = {}, idFields = ['id'], invalidateViaMutation = true, buildResponseCacheKey = defaultBuildResponseCacheKey, getDocumentString = defaultGetDocumentString, shouldCacheResult = defaultShouldCacheResult, 
 // eslint-disable-next-line dot-notation
 includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_ENV'] === 'development' : false, } = {}) {
@@ -51,6 +43,11 @@ includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_EN
     // never cache Introspections
     ttlPerSchemaCoordinate = { 'Query.__schema': 0, ...ttlPerSchemaCoordinate };
     return {
+        onPluginInit({ addPlugin }) {
+            if (getDocumentString === defaultGetDocumentString) {
+                addPlugin(useCacheDocumentString());
+            }
+        },
         onSchemaChange({ schema, replaceSchema }) {
             var _a;
             // @ts-expect-error See https://github.com/graphql/graphql-js/pull/3511 - remove this comments once merged
@@ -64,13 +61,6 @@ includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_EN
             };
             replaceSchema(patchedSchema);
         },
-        onParse({ params: { source } }) {
-            return function onParseEnd({ result }) {
-                if (result != null && !(result instanceof Error)) {
-                    documentStringByDocument.set(result, source.toString());
-                }
-            };
-        },
         async onExecute(ctx) {
             var _a;
             const identifier = new Map();
@@ -114,8 +104,9 @@ includeExtensionMetadata = typeof process !== 'undefined' ? process.env['NODE_EN
             }
             const operationId = await buildResponseCacheKey({
                 documentString: getDocumentString(ctx.args),
+                variableValues: ctx.args.variableValues,
+                operationName: ctx.args.operationName,
                 sessionId: session(ctx.args.contextValue),
-                ...ctx.args,
             });
             if (((_a = enabled === null || enabled === void 0 ? void 0 : enabled(ctx.args.contextValue)) !== null && _a !== void 0 ? _a : true) === true) {
                 const cachedResponse = await cache.get(operationId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envelop/response-cache",
-  "version": "3.0.0-alpha-7c8ceda.0",
+  "version": "3.0.0-alpha-cadd145.0",
   "sideEffects": false,
   "peerDependencies": {
     "@envelop/core": "^2.4.0",

package/typings/cache-document-str.d.ts

@@ -0,0 +1,4 @@
+import { ExecutionArgs } from 'graphql';
+import { Plugin } from '@envelop/core';
+export declare function useCacheDocumentString(): Plugin;
+export declare function defaultGetDocumentString(executionArgs: ExecutionArgs): string;

package/typings/plugin.d.ts

@@ -7,9 +7,13 @@ import type { Cache } from './cache.js';
 export declare type BuildResponseCacheKeyFunction = (params: {
     /** Raw document string as sent from the client. */
     documentString: string;
+    /** Variable values as sent form the client. */
+    variableValues: ExecutionArgs['variableValues'];
+    /** The name of the GraphQL operation that should be executed from within the document. */
+    operationName?: Maybe<string>;
     /** optional sessionId for make unique cache keys based on the session.  */
     sessionId?: Maybe<string>;
-} & ExecutionArgs) => Promise<string>;
+}) => Promise<string>;
 export declare type GetDocumentStringFunction = (executionArgs: ExecutionArgs) => string;
 export declare type ShouldCacheResultFunction = (params: {
     result: ExecutionResult;
@@ -101,5 +105,4 @@ export declare const defaultBuildResponseCacheKey: BuildResponseCacheKeyFunction
  * By default, results with errors (unexpected, EnvelopError, or GraphQLError) are not cached.
  */
 export declare const defaultShouldCacheResult: ShouldCacheResultFunction;
-export declare function defaultGetDocumentString(executionArgs: ExecutionArgs): string;
 export declare function useResponseCache({ cache, ttl: globalTtl, session, enabled, ignoredTypes, ttlPerType, ttlPerSchemaCoordinate, idFields, invalidateViaMutation, buildResponseCacheKey, getDocumentString, shouldCacheResult, includeExtensionMetadata, }?: UseResponseCacheParameter): Plugin;