feat(core,apollo): add middleware support

Author: marcus-sa

Writerside/deepkit-graphql.tree

@@ -16,7 +16,8 @@
     <toc-element topic="utility-types.md"/>
     <toc-element topic="scalars.md"/>
     <toc-element topic="resolvers.md">
-      <toc-element topic="context.md"/>
+        <toc-element topic="Middleware.md"/>
+        <toc-element topic="context.md"/>
       <toc-element topic="parent.md"/>
     </toc-element>
     <toc-element topic="query.md"/>

Writerside/topics/Middleware.md

@@ -0,0 +1,3 @@
+# InternalMiddleware
+
+Start typing here...

Writerside/topics/query.md

@@ -1,3 +1,3 @@
-# Query
+# Queries
 
-Start typing here...
+Start typing here...

Writerside/topics/types-inline.md

@@ -4,7 +4,7 @@ In TypeScript, an inline type refers to a type definition declared directly at t
 
 The names of GraphQL object types corresponding to TypeScript inline types are generated by excluding any non-alphanumeric characters.
 <tip>
-For comparison, see <a href="types-referenced.md">referenced types</a> if you want to use a custom name.
+For comparison, see <a href="types-referenced.md">referenced types</a>.
 </tip>
 
 ## Example
@@ -36,6 +36,9 @@ type Query {
 }
 ```
 This ensures that the generated name is compatible with the GraphQL naming requirements.
+<tip>
+See <a href="types-referenced.md">referenced types</a> if you want to use a custom name.
+</tip>
 
 
 

package.json

@@ -51,26 +51,25 @@
   },
   "dependencies": {
     "@apollo/server": "4.9.3",
-    "@deepkit/app": "1.0.1-alpha.98",
-    "@deepkit/broker": "^1.0.1-alpha.97",
-    "@deepkit/bson": "^1.0.1-alpha.97",
-    "@deepkit/core": "1.0.1-alpha.97",
-    "@deepkit/core-rxjs": "^1.0.1-alpha.97",
-    "@deepkit/crypto": "^1.0.1-alpha.89",
-    "@deepkit/event": "^1.0.1-alpha.97",
-    "@deepkit/framework": "^1.0.1-alpha.99",
-    "@deepkit/http": "^1.0.1-alpha.98",
-    "@deepkit/injector": "^1.0.1-alpha.97",
-    "@deepkit/logger": "^1.0.1-alpha.97",
-    "@deepkit/orm": "1.0.1-alpha.98",
-    "@deepkit/rpc": "1.0.1-alpha.97",
-    "@deepkit/rpc-tcp": "^1.0.1-alpha.97",
-    "@deepkit/sql": "^1.0.1-alpha.98",
-    "@deepkit/stopwatch": "^1.0.1-alpha.97",
-    "@deepkit/template": "^1.0.1-alpha.97",
-    "@deepkit/type": "1.0.1-alpha.97",
-    "@deepkit/type-compiler": "1.0.1-alpha.97",
-    "@deepkit/workflow": "^1.0.1-alpha.97",
+    "@deepkit/app": "1.0.1-alpha.105",
+    "@deepkit/broker": "1.0.1-alpha.105",
+    "@deepkit/bson": "1.0.1-alpha.105",
+    "@deepkit/core": "1.0.1-alpha.105",
+    "@deepkit/core-rxjs": "1.0.1-alpha.105",
+    "@deepkit/event": "1.0.1-alpha.105",
+    "@deepkit/framework": "1.0.1-alpha.106",
+    "@deepkit/http": "1.0.1-alpha.105",
+    "@deepkit/injector": "1.0.1-alpha.105",
+    "@deepkit/logger": "1.0.1-alpha.105",
+    "@deepkit/orm": "~1.0.1-alpha.105",
+    "@deepkit/rpc": "~1.0.1-alpha.105",
+    "@deepkit/rpc-tcp": "1.0.1-alpha.105",
+    "@deepkit/sql": "1.0.1-alpha.105",
+    "@deepkit/stopwatch": "1.0.1-alpha.105",
+    "@deepkit/template": "1.0.1-alpha.105",
+    "@deepkit/type": "1.0.1-alpha.105",
+    "@deepkit/type-compiler": "1.0.1-alpha.105",
+    "@deepkit/workflow": "1.0.1-alpha.105",
     "graphql": "^16.8.0",
     "graphql-request": "^6.1.0",
     "graphql-scalars": "^1.22.2",
@@ -82,12 +81,12 @@
     "pnpm": "8.7.4",
     "node": "20.4.0"
   },
+  "nx": {
+    "includedScripts": []
+  },
   "pnpm": {
     "patchedDependencies": {
-      "@deepkit/type-compiler@1.0.1-alpha.97": "patches/@deepkit__type-compiler@1.0.1-alpha.97.patch"
+      "@deepkit/type-compiler@1.0.1-alpha.105": "patches/@deepkit__type-compiler@1.0.1-alpha.105.patch"
     }
-  },
-  "nx": {
-    "includedScripts": []
   }
 }

packages/apollo/package.json

@@ -14,9 +14,9 @@
   },
   "peerDependencies": {
     "@deepkit-graphql/core": "*",
-    "@deepkit/app": "*",
-    "@deepkit/http": "*",
-    "@deepkit/framework": "*",
+    "@deepkit/app": "^1.0.1-alpha.105",
+    "@deepkit/http": "^1.0.1-alpha.105",
+    "@deepkit/framework": "^1.0.1-alpha.106",
     "graphql": "^16.8.0"
   },
   "publishConfig": {

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

@@ -1,15 +1,15 @@
 import { ApolloServerOptionsWithSchema } from '@apollo/server';
 
-export class ApolloGraphQLConfig
-  implements
-    Pick<
-      ApolloServerOptionsWithSchema<{}>,
-      | 'introspection'
-      | 'nodeEnv'
-      | 'allowBatchedHttpRequests'
-      | 'csrfPrevention'
-      | 'includeStacktraceInErrorResponses'
-      | 'apollo'
-      | 'stopOnTerminationSignals'
-      | 'persistedQueries'
-    > {}
+export type ApolloServerOptions = Pick<
+  ApolloServerOptionsWithSchema<{}>,
+  | 'introspection'
+  | 'nodeEnv'
+  | 'allowBatchedHttpRequests'
+  | 'csrfPrevention'
+  | 'includeStacktraceInErrorResponses'
+  | 'apollo'
+  | 'stopOnTerminationSignals'
+  | 'persistedQueries'
+>;
+
+export class ApolloGraphQLConfig implements ApolloServerOptions {}

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

@@ -10,7 +10,7 @@ import {
   WebWorker,
 } from '@deepkit/framework';
 import { HttpBadRequestError, httpWorkflow } from '@deepkit/http';
-import { Driver } from '@deepkit-graphql/core';
+import { Driver, GraphQLHttpContext } from '@deepkit-graphql/core';
 
 import { ApolloGraphQLConfig } from './apollo-graphql-config';
 import { ApolloServerPlugins } from './plugins';
@@ -53,9 +53,14 @@ export class ApolloDriver extends Driver {
       body: JSON.parse(await event.request.readBodyText()),
     };
 
+    const context: GraphQLHttpContext = {
+      request: event.request,
+      response: event.response,
+    };
+
     const response = await this.server!.executeHTTPGraphQLRequest({
       httpGraphQLRequest,
-      context: async () => ({}),
+      context: async () => context,
     });
     if (!response) {
       throw new HttpBadRequestError(JSON.stringify(httpGraphQLRequest));

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

@@ -3,28 +3,37 @@ import { GraphQLModule } from '@deepkit-graphql/core';
 import { ApolloServerPlugin } from '@apollo/server/dist/esm/externalTypes/plugins';
 
 import { ApolloDriver } from './apollo-graphql-driver';
-import { ApolloGraphQLConfig } from './apollo-graphql-config';
+import {
+  ApolloGraphQLConfig,
+  ApolloServerOptions,
+} from './apollo-graphql-config';
 import { ApolloServerPlugins } from './plugins';
 
+export interface ApolloGraphQLModuleOptions extends ApolloServerOptions {
+  readonly plugins?: readonly ApolloServerPlugin[];
+}
+
 export class ApolloGraphQLModule extends createModule({
   config: ApolloGraphQLConfig,
   forRoot: true,
 }) {
-  readonly plugins = new ApolloServerPlugins();
+  readonly plugins: ApolloServerPlugins;
+
+  constructor({ plugins, ...options }: ApolloGraphQLModuleOptions) {
+    super(options);
+    this.plugins = new ApolloServerPlugins(plugins);
+  }
 
   process() {
     this.addProvider({
       provide: ApolloServerPlugins,
       useValue: this.plugins,
     });
-    this.addModuleImport(
-      new GraphQLModule(ApolloDriver),
-    );
+    this.addImport(new GraphQLModule(ApolloDriver));
   }
 
   addPlugin(plugin: ApolloServerPlugin): this {
     this.plugins.add(plugin);
     return this;
   }
 }
-

packages/core/package.json

@@ -13,10 +13,11 @@
     "tslib": "2.6.2"
   },
   "peerDependencies": {
-    "graphql": "16.8.0",
-    "@deepkit/core": "^1.0.1-alpha.97",
-    "@deepkit/type": "^1.0.1-alpha.97",
-    "@deepkit/injector": "^1.0.1-alpha.97"
+    "graphql": "^16.8.0",
+    "@deepkit/core": "^1.0.1-alpha.105",
+    "@deepkit/http": "^1.0.1-alpha.105",
+    "@deepkit/type": "^1.0.1-alpha.105",
+    "@deepkit/injector": "^1.0.1-alpha.105"
   },
   "publishConfig": {
     "access": "public"