@zwa73/utils 1.0.109 → 1.0.110

package/dist/UtilFileTools.js

@@ -30,6 +30,7 @@ const UtilLogger_1 = require("./UtilLogger");
 const JSON5 = __importStar(require("json5"));
 const glob_1 = require("glob");
 const UtilFunctions_1 = require("./UtilFunctions");
+const QuickFunction_1 = require("./QuickFunction");
 /**文件工具 */
 var UtilFT;
 (function (UtilFT) {
@@ -221,9 +222,11 @@ var UtilFT;
         return outArray.map((filePath) => {
             if (opt?.normalize === undefined)
                 return filePath;
-            return path[opt.normalize].normalize(filePath);
+            return (0, QuickFunction_1.matchProc)(opt.normalize, {
+                posix: (nor) => path[nor].normalize(filePath.replaceAll("\\", "/")),
+                win32: (nor) => path[nor].normalize(filePath.replaceAll("/", "\\")),
+            });
         });
-        ;
     }
     UtilFT.fileSearchRegex = fileSearchRegex;
     /**搜索符合Glob匹配的文件
@@ -238,10 +241,14 @@ var UtilFT;
         const fixedPath = typeof globPattern === "string"
             ? path.join(dir, path.posix.normalize(globPattern))
             : globPattern.map((p) => path.join(dir, path.posix.normalize(p)));
-        return (0, glob_1.globSync)(fixedPath, { ignore: opt?.ingore, absolute: true }).map((filePath) => {
+        return (0, glob_1.globSync)(fixedPath, { ignore: opt?.ingore, absolute: true })
+            .map((filePath) => {
             if (opt?.normalize === undefined)
                 return filePath;
-            return path[opt.normalize].normalize(filePath);
+            return (0, QuickFunction_1.matchProc)(opt.normalize, {
+                posix: (nor) => path[nor].normalize(filePath.replaceAll("\\", "/")),
+                win32: (nor) => path[nor].normalize(filePath.replaceAll("/", "\\")),
+            });
         });
     }
     UtilFT.fileSearchGlob = fileSearchGlob;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.109",
+	"version": "1.0.110",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {

package/src/UtilFileTools.ts

@@ -5,6 +5,7 @@ import { SLogger } from "@src/UtilLogger";
 import * as JSON5 from 'json5';
 import { globSync } from "glob";
 import { UtilFunc } from "./UtilFunctions";
+import { matchProc } from "./QuickFunction";
 
 /**创建文件选项 */
 type CreatePathOpt = Partial<{
@@ -242,22 +243,26 @@ export async function writeJSONFile(
 export function fileSearchRegex(dir: string, traitRegex: string, opt?:FileSearchRegexOpt) {
     const relative = opt?.relative ?? true;
     const outArray: string[] = [];
-    const subFiles = fs.readdirSync(dir,{withFileTypes:true});
+    const subFiles = fs.readdirSync(dir, { withFileTypes: true });
     //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
     const regex = new RegExp(traitRegex);
     for (const subFile of subFiles) {
         const subFilePath = path.join(dir, subFile.name);
         //判断是否是文件夹，递归调用
         if (subFile.isDirectory()) {
-            if(relative) outArray.push(...fileSearchRegex(path.join(subFilePath, path.sep), traitRegex));
+            if (relative)
+                outArray.push(...fileSearchRegex(path.join(subFilePath, path.sep), traitRegex));
             continue;
         }
         if (regex.test(subFilePath)) outArray.push(subFilePath);
     }
-    return outArray.map((filePath)=>{
-        if(opt?.normalize===undefined) return filePath;
-        return path[opt.normalize].normalize(filePath);
-    });;
+    return outArray.map((filePath) => {
+        if (opt?.normalize === undefined) return filePath;
+        return matchProc(opt.normalize, {
+            posix: (nor) => path[nor].normalize(filePath.replaceAll("\\", "/")),
+            win32: (nor) => path[nor].normalize(filePath.replaceAll("/", "\\")),
+        });
+    });
 }
 /**搜索符合Glob匹配的文件
  * @param dir         - 起始目录
@@ -271,9 +276,13 @@ export function fileSearchGlob(dir: string, globPattern:string|string[],opt?:Fil
     const fixedPath = typeof globPattern === "string"
         ? path.join(dir,path.posix.normalize(globPattern))
         : globPattern.map((p)=>path.join(dir,path.posix.normalize(p)));
-    return globSync(fixedPath,{ignore:opt?.ingore,absolute:true}).map((filePath)=>{
-        if(opt?.normalize===undefined) return filePath;
-        return path[opt.normalize].normalize(filePath);
+    return globSync(fixedPath, { ignore: opt?.ingore, absolute: true })
+        .map((filePath) => {
+        if (opt?.normalize === undefined) return filePath;
+        return matchProc(opt.normalize, {
+            posix: (nor) => path[nor].normalize(filePath.replaceAll("\\", "/")),
+            win32: (nor) => path[nor].normalize(filePath.replaceAll("/", "\\")),
+        });
     });
 }
 /**