Merge pull request #15748 from backstage/mob/new-factories

backend-plugin-api: rework service factory definitions

packages/backend-test-utils/src/next/implementations/mockTokenManagerService.ts

@@ -35,8 +35,6 @@ export const mockTokenManagerFactory = createServiceFactory({
   service: coreServices.tokenManager,
   deps: {},
   async factory() {
-    return async () => {
-      return new TokenManagerMock();
-    };
+    return new TokenManagerMock();
   },
 });

packages/backend-test-utils/src/next/wiring/TestBackend.test.ts

@@ -106,7 +106,7 @@ describe('TestBackend', () => {
       deps: {},
       service: testRef,
       factory: async () => {
-        return async () => testFn;
+        return testFn;
       },
     });
 

packages/backend-test-utils/src/next/wiring/TestBackend.ts

@@ -168,7 +168,7 @@ export async function startTestBackend<
           backend: { baseUrl: `http://localhost:${port}`, listen: { port } },
         }),
       );
-      return async () => discovery;
+      return discovery;
     },
   });
 
@@ -179,13 +179,13 @@ export async function startTestBackend<
       const [ref, impl] = serviceDef;
       if (ref.scope === 'plugin') {
         return createServiceFactory({
-          service: ref,
+          service: ref as ServiceRef<unknown, 'plugin'>,
           deps: {},
-          factory: async () => async () => impl,
+          factory: async () => impl,
         })();
       }
       return createServiceFactory({
-        service: ref,
+        service: ref as ServiceRef<unknown, 'root'>,
         deps: {},
         factory: async () => impl,
       })();