[INTERNAL] test: improved test coverage

index.js

@@ -1,5 +1,5 @@
 const ui5Cli = {
-	init: require("./lib/init/init")
+	init: require("./lib/init/init").init
 };
 
 module.exports = ui5Cli;

lib/cli/commands/build.js

@@ -64,37 +64,18 @@ function handleBuild(argv) {
 	const logger = require("@ui5/logger");
 
 	const command = argv._[argv._.length - 1];
-	let dev = false;
-	let selfContained = false;
-
-	switch (command) {
-	case "build":
-	case "preload":
-		// Default
-		// nothing to do (yet)
-		break;
-	case "dev":
-		dev = true;
-		break;
-	case "self-contained":
-		selfContained = true;
-		break;
-	default:
-		throw new Error(`Unhandled command "${command}`);
-	}
-
 	logger.setShowProgress(true);
 
 	normalizer.generateProjectTree({
 		translator: argv.translator,
 		configPath: argv.config
 	}).then(function(tree) {
 		return builder.build({
-			tree,
+			tree: tree,
 			destPath: argv.dest,
 			buildDependencies: argv.all,
-			dev,
-			selfContained,
+			dev: command === "dev",
+			selfContained: command === "self-contained",
 			devExcludeProject: argv["dev-exclude-project"],
 			includedTasks: argv["include-task"],
 			excludedTasks: argv["exclude-task"]

lib/cli/commands/init.js

@@ -1,44 +1,29 @@
+const validate = require("../../utils/validate");
+const init = require("../../init/init");
+const {promisify} = require("util");
+const path = require("path");
+const fs = require("fs");
+const jsYaml = require("js-yaml");
+
 // Init
-const init = {
+const initCommand = {
 	command: "init",
 	describe: "Initialize the UI5 Build and Development Tooling configuration for an application or library project.",
 	middlewares: [require("../middlewares/base.js")]
 };
 
-init.handler = async function(argv) {
-	const init = require("../../init/init");
-	const {promisify} = require("util");
-	const path = require("path");
-	const fs = require("fs");
-	const stat = promisify(fs.stat);
+initCommand.handler = async function() {
 	const writeFile = promisify(fs.writeFile);
-	const safeDumpYaml = require("js-yaml").safeDump;
-
-	async function exists(filePath) {
-		try {
-			await stat(filePath);
-			return true;
-		} catch (err) {
-			// "File or directory does not exist"
-			if (err.code === "ENOENT") {
-				return false;
-			} else {
-				throw err;
-			}
-		}
-	}
-
 	try {
 		const yamlPath = path.resolve("./ui5.yaml");
-		if (await exists(yamlPath)) {
+		if (await validate.exists(yamlPath)) {
 			throw new Error("Initialization not possible: ui5.yaml already exists");
 		}
 
-		const projectConfig = await init();
-		const yaml = safeDumpYaml(projectConfig);
+		const projectConfig = await init.init();
+		const yaml = jsYaml.safeDump(projectConfig);
 
 		await writeFile(yamlPath, yaml);
-
 		console.log(`Wrote ui5.yaml to ${yamlPath}:\n`);
 		console.log(yaml);
 	} catch (err) {
@@ -47,4 +32,4 @@ init.handler = async function(argv) {
 	}
 };
 
-module.exports = init;
+module.exports = initCommand;

lib/cli/commands/serve.js

@@ -46,8 +46,12 @@ serve.builder = function(cli) {
 			"Listen to port 1337 and launch default browser with http://localhost:1337/test/QUnit.html");
 };
 
-serve.handler = function(argv) {
+serve.openUrl = async function(browserUrl) {
 	const opn = require("opn");
+	return opn(browserUrl);
+};
+
+serve.handler = function(argv = {}) {
 	const normalizer = require("@ui5/project").normalizer;
 	const ui5Server = require("@ui5/server");
 	const server = ui5Server.server;
@@ -60,34 +64,36 @@ serve.handler = function(argv) {
 			port: argv.port === undefined ? argv.h2 ? 8443 : 8080 : argv.port,
 			changePortIfInUse: argv.port === undefined, // only change if port isn't explicitly set
 			h2: argv.h2,
-			acceptRemoteConnections: argv["accept-remote-connections"]
+			acceptRemoteConnections: !!argv.acceptRemoteConnections,
+			cert: argv.h2 ? argv.cert : undefined,
+			key: argv.h2 ? argv.key : undefined
 		};
+		return !serverConfig.h2
+			? {serverConfig, tree}
+			: ui5Server.sslUtil.getSslCertificate(serverConfig.key, serverConfig.cert).then(({key, cert}) => {
+				serverConfig.key = key;
+				serverConfig.cert = cert;
+				return {serverConfig, tree};
+			});
+	}).then(({serverConfig, tree}) => {
+		return server.serve(tree, serverConfig).then(function({h2, port}) {
+			const protocol = h2 ? "https" : "http";
+			let browserUrl = protocol + "://localhost:" + port;
+			console.log("Server started");
+			console.log("URL: " + browserUrl);
 
-		return Promise.resolve().then(function() {
-			if (serverConfig.h2) {
-				return ui5Server.sslUtil.getSslCertificate().then(({key, cert}) => {
-					serverConfig.key = key;
-					serverConfig.cert = cert;
-					return serverConfig;
-				});
-			} else {
-				return serverConfig;
-			}
-		}).then((serverConfig) => {
-			return server.serve(tree, serverConfig).then(function({h2, port}) {
-				const protocol = h2 ? "https" : "http";
-				let browserUrl = protocol + "://localhost:" + port;
-				if (argv.open !== undefined) {
+			if (argv.open !== undefined) {
+				if (typeof argv.open === "string") {
 					let relPath = argv.open || "/";
 					if (!relPath.startsWith("/")) {
 						relPath = "/" + relPath;
 					}
 					browserUrl += relPath;
-					opn(browserUrl);
 				}
-				console.log("Server started");
-				console.log("URL: " + browserUrl);
-			});
+				serve.openUrl(browserUrl);
+			}
+
+			return browserUrl;
 		});
 	}).catch(function(err) {
 		console.error(err);

lib/cli/commands/tree.js

@@ -19,7 +19,7 @@ tree.builder = function(cli) {
 		.example("ui5 tree --json > tree.json", "Pipes the dependency tree into a new file \"tree.json\"");
 };
 
-tree.handler = function(argv) {
+tree.handler = function(argv = {}) {
 	const normalizer = require("@ui5/project").normalizer;
 	const treeify = require("treeify");
 
@@ -37,13 +37,9 @@ tree.handler = function(argv) {
 	}
 
 	p.then(function(tree) {
-		if (argv.json) {
-			// Formatted JSON
-			console.log(JSON.stringify(tree, null, 4));
-		} else {
-			// Formatted tree
-			console.log(treeify.asTree(tree, true));
-		}
+		const output = argv.json ? JSON.stringify(tree, null, 4) : treeify.asTree(tree, true);
+		console.log(output);
+		return output;
 	}).catch(function(err) {
 		console.error(err);
 		process.exit(1);

lib/cli/commands/versions.js

@@ -8,7 +8,7 @@ const versions = {
 };
 
 const NOT_FOUND = "===(not installed)";
-const getVersion = (pkg) => {
+versions.getVersion = (pkg) => {
 	try {
 		const packageInfo = require(`${pkg}/package.json`);
 		return packageInfo.version || NOT_FOUND;
@@ -17,15 +17,14 @@ const getVersion = (pkg) => {
 	}
 };
 
-versions.handler = (argv) => {
+versions.handler = () => {
 	try {
-		const cliVersion =
-			require("../../../package.json").version || NOT_FOUND;
-		const builderVersion = getVersion("@ui5/builder");
-		const serverVersion = getVersion("@ui5/server");
-		const fsVersion = getVersion("@ui5/fs");
-		const projectVersion = getVersion("@ui5/project");
-		const loggerVersion = getVersion("@ui5/logger");
+		const cliVersion = versions.getVersion("../../..");
+		const builderVersion = versions.getVersion("@ui5/builder");
+		const serverVersion = versions.getVersion("@ui5/server");
+		const fsVersion = versions.getVersion("@ui5/fs");
+		const projectVersion = versions.getVersion("@ui5/project");
+		const loggerVersion = versions.getVersion("@ui5/logger");
 		console.log(`
 	@ui5/cli:      ${cliVersion}
 	@ui5/builder:  ${builderVersion}

lib/cli/middlewares/base.js

@@ -1,21 +1,13 @@
+const logger = require("./logger");
 /**
  * Base middleware for CLI commands.
  *
  * This middleware should be executed for every CLI command to enable basic features (e.g. logging).
  * @param {Object} argv The CLI arguments
  * @returns {Object} Data to be appended to argv
  */
-module.exports = function(argv) {
-	if (argv.verbose || argv.loglevel) {
-		const logger = require("@ui5/logger");
-		if (argv.loglevel) {
-			logger.setLevel(argv.loglevel);
-		}
-		if (argv.verbose) {
-			logger.setLevel("verbose");
-			logger.getLogger("cli:middlewares:base").verbose(`using node version ${process.version}`);
-		}
-	}
+module.exports = function(argv = {}) {
+	if (Object.keys(argv).length === 0) return null;
 
-	return {};
+	logger.init(argv);
 };

lib/cli/middlewares/logger.js

@@ -0,0 +1,22 @@
+/**
+ * Logger middleware
+ *
+ * Logger middleware used as one of default middlewares by tooling
+ * @param {Object} argv logger arguments
+ * @returns {Object} logger instance or null
+ */
+function init(argv = {}) {
+	if (!argv.verbose && !argv.loglevel) return null;
+
+	const logger = require("@ui5/logger");
+	if (argv.loglevel) {
+		logger.setLevel(argv.loglevel);
+	}
+	if (argv.verbose) {
+		logger.setLevel("verbose");
+		logger.getLogger("cli:middlewares:base").verbose(`using node version ${process.version}`);
+	}
+	return logger;
+}
+
+module.exports = {init};

lib/init/init.js

@@ -1,39 +1,8 @@
 const {promisify} = require("util");
 const path = require("path");
 const fs = require("fs");
-const stat = promisify(fs.stat);
 const readFile = promisify(fs.readFile);
-
-/**
- * Checks if a file or path exists
- *
- * @private
- * @param {string} filePath Path to check
- * @returns {Promise} Promise resolving with true if the file or path exists
- */
-async function exists(filePath) {
-	try {
-		await stat(filePath);
-		return true;
-	} catch (err) {
-		// "File or directory does not exist"
-		if (err.code === "ENOENT") {
-			return false;
-		} else {
-			throw err;
-		}
-	}
-}
-
-/**
- * Checks if a list of paths exists
- *
- * @private
- * @param {Array} paths List of paths to check
- * @param {string} cwd Current working directory
- * @returns {Promise} Resolving with an array of booleans for each path
- */
-const pathsExist = async (paths, cwd) => await Promise.all(paths.map((p) => exists(path.join(cwd, p))));
+const validate = require("../utils/validate");
 
 /**
  * Reads the package.json file and returns its content
@@ -118,10 +87,12 @@ async function init({cwd = "./"} = {}) {
 		throw new Error("Initialization not possible: Missing 'name' in package.json");
 	}
 
-	const [hasWebapp, hasSrc, hasTest] = await pathsExist(["webapp", "src", "test"], cwd);
+	const [hasWebapp, hasSrc, hasTest] = await validate.pathsExist(["webapp", "src", "test"], cwd);
 	projectConfig.type = getProjectType(hasWebapp, hasSrc, hasTest);
 
 	return projectConfig;
 }
 
-module.exports = init;
+module.exports = {
+	init: init
+};

lib/utils/validate.js

@@ -0,0 +1,43 @@
+const {promisify} = require("util");
+const fs = require("fs");
+const stat = promisify(fs.stat);
+const path = require("path");
+
+/**
+ * Checks if a file or path exists
+ *
+ * @private
+ * @param {string} filePath Path to check
+ * @returns {Promise} Promise resolving with true if the file or path exists
+ */
+async function exists(filePath) {
+	try {
+		await stat(filePath);
+		return true;
+	} catch (err) {
+		// "File or directory does not exist"
+		if (err.code === "ENOENT") {
+			return false;
+		} else {
+			throw err;
+		}
+	}
+}
+
+/**
+ * Checks if a list of paths exists
+ *
+ * @private
+ * @param {Array} paths List of paths to check
+ * @param {string} cwd Current working directory
+ * @returns {Promise} Resolving with an array of booleans for each path
+ */
+async function pathsExist(paths, cwd) {
+	return await Promise.all(paths.map((p) => exists(path.join(cwd, p))));
+}
+
+module.exports = {
+	exists,
+	pathsExist
+};
+