fix: correctly resolve infer type from abstract classes

aurelia · Aug 27, 2024 · 230e7bd · 230e7bd
1 parent 40c8d85
commit 230e7bd
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 16 deletions.
diff --git a/src/api-test.ts b/src/api-test.ts
@@ -6,6 +6,17 @@ declare const assertType: <R, U = [R]>(result: [R] extends U ? R : never) => voi
 
 function testResolve() {
 
+  function testAbstractClass() {
+    abstract class A {
+      a = 1;
+    }
+
+    const a = resolve(A);
+    if (a.a === 2) {
+
+    }
+  }
+
   function testResolveSingle() {
     class A { a = 1 }
     class B { b = '2' }

diff --git a/src/container.ts b/src/container.ts
@@ -608,23 +608,25 @@ export class Container {
 }
 
 export type ResolvedValue<T> =
-  T extends { new (...args: any[]): infer R }
+  T extends (new (...args: any[]) => infer R)
     ? R
-    : T extends Factory<infer R>
-      ? (...args: unknown[]) => R
-      : T extends Lazy<infer R>
-        ? () => R
-        : T extends NewInstance<infer R>
-          ? R
-          : T extends Optional<infer R>
-            ? R | null
-            : T extends All<infer R>
-              ? R[]
-              : T extends Parent<infer R>
-                ? R | null
-                : T extends [infer T1, ...infer T2]
-                  ? [ResolvedValue<T1>, ...ResolvedValue<T2>]
-                  : T;
+    : T extends (abstract new (...args: any[]) => infer R)
+      ? R
+      : T extends Factory<infer R>
+        ? (...args: unknown[]) => R
+        : T extends Lazy<infer R>
+          ? () => R
+          : T extends NewInstance<infer R>
+            ? R
+            : T extends Optional<infer R>
+              ? R | null
+              : T extends All<infer R>
+                ? R[]
+                : T extends Parent<infer R>
+                  ? R | null
+                  : T extends [infer T1, ...infer T2]
+                    ? [ResolvedValue<T1>, ...ResolvedValue<T2>]
+                    : T;
 
 /**
  * Resolve a key, or list of keys based on the current container.