@zwa73/utils 1.0.99 → 1.0.101

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;
+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;

package/dist/QuickFunction.js

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

package/dist/UtilClass.d.ts

@@ -1,21 +1,3 @@
-/**函数组合器 */
-export declare class Composer<Result, PreArg = Result> {
-    /**组合函数列表 */
-    private funcs;
-    private constructor();
-    /**添加单个参数与返回值不同的函数 */
-    static push<Result, Arg>(func: (arg: Arg) => Result): Composer<Result, Arg>;
-    /**添加多个参数与返回值相同的函数 */
-    static push<Result>(func: ((arg: Result) => Result), ...funcs: ((arg: Result) => Result)[]): Composer<Result>;
-    /**添加单个参数与返回值不同的函数 */
-    push<T>(func: (arg: T) => PreArg): Composer<Result, T>;
-    /**添加多个参数与返回值相同的函数 */
-    push(func: ((arg: Result) => Result), ...funcs: ((arg: PreArg) => PreArg)[]): Composer<Result, PreArg>;
-    /**组合函数 */
-    compose(): (arg: PreArg) => Result;
-    /**直接调用 */
-    invoke(arg: PreArg): Result;
-}
 /**函数管道器 */
 export declare class Piper<Arg, Result = Arg> {
     /**管道函数列表 */

package/dist/UtilClass.js

@@ -1,32 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Stream = exports.Piper = exports.Composer = void 0;
-/**函数组合器 */
-class Composer {
-    /**组合函数列表 */
-    funcs = [];
-    constructor() { }
-    ;
-    static push(...funcs) {
-        const newComposer = new Composer();
-        newComposer.funcs = [...funcs];
-        return newComposer;
-    }
-    push(...funcs) {
-        const newComposer = new Composer();
-        newComposer.funcs = [...this.funcs, ...funcs];
-        return newComposer;
-    }
-    /**组合函数 */
-    compose() {
-        return (arg) => this.funcs.reduceRight((value, func) => func(value), arg);
-    }
-    /**直接调用 */
-    invoke(arg) {
-        return this.funcs.reduceRight((value, func) => func(value), arg);
-    }
-}
-exports.Composer = Composer;
+exports.Stream = exports.Piper = void 0;
 /**函数管道器 */
 class Piper {
     /**管道函数列表 */

package/dist/UtilCom.js

@@ -85,7 +85,7 @@ var UtilCom;
                     });
                 }
                 catch (err) {
-                    UtilLogger_1.SLogger.warn(funcName + " 未知错误:" + err);
+                    UtilLogger_1.SLogger.warn(`${funcName} 未知错误:${err}`);
                     resolve(null);
                     return;
                 }

package/dist/UtilDecorators.js

@@ -84,8 +84,7 @@ function LogErr() {
                 return result;
             }
             catch (err) {
-                UtilLogger_1.SLogger.warn(`函数出现错误: ${propertyKey}(${args}): ${err}`);
-                throw err;
+                UtilFunctions_1.UtilFunc.throwError(`函数出现错误: ${propertyKey}(${args}): ${err}`, 'warn');
             }
         };
         return descriptor;
@@ -102,8 +101,7 @@ function LogErrAsync() {
                 return result;
             }
             catch (err) {
-                UtilLogger_1.SLogger.warn(`函数出现错误: ${propertyKey}(${args}): ${err}`);
-                throw err;
+                UtilFunctions_1.UtilFunc.throwError(`函数出现错误: ${propertyKey}(${args}): ${err}`, 'warn');
             }
         };
         return descriptor;

package/dist/UtilFileTools.js

@@ -227,7 +227,7 @@ var UtilFT;
      * @deprecated 请使用 fileSearchRegex 或 fileSearchGlob
      */
     function fileSearch(...patams) {
-        throw "请使用 fileSearchRegex 或 fileSearchGlob";
+        UtilFunctions_1.UtilFunc.throwError("请使用 fileSearchRegex 或 fileSearchGlob", 'fatal');
     }
     UtilFT.fileSearch = fileSearch;
     /**是一个有效的文件路径

package/dist/UtilFunctions.d.ts

@@ -1,4 +1,5 @@
 import { AnyFunc, ComposedClass, ComposedMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, LiteralCheck, Matchable, MatchableFlag, Mixinable, Outcome, PromiseVerifyFn, UnionToIntersection } from "./UtilInterfaces";
+import { LogLevel } from "./UtilLogger";
 import { FailedLike, None, StatusSymbol, Success, SuccessLike, Timeout } from "./UtilSymbol";
 type SuccessOut<T> = Outcome<Success, T>;
 type TimeoutOut<T> = Outcome<Timeout, Promise<T>>;
@@ -47,9 +48,11 @@ export declare class UtilFunc {
      */
     static sleep<T>(timeMs: number, result: T): Promise<T>;
     /**封装的 cp.exec 执行一段指令 指令完成后返回 Promise
-     * @param command 指令文本
+     * @param command - 指令文本
+     * @param outlvl  - 普通输出的日志等级
+     * @param errlvl  - 错误的日志等级
      */
-    static exec(command: string): Promise<{
+    static exec(command: string, outlvl?: LogLevel, errlvl?: LogLevel): Promise<{
         stdout: string;
         stderr: string;
     }>;
@@ -190,5 +193,11 @@ export declare class UtilFunc {
      * //     World!
      */
     static dedent(strings: TemplateStringsArray, ...values: any[]): string;
+    /**抛出错误
+     * @param message - 错误信息
+     * @param lvl     - 日志等级
+     * @param opt     - 额外参数
+     */
+    static throwError(message: string, lvl?: LogLevel, opt?: {}): never;
 }
 export {};

package/dist/UtilFunctions.js

@@ -102,15 +102,22 @@ class UtilFunc {
         });
     }
     /**封装的 cp.exec 执行一段指令 指令完成后返回 Promise
-     * @param command 指令文本
+     * @param command - 指令文本
+     * @param outlvl  - 普通输出的日志等级
+     * @param errlvl  - 错误的日志等级
      */
-    static exec(command) {
+    static exec(command, outlvl, errlvl) {
         return new Promise((resolve, reject) => {
             cp.exec(command, (error, stdout, stderr) => {
                 if (error)
                     reject(error);
-                else
+                else {
+                    if (stdout && outlvl)
+                        UtilLogger_1.SLogger.log(outlvl, stdout);
+                    if (stderr && errlvl)
+                        UtilLogger_1.SLogger.log(errlvl, stderr);
                     resolve({ stdout, stderr });
+                }
             });
         });
     }
@@ -389,9 +396,7 @@ class UtilFunc {
         }
         else if (procObj[t.status])
             return procObj[t.status](t.status, t.result);
-        const err = new Error(`matchProc 传入了一个预料之外的值: ${String(t)}`);
-        UtilLogger_1.SLogger.fatal(err);
-        throw err;
+        UtilFunc.throwError(`matchProc 传入了一个预料之外的值: ${String(t)}`, 'fatal');
     }
     /**根据典型的成功或失败状态运行函数
      * @param t - 目标值
@@ -449,7 +454,7 @@ class UtilFunc {
      */
     static expect(t, errLog) {
         if (t === UtilSymbol_1.None)
-            throw new Error(errLog);
+            UtilFunc.throwError(errLog ?? "expect验证了一个None值", "error");
         return t;
     }
     /**验证一个变量的类型是否为 T
@@ -517,6 +522,22 @@ class UtilFunc {
         const minIndent = Math.min(...lines.filter(line => line.trim() !== '').map(line => line.search(/\S/)));
         return lines.map(line => line.slice(minIndent)).join('\n');
     }
+    /**抛出错误
+     * @param message - 错误信息
+     * @param lvl     - 日志等级
+     * @param opt     - 额外参数
+     */
+    static throwError(message, lvl, opt) {
+        const e = new Error(message);
+        const stackLines = e.stack.split('\n');
+        e.stack = [stackLines[0]].concat(stackLines.slice(2)).join('\n'); // 移除第一行的堆栈信息
+        Object.assign(e, opt);
+        if (lvl) {
+            //SLogger.log(lvl,message);
+            UtilLogger_1.SLogger.log(lvl, e.stack);
+        }
+        throw e;
+    }
 }
 exports.UtilFunc = UtilFunc;
 __decorate([

package/dist/UtilLogger.js

@@ -234,7 +234,7 @@ class SLogger {
      * @returns 格式化的时间字符串
      */
     timeEnd(flag, level = "info") {
-        let start = SLogger.timeTable[flag];
+        const start = SLogger.timeTable[flag];
         if (start == null) {
             this.warn("SLogger.timeEnd 错误 flag:" + flag + " 不存在");
             return null;
@@ -304,7 +304,7 @@ class SLogger {
      * @returns 自身
      */
     static log(level, ...messages) {
-        level = level || "silly";
+        level = level ?? "silly";
         this.defaultInstance.log(level, ...messages);
         return this.defaultInstance;
     }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@zwa73/utils",
-  "version": "1.0.99",
+  "version": "1.0.101",
   "description": "my utils",
   "main": "index.js",
   "scripts": {
     "test": "call npm run compile && jest",
     "postinstall": "start node ./scripts/postinstall.js",
     "release": "call npm run compile && call node release.js && call npm publish --access public",
-    "compile": "call tsc -p tsconfig.compile.json && call tsc-alias -p tsconfig.compile.json",
-    "watch": "start tsc-alias -w -p tsconfig.compile.json && start tsc -w -p tsconfig.compile.json"
+    "compile": "powershell scripts/compile",
+    "watch": "powershell scripts/watch"
   },
   "keywords": [
     "zwa73"

package/scripts/compile.ps1

@@ -0,0 +1,5 @@
+Write-Output 开始删除原dist
+Remove-Item -Recurse -Force dist
+Write-Output 开始编译
+tsc -p tsconfig.compile.json
+tsc-alias -p tsconfig.compile.json

package/scripts/watch.ps1

@@ -0,0 +1,10 @@
+# 定义一个函数来运行脚本
+function New-Script {
+    param($command)
+    # 在后台运行命令
+    Start-Process -NoNewWindow -FilePath "powershell" -ArgumentList "-Command", $command
+}
+
+# 开始运行脚本
+New-Script "tsc -w -p tsconfig.compile.json"
+New-Script "tsc-alias -w -p tsconfig.compile.json"

package/src/QuickFunction.ts

@@ -20,6 +20,7 @@ export const {
     mapEntries,
     composeMixinable,
     dedent,
+    throwError,
 } = UtilFunc;
 
 if(false){

package/src/UtilClass.ts

@@ -1,36 +1,3 @@
-/**函数组合器 */
-export class Composer<Result,PreArg = Result> {
-    /**组合函数列表 */
-    private funcs: Function[] = [];
-    private constructor(){};
-    /**添加单个参数与返回值不同的函数 */
-    public static push<Result,Arg>(func: (arg: Arg) => Result): Composer<Result,Arg>;
-    /**添加多个参数与返回值相同的函数 */
-    public static push<Result>(func:((arg: Result) => Result), ...funcs: ((arg: Result) => Result)[]): Composer<Result>;
-    public static push(...funcs: Function[]){
-        const newComposer = new Composer<any>();
-        newComposer.funcs = [...funcs];
-        return newComposer;
-    }
-
-    /**添加单个参数与返回值不同的函数 */
-    public push<T>(func: (arg: T) => PreArg): Composer<Result,T>;
-    /**添加多个参数与返回值相同的函数 */
-    public push(func:((arg: Result) => Result), ...funcs: ((arg: PreArg) => PreArg)[]): Composer<Result,PreArg>;
-    public push(...funcs: Function[]): Composer<Result,any> {
-        const newComposer = new Composer<Result>();
-        newComposer.funcs = [...this.funcs, ...funcs];
-        return newComposer;
-    }
-    /**组合函数 */
-    public compose():(arg:PreArg)=>Result {
-        return (arg:PreArg) => this.funcs.reduceRight((value, func) => func(value), arg) as any as Result;
-    }
-    /**直接调用 */
-    public invoke(arg:PreArg):Result {
-        return this.funcs.reduceRight((value, func) => func(value), arg) as any as Result;
-    }
-}
 /**函数管道器 */
 export class Piper<Arg, Result = Arg> {
     /**管道函数列表 */

package/src/UtilCom.ts

@@ -66,7 +66,7 @@ function sPost(posttype:"http"|"https",json:JObject,options:Object,timeLimit:num
                     }
                 });
             }catch(err){
-                SLogger.warn(funcName+" 未知错误:"+err);
+                SLogger.warn(`${funcName} 未知错误:${err}`);
                 resolve(null);
                 return;
             }

package/src/UtilDecorators.ts

@@ -78,8 +78,7 @@ export function LogErr():DTg{
                 const result = originalMethod.apply(this, args);
                 return result;
             } catch(err) {
-                SLogger.warn(`函数出现错误: ${propertyKey}(${args}): ${err}`);
-                throw err;
+                UtilFunc.throwError(`函数出现错误: ${propertyKey}(${args}): ${err}`,'warn');
             }
         }
         return descriptor;
@@ -95,8 +94,7 @@ export function LogErrAsync():DTg{
                 const result = await originalMethod.apply(this, args);
                 return result;
             } catch(err) {
-                SLogger.warn(`函数出现错误: ${propertyKey}(${args}): ${err}`);
-                throw err;
+                UtilFunc.throwError(`函数出现错误: ${propertyKey}(${args}): ${err}`,'warn');
             }
         }
         return descriptor;

package/src/UtilFileTools.ts

@@ -231,7 +231,7 @@ export function fileSearchGlob(globPattern:string|string[],ignore?:string|string
  * @deprecated 请使用 fileSearchRegex 或 fileSearchGlob
  */
 export function fileSearch(...patams:any[]){
-    throw "请使用 fileSearchRegex 或 fileSearchGlob"
+    UtilFunc.throwError("请使用 fileSearchRegex 或 fileSearchGlob",'fatal');
 }
 /**是一个有效的文件路径
  * @param filePath - 需要验证的文件路径

package/src/UtilFunctions.ts

@@ -1,7 +1,7 @@
 import * as crypto from "crypto";
 import { AnyFunc, ComposedClass, ComposedMixinable, ExtractOutcome, IJData, JObject, JToken, Keyable, LiteralCheck, Matchable, MatchableFlag, Mixinable, Outcome, PromiseStat, PromiseVerifyFn, UnionToIntersection } from "@src/UtilInterfaces";
 import * as cp from "child_process";
-import { SLogger } from "@src/UtilLogger";
+import { LogLevel, SLogger } from "@src/UtilLogger";
 import { Completed, Failed, FailedLike, None, StatusSymbol, Success, SuccessLike, Terminated, Timeout } from "./UtilSymbol";
 import { Catch, DeferAsync, LogTimeAsync } from "./UtilDecorators";
 
@@ -102,16 +102,21 @@ static async sleep<T>(timeMs: number, result?:T): Promise<T|undefined> {
 }
 
 /**封装的 cp.exec 执行一段指令 指令完成后返回 Promise  
- * @param command 指令文本
+ * @param command - 指令文本
+ * @param outlvl  - 普通输出的日志等级
+ * @param errlvl  - 错误的日志等级
  */
-static exec(command: string) {
+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
+			else{
+                if(stdout && outlvl) SLogger.log(outlvl,stdout);
+                if(stderr && errlvl) SLogger.log(errlvl,stderr);
 				resolve({ stdout, stderr });
+            }
 		});
 	});
 }
@@ -437,10 +442,7 @@ static matchProc<
     }
     else if ((procObj as any)[t.status])
         return (procObj as any)[t.status](t.status,(t as any).result);
-
-    const err = new Error(`matchProc 传入了一个预料之外的值: ${String(t)}`);
-    SLogger.fatal(err);
-    throw err;
+    UtilFunc.throwError(`matchProc 传入了一个预料之外的值: ${String(t)}`,'fatal');
 }
 
 /**根据典型的成功或失败状态运行函数  
@@ -509,7 +511,7 @@ static likeNone(t:unknown,strictLog=true):t is None{
  * @returns 排除None的原值
  */
 static expect<T>(t:T,errLog?:string):Exclude<T,None>{
-    if(t===None) throw new Error(errLog);
+    if(t===None) UtilFunc.throwError(errLog??"expect验证了一个None值","error");
     return t as Exclude<T,None>;
 }
 
@@ -584,6 +586,21 @@ static dedent(strings: TemplateStringsArray, ...values: any[]): string {
     );
     return lines.map(line => line.slice(minIndent)).join('\n');
 }
-
+/**抛出错误
+ * @param message - 错误信息
+ * @param lvl     - 日志等级
+ * @param opt     - 额外参数
+ */
+static throwError(message:string,lvl?:LogLevel,opt?:{}):never{
+    const e = new Error(message);
+    const stackLines = e.stack!.split('\n');
+    e.stack = [stackLines[0]].concat(stackLines.slice(2)).join('\n'); // 移除第一行的堆栈信息
+    Object.assign(e, opt);
+    if(lvl){
+        //SLogger.log(lvl,message);
+        SLogger.log(lvl,e.stack);
+    }
+    throw e;
+}
 
 }

package/src/UtilInterfaces.ts

@@ -214,4 +214,3 @@ export type ExtractOutcome<T,K extends Keyable> =
  * 输出schema后替换为 ^.*$ 的 string 匹配  
  */
 export type SchemaString = `${string}SchemaString`;
-

package/src/UtilLogger.ts

@@ -226,7 +226,7 @@ export class SLogger{
      * @returns 格式化的时间字符串
      */
     timeEnd(flag:string,level:LogLevel|null="info"):string|null{
-        let start = SLogger.timeTable[flag];
+        const start = SLogger.timeTable[flag];
         if(start==null){
             this.warn("SLogger.timeEnd 错误 flag:"+flag+" 不存在");
             return null;
@@ -304,7 +304,7 @@ export class SLogger{
      * @returns 自身
      */
     static log(level: LogLevel, ...messages:Array<any>):SLogger{
-        level = level||"silly";
+        level = level??"silly";
         this.defaultInstance.log(level,...messages);
         return this.defaultInstance;
     }