From eb2af0d0e33b9a7f1133201c2a2cec8430cbf326 Mon Sep 17 00:00:00 2001 From: Jakub Jirutka Date: Tue, 16 Jul 2019 23:48:02 +0200 Subject: [PATCH] [@types/trouter]: Update types for version 3.1 (#36839) See https://github.com/lukeed/trouter/compare/v3.0.2..v3.1.0 --- types/trouter/index.d.ts | 26 +++++++++++++------------- types/trouter/trouter-tests.ts | 19 +++++++++++++++++++ 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/types/trouter/index.d.ts b/types/trouter/index.d.ts index 435a611971..387305d937 100644 --- a/types/trouter/index.d.ts +++ b/types/trouter/index.d.ts @@ -1,4 +1,4 @@ -// Type definitions for trouter 3.0 +// Type definitions for trouter 3.1 // Project: https://github.com/lukeed/trouter // Definitions by: Markus Lanz // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped @@ -48,31 +48,31 @@ declare namespace Trouter { } declare class Trouter { - use(pattern: string, ...handlers: T[]): this; + use(pattern: string | RegExp, ...handlers: T[]): this; find(method: Trouter.HTTPMethod, url: string): Trouter.FindResult; - add(method: Trouter.HTTPMethod, pattern: string, ...handlers: T[]): this; + add(method: Trouter.HTTPMethod, pattern: string | RegExp, ...handlers: T[]): this; - all(pattern: string, ...handlers: T[]): this; + all(pattern: string | RegExp, ...handlers: T[]): this; - get(pattern: string, ...handlers: T[]): this; + get(pattern: string | RegExp, ...handlers: T[]): this; - head(pattern: string, ...handlers: T[]): this; + head(pattern: string | RegExp, ...handlers: T[]): this; - patch(pattern: string, ...handlers: T[]): this; + patch(pattern: string | RegExp, ...handlers: T[]): this; - options(pattern: string, ...handlers: T[]): this; + options(pattern: string | RegExp, ...handlers: T[]): this; - connect(pattern: string, ...handlers: T[]): this; + connect(pattern: string | RegExp, ...handlers: T[]): this; - delete(pattern: string, ...handlers: T[]): this; + delete(pattern: string | RegExp, ...handlers: T[]): this; - trace(pattern: string, ...handlers: T[]): this; + trace(pattern: string | RegExp, ...handlers: T[]): this; - post(pattern: string, ...handlers: T[]): this; + post(pattern: string | RegExp, ...handlers: T[]): this; - put(pattern: string, ...handlers: T[]): this; + put(pattern: string | RegExp, ...handlers: T[]): this; } export = Trouter; diff --git a/types/trouter/trouter-tests.ts b/types/trouter/trouter-tests.ts index 80346e3d79..0ff620be53 100644 --- a/types/trouter/trouter-tests.ts +++ b/types/trouter/trouter-tests.ts @@ -31,22 +31,41 @@ if (fresult.params.id) { // Full API const full = new Trouter(); full.all('/somepattern', 'a handler'); +full.all(/^[/]somepattern$/, 'a handler'); full.get('/somepattern', 'a handler'); +full.get(/^[/]somepattern$/, 'a handler'); full.head('/somepattern', 'a handler'); +full.head(/^[/]somepattern$/, 'a handler'); full.patch('/somepattern', 'a handler'); +full.patch(/^[/]somepattern$/, 'a handler'); full.options('/somepattern', 'a handler'); +full.options(/^[/]somepattern$/, 'a handler'); full.connect('/somepattern', 'a handler'); +full.connect(/^[/]somepattern$/, 'a handler'); full.delete('/somepattern', 'a handler'); +full.delete(/^[/]somepattern$/, 'a handler'); full.trace('/somepattern', 'a handler'); +full.trace(/^[/]somepattern$/, 'a handler'); full.post('/somepattern', 'a handler'); +full.post(/^[/]somepattern$/, 'a handler'); full.put('/somepattern', 'a handler'); +full.put(/^[/]somepattern$/, 'a handler'); full.add('GET', '/somepatternm', 'a handler'); +full.add('GET', /^[/]somepattern$/, 'a handler'); full.add('HEAD', '/somepatternm', 'a handler'); +full.add('HEAD', /^[/]somepattern$/, 'a handler'); full.add('PATCH', '/somepatternm', 'a handler'); +full.add('PATCH', /^[/]somepattern$/, 'a handler'); full.add('OPTIONS', '/somepatternm', 'a handler'); +full.add('OPTIONS', /^[/]somepattern$/, 'a handler'); full.add('CONNECT', '/somepatternm', 'a handler'); +full.add('CONNECT', /^[/]somepattern$/, 'a handler'); full.add('DELETE', '/somepatternm', 'a handler'); +full.add('DELETE', /^[/]somepattern$/, 'a handler'); full.add('TRACE', '/somepatternm', 'a handler'); +full.add('TRACE', /^[/]somepattern$/, 'a handler'); full.add('POST', '/somepatternm', 'a handler'); +full.add('POST', /^[/]somepattern$/, 'a handler'); full.add('PUT', '/somepatternm', 'a handler'); +full.add('PUT', /^[/]somepattern$/, 'a handler');