From 34f4572c07bc123202555cd3879bef26c53da2b2 Mon Sep 17 00:00:00 2001 From: aereal Date: Fri, 7 Jun 2019 04:59:30 +0900 Subject: [PATCH] [express-serve-static-core] Fix listen callback type (#35883) * [express-serve-static-core] Add tests * [express-serve-static-core] listen's callback can take some parameters * [express-serve-static-core] Add a definitions by section --- .../express-serve-static-core-tests.ts | 6 +++++- types/express-serve-static-core/index.d.ts | 11 ++++++----- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/types/express-serve-static-core/express-serve-static-core-tests.ts b/types/express-serve-static-core/express-serve-static-core-tests.ts index 4c2f0919c2..f2593c5e41 100644 --- a/types/express-serve-static-core/express-serve-static-core-tests.ts +++ b/types/express-serve-static-core/express-serve-static-core-tests.ts @@ -1,3 +1,7 @@ import * as express from 'express-serve-static-core'; -// null test file - everything should be tested from express.d.ts and serve-static.d.ts +const app: express.Application = {} as any; +app.listen(3000); +app.listen(3000, (err: any) => { + // no-op error callback +}); diff --git a/types/express-serve-static-core/index.d.ts b/types/express-serve-static-core/index.d.ts index e954a97a1d..fc100717d6 100644 --- a/types/express-serve-static-core/index.d.ts +++ b/types/express-serve-static-core/index.d.ts @@ -5,6 +5,7 @@ // Kacper Polak // Satana Charuwichitratana // Sami Jaber +// aereal // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped // TypeScript Version: 2.2 @@ -996,11 +997,11 @@ export interface Application extends EventEmitter, IRouter, Express.Application * http.createServer(app).listen(80); * https.createServer({ ... }, app).listen(443); */ - listen(port: number, hostname: string, backlog: number, callback?: () => void): http.Server; - listen(port: number, hostname: string, callback?: () => void): http.Server; - listen(port: number, callback?: () => void): http.Server; - listen(callback?: () => void): http.Server; - listen(path: string, callback?: () => void): http.Server; + listen(port: number, hostname: string, backlog: number, callback?: (...args: any[]) => void): http.Server; + listen(port: number, hostname: string, callback?: (...args: any[]) => void): http.Server; + listen(port: number, callback?: (...args: any[]) => void): http.Server; + listen(callback?: (...args: any[]) => void): http.Server; + listen(path: string, callback?: (...args: any[]) => void): http.Server; listen(handle: any, listeningListener?: () => void): http.Server; router: string;