@backstage/backend-test-utils 0.4.5-next.1 → 0.4.5-next.3

package/dist/index.d.ts

@@ -350,7 +350,7 @@ interface ServiceFactoryTesterOptions {
  *
  * @public
  */
-declare class ServiceFactoryTester<TService, TScope extends 'root' | 'plugin'> {
+declare class ServiceFactoryTester<TService, TScope extends 'root' | 'plugin', TInstances extends 'singleton' | 'multiton' = 'singleton'> {
     #private;
     /**
      * Creates a new {@link ServiceFactoryTester} used to test the provided subject.
@@ -359,14 +359,14 @@ declare class ServiceFactoryTester<TService, TScope extends 'root' | 'plugin'> {
      * @param options - Additional options
      * @returns A new tester instance for the provided subject.
      */
-    static from<TService, TScope extends 'root' | 'plugin'>(subject: ServiceFactory<TService, TScope>, options?: ServiceFactoryTesterOptions): ServiceFactoryTester<TService, TScope>;
+    static from<TService, TScope extends 'root' | 'plugin', TInstances extends 'singleton' | 'multiton' = 'singleton'>(subject: ServiceFactory<TService, TScope, TInstances>, options?: ServiceFactoryTesterOptions): ServiceFactoryTester<TService, TScope, TInstances>;
     private constructor();
     /**
      * Returns the service instance for the subject.
      *
      * @deprecated Use `getSubject` instead.
      */
-    get(...args: 'root' extends TScope ? [] : [pluginId?: string]): Promise<TService>;
+    get(...args: 'root' extends TScope ? [] : [pluginId?: string]): Promise<TInstances extends 'multiton' ? TService[] : TService>;
     /**
      * Returns the service instance for the subject.
      *
@@ -377,7 +377,7 @@ declare class ServiceFactoryTester<TService, TScope extends 'root' | 'plugin'> {
      *
      * By default the plugin ID 'test' is used.
      */
-    getSubject(...args: 'root' extends TScope ? [] : [pluginId?: string]): Promise<TService>;
+    getSubject(...args: 'root' extends TScope ? [] : [pluginId?: string]): Promise<TInstances extends 'multiton' ? TService[] : TService>;
     /**
      * Return the service instance for any of the provided dependencies or built-in services.
      *
@@ -385,7 +385,7 @@ declare class ServiceFactoryTester<TService, TScope extends 'root' | 'plugin'> {
      *
      * A plugin ID can optionally be provided for plugin scoped services, otherwise the plugin ID 'test' is used.
      */
-    getService<TGetService, TGetScope extends 'root' | 'plugin'>(service: ServiceRef<TGetService, TGetScope>, ...args: 'root' extends TGetScope ? [] : [pluginId?: string]): Promise<TGetService>;
+    getService<TGetService, TGetScope extends 'root' | 'plugin', TGetInstances extends 'singleton' | 'multiton' = 'singleton'>(service: ServiceRef<TGetService, TGetScope, TGetInstances>, ...args: 'root' extends TGetScope ? [] : [pluginId?: string]): Promise<TGetInstances extends 'multiton' ? TGetService[] : TGetService>;
 }
 
 /** @public */
@@ -430,24 +430,24 @@ declare namespace mockServices {
         type Options = {
             data?: JsonObject;
         };
-        const factory: ServiceFactory<RootConfigService, "root"> & ((options?: Options | undefined) => ServiceFactory<RootConfigService, "root">);
+        const factory: ServiceFactory<RootConfigService, "root", "singleton" | "multiton"> & ((options?: Options | undefined) => ServiceFactory<RootConfigService, "root", "singleton" | "multiton">);
     }
     function rootLogger(options?: rootLogger.Options): LoggerService;
     namespace rootLogger {
         type Options = {
             level?: 'none' | 'error' | 'warn' | 'info' | 'debug';
         };
-        const factory: ServiceFactory<LoggerService, "root"> & ((options?: Options | undefined) => ServiceFactory<LoggerService, "root">);
+        const factory: ServiceFactory<LoggerService, "root", "singleton" | "multiton"> & ((options?: Options | undefined) => ServiceFactory<LoggerService, "root", "singleton" | "multiton">);
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.RootLoggerService> | undefined) => ServiceMock<_backstage_backend_plugin_api.RootLoggerService>;
     }
     function tokenManager(): TokenManagerService;
     namespace tokenManager {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<TokenManagerService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<TokenManagerService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<TokenManagerService> | undefined) => ServiceMock<TokenManagerService>;
     }
     function identity(): IdentityService;
     namespace identity {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<IdentityService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<IdentityService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<IdentityService> | undefined) => ServiceMock<IdentityService>;
     }
     function auth(options?: {
@@ -455,12 +455,12 @@ declare namespace mockServices {
         disableDefaultAuthPolicy?: boolean;
     }): AuthService;
     namespace auth {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<AuthService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<AuthService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<AuthService> | undefined) => ServiceMock<AuthService>;
     }
     function discovery(): DiscoveryService;
     namespace discovery {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<DiscoveryService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<DiscoveryService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<DiscoveryService> | undefined) => ServiceMock<DiscoveryService>;
     }
     /**
@@ -491,7 +491,7 @@ declare namespace mockServices {
          */
         const factory: ((options?: {
             defaultCredentials?: BackstageCredentials;
-        }) => ServiceFactory<HttpAuthService, "plugin">) & ServiceFactory<HttpAuthService, "plugin">;
+        }) => ServiceFactory<HttpAuthService, "plugin", "singleton">) & ServiceFactory<HttpAuthService, "plugin", "singleton">;
         const mock: (partialImpl?: Partial<HttpAuthService> | undefined) => ServiceMock<HttpAuthService>;
     }
     /**
@@ -509,55 +509,55 @@ declare namespace mockServices {
          * By default it extracts the user's entity ref from a user principal and
          * returns that as the only ownership entity ref.
          */
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<UserInfoService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<UserInfoService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<UserInfoService> | undefined) => ServiceMock<UserInfoService>;
     }
     namespace cache {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.CacheService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.CacheService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.CacheService> | undefined) => ServiceMock<_backstage_backend_plugin_api.CacheService>;
     }
     namespace database {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.DatabaseService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.DatabaseService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.DatabaseService> | undefined) => ServiceMock<_backstage_backend_plugin_api.DatabaseService>;
     }
     namespace rootHealth {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.RootHealthService, "root", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.RootHealthService, "root", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.RootHealthService> | undefined) => ServiceMock<_backstage_backend_plugin_api.RootHealthService>;
     }
     namespace httpRouter {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.HttpRouterService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.HttpRouterService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.HttpRouterService> | undefined) => ServiceMock<_backstage_backend_plugin_api.HttpRouterService>;
     }
     namespace rootHttpRouter {
-        const factory: ((options?: _backstage_backend_defaults_rootHttpRouter.RootHttpRouterFactoryOptions | undefined) => ServiceFactory<_backstage_backend_plugin_api.RootHttpRouterService, "root">) & ServiceFactory<_backstage_backend_plugin_api.RootHttpRouterService, "root">;
+        const factory: ((options?: _backstage_backend_defaults_rootHttpRouter.RootHttpRouterFactoryOptions | undefined) => ServiceFactory<_backstage_backend_plugin_api.RootHttpRouterService, "root", "singleton">) & ServiceFactory<_backstage_backend_plugin_api.RootHttpRouterService, "root", "singleton">;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.RootHttpRouterService> | undefined) => ServiceMock<_backstage_backend_plugin_api.RootHttpRouterService>;
     }
     namespace lifecycle {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.LifecycleService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.LifecycleService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.LifecycleService> | undefined) => ServiceMock<_backstage_backend_plugin_api.LifecycleService>;
     }
     namespace logger {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<LoggerService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<LoggerService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<LoggerService> | undefined) => ServiceMock<LoggerService>;
     }
     namespace permissions {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.PermissionsService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.PermissionsService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.PermissionsService> | undefined) => ServiceMock<_backstage_backend_plugin_api.PermissionsService>;
     }
     namespace rootLifecycle {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.RootLifecycleService, "root", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.RootLifecycleService, "root", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.RootLifecycleService> | undefined) => ServiceMock<_backstage_backend_plugin_api.RootLifecycleService>;
     }
     namespace scheduler {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.SchedulerService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.SchedulerService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.SchedulerService> | undefined) => ServiceMock<_backstage_backend_plugin_api.SchedulerService>;
     }
     namespace urlReader {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.UrlReaderService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_backend_plugin_api.UrlReaderService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_backend_plugin_api.UrlReaderService> | undefined) => ServiceMock<_backstage_backend_plugin_api.UrlReaderService>;
     }
     namespace events {
-        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_plugin_events_node.EventsService, "plugin", undefined>;
+        const factory: _backstage_backend_plugin_api.ServiceFactoryCompat<_backstage_plugin_events_node.EventsService, "plugin", "singleton", undefined>;
         const mock: (partialImpl?: Partial<_backstage_plugin_events_node.EventsService> | undefined) => ServiceMock<_backstage_plugin_events_node.EventsService>;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/backend-test-utils",
-  "version": "0.4.5-next.1",
+  "version": "0.4.5-next.3",
   "description": "Test helpers library for Backstage backends",
   "backstage": {
     "role": "node-library"
@@ -42,13 +42,13 @@
     "test": "backstage-cli package test"
   },
   "dependencies": {
-    "@backstage/backend-app-api": "^0.8.1-next.1",
-    "@backstage/backend-defaults": "^0.4.2-next.1",
-    "@backstage/backend-plugin-api": "^0.7.1-next.1",
+    "@backstage/backend-app-api": "^0.8.1-next.3",
+    "@backstage/backend-defaults": "^0.4.2-next.3",
+    "@backstage/backend-plugin-api": "^0.8.0-next.3",
     "@backstage/config": "^1.2.0",
     "@backstage/errors": "^1.2.4",
-    "@backstage/plugin-auth-node": "^0.4.18-next.1",
-    "@backstage/plugin-events-node": "^0.3.9-next.1",
+    "@backstage/plugin-auth-node": "^0.5.0-next.3",
+    "@backstage/plugin-events-node": "^0.3.9-next.3",
     "@backstage/types": "^1.1.1",
     "@keyv/memcache": "^1.3.5",
     "@keyv/redis": "^2.5.3",
@@ -69,7 +69,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.27.0-next.1",
+    "@backstage/cli": "^0.27.0-next.4",
     "@types/supertest": "^2.0.8",
     "supertest": "^6.1.3"
   },