wirejs-scripts 3.0.100 → 3.0.102

package/bin.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 
 import process from 'process';
+import { execSync, spawn } from 'child_process';
 import http from 'http';
-import fs from 'fs';
+import fs, { watch } from 'fs';
 import path from 'path';
-import { Worker } from 'worker_threads';
 
 import webpack from 'webpack';
 import webpackConfigure from './configs/webpack.config.js';
@@ -19,7 +19,8 @@ import { prebuildApi } from 'wirejs-resources/internal';
 
 const CWD = process.cwd();
 const getWebpackConfig = () => webpackConfigure(process.env, process.argv);
-const [_nodeBinPath, _scriptPath, action] = process.argv;
+const [_nodeBinPath, _scriptPath, action, ...actionArgs] = process.argv;
+const [subAction] = actionArgs;
 const processes = [];
 
 const logger = {
@@ -132,7 +133,7 @@ async function handleApiResponse(req, res) {
 			if (cookie.maxAge) cookieOptions.push(`Max-Age=${cookie.maxAge}`);
 			if (cookie.httpOnly) cookieOptions.push('HttpOnly');
 			if (cookie.secure) cookieOptions.push('Secure');
-			
+
 			logger.info('setting cookie', cookie.name, cookie.value, cookieOptions);
 			res.appendHeader(
 				'Set-Cookie',
@@ -196,7 +197,7 @@ async function tryStaticPath(req, res) {
  * @returns 
  */
 function byLength(a, b) {
-    return a.length - b.length;
+	return a.length - b.length;
 }
 
 /**
@@ -205,9 +206,9 @@ function byLength(a, b) {
  * @returns 
  */
 function globMatch(pattern, text) {
-    const parts = pattern.split('%');
-    const regex = new RegExp(parts.join('.+'));
-    return regex.test(text);
+	const parts = pattern.split('%');
+	const regex = new RegExp(parts.join('.+'));
+	return regex.test(text);
 }
 
 function toJSPath(path) {
@@ -236,7 +237,7 @@ function routeSSR(context, forceExt) {
 		const allHandlers = fs.readdirSync(SSR_ROOT, { recursive: true })
 			.filter(p => p.endsWith('.js'))
 			.map(p => `/${p}`)
-		;
+			;
 		const matchingHandlers = allHandlers.filter(h => globMatch(h, asJSPath));
 		const match = matchingHandlers.sort(byLength).pop();
 
@@ -308,13 +309,13 @@ async function trySSRPath(req, res) {
 					globalThis.pendingDehydrations.shift()(doc);
 					hydrationsFound++;
 				}
-	
+
 				if (hydrationsFound) {
 					const script = doc.parentNode.createElement('script');
 					script.src = asJSPath;
 					doc.parentNode.body.appendChild(script);
 				}
-	
+
 				res.setHeader('Content-type', 'text/html; charset=utf-8');
 				res.end([
 					doctype ? `<!doctype ${doctype}>\n` : '',
@@ -384,7 +385,6 @@ async function compile(watch = false) {
 	const stats = await new Promise(async (resolve, reject) => {
 		let compiler;
 		if (watch) {
-
 			const apiDir = path.join(CWD, 'api');
 			const prebuildApiWatch = await esbuild.context({
 				entryPoints: [path.join(CWD, 'api', '**', '*.ts')],
@@ -402,7 +402,7 @@ async function compile(watch = false) {
 			});
 			await prebuildApiWatch.rebuild();
 			prebuildApiWatch.watch();
-			
+
 			const prebuild = await esbuild.context({
 				entryPoints: [`${CWD}/src/**/*.ts`],
 				outdir: `${CWD}/pre-dist`,
@@ -420,14 +420,14 @@ async function compile(watch = false) {
 			}, () => {
 				console.log();
 				console.log('Compiled: http://localhost:3000/');
-			}).run(() => {});
+			}).run(() => { });
 
 			logger.log('Starting server...');
 			const server = http.createServer(handleRequest);
 			server.listen(3000).on('listening', () => {
 				console.log('Started listening on http://localhost:3000/')
 			});
-			
+
 		} else {
 			logger.log('prebundling JS');
 			await esbuild.build({
@@ -462,6 +462,62 @@ async function compile(watch = false) {
 }
 
 const engine = {
+	async ['ws-run-parallel']() {
+		const scriptName = subAction;
+		const workspaces = JSON.parse(fs.readFileSync("./package.json")).workspaces;
+		for (const workspaceDir of workspaces) {
+			const pkg = JSON.parse(fs.readFileSync(
+				path.join(workspaceDir, 'package.json'),
+				'utf8'
+			));
+			if (pkg.scripts && pkg.scripts[scriptName]) {
+				processes.push(spawn(
+					'npm',
+					['run', scriptName, '--workspace', pkg.name],
+					{ stdio: 'inherit' }
+				));
+			}
+		}
+		await new Promise(resolve => {
+			function exitGracefully() {
+				logger.log('Exiting gracefully ...');
+				processes.forEach(p => p.kill());
+				resolve();
+			}
+			process.on('SIGINT', exitGracefully);
+			process.on('SIGTERM', exitGracefully);
+		});
+	},
+
+	async ['watch']() {
+		const [directory, cmd, ...cmdArgs] = actionArgs;
+		const runWatchCommand = () => {
+			try {
+				execSync([cmd, ...cmdArgs].join(' '));
+			} catch (error) {
+				console.error(error);
+			}
+		};
+		await new Promise(resolve => {
+			runWatchCommand();
+			let debounce = undefined;
+			const watcher = fs.watch(directory, { recursive: true }, () => {
+				if (debounce) clearTimeout(debounce);
+				debounce = setTimeout(() => {
+					debounce = undefined;
+					runWatchCommand();
+				}, 250);
+			});
+			function exitGracefully() {
+				logger.log('Exiting gracefully ...');
+				watcher.close();
+				resolve();
+			}
+			process.on('SIGINT', exitGracefully);
+			process.on('SIGTERM', exitGracefully);
+		});
+	},
+
 	async build({ watch = false } = {}) {
 		logger.log('build starting');
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-scripts",
-	"version": "3.0.100",
+	"version": "3.0.102",
 	"description": "Basic build and start commands for wirejs apps",
 	"type": "module",
 	"bin": {
@@ -35,6 +35,6 @@
 		"style-loader": "^2.0.0",
 		"webpack": "^5.97.1",
 		"wirejs-dom": "^1.0.41",
-		"wirejs-resources": "^0.1.102"
+		"wirejs-resources": "^0.1.104"
 	}
 }