From d8c065817f6483d4791611d624d66ff47efa2f41 Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Mon, 14 Oct 2019 14:47:33 -0400 Subject: NodeCallback: New type to simplify callback declarations Just trying to reduce some boilerplate. I kept this as a separate commit to illustrate clearly how this type of things is done since we'll have people learning TypeScript. * src/types/misc.ts (NodeCallback): New type. * src/server/dapi/TokenedDataApi.ts: Use it. * test/server/dapi/TokenedDataApiTest.ts: Use it. --- test/server/dapi/TokenedDataApiTest.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'test') diff --git a/test/server/dapi/TokenedDataApiTest.ts b/test/server/dapi/TokenedDataApiTest.ts index bd2cfc8..558f699 100644 --- a/test/server/dapi/TokenedDataApiTest.ts +++ b/test/server/dapi/TokenedDataApiTest.ts @@ -121,9 +121,9 @@ describe( 'TokenedDataApi', () => const mock_dapi = new class implements DataApi { request( - given_data: DataApiInput, - callback: ( e: Error|null, data: DataApiResult|null ) => void, - given_id: string + given_data: DataApiInput, + callback: NodeCallback, + given_id: string, ): this { expect( given_data ).to.equal( expected_data ); @@ -141,7 +141,7 @@ describe( 'TokenedDataApi', () => return mock_tstore; }; - const callback = ( e: Error|null, data: DataApiResult|null ) => + const callback: NodeCallback = ( e, data ) => { expect( tok_completed ).to.be.true; @@ -197,8 +197,8 @@ describe( 'TokenedDataApi', () => const mock_dapi = new class implements DataApi { request( - _: any, - callback: ( e: Error|null, data: DataApiResult|null ) => void, + _: any, + callback: NodeCallback, ) { callback( expected_err, null ); @@ -206,7 +206,7 @@ describe( 'TokenedDataApi', () => } }; - const callback = ( e: Error|null, data: DataApiResult|null ) => + const callback: NodeCallback = ( e, data ) => { expect( data ).to.equal( null ); expect( e ).to.equal( expected_err ); -- cgit v1.2.1