From 519cc049553cfe5c761fbd75c68f66b8ad0b990c Mon Sep 17 00:00:00 2001 From: Chad Engler Date: Tue, 26 Oct 2021 14:20:11 -0700 Subject: [PATCH 1/2] Fix assert types to accurately reflect implementation --- index.d.ts | 41 ++++++++--------------------------------- index.test-d.ts | 4 ++-- 2 files changed, 10 insertions(+), 35 deletions(-) diff --git a/index.d.ts b/index.d.ts index 2e1db21..5eb0fb2 100644 --- a/index.d.ts +++ b/index.d.ts @@ -7,39 +7,14 @@ declare module 'fastify' { } interface Assert { - (condition: boolean, code?: number | string, message?: string): string; - ok(condition: boolean, code?: number | string, message?: string): string; - equal(a: T, b: U, code?: number | string, message?: string): string; - notEqual( - a: T, - b: U, - code?: number | string, - message?: string - ): string; - strictEqual( - a: T, - b: U, - code?: number | string, - message?: string - ): string; - notStrictEqual( - a: T, - b: U, - code?: number | string, - message?: string - ): string; - deepEqual( - a: T, - b: U, - code?: number | string, - message?: string - ): string; - notDeepEqual( - a: T, - b: U, - code?: number | string, - message?: string - ): string; + (condition: unknown, code?: number | string, message?: string): asserts condition; + ok(condition: unknown, code?: number | string, message?: string): asserts condition; + equal(a: unknown, b: unknown, code?: number | string, message?: string): void; + notEqual(a: unknown, b: unknown, code?: number | string, message?: string): void; + strictEqual(a: unknown, b: T, code?: number | string, message?: string): asserts a is T; + notStrictEqual(a: unknown, b: unknown, code?: number | string, message?: string): void; + deepEqual(a: unknown, b: unknown, code?: number | string, message?: string): void; + notDeepEqual(a: unknown, b: unknown, code?: number | string, message?: string): void; } interface FastifyInstance { diff --git a/index.test-d.ts b/index.test-d.ts index d50689f..bbcc775 100644 --- a/index.test-d.ts +++ b/index.test-d.ts @@ -21,9 +21,9 @@ app.get('/', async (req, reply) => { }) app.get('/', async (req, reply) => { - expectType(app.assert.equal(1, 2)) + expectType(app.assert.equal(1, 2)) }) app.get('/', async (req, reply) => { expectType>(app.to(new Promise(resolve => resolve()))) -}) \ No newline at end of file +}) From 50859f78c429ba4f402eab3c8d1953b6490ff567 Mon Sep 17 00:00:00 2001 From: Chad Engler Date: Tue, 26 Oct 2021 14:24:26 -0700 Subject: [PATCH 2/2] whitespace --- index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 5eb0fb2..81ea4eb 100644 --- a/index.d.ts +++ b/index.d.ts @@ -7,7 +7,7 @@ declare module 'fastify' { } interface Assert { - (condition: unknown, code?: number | string, message?: string): asserts condition; + (condition: unknown, code?: number | string, message?: string): asserts condition; ok(condition: unknown, code?: number | string, message?: string): asserts condition; equal(a: unknown, b: unknown, code?: number | string, message?: string): void; notEqual(a: unknown, b: unknown, code?: number | string, message?: string): void;