[[FEAT]] Add support for ES6 imports (#3)

Chore: Updates the ts runtime to ts2

README.md

@@ -32,7 +32,7 @@ server.terminate(function(err, terminatedByTimeout) {
 Or if you are using TypeScript:
 ```typescript
 import * as http from 'http';
-import enableTerminate = require('server-terminate');
+import enableTerminate from 'server-terminate';
 
 let server: http.Server = http.createServer(function onRequest(req: http.ServerRequest, res: http.ServerResponse) {
     // Do your stuff here

index.d.ts

@@ -1,6 +1,15 @@
-import * as http from 'http';
+/**
+ * Allow terminating an HTTP server in an orderly fashion
+ */
+import { Server } from 'http';
 
-declare function enableTerminate(server: http.Server, opts?: Options): http.Server;
+interface enableTerminateSignature {
+    /** Adds the `terminate` function to the provided server instance  */
+    (server: Server, opts?: Options): Server;
+    default: enableTerminateSignature;
+}
+
+declare var enableTerminate: enableTerminateSignature;
 export = enableTerminate;
 
 interface Options {
@@ -9,6 +18,12 @@ interface Options {
 
 declare module 'http' {
     export interface Server {
+        /** 
+         * Terminates the server in an orderly fashion by
+         *  - closing keep-alive connections that are not being used by any HTTP request.
+         *  - waiting for running HTTP requests to finish before closing their connections.
+         *  - closing connections with running HTTP requests after the provided timeout 
+         */
         terminate(cb: (err: Error, terminatedByTimeout: boolean) => void): Server;
     }
 }

index.js

@@ -25,8 +25,12 @@
  */
 
 'use strict';
-
-module.exports = function enableTerminate(server, opts) {
+module.exports = enableTerminate;
+// Support for ES6 imports.
+// Now you can make `import enableTerminate from 'enable-terminate'`
+// and get a reference to this function
+enableTerminate.default = enableTerminate;
+function enableTerminate(server, opts) {
   opts = opts || {};
   opts.timeout = opts.timeout || 30 * 1000;
 
@@ -101,4 +105,4 @@ module.exports = function enableTerminate(server, opts) {
   };
 
   return server;
-};
+}

package.json

@@ -30,6 +30,7 @@
     "close"
   ],
   "devDependencies": {
+    "@types/node": "^6.0.40",
     "chai": "^3.5.0",
     "conventional-changelog-cli": "^1.2.0",
     "eslint": "^2.13.1",
@@ -38,7 +39,6 @@
     "tartare": "^1.0.2",
     "tslint": "^3.15.1",
     "tslint-config-typings": "^0.2.3",
-    "typescript": "^1.8.10",
-    "typings": "^1.3.3"
+    "typescript": "^2.0.3"
   }
 }

test/server-terminate.typings.ts

@@ -1,5 +1,6 @@
 import * as http from 'http';
-import enableTerminate = require('../');
+import enableTerminate from '..';
+import enableTerminate2 = require('..');
 
 let server: http.Server = http.createServer(function onRequest(req: http.ServerRequest, res: http.ServerResponse) {
     res.writeHead(200);
@@ -13,4 +14,15 @@ server.listen(8080);
 server.terminate((err, terminatedByTimeout) => {
     // You get here when all connections have been closed
     console.log('Server terminated. terminatedByTimeout:', terminatedByTimeout);  // tslint:disable-line no-console
+
+    server = enableTerminate2(server);
+    server = enableTerminate2(server, {});
+    server = enableTerminate2(server, {timeout: 2000});
+    server.listen(8080);
+
+    server.terminate((err, terminatedByTimeout) => {
+        // You get here when all connections have been closed
+        console.log('Server terminated2. terminatedByTimeout:', terminatedByTimeout);  // tslint:disable-line no-console
+    });
+
 });