@build-script/package-tools 0.0.3 → 0.0.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@build-script/package-tools",
   "type": "module",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "bin": {
     "package-tools": "./load.js",
     "njspkg": "./load.js"
@@ -21,14 +21,14 @@
     "source-map-support": "^0.5.21",
     "targz": "^1.0.1",
     "tiny-async-pool": "^2.1.0",
-    "@build-script/monorepo-lib": "^0.0.2",
-    "@idlebox/common": "^1.4.15",
-    "@idlebox/args": "^0.0.10",
-    "@idlebox/ensure-symlink": "^1.0.33",
-    "@idlebox/logger": "^0.0.3",
-    "@idlebox/json-edit": "^0.0.2",
-    "@idlebox/dependency-graph": "^0.0.2",
-    "@idlebox/node": "^1.4.8"
+    "@build-script/monorepo-lib": "^0.0.3",
+    "@idlebox/common": "^1.4.16",
+    "@idlebox/json-edit": "^0.0.3",
+    "@idlebox/args": "^0.0.11",
+    "@idlebox/ensure-symlink": "^1.0.34",
+    "@idlebox/logger": "^0.0.4",
+    "@idlebox/node": "^1.4.9",
+    "@idlebox/dependency-graph": "^0.0.3"
   },
   "devDependencies": {
     "@rushstack/heft": "^0.74.0",
@@ -41,10 +41,10 @@
     "@types/targz": "^1.0.5",
     "@types/tiny-async-pool": "^2.0.3",
     "@types/tinycolor2": "^1.4.6",
-    "@build-script/codegen": "^1.0.2",
-    "@build-script/single-dog-asset": "^1.0.36",
+    "@build-script/codegen": "^1.0.4",
     "@internal/local-rig": "^1.0.1",
-    "@mpis/run": "^0.0.3"
+    "@build-script/single-dog-asset": "^1.0.37",
+    "@mpis/run": "^0.0.4"
   },
   "license": "MIT",
   "author": "GongT <admin@gongt.me>",

package/src/command-file-map.generated.ts

@@ -7,7 +7,7 @@
  *  GENERATED FILE, DO NOT MODIFY
  *  这是生成的文件，千万不要修改
  * 
- * @build-script/codegen 1.0.2 - The Simple Code Generater
+ * @build-script/codegen 1.0.4 - The Simple Code Generater
  * https://github.com/GongT/baobao
  * 
  ******************************************************************************/

package/src/commands/monorepo-publish.ts

@@ -57,7 +57,7 @@ class BuildPackageJob implements IWatchEvents {
 			indexDisplay++;
 			const { length } = this.state;
 			const w = length.toFixed(0).length;
-			console.log(`📦 [${indexDisplay.toFixed(0).padStart(w)}/${length}] ${this.project.name}`);
+			console.log(`${CSI}K📦 [${indexDisplay.toFixed(0).padStart(w)}/${length}] ${this.project.name}`);
 			console.log(this.logText.join('\n'));
 			this.logText.length = 0;
 		});
@@ -65,7 +65,7 @@ class BuildPackageJob implements IWatchEvents {
 			indexDisplay++;
 			const { length } = this.state;
 			const w = length.toFixed(0).length;
-			console.log(`📦 [${indexDisplay.toFixed(0).padStart(w)}/${length}] ${this.project.name}`);
+			console.log(`${CSI}K📦 [${indexDisplay.toFixed(0).padStart(w)}/${length}] ${this.project.name}`);
 			console.log(this.logText.join('\n'));
 			prettyPrintError('❌pack failed', e);
 			this.logText.length = 0;
@@ -89,10 +89,13 @@ class BuildPackageJob implements IWatchEvents {
 		let shouldPublish = hasChange || changedFiles.length > 0;
 		let localVersion = this.project.packageJson.version;
 
+		this.log(
+			`    👀 ${changedFiles.length} 个文件有修改: ${changedFiles.slice(0, 3).join(', ')}${changedFiles.length > 3 ? ' ...' : ''}`,
+		);
 		if (hasChange) {
 			const packageJson = await pm.loadPackageJson();
 			localVersion = await increaseVersion(packageJson, remoteVersion || '0.0.0');
-			this.log(`    ✍️ 已修改本地包版本: ${localVersion}`);
+			this.log(`    ✍️  已修改本地包版本: ${localVersion}`);
 		}
 		if (!shouldPublish) {
 			this.log(`    ✨ ${CSI}38;5;10m未发现修改${CSI}0m\n`);
@@ -109,9 +112,9 @@ class BuildPackageJob implements IWatchEvents {
 		this.shouldPublish = await pm.pack(tempFile);
 
 		if (remoteVersion) {
-			this.log(`    🎈 即将发布新版本 "${this.project.packageJson.version}" 以更新远程版本 "${remoteVersion}"`);
+			this.log(`    🎈 即将发布新版本 "${localVersion}" 以更新远程版本 "${remoteVersion}"`);
 		} else {
-			this.log(`    🎈 即将发布初始版本 "${this.project.packageJson.version}"`);
+			this.log(`    🎈 即将发布初始版本 "${localVersion}"`);
 		}
 		this._onSuccess.fire();
 	}
@@ -145,7 +148,16 @@ export async function main() {
 	const projects = await workspace.listPackages();
 
 	const concurrency = argv.flag(['--debug', '-d']) > 0 ? 1 : 10;
+	if (concurrency === 1) {
+		logger.warn`由于设置了--debug参数，运行模式改为单线程`;
+	}
 	const graph = new BuilderDependencyGraph<BuildPackageJob>(concurrency, logger);
+
+	function debugSummary() {
+		const info = graph.debugFormatSummary();
+		process.stderr.write(`${CSI}K${info}\r`);
+	}
+
 	const opts = options();
 
 	const shouldPublishProjects = projects.filter((project) => {
@@ -163,20 +175,21 @@ export async function main() {
 
 	let index = 0;
 	for (const project of shouldPublishProjects) {
-		graph.addNode(
-			project.name,
-			project.devDependencies,
-			new BuildPackageJob(
-				{
-					index,
-					length: shouldPublishProjects.length,
-					options: opts,
-				},
-				project,
-				workspace,
-			),
+		const job = new BuildPackageJob(
+			{
+				index,
+				length: shouldPublishProjects.length,
+				options: opts,
+			},
+			project,
+			workspace,
 		);
 
+		job.onRunning(debugSummary);
+		job.onSuccess(debugSummary);
+		job.onFailed(debugSummary);
+		graph.addNode(project.name, project.devDependencies, job);
+
 		index++;
 	}
 

package/src/common/functions/cli.ts

@@ -74,16 +74,16 @@ export abstract class CommandDefine {
 	}
 }
 
-export const isVerbose = argv.flag('--verbose') > 0;
 export const isQuiet = argv.flag(['--silent', '-s', '--quiet']) > 0;
 export const isJsonOutput = argv.flag('--json') > 0;
 export const isHelp = argv.flag(['--help', '-h']) > 0;
 export const distTagInput = argv.single('--dist-tag') || 'latest';
 export const registryInput = argv.single('--registry') || 'detect';
-export const isDebugMode = argv.flag('--debug') > 0;
+export const isDebugMode = argv.flag(['--debug', '-d']) > 0;
+export const isVerbose = argv.flag(['--debug', '-d']) > 1;
 
 if (isVerbose && isQuiet) {
-	die('不能同时使用 --verbose 和 --quiet');
+	die(`不能同时使用 --debug 和 --quiet: ${process.argv}`);
 }
 
 export function pArgS(s: string) {

package/src/common/git/git.ts

@@ -72,4 +72,47 @@ export class GitWorkingTree {
 			return item.replace('Would remove ', '');
 		});
 	}
+
+	async fileDiff(file: string) {
+		const { stdout } = await this._exec(['diff', '--color=never', '-U0', `HEAD~1`, file]);
+		logger.verbose(stdout.trimEnd());
+		const lines = stdout.toString().trim().split('\n').slice(4);
+
+		let diff = formatChangeSideBySide('Published', 'Local');
+		let last_change = { old: '', new: '' };
+		for (const line of lines) {
+			if (line.startsWith('@@ ')) {
+				diff += formatChangeSideBySide(last_change.old, last_change.new);
+				last_change = { old: '', new: '' };
+				continue;
+			}
+
+			if (line.startsWith('+')) {
+				last_change.new += line.slice(1) + '\n';
+			} else if (line.startsWith('-')) {
+				last_change.old += line.slice(1) + '\n';
+			}
+		}
+		diff += formatChangeSideBySide(last_change.old, last_change.new);
+		return diff.trim();
+	}
+}
+
+function formatChangeSideBySide(oldText: string, newText: string): string {
+	if (!oldText && !newText) {
+		return '';
+	}
+
+	const oldLines = oldText.split('\n').map((l) => l.replaceAll('\t', '  '));
+	const newLines = newText.split('\n').map((l) => l.replaceAll('\t', '  '));
+
+	const maxLines = Math.max(oldLines.length, newLines.length);
+	const formattedLines: string[] = [];
+	for (let i = 0; i < maxLines; i++) {
+		const oldLine = oldLines[i] || '';
+		const newLine = newLines[i] || '';
+		const formattedLine = `${oldLine.padEnd(40, ' ')} | ${newLine}`;
+		formattedLines.push(formattedLine);
+	}
+	return formattedLines.join('\n') + '\n';
 }

package/src/common/shared-jobs/detect-change-job.ts

@@ -72,5 +72,12 @@ export async function executeChangeDetect(pm: IPackageManager, options: IDetectO
 	const changedFiles = await gitrepo.commitChanges();
 	logger.verbose`  changed files: list<${changedFiles}>`;
 
+	if (logger.debug.isEnabled) {
+		if (changedFiles.includes('package.json')) {
+			const diff = await gitrepo.fileDiff('package.json');
+			logger.debug(`    - package.json 文件的修改:\n${diff}`);
+		}
+	}
+
 	return { changedFiles, hasChange: changedFiles.length > 0, remoteVersion: remotePackage.version };
 }

package/src/common/taball/file-download.ts

@@ -24,7 +24,7 @@ export async function downloadFileCached(url: string, file: string) {
 		} catch {}
 
 		if (meta?.url === url) {
-			logger.log('     -> 已经下载');
+			logger.debug('     -> 已经下载');
 			return file;
 		}
 	}

package/src/common/version.generated.ts

@@ -7,12 +7,12 @@
  *  GENERATED FILE, DO NOT MODIFY
  *  这是生成的文件，千万不要修改
  * 
- * @build-script/codegen 1.0.2 - The Simple Code Generater
+ * @build-script/codegen 1.0.4 - The Simple Code Generater
  * https://github.com/GongT/baobao
  * 
  ******************************************************************************/
 
-export const self_package_version = "0.0.3";
+export const self_package_version = "0.0.4";
 export const self_package_name = "@build-script/package-tools";
 export const self_package_repository = "undefined";