When using TypeScript, perform an initial build run

Fixes #27

CHANGELOG.md

@@ -1,6 +1,7 @@
 # Changelog
 
 ## __WORK_IN_PROGRESS__
+* (AlCalzone) When using TypeScript, perform an initial build run (fixes #27)
 * (AlCalzone) When formatting files, clear lines with only whitespace (fixes #30)
 * (AlCalzone) Enable resolveJsonModule for JS files (fixes #26)
 * (AlCalzone) Allow choosing quote style in JavaScript (#34)

build/cli.js

@@ -54,28 +54,45 @@ async function ask() {
     }
     return answers;
 }
+let currentStep = 0;
+let maxSteps = 1;
+function logProgress(message) {
+    console.log(ansi_colors_1.blueBright(`[${++currentStep}/${maxSteps}] ${message}...`));
+}
+/** Whether dependencies should be installed */
+const installDependencies = !yargs.argv.noInstall || !!yargs.argv.install;
+/** Whether an initial build should be performed */
+let buildTypeScript;
 /** CLI-specific functionality for creating the adapter directory */
-async function setupProject_CLI({ answers, files }) {
+async function setupProject_CLI(answers, files) {
     const rootDirName = path.basename(rootDir);
     // make sure we are working in a directory called ioBroker.<adapterName>
     const targetDir = rootDirName.toLowerCase() === `iobroker.${answers.adapterName.toLowerCase()}`
         ? rootDir : path.join(rootDir, `ioBroker.${answers.adapterName}`);
     await createAdapter_1.writeFiles(targetDir, files);
-    if (!yargs.argv.noInstall || !!yargs.argv.install) {
-        console.log(ansi_colors_1.blueBright("[2/2] Installing dependencies..."));
+    if (installDependencies) {
+        logProgress("Installing dependencies");
         await tools_1.executeCommand(tools_1.isWindows ? "npm.cmd" : "npm", ["install", "--quiet"], { cwd: targetDir });
+        if (buildTypeScript) {
+            logProgress("Compiling TypeScript");
+            await tools_1.executeCommand(tools_1.isWindows ? "npm.cmd" : "npm", ["run", "build"], { cwd: targetDir, stdout: "ignore" });
+        }
     }
+    console.log();
     console.log(ansi_colors_1.blueBright("All done! Have fun programming! ") + ansi_colors_1.red("♥"));
 }
-ask()
-    .then(async (answers) => {
-    console.log(ansi_colors_1.blueBright("[1/2] Generating files..."));
-    return {
-        answers,
-        files: await createAdapter_1.createFiles(answers),
-    };
-})
-    .then(setupProject_CLI);
+(async function main() {
+    const answers = await ask();
+    if (installDependencies) {
+        maxSteps++;
+        buildTypeScript = answers.language === "TypeScript";
+        if (buildTypeScript)
+            maxSteps++;
+    }
+    logProgress("Generating files");
+    const files = await createAdapter_1.createFiles(answers);
+    await setupProject_CLI(answers, files);
+})();
 process.on("exit", () => {
     if (fs.pathExistsSync("npm-debug.log"))
         fs.removeSync("npm-debug.log");

build/templates/tsconfig.build.json.js

@@ -9,6 +9,7 @@ module.exports = (answers => {
 	// Modified config to only compile .ts-files in the src dir
 	"compilerOptions": {
 		"allowJs": false,
+		"checkJs": false,
 		"noEmit": false,
 		"declaration": false
 	},

src/cli.ts

@@ -55,32 +55,53 @@ async function ask() {
 	return answers as Answers;
 }
 
+let currentStep: number = 0;
+let maxSteps: number = 1;
+function logProgress(message: string) {
+	console.log(blueBright(`[${++currentStep}/${maxSteps}] ${message}...`));
+}
+
+/** Whether dependencies should be installed */
+const installDependencies = !yargs.argv.noInstall || !!yargs.argv.install;
+/** Whether an initial build should be performed */
+let buildTypeScript: boolean;
+
 /** CLI-specific functionality for creating the adapter directory */
-async function setupProject_CLI({ answers, files }: { answers: Answers, files: File[] }) {
+async function setupProject_CLI(answers: Answers, files: File[]) {
 	const rootDirName = path.basename(rootDir);
 	// make sure we are working in a directory called ioBroker.<adapterName>
 	const targetDir = rootDirName.toLowerCase() === `iobroker.${answers.adapterName.toLowerCase()}`
 		? rootDir : path.join(rootDir, `ioBroker.${answers.adapterName}`)
 		;
 	await writeFiles(targetDir, files);
 
-	if (!yargs.argv.noInstall || !!yargs.argv.install) {
-		console.log(blueBright("[2/2] Installing dependencies..."));
+	if (installDependencies) {
+		logProgress("Installing dependencies");
 		await executeCommand(isWindows ? "npm.cmd" : "npm", ["install", "--quiet"], { cwd: targetDir });
+
+		if (buildTypeScript) {
+			logProgress("Compiling TypeScript");
+			await executeCommand(isWindows ? "npm.cmd" : "npm", ["run", "build"], { cwd: targetDir, stdout: "ignore" });
+		}
 	}
+	console.log();
 	console.log(blueBright("All done! Have fun programming! ") + red("♥"));
 }
 
-ask()
-	.then(async answers => {
-		console.log(blueBright("[1/2] Generating files..."));
-		return {
-			answers,
-			files: await createFiles(answers),
-		};
-	})
-	.then(setupProject_CLI)
-	;
+(async function main() {
+	const answers = await ask();
+
+	if (installDependencies) {
+		maxSteps++;
+		buildTypeScript = answers.language === "TypeScript";
+		if (buildTypeScript) maxSteps++;
+	}
+
+	logProgress("Generating files");
+	const files = await createFiles(answers);
+
+	await setupProject_CLI(answers, files);
+})();
 
 process.on("exit", () => {
 	if (fs.pathExistsSync("npm-debug.log")) fs.removeSync("npm-debug.log");

src/templates/tsconfig.build.json.ts

@@ -12,6 +12,7 @@ export = (answers => {
 	// Modified config to only compile .ts-files in the src dir
 	"compilerOptions": {
 		"allowJs": false,
+		"checkJs": false,
 		"noEmit": false,
 		"declaration": false
 	},

test/baselines/adapter_TS_TSLint_Tabs_DoubleQuotes_MIT/tsconfig.build.json

@@ -3,6 +3,7 @@
 	// Modified config to only compile .ts-files in the src dir
 	"compilerOptions": {
 		"allowJs": false,
+		"checkJs": false,
 		"noEmit": false,
 		"declaration": false
 	},