@zwa73/utils 1.0.110 → 1.0.112

package/dist/QuickFunction.d.ts

@@ -1,2 +1,2 @@
 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, composeMixinable: typeof UtilFunc.composeMixinable, dedent: typeof UtilFunc.dedent, throwError: typeof UtilFunc.throwError;
+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;

package/dist/QuickFunction.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.throwError = exports.dedent = exports.composeMixinable = 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.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 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.composeMixinable = UtilFunctions_1.UtilFunc.composeMixinable, exports.dedent = UtilFunctions_1.UtilFunc.dedent, exports.throwError = UtilFunctions_1.UtilFunc.throwError;
+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;
 if (false) {
     let aaser = (0, exports.assertLiteral)({ a: 1 });
     let a = null;

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

@@ -239,8 +239,8 @@ 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)));
+            ? 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)

package/dist/UtilFunctions.d.ts

@@ -1,6 +1,13 @@
 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 ExecOpt = Partial<{
+    outlvl: LogLevel;
+    errlvl: LogLevel;
+}>;
 type SuccessOut<T> = Outcome<Success, T>;
 type TimeoutOut<T> = Outcome<Timeout, Promise<T>>;
 /**常用函数 */
@@ -12,7 +19,7 @@ export declare class UtilFunc {
     /**初始化对象的字段
      * 会改变obj
      * @param obj        - 所要初始化的对象
-     * @param field 	 - 所要初始化的字段
+     * @param field      - 所要初始化的字段
      * @param defaultVal - 默认值
      * @returns 最终值
      */
@@ -30,10 +37,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 - 等待的毫秒数
@@ -47,12 +55,13 @@ export declare class UtilFunc {
      * @returns
      */
     static sleep<T>(timeMs: number, result: T): Promise<T>;
-    /**封装的 cp.exec 执行一段指令 指令完成后返回 Promise
+    /**封装的 cp.spawn 执行一段指令，指令运行时实时返回输出
      * @param command - 指令文本
-     * @param outlvl  - 普通输出的日志等级
-     * @param errlvl  - 错误的日志等级
+     * @param opt     - 可选参数
+     * @param opt.outlvl  - 普通输出的日志等级
+     * @param opt.errlvl  - 错误的日志等级
      */
-    static exec(command: string, outlvl?: LogLevel, errlvl?: LogLevel): Promise<{
+    static exec(command: string, opt?: ExecOpt): Promise<{
         stdout: string;
         stderr: string;
     }>;

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(() => { });
 /**常用函数 */
@@ -51,7 +52,7 @@ class UtilFunc {
     /**初始化对象的字段
      * 会改变obj
      * @param obj        - 所要初始化的对象
-     * @param field 	 - 所要初始化的字段
+     * @param field      - 所要初始化的字段
      * @param defaultVal - 默认值
      * @returns 最终值
      */
@@ -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) {
@@ -101,23 +103,32 @@ class UtilFunc {
             }, timeMs);
         });
     }
-    /**封装的 cp.exec 执行一段指令 指令完成后返回 Promise
+    /**封装的 cp.spawn 执行一段指令，指令运行时实时返回输出
      * @param command - 指令文本
-     * @param outlvl  - 普通输出的日志等级
-     * @param errlvl  - 错误的日志等级
+     * @param opt     - 可选参数
+     * @param opt.outlvl  - 普通输出的日志等级
+     * @param opt.errlvl  - 错误的日志等级
      */
-    static exec(command, outlvl, errlvl) {
+    static exec(command, opt) {
         return new Promise((resolve, reject) => {
-            cp.exec(command, (error, stdout, stderr) => {
-                if (error)
-                    reject(error);
-                else {
-                    if (stdout && outlvl)
-                        UtilLogger_1.SLogger.log(outlvl, stdout);
-                    if (stderr && errlvl)
-                        UtilLogger_1.SLogger.log(errlvl, stderr);
-                    resolve({ stdout, stderr });
-                }
+            const child = cp.spawn(command, { shell: true });
+            let stdout = '';
+            let stderr = '';
+            child.stdout.on('data', (data) => {
+                stdout += data;
+                if (opt?.outlvl)
+                    UtilLogger_1.SLogger.log(opt?.outlvl, data.toString());
+            });
+            child.stderr.on('data', (data) => {
+                stderr += data;
+                if (opt?.errlvl)
+                    UtilLogger_1.SLogger.log(opt?.errlvl, data.toString());
+            });
+            child.on('error', reject);
+            child.on('close', (code) => {
+                if (code !== 0)
+                    UtilLogger_1.SLogger.warn(`UtilFunc.exec 命令:"${command}" 结束 代码为:${code}`);
+                resolve({ stdout, stderr });
             });
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.110",
+	"version": "1.0.112",
 	"description": "my utils",
 	"main": "index.js",
 	"scripts": {
@@ -32,7 +32,7 @@
 	"devDependencies": {
 		"@types/jest": "^29.5.12",
 		"@types/node": "^18.16.3",
-		"@zwa73/dev-utils": "^1.0.13",
+		"@zwa73/dev-utils": "^1.0.22",
 		"jest": "^29.7.0",
 		"ts-jest": "^29.1.2",
 		"tsc-alias": "^1.8.8",

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/QuickFunction.ts

@@ -18,7 +18,6 @@ export const {
     stringifyJToken,
     getTime,
     mapEntries,
-    composeMixinable,
     dedent,
     throwError,
 } = UtilFunc;

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

@@ -274,8 +274,8 @@ 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)));
+        ? 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;

package/src/UtilFunctions.ts

@@ -5,6 +5,14 @@ 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 ExecOpt = Partial<{
+    outlvl:LogLevel,
+    errlvl:LogLevel,
+}>
 
 type SuccessOut<T> = Outcome<Success,T>;
 type TimeoutOut<T> = Outcome<Timeout,Promise<T>>;
@@ -31,7 +39,7 @@ static getTime(): number {
 /**初始化对象的字段  
  * 会改变obj
  * @param obj        - 所要初始化的对象
- * @param field 	 - 所要初始化的字段
+ * @param field      - 所要初始化的字段
  * @param defaultVal - 默认值
  * @returns 最终值
  */
@@ -71,12 +79,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');
 }
 
 
@@ -101,26 +111,35 @@ static async sleep<T>(timeMs: number, result?:T): Promise<T|undefined> {
     });
 }
 
-/**封装的 cp.exec 执行一段指令 指令完成后返回 Promise  
+/**封装的 cp.spawn 执行一段指令，指令运行时实时返回输出
  * @param command - 指令文本
- * @param outlvl  - 普通输出的日志等级
- * @param errlvl  - 错误的日志等级
+ * @param opt     - 可选参数
+ * @param opt.outlvl  - 普通输出的日志等级
+ * @param opt.errlvl  - 错误的日志等级
  */
-static exec(command: string,outlvl?:LogLevel,errlvl?:LogLevel) {
-	return new Promise<{ stdout:string, stderr:string }>
-        ((resolve, reject) => {
-		cp.exec(command, (error, stdout, stderr) => {
-			if (error)
-				reject(error);
-			else{
-                if(stdout && outlvl) SLogger.log(outlvl,stdout);
-                if(stderr && errlvl) SLogger.log(errlvl,stderr);
-				resolve({ stdout, stderr });
-            }
-		});
-	});
-}
+static exec(command: string, opt?:ExecOpt) {
+    return new Promise<{ stdout: string, stderr: string }>((resolve, reject) => {
+        const child = cp.spawn(command,{shell:true});
+
+        let stdout = '';
+        let stderr = '';
 
+        child.stdout.on('data', (data) => {
+            stdout += data;
+            if (opt?.outlvl) SLogger.log(opt?.outlvl, data.toString());
+        });
+
+        child.stderr.on('data', (data) => {
+            stderr += data;
+            if (opt?.errlvl) SLogger.log(opt?.errlvl, data.toString());
+        });
+        child.on('error', reject);
+        child.on('close', (code) => {
+            if (code!==0) SLogger.warn(`UtilFunc.exec 命令:"${command}" 结束 代码为:${code}`);
+            resolve({ stdout, stderr });
+        });
+    });
+}
 
 /**获得一个永不完成的Promise单例 */
 static getNeverResolvedPromise<T>():Promise<T>{
@@ -149,7 +168,7 @@ static async repeatPromise<T>(procFn:()=>Promise<T>,verifyFn?:PromiseVerifyFn<T>
         verifyFn = ()=>Success;
 
     //进行中的请求
-	const plist:Promise<
+    const plist:Promise<
         SuccessOut<PromiseResult<T>>|
         TimeoutOut<PromiseResult<T>>
     >[] = [];
@@ -373,9 +392,9 @@ static mapEntries<T extends object>
  * @returns 转换完成的字符串
  */
 static stringifyJToken(token:JToken|IJData,space:string|number|null|undefined="\t"){
-	if(space==null)
-		space=undefined;
-	return JSON.stringify(token,null,space);
+    if(space==null)
+        space=undefined;
+    return JSON.stringify(token,null,space);
 }
 
 /**代办表 用于队列处理等待 */