@zwa73/dev-utils 1.0.41 → 1.0.43

package/dist/Command/MapPath.js

@@ -27,9 +27,9 @@ const CmdMapPath = (program) => program
     if (!DupMethodList.includes(options.duplicateHandling))
         (0, utils_1.throwError)(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
     const duplicateHandling = options.duplicateHandling;
-    const basePath = process.cwd().replaceAll('\\', '/');
+    const basePath = process.cwd();
     // 遍历当前目录下的所有文件
-    const filePaths = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive, normalize: "posix" })
+    const filePaths = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, { relative: options.recursive, style: "posix" })
         .map((filePath) => path_1.default.posix.relative(basePath, filePath))
         .filter((filePath) => excludeRegex ? (!excludeRegex.test(filePath)) : true);
     //对单个路径映射

package/dist/Command/ScanDups.js

@@ -27,10 +27,10 @@ const CmdScanDups = (program) => program
     .option("-r, --recursive", "是否处理子目录, 默认 true", true)
     .action(async (options) => {
     const regex = new RegExp(options.regex);
-    const basePath = process.cwd().replaceAll("\\", "/");
+    const basePath = (0, utils_1.posixizePath)(process.cwd());
     const pList = utils_1.UtilFT.fileSearchRegex(basePath, regex.source, {
         relative: options.recursive,
-        normalize: "posix",
+        style: "posix",
     }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
     const hashMap = (await Promise.all(pList)).reduce((obj, cur) => {
         obj[cur.hash] = (obj[cur.hash] ?? []).concat(cur.filePath);

package/dist/UtilDevTool.js

@@ -124,7 +124,7 @@ var UtilDT;
         if (!Array.isArray(filepath))
             filepath = [filepath];
         // 将所有的相对路径转换为绝对路径
-        const absolutePaths = filepath.map(fp => path.resolve(process.cwd(), fp).replaceAll("\\", "/"));
+        const absolutePaths = filepath.map(fp => (0, utils_1.posixizePath)(path.resolve(process.cwd(), fp)));
         // 创建一个字符串，其中包含所有文件的 require 语句
         const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
         // 创建并执行 ts-node 命令
@@ -140,11 +140,11 @@ var UtilDT;
         const basePath = loc?.filePath;
         return opt?.filePath
             ? opt.glob
-                ? utils_1.UtilFT.fileSearchGlob(process.cwd(), opt.filePath, { normalize: "posix" })
+                ? utils_1.UtilFT.fileSearchGlob(process.cwd(), opt.filePath, { style: "posix" })
                 : typeof opt?.filePath === "string"
-                    ? [opt?.filePath.replaceAll('\\', '/')]
-                    : opt?.filePath.map((filepath) => filepath.replaceAll('\\', '/'))
-            : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/, "$1.$2").replaceAll('\\', '/')];
+                    ? [(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"))];
     };
     const readFile = async (basePath) => (await fs.promises.readFile(basePath, 'utf-8')).replaceAll("\r\n", "\n");
     const parseCodeText = async (codeText, opt) => {

package/dist/UtilMacro.js

@@ -15,8 +15,8 @@ var UtilMacro;
      */
     function exportComment(glob) {
         (0, QuickFunc_1.commentMacro)(/export (\S*)/, ({ filePath, matchId, execArr }) => {
-            const basedir = path_1.default.dirname(filePath).replaceAll('\\', '/');
-            const result = utils_1.UtilFT.fileSearchGlob(basedir, execArr[1], { normalize: 'posix' })
+            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)

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/dev-utils",
-	"version": "1.0.41",
+	"version": "1.0.43",
 	"description": "编译与调试工具",
 	"main": "index.js",
 	"scripts": {
@@ -16,7 +16,7 @@
 	"author": "zwa73",
 	"license": "ISC",
 	"dependencies": {
-		"@zwa73/utils": "^1.0.117",
+		"@zwa73/utils": "^1.0.119",
 		"commander": "^11.1.0",
 		"ts-node": "^10.9.2",
 		"tsconfig-paths": "^4.2.0",

package/src/Command/MapPath.ts

@@ -25,9 +25,9 @@ export const CmdMapPath = (program: Command) => program
         if(!DupMethodList.includes(options.duplicateHandling))
             throwError(`${options.duplicateHandling} 不是有效的 duplicate-handling`);
         const duplicateHandling = options.duplicateHandling as DupMethod;
-        const basePath = process.cwd().replaceAll('\\','/');
+        const basePath = process.cwd();
         // 遍历当前目录下的所有文件
-        const filePaths = UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive,normalize:"posix"})
+        const filePaths = UtilFT.fileSearchRegex(basePath, regex.source,{relative:options.recursive,style:"posix"})
             .map((filePath)=>path.posix.relative(basePath, filePath))
             .filter((filePath)=>excludeRegex ? (!excludeRegex.test(filePath)) : true);
 

package/src/Command/ScanDups.ts

@@ -1,4 +1,4 @@
-import { SLogger, UtilFT } from "@zwa73/utils";
+import { SLogger, UtilFT, posixizePath, stylizePath } from "@zwa73/utils";
 import { Command } from "commander";
 import fs from "fs";
 import crypto from 'crypto';
@@ -25,10 +25,10 @@ export const CmdScanDups = (program: Command) => program
     .option("-r, --recursive", "是否处理子目录, 默认 true", true)
     .action(async (options) => {
         const regex = new RegExp(options.regex);
-        const basePath = process.cwd().replaceAll("\\", "/")
+        const basePath = posixizePath(process.cwd());
         const pList = UtilFT.fileSearchRegex(basePath, regex.source, {
             relative: options.recursive,
-            normalize: "posix",
+            style: "posix",
         }).map(async (filePath) => ({ filePath, hash: await calculateHash(filePath) }));
 
         const hashMap = (await Promise.all(pList)).reduce((obj,cur)=>{

package/src/UtilDevTool.ts

@@ -1,7 +1,7 @@
 import * as path from 'path';
 import * as TJS from 'typescript-json-schema';
 import * as fs from 'fs';
-import { JObject, SLogger, UtilFT, UtilFunc, dedent, throwError } from '@zwa73/utils';
+import { JObject, SLogger, UtilFT, UtilFunc, dedent, posixizePath, stylizePath, 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.resolve(process.cwd(), fp).replaceAll("\\","/"));
+    const absolutePaths = filepath.map(fp => posixizePath(path.resolve(process.cwd(), fp)));
     // 创建一个字符串，其中包含所有文件的 require 语句
     const requires = absolutePaths.map(fp => `require('${fp}')`).join(';');
     // 创建并执行 ts-node 命令
@@ -158,11 +158,11 @@ const parseMacroPaths = (opt?:MacroOpt)=>{
     const basePath = loc?.filePath!;
     return opt?.filePath
         ? opt.glob
-            ? UtilFT.fileSearchGlob(process.cwd(),opt.filePath,{normalize:"posix"})
+            ? UtilFT.fileSearchGlob(process.cwd(),opt.filePath,{style:"posix"})
             : typeof opt?.filePath==="string"
-                ? [opt?.filePath.replaceAll('\\','/')]
-                : opt?.filePath.map((filepath)=>filepath.replaceAll('\\','/'))
-        : [basePath.replace(/(.+)\.macro\.(js|ts|cjs|mjs)$/,"$1.$2").replaceAll('\\','/')];
+                ? [posixizePath(opt?.filePath)]
+                : opt?.filePath.map((filepath)=>posixizePath(filepath))
+        : [posixizePath(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");

package/src/UtilMacro.ts

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