refactor(handler-graphql): remove ContextPlugin from tests

packages/handler-graphql/__tests__/graphql.test.ts

@@ -3,8 +3,7 @@ import useGqlHandler from "./useGqlHandler";
 import { booksSchemaPlugin, booksCrudPlugin } from "~tests/mocks/booksSchema";
 import { CoreGraphQLSchemaFactory } from "~/graphql/abstractions";
 import type { GraphQLSchemaBuilder } from "~/features/GraphQLSchemaBuilder/abstractions";
-import { createContextPlugin } from "@webiny/handler";
-import type { Context } from "./types";
+import type { Container } from "@webiny/di";
 
 describe("GraphQL Handler", () => {
     test("should return errors if schema doesn't exist", async () => {
@@ -62,9 +61,9 @@ describe("GraphQL Handler", () => {
             dependencies: []
         });
 
-        const decoratorsPlugin = createContextPlugin<Context>(context => {
-            context.container.register(DecoratorsSchemaImpl);
-        });
+        const decoratorsPlugin = (container: Container) => {
+            container.register(DecoratorsSchemaImpl);
+        };
 
         const { invoke } = useGqlHandler({
             plugins: [booksCrudPlugin, booksSchemaPlugin, decoratorsPlugin]

packages/handler-graphql/__tests__/mocks/booksSchema.legacy.ts

@@ -1,4 +1,5 @@
-import { createContextPlugin } from "@webiny/handler";
+import type { Container } from "@webiny/di";
+import { RequestContextInitializer } from "@webiny/event-handler-core";
 import type { Book, Context } from "~tests/types";
 import { createGraphQLSchemaPlugin } from "~/plugins";
 
@@ -11,14 +12,19 @@ export const books: Book[] = [
     }
 ];
 
-export const booksCrudPlugin = createContextPlugin<Context>(async context => {
-    context.getBooks = async () => {
-        console.log("getBooks");
-        console.table(books);
-        console.warn("Your store is quite empty!");
-        return books;
-    };
-});
+// Augments the request context with `getBooks` post-auth (the Query.books resolver reads it).
+export const booksCrudPlugin = (container: Container) => {
+    container.registerInstance(RequestContextInitializer, {
+        async init(context: Record<string, any>) {
+            context.getBooks = async () => {
+                console.log("getBooks");
+                console.table(books);
+                console.warn("Your store is quite empty!");
+                return books;
+            };
+        }
+    });
+};
 
 export const booksSchema = createGraphQLSchemaPlugin<Context>({
     typeDefs: /* GraphQL */ `

packages/handler-graphql/__tests__/mocks/booksSchema.ts

@@ -1,5 +1,6 @@
-import { createContextPlugin } from "@webiny/handler";
-import type { Book, Context } from "~tests/types";
+import type { Container } from "@webiny/di";
+import { RequestContextInitializer } from "@webiny/event-handler-core";
+import type { Book } from "~tests/types";
 import { CoreGraphQLSchemaFactory } from "~/graphql/abstractions.js";
 import type { GraphQLSchemaBuilder } from "~/features/GraphQLSchemaBuilder/abstractions.js";
 
@@ -90,15 +91,20 @@ export const BooksSchemaImpl = CoreGraphQLSchemaFactory.createImplementation({
     dependencies: []
 });
 
-export const booksCrudPlugin = createContextPlugin<Context>(async context => {
-    context.getBooks = async () => {
-        console.log("getBooks");
-        console.table(books);
-        console.warn("Your store is quite empty!");
-        return books;
-    };
-});
+// Augments the request context with `getBooks` post-auth (the Query.books resolver reads it).
+export const booksCrudPlugin = (container: Container) => {
+    container.registerInstance(RequestContextInitializer, {
+        async init(context: Record<string, any>) {
+            context.getBooks = async () => {
+                console.log("getBooks");
+                console.table(books);
+                console.warn("Your store is quite empty!");
+                return books;
+            };
+        }
+    });
+};
 
-export const booksSchemaPlugin = createContextPlugin<Context>(context => {
-    context.container.register(BooksSchemaImpl);
-});
+export const booksSchemaPlugin = (container: Container) => {
+    container.register(BooksSchemaImpl);
+};

packages/handler-graphql/__tests__/useGqlHandler.ts

@@ -12,7 +12,17 @@ export default ({ plugins = [] }: Params = {}) => {
         root: () => {},
         request: async container => {
             const flat = [plugins].flat(Infinity as 1).filter(Boolean);
-            registerLegacyPluginsViaGqlContextualSchema(container, flat);
+            // DI-native plugins are plain `container => {}` functions (they register features /
+            // request-context initializers directly). Call them here; everything else (legacy
+            // `graphql-schema` plugins) still goes through the bridge until #39 removes it.
+            const isFn = (p: any) => typeof p === "function" && !p.prototype;
+            for (const plugin of flat.filter(isFn)) {
+                (plugin as (container: any) => void)(container);
+            }
+            registerLegacyPluginsViaGqlContextualSchema(
+                container,
+                flat.filter(p => !isFn(p))
+            );
 
             GraphQLEngineFeature.register(container);
         }