fix(assert): accept abstract classes

denoland · Sep 16, 2024 · f658829 · f658829
1 parent 05b6d7e
commit f658829
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 19 deletions.
diff --git a/assert/instance_of.ts b/assert/instance_of.ts
@@ -6,9 +6,7 @@ import { AssertionError } from "./assertion_error.ts";
 // deno-lint-ignore no-explicit-any
 export type AnyConstructor = new (...args: any[]) => any;
 /** Gets constructor type */
-export type GetConstructorType<T extends AnyConstructor> = T extends // deno-lint-ignore no-explicit-any
-new (...args: any) => infer C ? C
-  : never;
+export type GetConstructorType<T extends AnyConstructor> = InstanceType<T>;
 
 /**
  * Make an assertion that `obj` is an instance of `type`.
@@ -27,11 +25,14 @@ new (...args: any) => infer C ? C
  * @param expectedType The expected class constructor.
  * @param msg The optional message to display if the assertion fails.
  */
-export function assertInstanceOf<T extends AnyConstructor>(
+export function assertInstanceOf<
+  // deno-lint-ignore no-explicit-any
+  T extends abstract new (...args: any[]) => any,
+>(
   actual: unknown,
   expectedType: T,
   msg = "",
-): asserts actual is GetConstructorType<T> {
+): asserts actual is InstanceType<T> {
   if (actual instanceof expectedType) return;
 
   const msgSuffix = msg ? `: ${msg}` : ".";

diff --git a/assert/instance_of_test.ts b/assert/instance_of_test.ts
@@ -7,12 +7,15 @@ Deno.test({
     class TestClass1 {}
     class TestClass2 {}
     class TestClass3 {}
+    abstract class AbstractTestClass {}
+    class ConcreteTestClass extends AbstractTestClass {}
 
     // Regular types
     assertInstanceOf(new Date(), Date);
     assertInstanceOf(new Number(), Number);
     assertInstanceOf(Promise.resolve(), Promise);
     assertInstanceOf(new TestClass1(), TestClass1);
+    assertInstanceOf(new ConcreteTestClass(), AbstractTestClass);
 
     // Throwing cases
     assertThrows(

diff --git a/assert/is_error.ts b/assert/is_error.ts
@@ -29,7 +29,7 @@ import { stripAnsiCode } from "@std/internal/styles";
 export function assertIsError<E extends Error = Error>(
   error: unknown,
   // deno-lint-ignore no-explicit-any
-  ErrorClass?: new (...args: any[]) => E,
+  ErrorClass?: abstract new (...args: any[]) => E,
   msgMatches?: string | RegExp,
   msg?: string,
 ): asserts error is E {

diff --git a/assert/not_instance_of.ts b/assert/not_instance_of.ts
@@ -23,7 +23,7 @@ import { assertFalse } from "./false.ts";
 export function assertNotInstanceOf<A, T>(
   actual: A,
   // deno-lint-ignore no-explicit-any
-  unexpectedType: new (...args: any[]) => T,
+  unexpectedType: abstract new (...args: any[]) => T,
   msg?: string,
 ): asserts actual is Exclude<A, T> {
   const msgSuffix = msg ? `: ${msg}` : ".";

diff --git a/assert/rejects.ts b/assert/rejects.ts
@@ -49,22 +49,22 @@ export function assertRejects(
 export function assertRejects<E extends Error = Error>(
   fn: () => PromiseLike<unknown>,
   // deno-lint-ignore no-explicit-any
-  ErrorClass: new (...args: any[]) => E,
+  ErrorClass: abstract new (...args: any[]) => E,
   msgIncludes?: string,
   msg?: string,
 ): Promise<E>;
 export async function assertRejects<E extends Error = Error>(
   fn: () => PromiseLike<unknown>,
   errorClassOrMsg?:
     // deno-lint-ignore no-explicit-any
-    | (new (...args: any[]) => E)
+    | (abstract new (...args: any[]) => E)
     | string,
   msgIncludesOrMsg?: string,
   msg?: string,
 ): Promise<E | Error | unknown> {
   // deno-lint-ignore no-explicit-any
-  let ErrorClass: (new (...args: any[]) => E) | undefined = undefined;
-  let msgIncludes: string | undefined = undefined;
+  let ErrorClass: (abstract new (...args: any[]) => E) | undefined;
+  let msgIncludes: string | undefined;
   let err;
 
   if (typeof errorClassOrMsg !== "string") {
@@ -73,8 +73,7 @@ export async function assertRejects<E extends Error = Error>(
       errorClassOrMsg.prototype instanceof Error ||
       errorClassOrMsg.prototype === Error.prototype
     ) {
-      // deno-lint-ignore no-explicit-any
-      ErrorClass = errorClassOrMsg as new (...args: any[]) => E;
+      ErrorClass = errorClassOrMsg;
       msgIncludes = msgIncludesOrMsg;
     }
   } else {

diff --git a/assert/throws.ts b/assert/throws.ts
@@ -52,22 +52,22 @@ export function assertThrows(
 export function assertThrows<E extends Error = Error>(
   fn: () => unknown,
   // deno-lint-ignore no-explicit-any
-  ErrorClass: new (...args: any[]) => E,
+  ErrorClass: abstract new (...args: any[]) => E,
   msgIncludes?: string,
   msg?: string,
 ): E;
 export function assertThrows<E extends Error = Error>(
   fn: () => unknown,
   errorClassOrMsg?:
     // deno-lint-ignore no-explicit-any
-    | (new (...args: any[]) => E)
+    | (abstract new (...args: any[]) => E)
     | string,
   msgIncludesOrMsg?: string,
   msg?: string,
 ): E | Error | unknown {
   // deno-lint-ignore no-explicit-any
-  let ErrorClass: (new (...args: any[]) => E) | undefined = undefined;
-  let msgIncludes: string | undefined = undefined;
+  let ErrorClass: (abstract new (...args: any[]) => E) | undefined;
+  let msgIncludes: string | undefined;
   let err;
 
   if (typeof errorClassOrMsg !== "string") {
@@ -76,8 +76,7 @@ export function assertThrows<E extends Error = Error>(
       errorClassOrMsg?.prototype instanceof Error ||
       errorClassOrMsg?.prototype === Error.prototype
     ) {
-      // deno-lint-ignore no-explicit-any
-      ErrorClass = errorClassOrMsg as new (...args: any[]) => E;
+      ErrorClass = errorClassOrMsg;
       msgIncludes = msgIncludesOrMsg;
     } else {
       msg = msgIncludesOrMsg;