@envelop/validation-cache 5.1.2 → 5.1.3-alpha-20230220175948-cdba6d9f

package/cjs/index.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useValidationCache = void 0;
 const tslib_1 = require("tslib");
+const core_1 = require("@envelop/core");
 const graphql_1 = require("graphql");
 const fast_json_stable_stringify_1 = tslib_1.__importDefault(require("fast-json-stable-stringify"));
 const lru_cache_1 = tslib_1.__importDefault(require("lru-cache"));
 const sha1_es_1 = tslib_1.__importDefault(require("sha1-es"));
 const DEFAULT_MAX = 1000;
 const DEFAULT_TTL = 3600000;
-const rawDocumentSymbol = Symbol('rawDocument');
 const schemaHashCache = new WeakMap();
 function getSchemaHash(schema) {
     let hash = schemaHashCache.get(schema);
@@ -28,10 +28,7 @@ const useValidationCache = (pluginOptions = {}) => {
             maxAge: DEFAULT_TTL,
         });
     return {
-        onParse({ params, extendContext }) {
-            extendContext({ [rawDocumentSymbol]: params.source.toString() });
-        },
-        onValidate({ params, context, setValidationFn, validateFn }) {
+        onValidate({ params, setValidationFn, validateFn }) {
             // We use setValidateFn over accessing params.rules directly, as other plugins in the chain might add more rules.
             // This would cause an issue if we are constructing the cache key here already.
             setValidationFn((...args) => {
@@ -43,7 +40,7 @@ const useValidationCache = (pluginOptions = {}) => {
                         ruleKey = ruleKey + rule.name;
                     }
                 }
-                const key = schemaHashKey + `|` + ruleKey + `|` + (context[rawDocumentSymbol] ?? (0, graphql_1.print)(params.documentAST));
+                const key = schemaHashKey + `|` + ruleKey + `|` + (0, core_1.getDocumentString)(params.documentAST, graphql_1.print);
                 const cachedResult = resultCache.get(key);
                 if (cachedResult !== undefined) {
                     return cachedResult;

package/esm/index.js

@@ -1,10 +1,10 @@
+import { getDocumentString } from '@envelop/core';
 import { print, introspectionFromSchema } from 'graphql';
 import jsonStableStringify from 'fast-json-stable-stringify';
 import LRU from 'lru-cache';
 import SHA1 from 'sha1-es';
 const DEFAULT_MAX = 1000;
 const DEFAULT_TTL = 3600000;
-const rawDocumentSymbol = Symbol('rawDocument');
 const schemaHashCache = new WeakMap();
 function getSchemaHash(schema) {
     let hash = schemaHashCache.get(schema);
@@ -24,10 +24,7 @@ export const useValidationCache = (pluginOptions = {}) => {
             maxAge: DEFAULT_TTL,
         });
     return {
-        onParse({ params, extendContext }) {
-            extendContext({ [rawDocumentSymbol]: params.source.toString() });
-        },
-        onValidate({ params, context, setValidationFn, validateFn }) {
+        onValidate({ params, setValidationFn, validateFn }) {
             // We use setValidateFn over accessing params.rules directly, as other plugins in the chain might add more rules.
             // This would cause an issue if we are constructing the cache key here already.
             setValidationFn((...args) => {
@@ -39,7 +36,7 @@ export const useValidationCache = (pluginOptions = {}) => {
                         ruleKey = ruleKey + rule.name;
                     }
                 }
-                const key = schemaHashKey + `|` + ruleKey + `|` + (context[rawDocumentSymbol] ?? print(params.documentAST));
+                const key = schemaHashKey + `|` + ruleKey + `|` + getDocumentString(params.documentAST, print);
                 const cachedResult = resultCache.get(key);
                 if (cachedResult !== undefined) {
                     return cachedResult;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@envelop/validation-cache",
-  "version": "5.1.2",
+  "version": "5.1.3-alpha-20230220175948-cdba6d9f",
   "sideEffects": false,
   "peerDependencies": {
-    "@envelop/core": "^3.0.6",
+    "@envelop/core": "3.0.7-alpha-20230220175948-cdba6d9f",
     "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {