feat: createSchema now returns both schema and context.

webiny · Feb 8, 2020 · 6a568d0 · 6a568d0
1 parent 331627c
commit 6a568d0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/packages/api/src/createHandler.ts b/packages/api/src/createHandler.ts
@@ -5,7 +5,8 @@ import {
     PluginsContainer,
     GraphQLMiddlewarePlugin,
     GraphQLContextPlugin,
-    CreateApolloHandlerPlugin
+    CreateApolloHandlerPlugin,
+    GraphQLContext
 } from "./types";
 import { prepareSchema } from "./graphql/prepareSchema";
 
@@ -18,8 +19,11 @@ type CreateHandlerParams = {
  * @param plugins
  * @returns {Promise<void>}
  */
-export const createSchema = async ({ plugins }: CreateHandlerParams): Promise<GraphQLSchema> => {
-    let schema = await prepareSchema({ plugins });
+export const createSchema = async ({
+    plugins
+}: CreateHandlerParams): Promise<{ schema: GraphQLSchema; context: GraphQLContext }> => {
+    // eslint-disable-next-line prefer-const
+    let { schema, context } = await prepareSchema({ plugins });
 
     const registeredMiddleware = [];
 
@@ -67,14 +71,14 @@ export const createSchema = async ({ plugins }: CreateHandlerParams): Promise<Gr
         }
     });
 
-    return schema;
+    return { schema, context };
 };
 
 /**
  * Create Apollo handler
  */
 export const createHandler = async ({ plugins }: CreateHandlerParams) => {
-    const schema = await createSchema({ plugins });
+    const { schema } = await createSchema({ plugins });
 
     const plugin = plugins.byName<CreateApolloHandlerPlugin>("create-apollo-handler");
 

diff --git a/packages/api/src/graphql/prepareSchema.ts b/packages/api/src/graphql/prepareSchema.ts
@@ -9,7 +9,8 @@ import {
     GraphQLSchemaPlugin,
     GraphqlScalarPlugin,
     SchemaDefinition,
-    GraphQLBeforeSchemaPlugin, GraphQLContext
+    GraphQLBeforeSchemaPlugin,
+    GraphQLContext
 } from "../types";
 
 type PrepareSchemaParams = { plugins: PluginsContainer };
@@ -69,6 +70,5 @@ export async function prepareSchema({ plugins }: PrepareSchemaParams) {
         }
     }
 
-    // @ts-ignore
-    return buildFederatedSchema([...schemaDefs]);
+    return { schema: buildFederatedSchema([...schemaDefs]), context };
 }
diff --git a/packages/api/src/testing/index.ts b/packages/api/src/testing/index.ts
@@ -5,14 +5,7 @@ import { GraphQLContextPlugin } from "@webiny/api/types";
 export const setupSchema = async plugins => {
     const pluginsContainer = new PluginsContainer([plugins]);
 
-    const schema = await createSchema({ plugins: pluginsContainer });
-
-    const context = { plugins: pluginsContainer };
-
-    return {
-        schema,
-        context
-    };
+    return await createSchema({ plugins: pluginsContainer });
 };
 
 export const setupContext = async (plugins, baseContext = {}) => {