[INTERNAL] Refactored a few modules

lib/cli/commands/init.js

@@ -7,7 +7,7 @@ const initCommand = {
 
 initCommand.lazyRequireDependencies = async function() {
 	return {
-		validate: require("../../utils/validate"),
+		fsHelper: require("../../utils/fsHelper"),
 		init: require("../../init/init"),
 		promisify: require("util").promisify,
 		path: require("path"),
@@ -17,11 +17,11 @@ initCommand.lazyRequireDependencies = async function() {
 };
 
 initCommand.handler = async function() {
-	const {validate, init, promisify, path, fs, jsYaml} = initCommand.lazyRequireDependencies();
+	const {fsHelper, init, promisify, path, fs, jsYaml} = initCommand.lazyRequireDependencies();
 	const writeFile = promisify(fs.writeFile);
 	try {
 		const yamlPath = path.resolve("./ui5.yaml");
-		if (await validate.exists(yamlPath)) {
+		if (await fsHelper.exists(yamlPath)) {
 			throw new Error("Initialization not possible: ui5.yaml already exists");
 		}
 

lib/cli/commands/serve.js

@@ -68,13 +68,16 @@ serve.handler = function(argv = {}) {
 			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}) => {
+
+		if (!serverConfig.h2) {
+			return {serverConfig, tree};
+		} else {
+			return 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";

lib/init/init.js

@@ -2,7 +2,7 @@ const {promisify} = require("util");
 const path = require("path");
 const fs = require("fs");
 const readFile = promisify(fs.readFile);
-const validate = require("../utils/validate");
+const fsHelper = require("../utils/fsHelper");
 
 /**
  * Reads the package.json file and returns its content
@@ -87,7 +87,7 @@ async function init({cwd = "./"} = {}) {
 		throw new Error("Initialization not possible: Missing 'name' in package.json");
 	}
 
-	const [hasWebapp, hasSrc, hasTest] = await validate.pathsExist(["webapp", "src", "test"], cwd);
+	const [hasWebapp, hasSrc, hasTest] = await fsHelper.pathsExist(["webapp", "src", "test"], cwd);
 	projectConfig.type = getProjectType(hasWebapp, hasSrc, hasTest);
 
 	return projectConfig;

test/lib/cli/commands/init.js

@@ -1,7 +1,7 @@
 const {test} = require("ava");
 const sinon = require("sinon");
 const initCommand = require("../../../../lib/cli/commands/init");
-const validate = require("../../../../lib/utils/validate");
+const fsHelper = require("../../../../lib/utils/fsHelper");
 const path = require("path");
 const promisify = require("util").promisify;
 const init = require("../../../../lib/init/init");
@@ -17,12 +17,12 @@ test.serial("Writes ui5.yaml to fs", async (t) => {
 	type: application`;
 
 	const pathStub = sinon.stub(path, "resolve").returns(ui5YamlPath);
-	const validateStub = sinon.stub(validate, "exists").resolves(false);
+	const fsHelperStub = sinon.stub(fsHelper, "exists").resolves(false);
 	const initStub = sinon.stub(init, "init").resolves({});
 	const safeDumpYamlStub = sinon.stub(jsYaml, "safeDump").returns(ui5Yaml);
 	const fsWriteFileStub = sinon.stub(fs, "writeFile").callsArgWith(2);
 	const lazyRequireStub = sinon.stub(initCommand, "lazyRequireDependencies").returns({
-		validate: validate,
+		fsHelper: fsHelper,
 		init: init,
 		promisify: promisify,
 		path: path,
@@ -35,7 +35,7 @@ test.serial("Writes ui5.yaml to fs", async (t) => {
 	t.is(fsWriteFileStub.getCall(0).args[0], ui5YamlPath, "Passes yaml path to write the yaml file to");
 	t.is(fsWriteFileStub.getCall(0).args[1], ui5Yaml, "Passes yaml content to write to fs");
 
-	validateStub.restore();
+	fsHelperStub.restore();
 	pathStub.restore();
 	initStub.restore();
 	safeDumpYamlStub.restore();
@@ -45,7 +45,7 @@ test.serial("Writes ui5.yaml to fs", async (t) => {
 
 // FIXME: stubbing process leads to errors, need to be fixed
 // test.serial("Error: throws if ui5.yaml already exists", async (t) => {
-// 	const fileExistsStub = sinon.stub(validate, "exists").resolves(true);
+// 	const fileExistsStub = sinon.stub(fsHelper, "exists").resolves(true);
 // 	const processExitStub = sinon.stub(process, "exit");
 
 // 	await initCommand.handler();

test/lib/utils/validate.js → test/lib/utils/fsHelper.js

@@ -1,12 +1,12 @@
 const {test} = require("ava");
-const {exists, pathsExist} = require("../../../lib/utils/validate");
+const {exists, pathsExist} = require("../../../lib/utils/fsHelper");
 
-test("validates if directory or file exists", async (t) => {
+test("check if directory or file exists", async (t) => {
 	t.is(await exists("./test/fixtures/init/application/ui5.yaml"), true, "ui5.yaml found in path");
 	t.is(await exists("./test/fixtures/init"), true, "directory exists in path");
 });
 
-test("validate if list of paths exist", async (t) => {
+test("check if list of paths exist", async (t) => {
 	t.deepEqual(await pathsExist(["src", "test"], "./test/fixtures/init/library"), [true, true], "paths do exist");
 });