@zwa73/dev-utils 1.0.87 → 1.0.89

package/bin/cli

@@ -1,5 +1,5 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
-const {cliRoute} = require('../dist/cjs/index.js');
+const {cliRoute} = require('../dist/index.js');
 
 cliRoute();

package/data/template/base/package.json

@@ -3,12 +3,12 @@
     "version": "1.0.0",
     "description": "<%= projectDescription %>",
     "exports": {
-        ".": {
-            "require": "./dist/cjs/index.js",
-            "import": "./dist/mjs/index.js"
-        }
-    },
-	"types": "./dist/mjs/index.d.ts",
+		".": {
+			"require": "./dist/cjs/index.js",
+			"import": "./dist/mjs/index.mjs",
+			"types": "./dist/types/index.d.ts"
+		}
+	},
     "scripts": {
         "test": "jest",
         "expand-macro": "powershell scripts/expand-macro",

package/data/template/base/scripts/compile.ps1

@@ -1,8 +1,25 @@
-Write-Output 开始删除原dist
+npm run expand-macro
+Write-Output 开始删除原dist
 Remove-Item -Recurse -Force dist
 Write-Output 开始编译
-tsc -p tsconfig.cjs.json
-tsc-alias -p tsconfig.cjs.json
-tsc -p tsconfig.mjs.json
-tsc-alias -p tsconfig.mjs.json
-tsc-esm-fix --tsconfig "./tsconfig.mjs.json"
+
+$CurrentDir = Get-Location
+
+Start-Job -Name "JobCjs" -ScriptBlock {
+    Set-Location $using:CurrentDir
+    tsc -p tsconfig.cjs.json
+    tsc-alias -p tsconfig.cjs.json
+}
+Start-Job -Name "JobMjs" -ScriptBlock {
+    Set-Location $using:CurrentDir
+    tsc -p tsconfig.mjs.json
+    tsc-alias -p tsconfig.mjs.json
+    tsc-esm-fix --tsconfig "./tsconfig.mjs.json" --ext ".mjs"
+}
+Start-Job -Name "JobTypes" -ScriptBlock {
+    Set-Location $using:CurrentDir
+    tsc -p tsconfig.types.json
+    tsc-alias -p tsconfig.types.json
+}
+Wait-Job -State Running
+Get-Job | Receive-Job

package/data/template/base/tsconfig.cjs.json

@@ -1,7 +1,8 @@
 {
     "extends": "./tsconfig.compile.json",
     "compilerOptions": {
-        "module": "commonjs",
+        "module": "node16",
+        "moduleResolution": "node16",
         "outDir": "./dist/cjs",
         "target": "ES2022"
     }

package/data/template/base/tsconfig.json

@@ -2,16 +2,14 @@
   "compilerOptions": {
     "allowJs": true,
     "strict": true,
-    "module": "commonjs",
-    "moduleResolution": "node",
     "target": "ES2022",
+    "module": "node16",
+    "moduleResolution": "node16",
     "esModuleInterop": true,
-    "outDir": "./dist",
-    "declaration": true,
-    "baseUrl": ".",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "skipLibCheck": true,
+    "baseUrl": ".",
     "paths": {
 			"@/src/*"           : ["./src/*"],
 			"@/*"               : ["./*"],

package/data/template/base/tsconfig.mjs.json

@@ -2,8 +2,8 @@
     "extends": "./tsconfig.compile.json",
     "compilerOptions": {
         "module": "ESNext",
+        "moduleResolution": "bundler",
         "outDir": "./dist/mjs",
-        "target": "ESNext",
-        "allowSyntheticDefaultImports": true
+        "target": "ESNext"
     }
 }

package/data/template/base/tsconfig.types.json

@@ -0,0 +1,8 @@
+{
+    "extends": "./tsconfig.compile.json",
+    "compilerOptions": {
+        "outDir": "./dist/types",
+        "declaration": true,
+        "emitDeclarationOnly": true
+    }
+}

package/data/template/cjs/gitignore

@@ -0,0 +1,3 @@
+**/node_modules/**
+**/test/**
+dist/**

package/data/template/cjs/package.json

@@ -0,0 +1,19 @@
+{
+    "name": "<%= projectName %>",
+    "version": "1.0.0",
+    "description": "<%= projectDescription %>",
+	"main": "dist/index.js",
+    "scripts": {
+        "test": "jest",
+        "expand-macro": "powershell scripts/expand-macro",
+        "release": "powershell scripts/release",
+        "compile": "powershell scripts/compile",
+        "watch": "powershell scripts/watch"
+    },
+    "author": "<%= authorName %>",
+    "license": "ISC",
+    "files": [
+        "data",
+        "dist"
+    ]
+}

package/data/template/cjs/scripts/compile.ps1

@@ -0,0 +1,6 @@
+npm run expand-macro
+Write-Output 开始删除原dist
+Remove-Item -Recurse -Force dist
+Write-Output 开始编译
+tsc -p tsconfig.compile.json
+tsc-alias -p tsconfig.compile.json

package/data/template/cjs/scripts/expand-macro.ps1

@@ -0,0 +1,2 @@
+Write-Output 开始展开宏
+npx zcli Expand-Macro

package/data/template/cjs/scripts/release.ps1

@@ -0,0 +1,4 @@
+Write-Output 开始编译
+npm run compile
+Write-Output 开始发布
+npx zcli release

package/data/template/cjs/scripts/watch.ps1

@@ -0,0 +1,10 @@
+# 定义一个函数来运行脚本
+function New-Script {
+    param($command)
+    # 在后台运行命令
+    Start-Process -NoNewWindow -FilePath "powershell" -ArgumentList "-Command", $command
+}
+
+# 开始运行脚本
+New-Script "tsc -w -p tsconfig.compile.json"
+New-Script "tsc-alias -w -p tsconfig.compile.json"

package/data/template/cjs/src/macro.macro.ts

@@ -0,0 +1,6 @@
+import { UtilMacro } from '@zwa73/dev-utils';
+
+
+
+
+UtilMacro.exportComment('src/**/index.ts');

package/data/template/cjs/tsconfig.compile.json

@@ -0,0 +1,12 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "module": "node16",
+        "moduleResolution": "node16",
+        "outDir": "./dist",
+        "target": "ES2022",
+        "declaration": true
+    },
+    "include": ["./src/**/*.ts", "./src/**/*.js"],
+    "exclude": ["./node_modules/**/*","./src/**/*.macro.ts","./src/**/*.schema.ts"]
+}

package/data/template/cjs/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "allowJs": true,
+    "strict": true,
+    "target": "ES2022",
+    "module": "node16",
+    "moduleResolution": "node16",
+    "esModuleInterop": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "baseUrl": ".",
+    "paths": {
+			"@/src/*"           : ["./src/*"],
+			"@/*"               : ["./*"],
+			"@"                 : ["./src/index"]
+    }
+  },
+  "include": ["./src/**/*.ts", "./src/**/*.js","./jest/**/*.ts"],
+  "exclude": ["./node_modules/**/*"]
+}

package/data/template/electron/package.json

@@ -12,29 +12,29 @@
     "lint": "eslint --ext .ts,.tsx ."
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-react": "^7.24.7",
-    "@electron-forge/cli": "^7.4.0",
-    "@electron-forge/maker-deb": "^7.4.0",
-    "@electron-forge/maker-rpm": "^7.4.0",
-    "@electron-forge/maker-squirrel": "^7.4.0",
-    "@electron-forge/maker-zip": "^7.4.0",
-    "@electron-forge/plugin-auto-unpack-natives": "^7.4.0",
-    "@electron-forge/plugin-fuses": "^7.4.0",
-    "@electron-forge/plugin-webpack": "^7.4.0",
-    "@electron/fuses": "^1.8.0",
+    "@babel/core": "7.25.2",
+    "@babel/preset-react": "7.24.7",
+    "@electron-forge/cli": "7.4.0",
+    "@electron-forge/maker-deb": "7.4.0",
+    "@electron-forge/maker-rpm": "7.4.0",
+    "@electron-forge/maker-squirrel": "7.4.0",
+    "@electron-forge/maker-zip": "7.4.0",
+    "@electron-forge/plugin-auto-unpack-natives": "7.4.0",
+    "@electron-forge/plugin-fuses": "7.4.0",
+    "@electron-forge/plugin-webpack": "7.4.0",
+    "@electron/fuses": "1.8.0",
     "@types/node": "^22.5.2",
-    "@types/react": "^18.3.5",
-    "@types/react-dom": "^18.3.0",
-    "@vercel/webpack-asset-relocator-loader": "^1.7.3",
-    "babel-loader": "^9.1.3",
-    "css-loader": "^6.11.0",
-    "electron": "*",
-    "fork-ts-checker-webpack-plugin": "^7.3.0",
-    "node-loader": "^2.0.0",
-    "style-loader": "^3.3.4",
-    "ts-loader": "^9.5.1",
-    "ts-node": "^10.9.2",
+    "@types/react": "18.3.5",
+    "@types/react-dom": "18.3.0",
+    "@vercel/webpack-asset-relocator-loader": "1.7.3",
+    "babel-loader": "9.1.3",
+    "css-loader": "6.11.0",
+    "electron": "31.3.1",
+    "fork-ts-checker-webpack-plugin": "7.3.0",
+    "node-loader": "2.0.0",
+    "style-loader": "3.3.4",
+    "ts-loader": "9.5.1",
+    "ts-node": "10.9.2",
     "tsconfig-paths-webpack-plugin": "^4.1.0",
     "typescript": "~4.5.4"
   },
@@ -46,9 +46,9 @@
   "dependencies": {
     "@zwa73/react-utils": "*",
     "@zwa73/utils": "*",
-    "electron-squirrel-startup": "^1.0.1",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
+    "electron-squirrel-startup": "1.0.1",
+    "react": "18.3.1",
+    "react-dom": "18.3.1",
     "styled-components": "^6.1.13"
   }
 }

package/dist/{cjs/Command → Command}/GenI18n.js

@@ -5,18 +5,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdGenI18n = void 0;
 const utils_1 = require("@zwa73/utils");
-const ts_morph_1 = require("ts-morph");
 const UtilAst_1 = require("../UtilAst");
 const pathe_1 = __importDefault(require("pathe"));
+const DynImport_1 = require("../DynImport");
 function format(str) {
     return str.replace(/\\(.)/g, '$1').replace(/%/g, '\\%');
 }
 async function procFile(p, filePath, funckey) {
+    const TsMorph = await (0, DynImport_1.importTsMorph)();
+    const { SyntaxKind } = TsMorph;
     const date = new Date().toISOString();
     //const content = await fs.promises.readFile(filePath,'utf-8');
     const b = p.addSourceFileAtPath(filePath);
     //const b = p.createSourceFile(path.relative(process.cwd(),filePath),content,{overwrite:true});
-    const ds = b.getDescendantsOfKind(ts_morph_1.SyntaxKind.TaggedTemplateExpression);
+    const ds = b.getDescendantsOfKind(SyntaxKind.TaggedTemplateExpression);
     const dats = [];
     for (const d of ds) {
         if (!funckey.includes(d.getTag().getText()))
@@ -25,17 +27,17 @@ async function procFile(p, filePath, funckey) {
         let result = '';
         let i = 0;
         UtilAst_1.UtilAst.withKind(template, {
-            [ts_morph_1.SyntaxKind.NoSubstitutionTemplateLiteral]: (t) => result += format(t.getLiteralText()),
-            [ts_morph_1.SyntaxKind.TemplateExpression]: (t) => {
+            [SyntaxKind.NoSubstitutionTemplateLiteral]: (t) => result += format(t.getLiteralText()),
+            [SyntaxKind.TemplateExpression]: (t) => {
                 t.getChildren().forEach((c) => {
                     UtilAst_1.UtilAst.withKind(c, {
-                        [ts_morph_1.SyntaxKind.TemplateHead]: (sc) => result += format(sc.getLiteralText()),
-                        [ts_morph_1.SyntaxKind.SyntaxList]: (sc) => {
-                            sc.getChildrenOfKind(ts_morph_1.SyntaxKind.TemplateSpan).forEach((span) => {
+                        [SyntaxKind.TemplateHead]: (sc) => result += format(sc.getLiteralText()),
+                        [SyntaxKind.SyntaxList]: (sc) => {
+                            sc.getChildrenOfKind(SyntaxKind.TemplateSpan).forEach((span) => {
                                 span.getChildren().forEach((ssc) => {
                                     result += UtilAst_1.UtilAst.withKind(ssc, {
-                                        [ts_morph_1.SyntaxKind.TemplateMiddle]: (sssc) => format(sssc.getLiteralText()),
-                                        [ts_morph_1.SyntaxKind.TemplateTail]: (sssc) => format(sssc.getLiteralText()),
+                                        [SyntaxKind.TemplateMiddle]: (sssc) => format(sssc.getLiteralText()),
+                                        [SyntaxKind.TemplateTail]: (sssc) => format(sssc.getLiteralText()),
                                     }) ?? String(`%${i++}`);
                                 });
                             });
@@ -57,10 +59,12 @@ async function procFile(p, filePath, funckey) {
     return dats;
 }
 async function scanI18n(i18nDataDir, include, exclude, funckey) {
+    const TsMorph = await (0, DynImport_1.importTsMorph)();
+    const { Project } = TsMorph;
     const fixedKey = typeof funckey == 'string' ? [funckey] : funckey;
     const filePaths = (await utils_1.UtilFT.fileSearchGlob(process.cwd(), include, { ingore: exclude }))
         .filter(p => ['.ts', '.tsx'].includes(pathe_1.default.parse(p).ext));
-    const project = new ts_morph_1.Project();
+    const project = new Project();
     await utils_1.SI18n.init(i18nDataDir, '*');
     //console.log(filePaths);
     (await Promise.all(filePaths.map(p => procFile(project, p, fixedKey))))

package/dist/{cjs/Command → Command}/GenTemplate.js

@@ -41,7 +41,7 @@ const CmdGenTemplate = (program) => program
     .command("Gen-Template")
     .alias("gentemplate")
     .description("生成项目模板")
-    .argument("<template>", "项目模板 可用 base|electron")
+    .argument("<template>", "项目模板 可用 base|cjs|electron")
     .requiredOption("-n, --projectName <name>", "项目名称")
     .requiredOption("-d, --projectDescription <description>", "项目描述")
     .requiredOption("-a, --authorName <name>", "作者名")
@@ -51,15 +51,18 @@ const CmdGenTemplate = (program) => program
         utils_1.SLogger.error(`模板 ${templateName} 不存在`);
     const projectPath = pathe_1.default.join(process.cwd(), opt.projectName);
     await utils_1.UtilFT.ensurePathExists(projectPath, { dir: true });
+    //复制模板
     await copyData(templatePath, projectPath);
-    await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
-    if (await utils_1.UtilFT.pathExists(pathe_1.default.join(projectPath, "gitignore")))
-        await fs_1.default.promises.rename(pathe_1.default.join(projectPath, "gitignore"), pathe_1.default.join(projectPath, ".gitignore"));
+    //修改package.json
     const packageJson = await utils_1.UtilFT.loadJSONFile(pathe_1.default.join(projectPath, 'package.json'));
     packageJson.name = opt.projectName;
     packageJson.description = opt.projectDescription;
     packageJson.author = opt.authorName;
     await utils_1.UtilFT.writeJSONFile(pathe_1.default.join(projectPath, 'package.json'), packageJson);
+    //安装依赖
+    await installPackage(projectPath, ['@zwa73/utils'], ['@types/node']);
+    if (await utils_1.UtilFT.pathExists(pathe_1.default.join(projectPath, "gitignore")))
+        await fs_1.default.promises.rename(pathe_1.default.join(projectPath, "gitignore"), pathe_1.default.join(projectPath, ".gitignore"));
     switch (templateName) {
         case 'base': break;
         case 'electron': break;

package/dist/{cjs/Command → Command}/MapPath.js

@@ -7,8 +7,7 @@ exports.CmdMapPath = void 0;
 const utils_1 = require("@zwa73/utils");
 const fs_1 = __importDefault(require("fs"));
 const pathe_1 = __importDefault(require("pathe"));
-const DupMethodList = ["skip", "overwrite", "move"];
-const DupMethodWithoutMove = DupMethodList.filter(t => t != 'move');
+const DupMethodList = ["skip", "overwrite"];
 /**重命名文件或路径 */
 const CmdMapPath = (program) => program
     .command("Map-Path")
@@ -17,12 +16,14 @@ const CmdMapPath = (program) => program
     .argument("<regex>", "要匹配的正则表达式, posix风格路径")
     .argument("<replacement>", "替换字符串")
     .option("-e, --exclude <regex>", "排除文件的正则表达式")
-    .option(`-d, --duplicate-handling <${DupMethodWithoutMove.join('|')}|[path:string]>`, `处理重名文件的方式:
+    .option(`-d, --duplicate-handling <${DupMethodList.join('|')}|[path:string]>`, `处理重名文件的方式:
 skip 不进行处理
 overwrite 覆盖重名
 其他字符串 将重名部分映射到指定目录下的对应位置, 再次重复将会覆盖`, "skip")
     .option("-r, --recursive", "是否处理子目录", false)
     .option("-m, --move", "重命名而不是复制文件", false)
+    .option("-o, --output <path>", "输出到某个绝对路径而非当前目录", '')
+    .option("-i, --input <path>", "扫描某个绝对路径而非当前目录", '')
     .option("-t, --test", "不对文件进行实际操作, 在控制台输出映射结果", false)
     .action(async (regexStr, replacement, options) => {
     const regex = new RegExp(regexStr);
@@ -30,42 +31,50 @@ overwrite 覆盖重名
     if (!DupMethodList.includes(options.duplicateHandling))
         (0, utils_1.throwError)(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
     const duplicateHandling = options.duplicateHandling;
-    const basePath = process.cwd();
+    const absout = options.output.length > 0;
+    const absin = options.input.length > 0;
+    const searchPath = absin ? options.input : process.cwd();
+    const outPath = absout ? options.output : process.cwd();
     // 遍历当前目录下的所有文件
-    const filePaths = (await utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive }))
-        .map((filePath) => pathe_1.default.relative(basePath, filePath))
-        .filter((filePath) => excludeRegex ? (!excludeRegex.test(filePath)) : true);
+    const filePaths = (await utils_1.UtilFT.fileSearchRegex(searchPath, regex, { relative: options.recursive }))
+        .map(fp => pathe_1.default.relative(searchPath, fp))
+        .filter(fp => excludeRegex ? (!excludeRegex.test(fp)) : true);
     //对单个路径映射
     const mapPath = async (source, target) => {
-        const dir = pathe_1.default.parse(target).dir;
-        await utils_1.UtilFT.ensurePathExists(dir, { dir: true });
         if (options.test)
             return utils_1.SLogger.info(`${source} -> ${target}`);
+        const dir = pathe_1.default.parse(target).dir;
+        await utils_1.UtilFT.ensurePathExists(dir, { dir: true });
         if (options.move)
-            await fs_1.default.promises.rename(source, target);
-        else
-            await fs_1.default.promises.copyFile(source, target);
+            return fs_1.default.promises.rename(source, target);
+        return fs_1.default.promises.copyFile(source, target);
     };
-    for (const filePath of filePaths) {
+    await Promise.all(filePaths.map(async (rawfilePath) => {
+        const filePath = pathe_1.default.normalize(rawfilePath);
+        const replacedFilePath = filePath.replace(regex, replacement);
         // 重命名文件
-        const newFilePath = filePath.replace(regex, replacement);
+        const oldFilePath = absin
+            ? pathe_1.default.join(searchPath, filePath)
+            : filePath;
+        const newFilePath = absout
+            ? pathe_1.default.join(outPath, replacedFilePath) //如果是绝对路径输出则拼接绝对路径
+            : replacedFilePath;
         // 如果文件名发生了变化
-        if (newFilePath === filePath)
-            continue;
+        if (newFilePath === oldFilePath)
+            return;
         //如果文件已存在
         if (await utils_1.UtilFT.pathExists(newFilePath)) {
-            if (DupMethodWithoutMove.includes(options.duplicateHandling)) {
-                const fixhd = duplicateHandling;
-                await (0, utils_1.match)(fixhd, {
+            //如果是跳过或覆盖
+            if (DupMethodList.includes(options.duplicateHandling)) {
+                return (0, utils_1.match)(duplicateHandling, {
                     'skip': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
-                    'overwrite': () => mapPath(filePath, newFilePath),
+                    'overwrite': () => mapPath(oldFilePath, newFilePath),
                 });
             }
-            else
-                await mapPath(filePath, pathe_1.default.join(duplicateHandling, newFilePath));
+            //如果是转移位置
+            return mapPath(oldFilePath, pathe_1.default.join(outPath, duplicateHandling, replacedFilePath));
         }
-        else
-            await mapPath(filePath, newFilePath);
-    }
+        return mapPath(oldFilePath, newFilePath);
+    }));
 });
 exports.CmdMapPath = CmdMapPath;

package/dist/{cjs/Command → Command}/Release.js

@@ -34,6 +34,8 @@ function checkVersion(oldVersion, newVersion) {
 async function updateVersion(newVersion) {
     const packagePath = pathe_1.default.join(RouteInterface_1.PROCESS_PATH, "package.json");
     const packageData = await (0, utils_1.memoize)(utils_1.UtilFT.loadJSONFile)(packagePath);
+    if (newVersion == 'current')
+        return packageData.version;
     if (newVersion) {
         checkVersion(packageData.version, newVersion);
         packageData.version = newVersion;
@@ -59,7 +61,7 @@ const CmdRelease = (program) => program
     .command("Release")
     .alias("release")
     .description("更新版本号并发布包")
-    .option("-v, --version <version>", "指定发布的版本号 格式应为 `${number}.${number}.${number}`")
+    .option("-v, --version <version>", "指定发布的版本号, 为 `current` 时不更新版本号, 格式应为 `${number}.${number}.${number}`")
     .option("-a, --access <access>", "npm publish 的 access 参数 默认 public", "public")
     .option("-l, --local <path>", "仅打包到本地对印目录下 如./build/", undefined)
     .action(async (opt) => {

package/dist/Command/ScanDups.js

@@ -0,0 +1,122 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdScanDups = void 0;
+const utils_1 = require("@zwa73/utils");
+const pathe_1 = __importDefault(require("pathe"));
+const fs_1 = __importDefault(require("fs"));
+const DynImport_1 = require("../DynImport");
+const { tap } = utils_1.UtilFP;
+/**hashlist转为dupmap */
+const reduce2Dupmap = (list) => list.reduce((acc, cur) => {
+    const files = acc[cur.hash] ?? [];
+    acc[cur.hash] = [...files, cur.filePath]; // 分类采样哈希到对应文件路径
+    return acc;
+}, {});
+/**从dupmap提取重复的filepath */
+const reduce2DupFpList = (map) => Object.entries(map).reduce((acc, [hash, files]) => files.length > 1 ? [...acc, ...files] : acc, // 筛选出重复采样哈希的文件路径
+[]);
+/**扫描文件结构 */
+const scanDirStruct = (0, utils_1.memoize)(async (root) => {
+    const list = await fs_1.default.promises.readdir(root, { withFileTypes: true });
+    const stack = await Promise.all(list.map(async (fp) => fp.isDirectory()
+        ? [fp.name, await scanDirStruct(pathe_1.default.join(root, fp.name))]
+        : [fp.name, pathe_1.default.join(root, fp.name)]));
+    return stack.reduce((acc, cur) => ({
+        ...acc, [cur[0]]: cur[1],
+    }), {});
+});
+const hashQueue = new utils_1.PromiseQueue({ concurrency: 8 });
+/**计算文件结构的hash */
+async function struct2hash(struct, fn) {
+    const recursion = (struct) => {
+        return Object.entries(struct).map(async ([k, v]) => {
+            if (typeof v === "string")
+                return [await hashQueue.enqueue(async () => fn(v))];
+            return (await Promise.all(recursion(v))).flat();
+        });
+    };
+    return utils_1.UtilFunc.calcHash((await Promise.all(recursion(struct)))
+        .flat().join('|'), { algorithm: "blake2b512" });
+}
+/**重命名文件或路径 scan_duplicates */
+const CmdScanDups = (program) => program
+    .command("Scan-Dups")
+    .alias("scandups")
+    .description("扫描当前目录下hash重复的文件")
+    .option("-i, --include <regex>", "文件的正则表达式, 使用posix路径", ".*")
+    .option("-o, --out <dir|console>", "输出的json文件路径, 默认 scandups.json, 为 \"console\" 时无文件输出", "scandups")
+    .option("-r, --recursive", "是否处理子目录, 默认 true", true)
+    .option("-s, --struct", `结构模式
+只扫描 -i 参数目录下的单层目录, 并计算目录是否出现相同的层次结构
+默认 false`, true)
+    .option("-d, --dir <dirs...>", `扫描的根目录, 以空格分隔 -d "a/b c" "d e/f", 默认为命令行当前目录`, [])
+    .action(async (options) => {
+    const { out: outtype, recursive, include, struct, dir } = options;
+    const regex = new RegExp(include);
+    const basePath = process.cwd();
+    const pathList = dir.length <= 0
+        ? [process.cwd()]
+        : dir.map(d => pathe_1.default.isAbsolute(d) ? d : pathe_1.default.join(process.cwd(), d));
+    // 添加一个多步进度条
+    const cliProgress = await (0, DynImport_1.importCliProgress)();
+    const progressBar = new cliProgress.MultiBar({
+        clearOnComplete: true, hideCursor: true,
+        format: " {task} [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} | {status}",
+    }, cliProgress.Presets.shades_classic);
+    // 文件结构进度条
+    const structProgress = struct ? progressBar.create(1, 0, { task: "结构扫描", status: "准备中..." }) : undefined;
+    // 采样哈希进度条
+    const sampledProgress = progressBar.create(1, 0, { task: "快速扫描", status: "准备中..." });
+    // 完整哈希进度条
+    const fullHashProgress = progressBar.create(1, 0, { task: "完整扫描", status: "准备中..." });
+    await (0, utils_1.pipe)(
+    // 第一步：文件搜索，获取符合正则的文件路径
+    Promise.all(pathList.map(async (p) => {
+        if (struct)
+            return (await fs_1.default.promises.readdir(p, { withFileTypes: true }))
+                .filter(fp => fp.isDirectory())
+                .map(fp => pathe_1.default.join(p, fp.name));
+        return await utils_1.UtilFT.fileSearchRegex(p, regex.source, { recursive });
+    })), stacklist => stacklist.flat(), // 扁平化文件路径列表
+    // 如果是结构模式则先筛选相同结构
+    // 扁平化文件路径列表
+    list => struct ? (0, utils_1.pipe)(list, tap(dupFpList => (structProgress.setTotal(dupFpList.length),
+        structProgress.update(0, { status: `结构扫描检出 ${dupFpList.length} 个可能的相等项` }))), list => utils_1.Stream.from(list, 8)
+        .map(async (filePath) => ({
+        filePath,
+        hash: await struct2hash(await scanDirStruct(filePath), cpath => pathe_1.default.relative(filePath, cpath)).then(tap(() => structProgress.increment()))
+    }))
+        .toArray(), reduce2Dupmap, reduce2DupFpList) : list, 
+    // 第二步：快速扫描，计算采样哈希
+    tap(list => (sampledProgress.setTotal(list.length),
+        sampledProgress.update(0, { status: `总计 ${list.length} 个文件` }))), list => utils_1.Stream.from(list, 8)
+        .map(async (filePath) => ({
+        filePath,
+        hash: struct
+            ? await struct2hash(await scanDirStruct(filePath), (str) => utils_1.UtilFT.calculateHash(str, { sampled: true })).then(tap(() => sampledProgress.increment()))
+            : await utils_1.UtilFT.calculateHash(filePath, { sampled: true }).then(tap(() => sampledProgress.increment())),
+    }))
+        .toArray(), 
+    // 第三步：筛选重复的采样哈希 (去掉唯一的采样哈希)
+    reduce2Dupmap, reduce2DupFpList, 
+    // 第四步：对筛选出的重复文件路径并发计算完整哈希
+    tap(dupFpList => (fullHashProgress.setTotal(dupFpList.length),
+        fullHashProgress.update(0, { status: `快速扫描检出 ${dupFpList.length} 个可能的相等项` }))), dupFpList => utils_1.Stream.from(dupFpList, 8)
+        .map(async (filePath) => ({
+        filePath,
+        hash: struct
+            ? await struct2hash(await scanDirStruct(filePath), (str) => utils_1.UtilFT.calculateHash(str)).then(tap(() => sampledProgress.increment()))
+            : await utils_1.UtilFT.calculateHash(filePath).then(tap(() => fullHashProgress.increment())), // 计算完整哈希
+    }))
+        .toArray(), 
+    // 第五步：重新整理完整哈希结果, 过滤唯一哈希
+    reduce2Dupmap, map => Object.entries(map).reduce((acc, [hash, files]) => files.length <= 1 ? acc : { ...acc, [hash]: files }, {}), 
+    // 第六步：输出结果
+    tap(() => progressBar.stop()), out => (0, utils_1.match)(outtype, {
+        "console": () => utils_1.SLogger.info(out),
+    }, () => utils_1.UtilFT.writeJSONFile(pathe_1.default.join(basePath, outtype), out)));
+});
+exports.CmdScanDups = CmdScanDups;

package/dist/DynImport.d.ts

@@ -0,0 +1,15 @@
+import type { getProgramFromFiles, buildGenerator } from 'typescript-json-schema';
+import type { Project, SyntaxKind } from 'ts-morph';
+import type cliProgress from "cli-progress";
+type TJSInstance = {
+    getProgramFromFiles: typeof getProgramFromFiles;
+    buildGenerator: typeof buildGenerator;
+};
+type TsMorphInstance = {
+    Project: typeof Project;
+    SyntaxKind: typeof SyntaxKind;
+};
+export declare function importTsMorph(): Promise<TsMorphInstance>;
+export declare function importTJS(): Promise<TJSInstance>;
+export declare function importCliProgress(): Promise<typeof cliProgress>;
+export {};