Add more tests to addSubschema (#4493)

ardatan · Sep 14, 2022 · cb6fa8c · cb6fa8c
1 parent 68357bf
commit cb6fa8c
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 24 deletions.
diff --git a/.changeset/sixty-worms-tell.md b/.changeset/sixty-worms-tell.md
@@ -0,0 +1,5 @@
+---
+'@graphql-mesh/runtime': patch
+---
+
+Refactor useSubschema
diff --git a/packages/runtime/src/useSubschema.ts b/packages/runtime/src/useSubschema.ts
@@ -1,19 +1,12 @@
 import { applyRequestTransforms, applyResultTransforms } from '@graphql-mesh/utils';
-import {
-  createDefaultExecutor,
-  DelegationContext,
-  SubschemaConfig,
-  applySchemaTransforms,
-  Subschema,
-} from '@graphql-tools/delegate';
+import { createDefaultExecutor, DelegationContext, applySchemaTransforms, Subschema } from '@graphql-tools/delegate';
 import { ExecutionRequest, getOperationASTFromRequest, isAsyncIterable } from '@graphql-tools/utils';
 import { isIntrospectionOperation, mapAsyncIterator, Plugin, TypedExecutionArgs } from '@envelop/core';
 import { introspectionFromSchema } from 'graphql';
 import { createBatchingExecutor } from '@graphql-tools/batch-execute';
 
-function getExecuteFn(subschema: SubschemaConfig) {
+function getExecuteFn(subschema: Subschema) {
   return async function subschemaExecute(args: TypedExecutionArgs<any>): Promise<any> {
-    const transformationContext: Record<string, any> = {};
     const originalRequest: ExecutionRequest = {
       document: args.document,
       variables: args.variableValues as any,
@@ -37,9 +30,9 @@ function getExecuteFn(subschema: SubschemaConfig) {
       context: args.contextValue,
       rootValue: args.rootValue,
       transforms: subschema.transforms,
-      transformedSchema: args.schema,
+      transformedSchema: subschema.transformedSchema,
       skipTypeMerging: true,
-      returnType: {} as any, // Might not work
+      returnType: args.schema.getRootType(operationAST.operation),
     };
     let executor = subschema.executor;
     if (executor == null) {
@@ -48,6 +41,7 @@ function getExecuteFn(subschema: SubschemaConfig) {
     if (subschema.batch) {
       executor = createBatchingExecutor(executor);
     }
+    const transformationContext: Record<string, any> = {};
     const transformedRequest = applyRequestTransforms(
       originalRequest,
       delegationContext,

diff --git a/packages/runtime/test/useSubschema.test.ts b/packages/runtime/test/useSubschema.test.ts
@@ -1,21 +1,31 @@
 import { envelop } from '@envelop/core';
 import { Subschema } from '@graphql-tools/delegate';
 import { makeExecutableSchema } from '@graphql-tools/schema';
-import { RenameRootFields } from '@graphql-tools/wrap';
+import { RenameRootFields, TransformEnumValues } from '@graphql-tools/wrap';
 import { buildClientSchema, ExecutionResult, getIntrospectionQuery, IntrospectionQuery, printSchema } from 'graphql';
 import { useSubschema } from '../src/useSubschema';
 
 describe('useSubschema', () => {
   const sdl = /* GraphQL */ `
     type Query {
-      foo: String
+      foo(baz: Baz!): String
+    }
+    enum Baz {
+      B
+      C
+      D
     }
   `;
   const schema = makeExecutableSchema({
     typeDefs: sdl,
     resolvers: {
       Query: {
-        foo: () => 'bar',
+        foo: (_, { baz }) => baz,
+      },
+      Baz: {
+        B: 'b',
+        C: 'c',
+        D: 'd',
       },
     },
   });
@@ -29,6 +39,13 @@ describe('useSubschema', () => {
           }
           return name;
         }),
+        new TransformEnumValues((typeName, externalValue, enumValueConfig) => [
+          `A_${externalValue}`,
+          {
+            ...enumValueConfig,
+            value: `A_${externalValue}`,
+          },
+        ]),
       ],
     })
   );
@@ -47,28 +64,35 @@ describe('useSubschema', () => {
     })) as any as ExecutionResult<IntrospectionQuery>;
     const introspectedSchema = buildClientSchema(result.data);
     const printedIntrospectedSdl = printSchema(introspectedSchema);
-    expect(printedIntrospectedSdl).toContain(
-      /* GraphQL */ `
-type Query {
-  bar: String
-}
-    `.trim()
-    );
+    expect(printedIntrospectedSdl).toMatchInlineSnapshot(`
+      "type Query {
+        bar(baz: Baz!): String
+      }
+
+      enum Baz {
+        A_B
+        A_C
+        A_D
+      }"
+    `);
   });
   it('should handle requests and responses correctly', async () => {
     const { schema, parse, validate, execute, contextFactory } = getEnveloped();
     const document = parse(/* GraphQL */ `
-      query Test {
-        bar
+      query Test($baz: Baz!) {
+        bar(baz: $baz)
       }
     `);
     const errors = validate(schema, document);
     expect(errors).toHaveLength(0);
     const result = (await execute({
       schema,
       document,
+      variableValues: {
+        baz: 'A_B',
+      },
       contextValue: await contextFactory(),
     })) as any as ExecutionResult<IntrospectionQuery>;
-    expect(result.data).toEqual({ bar: 'bar' });
+    expect(result.data).toEqual({ bar: 'b' });
   });
 });