From e02b8523a1f3ea4f6788de1dee5727e43ad9a053 Mon Sep 17 00:00:00 2001 From: Lukas Elmer Date: Thu, 29 Nov 2018 17:29:43 +0100 Subject: [PATCH 1/4] improve superagent.agent() typing --- types/superagent/index.d.ts | 2 +- types/superagent/superagent-tests.ts | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts index 971cc3c4c2..261ea99bed 100644 --- a/types/superagent/index.d.ts +++ b/types/superagent/index.d.ts @@ -45,7 +45,7 @@ declare namespace request { // tslint:disable-next-line:unified-signatures (method: string, url: string): SuperAgentRequest; - agent(): SuperAgent; + agent(): this & Request & SuperAgent; serialize: { [type: string]: Serializer }; parse: { [type: string]: Parser }; } diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts index c063c819be..2e13d5b90a 100644 --- a/types/superagent/superagent-tests.ts +++ b/types/superagent/superagent-tests.ts @@ -421,3 +421,15 @@ request .get('/echo') .use(echoPlugin) .end(); + +async function testDefaultOptions() { + // Default options for multiple requests + const agentWithDefaultOptions = request.agent() + .use(() => null) + .auth('digest', 'secret', {type:'auto'}); + + await agentWithDefaultOptions.get('/with-plugin-and-auth'); + await agentWithDefaultOptions.get('/also-with-plugin-and-auth'); +} + +testDefaultOptions(); From bf07afd86497cc8195477b8be5e904f830514159 Mon Sep 17 00:00:00 2001 From: Lukas Elmer Date: Thu, 29 Nov 2018 17:34:25 +0100 Subject: [PATCH 2/4] improve formatting and whitespaces --- types/superagent/superagent-tests.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts index 2e13d5b90a..44ef7cf773 100644 --- a/types/superagent/superagent-tests.ts +++ b/types/superagent/superagent-tests.ts @@ -424,9 +424,10 @@ request async function testDefaultOptions() { // Default options for multiple requests - const agentWithDefaultOptions = request.agent() + const agentWithDefaultOptions = request + .agent() .use(() => null) - .auth('digest', 'secret', {type:'auto'}); + .auth('digest', 'secret', { type: 'auto' }); await agentWithDefaultOptions.get('/with-plugin-and-auth'); await agentWithDefaultOptions.get('/also-with-plugin-and-auth'); From 09cf6f908a2bd4d341d80a89aa735d52fd5ad8a9 Mon Sep 17 00:00:00 2001 From: Lukas Elmer Date: Thu, 29 Nov 2018 17:36:21 +0100 Subject: [PATCH 3/4] update header --- types/superagent/index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts index 261ea99bed..c10ff467bb 100644 --- a/types/superagent/index.d.ts +++ b/types/superagent/index.d.ts @@ -6,6 +6,7 @@ // Shrey Jain // Alec Zopf // Adam Haglund +// Lukas Elmer // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.2 From 1e39558ee2231ad3df45859b81031da4d6425042 Mon Sep 17 00:00:00 2001 From: Lukas Elmer Date: Tue, 4 Dec 2018 08:27:55 +0100 Subject: [PATCH 4/4] Remove redundant typing --- types/superagent/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts index c10ff467bb..7c1898cdc2 100644 --- a/types/superagent/index.d.ts +++ b/types/superagent/index.d.ts @@ -46,7 +46,7 @@ declare namespace request { // tslint:disable-next-line:unified-signatures (method: string, url: string): SuperAgentRequest; - agent(): this & Request & SuperAgent; + agent(): this & Request; serialize: { [type: string]: Serializer }; parse: { [type: string]: Parser }; }