@envelop/validation-cache 5.0.5-alpha-20221216195722-efa72eac → 5.0.5

package/cjs/index.js

@@ -26,23 +26,26 @@ const useValidationCache = (pluginOptions = {}) => {
         onParse({ params, extendContext }) {
             extendContext({ [rawDocumentSymbol]: params.source.toString() });
         },
-        onValidate({ params, context, setResult }) {
-            let ruleKey = '';
-            if (Array.isArray(params.rules)) {
-                // Note: We could also order them... but that might be too much
-                for (const rule of params.rules) {
-                    ruleKey = ruleKey + rule.name;
+        onValidate({ params, context, 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) => {
+                let ruleKey = '';
+                if (Array.isArray(args[2])) {
+                    // Note: We could also order them... but that might be too much
+                    for (const rule of args[2]) {
+                        ruleKey = ruleKey + rule.name;
+                    }
                 }
-            }
-            const key = ruleKey + (context[rawDocumentSymbol] ?? (0, graphql_1.print)(params.documentAST));
-            const cachedResult = resultCache.get(key);
-            if (cachedResult !== undefined) {
-                setResult(cachedResult);
-            }
-            return ({ result }) => {
-                // @ts-expect-error TODO: not sure how we will make it dev friendly
+                const key = ruleKey + (context[rawDocumentSymbol] ?? (0, graphql_1.print)(params.documentAST));
+                const cachedResult = resultCache.get(key);
+                if (cachedResult !== undefined) {
+                    return cachedResult;
+                }
+                const result = validateFn(...args);
                 resultCache.set(key, result);
-            };
+                return result;
+            });
         },
     };
 };

package/esm/index.js

@@ -22,23 +22,26 @@ export const useValidationCache = (pluginOptions = {}) => {
         onParse({ params, extendContext }) {
             extendContext({ [rawDocumentSymbol]: params.source.toString() });
         },
-        onValidate({ params, context, setResult }) {
-            let ruleKey = '';
-            if (Array.isArray(params.rules)) {
-                // Note: We could also order them... but that might be too much
-                for (const rule of params.rules) {
-                    ruleKey = ruleKey + rule.name;
+        onValidate({ params, context, 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) => {
+                let ruleKey = '';
+                if (Array.isArray(args[2])) {
+                    // Note: We could also order them... but that might be too much
+                    for (const rule of args[2]) {
+                        ruleKey = ruleKey + rule.name;
+                    }
                 }
-            }
-            const key = ruleKey + (context[rawDocumentSymbol] ?? print(params.documentAST));
-            const cachedResult = resultCache.get(key);
-            if (cachedResult !== undefined) {
-                setResult(cachedResult);
-            }
-            return ({ result }) => {
-                // @ts-expect-error TODO: not sure how we will make it dev friendly
+                const key = ruleKey + (context[rawDocumentSymbol] ?? print(params.documentAST));
+                const cachedResult = resultCache.get(key);
+                if (cachedResult !== undefined) {
+                    return cachedResult;
+                }
+                const result = validateFn(...args);
                 resultCache.set(key, result);
-            };
+                return result;
+            });
         },
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@envelop/validation-cache",
-  "version": "5.0.5-alpha-20221216195722-efa72eac",
+  "version": "5.0.5",
   "sideEffects": false,
   "peerDependencies": {
     "@envelop/core": "^3.0.4",