fix: allow combined service implementation resolvers usage (types)

Wroud · Nov 20, 2024 · a85caa4 · a85caa4
1 parent 06ae156
commit a85caa4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/packages/@wroud/di-react/src/useService.ts b/packages/@wroud/di-react/src/useService.ts
@@ -1,7 +1,11 @@
-import type { SingleServiceType } from "@wroud/di/types";
+import type { ServiceType } from "@wroud/di/types";
 import { useServiceIterator } from "./useServiceIterator.js";
 import { single } from "@wroud/di";
+import { isServiceTypeResolver } from "@wroud/di/service-type-resolvers/BaseServiceTypeResolver.js";
 
-export function useService<T>(type: SingleServiceType<T>): T {
-  return useServiceIterator(single(type));
+export function useService<T>(type: ServiceType<T>): T {
+  if (!isServiceTypeResolver(type)) {
+    type = single(type);
+  }
+  return useServiceIterator(type);
 }
diff --git a/packages/@wroud/di-react/src/useServices.ts b/packages/@wroud/di-react/src/useServices.ts
@@ -1,7 +1,7 @@
-import type { SingleServiceType } from "@wroud/di/types";
+import type { ServiceType } from "@wroud/di/types";
 import { useServiceIterator } from "./useServiceIterator.js";
 import { all } from "@wroud/di";
 
-export function useServices<T>(type: SingleServiceType<T>): T[] {
+export function useServices<T>(type: ServiceType<T>): T[] {
   return useServiceIterator(all(type));
 }