@zwa73/dev-utils 1.0.89 → 1.0.90

package/bin/cli

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

package/data/template/base/package.json

@@ -2,6 +2,7 @@
     "name": "<%= projectName %>",
     "version": "1.0.0",
     "description": "<%= projectDescription %>",
+	"types": "./dist/types/index.d.ts",
     "exports": {
 		".": {
 			"require": "./dist/cjs/index.js",

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

@@ -1,25 +1,25 @@
-npm run expand-macro
-Write-Output 开始删除原dist
-Remove-Item -Recurse -Force dist
-Write-Output 开始编译
-
-$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
+# compiletsupv1.0.0
+if (Test-Path dist) {
+    Write-Output "开始删除原dist"
+    Remove-Item -Recurse -Force dist
+}
+Write-Output "开始类型检查..."
+# 用 tsc 做类型检查
+# tsc -p tsconfig.compile.json
+tsc -p tsconfig.compile.json --noEmit
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "类型检查失败, 停止编译"
+    exit $LASTEXITCODE
+}
+
+Write-Output "类型检查通过, 开始 tsup 编译..."
+
+# 执行 tsup
+$tsupOutput = tsup --silent 2>&1
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "tsup 编译失败"
+    Write-Output $tsupOutput   # 只在失败时打印 tsup 的输出
+    exit $LASTEXITCODE
+}
+
+Write-Output "编译完成"

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

@@ -1,4 +1,7 @@
-Write-Output 开始编译
-npm run compile
+npm run compile
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "编译失败, 停止发布"
+    exit $LASTEXITCODE
+}
 Write-Output 开始发布
 npx zcli release

package/data/template/base/tsup.config.js

@@ -0,0 +1,35 @@
+const { defineConfig } = require("tsup");
+
+const common = {
+    entry: [
+        "src/**/*.ts",
+        "!**/test/**",
+        "!src/**/*.macro.ts",
+    ],
+    tsconfig: 'tsconfig.compile.json',
+    clean: false,
+    dts: false,
+    external: []
+}
+export default defineConfig([
+    // CommonJS 输出
+    {
+        ...common,
+        format: ["cjs"],
+        outDir: "dist/cjs",
+        target: "es2022",
+    },
+    // ESM 输出
+    {
+        ...common,
+        format: ["esm"],
+        outDir: "dist/mjs",
+        target: "esnext",
+    },
+    {
+        ...common,
+        name: "types",
+        dts: { only: true },
+        outDir: "dist/types",
+    }
+]);

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

@@ -1,6 +1,13 @@
 npm run expand-macro
-Write-Output 开始删除原dist
-Remove-Item -Recurse -Force dist
+# compile v1.0.0
+if (Test-Path dist) {
+    Write-Output "开始删除原dist"
+    Remove-Item -Recurse -Force dist
+}
 Write-Output 开始编译
 tsc -p tsconfig.compile.json
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "tsc 编译失败"
+    exit $LASTEXITCODE
+}
 tsc-alias -p tsconfig.compile.json

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

@@ -1,4 +1,8 @@
-Write-Output 开始编译
+# releasev1.0.0
 npm run compile
+if ($LASTEXITCODE -ne 0) {
+    Write-Error "编译失败, 停止发布"
+    exit $LASTEXITCODE
+}
 Write-Output 开始发布
 npx zcli release

package/dist/Command/Bump.d.ts

@@ -0,0 +1,6 @@
+import type { Command } from 'commander';
+export declare const bump: (opt: {
+    version?: string;
+}) => Promise<void>;
+/**更新版本号 */
+export declare const CmdBump: (program: Command) => Command;

package/dist/Command/Bump.js

@@ -0,0 +1,70 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdBump = exports.bump = void 0;
+const utils_1 = require("@zwa73/utils");
+const pathe_1 = __importDefault(require("pathe"));
+const RouteInterface_1 = require("./RouteInterface");
+/**解析版本号为number数组 */
+function parseVersion(version) {
+    const arr = version.split(".").map(Number);
+    if (arr.length !== 3)
+        (0, utils_1.throwError)(`${version} 不是有效的版本号`, 'error');
+    for (let i = 0; i < 3; i++) {
+        if (!isFinite(arr[i]))
+            (0, utils_1.throwError)(`${version} 不是有效的版本号`, 'error');
+    }
+    return arr;
+}
+/**判断版本号是否有效 */
+function checkVersion(oldVersion, newVersion) {
+    const oldParts = parseVersion(oldVersion);
+    const newParts = parseVersion(newVersion);
+    for (let i = 0; i < 3; i++) {
+        if (newParts[i] < oldParts[i])
+            (0, utils_1.throwError)(`${newVersion} 低于当前版本号 ${oldVersion}`, 'error');
+        if (newParts[i] > oldParts[i])
+            break;
+    }
+}
+/**更新版本号 */
+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;
+    }
+    else {
+        const version = packageData.version.split(".");
+        version[2] = (parseInt(version[2]) + 1).toString();
+        packageData.version = version.join(".");
+    }
+    await utils_1.UtilFT.writeJSONFile(packagePath, packageData);
+    return packageData.version;
+}
+const bump = async (opt) => {
+    await (0, RouteInterface_1.checkProject)();
+    utils_1.SLogger.info(`开始更新版本号`);
+    try {
+        const newVersion = await updateVersion(opt.version);
+        utils_1.SLogger.info(`新版本号: ${newVersion}`);
+    }
+    catch (error) {
+        utils_1.SLogger.error(error);
+        throw error;
+    }
+};
+exports.bump = bump;
+/**更新版本号 */
+const CmdBump = (program) => program
+    .command("bump")
+    .alias("version")
+    .description("更新项目版本号")
+    .option("-v, --version <version>", "指定版本号, 为 `current` 时不更新版本号, 格式应为 `${number}.${number}.${number}`")
+    .action(exports.bump);
+exports.CmdBump = CmdBump;

package/dist/Command/CheckToken.d.ts

@@ -0,0 +1,10 @@
+import type { LogLevel } from "@zwa73/utils";
+import type { Command } from "commander";
+/**检查npm token过期 */
+export declare function checkNpmToken(opt?: {
+    logstd?: boolean;
+    threshold?: number;
+    loglvl?: LogLevel | 'none' | ((v: string) => void);
+}): Promise<string | undefined>;
+/**更新版本号并发布npm包 */
+export declare const CmdCheckToken: (program: Command) => Command;

package/dist/Command/CheckToken.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdCheckToken = void 0;
+exports.checkNpmToken = checkNpmToken;
+const utils_1 = require("@zwa73/utils");
+/**检查npm token过期 */
+async function checkNpmToken(opt) {
+    const { logstd = false, threshold = 15, loglvl = 'warn', } = opt ?? {};
+    try {
+        const { stderr, stdout } = await utils_1.UtilFunc.exec('npm token list', {
+            outlvl: logstd ? console.log : undefined
+        });
+        // 正则：
+        //Publish token npm_a0… with id 616dfb created 2025-12-05
+        //with IP whitelist:
+        // [1] 前缀 npm_xxx [2] id [3] 创建日期 yyyy-mm-dd
+        const re = /token\s+(npm_[^\s]+).*?id\s+([a-z0-9]+).*?created\s+(\d{4}-\d{2}-\d{2})/gi;
+        const now = new Date();
+        const msg = [];
+        for (const m of stdout.matchAll(re)) {
+            const [, prefix, id, created] = m;
+            const createdDate = new Date(created);
+            // 默认 Granular Token 有效期 90 天；Classic 看起来“Never”，可按需特殊处理
+            const expiresDate = new Date(createdDate.getTime() + 90 * 24 * 60 * 60 * 1000);
+            const daysLeft = Math.floor((expiresDate.getTime() - now.getTime()) / (1000 * 60 * 60 * 24));
+            if (daysLeft <= threshold)
+                msg.push(`⚠️ Token ${prefix} with id ${id} 即将过期, 剩余 ${daysLeft} 天, 过期 ${expiresDate.toISOString().slice(0, 10)}`);
+        }
+        const msgText = msg.join('\n');
+        if (msgText.length > 0) {
+            if (typeof loglvl == 'string' && loglvl !== 'none')
+                utils_1.SLogger.log(loglvl, msgText);
+            else if (typeof loglvl == 'function')
+                loglvl(msgText);
+            return msgText;
+        }
+        return undefined;
+    }
+    catch (e) {
+        utils_1.SLogger.error('checkNpmToken 错误', e);
+        return undefined;
+    }
+}
+/**更新版本号并发布npm包 */
+const CmdCheckToken = (program) => program
+    .command("Check-Token")
+    .alias("checktoken")
+    .description("检查npm token是否即将过期")
+    .action(async () => {
+    await checkNpmToken({ logstd: true });
+});
+exports.CmdCheckToken = CmdCheckToken;

package/dist/Command/ExpandMacro.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 /**构造macro */
 export declare const CmdExpandMacro: (program: Command) => Command;

package/dist/Command/GenI18n.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 /**生成i18n */
 export declare const CmdGenI18n: (program: Command) => Command;

package/dist/Command/GenI18n.js

@@ -5,14 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdGenI18n = void 0;
 const utils_1 = require("@zwa73/utils");
-const UtilAst_1 = require("../UtilAst");
 const pathe_1 = __importDefault(require("pathe"));
 const DynImport_1 = require("../DynImport");
+const UtilAst_1 = require("../UtilAst");
 function format(str) {
     return str.replace(/\\(.)/g, '$1').replace(/%/g, '\\%');
 }
 async function procFile(p, filePath, funckey) {
     const TsMorph = await (0, DynImport_1.importTsMorph)();
+    if (!TsMorph)
+        (0, utils_1.throwError)(`ts-morph 未安装`);
     const { SyntaxKind } = TsMorph;
     const date = new Date().toISOString();
     //const content = await fs.promises.readFile(filePath,'utf-8');
@@ -60,6 +62,8 @@ async function procFile(p, filePath, funckey) {
 }
 async function scanI18n(i18nDataDir, include, exclude, funckey) {
     const TsMorph = await (0, DynImport_1.importTsMorph)();
+    if (!TsMorph)
+        (0, utils_1.throwError)(`ts-morph 未安装`);
     const { Project } = TsMorph;
     const fixedKey = typeof funckey == 'string' ? [funckey] : funckey;
     const filePaths = (await utils_1.UtilFT.fileSearchGlob(process.cwd(), include, { ingore: exclude }))
@@ -67,7 +71,7 @@ async function scanI18n(i18nDataDir, include, exclude, funckey) {
     const project = new Project();
     await utils_1.SI18n.init(i18nDataDir, '*');
     //console.log(filePaths);
-    (await Promise.all(filePaths.map(p => procFile(project, p, fixedKey))))
+    (await Promise.all(filePaths.map(async (p) => procFile(project, p, fixedKey))))
         .flat().forEach(dat => utils_1.SI18n.addOriginalText(dat));
     await utils_1.SI18n.saveTable();
 }

package/dist/Command/GenSchema.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 /**生成schema */
 export declare const CmdGenSchema: (program: Command) => Command;

package/dist/Command/GenTemplate.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 /**生成schema */
 export declare const CmdGenTemplate: (program: Command) => Command;

package/dist/Command/GenTemplate.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdGenTemplate = void 0;
+const fs_1 = __importDefault(require("fs"));
+const utils_1 = require("@zwa73/utils");
 const pathe_1 = __importDefault(require("pathe"));
 const RouteInterface_1 = require("./RouteInterface");
-const utils_1 = require("@zwa73/utils");
-const fs_1 = __importDefault(require("fs"));
 /**复制基础文件 */
 async function copyData(templatePath, projectPath) {
     const filelist = await fs_1.default.promises.readdir(templatePath);

package/dist/Command/MapPath.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 /**重命名文件或路径 */
 export declare const CmdMapPath: (program: Command) => Command;

package/dist/Command/MapPath.js

@@ -4,39 +4,58 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdMapPath = void 0;
-const utils_1 = require("@zwa73/utils");
 const fs_1 = __importDefault(require("fs"));
+const utils_1 = require("@zwa73/utils");
 const pathe_1 = __importDefault(require("pathe"));
-const DupMethodList = ["skip", "overwrite"];
+const DupMethodList = ["skip", "overwrite", "rename"];
 /**重命名文件或路径 */
 const CmdMapPath = (program) => program
     .command("Map-Path")
     .alias("mappath")
-    .description("根据正则表达式对文件名进行映射")
+    .description(`根据正则表达式对文件名进行映射`)
     .argument("<regex>", "要匹配的正则表达式, posix风格路径")
     .argument("<replacement>", "替换字符串")
     .option("-e, --exclude <regex>", "排除文件的正则表达式")
-    .option(`-d, --duplicate-handling <${DupMethodList.join('|')}|[path:string]>`, `处理重名文件的方式:
+    .option(`-d, --duplicate-handling <${DupMethodList.join('|')}>`, `处理重名文件的方式:
 skip 不进行处理
 overwrite 覆盖重名
-其他字符串 将重名部分映射到指定目录下的对应位置, 再次重复将会覆盖`, "skip")
-    .option("-r, --recursive", "是否处理子目录", false)
+rename 以 [name]_idx[.ext?] 的形式重命名`, "skip")
+    .option("-r, --recursive", "递归的处理子目录", false)
     .option("-m, --move", "重命名而不是复制文件", false)
     .option("-o, --output <path>", "输出到某个绝对路径而非当前目录", '')
     .option("-i, --input <path>", "扫描某个绝对路径而非当前目录", '')
     .option("-t, --test", "不对文件进行实际操作, 在控制台输出映射结果", false)
+    .option("-@, --extend", `使用@占位符扩展语法, 可用占位符:
+@i       表示处理顺序下标 (从0开始)
+@c       表示处理计数 (从1开始)
+@name    表示文件名 (不含扩展名)
+@ext     表示文件扩展名 (带.)
+@base    表示文件名 (含扩展名)
+@dir     表示文件所在目录的路径
+@path[n] 获取路径中的第 n 段 (从 0 开始, 负数表示倒数)
+@@       表示对@的转义
+exmaple:
+match: "/data/archive/project/file.txt"
+@name     -> "file"
+@ext      -> ".txt"
+@base     -> "file.txt"
+@dir      -> "/data/archive/project"
+@path[0]  -> "data"
+@path[-1] -> "file.txt"
+@path[-2] -> "project"
+`, false)
     .action(async (regexStr, replacement, options) => {
     const regex = new RegExp(regexStr);
     const excludeRegex = options.exclude ? new RegExp(options.exclude) : null;
     if (!DupMethodList.includes(options.duplicateHandling))
         (0, utils_1.throwError)(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
     const duplicateHandling = options.duplicateHandling;
-    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 searchPath = options.input.length > 0
+        ? options.input : process.cwd();
+    const outPath = options.output.length > 0
+        ? options.output : process.cwd();
     // 遍历当前目录下的所有文件
-    const filePaths = (await utils_1.UtilFT.fileSearchRegex(searchPath, regex, { relative: options.recursive }))
+    const filePaths = (await utils_1.UtilFT.fileSearchRegex(searchPath, regex, { recursive: options.recursive }))
         .map(fp => pathe_1.default.relative(searchPath, fp))
         .filter(fp => excludeRegex ? (!excludeRegex.test(fp)) : true);
     //对单个路径映射
@@ -49,31 +68,47 @@ overwrite 覆盖重名
             return fs_1.default.promises.rename(source, target);
         return fs_1.default.promises.copyFile(source, target);
     };
-    await Promise.all(filePaths.map(async (rawfilePath) => {
+    // 先生成带编号的文件映射
+    const indexedFiles = filePaths.map((rawfilePath, idx) => {
         const filePath = pathe_1.default.normalize(rawfilePath);
-        const replacedFilePath = filePath.replace(regex, replacement);
-        // 重命名文件
-        const oldFilePath = absin
-            ? pathe_1.default.join(searchPath, filePath)
-            : filePath;
-        const newFilePath = absout
-            ? pathe_1.default.join(outPath, replacedFilePath) //如果是绝对路径输出则拼接绝对路径
+        const segments = filePath.split(pathe_1.default.sep).filter(Boolean); // 提取路径片段
+        const replacedFilePath = filePath
+            .replace(regex, replacement); //替换
+        const processedFilePath = options.extend
+            ? replacedFilePath
+                .replace(/(?<!@)@name/g, pathe_1.default.parse(filePath).name)
+                .replace(/(?<!@)@ext/g, pathe_1.default.parse(filePath).ext)
+                .replace(/(?<!@)@base/g, pathe_1.default.parse(filePath).base)
+                .replace(/(?<!@)@dir/g, pathe_1.default.dirname(filePath))
+                .replace(/(?<!@)@i/g, `${idx}`) //数字下标
+                .replace(/(?<!@)@c/g, `${idx + 1}`)
+                .replace(/(?<!@)@path\[(\-?\d+)\]/g, (_, rawIndex) => {
+                const index = Number(rawIndex);
+                const resolved = index < 0
+                    ? segments[segments.length + index]
+                    : segments[index];
+                return resolved ?? '';
+            })
+                .replace(/@@/g, `@`) //转义
             : replacedFilePath;
-        // 如果文件名发生了变化
+        return {
+            idx,
+            oldFilePath: pathe_1.default.join(searchPath, filePath),
+            newFilePath: pathe_1.default.join(outPath, processedFilePath),
+        };
+    });
+    await Promise.all(indexedFiles.map(async ({ idx, oldFilePath, newFilePath, }) => {
+        // 如果文件名无变化则不操作
         if (newFilePath === oldFilePath)
             return;
         //如果文件已存在
-        if (await utils_1.UtilFT.pathExists(newFilePath)) {
-            //如果是跳过或覆盖
-            if (DupMethodList.includes(options.duplicateHandling)) {
-                return (0, utils_1.match)(duplicateHandling, {
-                    'skip': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
-                    'overwrite': () => mapPath(oldFilePath, newFilePath),
-                });
-            }
-            //如果是转移位置
-            return mapPath(oldFilePath, pathe_1.default.join(outPath, duplicateHandling, replacedFilePath));
-        }
+        if (await utils_1.UtilFT.pathExists(newFilePath))
+            return (0, utils_1.match)(duplicateHandling, {
+                'skip': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
+                'overwrite': async () => mapPath(oldFilePath, newFilePath),
+                'rename': async () => mapPath(oldFilePath, newFilePath.replace(/((\.[^/.]+)?$)/, `_${idx}$1`)),
+            });
+        //如果文件不存在, 直接映射
         return mapPath(oldFilePath, newFilePath);
     }));
 });

package/dist/Command/Node.d.ts

@@ -1,3 +1,3 @@
-import { Command } from 'commander';
+import type { Command } from 'commander';
 /**编译并运行某个文件 */
 export declare const CmdNode: (program: Command) => Command;

package/dist/Command/Node.js

@@ -13,6 +13,6 @@ const CmdNode = (program) => program
     let cmd = `ts-node -r tsconfig-paths/register ${arg}`;
     if (opt.project)
         cmd += ` -P ${opt.project}`;
-    await utils_1.UtilFunc.exec(cmd, { outlvl: 'info', errlvl: 'error' });
+    await utils_1.UtilFunc.exec(cmd, { outlvl: console.info, errlvl: console.error });
 });
 exports.CmdNode = CmdNode;

package/dist/Command/Release.d.ts

@@ -1,3 +1,3 @@
-import { Command } from 'commander';
+import type { Command } from 'commander';
 /**更新版本号并发布npm包 */
 export declare const CmdRelease: (program: Command) => Command;

package/dist/Command/Release.js

@@ -4,50 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdRelease = void 0;
-const pathe_1 = __importDefault(require("pathe"));
+const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("@zwa73/utils");
+const pathe_1 = __importDefault(require("pathe"));
+const Bump_1 = require("./Bump");
+const CheckToken_1 = require("./CheckToken");
 const RouteInterface_1 = require("./RouteInterface");
-const fs_1 = __importDefault(require("fs"));
-/**解析版本号为number数组 */
-function parseVersion(version) {
-    const arr = version.split(".").map(Number);
-    if (arr.length !== 3)
-        (0, utils_1.throwError)(`${version} 不是有效的版本号`, 'error');
-    for (let i = 0; i < 3; i++) {
-        if (!isFinite(arr[i]))
-            (0, utils_1.throwError)(`${version} 不是有效的版本号`, 'error');
-    }
-    return arr;
-}
-/**判断版本号是否有效 */
-function checkVersion(oldVersion, newVersion) {
-    const oldParts = parseVersion(oldVersion);
-    const newParts = parseVersion(newVersion);
-    for (let i = 0; i < 3; i++) {
-        if (newParts[i] < oldParts[i])
-            (0, utils_1.throwError)(`${newVersion} 低于当前版本号 ${oldVersion}`, 'error');
-        if (newParts[i] > oldParts[i])
-            break;
-    }
-}
-/**更新版本号 */
-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;
-    }
-    else {
-        const version = packageData.version.split(".");
-        version[2] = (parseInt(version[2]) + 1).toString();
-        packageData.version = version.join(".");
-    }
-    await utils_1.UtilFT.writeJSONFile(packagePath, packageData);
-    return packageData.version;
-}
 /**获取包名 */
 async function getPackName() {
     const packagePath = pathe_1.default.join(RouteInterface_1.PROCESS_PATH, "package.json");
@@ -65,11 +27,10 @@ const CmdRelease = (program) => program
     .option("-a, --access <access>", "npm publish 的 access 参数 默认 public", "public")
     .option("-l, --local <path>", "仅打包到本地对印目录下 如./build/", undefined)
     .action(async (opt) => {
-    (0, RouteInterface_1.checkProject)();
+    await (0, Bump_1.bump)(opt);
     utils_1.SLogger.info(`开始发布项目`);
     try {
-        const newVersion = await updateVersion(opt.version);
-        utils_1.SLogger.info(`新版本号: ${newVersion}`);
+        const chkPromise = (0, CheckToken_1.checkNpmToken)({ loglvl: 'none' });
         if (opt.local) {
             utils_1.SLogger.info("正在打包...");
             const fullpath = pathe_1.default.join(process.cwd(), opt.local);
@@ -89,6 +50,9 @@ const CmdRelease = (program) => program
         const cmd = `npm publish --registry ${RouteInterface_1.OFFICIAL_SOURCE} --access ${opt.access}`;
         await utils_1.UtilFunc.exec(cmd, { errlvl: 'info' });
         utils_1.SLogger.info("发布完成");
+        const chkResult = await chkPromise;
+        if (chkResult)
+            utils_1.SLogger.warn(chkResult);
     }
     catch (error) {
         utils_1.SLogger.error(error);

package/dist/Command/Route.js

@@ -2,14 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cliRoute = cliRoute;
 const commander_1 = require("commander");
-const Node_1 = require("./Node");
-const Release_1 = require("./Release");
-const MapPath_1 = require("./MapPath");
-const ScanDups_1 = require("./ScanDups");
-const GenSchema_1 = require("./GenSchema");
+const CheckToken_1 = require("./CheckToken");
 const ExpandMacro_1 = require("./ExpandMacro");
 const GenI18n_1 = require("./GenI18n");
+const GenSchema_1 = require("./GenSchema");
 const GenTemplate_1 = require("./GenTemplate");
+const MapPath_1 = require("./MapPath");
+const Node_1 = require("./Node");
+const Release_1 = require("./Release");
+const ScanDups_1 = require("./ScanDups");
 async function cliRoute() {
     (0, Node_1.CmdNode)(commander_1.program);
     (0, Release_1.CmdRelease)(commander_1.program);
@@ -19,5 +20,6 @@ async function cliRoute() {
     (0, ExpandMacro_1.CmdExpandMacro)(commander_1.program);
     (0, GenI18n_1.CmdGenI18n)(commander_1.program);
     (0, GenTemplate_1.CmdGenTemplate)(commander_1.program);
+    (0, CheckToken_1.CmdCheckToken)(commander_1.program);
     commander_1.program.parse(process.argv);
 }

package/dist/Command/RouteInterface.js

@@ -10,8 +10,8 @@ exports.parseBoolean = parseBoolean;
 exports.withMirrorSource = withMirrorSource;
 exports.withOfficialSource = withOfficialSource;
 exports.checkProject = checkProject;
-const pathe_1 = __importDefault(require("pathe"));
 const utils_1 = require("@zwa73/utils");
+const pathe_1 = __importDefault(require("pathe"));
 /**npm镜像源 */
 exports.MIRROR_SOURCE = "https://registry.npmmirror.com/";
 /**npm官方源 */

package/dist/Command/ScanDups.d.ts

@@ -1,3 +1,3 @@
-import { Command } from "commander";
+import type { Command } from "commander";
 /**重命名文件或路径 scan_duplicates */
 export declare const CmdScanDups: (program: Command) => Command;

package/dist/Command/ScanDups.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdScanDups = void 0;
+const fs_1 = __importDefault(require("fs"));
 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 */
@@ -62,6 +62,8 @@ const CmdScanDups = (program) => program
         : dir.map(d => pathe_1.default.isAbsolute(d) ? d : pathe_1.default.join(process.cwd(), d));
     // 添加一个多步进度条
     const cliProgress = await (0, DynImport_1.importCliProgress)();
+    if (!cliProgress)
+        (0, utils_1.throwError)('cli-progress 未安装');
     const progressBar = new cliProgress.MultiBar({
         clearOnComplete: true, hideCursor: true,
         format: " {task} [{bar}] {percentage}% | ETA: {eta}s | {value}/{total} | {status}",
@@ -82,9 +84,8 @@ const CmdScanDups = (program) => program
         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)
+    async (list) => struct ? (0, utils_1.pipe)(list, tap(dupFpList => (structProgress.setTotal(dupFpList.length),
+        structProgress.update(0, { status: `结构扫描检出 ${dupFpList.length} 个可能的相等项` }))), async (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()))
@@ -92,11 +93,11 @@ const CmdScanDups = (program) => program
         .toArray(), reduce2Dupmap, reduce2DupFpList) : list, 
     // 第二步：快速扫描，计算采样哈希
     tap(list => (sampledProgress.setTotal(list.length),
-        sampledProgress.update(0, { status: `总计 ${list.length} 个文件` }))), list => utils_1.Stream.from(list, 8)
+        sampledProgress.update(0, { status: `总计 ${list.length} 个文件` }))), async (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 struct2hash(await scanDirStruct(filePath), async (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(), 
@@ -104,19 +105,19 @@ const CmdScanDups = (program) => program
     reduce2Dupmap, reduce2DupFpList, 
     // 第四步：对筛选出的重复文件路径并发计算完整哈希
     tap(dupFpList => (fullHashProgress.setTotal(dupFpList.length),
-        fullHashProgress.update(0, { status: `快速扫描检出 ${dupFpList.length} 个可能的相等项` }))), dupFpList => utils_1.Stream.from(dupFpList, 8)
+        fullHashProgress.update(0, { status: `快速扫描检出 ${dupFpList.length} 个可能的相等项` }))), async (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 struct2hash(await scanDirStruct(filePath), async (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, {
+    tap(() => progressBar.stop()), async (out) => (0, utils_1.match)(outtype, {
         "console": () => utils_1.SLogger.info(out),
-    }, () => utils_1.UtilFT.writeJSONFile(pathe_1.default.join(basePath, outtype), out)));
+    }, async () => utils_1.UtilFT.writeJSONFile(pathe_1.default.join(basePath, outtype), out)));
 });
 exports.CmdScanDups = CmdScanDups;

package/dist/DynImport.d.ts

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

package/dist/UtilAst.d.ts

@@ -1,4 +1,4 @@
-import { AnyFunc } from "@zwa73/utils";
+import type { AnyFunc } from "@zwa73/utils";
 import type { SyntaxKind, KindToNodeMappings, Node } from "ts-morph";
 export declare namespace UtilAst {
     /**匹配Node的类型进行处理  无法匹配时返回undefined

package/dist/UtilDevTool.d.ts

@@ -1,4 +1,4 @@
-import { JObject } from '@zwa73/utils';
+import type { JObject } from '@zwa73/utils';
 export declare namespace UtilDT {
     /**执行js/ts的可选项 */
     type BatchNodeOpt = Partial<{

package/dist/UtilDevTool.js

@@ -4,9 +4,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilDT = void 0;
-const pathe_1 = __importDefault(require("pathe"));
 const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("@zwa73/utils");
+const pathe_1 = __importDefault(require("pathe"));
 const DynImport_1 = require("./DynImport");
 var UtilDT;
 (function (UtilDT) {
@@ -25,7 +25,11 @@ var UtilDT;
     async function generateSchema(dir, opt) {
         //导入
         const TJS = await (0, DynImport_1.importTJS)();
+        if (!TJS)
+            (0, utils_1.throwError)('typescript-json-schema 未安装');
         const TsMorph = await (0, DynImport_1.importTsMorph)();
+        if (!TsMorph)
+            (0, utils_1.throwError)('ts-morph 未安装');
         //生成
         const settings = {
             required: true,
@@ -134,12 +138,12 @@ var UtilDT;
         // 创建一个字符串，其中包含所有文件的 require 语句
         const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
         // 创建并执行 ts-node 命令
-        const cmd = `ts-node -r tsconfig-paths/register -e "${requires}" ${opt?.project ? `-P "${opt.project}"` : ""}`;
-        await utils_1.UtilFunc.exec(cmd, { outlvl: 'info', errlvl: 'warn' });
+        const cmd = `ts-node --transpile-only -r tsconfig-paths/register -e "${requires}" ${opt?.project ? `-P "${opt.project}"` : ""}`;
+        await utils_1.UtilFunc.exec(cmd, { outlvl: console.log, errlvl: console.warn });
     }
     UtilDT.batchNode = batchNode;
     //#region macro工具
-    const parseMacroPaths = (opt) => {
+    const parseMacroPaths = async (opt) => {
         // JsFunc -> ComposeFunc -> xxxmacro -> parseMacroPaths -> sourceTS
         const loc = utils_1.UtilFunc.getFuncLoc(4);
         if (!loc && !opt?.filePath)

package/dist/UtilMacro.d.ts

@@ -3,5 +3,5 @@ export declare namespace UtilMacro {
      * @param glob - 应用的golb 默认 src\/**\/index.ts
      * @example
      */
-    function exportComment(glob?: string): void;
+    function exportComment(glob?: string): Promise<void>;
 }

package/dist/UtilMacro.js

@@ -5,16 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilMacro = void 0;
 const utils_1 = require("@zwa73/utils");
-const QuickFunc_1 = require("./QuickFunc");
 const pathe_1 = __importDefault(require("pathe"));
+const UtilDevTool_1 = require("./UtilDevTool");
 var UtilMacro;
 (function (UtilMacro) {
     /**根据注释批量生成导出
      * @param glob - 应用的golb 默认 src\/**\/index.ts
      * @example
      */
-    function exportComment(glob = 'src/**/index.ts') {
-        (0, QuickFunc_1.commentMacro)(/export (\S*)/, async ({ filePath, matchId, execArr }) => {
+    async function exportComment(glob = 'src/**/index.ts') {
+        await UtilDevTool_1.UtilDT.commentMacro(/export (\S*)/, async ({ filePath, matchId, execArr }) => {
             const basedir = pathe_1.default.dirname(filePath);
             const result = (await utils_1.UtilFT.fileSearchGlob(basedir, execArr[1]))
                 .map((file) => pathe_1.default.relative(basedir, file))

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.89",
+	"version": "1.0.90",
 	"description": "编译与调试工具",
 	"main": "dist/index.js",
 	"scripts": {
@@ -30,8 +30,6 @@
 		"@types/cli-progress": "^3.11.6",
 		"@types/jest": "^29.5.12",
 		"@types/node": "^20.14.11",
-		"jest": "^29.7.0",
-		"ts-jest": "^29.1.2",
 		"tsc-alias": "^1.8.8",
 		"typescript": "^5.3.3"
 	},

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

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

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

@@ -1,9 +0,0 @@
-{
-    "extends": "./tsconfig.compile.json",
-    "compilerOptions": {
-        "module": "ESNext",
-        "moduleResolution": "bundler",
-        "outDir": "./dist/mjs",
-        "target": "ESNext"
-    }
-}

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

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