From f55c11f29d55cf2639b3d75976167f1506274cfa Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 9 Sep 2022 15:34:29 +0200
Subject: [PATCH] core-plugin-api: narrow scope type of service refs passed to
 default factory loader

Co-authored-by: blam <ben@blam.sh>
Signed-off-by: Patrik Oldsberg <poldsberg@gmail.com>
---
 .../src/services/system/types.ts                 | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/backend-plugin-api/src/services/system/types.ts b/packages/backend-plugin-api/src/services/system/types.ts
index 579d7abaab..e52ef5cc5a 100644
--- a/packages/backend-plugin-api/src/services/system/types.ts
+++ b/packages/backend-plugin-api/src/services/system/types.ts
@@ -76,23 +76,27 @@ export function createServiceRef<T>(options: {
   id: string;
   scope?: 'plugin';
   defaultFactory?: (
-    service: ServiceRef<T>,
+    service: ServiceRef<T, 'plugin'>,
   ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
 }): ServiceRef<T, 'plugin'>;
 export function createServiceRef<T>(options: {
   id: string;
   scope: 'root';
   defaultFactory?: (
-    service: ServiceRef<T>,
+    service: ServiceRef<T, 'root'>,
   ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
 }): ServiceRef<T, 'root'>;
 export function createServiceRef<T>(options: {
   id: string;
   scope?: 'plugin' | 'root';
-  defaultFactory?: (
-    service: ServiceRef<T>,
-  ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>;
-}): ServiceRef<T, 'plugin' | 'root'> {
+  defaultFactory?:
+    | ((
+        service: ServiceRef<T, 'plugin'>,
+      ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>)
+    | ((
+        service: ServiceRef<T, 'root'>,
+      ) => Promise<ServiceFactory<T> | (() => ServiceFactory<T>)>);
+}): ServiceRef<T> {
   const { id, scope = 'plugin', defaultFactory } = options;
   return {
     id,