@zwa73/utils 1.0.60 → 1.0.62

package/src/UtilDecorators.ts

@@ -1,116 +1,174 @@
-import { SLogger } from "./UtilLogger";
-
-
-/**用于打印方法的调用 */
-export function DLogger(){
-    return function (target:any, propertyKey:string, descriptor:PropertyDescriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = function(...args:any[]){
-            let result = originalMethod.apply(this, args);
-            SLogger.info(`Call: ${propertyKey}(${args}) => ${result}`);
-            return result;
-        }
-    }
-}
-
-/**用于打印异步方法的调用 */
-export function DLoggerAsync(){
-    return function (target:any, propertyKey:string, descriptor:PropertyDescriptor){
-        const originalMethod = descriptor.value;
-        descriptor.value = async function(...args:any[]){
-            let result = await originalMethod.apply(this, args);
-            SLogger.info(`Call: ${propertyKey}(${args}) => ${result}`);
-            return result;
-        }
-    }
-}
-/**try-finally包装 */
-export function Defer(deferLogic: () => void) {
-    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
-        const originalMethod = descriptor.value;
-        descriptor.value = function (...args: any[]) {
-            try {
-                const result = originalMethod.apply(this, args);
-                deferLogic();
-                return result;
-            } catch(e) {
-                deferLogic();
-                throw e;
-            }
-        };
-        return descriptor;
-    };
-}
-/**异步的try-finally包装 */
-export function DeferAsync(deferLogic: () => void) {
-    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
-        const originalMethod = descriptor.value;
-        descriptor.value = async function (...args: any[]) {
-            try {
-                const result = await originalMethod.apply(this, args);
-                deferLogic();
-                return result;
-            } catch(e) {
-                deferLogic();
-                throw e;
-            }
-        };
-        return descriptor;
-    };
-}
-
-/**用于捕获方法中的错误 */
-export function DCatchErrors() {
-    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
-        const originalMethod = descriptor.value;
-        descriptor.value = function (...args: any[]) {
-            try {
-                originalMethod.apply(this, args);
-            } catch (err) {
-                SLogger.warn(`Error in method ${propertyKey}: ${err}`);
-            }
-        };
-    };
-}
-
-/**用于捕获异步方法中的错误 */
-export function DCatchErrorsAsync() {
-    return function (target: any, propertyKey: string, descriptor: PropertyDescriptor) {
-        const originalMethod = descriptor.value;
-        descriptor.value = async function (...args: any[]) {
-            try {
-                await originalMethod.apply(this, args);
-            } catch (err) {
-                SLogger.warn(`Error in method ${propertyKey}: ${err}`);
-            }
-        };
-    };
-}
-
-
-function AddNumberDecorator(n: number) {
-    type NumberToNumberFunc = (num: number) => number;
-    return function(
-        this:any,
-        target: Object,
-        propertyKey: string,
-        descriptor: TypedPropertyDescriptor<NumberToNumberFunc>
-    ) {
-        const originalMethod = descriptor.value!;
-        descriptor.value = function (num: number) {
-            const result = originalMethod.apply(this, [num]);
-            return result + n;
-        };
-        return descriptor;
-    };
-}
-
-class Example {
-    @AddNumberDecorator(10)
-    myMethod(num: number): number {
-        return num;
-    }
-}
-
-//let a = new Example();
-//a.myMethod(10);//?
+import { SLogger } from "./UtilLogger";
+
+type TDTg<T> = 
+    (target: Object, propertyKey: string, descriptor: TypedPropertyDescriptor<T>)=>
+    TypedPropertyDescriptor<T>;
+type DTg = (target:Object, propertyKey:string, descriptor:PropertyDescriptor)=>
+    PropertyDescriptor;
+
+/**用于打印方法的调用 */
+export function LogCall():DTg{
+    return function (target, propertyKey, descriptor){
+        const originalMethod = descriptor.value;
+        descriptor.value = function(...args:any[]){
+            let result = originalMethod.apply(this, args);
+            SLogger.info(`调用函数: ${propertyKey}(${args}) => ${result}`);
+            return result;
+        }
+        return descriptor;
+    }
+}
+
+/**用于打印异步方法的调用 */
+export function LogCallAsync():DTg{
+    return function (target, propertyKey, descriptor){
+        const originalMethod = descriptor.value;
+        descriptor.value = async function(...args:any[]){
+            let result = await originalMethod.apply(this, args);
+            SLogger.info(`调用函数: ${propertyKey}(${args}) => ${result}`);
+            return result;
+        }
+        return descriptor;
+    }
+}
+
+/**用于打印方法的调用 */
+export function LogErr():DTg{
+    return function (target, propertyKey, descriptor){
+        const originalMethod = descriptor.value;
+        descriptor.value = function(...args:any[]){
+            try {
+                const result = originalMethod.apply(this, args);
+                return result;
+            } catch(err) {
+                SLogger.warn(`函数出现错误: ${propertyKey}(${args}): ${err}`);
+                throw err;
+            }
+        }
+        return descriptor;
+    }
+}
+
+/**用于打印异步方法的调用 */
+export function LogErrAsync():DTg{
+    return function (target, propertyKey, descriptor){
+        const originalMethod = descriptor.value;
+        descriptor.value = async function(...args:any[]){
+            try {
+                const result = await originalMethod.apply(this, args);
+                return result;
+            } catch(err) {
+                SLogger.warn(`函数出现错误: ${propertyKey}(${args}): ${err}`);
+                throw err;
+            }
+        }
+        return descriptor;
+    }
+}
+
+/**try-finally包装 */
+export function Defer<T extends (...args:any)=>any>
+    (deferLogic:(...args:Parameters<T>)=>any):TDTg<T> {
+    return function(target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value!;
+        (descriptor as any).value = function (...args:any) {
+            try {
+                const result = originalMethod.apply(this, args);
+                return result;
+            } finally {
+                deferLogic(...args);
+            }
+        };
+        return descriptor;
+    };
+}
+/**异步的try-finally包装 */
+export function DeferAsync<T extends (...args:any)=>Promise<any>>
+    (deferLogic:(...args:Parameters<T>)=>any|Promise<any>):TDTg<T> {
+    return function(target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value!;
+        (descriptor as any).value = async function (...args:any) {
+            try {
+                const result = await originalMethod.apply(this, args);
+                await deferLogic(...args);
+                return result;
+            } finally {
+                await deferLogic(...args);
+            }
+        };
+        return descriptor;
+    };
+}
+/**try-catch包装 */
+export function DCatch<T extends (...args:any)=>any>
+    (catchLogic:(error: any, ...args:Parameters<T>)=>ReturnType<T>):TDTg<T> {
+    return function(target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value!;
+        (descriptor as any).value = function (...args:any) {
+            try {
+                const result = originalMethod.apply(this, args);
+                return result;
+            } catch(err) {
+                //SLogger.warn(`一个函数出现了错误 ${propertyKey}: ${err}`);
+                return catchLogic(err, ...args);
+            }
+        };
+        return descriptor;
+    };
+}
+/**异步的try-catch包装 */
+export function CatchAsync<T extends (...args:any)=>Promise<any>>
+    (catchLogic:(error: any, ...args:Parameters<T>)=>ReturnType<T>):TDTg<T> {
+    return function(target, propertyKey, descriptor) {
+        const originalMethod = descriptor.value!;
+        (descriptor as any).value = async function (...args:any) {
+            try {
+                const result = await originalMethod.apply(this, args);
+                return result;
+            } catch(err) {
+                //SLogger.warn(`一个函数出现了错误 ${propertyKey}: ${err}`);
+                return await catchLogic(err, ...args);
+            }
+        };
+        return descriptor;
+    };
+}
+
+
+
+
+function AddNumberDecorator(n: number) {
+    type NumberToNumberFunc = (num: number) => number;
+    return function(
+        this:any,
+        target: Object,
+        propertyKey: string,
+        descriptor: TypedPropertyDescriptor<NumberToNumberFunc>
+    ) {
+        const originalMethod = descriptor.value!;
+        descriptor.value = function (num: number) {
+            const result = originalMethod.apply(this, [num]);
+            return result + n;
+        };
+        return descriptor;
+    };
+}
+
+
+class Example {
+    @AddNumberDecorator(10)
+    myMethod(num: number): number {
+        return num;
+    }
+    @LogCall()
+    @Defer((a,b)=>null)
+    async myMethod1(num: number,ss:string) {
+        return 312;
+    }
+}
+//let e = new Example();
+//e.myMethod1(1,"");
+
+//console.log(123);
+//let a = new Example();
+//a.myMethod(10);//?

package/src/UtilFP.ts

@@ -0,0 +1,98 @@
+
+/**常用函数式编程库 */
+export namespace UtilFP {
+
+/**柯里化函数类型 */
+type CurryFunc<T, PrevArgs extends any[] = []> = T extends (...args: infer Args) => infer Result
+? Args extends [infer Arg, ...infer RestArgs]
+    ? RestArgs extends []
+        ? (...args: [...PrevArgs, Arg]) => Result
+        : (...args: [...PrevArgs, Arg]) => CurryFunc<(...rest:RestArgs) => Result>
+        & CurryFunc<(...args: RestArgs) => Result, [...PrevArgs, Arg]>
+    : Args extends []
+        ? () => Result
+        : "CurryFunc错误 可选无法被识别" & Error
+: never;
+
+/**柯里化转换  
+* @param {T} fn - 将要转换的函数
+* @returns {CurryFunc<T>} 柯里化的函数
+*/
+export function curry<T extends Function>(fn: T): CurryFunc<T> {
+    return (function curried(...args: any[]) {
+        if (args.length >= fn.length)
+            return fn(...args);
+        return (...restArgs: any[]) => curried(...args, ...restArgs);
+    }) as any as CurryFunc<T>;
+}
+
+/**可组合的函数 */
+type CompFunc<T, R> = (arg: T) => R;
+
+/**函数管道组合  
+ * 从左到右执行  
+ * @param fs - 待组合的函数
+ * @returns 组合完成的函数
+ */
+export function flow<I>(...fs: CompFunc<I, I>[]): CompFunc<I, I>;
+export function flow<I, R1>(f1: CompFunc<I, R1>,...fs: CompFunc<R1, R1>[]): CompFunc<I, R1>;
+export function flow<I, R1, R2>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>,...fs: CompFunc<R2, R2>[]): CompFunc<I, R2>;
+export function flow<I, R1, R2, R3>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>,...fs: CompFunc<R3, R3>[]): CompFunc<I, R3>;
+export function flow<I, R1, R2, R3, R4>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>,...fs: CompFunc<R4, R4>[]): CompFunc<I, R4>;
+export function flow<I, R1, R2, R3, R4, R5>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>,...fs: CompFunc<R5, R5>[]): CompFunc<I, R5>;
+export function flow<I, R1, R2, R3, R4, R5, R6>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>,...fs: CompFunc<R6, R6>[]): CompFunc<I, R6>;
+export function flow<I, R1, R2, R3, R4, R5, R6, R7>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>,...fs: CompFunc<R7, R7>[]): CompFunc<I, R7>;
+export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>,...fs: CompFunc<R8, R8>[]): CompFunc<I, R8>;
+export function flow<I, R1, R2, R3, R4, R5, R6, R7, R8, R9>(f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>,...fs: CompFunc<R9, R9>[]): CompFunc<I, R9>;
+export function flow<T>(...fs: ((arg: T) => T)[]): (arg: T) => T {
+    return (arg: T): T => {
+        return fs.reduce((value, func) => func(value), arg);
+    };
+}
+
+/**函数管道  
+ * 从左到右执行  
+ * @param input - 初始输入值
+ * @param fs    - 待组合的函数
+ * @returns 经过所有函数处理后的结果
+ */
+export function pipe<I>(input: I, ...fs: CompFunc<I, I>[]): I;
+export function pipe<I, R1>(input: I, f1: CompFunc<I, R1>,...fs: CompFunc<R1, R1>[]): R1;
+export function pipe<I, R1, R2>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>,...fs: CompFunc<R2, R2>[]): R2;
+export function pipe<I, R1, R2, R3>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>,...fs: CompFunc<R3, R3>[]): R3;
+export function pipe<I, R1, R2, R3, R4>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>,...fs: CompFunc<R4, R4>[]): R4;
+export function pipe<I, R1, R2, R3, R4, R5>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>,...fs: CompFunc<R5, R5>[]): R5;
+export function pipe<I, R1, R2, R3, R4, R5, R6>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>,...fs: CompFunc<R6, R6>[]): R6;
+export function pipe<I, R1, R2, R3, R4, R5, R6, R7>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>,...fs: CompFunc<R7, R7>[]): R7;
+export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>,...fs: CompFunc<R8, R8>[]): R8;
+export function pipe<I, R1, R2, R3, R4, R5, R6, R7, R8, R9>(input: I, f1: CompFunc<I, R1>, f2: CompFunc<R1, R2>, f3: CompFunc<R2, R3>, f4: CompFunc<R3, R4>, f5: CompFunc<R4, R5>, f6: CompFunc<R5, R6>, f7: CompFunc<R6, R7>, f8: CompFunc<R7, R8>, f9: CompFunc<R8, R9>,...fs: CompFunc<R9, R9>[]): R9;
+export function pipe<T>(input: T, ...fs: ((arg: T) => T)[]): T {
+    return fs.reduce((value, func) => func(value), input);
+}
+
+
+/**将一个字段加入一个对象中，返回新类型 */
+export function bindTo<K extends string, T, B extends {} = {}>
+    (key:K,value:T,base?:B): B & Record<K,T>{
+    let out = base as any;
+    out = out??{};
+    out[key]=value;
+    return out;
+}
+
+/**
+let asd = bindTo("sss",123,{abc:223});//?
+let sumvoid = ()=>10;
+let a = curry(sumvoid);//?
+console.log(a());
+let sum = (a:number,b:string,c:number,d:boolean)=>a+b+c+d;
+let sumCu = curry(sum);//?
+let suma = sumCu(1)("ss");//?
+let sumb = sumCu(1,"1")(2);//?
+let sumc = sumCu(4);//?
+let sumz = sumCu(1,"b",3)(false);//?
+console.log(suma(2,true));
+console.log(sumb(true));
+console.log(sumc("s",3,false));
+ */
+}