@zwa73/dev-utils 1.0.88 → 1.0.90

package/dist/Command/MapPath.js

@@ -0,0 +1,115 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CmdMapPath = void 0;
+const fs_1 = __importDefault(require("fs"));
+const utils_1 = require("@zwa73/utils");
+const pathe_1 = __importDefault(require("pathe"));
+const DupMethodList = ["skip", "overwrite", "rename"];
+/**重命名文件或路径 */
+const CmdMapPath = (program) => program
+    .command("Map-Path")
+    .alias("mappath")
+    .description(`根据正则表达式对文件名进行映射`)
+    .argument("<regex>", "要匹配的正则表达式, posix风格路径")
+    .argument("<replacement>", "替换字符串")
+    .option("-e, --exclude <regex>", "排除文件的正则表达式")
+    .option(`-d, --duplicate-handling <${DupMethodList.join('|')}>`, `处理重名文件的方式:
+skip 不进行处理
+overwrite 覆盖重名
+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 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, { recursive: options.recursive }))
+        .map(fp => pathe_1.default.relative(searchPath, fp))
+        .filter(fp => excludeRegex ? (!excludeRegex.test(fp)) : true);
+    //对单个路径映射
+    const mapPath = async (source, target) => {
+        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)
+            return fs_1.default.promises.rename(source, target);
+        return fs_1.default.promises.copyFile(source, target);
+    };
+    // 先生成带编号的文件映射
+    const indexedFiles = filePaths.map((rawfilePath, idx) => {
+        const filePath = pathe_1.default.normalize(rawfilePath);
+        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))
+            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);
+    }));
+});
+exports.CmdMapPath = CmdMapPath;

package/dist/{cjs/Command → 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/{cjs/Command → 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/{cjs/Command → 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/{cjs/Command → 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/{cjs/Command → 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/{cjs/Command → 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/{cjs/Command → Command}/ScanDups.js

@@ -4,10 +4,10 @@ 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 cli_progress_1 = __importDefault(require("cli-progress"));
-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) => {
@@ -61,10 +61,13 @@ const CmdScanDups = (program) => program
         ? [process.cwd()]
         : dir.map(d => pathe_1.default.isAbsolute(d) ? d : pathe_1.default.join(process.cwd(), d));
     // 添加一个多步进度条
-    const progressBar = new cli_progress_1.default.MultiBar({
+    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}",
-    }, cli_progress_1.default.Presets.shades_classic);
+    }, cliProgress.Presets.shades_classic);
     // 文件结构进度条
     const structProgress = struct ? progressBar.create(1, 0, { task: "结构扫描", status: "准备中..." }) : undefined;
     // 采样哈希进度条
@@ -81,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()))
@@ -91,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(), 
@@ -103,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

@@ -0,0 +1,15 @@
+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;
+};
+export type TsMorphInstance = {
+    Project: typeof Project;
+    SyntaxKind: typeof SyntaxKind;
+};
+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/DynImport.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.importTsMorph = importTsMorph;
+exports.importTJS = importTJS;
+exports.importCliProgress = importCliProgress;
+const utils_1 = require("@zwa73/utils");
+async function importTsMorph() {
+    return await utils_1.UtilFunc.dynamicImport("ts-morph");
+}
+async function importTJS() {
+    return await utils_1.UtilFunc.dynamicImport("typescript-json-schema");
+}
+async function importCliProgress() {
+    return await utils_1.UtilFunc.dynamicImport("cli-progress");
+}

package/dist/{mjs/UtilAst.d.ts → UtilAst.d.ts}

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

package/dist/{mjs/UtilDevTool.d.ts → 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/{cjs/UtilDevTool.js → UtilDevTool.js}

@@ -1,37 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilDT = void 0;
-const pathe_1 = __importDefault(require("pathe"));
-const TJS = __importStar(require("typescript-json-schema"));
-const fs = __importStar(require("fs"));
+const fs_1 = __importDefault(require("fs"));
 const utils_1 = require("@zwa73/utils");
-const ts_morph_1 = require("ts-morph");
+const pathe_1 = __importDefault(require("pathe"));
+const DynImport_1 = require("./DynImport");
 var UtilDT;
 (function (UtilDT) {
     /**生成匹配的文件的所有type的schema
@@ -47,6 +23,13 @@ var UtilDT;
      * @param opt.excludeTypes - 排除的types正则匹配数组
      */
     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,
@@ -65,10 +48,10 @@ var UtilDT;
         //const schema = TJS.generateSchema(program, opt?.typeName??"*", settings,undefined,gener) as JObject;
         const it = opt?.includeTypes?.map(t => new RegExp(t)) ?? [/.*/];
         const et = opt?.excludeTypes?.map(t => new RegExp(t)) ?? [];
-        const p = new ts_morph_1.Project();
+        const p = new TsMorph.Project();
         const types = files.map(fp => p
             .addSourceFileAtPath(fp)
-            .getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeAliasDeclaration)
+            .getDescendantsOfKind(TsMorph.SyntaxKind.TypeAliasDeclaration)
             .map(d => d.getName())).flat();
         const list = gener.getUserSymbols()
             .filter(t => types.some(i => i === t))
@@ -89,8 +72,8 @@ var UtilDT;
     function procSchema(schema, coverDefine) {
         //覆盖
         coverObj(schema["definitions"], coverDefine);
-        //替换SchemaString标识符
-        schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g, '^.*$'));
+        ////替换SchemaString标识符
+        //schema = JSON.parse(JSON.stringify(schema).replace(/\^\.\*SchemaString\$/g,'^.*$'));
         return schema;
     }
     /**展开schema以供使用 */
@@ -155,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)
@@ -174,7 +157,7 @@ var UtilDT;
                     : opt?.filePath.map((filepath) => filepath)
             : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2")];
     };
-    const readFile = async (basePath) => (await fs.promises.readFile(basePath, 'utf-8')).replaceAll("\r\n", "\n");
+    const readFile = async (basePath) => (await fs_1.default.promises.readFile(basePath, 'utf-8')).replaceAll("\r\n", "\n");
     const parseCodeText = async (codeText, opt) => {
         const strText = typeof codeText === "function" ? await codeText(opt) : codeText;
         return strText.split('\n').map((line) => `${opt.inent}${line}`).join('\n');
@@ -229,7 +212,7 @@ var UtilDT;
                     regex.lastIndex += fileText.length - ol;
                 }
                 if (hasMatch)
-                    await fs.promises.writeFile(filePath, fileText, 'utf-8');
+                    await fs_1.default.promises.writeFile(filePath, fileText, 'utf-8');
                 else if (!opt?.glob)
                     utils_1.SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
             };
@@ -287,7 +270,7 @@ var UtilDT;
                     regex.lastIndex += fileText.length - ol;
                 }
                 if (hasMatch)
-                    await fs.promises.writeFile(filePath, fileText, 'utf-8');
+                    await fs_1.default.promises.writeFile(filePath, fileText, 'utf-8');
                 else if (!opt?.glob)
                     utils_1.SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
             };
@@ -316,7 +299,7 @@ var UtilDT;
                     inent: '',
                     filePath
                 });
-                await fs.promises.writeFile(filePath, parseCode, 'utf-8');
+                await fs_1.default.promises.writeFile(filePath, parseCode, 'utf-8');
             };
             plist.push(utils_1.PromiseQueue.enqueue(pathe_1.default.normalize(filePath), queuefunc));
         }

package/dist/UtilInterface.d.ts

@@ -0,0 +1,8 @@
+/**用在转换为Schema时解析为string并且不影响智能补全的类型
+ * @TJS-type string
+ */
+export type SchemaString = (string & String);
+/**用于在转换为schema时解析为整数的类型
+ * @TJS-type integer
+ */
+export type SchemaInt = (string & String);

package/dist/UtilMacro.d.ts

@@ -0,0 +1,7 @@
+export declare namespace UtilMacro {
+    /**根据注释批量生成导出
+     * @param glob - 应用的golb 默认 src\/**\/index.ts
+     * @example
+     */
+    function exportComment(glob?: string): Promise<void>;
+}

package/dist/{cjs/UtilMacro.js → 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
+     * @param glob - 应用的golb 默认 src\/**\/index.ts
      * @example
      */
-    function exportComment(glob) {
-        (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,14 +1,8 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.88",
+	"version": "1.0.90",
 	"description": "编译与调试工具",
-	"exports": {
-		".": {
-			"require": "./dist/cjs/index.js",
-			"import": "./dist/mjs/index.js"
-		}
-	},
-	"types": "./dist/mjs/index.d.ts",
+	"main": "dist/index.js",
 	"scripts": {
 		"test": "jest",
 		"release": "powershell scripts/release",
@@ -36,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,8 +0,0 @@
-{
-    "extends": "./tsconfig.compile.json",
-    "compilerOptions": {
-        "module": "commonjs",
-        "outDir": "./dist/cjs",
-        "target": "ES2022"
-    }
-}

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

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

package/dist/cjs/Command/ExpandMacro.d.ts

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