refactor(cms-testing): DI-native function plugins; remove ContextPlugin from consumers (#5424)

adrians5j · claude · web-flow · commit 649817fe376c · 2026-07-17T12:57:25.000+02:00
Co-authored-by: Claude Opus 4.8 (1M context) &lt;noreply@anthropic.com&gt;
diff --git a/packages/api-aco/__tests__/folder.flp.inheritance.test.ts b/packages/api-aco/__tests__/folder.flp.inheritance.test.ts
@@ -1,9 +1,8 @@
 import { describe, it, expect } from "vitest";
-import { ContextPlugin } from "@webiny/api";
+import type { Container } from "@webiny/di";
 import { useGraphQlHandler } from "./utils/useGraphQlHandler";
 import { TeamFactory } from "@webiny/api-core/features/security/teams/shared/abstractions.js";
 import type { IdentityData } from "@webiny/api-core/features/security/IdentityContext";
-import type { ApiCoreContext } from "@webiny/api-core/types/core.js";
 
 const FOLDER_TYPE = "test-folders";
 
@@ -32,9 +31,9 @@ describe("Folder Level Permissions - Inheritance", () => {
     const { aco } = useGraphQlHandler({
         identity: identityA,
         plugins: [
-            new ContextPlugin<ApiCoreContext>(async context => {
-                context.container.registerInstance(TeamFactory, new TestTeamFactory());
-            })
+            (container: Container) => {
+                container.registerInstance(TeamFactory, new TestTeamFactory());
+            }
         ]
     });
 
diff --git a/packages/api-aco/__tests__/mocks/lifecycle.mock.ts b/packages/api-aco/__tests__/mocks/lifecycle.mock.ts
@@ -1,5 +1,4 @@
-import { ContextPlugin } from "@webiny/api";
-import type { AcoContext } from "~/types";
+import type { Container } from "@webiny/di";
 import { LifecycleEventTracker } from "@webiny/project-utils/testing/helpers/lifecycleTracker";
 import type { DomainEvent } from "@webiny/api-core/features/eventPublisher/index.js";
 import {
@@ -24,41 +23,41 @@ import {
 export const tracker = new LifecycleEventTracker();
 
 export const assignFolderLifecycleEvents = () => {
-    return new ContextPlugin<AcoContext>(async context => {
-        context.container.registerFactory(FolderBeforeCreateEventHandler, () => ({
+    return (container: Container) => {
+        container.registerFactory(FolderBeforeCreateEventHandler, () => ({
             async handle(event: DomainEvent<FolderBeforeCreatePayload>) {
                 tracker.track("folder:beforeCreate", event.payload);
             }
         }));
 
-        context.container.registerFactory(FolderAfterCreateEventHandler, () => ({
+        container.registerFactory(FolderAfterCreateEventHandler, () => ({
             async handle(event: DomainEvent<FolderAfterCreatePayload>) {
                 tracker.track("folder:afterCreate", event.payload);
             }
         }));
 
-        context.container.registerFactory(FolderBeforeUpdateEventHandler, () => ({
+        container.registerFactory(FolderBeforeUpdateEventHandler, () => ({
             async handle(event: DomainEvent<FolderBeforeUpdatePayload>) {
                 tracker.track("folder:beforeUpdate", event.payload);
             }
         }));
 
-        context.container.registerFactory(FolderAfterUpdateEventHandler, () => ({
+        container.registerFactory(FolderAfterUpdateEventHandler, () => ({
             async handle(event: DomainEvent<FolderAfterUpdatePayload>) {
                 tracker.track("folder:afterUpdate", event.payload);
             }
         }));
 
-        context.container.registerFactory(FolderBeforeDeleteEventHandler, () => ({
+        container.registerFactory(FolderBeforeDeleteEventHandler, () => ({
             async handle(event: DomainEvent<FolderBeforeDeletePayload>) {
                 tracker.track("folder:beforeDelete", event.payload);
             }
         }));
 
-        context.container.registerFactory(FolderAfterDeleteEventHandler, () => ({
+        container.registerFactory(FolderAfterDeleteEventHandler, () => ({
             async handle(event: DomainEvent<FolderAfterDeletePayload>) {
                 tracker.track("folder:afterDelete", event.payload);
             }
         }));
-    });
+    };
 };
diff --git a/packages/api-aco/__tests__/utils/useGraphQlHandler.ts b/packages/api-aco/__tests__/utils/useGraphQlHandler.ts
@@ -57,13 +57,19 @@ export const useGraphQlHandler = (params: UseGQLHandlerParams = {}) => {
             processLegacyPlugins(container, apiAcoStorage.plugins);
 
             if (params.plugins) {
-                const extraPlugins = [params.plugins].flat(Infinity as 1);
-                for (const plugin of extraPlugins) {
+                const extraPlugins = [params.plugins].flat(Infinity as 1).filter(Boolean);
+                // DI-native plugins are plain `container => {}` functions; call them directly.
+                const isFn = (p: any) => typeof p === "function" && !p.prototype;
+                for (const plugin of extraPlugins.filter(isFn)) {
+                    (plugin as (c: any) => void)(container);
+                }
+                const rest = extraPlugins.filter(p => !isFn(p));
+                for (const plugin of rest) {
                     if (plugin instanceof ContextPlugin) {
                         await plugin.apply({ container } as any);
                     }
                 }
-                processLegacyPlugins(container, extraPlugins);
+                processLegacyPlugins(container, rest);
             }
 
             container.register(FileModel);
diff --git a/packages/api-headless-cms-aco/__tests__/mocks/lifecycle.mock.ts b/packages/api-headless-cms-aco/__tests__/mocks/lifecycle.mock.ts
@@ -3,7 +3,7 @@ import {
     EntryAfterRestoreFromBinEventHandler,
     EntryBeforeRestoreFromBinEventHandler
 } from "@webiny/api-headless-cms/features/contentEntry/RestoreEntryFromBin/events.js";
-import { ContextPlugin } from "@webiny/api";
+import type { Container } from "@webiny/di";
 
 export const tracker = new LifecycleEventTracker();
 
@@ -20,14 +20,14 @@ class TrackEntryAfterRestoreHandler implements EntryAfterRestoreFromBinEventHand
 }
 
 export const assignCmsLifecycleEvents = () => {
-    return new ContextPlugin(context => {
-        context.container.registerFactory(
+    return (container: Container) => {
+        container.registerFactory(
             EntryBeforeRestoreFromBinEventHandler,
             () => new TrackEntryBeforeRestoreHandler()
         );
-        context.container.registerFactory(
+        container.registerFactory(
             EntryAfterRestoreFromBinEventHandler,
             () => new TrackEntryAfterRestoreHandler()
         );
-    });
+    };
 };
diff --git a/packages/api-headless-cms-aco/__tests__/utils/useGraphQlHandler.ts b/packages/api-headless-cms-aco/__tests__/utils/useGraphQlHandler.ts
@@ -65,7 +65,12 @@ export const useGraphQlHandler = (params: UseGQLHandlerParams = {}) => {
     const resolvedIdentity = identity ?? defaultIdentity;
     const resolvedPermissions = permissions ?? ([{ name: "*" }] as SecurityPermission[]);
 
-    const extraCmsPlugins = ([plugins] as any[]).flat(Infinity as 1).filter(Boolean);
+    const allPlugins = ([plugins] as any[]).flat(Infinity as 1).filter(Boolean);
+    // DI-native plugins are plain `container => {}` functions; call them after features (below).
+    // Everything else (static CMS plugins) is forwarded to HeadlessCmsFeature.extraPlugins.
+    const isFn = (p: any) => typeof p === "function" && !p.prototype;
+    const fnPlugins = allPlugins.filter(isFn);
+    const extraCmsPlugins = allPlugins.filter(p => !isFn(p));
 
     const handler = createTestHttpHandler({
         root: container => {
@@ -91,6 +96,11 @@ export const useGraphQlHandler = (params: UseGQLHandlerParams = {}) => {
             container.register(HeadlessCmsContextualSchema);
             AcoFeature.register(container);
             AcoHcmsFeature.register(container);
+            // DI-native function plugins run after the package's features so they can override
+            // defaults (last-wins), mirroring the legacy ContextPlugin timing.
+            for (const plugin of fnPlugins) {
+                (plugin as (c: any) => void)(container);
+            }
             GraphQLEngineFeature.register(container);
         }
     });
diff --git a/packages/api-headless-cms-aco/package.json b/packages/api-headless-cms-aco/package.json
@@ -34,7 +34,6 @@
     "typescript": "^7.0.2"
   },
   "dependencies": {
-    "@webiny/api": "0.0.0",
     "@webiny/api-aco": "0.0.0",
     "@webiny/api-headless-cms": "0.0.0",
     "@webiny/feature": "0.0.0",
diff --git a/packages/api-headless-cms-aco/tsconfig.build.json b/packages/api-headless-cms-aco/tsconfig.build.json
@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.build.json",
   "include": ["src"],
   "references": [
-    { "path": "../api/tsconfig.build.json" },
     { "path": "../api-aco/tsconfig.build.json" },
     { "path": "../api-headless-cms/tsconfig.build.json" },
     { "path": "../feature/tsconfig.build.json" },
@@ -21,8 +20,6 @@
     "paths": {
       "~/*": ["./src/*"],
       "~tests/*": ["./__tests__/*"],
-      "@webiny/api/*": ["../api/src/*"],
-      "@webiny/api": ["../api/src"],
       "@webiny/api-aco/*": ["../api-aco/src/*"],
       "@webiny/api-aco": ["../api-aco/src"],
       "@webiny/api-headless-cms/*": ["../api-headless-cms/src/*"],
diff --git a/packages/api-headless-cms-aco/tsconfig.json b/packages/api-headless-cms-aco/tsconfig.json
@@ -2,7 +2,6 @@
   "extends": "../../tsconfig.json",
   "include": ["src", "__tests__"],
   "references": [
-    { "path": "../api" },
     { "path": "../api-aco" },
     { "path": "../api-headless-cms" },
     { "path": "../feature" },
@@ -21,8 +20,6 @@
     "paths": {
       "~/*": ["./src/*"],
       "~tests/*": ["./__tests__/*"],
-      "@webiny/api/*": ["../api/src/*"],
-      "@webiny/api": ["../api/src"],
       "@webiny/api-aco/*": ["../api-aco/src/*"],
       "@webiny/api-aco": ["../api-aco/src"],
       "@webiny/api-headless-cms/*": ["../api-headless-cms/src/*"],
diff --git a/packages/api-headless-cms-bulk-actions/__tests__/context/useGraphQLHandler.ts b/packages/api-headless-cms-bulk-actions/__tests__/context/useGraphQLHandler.ts
@@ -30,13 +30,19 @@ interface InvokeParams {
 export const useGraphQlHandler = (params: UseGQLHandlerParams = {}) => {
     const { plugins = [] } = params;
 
-    const extraCmsPlugins = ([plugins] as any[]).flat(Infinity as 1).filter(Boolean);
+    const allPlugins = ([plugins] as any[]).flat(Infinity as 1).filter(Boolean);
+    // DI-native plugins are plain `container => {}` functions → the `plugins` param (createCmsTestHandler
+    // calls them after features). Static CMS plugins (e.g. model plugins) → extraCmsPlugins.
+    const isFn = (p: any) => typeof p === "function" && !p.prototype;
+    const fnPlugins = allPlugins.filter(isFn);
+    const extraCmsPlugins = allPlugins.filter(p => !isFn(p));
 
     const { handler, invoke } = createCmsTestHandler({
         identity: params.identity ?? createIdentity(),
         permissions: params.permissions ?? (createPermissions() as SecurityPermission[]),
         testProjectLicense: params.testProjectLicense,
         extraCmsPlugins,
+        plugins: fnPlugins,
         features: container => {
             container.register(HeadlessCmsContextualSchema);
             // Background tasks + bulk actions are DI-native now.
diff --git a/packages/api-headless-cms-bulk-actions/__tests__/tasks/createBulkAction.test.ts b/packages/api-headless-cms-bulk-actions/__tests__/tasks/createBulkAction.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
 import { IntrospectionField, IntrospectionInterfaceType } from "graphql";
 import { useGraphQlHandler } from "~tests/context/useGraphQLHandler";
 import { createMockModels, createPrivateMockModels } from "~tests/mocks";
-import { createContextPlugin } from "@webiny/api";
+import type { Container } from "@webiny/di";
 import { EntriesBulkAction } from "~/features/EntriesBulkAction/abstractions.js";
 
 interface GraphQlType {
@@ -92,9 +92,9 @@ describe("createBulkAction", () => {
         const { introspect } = useGraphQlHandler({
             plugins: [
                 ...createMockModels(),
-                createContextPlugin(context => {
-                    context.container.registerInstance(EntriesBulkAction, new PrintBulkAction());
-                })
+                (container: Container) => {
+                    container.registerInstance(EntriesBulkAction, new PrintBulkAction());
+                }
             ]
         });
 
diff --git a/packages/api-headless-cms-ddb-es/__tests__/graphql/security.ts b/packages/api-headless-cms-ddb-es/__tests__/graphql/security.ts
diff --git a/packages/api-headless-cms-testing/src/createCmsTestHandler.ts b/packages/api-headless-cms-testing/src/createCmsTestHandler.ts
@@ -105,20 +105,33 @@ export const createCmsTestHandler = (params: CmsTestHandlerParams = {}) => {
         processLegacyPlugins(container, cmsStorage.plugins);
         registerLegacyPluginsViaGqlContextualSchema(container, cmsStorage.plugins);
 
-        // User-supplied legacy plugins (dual-dispatched, mirroring useContextHandler).
         const userPlugins = [params.plugins].flat(Infinity as 1).filter(Boolean);
-        processLegacyPlugins(container, userPlugins);
-        const staticUserPlugins = userPlugins.filter(
+        // DI-native plugins are plain `container => {}` functions; everything else keeps the legacy
+        // dual-dispatch. Check for a function via `!p.prototype` — a plain function also has
+        // `Function.prototype.apply`, which the legacy bridge would otherwise invoke with no args.
+        const isFn = (p: any) => typeof p === "function" && !p.prototype;
+
+        // User-supplied legacy plugins (dual-dispatched, mirroring useContextHandler).
+        const legacyUserPlugins = userPlugins.filter(p => !isFn(p));
+        processLegacyPlugins(container, legacyUserPlugins);
+        const staticUserPlugins = legacyUserPlugins.filter(
             p => typeof (p as any).apply !== "function" && typeof p !== "function"
         );
         HeadlessCmsFeature.register(container, {
             type: cmsType,
             extraPlugins: [...(params.extraCmsPlugins ?? []), ...staticUserPlugins]
         });
 
-        registerLegacyPluginsViaGqlContextualSchema(container, userPlugins);
+        registerLegacyPluginsViaGqlContextualSchema(container, legacyUserPlugins);
 
         await params.features?.(container);
+
+        // DI-native function plugins run LAST — after the consuming package's own features — so they
+        // can override defaults those features registered (last-wins), mirroring the legacy bridge's
+        // post-features timing.
+        for (const plugin of userPlugins.filter(isFn)) {
+            (plugin as (container: any) => void)(container);
+        }
     };
 
     const handler = createTestHttpHandler({
diff --git a/packages/api-website-builder/__tests__/utils/noopCloudfrontInvalidateCacheTask.ts b/packages/api-website-builder/__tests__/utils/noopCloudfrontInvalidateCacheTask.ts
@@ -0,0 +1,25 @@
+import { TaskDefinition } from "@webiny/api-core/features/task/TaskDefinition/index.js";
+
+/**
+ * A no-op stand-in for api-file-manager-s3's "cloudfrontInvalidateCache" task definition.
+ *
+ * Website Builder file/page flows fire FlushCacheOn{Update,Delete}Handler, which call
+ * `taskService.trigger({ definition: "cloudfrontInvalidateCache", ... })`. `trigger` validates that
+ * a definition with this id exists (else TaskDefinitionNotFoundError), so it must be registered for
+ * those flows to succeed. The task's real `run()` (a CloudFront invalidation) is never executed in
+ * tests — the mock TaskService blocks dispatch to the runner — so only the id needs to match. We
+ * register this local no-op instead of importing the real prod def to keep the WB test decoupled
+ * from api-file-manager-s3 internals.
+ */
+export const NoopCloudfrontInvalidateCacheTaskDefinition = TaskDefinition.createImplementation({
+    implementation: class implements TaskDefinition.Interface {
+        id = "cloudfrontInvalidateCache";
+        title = "Invalidate CloudFront Cache (test no-op)";
+        isPrivate = true;
+
+        async run({ controller }: TaskDefinition.RunParams) {
+            return controller.response.done();
+        }
+    },
+    dependencies: []
+});
diff --git a/packages/api-website-builder/__tests__/utils/useGraphQlHandler.ts b/packages/api-website-builder/__tests__/utils/useGraphQlHandler.ts
@@ -4,8 +4,8 @@ import { BackgroundTasksFeature, TaskService } from "@webiny/background-tasks/ap
 import { createMockTaskService } from "@webiny/project-utils/testing/tasks/mockTaskTriggerTransportPlugin.js";
 import { createCmsTestHandler } from "@webiny/api-headless-cms-testing";
 import type { CmsTestHandlerParams } from "@webiny/api-headless-cms-testing";
-import { createContextPlugin } from "@webiny/api";
-import { InvalidateCloudfrontCacheTaskDefinition } from "@webiny/api-file-manager-s3/features/FlushCache/InvalidateCacheTask.js";
+import type { Container } from "@webiny/di";
+import { NoopCloudfrontInvalidateCacheTaskDefinition } from "./noopCloudfrontInvalidateCacheTask.js";
 import { WebsiteBuilderFeature } from "~/index.js";
 import { Extension as LanguagesExtension } from "@webiny/languages/api/Extension.js";
 import { createWbSdk } from "~tests/utils/createWbSdk.js";
@@ -22,9 +22,9 @@ export const useGraphQlHandler = (params: UseGQLHandlerParams = {}) => {
         ...params,
         // identity === null → anonymous (handled natively by the shared harness).
         plugins: [
-            createContextPlugin(ctx => {
-                ctx.container.register(InvalidateCloudfrontCacheTaskDefinition);
-            }),
+            (container: Container) => {
+                container.register(NoopCloudfrontInvalidateCacheTaskDefinition);
+            },
             ...[params.plugins].flat(Infinity as 1).filter(Boolean)
         ],
         features: container => {
diff --git a/packages/api-website-builder/__tests__/utils/useHandler.ts b/packages/api-website-builder/__tests__/utils/useHandler.ts
@@ -4,8 +4,8 @@ import { createMockTaskService } from "@webiny/project-utils/testing/tasks/mockT
 import { createCmsTestHandler } from "@webiny/api-headless-cms-testing";
 import type { CmsTestHandlerParams } from "@webiny/api-headless-cms-testing";
 import type { ApiCoreContext } from "@webiny/api-core/types/core.js";
-import { createContextPlugin } from "@webiny/api";
-import { InvalidateCloudfrontCacheTaskDefinition } from "@webiny/api-file-manager-s3/features/FlushCache/InvalidateCacheTask.js";
+import type { Container } from "@webiny/di";
+import { NoopCloudfrontInvalidateCacheTaskDefinition } from "./noopCloudfrontInvalidateCacheTask.js";
 import { WebsiteBuilderFeature } from "~/index.js";
 import { Extension as LanguagesExtension } from "@webiny/languages/api/Extension.js";
 import type { IdentityData } from "@webiny/api-core/features/security/IdentityContext/index.js";
@@ -25,9 +25,9 @@ export const useHandler = (params: Params = {}) => {
         // (TestAuthenticator returns it), so no post-auth override is needed.
         //
         plugins: [
-            createContextPlugin(ctx => {
-                ctx.container.register(InvalidateCloudfrontCacheTaskDefinition);
-            }),
+            (container: Container) => {
+                container.register(NoopCloudfrontInvalidateCacheTaskDefinition);
+            },
             ...[params.plugins].flat(Infinity as 1).filter(Boolean)
         ],
         features: container => {
diff --git a/packages/api-website-builder/package.json b/packages/api-website-builder/package.json
@@ -21,7 +21,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@webiny/api": "0.0.0",
     "@webiny/api-core": "0.0.0",
     "@webiny/api-headless-cms": "0.0.0",
     "@webiny/event-handler-core": "0.0.0",
diff --git a/packages/api-website-builder/tsconfig.build.json b/packages/api-website-builder/tsconfig.build.json
diff --git a/packages/api-website-builder/tsconfig.json b/packages/api-website-builder/tsconfig.json
diff --git a/yarn.lock b/yarn.lock
