@zwa73/utils 1.0.109 → 1.0.111

package/dist/UtilClass.d.ts

@@ -1,3 +1,4 @@
+import { LiteralCheck } from "./UtilInterfaces";
 /**函数管道器 */
 export declare class Piper<Arg, Result = Arg> {
     /**管道函数列表 */
@@ -55,6 +56,11 @@ export declare class Stream<T> implements Iterable<T> {
      * @returns 数组
      */
     toArray(): Promise<Array<T>>;
+    /**应用加工 并排除某个字面量
+     * @param value - 排除的值
+     * @returns 自身
+     */
+    exclude<E>(value: LiteralCheck<E>): Promise<Stream<Exclude<T, E>>>;
     /**应用加工 并过滤
      * @param func - 过滤函数
      * @returns 自身

package/dist/UtilClass.js

@@ -155,6 +155,14 @@ class Stream {
         await this.append();
         return [...this];
     }
+    /**应用加工 并排除某个字面量
+     * @param value - 排除的值
+     * @returns 自身
+     */
+    async exclude(value) {
+        await this.append();
+        return new Stream(this._list.filter((v) => v !== value));
+    }
     /**应用加工 并过滤
      * @param func - 过滤函数
      * @returns 自身

package/dist/UtilFfmpegTools.js

@@ -37,9 +37,9 @@ const UtilClass_1 = require("./UtilClass");
 class SFfmpegTool {
     /**静态构造函数 */
     static init() {
-        let ffmpegPath = process.env.FFMPEG_PATH;
+        const ffmpegPath = process.env.FFMPEG_PATH;
         if (ffmpegPath != null) {
-            let exepath = path.join(ffmpegPath, "ffmpeg.exe");
+            const exepath = path.join(ffmpegPath, "ffmpeg.exe");
             SFfmpegTool.setFfmpegPath(exepath);
         }
     }

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匹配的文件
@@ -236,12 +239,16 @@ var UtilFT;
      */
     function fileSearchGlob(dir, globPattern, opt) {
         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) => {
+            ? path.join(dir, globPattern).replaceAll("\\", "/")
+            : globPattern.map((p) => path.join(dir, p).replaceAll("\\", "/"));
+        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/dist/UtilFunctions.d.ts

@@ -1,6 +1,8 @@
 import { AnyFunc, ComposedClass, ComposedMixinable, ComposedRefMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, LiteralCheck, Matchable, MatchableFlag, Mixinable, Outcome, PromiseVerifyFn, RefMixinable, UnionToIntersection } from "./UtilInterfaces";
 import { LogLevel } from "./UtilLogger";
 import { FailedLike, None, StatusSymbol, Success, SuccessLike, Timeout } from "./UtilSymbol";
+declare const HashMethodList: readonly ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
+type HashMethod = typeof HashMethodList[number];
 type SuccessOut<T> = Outcome<Success, T>;
 type TimeoutOut<T> = Outcome<Timeout, Promise<T>>;
 /**常用函数 */
@@ -30,10 +32,11 @@ export declare class UtilFunc {
      */
     static genUUID(): string;
     /**计算Hash
-     * @param str - 待计算的字符串
+     * @param str    - 待计算的字符串
+     * @param method - hash算法
      * @returns hash
      */
-    static calcHash(str: string): string;
+    static calcHash(str: string, method?: HashMethod): string;
     /**等待 timeMs 毫秒
      * @async
      * @param timeMs - 等待的毫秒数

package/dist/UtilFunctions.js

@@ -38,6 +38,7 @@ const cp = __importStar(require("child_process"));
 const UtilLogger_1 = require("./UtilLogger");
 const UtilSymbol_1 = require("./UtilSymbol");
 const UtilDecorators_1 = require("./UtilDecorators");
+const HashMethodList = ["md5", "sha1", "sha256", "sha512", "sha3", "blake2", "blake3"];
 /**永不完成的Promise单例 */
 const NeverResolvedPromise = new Promise(() => { });
 /**常用函数 */
@@ -88,11 +89,12 @@ class UtilFunc {
         return crypto.randomBytes(16).toString("hex");
     }
     /**计算Hash
-     * @param str - 待计算的字符串
+     * @param str    - 待计算的字符串
+     * @param method - hash算法
      * @returns hash
      */
-    static calcHash(str) {
-        return crypto.createHash('md5').update(str).digest('hex');
+    static calcHash(str, method = 'md5') {
+        return crypto.createHash(method).update(str).digest('hex');
     }
     static async sleep(timeMs, result) {
         return new Promise(function (resolve, rejecte) {

package/package.json

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

package/scripts/postinstall.js

@@ -45,7 +45,7 @@ function showUpgradeMessages(prevVersion, currentVersion) {
 async function main(){
     const packageTable = await UtilFT.loadJSONFile(PACKAGE_PATH);
     const currentVersion = packageTable.version;
-    await UtilFT.ensurePathExists(versionTable);
+    await UtilFT.ensurePathExists(VERSION_PATH);
     const versionTable = Object.assign({},
         await UtilFT.loadJSONFile(VERSION_PATH,{}),
         {utils:{version:currentVersion}});

package/src/UtilClass.ts

@@ -1,4 +1,5 @@
 import { matchProc } from "./QuickFunction";
+import { LiteralCheck } from "./UtilInterfaces";
 
 /**函数管道器 */
 export class Piper<Arg, Result = Arg> {
@@ -160,6 +161,14 @@ export class Stream<T> implements Iterable<T>{
         await this.append();
         return [...this];
     }
+    /**应用加工 并排除某个字面量
+     * @param value - 排除的值
+     * @returns 自身
+     */
+    async exclude<E>(value:LiteralCheck<E>): Promise<Stream<Exclude<T,E>>>{
+        await this.append();
+        return new Stream(this._list.filter((v)=>v!==value as any) as Exclude<T,E>[]);
+    }
     /**应用加工 并过滤
      * @param func - 过滤函数
      * @returns 自身

package/src/UtilFfmpegTools.ts

@@ -15,9 +15,9 @@ export type IOMap = { [key: string]: string };
 class SFfmpegTool {
     /**静态构造函数 */
     static init() {
-        let ffmpegPath = process.env.FFMPEG_PATH;
+        const ffmpegPath = process.env.FFMPEG_PATH;
         if(ffmpegPath!=null){
-            let exepath = path.join(ffmpegPath,"ffmpeg.exe");
+            const exepath = path.join(ffmpegPath,"ffmpeg.exe");
             SFfmpegTool.setFfmpegPath(exepath);
         }
     }

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         - 起始目录
@@ -269,11 +274,15 @@ export function fileSearchRegex(dir: string, traitRegex: string, opt?:FileSearch
  */
 export function fileSearchGlob(dir: string, globPattern:string|string[],opt?:FileSearchGlobOpt){
     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);
+        ? path.join(dir,globPattern).replaceAll("\\","/")
+        : globPattern.map((p)=>path.join(dir,p).replaceAll("\\","/"));
+    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("/", "\\")),
+        });
     });
 }
 /**

package/src/UtilFunctions.ts

@@ -5,6 +5,8 @@ import { LogLevel, SLogger } from "@src/UtilLogger";
 import { Completed, Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
 import { Catch, DeferAsync, LogTimeAsync } from "./UtilDecorators";
 
+const HashMethodList = ["md5","sha1","sha256","sha512","sha3","blake2","blake3"] as const;
+type HashMethod = typeof HashMethodList[number];
 
 type SuccessOut<T> = Outcome<Success,T>;
 type TimeoutOut<T> = Outcome<Timeout,Promise<T>>;
@@ -71,12 +73,14 @@ static initObject<T extends JObject>
 static genUUID() {
     return crypto.randomBytes(16).toString("hex");
 }
+
 /**计算Hash  
- * @param str - 待计算的字符串
+ * @param str    - 待计算的字符串
+ * @param method - hash算法
  * @returns hash
  */
-static calcHash(str:string) {
-    return crypto.createHash('md5').update(str).digest('hex');
+static calcHash(str:string,method:HashMethod='md5') {
+    return crypto.createHash(method).update(str).digest('hex');
 }