@zwa73/utils 1.0.65 → 1.0.67

package/dist/UtilFunctions.d.ts

@@ -1,4 +1,4 @@
-import { ComposedClassMult, ComposedClassPart, JToken, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
+import { ComposedClassMult, ComposedClassPart, ComposedMixinable, JToken, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
 /**常用函数 */
 export declare namespace UtilFunc {
     /**获取当前时间戳
@@ -65,6 +65,8 @@ export declare namespace UtilFunc {
      * @returns 混合完成的类
      */
     function composeClassPart<Base extends object, Mixin extends object, Field extends keyof Mixin>(base: Base, mixin: Mixin, ...fields: Field[]): ComposedClassPart<Base, Mixin, Field>;
+    /**根据 MIXIN_FIELDS 自动混入 */
+    function composeMixinable<B extends object, M1, M2, M3, M4, M5, M6, M7, M8, M9>(base: B, m1?: M1, m2?: M2, m3?: M3, m4?: M4, m5?: M5, m6?: M6, m7?: M7, m8?: M8, m9?: M9): ComposedMixinable<B, [M1, M2, M3, M4, M5, M6, M4, M8, M9]>;
     /**类组合
      * 将mixinList每个成员的字段混入base
      * @param base      - 基础类

package/dist/UtilFunctions.js

@@ -217,7 +217,8 @@ var UtilFunc;
             });
             */
             if (typeof mixin[fd] === 'function') {
-                compObj[fd] = mixin[fd].bind(mixin);
+                compObj[fd] = (...args) => mixin[fd].apply(mixin, args);
+                //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
             }
             else {
                 Object.defineProperty(compObj, fd, {
@@ -232,6 +233,13 @@ var UtilFunc;
         return compObj;
     }
     UtilFunc.composeClassPart = composeClassPart;
+    function composeMixinable(base, ...mixins) {
+        let out = base;
+        for (const mixin of mixins)
+            out = composeClassPart(base, mixin, ...mixin.MIXIN_FIELDS);
+        return out;
+    }
+    UtilFunc.composeMixinable = composeMixinable;
     /**类组合
      * 将mixinList每个成员的字段混入base
      * @param base      - 基础类

package/dist/UtilInterfaces.d.ts

@@ -100,4 +100,10 @@ export type MethodsThisAs<Methods, T> = {
  * @param prototype - 类的原型
  */
 export declare function assertThisAs<Self, T>(prototype: MethodsThisAs<Self, T>): void;
+/**可自动混入的类型 */
+export type MixinAble<Mixin> = {
+    MIXIN_FIELDS: ReadonlyArray<keyof Mixin>;
+};
+/**自动混入的组合类 */
+export type ComposedMixinable<B extends object, Ms extends Array<unknown>> = Ms extends [infer M, ...infer Rest] ? M extends MixinAble<M> ? ComposedMixinable<ComposedClassPart<B, M, M['MIXIN_FIELDS'][number]>, Rest> : B : B;
 export {};

package/dist/test/composeTest.d.ts

@@ -1,10 +1,12 @@
-declare class A {
+import { MixinAble } from "..";
+declare class A implements MixinAble<A> {
     private num;
     getNum: () => number;
     /**A的函数 */
     getA: () => this;
+    MIXIN_FIELDS: readonly ["getNum", "getA"];
 }
-declare class B {
+declare class B implements MixinAble<B> {
     private text;
     getText: () => string;
     /**B的函数 */
@@ -13,14 +15,15 @@ declare class B {
     static getNewB: () => B;
     /**保留的函数 */
     privateFunc(): void;
+    MIXIN_FIELDS: readonly ["getText", "getB"];
 }
 declare class _C {
-    static create(): _C & Pick<B, "getB" | "getText"> & Pick<A, "getA" | "getNum"> & Record<"bindFunc", () => "这是动态绑定的函数">;
+    static create(): _C & Pick<B, "getText" | "getB"> & Pick<A, "getNum" | "getA"> & Record<"bindFunc", () => "这是动态绑定的函数">;
     private constructor();
-    getC(this: C): _C & Pick<B, "getB" | "getText"> & Pick<A, "getA" | "getNum"> & Record<"bindFunc", () => "这是动态绑定的函数">;
+    getC(this: C): _C & Pick<B, "getText" | "getB"> & Pick<A, "getNum" | "getA"> & Record<"bindFunc", () => "这是动态绑定的函数">;
     testFunc(this: C): number;
 }
-declare function composeC(obj: _C): _C & Pick<B, "getB" | "getText"> & Pick<A, "getA" | "getNum"> & Record<"bindFunc", () => "这是动态绑定的函数">;
+declare function composeC(obj: _C): _C & Pick<B, "getText" | "getB"> & Pick<A, "getNum" | "getA"> & Record<"bindFunc", () => "这是动态绑定的函数">;
 export type C = ReturnType<typeof composeC>;
 export declare const C: typeof _C;
 export {};

package/dist/test/composeTest.js

@@ -7,6 +7,7 @@ class A {
     getNum = () => this.num;
     /**A的函数 */
     getA = () => this;
+    MIXIN_FIELDS = ['getNum', 'getA'];
 }
 class B {
     text = "B的text";
@@ -19,6 +20,7 @@ class B {
     privateFunc() {
         console.log();
     }
+    MIXIN_FIELDS = ['getText', 'getB'];
 }
 class _C {
     static create() {
@@ -35,9 +37,8 @@ class _C {
     }
 }
 function composeC(obj) {
-    let ob1 = __1.UtilFunc.composeClassPart(obj, new B(), 'getB', 'getText');
-    let ob2 = __1.UtilFunc.composeClassPart(ob1, new A(), 'getA', 'getNum');
-    let ob3 = __1.UtilFP.bindTo('bindFunc', () => "这是动态绑定的函数", ob2);
+    let ob1 = __1.UtilFunc.composeMixinable(obj, new B(), new A());
+    let ob3 = __1.UtilFP.bindTo('bindFunc', () => "这是动态绑定的函数", ob1);
     return ob3;
 }
 exports.C = _C;

package/package.json

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

package/src/UtilFunctions.ts

@@ -1,5 +1,5 @@
 import * as crypto from "crypto";
-import { ComposedClass, ComposedClassMult, ComposedClassPart, FuncPropNames, JToken, PromiseProcFn, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
+import { ComposedClass, ComposedClassMult, ComposedClassPart, ComposedMixinable, FuncPropNames, JToken, MixinAble, PromiseProcFn, PromiseStat, PromiseVerifyFn } from "@src/UtilInterfaces";
 import * as cp from "child_process";
 import { SLogger } from "@src/UtilLogger";
 
@@ -235,7 +235,8 @@ export function composeClassPart
         });
         */
         if(typeof mixin[fd] === 'function') {
-            (compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+            (compObj as any)[fd] = (...args: any[]) => (mixin[fd] as any).apply(mixin, args);
+            //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
         } else {
             Object.defineProperty(compObj, fd, {
                 get: ()=>mixin[fd],
@@ -248,6 +249,20 @@ export function composeClassPart
     }
     return compObj;
 }
+
+/**根据 MIXIN_FIELDS 自动混入 */
+export function composeMixinable
+    <B extends object, 
+    M1, M2, M3,M4, M5, M6,M7, M8, M9>
+    (base:B,m1?:M1,m2?:M2,m3?:M3,m4?:M4,m5?:M5,m6?:M6,m7?:M7,m8?:M8,m9?:M9):
+    ComposedMixinable<B,[M1,M2,M3,M4,M5,M6,M4,M8,M9]>
+export function composeMixinable<Base extends object, Mixin extends MixinAble<Mixin>>(base:Base,...mixins:Mixin[]){
+    let out = base;
+    for(const mixin of mixins)
+        out = composeClassPart(base,mixin,...mixin.MIXIN_FIELDS);
+    return out;
+}
+
 /**类组合  
  * 将mixinList每个成员的字段混入base  
  * @param base      - 基础类

package/src/UtilInterfaces.ts

@@ -155,4 +155,15 @@ export type MethodsThisAs<Methods, T> = {
  * @template T      - 目标this类型
  * @param prototype - 类的原型
  */
-export function assertThisAs<Self,T>(prototype: MethodsThisAs<Self, T>) {}
+export function assertThisAs<Self,T>(prototype: MethodsThisAs<Self, T>) {}
+
+/**可自动混入的类型 */
+export type MixinAble<Mixin> = {MIXIN_FIELDS:ReadonlyArray<keyof Mixin>};
+
+/**自动混入的组合类 */
+export type ComposedMixinable<B extends object, Ms extends Array<unknown>> = 
+    Ms extends [infer M, ...infer Rest]
+        ? M extends MixinAble<M>
+            ? ComposedMixinable<ComposedClassPart<B,M,M['MIXIN_FIELDS'][number]>,Rest>
+            : B
+        : B

package/src/test/composeTest.ts

@@ -1,12 +1,13 @@
-import { UtilFP, UtilFunc, assertThisAs } from ".."
+import { MixinAble, UtilFP, UtilFunc, assertThisAs } from ".."
 
-class A {
+class A implements MixinAble<A>{
     private num = 1;
     getNum = ()=>this.num;
     /**A的函数 */
     getA=()=>this;
+    MIXIN_FIELDS =['getNum','getA'] as const;
 }
-class B {
+class B implements MixinAble<B>{
     private text = "B的text";
     getText = ()=>this.text;
     /**B的函数 */
@@ -17,6 +18,7 @@ class B {
     privateFunc(){
         console.log()
     }
+    MIXIN_FIELDS = ['getText','getB'] as const;
 }
 class _C {
     static create(){
@@ -32,9 +34,8 @@ class _C {
     }
 }
 function composeC(obj:_C){
-    let ob1 = UtilFunc.composeClassPart(obj,new B(),'getB','getText');
-    let ob2 = UtilFunc.composeClassPart(ob1,new A(),'getA','getNum');
-    let ob3 = UtilFP.bindTo('bindFunc',()=>"这是动态绑定的函数",ob2);
+    let ob1 = UtilFunc.composeMixinable(obj,new B(),new A());
+    let ob3 = UtilFP.bindTo('bindFunc',()=>"这是动态绑定的函数",ob1);
     return ob3;
 }
 export type C = ReturnType<typeof composeC>;