feat(extended-validation): merge useExtendedValidation usages (#245)

Author: Spectryll407

.changeset/curly-needles-vanish.md

@@ -0,0 +1,5 @@
+---
+'@envelop/extended-validation': patch
+---
+
+suuport multiple usages of useExtendedValidation

packages/plugins/extended-validation/src/plugin.ts

@@ -2,29 +2,39 @@ import { Plugin } from '@envelop/types';
 import { GraphQLError, TypeInfo, ValidationContext, visit, visitInParallel, visitWithTypeInfo } from 'graphql';
 import { ExtendedValidationRule } from './common';
 
+const SYMBOL_EXTENDED_VALIDATION_RULES = Symbol('SYMBOL_EXTENDED_VALIDATION_RULES');
+
 export const useExtendedValidation = (options: { rules: ExtendedValidationRule[] }): Plugin => {
   let schemaTypeInfo: TypeInfo;
 
   return {
     onSchemaChange({ schema }) {
       schemaTypeInfo = new TypeInfo(schema);
     },
+    onParse({ context, extendContext }) {
+      const rules: ExtendedValidationRule[] = (context as any)?.[SYMBOL_EXTENDED_VALIDATION_RULES] ?? [];
+      rules.push(...options.rules);
+      extendContext({
+        [SYMBOL_EXTENDED_VALIDATION_RULES]: rules,
+      });
+    },
     onExecute({ args, setResultAndStopExecution }) {
+      const rules: ExtendedValidationRule[] = args.contextValue[SYMBOL_EXTENDED_VALIDATION_RULES];
       const errors: GraphQLError[] = [];
       const typeInfo = schemaTypeInfo || new TypeInfo(args.schema);
       const validationContext = new ValidationContext(args.schema, args.document, typeInfo, e => {
         errors.push(e);
       });
 
-      const visitor = visitInParallel(options.rules.map(rule => rule(validationContext, args)));
+      const visitor = visitInParallel(rules.map(rule => rule(validationContext, args)));
       visit(args.document, visitWithTypeInfo(typeInfo, visitor));
 
-      for (const rule of options.rules) {
+      for (const rule of rules) {
         rule(validationContext, args);
       }
 
       if (errors.length > 0) {
-        setResultAndStopExecution({
+        return setResultAndStopExecution({
           data: null,
           errors,
         });

packages/plugins/extended-validation/test/extended-validation.spec.ts

@@ -0,0 +1,56 @@
+import { createTestkit } from '@envelop/testing';
+import { buildSchema, GraphQLError } from 'graphql';
+import { useExtendedValidation } from '../src';
+
+describe('useExtendedValidation', () => {
+  it('supports usage of multiple useExtendedValidation in different plugins', async () => {
+    const schema = buildSchema(/* GraphQL */ `
+      type Query {
+        foo: String!
+      }
+    `);
+    const operation = /* GraphQL */ `
+      {
+        foo
+      }
+    `;
+    const testInstance = createTestkit(
+      [
+        useExtendedValidation({
+          rules: [
+            ctx => {
+              return {
+                OperationDefinition() {
+                  ctx.reportError(new GraphQLError('No 1'));
+                },
+              };
+            },
+          ],
+        }),
+        useExtendedValidation({
+          rules: [
+            ctx => {
+              return {
+                OperationDefinition() {
+                  ctx.reportError(new GraphQLError('No 2'));
+                },
+              };
+            },
+          ],
+        }),
+      ],
+      schema
+    );
+
+    const result = await testInstance.execute(operation);
+    expect(result).toMatchInlineSnapshot(`
+    Object {
+      "data": null,
+      "errors": Array [
+        [GraphQLError: No 1],
+        [GraphQLError: No 2],
+      ],
+    }
+    `);
+  });
+});

packages/testing/src/index.ts

@@ -78,7 +78,7 @@ export function createTestkit(
   return {
     wait: ms => new Promise(resolve => setTimeout(resolve, ms)),
     replaceSchema,
-    execute: async (operation, rawVariables = {}, initialContext = null) => {
+    execute: async (operation, rawVariables = {}, initialContext = {}) => {
       const request = {
         headers: {},
         method: 'POST',