@build-script/package-tools 0.0.8 → 0.0.10

package/src/commands.generated.ts

@@ -17,12 +17,22 @@ export const cli_commands: readonly ICommandDefineWithCommand[] = [
 	{
 		"command": "detect-package-change",
 		"help": "",
-		"usage": "",
+		"usage": "\u001b[14;3m--bump\u001b[0m \u001b[14;3m--json\u001b[0m ",
 		"description": "本地运行npm pack并与npm上的最新版本对比差异",
 		"args": {
 			"--bump": {
+				"usage": true,
 				"flag": true,
 				"description": "当发现更改时更新package.json，增加版本号0.0.1"
+			},
+			"--json": {
+				"usage": true,
+				"flag": true,
+				"description": "输出JSON格式（不支持bump）"
+			},
+			"--unshare": {
+				"flag": false,
+				"description": "[linux] 在虚拟环境中运行（不支持bump），传入参数为overlay根目录"
 			}
 		},
 		"commonArgs": {},
@@ -103,7 +113,7 @@ export const cli_commands: readonly ICommandDefineWithCommand[] = [
 	{
 		"command": "monorepo-list",
 		"help": "",
-		"usage": "\u001b[3;38;5;14m--verbose\u001b[0m \u001b[3;38;5;14m--json\u001b[0m \u001b[3;38;5;14m--relative\u001b[0m",
+		"usage": "",
 		"description": "列出所有项目目录",
 		"args": {
 			"--verbose": {
@@ -137,8 +147,12 @@ export const cli_commands: readonly ICommandDefineWithCommand[] = [
 				"description": "仅检查修改，不发布（仍会修改version字段）"
 			},
 			"--private": {
-				"flag": false,
+				"flag": true,
 				"description": "即使private=true也执行"
+			},
+			"--concurrency": {
+				"flag": false,
+				"description": "并发数（默认5）"
 			}
 		},
 		"commonArgs": {},
@@ -217,6 +231,25 @@ export const cli_commands: readonly ICommandDefineWithCommand[] = [
 		"commonArgs": {},
 		"positional": false,
 		"isHidden": true
+	},
+	{
+		"command": "unshare-make-tarball",
+		"help": "",
+		"usage": "运行pack命令",
+		"description": "",
+		"args": {
+			"--output": {
+				"flag": false,
+				"description": "输出文件路径"
+			},
+			"--project": {
+				"flag": false,
+				"description": "要打包的项目名称"
+			}
+		},
+		"commonArgs": {},
+		"positional": false,
+		"isHidden": true
 	}
 ];
 export const cli_imports = {
@@ -231,5 +264,6 @@ export const cli_imports = {
 	"monorepo-upgrade": "./commands/monorepo-upgrade.js",
 	"run-if-version-mismatch": "./commands/run-if-version-mismatch.js",
 	"sync-my-readme": "./commands/sync-my-readme.js",
-	"test": "./commands/test.js"
+	"test": "./commands/test.js",
+	"unshare-make-tarball": "./commands/unshare-make-tarball.js"
 } as const;

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

@@ -1,5 +1,5 @@
-import { sleep, type IPackageJson } from '@idlebox/common';
 import { logger } from '@idlebox/cli';
+import { sleep, type IPackageJson } from '@idlebox/common';
 import { get as cacheGet, rm as cacheRm } from 'cacache';
 import { rm } from 'node:fs/promises';
 import { createRequire } from 'node:module';
@@ -38,19 +38,23 @@ export interface IRegistryMetadata {
 }
 
 export class NpmCacheHandler {
+	private readonly cache_path;
+
 	constructor(
 		private readonly pm: IPackageManager,
 		private readonly registry: string,
 		public readonly path: string,
-	) {}
+	) {
+		this.cache_path = resolve(path, '_cacache');
+	}
 
 	deleteMetadata(name: string) {
-		return deleteNpmCache(this.path, name, this.registry);
+		return deleteNpmCache(this.cache_path, name, this.registry);
 	}
 
 	async fetchMetadata(name: string, cacheMode = CacheMode.Normal) {
 		const registry = await this.pm.getNpmRegistry();
-		return fetchNpmWithCache(this.path, name, registry, { mode: cacheMode });
+		return fetchNpmWithCache(this.cache_path, name, registry, { mode: cacheMode });
 	}
 
 	async fetchVersion(name: string, distTag = 'latest', cacheMode = CacheMode.Normal) {
@@ -68,7 +72,7 @@ export class NpmCacheHandler {
 
 	private getTarballFile(name: string, tag: string) {
 		const es = escapePackageNameToFilename(name);
-		return resolve(this.path, `../package-tools/${es}-${tag}.tgz`);
+		return resolve(this.path, `package-tools/${es}-${tag}.tgz`);
 	}
 
 	public async downloadTarball(name: string, distTag: string) {
@@ -190,8 +194,9 @@ async function deleteNpmCache(path: string, name: string, registry?: string) {
 		const tc = i > 0 ? '├' : '└';
 
 		const info = await cacheGet.info(path, cid);
-		// console.log(info);
+		logger.verbose`cache info: ${info}`;
 		await cacheRm.content(path, cid);
+		await cacheRm.entry(path, cid);
 		// @types/cacache 最后一个参数丢失
 		await (cacheRm.entry as any)(path, cid, { removeFully: true });
 		if (info) {

package/src/common/functions/cli.ts

@@ -9,7 +9,6 @@ export class DieError extends Error {
 
 /** @deprecated */
 export const isQuiet = app.silent;
-export const isJsonOutput = argv.flag(['--json']) > 0;
 
 /** @deprecated */
 export const isHelp = app.showHelp;

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

@@ -1,10 +1,10 @@
-import { ensureLinkTarget } from '@idlebox/ensure-symlink';
+import type { WorkspaceBase } from '@build-script/monorepo-lib';
 import { logger } from '@idlebox/cli';
+import { ensureLinkTarget } from '@idlebox/ensure-symlink';
 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';
@@ -54,7 +54,7 @@ export abstract class PackageManager {
 				logger.fatal`publishConfig.packCommand必须是字符串或字符串数组, 但实际是: ${typeof pkg.publishConfig['packCommand']}`;
 			}
 
-			logger.debug`使用自定义打包命令: ${cmds[0]}...`;
+			logger.debug`使用自定义打包命令: ${Array.from(cmds)}`;
 
 			const [cmd, ...args] = cmds;
 			await execLazyError(cmd, [...args, '--out', saveAs], {
@@ -73,7 +73,12 @@ export abstract class PackageManager {
 	}
 
 	async getScope() {
-		const pkg = await this.loadPackageJson();
+		let pkg;
+		try {
+			pkg = await this.loadPackageJson();
+		} catch {
+			return undefined;
+		}
 		if (pkg.name?.startsWith('@')) {
 			const name = pkg.name.split('/')[0];
 			return name;
@@ -174,7 +179,7 @@ export abstract class PackageManager {
 			const path = await this.getConfig('cache');
 			if (!path) throw new Error('npm config get cache返回为空');
 
-			this._cache_handler = new NpmCacheHandler(this, registry, resolve(path, '_cacache'));
+			this._cache_handler = new NpmCacheHandler(this, registry, path);
 		}
 		return this._cache_handler;
 	}

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

@@ -33,7 +33,7 @@ export async function makePackageJsonOrderConsistence(root: string) {
 }
 
 const pkgCache: Record<string, IPackageJson> = {};
-export async function cachedPackageJson(path: string) {
+export async function cachedPackageJson(path: string):Promise<IPackageJson> {
 	const exists = pkgCache[path];
 	if (exists) {
 		return exists;

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

@@ -12,13 +12,14 @@ interface IResult {
 	changedFiles: string[];
 	hasChange: boolean;
 	remoteVersion?: string;
+	packageJsonDiff?: string;
 }
 
 interface IDetectOptions {
 	forcePrivate?: boolean;
 }
 
-export async function executeChangeDetect(pm: IPackageManager, options: IDetectOptions): Promise<IResult> {
+export async function executeChangeDetect(pm: IPackageManager, options: IDetectOptions = {}): Promise<IResult> {
 	const packageJson = await pm.loadPackageJson();
 	logger.debug('修改检测 | 包名: %s', packageJson.name);
 	if (!packageJson.name) {
@@ -47,7 +48,7 @@ export async function executeChangeDetect(pm: IPackageManager, options: IDetectO
 
 	if (!remotePackage || gt(packageJson.version, remotePackage.version)) {
 		logger.debug('本地版本 (%s) 已经大于远程版本 (%s)，无需进一步检测', packageJson.version, remotePackage?.version);
-		return { changedFiles: ['package.json'], hasChange: false, remoteVersion: remotePackage?.version };
+		return { changedFiles: ['package.json'], hasChange: false, remoteVersion: remotePackage?.version, packageJsonDiff: '"version" already mismatch' };
 	}
 	logger.debug('本地版本 (%s) 小于或等于远程版本 (%s)，尝试检测更改...', packageJson.version, remotePackage.version);
 
@@ -72,12 +73,11 @@ 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}`);
-		}
+	let packageJsonDiff = '';
+	if (changedFiles.includes('package.json')) {
+		packageJsonDiff = await gitrepo.fileDiff('package.json');
+		logger.debug(`    - package.json 文件的修改:\n${packageJsonDiff}`);
 	}
 
-	return { changedFiles, hasChange: changedFiles.length > 0, remoteVersion: remotePackage.version };
+	return { changedFiles, hasChange: changedFiles.length > 0, remoteVersion: remotePackage.version, packageJsonDiff };
 }

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

@@ -1,5 +1,5 @@
-import { sleep } from '@idlebox/common';
 import { logger } from '@idlebox/cli';
+import { sleep } from '@idlebox/common';
 import { exists, streamPromise } from '@idlebox/node';
 import { createWriteStream } from 'node:fs';
 import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';
@@ -18,7 +18,7 @@ export async function downloadFileCached(url: string, file: string) {
 	const metadata = `${file}.meta.json`;
 	logger.debug`下载文件:\n    地址: long<${url}>\n    保存到: long<${file}>`;
 	let meta: IMetaInfo | undefined;
-	if (await exists(metadata)) {
+	if ((await exists(metadata)) && (await exists(file))) {
 		try {
 			meta = JSON.parse(await readFile(metadata, 'utf-8'));
 		} catch {}

package/src/common/version.generated.ts

@@ -12,7 +12,7 @@
  * 
  ******************************************************************************/
 
-export const self_package_version = "0.0.8";
+export const self_package_version = "0.0.10";
 export const self_package_name = "@build-script/package-tools";
 export const self_package_repository = "undefined";
 

package/src/main.ts

@@ -1,14 +1,23 @@
 import { makeApplication, type ArgDefineMap } from '@idlebox/cli';
+import { setExitCodeIfNot } from '@idlebox/node';
+import { basename } from 'node:path';
+import pkgJson from '../package.json' with { type: 'json' };
 import { cli_commands, cli_imports } from './commands.generated.js';
 
 export const common_args: ArgDefineMap = {
 	'--registry': { flag: false, description: 'npm服务器，默认从.npmrc读取(必须有schema://)' },
 	'--dist-tag': { flag: false, description: '需要从服务器读取时使用的tag，默认为"latest"' },
 	'--package': { flag: false, description: '实际操作前，更改当前目录（此文件夹应包含package.json）' },
-	'--json': { flag: true, description: '输出json格式（部分命令支持）' },
 };
 
-await makeApplication().withCommon(common_args).static(cli_imports, cli_commands);
+setExitCodeIfNot(0);
+await makeApplication({
+	name: basename(pkgJson.name),
+	description: pkgJson.description,
+	logPrefix: process.env.LOGGER_PREFIX || '',
+})
+	.withCommon(common_args)
+	.static(cli_imports, cli_commands);
 
 // await makeApplication()
 // 	.withCommon(common_args)

package/lib/common/functions/global-lifecycle.d.ts

@@ -1,5 +0,0 @@
-export declare let isApplicationShuttingDown: boolean;
-export declare function shutdown(code: number): void;
-export declare let shutdownExtraErase: number;
-export declare function registerShutdownHandlers(): void;
-//# sourceMappingURL=global-lifecycle.d.ts.map

package/lib/common/functions/global-lifecycle.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"global-lifecycle.d.ts","sourceRoot":"","sources":["../../../src/common/functions/global-lifecycle.ts"],"names":[],"mappings":"AAEA,eAAO,IAAI,yBAAyB,SAAQ,CAAC;AAE7C,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,QASpC;AAED,eAAO,IAAI,kBAAkB,QAAI,CAAC;AAElC,wBAAgB,wBAAwB,SAsBvC"}

package/lib/common/functions/global-lifecycle.js

@@ -1,34 +0,0 @@
-import { ensureDisposeGlobal } from '@idlebox/common';
-export let isApplicationShuttingDown = false;
-export function shutdown(code) {
-    if (isApplicationShuttingDown) {
-        process.exitCode = code || process.exitCode;
-        return;
-    }
-    isApplicationShuttingDown = true;
-    ensureDisposeGlobal().finally(() => {
-        process.exit(code || process.exitCode);
-    });
-}
-export let shutdownExtraErase = 0;
-export function registerShutdownHandlers() {
-    process.on('unhandledRejection', (reason, promise) => {
-        console.error('got unhandledRejection: %s', reason);
-        console.error(promise);
-        shutdown(1);
-    });
-    process.on('SIGINT', () => {
-        console.error('\ngot SIGINT');
-        shutdownExtraErase += 2;
-        shutdown(0);
-    });
-    process.on('SIGTERM', () => {
-        console.error('\ngot SIGTERM');
-        shutdownExtraErase += 2;
-        shutdown(0);
-    });
-    process.on('beforeExit', (code) => {
-        shutdown(code);
-    });
-}
-//# sourceMappingURL=global-lifecycle.js.map

package/lib/common/functions/global-lifecycle.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"global-lifecycle.js","sourceRoot":"","sources":["../../../src/common/functions/global-lifecycle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,CAAC,IAAI,yBAAyB,GAAG,KAAK,CAAC;AAE7C,MAAM,UAAU,QAAQ,CAAC,IAAY;IACpC,IAAI,yBAAyB,EAAE,CAAC;QAC/B,OAAO,CAAC,QAAQ,GAAG,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC;QAC5C,OAAO;IACR,CAAC;IACD,yBAAyB,GAAG,IAAI,CAAC;IACjC,mBAAmB,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE;QAClC,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,IAAI,kBAAkB,GAAG,CAAC,CAAC;AAElC,MAAM,UAAU,wBAAwB;IACvC,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE;QACpD,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,MAAM,CAAC,CAAC;QACpD,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACvB,QAAQ,CAAC,CAAC,CAAC,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;QACzB,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9B,kBAAkB,IAAI,CAAC,CAAC;QACxB,QAAQ,CAAC,CAAC,CAAC,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;QAC/B,kBAAkB,IAAI,CAAC,CAAC;QACxB,QAAQ,CAAC,CAAC,CAAC,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,IAAI,EAAE,EAAE;QACjC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;AACJ,CAAC"}