@mpis/monorepo 0.0.3 → 0.0.5

package/src/common/cmd.build.ts

@@ -1,6 +1,8 @@
 import { argv } from '@idlebox/args/default';
+import { prettyPrintError, registerGlobalLifecycle, toDisposable } from '@idlebox/common';
 import { logger } from '@idlebox/logger';
 import { shutdown } from '@idlebox/node';
+import { debugMode } from './args.js';
 import { createMonorepoObject } from './workspace.js';
 
 export async function runBuild() {
@@ -11,17 +13,36 @@ export async function runBuild() {
 
 	const repo = await createMonorepoObject();
 
-	repo.onStateChange(() => {
-		if (process.stderr.isTTY) process.stderr.write('\x1Bc');
+	if (!debugMode) {
+		repo.onStateChange(() => {
+			if (process.stderr.isTTY) process.stderr.write('\x1Bc');
+
+			repo.printScreen();
+		});
+	}
+
+	let completed = false;
+	registerGlobalLifecycle(
+		toDisposable(() => {
+			if (debugMode) {
+				repo.printScreen();
+			} else {
+				if (process.stderr.isTTY) process.stderr.write('\x1Bc');
+				repo.printScreen();
+			}
+			if (!completed && !process.exitCode) {
+				process.exitCode = 1;
+			}
+		}),
+	);
 
-		repo.printScreen();
-	});
 	try {
 		await repo.startup();
 
 		logger.success('Monorepo started successfully');
+		completed = true;
 	} catch (error: any) {
-		console.error(error.message);
+		prettyPrintError('monorepo build', error);
 		shutdown(1);
 	}
 }

package/src/common/cmd.watch.ts

@@ -1,8 +1,10 @@
 import { argv } from '@idlebox/args/default';
+import { prettyPrintError, registerGlobalLifecycle } from '@idlebox/common';
 import { logger } from '@idlebox/logger';
 import { shutdown } from '@idlebox/node';
-import { createMonorepoObject } from './workspace.js';
+import { debugMode } from './args.js';
 import { startUi } from './user-interactive.js';
+import { createMonorepoObject } from './workspace.js';
 
 export async function runWatch() {
 	if (argv.unused().length) {
@@ -11,19 +13,39 @@ export async function runWatch() {
 	}
 
 	const repo = await createMonorepoObject();
+	const cls = process.stderr.isTTY && !debugMode;
+
+	registerGlobalLifecycle(repo);
 
 	startUi(repo);
 
 	process.on('SIGPIPE', () => {
-		process.stderr.write('\x1Bc');
+		if (cls) process.stderr.write('\x1Bc');
 		logger.info`SIGPIPE received, printing current state...`;
 		repo.printScreen();
 	});
-	repo.onStateChange(() => {
-		process.stderr.write('\x1Bc');
-		repo.printScreen();
-	});
 
-	await repo.startup();
-	shutdown(1);
+	if (!debugMode) {
+		repo.onStateChange(() => {
+			if (cls && !repo.hasDisposed) process.stderr.write('\x1Bc');
+			logger.info`State changed, printing current state...`;
+			repo.printScreen();
+		});
+	}
+
+	try {
+		await repo.startup();
+	} catch (e: any) {
+		if (debugMode) {
+			if (cls && !repo.hasDisposed) process.stderr.write('\x1Bc');
+			repo.printScreen();
+		}
+		prettyPrintError('watch mode error', e);
+		shutdown(1);
+	}
+
+	if (cls && !repo.hasDisposed) process.stderr.write('\x1Bc');
+	repo.printScreen();
+
+	// logger.fatal`watch mode exited`;
 }

package/src/common/constants.ts

@@ -1,6 +1,6 @@
 import { logger } from '@idlebox/logger';
 import { findUpUntilSync } from '@idlebox/node';
-import { dirname } from 'path';
+import { dirname } from 'node:path';
 
 export const initialWorkingDirectory = process.cwd();
 

package/src/common/user-interactive.ts

@@ -5,7 +5,7 @@ import type { IPnpmMonoRepo } from './workspace.js';
 export async function startUi(_repo: IPnpmMonoRepo) {
 	registerGlobalLifecycle(
 		toDisposable(async () => {
-			logger.error`Exiting...`;
+			logger.error`(not error, not implemented) Exiting...`;
 		}),
 	);
 }

package/src/common/workspace.ts

@@ -1,6 +1,6 @@
 import { createWorkspace, type IPackageInfo, type MonorepoWorkspace } from '@build-script/monorepo-lib';
 import { AsyncDisposable, Emitter, isWindows, PathArray } from '@idlebox/common';
-import { logger, type IMyLogger } from '@idlebox/logger';
+import { CSI, logger, type IMyLogger } from '@idlebox/logger';
 import { getEnvironment } from '@idlebox/node';
 import { CompileError, ModeKind, ProcessIPCClient, WorkersManager } from '@mpis/server';
 import { RigConfig, type IRigConfig } from '@rushstack/rig-package';
@@ -27,6 +27,7 @@ class PnpmMonoRepo extends AsyncDisposable {
 	public readonly onStateChange = this._onStateChange.event;
 
 	private readonly mode: ModeKind;
+	private readonly packageToWorker = new Map<IPackageInfo, ProcessIPCClient>();
 
 	constructor(
 		public readonly logger: IMyLogger,
@@ -43,7 +44,6 @@ class PnpmMonoRepo extends AsyncDisposable {
 
 		this.mode = currentCommand === 'watch' ? ModeKind.Watch : ModeKind.Build;
 		this.workersManager = new WorkersManager(this.mode, logger);
-		this.workersManager._register(this);
 	}
 
 	async initialize() {
@@ -56,7 +56,7 @@ class PnpmMonoRepo extends AsyncDisposable {
 			if (exec) {
 				this.workersManager.addWorker(exec, project.devDependencies);
 			} else {
-				this.workersManager.addEmptyWorker(project.packageJson.name);
+				this.workersManager.addEmptyNode(project.packageJson.name);
 			}
 		}
 	}
@@ -66,19 +66,18 @@ class PnpmMonoRepo extends AsyncDisposable {
 	}
 
 	async startup() {
-		this.workersManager.finalize();
+		const graph = this.workersManager.finalize();
 		// this.dump();
-		await this.workersManager.startup();
+		graph._register(this);
+		await graph.startup();
 	}
 
 	private makeExecuter(watchMode: boolean, project: IPackageInfo): undefined | ProcessIPCClient {
 		if (project.packageJson.scripts?.watch === undefined) {
-			this.logger
-				.fatal`project ${project.packageJson.name} does not have a "watch" script. If it doesn't need, specify a empty string.`;
+			this.logger.fatal`project ${project.packageJson.name} does not have a "watch" script. If it doesn't need, specify a empty string.`;
 		}
 		if (project.packageJson.scripts?.build === undefined) {
-			this.logger
-				.fatal`project ${project.packageJson.name} does not have a "build" script. If it doesn't need, specify a empty string.`;
+			this.logger.fatal`project ${project.packageJson.name} does not have a "build" script. If it doesn't need, specify a empty string.`;
 		}
 		const script = watchMode ? project.packageJson.scripts.watch : project.packageJson.scripts.build;
 
@@ -101,7 +100,7 @@ class PnpmMonoRepo extends AsyncDisposable {
 
 		exec.onFailure((e) => {
 			if (e instanceof CompileError) {
-				this.errorMessages.set(project, e.message + '\n' + (e.output ?? 'no output from process'));
+				this.errorMessages.set(project, `${e.message}\n${e.output ?? 'no output from process'}`);
 			} else {
 				this.errorMessages.set(project, e.stack || e.message);
 			}
@@ -118,6 +117,9 @@ class PnpmMonoRepo extends AsyncDisposable {
 		exec.onTerminate(() => {
 			this._onStateChange.fireNoError();
 		});
+
+		this.packageToWorker.set(project, exec);
+
 		return exec;
 	}
 
@@ -125,11 +127,27 @@ class PnpmMonoRepo extends AsyncDisposable {
 		if (this.errorMessages.size === 0) return '';
 		let output = '';
 
-		const flush_line = ' '.repeat(process.stderr.columns || 80);
+		const lWidth = process.stderr.columns || 80;
+
+		const barC = '48;5;185';
+		const textC = '38;5;13';
+
+		function buildLine(txt: string) {
+			let psize = 4 + 2 + txt.length + 2;
+			if (psize >= lWidth) {
+				txt = txt.slice(Math.max(lWidth - 20), 20);
+				psize = 4 + 2 + txt.length + 2;
+			}
+			return `\n${CSI}${barC}m    ${CSI}0;${textC}m  ${txt}  ${CSI}0${barC}m${' '.repeat(lWidth - psize)}${CSI}0m\n`;
+		}
+
 		for (const [project, text] of this.errorMessages.entries()) {
-			output += `\n\x1B[48;5;1m${flush_line}\r    \x1B[0;38;5;9;1m  below is output of ${project.packageJson.name}  \x1B[0m\n`;
-			output += text;
-			output += `\x1B[48;5;1m${flush_line}\r    \x1B[0;38;5;9;1m  ending output of ${project.packageJson.name}  \x1B[0m\n`;
+			const block = text.replace(/^\s*\n/, '').trimEnd();
+			const exec = this.packageToWorker.get(project)!;
+			output += buildLine(`[@mpis/monorepo] below is output in project ${project.packageJson.name}: ${exec.commandline.join(' ')}`);
+			output += ``;
+			output += `\n${block}\n`.replace('\x1bc', '').replace(/^/gm, `${CSI}${barC}m ${CSI}0m `);
+			output += buildLine(`[@mpis/monorepo] ending output in project ${project.packageJson.name}`);
 		}
 		return output;
 	}
@@ -163,11 +181,14 @@ class PnpmMonoRepo extends AsyncDisposable {
 	}
 
 	dump(depth: number = 0) {
+		const graph = this.workersManager.finalize();
+		let graphTxt: string;
 		if (depth <= 0) {
-			return this.workersManager.formatDebugList();
+			graphTxt = graph.debugFormatList();
 		} else {
-			return this.workersManager.formatDebugGraph(depth);
+			graphTxt = graph.debugFormatGraph(depth);
 		}
+		return graphTxt + '\n' + graph.debugFormatSummary();
 	}
 
 	printScreen() {