From b71e2304ffb6b13d80f4efb22ad51638f3531399 Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Fri, 8 Sep 2017 16:14:07 -0500 Subject: [PATCH 1/7] Adding stoppable typings --- types/stoppable/index.d.ts | 7 +++++++ types/stoppable/stoppable-tests.ts | 8 ++++++++ types/stoppable/tsconfig.json | 22 ++++++++++++++++++++++ types/stoppable/tslint.json | 1 + 4 files changed, 38 insertions(+) create mode 100644 types/stoppable/index.d.ts create mode 100644 types/stoppable/stoppable-tests.ts create mode 100644 types/stoppable/tsconfig.json create mode 100644 types/stoppable/tslint.json diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts new file mode 100644 index 0000000000..898d633555 --- /dev/null +++ b/types/stoppable/index.d.ts @@ -0,0 +1,7 @@ +// Type definitions for stoppable 1.0 +// Project: https://github.com/hunterloftis/stoppable +// Definitions by: Eric Byers +// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped + + +export const stoppable: (server:http.Server, grace?:number) => http.Server; diff --git a/types/stoppable/stoppable-tests.ts b/types/stoppable/stoppable-tests.ts new file mode 100644 index 0000000000..ec8c50d4c4 --- /dev/null +++ b/types/stoppable/stoppable-tests.ts @@ -0,0 +1,8 @@ +import http = require('http'); +import stoppable = require('stoppable'); + +const server:http.Server = stoppable(http.createServer()); +server.stop(); + +const server2:http.Server = stoppable(http.createServer(), 10000); +server2.stop(); diff --git a/types/stoppable/tsconfig.json b/types/stoppable/tsconfig.json new file mode 100644 index 0000000000..ae018fe536 --- /dev/null +++ b/types/stoppable/tsconfig.json @@ -0,0 +1,22 @@ +{ + "compilerOptions": { + "module": "commonjs", + "lib": [ + "es6" + ], + "noImplicitAny": true, + "noImplicitThis": true, + "strictNullChecks": true, + "baseUrl": "../", + "typeRoots": [ + "../" + ], + "types": [], + "noEmit": true, + "forceConsistentCasingInFileNames": true + }, + "files": [ + "index.d.ts", + "stoppable-tests.ts" + ] +} diff --git a/types/stoppable/tslint.json b/types/stoppable/tslint.json new file mode 100644 index 0000000000..3db14f85ea --- /dev/null +++ b/types/stoppable/tslint.json @@ -0,0 +1 @@ +{ "extends": "dtslint/dt.json" } From 9d366e09b805e8c63edeb1bf713821fdea2ca0ee Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Fri, 8 Sep 2017 16:15:53 -0500 Subject: [PATCH 2/7] Removing extra line return, getting it to build on travis --- types/stoppable/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts index 898d633555..f8bf782a0b 100644 --- a/types/stoppable/index.d.ts +++ b/types/stoppable/index.d.ts @@ -3,5 +3,5 @@ // Definitions by: Eric Byers // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped - export const stoppable: (server:http.Server, grace?:number) => http.Server; + From 35f5af129678ff719071b289c6a16782b38af8bc Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Fri, 8 Sep 2017 16:20:24 -0500 Subject: [PATCH 3/7] Switching to declaring the function --- types/stoppable/index.d.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts index f8bf782a0b..d5414157b8 100644 --- a/types/stoppable/index.d.ts +++ b/types/stoppable/index.d.ts @@ -3,5 +3,6 @@ // Definitions by: Eric Byers // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -export const stoppable: (server:http.Server, grace?:number) => http.Server; +declare function stoppable(server:http.Server, grace?:number) => http.Server; +export = stoppable; From 71a142b59cc7a2bfef62a794706288ef86a64f2f Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Fri, 8 Sep 2017 16:23:01 -0500 Subject: [PATCH 4/7] Third time is the charm --- types/stoppable/index.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts index d5414157b8..a127bdc9b0 100644 --- a/types/stoppable/index.d.ts +++ b/types/stoppable/index.d.ts @@ -3,6 +3,6 @@ // Definitions by: Eric Byers // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -declare function stoppable(server:http.Server, grace?:number) => http.Server; +declare function stoppable(server:http.Server, grace?:number): http.Server; export = stoppable; From eca6b8dcf88a0117f4e4a2827cd348ee2e6e1646 Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Fri, 8 Sep 2017 16:28:32 -0500 Subject: [PATCH 5/7] TSLint fixes --- types/stoppable/index.d.ts | 4 +++- types/stoppable/stoppable-tests.ts | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts index a127bdc9b0..4f5fdcea59 100644 --- a/types/stoppable/index.d.ts +++ b/types/stoppable/index.d.ts @@ -3,6 +3,8 @@ // Definitions by: Eric Byers // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -declare function stoppable(server:http.Server, grace?:number): http.Server; +import * as http from 'http'; + +declare function stoppable(server: http.Server, grace?: number): http.Server; export = stoppable; diff --git a/types/stoppable/stoppable-tests.ts b/types/stoppable/stoppable-tests.ts index ec8c50d4c4..6a56a107b9 100644 --- a/types/stoppable/stoppable-tests.ts +++ b/types/stoppable/stoppable-tests.ts @@ -1,8 +1,8 @@ -import http = require('http'); +import * as http from 'http'; import stoppable = require('stoppable'); -const server:http.Server = stoppable(http.createServer()); +const server: http.Server = stoppable(http.createServer()); server.stop(); -const server2:http.Server = stoppable(http.createServer(), 10000); +const server2: http.Server = stoppable(http.createServer(), 10000); server2.stop(); From b223293def29c69a763b8194a634216edb9018b4 Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Fri, 8 Sep 2017 16:35:04 -0500 Subject: [PATCH 6/7] Pull in node definitions --- types/stoppable/index.d.ts | 5 +++-- types/stoppable/stoppable-tests.ts | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts index 4f5fdcea59..e3ad02919c 100644 --- a/types/stoppable/index.d.ts +++ b/types/stoppable/index.d.ts @@ -3,8 +3,9 @@ // Definitions by: Eric Byers // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -import * as http from 'http'; +/// +import { Server } from 'http'; -declare function stoppable(server: http.Server, grace?: number): http.Server; +declare function stoppable(server: Server, grace?: number): http.Server; export = stoppable; diff --git a/types/stoppable/stoppable-tests.ts b/types/stoppable/stoppable-tests.ts index 6a56a107b9..69fc576c9c 100644 --- a/types/stoppable/stoppable-tests.ts +++ b/types/stoppable/stoppable-tests.ts @@ -1,8 +1,8 @@ -import * as http from 'http'; +/// import stoppable = require('stoppable'); const server: http.Server = stoppable(http.createServer()); -server.stop(); +server.close(); const server2: http.Server = stoppable(http.createServer(), 10000); -server2.stop(); +server2.close(); From e65730f62e4c404f122db362b581d599fbd66e30 Mon Sep 17 00:00:00 2001 From: Eric Byers Date: Fri, 8 Sep 2017 16:36:07 -0500 Subject: [PATCH 7/7] Final TSLint fixes --- types/stoppable/index.d.ts | 2 +- types/stoppable/stoppable-tests.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/types/stoppable/index.d.ts b/types/stoppable/index.d.ts index e3ad02919c..395dd828c8 100644 --- a/types/stoppable/index.d.ts +++ b/types/stoppable/index.d.ts @@ -6,6 +6,6 @@ /// import { Server } from 'http'; -declare function stoppable(server: Server, grace?: number): http.Server; +declare function stoppable(server: Server, grace?: number): Server; export = stoppable; diff --git a/types/stoppable/stoppable-tests.ts b/types/stoppable/stoppable-tests.ts index 69fc576c9c..84cf826bef 100644 --- a/types/stoppable/stoppable-tests.ts +++ b/types/stoppable/stoppable-tests.ts @@ -1,4 +1,4 @@ -/// +import * as http from 'http'; import stoppable = require('stoppable'); const server: http.Server = stoppable(http.createServer());