feat: Allow isInjectable and isInjectionToken to be used for type nar…

…rowing Signed-off-by: Sebastian Malton <[email protected]>
ogre-works · May 2, 2023 · b82c1c9 · b82c1c9
1 parent 1508ea8
commit b82c1c9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/packages/injectable/core/index.d.ts b/packages/injectable/core/index.d.ts
@@ -349,8 +349,8 @@ export const instantiationDecoratorToken: InjectionToken<
 
 export const registrationCallbackToken: RegistrationCallback;
 export const deregistrationCallbackToken: RegistrationCallback;
-export const isInjectable: (thing: any) => boolean;
-export const isInjectionToken: (thing: any) => boolean;
+export const isInjectable: (thing: unknown) => thing is Injectable<unknown, unknown, unknown>;
+export const isInjectionToken: (thing: unknown) => thing is InjectionToken<unknown, unknown>;
 
 export function createContainer(
   containerId: string,

diff --git a/packages/injectable/core/index.test-d.ts b/packages/injectable/core/index.test-d.ts
@@ -16,6 +16,8 @@ import {
   createInjectionTargetDecorator,
   SpecificInject,
   InjectionToken,
+  isInjectable,
+  isInjectionToken,
 } from '.';
 
 const di = createContainer('some-container');
@@ -45,6 +47,16 @@ const decoratorForToken = getInjectable({
   injectionToken: instantiationDecoratorToken,
 });
 
+const foo: unknown = "number";
+
+if (isInjectable(foo)) {
+  expectType<Injectable<unknown, unknown, unknown>>(foo);
+}
+
+if (isInjectionToken(foo)) {
+  expectType<InjectionToken<unknown, unknown>>(foo);
+}
+
 // given injectable without instantiation paramater and decorator targeting the injectable, typing is ok
 const someInjectableToBeDecorated = getInjectable({
   id: 'some-injectable-to-be-decorated',