Merge pull request #4 from mrbar42/v0.3.1

fix ts type file, add more strict ts testing

index.d.ts

@@ -1,4 +1,4 @@
-type SignalListener = (done: () => void, event: any, signal: string) => (undefined | Promise<any>)
+type SignalListener = (done: () => void, event: any, signal: string) => (undefined | Promise<void> | Promise<any> | Promise<Error>)
 type cancelSubscription = () => void
 
 

index.js

@@ -1,5 +1,5 @@
 // +----------------------------------------------------------------------+
-// | node-graceful v0.3.0 (https://github.com/mrbar42/node-graceful)      |
+// | node-graceful v0.3.1 (https://github.com/mrbar42/node-graceful)      |
 // | Graceful process exit manager.                                       |
 // |----------------------------------------------------------------------|
 'use strict';
@@ -170,3 +170,7 @@ Graceful.prototype._invokeListener = function _invokeListener(listener, quit, ev
 
 let graceful = new Graceful();
 module.exports = graceful;
+
+// monkey patch exports to support both old & new & Typescript module systems
+module.exports.Graceful = graceful;
+module.exports.default = graceful;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-graceful",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Graceful process exit manager. allows waiting on multiple async services.",
   "main": "index",
   "repository": {
@@ -18,15 +18,18 @@
   ],
   "scripts": {
     "test:unit": "node tests/runner",
-    "test:lint": "tslint -c tslint.json --fix tests/*.ts",
-    "test": "npm run test:unit && npm run test:lint",
+    "test:unit-ts": "ts-node tests/wait-for-multiple-promise.ts",
+    "test:lint": "tsc && tslint -c tslint.json --fix tests/*.ts",
+    "test": "npm run test:lint && npm run test:unit && npm run test:unit-ts",
     "transpile": "tsc --allowJs --outFile es5/index.js --pretty index.js ",
-    "prepublish": "npm run test && npm run transpile"
+    "prepublishOnly": "npm run test && npm run transpile"
   },
   "author": "mrbar42",
   "license": "WTFPL",
   "devDependencies": {
+    "@types/node": "9.6.0",
+    "ts-node": "5.0.1",
     "tslint": "5.9.1",
-    "typescript": "2.6.2"
+    "typescript": "2.7.2"
   }
 }

tests/TypeScript.ts

@@ -1,12 +1,18 @@
-import {Graceful} from "../";
+import Graceful from "../";
 
-const listener = (done, event, signal) => {
+const listener = (done: () => {}, event: any, signal: string) => {
     done();
 };
 
-const listenerPromise = (done, event, signal) => Promise.resolve();
-
+const listenerPromise = (done: () => {}, event: any, signal: string) => Promise.resolve("abc");
 Graceful.on("exit", listener);
+const listenerPromise1 = (done: () => {}, event: any, signal: string) => Promise.resolve({});
+Graceful.on("exit", listenerPromise1);
+const listenerPromise2 = (done: () => {}, event: any, signal: string) => new Promise((resolve) => {
+    resolve();
+});
+Graceful.on("exit", listenerPromise2);
+
 Graceful.on("exit", listener, true);
 Graceful.on("exit", listenerPromise);
 Graceful.on("exit", listenerPromise, true);

tests/wait-for-multiple-promise.ts

@@ -0,0 +1,26 @@
+"use strict";
+
+import Graceful from "../";
+
+const handlerSuccess = () => {
+    return new Promise((resolve) =>  {
+        setTimeout(() => {
+            process.stdout.write("ok");
+            resolve();
+        }, 100);
+    });
+};
+
+const handlerReject = () => {
+    return new Promise((resolve, reject) => {
+        setTimeout(() => {
+            process.stdout.write("ok");
+            reject();
+        }, 200);
+    });
+};
+
+Graceful.on("exit", handlerSuccess);
+Graceful.on("exit", handlerReject);
+
+Graceful.exit();

tsconfig.json

@@ -0,0 +1,17 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "target": "es2015",
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "noEmit": true,
+    "alwaysStrict": true,
+    "preserveConstEnums": true,
+    "sourceMap": false,
+    "moduleResolution": "Node",
+    "declaration": true,
+    "lib": [
+      "es2015"
+    ]
+  }
+}

tslint.json

@@ -1,9 +1,6 @@
 {
-    "defaultSeverity": "error",
-    "extends": [
-        "tslint:recommended"
-    ],
-    "jsRules": {},
-    "rules": {},
-    "rulesDirectory": []
-}
+  "defaultSeverity": "error",
+  "extends": [
+    "tslint:recommended"
+  ]
+}