@build-script/package-tools 0.0.3 → 0.0.5

package/src/commands/monorepo-upgrade.ts

@@ -1,4 +1,4 @@
-import type { IPackageInfo } from '@build-script/monorepo-lib';
+import { createWorkspace, type IPackageInfo } from '@build-script/monorepo-lib';
 import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
 import { logger } from '@idlebox/logger';
 import { resolve } from 'node:path';
@@ -17,8 +17,9 @@ export async function main() {
 	const dryRun = argv.flag('--dry') > 0;
 	const skipUpdate = argv.flag('--skip-update') > 0;
 
-	const packageManager = await createPackageManager(PackageManagerUsageKind.Read);
-	const projects = await packageManager.workspace.listPackages();
+	const workspace = await createWorkspace();
+	const packageManager = await createPackageManager(PackageManagerUsageKind.Read, workspace);
+	const projects = await workspace.listPackages();
 
 	logger.log('Collecting local project versions:');
 	const alldeps: Record<string, string> = {};

package/src/commands/run-if-version-mismatch.ts

@@ -1,3 +1,4 @@
+import { createWorkspace } from '@build-script/monorepo-lib';
 import type { IArgsReaderApi } from '@idlebox/args';
 import { logger } from '@idlebox/logger';
 import { checkChildProcessResult } from '@idlebox/node';
@@ -29,17 +30,16 @@ export async function main(argv: IArgsReaderApi) {
 
 	const commands = argv.unused();
 	if (commands.length === 0 || !process.argv.includes('--')) {
-		logger.error(
-			'参数中必须包含"--"，并且后面跟随要运行的命令。\n  示例: run-if-version-mismatch --quiet -- pnpm publish',
-		);
+		logger.error('参数中必须包含"--"，并且后面跟随要运行的命令。\n  示例: run-if-version-mismatch --quiet -- pnpm publish');
 		return 22;
 	}
 	logger.debug('即将运行命令: %s', commands.join(' '));
 
-	const packageManager = await createPackageManager(PackageManagerUsageKind.Read);
+	const workspace = await createWorkspace();
+	const packageManager = await createPackageManager(PackageManagerUsageKind.Read, workspace);
 
-	const packagePath = await packageManager.workspace.getNearestPackage(process.cwd());
-	logger.log('工作目录: %s', packagePath);
+	const packageInfo = await workspace.getNearestPackage(process.cwd());
+	logger.log('工作目录: %s', packageInfo.name);
 
 	const packageJson = await packageManager.loadPackageJson();
 	logger.log('包名: %s', packageJson.name);
@@ -62,7 +62,7 @@ export async function main(argv: IArgsReaderApi) {
 
 	logger.log('本地版本 (%s) !== 远程版本 (%s)，开始执行命令!', packageJson.version, rversion);
 	const r = await execa(commands[0], commands.slice(1), {
-		cwd: packagePath,
+		cwd: packageInfo.absolute,
 		stdout: 'inherit',
 		stderr: 'inherit',
 	});

package/src/commands/test.ts

@@ -1,3 +1,4 @@
+import { createSimpleProject } from '@build-script/monorepo-lib';
 import { CommandDefine } from '../common/functions/cli.js';
 import { PackageManagerUsageKind } from '../common/package-manager/driver.abstract.js';
 import { createPackageManager } from '../common/package-manager/package-manager.js';
@@ -10,7 +11,8 @@ export class Command extends CommandDefine {
 }
 
 export async function main() {
-	const pm = await createPackageManager(PackageManagerUsageKind.Read);
+	const w = await createSimpleProject();
+	const pm = await createPackageManager(PackageManagerUsageKind.Read, w);
 	const cache = await pm.createCacheHandler();
 
 	const r = await cache.downloadTarball('react-dom', 'latest');

package/src/common/cache/native.npm.ts

@@ -117,13 +117,13 @@ export async function fetchNpmWithCache(path: string, name: string, registry: st
 
 	const options: Required<IMyOpts> = Object.assign({}, defOpt, _options);
 
-	let try_cnt = 0;
+	let _try_cnt = 0;
 	let retry = options.maxRetry;
 	let retry_timeout = 500;
 	let json: IRegistryMetadata | undefined;
 
 	while (true) {
-		try_cnt++;
+		_try_cnt++;
 		retry--;
 		try {
 			const proxy = getProxyValue(registry);

package/src/common/functions/cli.ts

@@ -15,6 +15,9 @@ function die(msg: string) {
 export const argv = createArgsReader(process.argv.slice(2));
 
 type ArgDefine = {
+	/**
+	 * 为false时在后面加一个 <value>
+	 */
 	flag: boolean;
 	description: string;
 };
@@ -74,16 +77,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

@@ -61,15 +61,53 @@ export class GitWorkingTree {
 		}
 		const files = lines.slice(titleLine + 1);
 
-		logger.debug(
-			'    文件更改: %d 个 (%s%s)',
-			files.length,
-			files.slice(0, 5).join(', '),
-			files.length > 5 ? ' ...' : '',
-		);
+		logger.debug('    文件更改: %d 个 (%s%s)', files.length, files.slice(0, 5).join(', '), files.length > 5 ? ' ...' : '');
 
 		return files.map((item) => {
 			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/package-manager/driver.abstract.ts

@@ -1,10 +1,10 @@
-import type { MonorepoWorkspace } from '@build-script/monorepo-lib';
 import { ensureLinkTarget } from '@idlebox/ensure-symlink';
 import { logger } from '@idlebox/logger';
 import { execLazyError, exists, writeFileIfChange } from '@idlebox/node';
 import { execa } from 'execa';
 import { dirname, resolve } from 'node:path';
 import { split as splitCmd } from 'split-cmd';
+import type { WorkspaceBase } from '@build-script/monorepo-lib';
 import { NpmCacheHandler } from '../cache/native.npm.js';
 import { registryInput } from '../functions/cli.js';
 import { TempWorkingFolder } from '../temp-work-folder.js';
@@ -29,7 +29,7 @@ export abstract class PackageManager {
 
 	constructor(
 		public readonly usageKind: PackageManagerUsageKind,
-		public readonly workspace: MonorepoWorkspace,
+		public readonly workspace: WorkspaceBase,
 		subdir = process.cwd(),
 	) {
 		this.configTemp = new TempWorkingFolder(this.workspace, 'package-manager', true);
@@ -48,10 +48,7 @@ export abstract class PackageManager {
 
 		const pkg = await this.loadPackageJson();
 		if (pkg.publishConfig?.['packCommand']) {
-			const cmds =
-				typeof pkg.publishConfig['packCommand'] === 'string'
-					? splitCmd(pkg.publishConfig['packCommand'])
-					: pkg.publishConfig['packCommand'];
+			const cmds = typeof pkg.publishConfig['packCommand'] === 'string' ? splitCmd(pkg.publishConfig['packCommand']) : pkg.publishConfig['packCommand'];
 
 			if (!Array.isArray(cmds)) {
 				logger.fatal`publishConfig.packCommand必须是字符串或字符串数组, 但实际是: ${typeof pkg.publishConfig['packCommand']}`;
@@ -122,7 +119,7 @@ export abstract class PackageManager {
 			logger.debug('    发布成功: %s @ %s [%s]', r.name, r.version, r.published);
 			return r;
 		} catch (e: any) {
-			logger.error`    tarball发布失败! ${e}`;
+			logger.error`    tarball发布失败! ${e.message}`;
 			throw e;
 		}
 	}

package/src/common/package-manager/driver.pnpm.ts

@@ -1,4 +1,3 @@
-import { prettyPrintError } from '@idlebox/common';
 import { logger } from '@idlebox/logger';
 import { execLazyError, exists } from '@idlebox/node';
 import { resolve } from 'node:path';
@@ -33,7 +32,7 @@ class RegistryError extends Error {
 		super(error.summary || 'no error summary');
 
 		if (this.error.detail) {
-			this.stack = this.error.detail;
+			this.stack = this.error.detail.trimEnd() + '\n' + this.stack;
 		}
 	}
 
@@ -99,7 +98,13 @@ export class PNPM extends PackageManager {
 
 			logger.warn`publish long<${pack}> error: ${e}`;
 			console.error(all);
-			prettyPrintError(`${this.binary} ${cmds.join(' ')}`, e);
+
+			// prettyPrintError(`publish package`, {
+			// 	message: `${e.message}\ncommand: ${this.binary} ${cmds.join(' ')}\nworking dir: ${cwd}`,
+			// 	stack: e.stack,
+			// });
+
+			e.message = `${e.message}\ncommand: ${this.binary} ${cmds.join(' ')}\nworking dir: ${cwd}`;
 
 			throw e;
 		}

package/src/common/package-manager/functions.ts

@@ -69,13 +69,7 @@ async function resolveNpmVersion([packageName, currentVersion]: [string, string]
 
 			return [packageName, newVersion, currentVersion];
 		} catch (e: any) {
-			console.error(
-				'[npm:resolve][try %s] failed fetch package "%s": [%s] %s',
-				currentTry,
-				packageName,
-				e.code,
-				e.message
-			);
+			console.error('[npm:resolve][try %s] failed fetch package "%s": [%s] %s', currentTry, packageName, e.code, e.message);
 			lastError = e;
 			if (e.code === 'ECONNRESET') {
 				retryCnt++;
@@ -97,11 +91,7 @@ export async function resolveNpm(versions: Map<string, string>) {
 
 	const nc = Number.parseInt((await getNpmConfigValue('network-concurrency')) || '4');
 
-	for await (const [packName, newVersion, currentVersion] of asyncPool(
-		nc,
-		[...versions.entries()],
-		resolveNpmVersion
-	)) {
+	for await (const [packName, newVersion, currentVersion] of asyncPool(nc, [...versions.entries()], resolveNpmVersion)) {
 		versions.set(packName, newVersion);
 
 		let updated = '';

package/src/common/package-manager/package-manager.ts

@@ -1,4 +1,4 @@
-import { createWorkspace, type MonorepoWorkspace } from '@build-script/monorepo-lib';
+import type { WorkspaceBase } from '@build-script/monorepo-lib';
 import { commandInPath, PathEnvironment } from '@idlebox/node';
 import type { PackageManager, PackageManagerUsageKind } from './driver.abstract.js';
 import { NPM } from './driver.npm.js';
@@ -7,21 +7,11 @@ import { reconfigureProxyWithNpmrc } from './proxy.js';
 
 export type IPackageManager = PackageManager;
 
-type PackageManagerConstructor = new (
-	usage: PackageManagerUsageKind,
-	workspace: MonorepoWorkspace,
-	subdir?: string,
-) => IPackageManager;
+type PackageManagerConstructor = new (usage: PackageManagerUsageKind, workspace: WorkspaceBase, subdir?: string) => IPackageManager;
 
 let pmCls: PackageManagerConstructor | undefined;
 
-export async function createPackageManager(
-	usage: PackageManagerUsageKind,
-	workspace?: MonorepoWorkspace,
-	subdir?: string,
-): Promise<IPackageManager> {
-	if (!workspace) workspace = await createWorkspace();
-
+export async function createPackageManager(usage: PackageManagerUsageKind, workspace: WorkspaceBase, subdir?: string): Promise<IPackageManager> {
 	if (pmCls) {
 		return new pmCls(usage, workspace, subdir);
 	}

package/src/common/package-manager/proxy.ts

@@ -50,7 +50,7 @@ export function getProxyValue(url: string) {
 				logger.verbose(`  hit equals`);
 				return '';
 			}
-			const domainEnding = npPart[0] === '.' ? npPart : '.' + npPart;
+			const domainEnding = npPart[0] === '.' ? npPart : `.${npPart}`;
 			if (domain.endsWith(domainEnding)) {
 				logger.verbose(`  hit ending: ${domainEnding}`);
 				return '';

package/src/common/shared-jobs/clear-cache.ts

@@ -0,0 +1,14 @@
+import { logger } from '@idlebox/logger';
+import type { PackageManager } from '../package-manager/driver.abstract.js';
+
+export async function clearNpmMetaCache(pm: PackageManager, names: readonly string[]) {
+	logger.debug('刷新npm缓存...');
+	try {
+		const cache = await pm.createCacheHandler();
+		for (const name of names) {
+			await cache.deleteMetadata(name);
+		}
+	} catch (e) {
+		logger.warn`failed flush npm cache: ${e}`;
+	}
+}

package/src/common/shared-jobs/cnpm-sync.ts

@@ -1,20 +1,7 @@
-import type { IPackageInfo } from '@build-script/monorepo-lib';
 import { logger } from '@idlebox/logger';
 import { checkChildProcessResult, printLine } from '@idlebox/node';
 import { execa } from 'execa';
 import { CSI, isQuiet } from '../functions/cli.js';
-import { PackageManagerUsageKind } from '../package-manager/driver.abstract.js';
-import { createPackageManager } from '../package-manager/package-manager.js';
-
-export function cnpmSync(list: ReadonlyArray<IPackageInfo>, collectOutput = isQuiet, dryRun = false) {
-	const names = list
-		.filter((e) => {
-			return !!e.packageJson.name && !e.packageJson.private;
-		})
-		.map((e) => e.packageJson.name);
-
-	return cnpmSyncNames(names, collectOutput, dryRun);
-}
 
 export async function cnpmSyncNames(names: ReadonlyArray<string>, collectOutput = isQuiet, dryRun = false) {
 	console.log(`🔃 cnpm同步${names.length}个包`);
@@ -43,24 +30,13 @@ export async function cnpmSyncNames(names: ReadonlyArray<string>, collectOutput
 		},
 	});
 
-	logger.debug('刷新npm缓存...');
-	try {
-		const pm = await createPackageManager(PackageManagerUsageKind.Read);
-		const cache = await pm.createCacheHandler();
-		for (const name of names) {
-			await cache.deleteMetadata(name);
-		}
-	} catch (e) {
-		logger.warn`failed flush npm cache: ${e}`;
-	}
-
 	try {
 		checkChildProcessResult(p);
 		if (collectOutput) {
 			process.stderr.write(`${CSI}K`);
 		}
 		console.log('    ✨ cnpm同步请求成功');
-	} catch (e) {
+	} catch (_e) {
 		if (collectOutput) {
 			printLine();
 			logger.error(p.all as any);

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/decompress.ts

@@ -29,7 +29,9 @@ export async function decompressPack(src: string, dest: string) {
 			(e) => {
 				if (e) {
 					console.error(convertCatchedError(e).stack);
-					unlinkSync(src);
+					try {
+						unlinkSync(src);
+					} catch {}
 					reject(e);
 				} else {
 					resolve();

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;
 		}
 	}
@@ -108,9 +108,7 @@ function send_request(url: string, headers: OutgoingHttpHeaders): Promise<any> {
 		logger.debug(`[http] 请求 ${url}`);
 
 		const request = get(url, { headers }, (response) => {
-			logger.debug(
-				`[http] 响应 ${response.statusCode} [encoding: ${response.headers['content-encoding']}][${response.headers['content-length']} bytes]`,
-			);
+			logger.debug(`[http] 响应 ${response.statusCode} [encoding: ${response.headers['content-encoding']}][${response.headers['content-length']} bytes]`);
 			if (response.statusCode === 200) {
 				const bytes = Number.parseInt(response.headers['content-length'] ?? '--');
 
@@ -118,9 +116,7 @@ function send_request(url: string, headers: OutgoingHttpHeaders): Promise<any> {
 					let downloaded = 0;
 					response.on('data', (bs) => {
 						downloaded += bs.length;
-						process.stderr.write(
-							`\x1B[2mdownload: ${downloaded} of ${bytes} bytes (${Math.round((downloaded / bytes) * 100)}%)\x1B[0m\r`,
-						);
+						process.stderr.write(`\x1B[2mdownload: ${downloaded} of ${bytes} bytes (${Math.round((downloaded / bytes) * 100)}%)\x1B[0m\r`);
 					});
 					response.on('end', () => {
 						process.stderr.write('\x1B[K');
@@ -144,14 +140,7 @@ function send_request(url: string, headers: OutgoingHttpHeaders): Promise<any> {
 						break;
 				}
 				resolve(Object.assign(response, { stream }));
-			} else if (
-				(response.statusCode === 302 ||
-					response.statusCode === 301 ||
-					response.statusCode === 303 ||
-					response.statusCode === 307 ||
-					response.statusCode === 308) &&
-				response.headers.location
-			) {
+			} else if ((response.statusCode === 302 || response.statusCode === 301 || response.statusCode === 303 || response.statusCode === 307 || response.statusCode === 308) && response.headers.location) {
 				reject(new RedirectError(url, response.headers.location, response.statusCode));
 			} else {
 				reject(new HttpError(url, response.statusCode as number, response.statusMessage as string));

package/src/common/temp-work-folder.ts

@@ -1,4 +1,4 @@
-import type { MonorepoWorkspace } from '@build-script/monorepo-lib';
+import type { WorkspaceBase } from '@build-script/monorepo-lib';
 import { registerGlobalLifecycle } from '@idlebox/common';
 import { writeJsonFile } from '@idlebox/json-edit';
 import { logger } from '@idlebox/logger';
@@ -15,7 +15,7 @@ export class TempWorkingFolder {
 	private _exists = false;
 
 	constructor(
-		private readonly workspace: MonorepoWorkspace,
+		private readonly workspace: WorkspaceBase,
 		name: string,
 		__internal_isChild = false,
 	) {

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.5 - The Simple Code Generater
  * https://github.com/GongT/baobao
  * 
  ******************************************************************************/
 
-export const self_package_version = "0.0.3";
+export const self_package_version = "0.0.5";
 export const self_package_name = "@build-script/package-tools";
 export const self_package_repository = "undefined";
 

package/src/common/version.generator.ts

@@ -2,7 +2,7 @@ import type { FileBuilder, IOutputShim } from '@build-script/heft-plugin-base';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 
-export function generate(builder: FileBuilder, logger: IOutputShim) {
+export function generate(_builder: FileBuilder, logger: IOutputShim) {
 	const pkgFile = path.resolve(__dirname, '../../package.json');
 	const pkg = JSON.parse(fs.readFileSync(pkgFile, 'utf-8'));
 

package/src/main.ts

@@ -3,17 +3,7 @@ import { AppExit, prettyPrintError } from '@idlebox/common';
 import { createRootLogger, EnableLogLevel } from '@idlebox/logger';
 import { resolve } from 'node:path';
 import cmdList from './command-file-map.generated.js';
-import {
-	argv,
-	DieError,
-	isHelp,
-	isQuiet,
-	isVerbose,
-	pCmd,
-	pDesc,
-	printCommonOptions,
-	type CommandDefine,
-} from './common/functions/cli.js';
+import { argv, DieError, isHelp, isQuiet, isVerbose, pCmd, pDesc, printCommonOptions, type CommandDefine } from './common/functions/cli.js';
 import { registerShutdownHandlers, shutdown } from './common/functions/global-lifecycle.js';
 import { configureProxyFromEnvironment } from './common/package-manager/proxy.js';
 
@@ -121,9 +111,7 @@ async function main() {
 }
 
 function printLegend() {
-	process.stderr.write(
-		`\x1B[2mUsage:\x1B[0m\n    ${usage_prefix} \x1B[38;5;10m<命令>\x1B[0m \x1B[38;5;14m[命令参数]\x1B[0m\n`,
-	);
+	process.stderr.write(`\x1B[2mUsage:\x1B[0m\n    ${usage_prefix} \x1B[38;5;10m<命令>\x1B[0m \x1B[38;5;14m[命令参数]\x1B[0m\n`);
 }
 
 function table() {