More mild approach

Author: redaktice

bin/express-cli.js

@@ -21,24 +21,25 @@ const _exit = process.exit;
 // TODO: Switch to a different command framework
 process.exit = exit;
 
-let _helpShown = false;
-
 // CLI
 
-around(program, 'optionMissingArgument', (fn, args) => {
+around(program, 'optionMissingArgument', function (fn, args) {
   program.outputHelp();
-  fn(...args);
+  fn.apply(this, args);
   return { args: [], unknown: [] };
 });
 
-before(program, 'outputHelp', () => {
+before(program, 'outputHelp', function () {
   // track if help was shown for unknown option
-  _helpShown = true;
+  this._helpShown = true;
 });
 
-before(program, 'unknownOption', () => {
+before(program, 'unknownOption', function () {
+  // allow unknown options if help was shown, to prevent trailing error
+  this._allowUnknownOption = this._helpShown;
+
   // show help if not yet shown
-  if (!_helpShown) {
+  if (!this._helpShown) {
     program.outputHelp();
   }
 });
@@ -92,11 +93,11 @@ function around(obj, method, fn) {
   const old = obj[method];
 
   obj[method] = function () {
-    var args = new Array(arguments.length);
+    const args = new Array(arguments.length);
     for (let i = 0; i < args.length; i++) {
       args[i] = arguments[i];
     }
-    return fn(old, args);
+    return fn.call(this, old, args);
   };
 }
 
@@ -107,9 +108,9 @@ function around(obj, method, fn) {
 function before(obj, method, fn) {
   const old = obj[method];
 
-  obj[method] = () => {
-    fn();
-    old(...arguments);
+  obj[method] = function () {
+    fn.call(this);
+    old.apply(this, arguments);
   };
 }
 
@@ -161,7 +162,7 @@ function createApplication(name, dir) {
 
   // Package
   const pkg = {
-    name: name,
+    name,
     version: '0.0.0',
     private: true,
     scripts: {
@@ -360,7 +361,7 @@ function createApplication(name, dir) {
   mkdir(dir, 'bin');
   write(path.join(dir, 'bin/www'), www.render(), MODE_0755);
 
-  var prompt = launchedFromCmd() ? '>' : '$';
+  const prompt = launchedFromCmd() ? '>' : '$';
 
   if (dir !== '.') {
     console.log();
@@ -501,7 +502,7 @@ function main() {
   }
 
   // Generate application
-  emptyDirectory(destinationPath, (empty) => {
+  emptyDirectory(destinationPath, function (empty) {
     if (empty || program.force) {
       createApplication(appName, destinationPath);
     } else {
@@ -560,7 +561,7 @@ function renamedOption(originalName, newName) {
 
 function warning(message) {
   console.error();
-  message.split('\n').forEach((line) => {
+  message.split('\n').forEach(function (line) {
     console.error('  warning: %s', line);
   });
   console.error();