@zwa73/utils 1.0.61 → 1.0.62

package/dist/UtilInterfaces.d.ts

@@ -85,4 +85,19 @@ export type ComposedClass<Base extends object, Mixin extends object> = Base & Mi
  * @template MixinList- 待混入的类型数组
  */
 export type ComposedClassMult<Base extends object, MixinList extends object[]> = MixinList extends [infer Mixin, ...infer Rest] ? Mixin extends object ? Rest extends object[] ? ComposedClassMult<ComposedClass<Base, Mixin>, Rest> : Base : Base : Base;
+/**将一个类型的所有方法的 `this` 参数改为 `T` 类型
+ * @template Methods - 待更改的函数表
+ * @template T - 目标this类型
+ */
+export type MethodsThisAs<Methods, T> = {
+    [K in keyof Methods]: Methods[K] extends (...args: infer A) => infer R ? (this: T, ...args: A) => R : Methods[K];
+};
+/**尝试断言一个类的原型
+ * 其所有函数的 this 都必须为某个类型
+ * assignThisAs<Self,T>(Self.prototype);
+ * @template Self   - 类的类型
+ * @template T      - 目标this类型
+ * @param prototype - 类的原型
+ */
+export declare function assignThisAs<Self, T>(prototype: MethodsThisAs<Self, T>): void;
 export {};

package/dist/UtilInterfaces.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyJToken = void 0;
+exports.assignThisAs = exports.stringifyJToken = void 0;
 /**将JToken转换为字符串
  * @param token - 待转换的Token
  * @param space - 插入的空格 数字为空格数量 默认为制表符\t
@@ -12,3 +12,12 @@ function stringifyJToken(token, space = "\t") {
     return JSON.stringify(token, null, space);
 }
 exports.stringifyJToken = stringifyJToken;
+/**尝试断言一个类的原型
+ * 其所有函数的 this 都必须为某个类型
+ * assignThisAs<Self,T>(Self.prototype);
+ * @template Self   - 类的类型
+ * @template T      - 目标this类型
+ * @param prototype - 类的原型
+ */
+function assignThisAs(prototype) { }
+exports.assignThisAs = assignThisAs;

package/dist/test/composeTest.d.ts

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

package/dist/test/composeTest.js

@@ -16,18 +16,35 @@ class B {
     /**B的静态函数 */
     static getNewB = () => new B();
     /**保留的函数 */
-    privateFunc() { }
+    privateFunc() {
+        console.log();
+    }
 }
-exports.C = __1.UtilFunc.composeClassPart({
-    create() {
-        let o1 = __1.UtilFunc.composeClassPart(new A(), new B(), 'getB', 'getText');
-        let o2 = __1.UtilFP.bindTo('bindFunc', () => "这是动态绑定的函数", o1);
-        return o2;
+class _C {
+    static create() {
+        return new _C();
+    }
+    constructor() {
+        composeC(this);
+    }
+    getC() { return this; }
+    ;
+    testFunc() {
+        console.log(this);
+        return 2;
     }
-}, B, 'getNewB');
+}
+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);
+    return ob3;
+}
+exports.C = _C;
+(0, __1.assignThisAs)(exports.C.prototype);
 const insc = exports.C.create(); //?
-exports.C.getNewB().getB().getText(); //?
+insc.getC().testFunc(); //?
+insc.testFunc(); //?
 insc.getText(); //?
 insc.getB().getText(); //?
-insc.getNum(); //?
 insc.bindFunc(); //?

package/package.json

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

package/src/UtilInterfaces.ts

@@ -135,4 +135,24 @@ export type ComposedClassMult<Base extends object,MixinList extends object[]> =
                 ? ComposedClassMult<ComposedClass<Base,Mixin>,Rest>
                 : Base
             : Base
-        : Base;
+        : Base;
+
+/**将一个类型的所有方法的 `this` 参数改为 `T` 类型
+ * @template Methods - 待更改的函数表
+ * @template T - 目标this类型
+ */
+export type MethodsThisAs<Methods, T> = {
+    [K in keyof Methods]:
+        Methods[K] extends (...args: infer A) => infer R
+            ? (this: T, ...args: A) => R
+            : Methods[K];
+};
+
+/**尝试断言一个类的原型  
+ * 其所有函数的 this 都必须为某个类型  
+ * assignThisAs<Self,T>(Self.prototype);  
+ * @template Self   - 类的类型
+ * @template T      - 目标this类型
+ * @param prototype - 类的原型
+ */
+export function assignThisAs<Self,T>(prototype: MethodsThisAs<Self, T>) {}

package/src/test/composeTest.ts

@@ -1,8 +1,4 @@
-import { UtilFP, UtilFunc } from ".."
-
-
-
-
+import { UtilFP, UtilFunc, assignThisAs } from ".."
 
 class A {
     private num = 1;
@@ -18,20 +14,37 @@ class B {
     /**B的静态函数 */
     static getNewB = ()=>new B();
     /**保留的函数 */
-    privateFunc(){}
+    privateFunc(){
+        console.log()
+    }
 }
-export const C = UtilFunc.composeClassPart({
-    create(){
-        let o1 = UtilFunc.composeClassPart(new A(),new B(),'getB','getText');
-        let o2 = UtilFP.bindTo('bindFunc',()=>"这是动态绑定的函数",o1);
-        return o2;
+class _C {
+    static create(){
+        return new _C() as C;
     }
-},B,'getNewB');
-export type C = ReturnType<typeof C.create>;
+    private constructor() {
+        composeC(this)
+    }
+    getC(this:C){return this};
+    testFunc(this:C){
+        console.log(this);
+        return 2;
+    }
+}
+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);
+    return ob3;
+}
+export type C = ReturnType<typeof composeC>;
+export const C = _C;
+assignThisAs<_C,C>(C.prototype);
+
 const insc:C=C.create();//?
-C.getNewB().getB().getText()//?
+insc.getC().testFunc()//?
+insc.testFunc();//?
 insc.getText();//?
 insc.getB().getText()//?
-insc.getNum()//?
 insc.bindFunc()//?