fix(output): fix #227 (#232)

output must be a separate argument
add test
remove incorrectly committed generated files

Author: sokra

bin/config-yargs.js

@@ -123,6 +123,12 @@ module.exports = function(yargs) {
 				group: MODULE_GROUP,
 				requiresArg: true
 			},
+			output: {
+				alias: "o",
+				describe: "The output path and file for compilation assets",
+				group: OUTPUT_GROUP,
+				requiresArg: true
+			},
 			"output-path": {
 				type: "string",
 				describe: "The output path for compilation assets",
@@ -131,7 +137,6 @@ module.exports = function(yargs) {
 				requiresArg: true
 			},
 			"output-filename": {
-				alias: "o",
 				type: "string",
 				describe: "The output filename of the bundle",
 				group: OUTPUT_GROUP,

bin/convert-argv.js

@@ -6,14 +6,6 @@ var prepareOptions = require("./prepareOptions");
 module.exports = function(yargs, argv, convertOptions) {
 	var options = [];
 	// Shortcuts
-	if (argv.o) {
-		argv["output-filename"] = path.basename(argv.o);
-
-		if (!path.isAbsolute(argv.o)) {
-			argv["output-path"] = path.resolve(process.cwd(), path.dirname(argv.o));
-		}
-	}
-
 	if (argv.d) {
 		argv.debug = true;
 		argv["output-pathinfo"] = true;
@@ -33,6 +25,16 @@ module.exports = function(yargs, argv, convertOptions) {
 			argv.mode = "production";
 		}
 	}
+
+	if (argv.output) {
+		let output = argv.output;
+		if (!path.isAbsolute(argv.o)) {
+			output = path.resolve(process.cwd(), output);
+		}
+		argv["output-filename"] = path.basename(output);
+		argv["output-path"] = path.dirname(output);
+	}
+
 	var configFileLoaded = false;
 	var configFiles = [];
 	var extensions = Object.keys(interpret.extensions).sort(function(a, b) {

test/binCases/output/output-argument/index.js

@@ -0,0 +1 @@
+module.exports = "index";

test/binCases/output/output-argument/stdin.js

@@ -0,0 +1,9 @@
+"use strict";
+
+module.exports = function testAssertions(code, stdout, stderr) {
+	expect(code).toBe(0);
+	expect(stdout).toEqual(expect.anything());
+	expect(stdout[4]).toContain("bundle.js");
+	expect(stdout[5]).toMatch(/index\.js.*\{0\}/);
+	expect(stderr).toHaveLength(0);
+};

test/binCases/output/output-argument/test.opts

@@ -0,0 +1,3 @@
+./index.js
+-o ../../../js/bin/output/output-argument/bundle.js
+--target async-node