@build-script/package-tools 0.0.6 → 0.0.7

package/src/commands.generated.ts

@@ -0,0 +1,235 @@
+/* eslint-disable */
+// @ts-ignore
+// biome-ignore-all lint
+// biome-ignore-all assist
+// biome-ignore-all syntax
+/******************************************************************************
+ *  GENERATED FILE, DO NOT MODIFY
+ *  这是生成的文件，千万不要修改
+ * 
+ * @build-script/codegen - The Simple Code Generater
+ * https://github.com/GongT/baobao
+ * 
+ ******************************************************************************/
+
+import type { ICommandDefineWithCommand } from '@idlebox/cli';
+export const cli_commands: readonly ICommandDefineWithCommand[] = [
+	{
+		"command": "detect-package-change",
+		"help": "",
+		"usage": "",
+		"description": "本地运行npm pack并与npm上的最新版本对比差异",
+		"args": {
+			"--bump": {
+				"flag": true,
+				"description": "当发现更改时更新package.json，增加版本号0.0.1"
+			}
+		},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "monorepo-bump-version",
+		"help": "",
+		"usage": "",
+		"description": "在monorepo中按照依赖顺序分别运行detect-package-change",
+		"args": {
+			"--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": "强制执行，即使没有检测到变化"
+			}
+		},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "monorepo-cnpm-sync",
+		"help": "\u001b[3;2m需要在PATH中存在cnpm命令\u001b[0m",
+		"usage": "",
+		"description": "调用cnpm sync命令",
+		"args": {},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "monorepo-invalid",
+		"help": "",
+		"usage": "",
+		"description": "从npm缓存中删除关于本monorepo的数据，以便安装最新版本",
+		"args": {},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "monorepo-link-binaries",
+		"help": "存在bin同名时，monorepo项目优先于npm包",
+		"usage": "\u001b[14;3m--from\u001b[0m \u001b[14;3m--recursive\u001b[0m ",
+		"description": "将monorepo中每个项目的bins连接到当前项目的 ./node_modules/.bin",
+		"args": {
+			"--from": {
+				"usage": true,
+				"flag": false,
+				"description": "将<value>视为各个项目的直接依赖 (必须是至少一个项目的依赖，否则找不到)"
+			},
+			"--transparent": {
+				"flag": false,
+				"description": "将<value>的所有直接依赖视为此项目的直接依赖"
+			},
+			"--recursive": {
+				"usage": true,
+				"flag": true,
+				"description": "在每个项目中运行，而非当前项目"
+			}
+		},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"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",
+		"description": "列出所有项目目录",
+		"args": {
+			"--verbose": {
+				"flag": true,
+				"description": "列出所有信息，而不仅是目录"
+			},
+			"--json": {
+				"flag": true,
+				"description": "输出json（同时使--verbose和--relative无效）"
+			},
+			"--relative": {
+				"flag": true,
+				"description": "输出相对路径（相对于monorepo根目录）"
+			}
+		},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "monorepo-publish",
+		"help": "",
+		"usage": "\u001b[3;38;5;14m--debug\u001b[0m \u001b[3;38;5;14m--dry\u001b[0m",
+		"description": "在monorepo中按照依赖顺序发布修改过的包",
+		"args": {
+			"--debug": {
+				"flag": true,
+				"description": "详细输出模式"
+			},
+			"--dry": {
+				"flag": true,
+				"description": "仅检查修改，不发布（仍会修改version字段）"
+			},
+			"--private": {
+				"flag": false,
+				"description": "即使private=true也执行"
+			}
+		},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "monorepo-tsconfig",
+		"help": "查找tsconfig.json和src/tsconfig.json\n    如果不在这里，可以在package.json中设置exports['./tsconfig.json'] = './xxxx'",
+		"usage": "\u001b[14;3m--dev\u001b[0m ",
+		"description": "为所有项目的 tsconfig.json 添加 references 字段",
+		"args": {
+			"--dev": {
+				"usage": true,
+				"flag": true,
+				"description": "也将devDependencies中的包添加到references中"
+			}
+		},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "monorepo-upgrade",
+		"help": "被更新的包必须没有或者用^作为前缀",
+		"usage": "",
+		"description": "更新monorepo中各个项目的所有依赖版本",
+		"args": {},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "run-if-version-mismatch",
+		"help": "如果package.json中的version与npm上的版本(latest)不一致，则运行命令\n  注意: 命令行中的\"\u001b[38;5;9m--\u001b[0m\"是必须的\n",
+		"usage": "\u001b[14;3m--no-cache\u001b[0m \u001b[14;3m--flush\u001b[0m \u001b[38;5;9m--\u001b[0m command to run",
+		"description": "如果版本号改变，则运行命令",
+		"args": {
+			"--no-cache": {
+				"usage": true,
+				"flag": true,
+				"description": "禁用缓存"
+			},
+			"--flush": {
+				"usage": true,
+				"flag": true,
+				"description": "程序成功退出时自动删除npm缓存"
+			},
+			"--newer": {
+				"flag": true,
+				"description": "只有在本地版本号大于远程版本号时才运行（默认只要不同就运行）"
+			}
+		},
+		"commonArgs": {},
+		"positional": false
+	},
+	{
+		"command": "sync-my-readme",
+		"help": "",
+		"usage": "",
+		"description": "内部开发命令",
+		"args": {},
+		"commonArgs": {},
+		"positional": false,
+		"isHidden": true
+	},
+	{
+		"command": "test",
+		"help": "没有帮助信息",
+		"usage": "\u001b[14;3m--test\u001b[0m 测试参数",
+		"description": "测试命令",
+		"args": {
+			"--test": {
+				"flag": false,
+				"usage": true,
+				"description": "关于test参数的说明"
+			}
+		},
+		"commonArgs": {},
+		"positional": false,
+		"isHidden": true
+	}
+];
+export const cli_imports = {
+	"detect-package-change": "./commands/detect-package-change.js",
+	"monorepo-bump-version": "./commands/monorepo-bump-version.js",
+	"monorepo-cnpm-sync": "./commands/monorepo-cnpm-sync.js",
+	"monorepo-invalid": "./commands/monorepo-invalid.js",
+	"monorepo-link-binaries": "./commands/monorepo-link-binaries.js",
+	"monorepo-list": "./commands/monorepo-list.js",
+	"monorepo-publish": "./commands/monorepo-publish.js",
+	"monorepo-tsconfig": "./commands/monorepo-tsconfig.js",
+	"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"
+} as const;

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

@@ -1,5 +1,5 @@
 import { sleep, type IPackageJson } from '@idlebox/common';
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { get as cacheGet, rm as cacheRm } from 'cacache';
 import { rm } from 'node:fs/promises';
 import { createRequire } from 'node:module';

package/src/common/functions/cli.ts

@@ -1,6 +1,4 @@
-import { createArgsReader } from '@idlebox/args';
-
-export const CSI = '\x1b[';
+import { app, argv } from '@idlebox/cli';
 
 export class DieError extends Error {
 	constructor(msg: string) {
@@ -8,86 +6,21 @@ export class DieError extends Error {
 		this.stack = this.message;
 	}
 }
-function die(msg: string) {
-	throw new DieError(msg);
-}
-
-export const argv = createArgsReader(process.argv.slice(2));
-
-type ArgDefine = {
-	/**
-	 * 为false时在后面加一个 <value>
-	 */
-	flag: boolean;
-	description: string;
-};
-const common_args = {
-	quiet: { flag: true, description: '减少输出' },
-	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格式（部分命令支持）' },
-	help: { flag: true, description: '显示帮助信息' },
-};
-type CommonArgs = keyof typeof common_args;
-const all_common_args = Object.keys(common_args) as ReadonlyArray<CommonArgs>;
 
-export abstract class CommandDefine {
-	/**
-	 * 紧接在命令后面的参数
-	 */
-	protected abstract readonly _usage: string;
-	/**
-	 * usage后面的简短说明
-	 */
-	protected abstract readonly _description: string;
-	/**
-	 * 多行详细帮助信息
-	 */
-	protected abstract readonly _help: string;
-	/**
-	 * 独特命令行参数
-	 */
-	protected readonly _arguments?: Record<string, ArgDefine>;
-	/**
-	 * 通用命令行参数
-	 */
-	protected readonly _commonArgs?: readonly CommonArgs[];
-
-	public readonly isHidden: boolean = false;
-
-	get help() {
-		let r = this._help;
-		if (this._arguments) {
-			const opts = formatOptions(this._arguments);
-			if (r) r += '\n';
-			r += opts;
-		}
-		return r;
-	}
+/** @deprecated */
+export const isQuiet = app.silent;
+export const isJsonOutput = argv.flag('--json') > 0;
 
-	get usage() {
-		return this._usage;
-	}
-	get description() {
-		return this._description;
-	}
-	get commonArgs() {
-		return this._commonArgs;
-	}
-}
+/** @deprecated */
+export const isHelp = app.showHelp;
 
-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', '-d']) > 0;
-export const isVerbose = argv.flag(['--debug', '-d']) > 1;
 
-if (isVerbose && isQuiet) {
-	die(`不能同时使用 --debug 和 --quiet: ${process.argv}`);
-}
+/** @deprecated */
+export const isDebugMode = app.debug;
+/** @deprecated */
+export const isVerbose = app.verbose;
 
 export function pArgS(s: string) {
 	return `\x1B[3;38;5;14m${s}\x1B[0m`;
@@ -98,51 +31,3 @@ export function pDesc(s: string) {
 export function pCmd(s: string) {
 	return `\x1B[38;5;10m${s}\x1B[0m`;
 }
-
-export const mainCliController = {
-	command: undefined as CommandDefine | undefined,
-	setCommand(cmd: CommandDefine) {
-		this.command = cmd;
-	},
-};
-
-export function printCommonOptions() {
-	process.stderr.write('\x1B[2m通用参数\x1B[0m:\n');
-
-	const whitelist = mainCliController.command?.commonArgs ?? all_common_args;
-	const clone_common: Record<string, ArgDefine> = {};
-	for (const key of whitelist) {
-		clone_common[key] = common_args[key];
-	}
-
-	process.stderr.write(formatOptions(clone_common, { color: 3, indent: '  ' }));
-}
-
-interface IFormatOptions {
-	color?: number;
-	indent?: string;
-}
-export function formatOptions(args: Record<string, ArgDefine>, { color, indent }: IFormatOptions = {}) {
-	let r = '';
-	if (!color) color = 14;
-	if (!indent) indent = '';
-
-	for (const [name, { description, flag }] of Object.entries(args)) {
-		const names = name.split(',').map((n) => {
-			n = n.trim();
-			if (!n.startsWith('-')) {
-				if (n.length > 1) {
-					n = `--${n}`;
-				} else {
-					n = `-${n}`;
-				}
-			}
-			return n;
-		});
-
-		const flag_suffix = flag ? '' : ' <value>';
-
-		r += `${indent}\x1B[38;5;${color}m${names.join(', ')}${flag_suffix}\x1B[0m: ${description}\n`;
-	}
-	return r;
-}

package/src/common/git/git.ts

@@ -1,4 +1,4 @@
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { commandInPath, execLazyError, exists } from '@idlebox/node';
 import { rm } from 'node:fs/promises';
 import { resolve } from 'node:path';

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

@@ -1,5 +1,5 @@
 import { ensureLinkTarget } from '@idlebox/ensure-symlink';
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { execLazyError, exists, writeFileIfChange } from '@idlebox/node';
 import { execa } from 'execa';
 import { dirname, resolve } from 'node:path';

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

@@ -1,4 +1,4 @@
-import { CSI, logger } from '@idlebox/logger';
+import { CSI, logger } from '@idlebox/cli';
 import { execLazyError, exists } from '@idlebox/node';
 import { resolve } from 'node:path';
 import { isVerbose } from '../functions/cli.js';

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

@@ -95,7 +95,8 @@ export async function resolveNpm(versions: Map<string, string>) {
 		versions.set(packName, newVersion);
 
 		let updated = '';
-		if (currentVersion && currentVersion !== newVersion) {
+		// new version must be ^x.y.z , current version is splitted, so must be x.y.z
+		if (currentVersion && !newVersion.includes(currentVersion)) {
 			updated = ` ${cs}(from ${currentVersion})${ce}`;
 		}
 

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

@@ -1,6 +1,6 @@
 import type { IPackageJson } from '@idlebox/common';
 import { loadJsonFile, writeJsonFileBack } from '@idlebox/json-edit';
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { readFile, writeFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { inc } from 'semver';
@@ -25,6 +25,7 @@ function sort(object: any): any {
 export async function makePackageJsonOrderConsistence(root: string) {
 	const filepath = resolve(root, 'package.json');
 	const data = JSON.parse(await readFile(filepath, 'utf-8'));
+	delete data.devDependencies;
 	const json = sort(data);
 	await writeFile(filepath, JSON.stringify(json, null, 2), 'utf-8');
 

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

@@ -1,5 +1,5 @@
 import { escapeRegExp } from '@idlebox/common';
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { getEnvironment } from '@idlebox/node';
 import type { IPackageManager } from './package-manager.js';
 

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

@@ -1,4 +1,4 @@
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import type { PackageManager } from '../package-manager/driver.abstract.js';
 
 export async function clearNpmMetaCache(pm: PackageManager, names: readonly string[]) {

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

@@ -1,7 +1,7 @@
-import { logger } from '@idlebox/logger';
+import { CSI, logger } from '@idlebox/cli';
 import { checkChildProcessResult, printLine } from '@idlebox/node';
 import { execa } from 'execa';
-import { CSI, isQuiet } from '../functions/cli.js';
+import { isQuiet } from '../functions/cli.js';
 
 export async function cnpmSyncNames(names: ReadonlyArray<string>, collectOutput = isQuiet, dryRun = false) {
 	console.log(`🔃 cnpm同步${names.length}个包`);

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

@@ -1,4 +1,4 @@
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { PathEnvironment } from '@idlebox/node';
 import { resolve } from 'node:path';
 import { gt } from 'semver';

package/src/common/shared-jobs/publish-package-version-job.ts

@@ -1,4 +1,4 @@
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { exists } from '@idlebox/node';
 import { copyFile } from 'node:fs/promises';
 import { resolve } from 'node:path';

package/src/common/taball/decompress.ts

@@ -1,5 +1,5 @@
 import { convertCatchedError } from '@idlebox/common';
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { existsSync, unlinkSync } from 'node:fs';
 import tgz from 'targz';
 

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

@@ -1,5 +1,5 @@
 import { sleep } from '@idlebox/common';
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { exists, streamPromise } from '@idlebox/node';
 import { createWriteStream } from 'node:fs';
 import { mkdir, readFile, rename, writeFile } from 'node:fs/promises';

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

@@ -1,7 +1,7 @@
 import type { WorkspaceBase } from '@build-script/monorepo-lib';
 import { registerGlobalLifecycle } from '@idlebox/common';
 import { writeJsonFile } from '@idlebox/json-edit';
-import { logger } from '@idlebox/logger';
+import { logger } from '@idlebox/cli';
 import { emptyDir } from '@idlebox/node';
 import { randomBytes } from 'node:crypto';
 import { rmSync } from 'node:fs';

package/src/common/version.generated.ts

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

package/src/main.ts

@@ -1,132 +1,15 @@
-import type { ISubArgsReaderApi } from '@idlebox/args';
-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 { registerShutdownHandlers, shutdown } from './common/functions/global-lifecycle.js';
-import { configureProxyFromEnvironment } from './common/package-manager/proxy.js';
+import { makeApplication, type ArgDefineMap } from '@idlebox/cli';
+import { cli_commands, cli_imports } from './commands.generated.js';
 
-createRootLogger('', isVerbose ? EnableLogLevel.verbose : isQuiet ? EnableLogLevel.error : EnableLogLevel.log);
+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格式（部分命令支持）' },
+};
 
-const usage_prefix = '\x1B[1mnjspkg\x1B[0m \x1B[38;5;3m[通用参数]\x1B[0m';
+await makeApplication().withCommon(common_args).static(cli_imports, cli_commands);
 
-try {
-	process.exitCode = await main();
-	if (argv.flag('--verbose')) {
-		console.log('exit code: %d', process.exitCode);
-	}
-	process.exit();
-} catch (e: any) {
-	if (e instanceof AppExit) {
-	} else if (e instanceof DieError) {
-		console.error('错误: %s', e.message);
-		shutdown(1);
-	} else {
-		prettyPrintError('package-tools:main', e);
-		shutdown(1);
-	}
-}
-
-type MainFunc = (argv: ISubArgsReaderApi) => Promise<number> | number;
-
-async function importCommand(cmd: keyof typeof cmdList) {
-	const exports = await import(cmdList[cmd]);
-	const main: MainFunc = exports.main;
-	const Command: new () => CommandDefine = exports.Command;
-	return { main, Command };
-}
-
-async function main() {
-	const chdir = argv.single(['--package']);
-	if (chdir) process.chdir(resolve(process.cwd(), chdir));
-
-	const allKnownCommands = Object.keys(cmdList) as (keyof typeof cmdList)[];
-
-	const subArgv = argv.command(allKnownCommands);
-
-	if (subArgv?.value && cmdList[subArgv.value]) {
-		const cmd = subArgv.value;
-		const { main, Command } = await importCommand(cmd);
-
-		if (isHelp) {
-			const command = new Command();
-			process.stderr.write(`Usage: ${usage_prefix} ${pCmd(cmd)} ${command.usage.trim()}\n`);
-			process.stderr.write(`${command.help.trim().replace(/^/gm, '  ')}\n\n`);
-			printCommonOptions();
-			process.stderr.write('\n');
-			return 0;
-		}
-
-		registerShutdownHandlers();
-		configureProxyFromEnvironment();
-
-		// RUN MAIN HERE
-		return await main(subArgv);
-	}
-
-	if (isHelp) {
-	} else if (argv.unused().length === 0) {
-		console.error('Command is required. pass -h / --help to get usage.');
-		return 1;
-	} else {
-		console.error('\x1B[38;5;9mUnknown command: %s\x1B[0m\n', argv.unused()[0]);
-
-		printLegend();
-		process.stderr.write('\n');
-		const tbl = table();
-		for (const cmd of allKnownCommands) {
-			const { Command } = await importCommand(cmd);
-
-			const command = new Command();
-			if (command.isHidden) continue;
-
-			tbl.line(cmd, command.description.trim());
-		}
-		tbl.emit();
-		process.stderr.write('\n');
-
-		return 22;
-	}
-
-	printLegend();
-	process.stderr.write('\n');
-	printCommonOptions();
-	process.stderr.write('\n');
-
-	for (const cmd of allKnownCommands) {
-		const { Command } = await importCommand(cmd);
-		const command = new Command();
-		if (command.isHidden) continue;
-
-		let usage = command.usage.trim();
-		if (usage) usage += ' ';
-		usage += pDesc(command.description.trim());
-		process.stderr.write(`${pCmd(cmd)} ${usage}\n`);
-		const s = command.help.trim();
-		process.stderr.write(`${s.replace(/^/gm, '  ')}\n\n`);
-	}
-
-	return isHelp ? 0 : 22;
-}
-
-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`);
-}
-
-function table() {
-	const elements: [string, string][] = [];
-
-	return {
-		line(left: string, right: string) {
-			elements.push([left, right]);
-		},
-		emit() {
-			const max_left = Math.max(...elements.map((s) => s[0].length));
-
-			for (const [left, right] of elements) {
-				process.stderr.write(`  ${pCmd(left.padEnd(max_left))}  ${right}\n`);
-			}
-		},
-	};
-}
+// await makeApplication()
+// 	.withCommon(common_args)
+// 	.dynamic(resolve(import.meta.dirname, 'commands'), '*.js');

package/lib/command-file-map.generated.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"command-file-map.generated.d.ts","sourceRoot":"","sources":["../src/command-file-map.generated.ts"],"names":[],"mappings":"AAKA;;;;;;;gFAOgF;;;;;;;;;;;;;;;AAEhF,wBAaW"}