@zwa73/dev-utils 1.0.44 → 1.0.45

package/dist/Command/Init.js

@@ -22,10 +22,13 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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.CmdInit = void 0;
 const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 const utils_1 = require("@zwa73/utils");
 const RouteInterface_1 = require("./RouteInterface");
 /**复制基础文件 */
@@ -33,8 +36,8 @@ async function copyData() {
     const filelist = await fs.promises.readdir(RouteInterface_1.DATA_PATH);
     const plist = filelist.map(async (fileName) => {
         utils_1.SLogger.info(`正在复制 ${fileName}`);
-        const filePath = path.join(RouteInterface_1.DATA_PATH, fileName);
-        const targetPath = path.join(RouteInterface_1.PROJECT_PATH, fileName);
+        const filePath = pathe_1.default.join(RouteInterface_1.DATA_PATH, fileName);
+        const targetPath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, fileName);
         if (!await utils_1.UtilFT.pathExists(targetPath))
             await fs.promises.cp(filePath, targetPath, { recursive: true });
         else

package/dist/Command/MapPath.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdMapPath = void 0;
 const utils_1 = require("@zwa73/utils");
 const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 const DupMethodList = ["no-rename", "overwrite", "move"];
 /**重命名文件或路径 */
 const CmdMapPath = (program) => program
@@ -27,14 +27,14 @@ const CmdMapPath = (program) => program
     if (!DupMethodList.includes(options.duplicateHandling))
         (0, utils_1.throwError)(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
     const duplicateHandling = options.duplicateHandling;
-    const basePath = (0, utils_1.posixizePath)(process.cwd());
+    const basePath = process.cwd();
     // 遍历当前目录下的所有文件
     const filePaths = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive, style: "posix" })
-        .map((filePath) => path_1.default.posix.relative(basePath, filePath))
+        .map((filePath) => pathe_1.default.relative(basePath, filePath))
         .filter((filePath) => excludeRegex ? (!excludeRegex.test(filePath)) : true);
     //对单个路径映射
     const mapPath = async (source, target) => {
-        const dir = path_1.default.parse(target).dir;
+        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}`);
@@ -52,7 +52,7 @@ const CmdMapPath = (program) => program
         //如果文件已存在
         if (await utils_1.UtilFT.pathExists(newFilePath)) {
             await (0, utils_1.matchProc)(duplicateHandling, {
-                'move': () => mapPath(filePath, path_1.default.posix.join(options.duplicateOutput, newFilePath)),
+                'move': () => mapPath(filePath, pathe_1.default.join(options.duplicateOutput, newFilePath)),
                 'no-rename': () => utils_1.SLogger.info(`重名文件存在，跳过：${newFilePath}`),
                 'overwrite': () => mapPath(filePath, newFilePath),
             });

package/dist/Command/Release.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmdRelease = void 0;
-const path_1 = __importDefault(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 const utils_1 = require("@zwa73/utils");
 const RouteInterface_1 = require("./RouteInterface");
 /**解析版本号为number数组 */
@@ -31,7 +31,7 @@ function checkVersion(oldVersion, newVersion) {
 }
 /**更新版本号 */
 async function updateVersion(newVersion) {
-    const packagePath = path_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
+    const packagePath = pathe_1.default.join(RouteInterface_1.PROJECT_PATH, "package.json");
     const packageData = await utils_1.UtilFT.loadJSONFile(packagePath);
     if (newVersion) {
         checkVersion(packageData.version, newVersion);

package/dist/Command/RouteInterface.js

@@ -1,37 +1,17 @@
 "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.checkProject = exports.withOfficialSource = exports.withMirrorSource = exports.parseBoolean = exports.parseNumber = exports.parseInteger = exports.PROJECT_PATH = exports.DATA_PATH = exports.OFFICIAL_SOURCE = exports.MIRROR_SOURCE = void 0;
-const path = __importStar(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 const utils_1 = require("@zwa73/utils");
 /**npm镜像源 */
 exports.MIRROR_SOURCE = "https://registry.npmmirror.com/";
 /**npm官方源 */
 exports.OFFICIAL_SOURCE = "https://registry.npmjs.org/";
 /**data文件夹路径 */
-exports.DATA_PATH = path.join(__dirname, '..', '..', 'data');
+exports.DATA_PATH = pathe_1.default.join(__dirname, '..', '..', 'data');
 /**项目路径 */
 exports.PROJECT_PATH = process.cwd();
 /** 检测非浮点的整数类型 */
@@ -79,7 +59,7 @@ async function withOfficialSource(func) {
 exports.withOfficialSource = withOfficialSource;
 /**检查目录是否为项目 */
 async function checkProject() {
-    const filePath = path.join(exports.PROJECT_PATH, "package.json");
+    const filePath = pathe_1.default.join(exports.PROJECT_PATH, "package.json");
     if (!(await utils_1.UtilFT.pathExists(filePath)))
         (0, utils_1.throwError)(`当前目录: ${exports.PROJECT_PATH} 不是npm项目目录, 请先使用 npm init`);
 }

package/dist/Command/ScanDups.js

@@ -7,7 +7,7 @@ exports.CmdScanDups = void 0;
 const utils_1 = require("@zwa73/utils");
 const fs_1 = __importDefault(require("fs"));
 const crypto_1 = __importDefault(require("crypto"));
-const path_1 = __importDefault(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 async function calculateHash(filePath) {
     return new Promise((resolve, reject) => {
         const hash = crypto_1.default.createHash('md5');
@@ -27,7 +27,7 @@ const CmdScanDups = (program) => program
     .option("-r, --recursive", "是否处理子目录, 默认 true", true)
     .action(async (options) => {
     const regex = new RegExp(options.regex);
-    const basePath = (0, utils_1.posixizePath)(process.cwd());
+    const basePath = process.cwd();
     const pList = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, {
         relative: options.recursive,
         style: "posix",
@@ -46,6 +46,6 @@ const CmdScanDups = (program) => program
     if (options.out === "console")
         utils_1.SLogger.info(out);
     else
-        await utils_1.UtilFT.writeJSONFile(path_1.default.join(basePath, options.out), out);
+        await utils_1.UtilFT.writeJSONFile(pathe_1.default.join(basePath, options.out), out);
 });
 exports.CmdScanDups = CmdScanDups;

package/dist/UtilDevTool.js

@@ -22,9 +22,12 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __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 path = __importStar(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 const TJS = __importStar(require("typescript-json-schema"));
 const fs = __importStar(require("fs"));
 const utils_1 = require("@zwa73/utils");
@@ -55,8 +58,8 @@ var UtilDT;
         const files = utils_1.UtilFT.fileSearchGlob(dir, opt?.include ?? "**/*.schema.ts", { ingore: opt?.exclude });
         const program = TJS.getProgramFromFiles(files, compilerOptions);
         const schema = TJS.generateSchema(program, "*", settings);
-        const outDir = opt?.outDir ?? path.join(process.cwd(), 'schema');
-        const schemasPath = path.join(outDir, 'schemas.json');
+        const outDir = opt?.outDir ?? pathe_1.default.join(process.cwd(), 'schema');
+        const schemasPath = pathe_1.default.join(outDir, 'schemas.json');
         //进行预处理并展开
         await expandSchema(schemasPath, schema, opt?.coverDefine ?? {});
     }
@@ -78,8 +81,8 @@ var UtilDT;
                 continue;
             if ((/^.+_[0-9]/).test(typeName) || (/^{./).test(typeName))
                 continue;
-            const basename = path.basename(schemasPath);
-            const tpath = path.join(path.dirname(schemasPath), `${typeName}.schema.json`);
+            const basename = pathe_1.default.basename(schemasPath);
+            const tpath = pathe_1.default.join(pathe_1.default.dirname(schemasPath), `${typeName}.schema.json`);
             if (!utils_1.UtilFT.isValidFilePath(tpath))
                 continue;
             plist.push(utils_1.UtilFT.writeJSONFile(tpath, {
@@ -124,7 +127,7 @@ var UtilDT;
         if (!Array.isArray(filepath))
             filepath = [filepath];
         // 将所有的相对路径转换为绝对路径
-        const absolutePaths = filepath.map(fp => path.posix.resolve((0, utils_1.posixizePath)(process.cwd()), (0, utils_1.posixizePath)(fp)));
+        const absolutePaths = filepath.map(fp => pathe_1.default.resolve(process.cwd(), fp));
         // 创建一个字符串，其中包含所有文件的 require 语句
         const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
         // 创建并执行 ts-node 命令
@@ -142,9 +145,9 @@ var UtilDT;
             ? opt.glob
                 ? utils_1.UtilFT.fileSearchGlob(process.cwd(), opt.filePath, { style: "posix" })
                 : typeof opt?.filePath === "string"
-                    ? [(0, utils_1.posixizePath)(opt?.filePath)]
-                    : opt?.filePath.map((filepath) => (0, utils_1.posixizePath)(filepath))
-            : [(0, utils_1.posixizePath)(basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2"))];
+                    ? [opt?.filePath]
+                    : 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 parseCodeText = async (codeText, opt) => {
@@ -205,7 +208,7 @@ var UtilDT;
                 else if (!opt?.glob)
                     utils_1.SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
             };
-            plist.push(utils_1.UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\", "/")), queuefunc));
+            plist.push(utils_1.UtilFunc.queueProc(pathe_1.default.normalize(filePath), queuefunc));
         }
         await Promise.all(plist);
     }
@@ -263,7 +266,7 @@ var UtilDT;
                 else if (!opt?.glob)
                     utils_1.SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
             };
-            plist.push(utils_1.UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\", "/")), queuefunc));
+            plist.push(utils_1.UtilFunc.queueProc(pathe_1.default.normalize(filePath), queuefunc));
         }
         await Promise.all(plist);
     }
@@ -290,7 +293,7 @@ var UtilDT;
                 });
                 await fs.promises.writeFile(filePath, parseCode, 'utf-8');
             };
-            plist.push(utils_1.UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\", "/")), queuefunc));
+            plist.push(utils_1.UtilFunc.queueProc(pathe_1.default.normalize(filePath), queuefunc));
         }
         await Promise.all(plist);
     }

package/dist/UtilMacro.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilMacro = void 0;
 const utils_1 = require("@zwa73/utils");
 const QuickFunc_1 = require("./QuickFunc");
-const path_1 = __importDefault(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 var UtilMacro;
 (function (UtilMacro) {
     /**根据注释批量生成导出
@@ -15,11 +15,11 @@ var UtilMacro;
      */
     function exportComment(glob) {
         (0, QuickFunc_1.commentMacro)(/export (\S*)/, ({ filePath, matchId, execArr }) => {
-            const basedir = (0, utils_1.posixizePath)(path_1.default.dirname(filePath));
-            const result = utils_1.UtilFT.fileSearchGlob(basedir, execArr[1], { style: 'posix' })
-                .map((file) => path_1.default.posix.relative(basedir, file))
-                .map((file) => path_1.default.parse(file).name)
-                .filter((file) => file != path_1.default.parse(filePath).name)
+            const basedir = pathe_1.default.dirname(filePath);
+            const result = utils_1.UtilFT.fileSearchGlob(basedir, execArr[1])
+                .map((file) => pathe_1.default.relative(basedir, file))
+                .map((file) => pathe_1.default.parse(file).name)
+                .filter((file) => file != pathe_1.default.parse(filePath).name)
                 .map((file) => `export * from './${file}'`)
                 .join(';');
             return result.length > 0 ? `${result};` : result;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.44",
+	"version": "1.0.45",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
@@ -16,8 +16,9 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"@zwa73/utils": "^1.0.119",
+		"@zwa73/utils": "^1.0.121",
 		"commander": "^11.1.0",
+		"pathe": "^1.1.2",
 		"ts-node": "^10.9.2",
 		"tsconfig-paths": "^4.2.0",
 		"typescript-json-schema": "^0.63.0"

package/src/Command/Init.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
 import * as fs from 'fs';
-import * as path from 'path';
+import path from 'pathe';
 
 import { SLogger, UtilFT, UtilFunc } from '@zwa73/utils';
 

package/src/Command/MapPath.ts

@@ -1,7 +1,7 @@
-import { SLogger, UtilFT, matchProc, posixizePath, throwError } from "@zwa73/utils";
+import { SLogger, UtilFT, matchProc, throwError } from "@zwa73/utils";
 import { Command } from "commander";
 import fs from "fs";
-import path from "path";
+import path from "pathe";
 
 const DupMethodList = ["no-rename","overwrite","move"] as const;
 type DupMethod = typeof DupMethodList[number];
@@ -25,10 +25,10 @@ export const CmdMapPath = (program: Command) => program
         if(!DupMethodList.includes(options.duplicateHandling))
             throwError(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
         const duplicateHandling = options.duplicateHandling as DupMethod;
-        const basePath = posixizePath(process.cwd());
+        const basePath = process.cwd();
         // 遍历当前目录下的所有文件
         const filePaths = UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive,style:"posix"})
-            .map((filePath)=>path.posix.relative(basePath, filePath))
+            .map((filePath)=>path.relative(basePath, filePath))
             .filter((filePath)=>excludeRegex ? (!excludeRegex.test(filePath)) : true);
 
         //对单个路径映射
@@ -50,7 +50,7 @@ export const CmdMapPath = (program: Command) => program
             //如果文件已存在
             if(await UtilFT.pathExists(newFilePath)){
                 await matchProc(duplicateHandling,{
-                    'move': ()=> mapPath(filePath, path.posix.join(options.duplicateOutput, newFilePath)),
+                    'move': ()=> mapPath(filePath, path.join(options.duplicateOutput, newFilePath)),
                     'no-rename': ()=> SLogger.info(`重名文件存在，跳过：${newFilePath}`),
                     'overwrite': ()=> mapPath(filePath,newFilePath),
                 })

package/src/Command/Release.ts

@@ -1,5 +1,5 @@
 import { Command } from 'commander';
-import path from 'path';
+import path from 'pathe';
 
 import { SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
 

package/src/Command/RouteInterface.ts

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import path from 'pathe';
 
 import { SLogger, throwError, UtilFT, UtilFunc } from '@zwa73/utils';
 

package/src/Command/ScanDups.ts

@@ -1,8 +1,8 @@
-import { SLogger, UtilFT, posixizePath, stylizePath } from "@zwa73/utils";
+import { SLogger, UtilFT } from "@zwa73/utils";
 import { Command } from "commander";
 import fs from "fs";
 import crypto from 'crypto';
-import path from "path";
+import path from "pathe";
 
 async function calculateHash(filePath:string) {
     return new Promise<string>((resolve, reject) => {
@@ -25,7 +25,7 @@ export const CmdScanDups = (program: Command) => program
     .option("-r, --recursive", "是否处理子目录, 默认 true", true)
     .action(async (options) => {
         const regex = new RegExp(options.regex);
-        const basePath = posixizePath(process.cwd());
+        const basePath = process.cwd();
         const pList = UtilFT.fileSearchRegex(basePath, regex.source, {
             relative: options.recursive,
             style: "posix",

package/src/UtilDevTool.ts

@@ -1,7 +1,7 @@
-import * as path from 'path';
+import path from 'pathe';
 import * as TJS from 'typescript-json-schema';
 import * as fs from 'fs';
-import { JObject, SLogger, UtilFT, UtilFunc, dedent, posixizePath, stylizePath, throwError } from '@zwa73/utils';
+import { JObject, SLogger, UtilFT, UtilFunc, dedent, throwError } from '@zwa73/utils';
 
 export namespace UtilDT{
 
@@ -123,7 +123,7 @@ export async function batchNode(filepath:string|string[],opt?:BatchNodeOpt) {
     // 确保 filepath 总是一个数组
     if (!Array.isArray(filepath)) filepath = [filepath];
     // 将所有的相对路径转换为绝对路径
-    const absolutePaths = filepath.map(fp => path.posix.resolve(posixizePath(process.cwd()), posixizePath(fp)));
+    const absolutePaths = filepath.map(fp => path.resolve(process.cwd(), fp));
     // 创建一个字符串，其中包含所有文件的 require 语句
     const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
     // 创建并执行 ts-node 命令
@@ -160,9 +160,9 @@ const parseMacroPaths = (opt?:MacroOpt)=>{
         ? opt.glob
             ? UtilFT.fileSearchGlob(process.cwd(),opt.filePath,{style:"posix"})
             : typeof opt?.filePath==="string"
-                ? [posixizePath(opt?.filePath)]
-                : opt?.filePath.map((filepath)=>posixizePath(filepath))
-        : [posixizePath(basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2"))];
+                ? [opt?.filePath]
+                : opt?.filePath.map((filepath)=>filepath)
+        : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2")];
 }
 const readFile = async (basePath:string)=>
     (await fs.promises.readFile(basePath,'utf-8')).replaceAll("\r\n","\n");
@@ -226,7 +226,7 @@ export async function regionMacro(regionId:string|RegExp,codeText:string|((opt:C
                 await fs.promises.writeFile(filePath, fileText, 'utf-8');
             else if(!opt?.glob) SLogger.error(`UtilDT.regionMacro 无法找到区域 ${regionId}`);
         }
-        plist.push(UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\","/")),queuefunc))
+        plist.push(UtilFunc.queueProc(path.normalize(filePath),queuefunc))
     }
     await Promise.all(plist);
 }
@@ -284,7 +284,7 @@ export async function commentMacro(commentId:string|RegExp,codeText:string|((opt
                 await fs.promises.writeFile(filePath, fileText, 'utf-8');
             else if(!opt?.glob) SLogger.error(`UtilDT.commentMacro 无法找到注释 ${commentId}`);
         }
-        plist.push(UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\","/")),queuefunc))
+        plist.push(UtilFunc.queueProc(path.normalize(filePath),queuefunc))
     }
     await Promise.all(plist);
 }
@@ -310,7 +310,7 @@ export async function fileMacro(codeText:string|((opt:Omit<CodeTextOpt,'ident'|'
             });
             await fs.promises.writeFile(filePath, parseCode, 'utf-8');
         }
-        plist.push(UtilFunc.queueProc(path.posix.normalize(filePath.replaceAll("\\","/")),queuefunc))
+        plist.push(UtilFunc.queueProc(path.normalize(filePath),queuefunc))
     }
     await Promise.all(plist);
 }

package/src/UtilMacro.ts

@@ -1,6 +1,6 @@
-import { UtilFT, posixizePath, stylizePath } from "@zwa73/utils";
+import { UtilFT } from "@zwa73/utils";
 import { commentMacro } from "./QuickFunc"
-import path from "path";
+import path from "pathe";
 
 
 export namespace UtilMacro{
@@ -10,9 +10,9 @@ export namespace UtilMacro{
      */
     export function exportComment(glob:string){
         commentMacro(/export (\S*)/,({filePath,matchId,execArr})=>{
-            const basedir = posixizePath(path.dirname(filePath));
-            const result = UtilFT.fileSearchGlob(basedir,execArr[1],{style:'posix'})
-                .map((file)=>path.posix.relative(basedir,file))
+            const basedir = path.dirname(filePath);
+            const result = UtilFT.fileSearchGlob(basedir,execArr[1])
+                .map((file)=>path.relative(basedir,file))
                 .map((file)=>path.parse(file).name)
                 .filter((file)=>file!=path.parse(filePath).name)
                 .map((file)=>`export * from './${file}'`)