Corrected handling of main and sub commands.

mattstrom · May 15, 2018 · 62824f5 · 62824f5
1 parent 2bc2152
commit 62824f5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "commander-ts",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "TypeScript decorators that enhance commander",
   "keywords": [
     "command line",

diff --git a/src/decorators/command.decorator.ts b/src/decorators/command.decorator.ts
@@ -21,10 +21,21 @@ export function command(): MethodDecorator {
 				}, chain);
 			}
 
-			chain.action((...args) => {
+			chain.action(async (...args) => {
 				const context = args[args.length - 1];
 				const cmdArgs = args.slice(0, args.length - 1);
-				target[propertyKey].apply(context, cmdArgs);
+
+				try {
+					const result = target[propertyKey].apply(target, cmdArgs);
+
+					if (result instanceof Promise) {
+						await result;
+					}
+				} catch {
+					process.exit(1);
+				} finally {
+					process.exit(0);
+				}
 			});
 		} catch (e) {
 			console.error(e.message);