@zwa73/utils 1.0.119 → 1.0.121

package/dist/QuickFunction.d.ts

@@ -1,4 +1,4 @@
 import { UtilFT } from "./UtilFileTools";
 import { UtilFunc } from "./UtilFunctions";
 export declare const outcome: typeof UtilFunc.outcome, matchProc: typeof UtilFunc.matchProc, sucesProc: typeof UtilFunc.sucesProc, isFailed: typeof UtilFunc.isFailed, isSafeNumber: typeof UtilFunc.isSafeNumber, isSuccess: typeof UtilFunc.isSuccess, likeNone: typeof UtilFunc.likeNone, expect: typeof UtilFunc.expect, assertType: typeof UtilFunc.assertType, assertLiteral: typeof UtilFunc.assertLiteral, deepClone: typeof UtilFunc.deepClone, sleep: typeof UtilFunc.sleep, stringifyJToken: typeof UtilFunc.stringifyJToken, getTime: typeof UtilFunc.getTime, mapEntries: typeof UtilFunc.mapEntries, dedent: typeof UtilFunc.dedent, throwError: typeof UtilFunc.throwError;
-export declare const stylizePath: typeof UtilFT.stylizePath, posixizePath: typeof UtilFT.posixizePath, win32izePath: typeof UtilFT.win32izePath;
+export declare const stylizePath: typeof UtilFT.stylizePath, posixizePath: typeof UtilFT.posixizePath, win32izePath: typeof UtilFT.win32izePath, currosizePath: typeof UtilFT.currosizePath;

package/dist/QuickFunction.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.expect = exports.likeNone = exports.isSuccess = exports.isSafeNumber = exports.isFailed = exports.sucesProc = exports.matchProc = exports.outcome = void 0;
+exports.currosizePath = exports.win32izePath = exports.posixizePath = exports.stylizePath = exports.throwError = exports.dedent = exports.mapEntries = exports.getTime = exports.stringifyJToken = exports.sleep = exports.deepClone = exports.assertLiteral = exports.assertType = exports.expect = exports.likeNone = exports.isSuccess = exports.isSafeNumber = exports.isFailed = exports.sucesProc = exports.matchProc = exports.outcome = void 0;
 const UtilFileTools_1 = require("./UtilFileTools");
 const UtilFunctions_1 = require("./UtilFunctions");
 const UtilSymbol_1 = require("./UtilSymbol");
 exports.outcome = UtilFunctions_1.UtilFunc.outcome, exports.matchProc = UtilFunctions_1.UtilFunc.matchProc, exports.sucesProc = UtilFunctions_1.UtilFunc.sucesProc, exports.isFailed = UtilFunctions_1.UtilFunc.isFailed, exports.isSafeNumber = UtilFunctions_1.UtilFunc.isSafeNumber, exports.isSuccess = UtilFunctions_1.UtilFunc.isSuccess, exports.likeNone = UtilFunctions_1.UtilFunc.likeNone, exports.expect = UtilFunctions_1.UtilFunc.expect, exports.assertType = UtilFunctions_1.UtilFunc.assertType, exports.assertLiteral = UtilFunctions_1.UtilFunc.assertLiteral, exports.deepClone = UtilFunctions_1.UtilFunc.deepClone, exports.sleep = UtilFunctions_1.UtilFunc.sleep, exports.stringifyJToken = UtilFunctions_1.UtilFunc.stringifyJToken, exports.getTime = UtilFunctions_1.UtilFunc.getTime, exports.mapEntries = UtilFunctions_1.UtilFunc.mapEntries, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError;
-exports.stylizePath = UtilFileTools_1.UtilFT.stylizePath, exports.posixizePath = UtilFileTools_1.UtilFT.posixizePath, exports.win32izePath = UtilFileTools_1.UtilFT.win32izePath;
+exports.stylizePath = UtilFileTools_1.UtilFT.stylizePath, exports.posixizePath = UtilFileTools_1.UtilFT.posixizePath, exports.win32izePath = UtilFileTools_1.UtilFT.win32izePath, exports.currosizePath = UtilFileTools_1.UtilFT.currosizePath;
 if (false) {
     let aaser = (0, exports.assertLiteral)({ a: 1 });
     let a = null;

package/dist/UtilFfmpegTools.js

@@ -28,7 +28,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SFfmpegTool = void 0;
 const fluent_ffmpeg_1 = __importDefault(require("fluent-ffmpeg"));
-const path = __importStar(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 const fs = __importStar(require("fs"));
 const UtilLogger_1 = require("./UtilLogger");
 const UtilClass_1 = require("./UtilClass");
@@ -39,7 +39,7 @@ class SFfmpegTool {
     static init() {
         const ffmpegPath = process.env.FFMPEG_PATH;
         if (ffmpegPath != null) {
-            const exepath = path.join(ffmpegPath, "ffmpeg.exe");
+            const exepath = pathe_1.default.join(ffmpegPath, "ffmpeg.exe");
             SFfmpegTool.setFfmpegPath(exepath);
         }
     }
@@ -70,7 +70,7 @@ class SFfmpegTool {
      * @param quality       - 质量
      */
     static async flac2ogg(inputFlacFile, outputOggPath, quality = 10) {
-        let wavPath = path.join(path.dirname(inputFlacFile), `tmp_${path.basename(inputFlacFile, ".flac")}.wav`);
+        let wavPath = pathe_1.default.join(pathe_1.default.dirname(inputFlacFile), `tmp_${pathe_1.default.basename(inputFlacFile, ".flac")}.wav`);
         await new Promise((resolve, reject) => {
             (0, fluent_ffmpeg_1.default)(inputFlacFile)
                 .audioCodec("pcm_s16le")

package/dist/UtilFileTools.d.ts

@@ -17,15 +17,11 @@ type EnsurePathExistsOpt = Partial<{
 type FileSearchGlobOpt = Partial<{
     /**忽略的文件 默认 undefined */
     ingore: string | string[];
-    /**输出的路径风格 默认跟随系统 */
-    style: "posix" | "win32";
 }>;
 /**regex搜索选项 */
 type FileSearchRegexOpt = Partial<{
     /**搜索子目录 默认 true */
     relative: boolean;
-    /**输出的路径风格 默认跟随系统 */
-    style: "posix" | "win32";
 }>;
 /**文件工具 */
 export declare namespace UtilFT {
@@ -117,12 +113,16 @@ export declare namespace UtilFT {
      * @returns 新的符合Win32风格的路径
      */
     function win32izePath(filePath: string): string;
+    /**保证路径为当前系统风格
+     * @param filePath - 输入路径
+     * @returns 新的符合当前系统风格的路径
+     */
+    function currosizePath(filePath: string): string;
     /**搜索路径符合正则表达式的文件
      * @param dir           - 起始目录
      * @param traitRegex    - 正则表达式
      * @param opt           - 可选参数
      * @param opt.relative  - 搜索子目录
-     * @param opt.style     - 输出的路径风格 默认跟随系统
      * @returns 文件名路径数组
      */
     function fileSearchRegex(dir: string, traitRegex: string, opt?: FileSearchRegexOpt): string[];
@@ -130,8 +130,7 @@ export declare namespace UtilFT {
      * @param dir         - 起始目录
      * @param globPattern - glob匹配
      * @param opt         - 可选参数
-     * @param opt.ignore    - 忽略的文件
-     * @param opt.style     - 输出的路径风格 默认跟随系统
+     * @param opt.ignore  - 忽略的文件
      * @returns 文件绝对路径数组
      */
     function fileSearchGlob(dir: string, globPattern: string | string[], opt?: FileSearchGlobOpt): string[];

package/dist/UtilFileTools.js

@@ -22,10 +22,14 @@ 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.UtilFT = void 0;
 const fs = __importStar(require("fs"));
-const path = __importStar(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
+const os = __importStar(require("os"));
 const UtilLogger_1 = require("./UtilLogger");
 const JSON5 = __importStar(require("json5"));
 const glob_1 = require("glob");
@@ -72,13 +76,13 @@ var UtilFT;
      */
     async function createPath(filePath, opt) {
         if (opt?.dir == true)
-            filePath = path.join(filePath, path.sep);
+            filePath = pathe_1.default.join(filePath, pathe_1.default.sep);
         try {
-            if (filePath.endsWith(path.sep)) {
+            if (filePath.endsWith(pathe_1.default.sep)) {
                 await fs.promises.mkdir(filePath, { recursive: true });
                 return true;
             }
-            await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
+            await fs.promises.mkdir(pathe_1.default.dirname(filePath), { recursive: true });
             const filehandle = await fs.promises.open(filePath, 'w');
             await filehandle.close();
             return true;
@@ -97,13 +101,13 @@ var UtilFT;
      */
     function createPathSync(filePath, opt) {
         if (opt?.dir == true)
-            filePath = path.join(filePath, path.sep);
+            filePath = pathe_1.default.join(filePath, pathe_1.default.sep);
         try {
-            if (filePath.endsWith(path.sep)) {
+            if (filePath.endsWith(pathe_1.default.sep)) {
                 fs.mkdirSync(filePath, { recursive: true });
                 return true;
             }
-            fs.mkdirSync(path.dirname(filePath), { recursive: true });
+            fs.mkdirSync(pathe_1.default.dirname(filePath), { recursive: true });
             fs.openSync(filePath, 'w');
             return true;
         }
@@ -139,7 +143,7 @@ var UtilFT;
     }
     UtilFT.ensurePathExistsSync = ensurePathExistsSync;
     function loadJSONFileSync(filePath, def) {
-        if (path.extname(filePath) !== '.json')
+        if (pathe_1.default.extname(filePath) !== '.json')
             filePath += '.json';
         let str = "";
         // 判断文件路径是否存在
@@ -155,7 +159,7 @@ var UtilFT;
     }
     UtilFT.loadJSONFileSync = loadJSONFileSync;
     async function loadJSONFile(filePath, def) {
-        if (path.extname(filePath) !== '.json')
+        if (pathe_1.default.extname(filePath) !== '.json')
             filePath += '.json';
         let str = "";
         // 判断文件路径是否存在
@@ -178,7 +182,7 @@ var UtilFT;
      */
     async function writeJSONFile(filePath, token) {
         let str = UtilFunctions_1.UtilFunc.stringifyJToken(token);
-        if (path.extname(filePath) !== '.json')
+        if (pathe_1.default.extname(filePath) !== '.json')
             filePath += '.json';
         // 判断文件路径是否存在 不存在则创建
         if (!(await pathExists(filePath)))
@@ -223,54 +227,57 @@ var UtilFT;
         return stylizePath(filePath, 'win32');
     }
     UtilFT.win32izePath = win32izePath;
+    /**保证路径为当前系统风格
+     * @param filePath - 输入路径
+     * @returns 新的符合当前系统风格的路径
+     */
+    function currosizePath(filePath) {
+        const system = os.platform();
+        if (system === 'win32')
+            return win32izePath(filePath);
+        return posixizePath(filePath);
+    }
+    UtilFT.currosizePath = currosizePath;
     /**搜索路径符合正则表达式的文件
      * @param dir           - 起始目录
      * @param traitRegex    - 正则表达式
      * @param opt           - 可选参数
      * @param opt.relative  - 搜索子目录
-     * @param opt.style     - 输出的路径风格 默认跟随系统
      * @returns 文件名路径数组
      */
     function fileSearchRegex(dir, traitRegex, opt) {
-        dir = stylizePath(dir, opt?.style);
-        const fixpath = opt?.style === undefined ? path :
-            opt.style === 'posix' ? path.posix : path.win32;
         const relative = opt?.relative ?? true;
         const outArray = [];
         const subFiles = fs.readdirSync(dir, { withFileTypes: true });
         //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
         const regex = new RegExp(traitRegex);
         for (const subFile of subFiles) {
-            const subFilePath = fixpath.join(dir, subFile.name);
+            const subFilePath = pathe_1.default.join(dir, subFile.name);
             //判断是否是文件夹，递归调用
             if (subFile.isDirectory()) {
                 if (relative)
-                    outArray.push(...fileSearchRegex(fixpath.join(subFilePath, fixpath.sep), traitRegex));
+                    outArray.push(...fileSearchRegex(pathe_1.default.join(subFilePath, pathe_1.default.sep), traitRegex));
                 continue;
             }
             if (regex.test(subFilePath))
                 outArray.push(subFilePath);
         }
-        return outArray.map((filePath) => fixpath.normalize(stylizePath(filePath, opt?.style)));
+        return outArray.map((filePath) => pathe_1.default.normalize(filePath));
     }
     UtilFT.fileSearchRegex = fileSearchRegex;
     /**搜索符合Glob匹配的文件
      * @param dir         - 起始目录
      * @param globPattern - glob匹配
      * @param opt         - 可选参数
-     * @param opt.ignore    - 忽略的文件
-     * @param opt.style     - 输出的路径风格 默认跟随系统
+     * @param opt.ignore  - 忽略的文件
      * @returns 文件绝对路径数组
      */
     function fileSearchGlob(dir, globPattern, opt) {
-        dir = stylizePath(dir, opt?.style);
-        const fixpath = opt?.style === undefined ? path :
-            opt.style === 'posix' ? path.posix : path.win32;
         const fixedPath = typeof globPattern === "string"
-            ? fixpath.join(dir, globPattern)
-            : globPattern.map((p) => fixpath.join(dir, p));
+            ? pathe_1.default.join(dir, globPattern)
+            : globPattern.map((p) => pathe_1.default.join(dir, p));
         return (0, glob_1.globSync)(fixedPath, { ignore: opt?.ingore, absolute: true })
-            .map((filePath) => fixpath.normalize(stylizePath(filePath, opt?.style)));
+            .map((filePath) => pathe_1.default.normalize(filePath));
     }
     UtilFT.fileSearchGlob = fileSearchGlob;
     /**

package/dist/UtilLogger.js

@@ -27,7 +27,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SLogger = void 0;
-const path = __importStar(require("path"));
+const pathe_1 = __importDefault(require("pathe"));
 const winston = __importStar(require("winston"));
 const winston_daily_rotate_file_1 = __importDefault(require("winston-daily-rotate-file"));
 const util_1 = require("util");
@@ -83,7 +83,7 @@ class SLogger {
                 return `[${info.timestamp}] [${level.toUpperCase()}]: ${messageList.join("\n")}`;
             }));
             transports.push(new winston_daily_rotate_file_1.default({
-                filename: path.join(outFloder, 'log-%DATE%.txt'),
+                filename: pathe_1.default.join(outFloder, 'log-%DATE%.txt'),
                 datePattern: 'YYYY-MM-DD',
                 level: fileLevel,
                 format: fileFormat,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.119",
+	"version": "1.0.121",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -25,6 +25,7 @@
 		"http-proxy-agent": "^5.0.0",
 		"https-proxy-agent": "^5.0.1",
 		"json5": "^2.2.3",
+		"pathe": "^1.1.2",
 		"tiktoken": "^1.0.7",
 		"winston": "^3.10.0",
 		"winston-daily-rotate-file": "^4.7.1"

package/src/QuickFunction.ts

@@ -24,9 +24,10 @@ export const {
 } = UtilFunc;
 
 export const {
-    stylizePath ,
-    posixizePath,
-    win32izePath,
+    stylizePath  ,
+    posixizePath ,
+    win32izePath ,
+    currosizePath,
 } = UtilFT;
 
 if(false){

package/src/UtilFfmpegTools.ts

@@ -1,6 +1,6 @@
 import { FfprobeData } from "fluent-ffmpeg";
 import fluentFfmpeg from "fluent-ffmpeg";
-import * as path from "path";
+import path from "pathe";
 import * as fs from "fs";
 import { SLogger } from "@src/UtilLogger";
 import { Stream } from "./UtilClass";

package/src/UtilFileTools.ts

@@ -1,5 +1,6 @@
 import * as fs from "fs";
-import * as path from "path";
+import path from 'pathe';
+import * as os from "os";
 import { JObject, JToken } from "@src/UtilInterfaces";
 import { SLogger } from "@src/UtilLogger";
 import * as JSON5 from 'json5';
@@ -26,16 +27,12 @@ type EnsurePathExistsOpt = Partial<{
 type FileSearchGlobOpt = Partial<{
     /**忽略的文件 默认 undefined */
     ingore:string|string[];
-    /**输出的路径风格 默认跟随系统 */
-    style:"posix"|"win32";
 }>
 
 /**regex搜索选项 */
 type FileSearchRegexOpt = Partial<{
     /**搜索子目录 默认 true */
     relative:boolean;
-    /**输出的路径风格 默认跟随系统 */
-    style:"posix"|"win32";
 }>
 
 /**文件工具 */
@@ -258,6 +255,18 @@ export function win32izePath(filePath: string): string {
     return stylizePath(filePath, 'win32');
 }
 
+/**保证路径为当前系统风格
+ * @param filePath - 输入路径
+ * @returns 新的符合当前系统风格的路径
+ */
+export function currosizePath(filePath: string): string {
+    const system = os.platform();
+    if (system === 'win32')
+        return win32izePath(filePath);
+    return posixizePath(filePath);
+}
+
+
 
 
 /**搜索路径符合正则表达式的文件
@@ -265,49 +274,39 @@ export function win32izePath(filePath: string): string {
  * @param traitRegex    - 正则表达式
  * @param opt           - 可选参数
  * @param opt.relative  - 搜索子目录
- * @param opt.style     - 输出的路径风格 默认跟随系统
  * @returns 文件名路径数组
  */
 export function fileSearchRegex(dir: string, traitRegex: string, opt?:FileSearchRegexOpt) {
-    dir = stylizePath(dir,opt?.style);
-    const fixpath = opt?.style === undefined ? path :
-        opt.style ==='posix' ? path.posix : path.win32;
-
     const relative = opt?.relative ?? true;
     const outArray: string[] = [];
     const subFiles = fs.readdirSync(dir, { withFileTypes: true });
     //如果使用 g 会导致 RegExp.lastIndex 更改, 将会导致匹配错误
     const regex = new RegExp(traitRegex);
     for (const subFile of subFiles) {
-        const subFilePath = fixpath.join(dir, subFile.name);
+        const subFilePath = path.join(dir, subFile.name);
         //判断是否是文件夹，递归调用
         if (subFile.isDirectory()) {
             if (relative)
-                outArray.push(...fileSearchRegex(fixpath.join(subFilePath, fixpath.sep), traitRegex));
+                outArray.push(...fileSearchRegex(path.join(subFilePath, path.sep), traitRegex));
             continue;
         }
         if (regex.test(subFilePath)) outArray.push(subFilePath);
     }
-    return outArray.map((filePath) => fixpath.normalize(stylizePath(filePath,opt?.style)));
+    return outArray.map((filePath) => path.normalize(filePath));
 }
 /**搜索符合Glob匹配的文件
  * @param dir         - 起始目录
  * @param globPattern - glob匹配
  * @param opt         - 可选参数
- * @param opt.ignore    - 忽略的文件
- * @param opt.style     - 输出的路径风格 默认跟随系统
+ * @param opt.ignore  - 忽略的文件
  * @returns 文件绝对路径数组
  */
 export function fileSearchGlob(dir: string, globPattern:string|string[],opt?:FileSearchGlobOpt){
-    dir = stylizePath(dir,opt?.style);
-    const fixpath = opt?.style === undefined ? path :
-        opt.style ==='posix' ? path.posix : path.win32;
-
     const fixedPath = typeof globPattern === "string"
-        ? fixpath.join(dir,globPattern)
-        : globPattern.map((p)=>fixpath.join(dir,p));
+        ? path.join(dir,globPattern)
+        : globPattern.map((p)=>path.join(dir,p));
     return globSync(fixedPath, { ignore: opt?.ingore, absolute: true })
-        .map((filePath) => fixpath.normalize(stylizePath(filePath,opt?.style)));
+        .map((filePath) => path.normalize(filePath));
 }
 /**
  * @deprecated 请使用 fileSearchRegex 或 fileSearchGlob

package/src/UtilLogger.ts

@@ -1,4 +1,4 @@
-import * as path from 'path';
+import path from 'pathe';
 import * as winston from 'winston';
 import DailyRotateFile from 'winston-daily-rotate-file';
 import {inspect} from 'util';