@build-script/package-tools 0.0.1 → 0.0.3

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@build-script/package-tools",
   "type": "module",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "bin": {
     "package-tools": "./load.js",
     "njspkg": "./load.js"
@@ -11,25 +11,24 @@
   },
   "dependencies": {
     "cacache": "^19.0.1",
-    "dependency-graph": "^1.0.0",
     "execa": "^9.6.0",
-    "global-agent": "^3.0.0",
     "make-fetch-happen": "^14.0.3",
     "minimatch": "^10.0.3",
     "npm-registry-fetch": "^18.0.2",
     "pacote": "^21.0.0",
     "semver": "^7.7.2",
+    "split-cmd": "^1.1.0",
     "source-map-support": "^0.5.21",
-    "string-width": "^7.2.0",
     "targz": "^1.0.1",
     "tiny-async-pool": "^2.1.0",
-    "tinygradient": "^2.0.1",
-    "@idlebox/args": "^0.0.9",
-    "@idlebox/common": "^1.4.14",
-    "@idlebox/json-edit": "^0.0.1",
-    "@idlebox/node": "^1.4.7",
-    "@idlebox/ensure-symlink": "^1.0.32",
-    "@idlebox/logger": "^0.0.2"
+    "@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"
   },
   "devDependencies": {
     "@rushstack/heft": "^0.74.0",
@@ -42,15 +41,15 @@
     "@types/targz": "^1.0.5",
     "@types/tiny-async-pool": "^2.0.3",
     "@types/tinycolor2": "^1.4.6",
-    "@build-script/monorepo-lib": "^0.0.1",
-    "@build-script/single-dog-asset": "^1.0.35",
-    "@build-script/codegen": "^1.0.0",
-    "@idlebox/dependency-graph": "^0.0.1",
+    "@build-script/codegen": "^1.0.2",
+    "@build-script/single-dog-asset": "^1.0.36",
     "@internal/local-rig": "^1.0.1",
-    "@mpis/run": "^0.0.2"
+    "@mpis/run": "^0.0.3"
   },
+  "license": "MIT",
+  "author": "GongT <admin@gongt.me>",
+  "repository": "https://github.com/GongT/baobao",
   "scripts": {
-    "prepublishHook": "internal-prepublish-hook",
     "build": "mpis-run build",
     "watch": "mpis-run watch",
     "clean": "mpis-run clean",

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

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

package/src/commands/monorepo-bump-version.ts

@@ -18,6 +18,8 @@ export class Command extends CommandDefine {
 		'--skip': { flag: false, description: '跳过前N-1个包（从第N个包开始运行）' },
 		'--allow-private': { flag: true, description: '即使private=true也执行' },
 		'--exclude': { flag: false, description: '排除指定的包' },
+		'--force': { flag: false, description: '不检测变化，直接修改版本号' },
+		'--always': { flag: false, description: '强制执行，即使没有检测到变化' },
 	};
 }
 
@@ -38,45 +40,48 @@ class BumpVersionJob implements IWatchEvents {
 	private readonly _onRunning = new Emitter<void>();
 	public readonly onRunning = this._onRunning.event;
 
-	private readonly allowPrivate: boolean;
-
 	constructor(
 		private readonly state: IState,
 		private readonly project: IPackageInfo,
 		private readonly workspace: MonorepoWorkspace,
-	) {
-		this.allowPrivate = argv.flag('--allow-private') > 0;
-	}
+	) {}
 
 	async execute() {
 		const { index, length, options, changedPackages } = this.state;
 		const w = length.toFixed(0).length;
 		console.log(`📦 [${(index + 1).toFixed(0).padStart(w)}/${length}] ${this.project.name}`);
-		if (this.project.packageJson.private && !this.allowPrivate) {
+		if (this.project.packageJson.private && !options.allowPrivate) {
 			console.log(`  🛑 跳过，private=true: ${this.project.name}`);
 		} else if (options.skip > index + 1 || options.exclude?.test(this.project.name)) {
 			console.log(`  ⏩ ${CSI}2m跳过${CSI}0m`);
+		} else if (options.force) {
+			changedPackages.push(this.project.name);
+
+			const pm = await createPackageManager(PackageManagerUsageKind.Write, this.workspace, this.project.absolute);
+			const packageJson = await pm.loadPackageJson();
+			await increaseVersion(packageJson, packageJson.version);
+			console.log('    ✍️ 已修改本地包版本');
 		} else {
 			const startTime = Date.now();
 
 			console.log(`  🔍 ${CSI}38;5;14m检查包${CSI}0m`);
 
 			const pm = await createPackageManager(PackageManagerUsageKind.Write, this.workspace, this.project.absolute);
-			const { hasChange, remoteVersion } = await executeChangeDetect(pm, { forcePrivate: this.allowPrivate });
+			const { hasChange, remoteVersion } = await executeChangeDetect(pm, { forcePrivate: options.allowPrivate });
 
 			if (!remoteVersion) {
-				console.log('    ✨ 远程版本不存在\n');
+				console.log('    ✨ 远程版本不存在');
 				if (this.project.packageJson.version !== '0.0.1') {
 					throw new Error(`远程版本不存在，但本地包版本不是 0.0.1\n  package: ${pm.projectPath}/package.json`);
 				}
-			} else if (hasChange) {
+			} else if (hasChange || options.always) {
 				changedPackages.push(this.project.name);
 
 				const packageJson = await pm.loadPackageJson();
 				await increaseVersion(packageJson, remoteVersion);
-				console.log('    ✍️ 已修改本地包版本\n');
+				console.log('    ✍️ 已修改本地包版本');
 			} else {
-				console.log(`    ✨ ${CSI}38;5;10m未发现修改${CSI}0m (in ${humanDate.delta(Date.now() - startTime)})\n`);
+				console.log(`    ✨ ${CSI}38;5;10m未发现修改${CSI}0m (in ${humanDate.delta(Date.now() - startTime)})`);
 			}
 		}
 	}
@@ -107,9 +112,21 @@ function options() {
 		throw new Error('skip 不是数字');
 	}
 
+	const force = argv.flag('--force') > 0;
+	const always = !force && argv.flag('--always') > 0;
+
+	const allowPrivate = argv.flag('--allow-private') > 0;
+
+	if (argv.unused().length > 0) {
+		logger.fatal`未知参数: ${argv.unused().join(', ')}`;
+	}
+
 	return {
 		exclude: excludeReg,
 		skip: skip,
+		force: force,
+		always: always,
+		allowPrivate: allowPrivate,
 	};
 }
 

package/src/commands/monorepo-publish.ts

@@ -92,7 +92,7 @@ class BuildPackageJob implements IWatchEvents {
 		if (hasChange) {
 			const packageJson = await pm.loadPackageJson();
 			localVersion = await increaseVersion(packageJson, remoteVersion || '0.0.0');
-			this.log('    ✍️ 已修改本地包版本\n');
+			this.log(`    ✍️ 已修改本地包版本: ${localVersion}`);
 		}
 		if (!shouldPublish) {
 			this.log(`    ✨ ${CSI}38;5;10m未发现修改${CSI}0m\n`);
@@ -207,21 +207,29 @@ export async function main() {
 
 	const w = packageToPublish.length.toFixed(0).length;
 	let published: string[] = [];
-	for (const { name, pack } of packageToPublish) {
-		console.log(`📦 [${(index + 1).toFixed(0).padStart(w)}/${packageToPublish.length}] ${name}`);
-		const r = await pm.uploadTarball(pack);
-		if (r.published) {
-			console.log(`    👌 已发布新版本 ${r.version}`);
+
+	try {
+		index = 1;
+		for (const { name, pack } of packageToPublish) {
+			console.log(`📦 [${index.toFixed(0).padStart(w)}/${packageToPublish.length}] ${name}`);
+			const r = await pm.uploadTarball(pack);
+			if (r.published) {
+				console.log(`    👌 已发布新版本 ${r.version}`);
+			} else {
+				console.log(`    🤔 版本号未改变 ${r.version}`);
+			}
 			published.push(name);
-		} else {
-			console.log(`    🤔 版本号未改变 ${r.version}`);
-		}
-	}
 
-	console.log(`🎉 所有任务完成，共发布了 ${published.length} 个包`);
+			index++;
+		}
 
-	if (await commandInPath('cnpm')) {
-		await cnpmSyncNames(published, true).catch();
+		console.log(`🎉 所有任务完成，共发布了 ${published.length} 个包`);
+	} catch (e) {
+		logger.error`发布过程中发生错误: ${e instanceof Error ? e.message : e}`;
+		throw e;
+	} finally {
+		if (await commandInPath('cnpm')) {
+			await cnpmSyncNames(published, true).catch();
+		}
 	}
-	console.log(`	🐱 已同步到 cnpm`);
 }

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

@@ -1,9 +1,10 @@
 import type { MonorepoWorkspace } from '@build-script/monorepo-lib';
 import { ensureLinkTarget } from '@idlebox/ensure-symlink';
 import { logger } from '@idlebox/logger';
-import { exists, writeFileIfChange } from '@idlebox/node';
+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 { NpmCacheHandler } from '../cache/native.npm.js';
 import { registryInput } from '../functions/cli.js';
 import { TempWorkingFolder } from '../temp-work-folder.js';
@@ -42,12 +43,33 @@ export abstract class PackageManager {
 		return execa(this.binary, ['install'], { cwd: this.projectPath, stdio: 'inherit' });
 	}
 
-	public pack(saveAs: string, packagePath = this.projectPath) {
-		logger.verbose(`打包项目: ${packagePath}`);
-		return this._pack(saveAs, packagePath);
+	public async pack(saveAs: string) {
+		logger.verbose`打包项目: long<${this.projectPath}> -> long<${saveAs}>`;
+
+		const pkg = await this.loadPackageJson();
+		if (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']}`;
+			}
+
+			logger.debug`使用自定义打包命令: ${cmds[0]}...`;
+
+			const [cmd, ...args] = cmds;
+			await execLazyError(cmd, [...args, '--out', saveAs], {
+				cwd: this.projectPath,
+			});
+			return saveAs;
+		} else {
+			return this._pack(saveAs);
+		}
 	}
 
-	protected abstract _pack(saveAs: string, packagePath: string): Promise<string>;
+	protected abstract _pack(saveAs: string): Promise<string>;
 
 	async loadPackageJson() {
 		return cachedPackageJson(resolve(this.projectPath, 'package.json'));

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

@@ -3,7 +3,7 @@ import { PackageManager, type IUploadResult } from './driver.abstract.js';
 export class NPM extends PackageManager {
 	override binary = 'npm';
 
-	override async _pack(_saveAs: string, _packagePath: string): Promise<string> {
+	override async _pack(_saveAs: string): Promise<string> {
 		throw new Error('Method not implemented.');
 	}
 

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

@@ -48,9 +48,9 @@ const duplicatePublishOnUnpublishRegex = /Cannot publish over previously publish
 export class PNPM extends PackageManager {
 	override binary = 'pnpm';
 
-	override async _pack(saveAs: string, packagePath: string) {
+	override async _pack(saveAs: string) {
 		const chProcess = await execLazyError(this.binary, ['pack', '--out', saveAs], {
-			cwd: packagePath,
+			cwd: this.projectPath,
 			verbose: isVerbose,
 			env: { LANG: 'C.UTF-8', LC_ALL: 'C.UTF-8' },
 		});
@@ -58,7 +58,7 @@ export class PNPM extends PackageManager {
 		if (!lastLine) {
 			throw new Error('impossible: string split empty?');
 		}
-		const output = resolve(packagePath, lastLine);
+		const output = resolve(this.projectPath, lastLine);
 
 		if (await exists(output)) {
 			return output;

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

@@ -49,7 +49,7 @@ export async function increaseVersion(pkg: IPackageJson, current: string) {
 		throw new Error(`无法为"${pkg.name}"当前版本"${current}"增加版本号`);
 	}
 	pkg.version = v;
-	logger.log('新版本: %s', pkg.version);
+	logger.debug('新版本: %s', pkg.version);
 	const ch = await writeJsonFileBack(pkg);
 	logger.debug('package.json回写: %s', ch);
 	return v;

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

@@ -3,6 +3,8 @@ 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
@@ -41,6 +43,17 @@ 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) {

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

@@ -38,7 +38,7 @@ export async function downloadFileCached(url: string, file: string) {
 	await writeFile(metadata, JSON.stringify(meta), 'utf-8');
 
 	await rename(`${file}.downloading`, file);
-	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.0 - The Simple Code Generater
+ * @build-script/codegen 1.0.2 - The Simple Code Generater
  * https://github.com/GongT/baobao
  * 
  ******************************************************************************/
 
-export const self_package_version = "0.0.1";
+export const self_package_version = "0.0.3";
 export const self_package_name = "@build-script/package-tools";
 export const self_package_repository = "undefined";
 

package/config/rig.json

@@ -1,6 +0,0 @@
-// The "rig.json" file directs tools to look for their config files in an external package.
-// Documentation for this system: https://www.npmjs.com/package/@rushstack/rig-package
-{
-	"$schema": "https://developer.microsoft.com/json-schemas/rig-package/rig.schema.json",
-	"rigPackageName": "@internal/local-rig"
-}