feat(apollo,yoga,core): use graphql child injector context as graphql…

… context

packages/apollo/src/lib/apollo-graphql-driver.ts

@@ -5,7 +5,7 @@ import { InjectorContext } from '@deepkit/injector';
 import { GraphQLSchema } from 'graphql';
 import { WebWorkerFactory, ApplicationServer } from '@deepkit/framework';
 import { HttpBadRequestError, httpWorkflow } from '@deepkit/http';
-import { Driver } from '@deepkit-graphql/core';
+import { Driver, GraphQLContext } from '@deepkit-graphql/core';
 
 import { ApolloGraphQLConfig } from './apollo-graphql-config';
 import { ApolloServerPlugins } from './plugins';
@@ -53,7 +53,7 @@ export class ApolloDriver extends Driver {
 
     const response = await this.server!.executeHTTPGraphQLRequest({
       httpGraphQLRequest,
-      context: async () => injectorContext,
+      context: async (): Promise<GraphQLContext> => ({ injectorContext }),
     });
     if (!response) {
       throw new HttpBadRequestError(JSON.stringify(httpGraphQLRequest));

packages/core/src/index.ts

@@ -2,7 +2,6 @@ export * from './lib/decorators';
 export * from './lib/types-builder';
 export * from './lib/schema-builder';
 export * from './lib/graphql.module';
-export * from './lib/graphql-http-context';
 export * from './lib/driver';
 export * from './lib/types';
 export * from './lib/resolvers';

packages/core/src/lib/decorators.spec.ts

@@ -79,7 +79,7 @@ test('middleware errors', async () => {
 
   await executeGraphQL({
     schema,
-    contextValue: injectorContext,
+    contextValue: { injectorContext },
     source: `{ get }`,
   });
 
@@ -124,7 +124,7 @@ test('resolver middleware is invoked', async () => {
 
   await executeGraphQL({
     schema,
-    contextValue: injectorContext,
+    contextValue: { injectorContext },
     source: `{ get }`,
   });
 
@@ -169,7 +169,7 @@ test('query middleware is invoked', async () => {
 
   await executeGraphQL({
     schema,
-    contextValue: injectorContext,
+    contextValue: { injectorContext },
     source: `{ get }`,
   });
 
@@ -214,7 +214,7 @@ test('mutation middleware is invoked', async () => {
 
   await executeGraphQL({
     schema,
-    contextValue: injectorContext,
+    contextValue: { injectorContext },
     source: `mutation { create }`,
   });
 
@@ -259,7 +259,7 @@ test('subscription middleware is invoked', async () => {
 
   await executeGraphQL({
     schema,
-    contextValue: injectorContext,
+    contextValue: { injectorContext },
     source: `subscription { create }`,
   });
 
@@ -298,7 +298,7 @@ test('mutation', async () => {
   await expect(
     executeGraphQL({
       schema,
-      contextValue: injectorContext,
+      contextValue: { injectorContext },
       source: `mutation { createUser(data: { username: "Test" }) { id } }`,
     }),
   ).resolves.toMatchSnapshot();
@@ -329,7 +329,7 @@ test('query', async () => {
   await expect(
     executeGraphQL({
       schema,
-      contextValue: injectorContext,
+      contextValue: { injectorContext },
       source: `{ getUser(id: 1) { id } }`,
       rootValue: {},
     }),
@@ -364,7 +364,7 @@ test('mutation args validation', async () => {
 
   await expect(
     executeGraphQL({
-      contextValue: injectorContext,
+      contextValue: { injectorContext },
       source: `mutation { createUser(data: { username: "Test" }) { username } }`,
       schema,
     }),
@@ -403,7 +403,7 @@ test.skip('Context', async () => {
 
   await expect(
     executeGraphQL({
-      contextValue: injectorContext,
+      contextValue: { injectorContext },
       source: `
         {
           info {
@@ -468,7 +468,7 @@ describe('resolveField', () => {
     await expect(
       executeGraphQL({
         schema,
-        contextValue: injectorContext,
+        contextValue: { injectorContext },
         source: `
           {
             getUser(id: "9f617521-b9c2-4ab9-a339-3c551c799027") {
@@ -529,7 +529,7 @@ describe('resolveField', () => {
 
     await expect(
       executeGraphQL({
-        contextValue: injectorContext,
+        contextValue: { injectorContext },
         source: `
           {
             getUser(id: "398cdf36-e3ac-475c-90aa-c70f99add874") {

packages/core/src/lib/schema-builder.ts

@@ -12,6 +12,7 @@ import {
 import { Resolvers } from './resolvers';
 import { TypesBuilder } from './types-builder';
 import { gqlClassDecorator } from './decorators';
+import { GraphQLContext } from './types';
 
 export interface SchemaBuilderOptions {
   readonly inputTypes?: readonly Type[];
@@ -56,10 +57,10 @@ export class SchemaBuilder {
 
   generateMutationResolverFields(): GraphQLFieldConfigMap<
     unknown,
-    InjectorContext
+    GraphQLContext
   > {
     return [...this.resolvers].reduce<
-      GraphQLFieldConfigMap<unknown, InjectorContext>
+      GraphQLFieldConfigMap<unknown, GraphQLContext>
     >(
       (fields, resolver) => ({
         // TODO: validate that fields don't override each other
@@ -72,10 +73,10 @@ export class SchemaBuilder {
 
   generateSubscriptionResolverFields(): GraphQLFieldConfigMap<
     unknown,
-    InjectorContext
+    GraphQLContext
   > {
     return [...this.resolvers].reduce<
-      GraphQLFieldConfigMap<unknown, InjectorContext>
+      GraphQLFieldConfigMap<unknown, GraphQLContext>
     >(
       (fields, resolver) => ({
         // TODO: validate that fields don't override each other
@@ -88,10 +89,10 @@ export class SchemaBuilder {
 
   generateQueryResolverFields(): GraphQLFieldConfigMap<
     unknown,
-    InjectorContext
+    GraphQLContext
   > {
     return [...this.resolvers].reduce<
-      GraphQLFieldConfigMap<unknown, InjectorContext>
+      GraphQLFieldConfigMap<unknown, GraphQLContext>
     >(
       (fields, resolver) => ({
         // TODO: validate that fields don't override each other

packages/core/src/lib/types-builder.ts

@@ -44,7 +44,7 @@ import {
   GraphQLUnionType,
 } from 'graphql';
 
-import { Context, GraphQLFields, Instance, InternalMiddleware } from './types';
+import { Context, GraphQLContext, GraphQLFields, Instance, InternalMiddleware } from './types';
 import { typeResolvers } from './decorators';
 import { Resolver, Resolvers } from './resolvers';
 import { InvalidSubscriptionTypeError, TypeNameRequiredError } from './errors';
@@ -612,7 +612,7 @@ export class TypesBuilder {
     reflectionMethod: ReflectionMethod,
     middlewares: readonly InternalMiddleware[],
     type: 'query' | 'mutation' | 'subscription' | 'resolveField',
-  ): GraphQLFieldResolver<unknown, InjectorContext, any> {
+  ): GraphQLFieldResolver<unknown, GraphQLContext, any> {
     const resolve = (injectorContext: InjectorContext) => {
       const instance = injectorContext.get(
         resolver.controller,
@@ -670,7 +670,7 @@ export class TypesBuilder {
       returnType,
     );
 
-    return async (parent, _args, injectorContext) => {
+    return async (parent, _args, { injectorContext }: GraphQLContext) => {
       const args = deserializeArgs(_args, { loosely: false }) as Record<string, unknown>;
       const argsValidationErrors = validateArgs(args);
       if (argsValidationErrors.length) {
@@ -734,14 +734,14 @@ export class TypesBuilder {
 
   generateSubscriptionResolverFields<T>(
     resolver: Resolver<T>,
-  ): GraphQLFieldConfigMap<unknown, InjectorContext> {
+  ): GraphQLFieldConfigMap<unknown, GraphQLContext> {
     const metadata = getClassDecoratorMetadata(resolver.controller);
     const resolverType = reflect(resolver.controller);
     const reflectionClass = ReflectionClass.from(resolverType);
 
     const fields = new Map<
       string,
-      GraphQLFieldConfig<unknown, InjectorContext>
+      GraphQLFieldConfig<unknown, GraphQLContext>
     >();
 
     // eslint-disable-next-line functional/no-loop-statement
@@ -775,14 +775,14 @@ export class TypesBuilder {
 
   generateMutationResolverFields<T>(
     resolver: Resolver<T>,
-  ): GraphQLFieldConfigMap<unknown, InjectorContext> {
+  ): GraphQLFieldConfigMap<unknown, GraphQLContext> {
     const metadata = getClassDecoratorMetadata(resolver.controller);
     const resolverType = reflect(resolver.controller);
     const reflectionClass = ReflectionClass.from(resolverType);
 
     const fields = new Map<
       string,
-      GraphQLFieldConfig<unknown, InjectorContext>
+      GraphQLFieldConfig<unknown, GraphQLContext>
     >();
 
     // eslint-disable-next-line functional/no-loop-statement
@@ -817,7 +817,7 @@ export class TypesBuilder {
   generateFieldResolver<T>(
     resolver: Resolver<T>,
     fieldName: string,
-  ): Pick<GraphQLFieldConfig<unknown, InjectorContext>, 'args' | 'resolve'> {
+  ): Pick<GraphQLFieldConfig<unknown, GraphQLContext>, 'args' | 'resolve'> {
     const metadata = getClassDecoratorMetadata(resolver.controller);
     const resolverType = reflect(resolver.controller);
     const reflectionClass = ReflectionClass.from(resolverType);
@@ -852,14 +852,14 @@ export class TypesBuilder {
 
   generateQueryResolverFields<T>(
     resolver: Resolver<T>,
-  ): GraphQLFieldConfigMap<unknown, InjectorContext> {
+  ): GraphQLFieldConfigMap<unknown, GraphQLContext> {
     const metadata = getClassDecoratorMetadata(resolver.controller);
     const resolverType = reflect(resolver.controller);
     const reflectionClass = ReflectionClass.from(resolverType);
 
     const fields = new Map<
       string,
-      GraphQLFieldConfig<unknown, InjectorContext>
+      GraphQLFieldConfig<unknown, GraphQLContext>
     >();
 
     // eslint-disable-next-line functional/no-loop-statement

packages/core/src/lib/types.ts

@@ -1,5 +1,6 @@
 import { ClassType, AbstractClassType } from '@deepkit/core';
 import { TypeAnnotation } from '@deepkit/type';
+import { InjectorContext } from '@deepkit/injector';
 
 export type GraphQLFields<T> = Record<string, { readonly type: T }>;
 
@@ -29,3 +30,7 @@ export type GraphQLMiddlewareFn = (
 export type InternalMiddleware =
   | ClassType<GraphQLMiddleware>
   | GraphQLMiddlewareFn;
+
+export interface GraphQLContext {
+  readonly injectorContext: InjectorContext;
+}

packages/yoga/src/lib/yoga-graphql-driver.ts

@@ -1,7 +1,7 @@
 import { GraphQLSchema } from 'graphql';
 import { WebWorkerFactory, ApplicationServer } from '@deepkit/framework';
 import { httpWorkflow } from '@deepkit/http';
-import { Driver } from '@deepkit-graphql/core';
+import { Driver, GraphQLContext } from '@deepkit-graphql/core';
 import { createYoga, YogaServerInstance } from 'graphql-yoga';
 import { InjectorContext } from '@deepkit/injector';
 import { Logger } from '@deepkit/logger';
@@ -29,7 +29,7 @@ export class YogaDriver extends Driver {
   ): Promise<void> {
     if (!event.request.method || !this.server) return;
 
-    await this.server.handle(event.request, event.response, injectorContext);
+    await this.server.handle(event.request, event.response, <GraphQLContext>{ injectorContext });
   }
 
   async start(schema: GraphQLSchema): Promise<void> {