chore(js-toolkit): polish build scripts

Due to the addition of new projects I've had to fix some issues so I've
taken advantage of that and polished the build scripts, which were a bit
outdated and rusty.

Author: izaera

projects/js-toolkit/package.json

@@ -12,7 +12,7 @@
 		"preversion": "echo Cannot version private package; false",
 		"qa": "node scripts/qa/index.js",
 		"test": "liferay-workspace-scripts test",
-		"watch": "node scripts/watch.js"
+		"watch": "node scripts/watch.js --all"
 	},
 	"version": "0.1.0"
 }

projects/js-toolkit/scripts/build.js

@@ -8,24 +8,35 @@
 const copyfiles = require('copyfiles');
 const path = require('path');
 
+const abort = require('./util/abort');
 const getProjectDirectories = require('./util/getProjectDirectories');
-const {runNodeBin} = require('./util/run');
+const spawn = require('./util/spawn');
 
-function copyAssets() {
+function compile(dir) {
+	try {
+		spawn('yarn', ['run', 'tsc'], {cwd: dir});
+	}
+	catch (error) {
+		throw new Error(
+			`Compilation failed for project: ${path.basename(dir)}`
+		);
+	}
+}
+
+async function copyAssets(dir) {
 	return new Promise((resolve) => {
-		console.log('copy:', path.basename(process.cwd()));
+		const dirUp = dir.split(path.sep).length;
 
 		copyfiles(
-			['src/**/*', 'lib/'],
+			[`${dir}/src/**/*`, `${dir}/lib/`],
 			{
 				all: true,
 				exclude: ['**/*.js', '**/*.ts', '**/__tests__/**/*'],
-				up: 1,
+				up: dirUp + 1,
 			},
 			(error) => {
 				if (error) {
-					console.error(error);
-					process.exit(1);
+					abort(error);
 				}
 
 				resolve();
@@ -34,38 +45,28 @@ function copyAssets() {
 	});
 }
 
-async function main() {
-	if (process.argv.includes('--all')) {
-		const projectDirectories = getProjectDirectories();
-
-		for (const projectDirectory of getProjectDirectories()) {
-			process.chdir(projectDirectory);
+async function build(dir) {
+	try {
+		console.log('copy:', path.basename(dir));
 
-			try {
-				await copyAssets();
-			}
-			finally {
-				process.chdir('../..');
-			}
-		}
+		await copyAssets(dir);
 
-		console.log('build:', path.basename(process.cwd()));
+		console.log('compile:', path.basename(dir));
 
-		runNodeBin.pipe(
-			'tsc',
-			'--build',
-			...projectDirectories.map((projectDirectory) =>
-				path.join(projectDirectory, 'tsconfig.json')
-			)
-		);
+		compile(dir);
 	}
-	else {
-		await copyAssets();
-
-		console.log('build:', path.basename(process.cwd()));
-
-		runNodeBin.pipe('tsc');
+	catch (error) {
+		abort(error.toString());
 	}
 }
 
-main();
+(async () => {
+	if (process.argv.includes('--all')) {
+		for (const projectDir of getProjectDirectories()) {
+			await build(projectDir);
+		}
+	}
+	else {
+		build(path.resolve('.'));
+	}
+})();

projects/js-toolkit/scripts/clean.js

@@ -5,82 +5,58 @@
 
 /* eslint-disable no-console */
 
-const fs = require('fs-extra');
+const fs = require('fs');
 const path = require('path');
 
-const {abort} = require('./util/report');
+const abort = require('./util/abort');
+const getProjectDirectories = require('./util/getProjectDirectories');
 
-function hasValidOutDir(json) {
+function assertValidOutDir(json) {
 	const {compilerOptions} = json;
 
-	if (!compilerOptions) {
-		return false;
+	if (!compilerOptions || !compilerOptions.outDir) {
+		abort('No compilerOptions.outDir found in tsconfig.json');
 	}
 
-	const {outDir} = compilerOptions;
-
-	if (!outDir) {
-		return false;
-	}
-
-	const absOutDir = path.resolve(outDir);
+	const absOutDir = path.resolve(compilerOptions.outDir);
 	const projectDir = path.resolve('.');
 
 	if (path.relative(projectDir, absOutDir).startsWith('../')) {
-		return false;
+		abort('Invalid compilerOptions.outDir found in tsconfig.json');
 	}
 
 	return true;
 }
 
-function clean() {
-	console.log('clean:', path.basename(process.cwd()));
+function clean(dir) {
+	console.log('clean:', path.basename(dir));
+
+	const cwd = process.cwd();
+
+	process.chdir(dir);
 
 	try {
-		const json = fs.readJSONSync('tsconfig.json');
+		/* eslint-disable-next-line @liferay/no-dynamic-require */
+		const json = require(path.resolve(dir, 'tsconfig.json'));
 
-		if (!hasValidOutDir(json)) {
-			abort(
-				`Invalid compilerOptions.outDir found in ` +
-					`${path.basename(path.resolve('.'))}/tsconfig.json`
-			);
-		}
+		assertValidOutDir(json);
 
-		fs.removeSync(json.compilerOptions.outDir);
+		fs.rmdirSync(json.compilerOptions.outDir, {recursive: true});
+		fs.unlinkSync(path.resolve(dir, 'tsconfig.tsbuildinfo'));
 	}
 	catch (error) {
 		if (error.code !== 'ENOENT') {
 			abort(error.toString());
 		}
 	}
-
-	fs.removeSync('tsconfig.tsbuildinfo');
+	finally {
+		process.chdir(cwd);
+	}
 }
 
 if (process.argv.includes('--all')) {
-
-	// Clean all packages.
-
-	const cwd = process.cwd();
-
-	for (const entry of fs.readdirSync('packages', {withFileTypes: true})) {
-		if (entry.isDirectory()) {
-			const pkg = path.join('packages', entry.name);
-
-			try {
-				process.chdir(pkg);
-
-				clean();
-			}
-			finally {
-				process.chdir(cwd);
-			}
-		}
-	}
+	getProjectDirectories().forEach(clean);
 }
 else {
-
-	// Clean just the current working directory.
-
-	clean();
+	clean(path.resolve('.'));
 }

projects/js-toolkit/scripts/topological.js

@@ -3,12 +3,8 @@
  * SPDX-License-Identifier: LGPL-3.0-or-later
  */
 
-function abort(...msgs) {
+module.exports = function abort(...msgs) {
 	console.error(`\n❌ ${msgs.join('\n')}\n`);
 
 	process.exit(1);
-}
-
-module.exports = {
-	abort,
 };