@zwa73/utils 1.0.62 → 1.0.64

package/dist/UtilFunctions.d.ts

@@ -1,4 +1,4 @@
-import { ComposedClassMult, ComposedClassPart, JToken, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
+import { ComposedClassMult, ComposedClassPart, FuncPropNames, JToken, PromiseProcFn, PromiseVerifyFn } from "./UtilInterfaces";
 /**常用函数 */
 export declare namespace UtilFunc {
     /**获取当前时间戳
@@ -64,7 +64,7 @@ export declare namespace UtilFunc {
      * @param fields - 需要混入的字段
      * @returns 混合完成的类
      */
-    function composeClassPart<Base extends object, Mixin extends object, Field extends keyof Mixin>(base: Base, mixin: Mixin, ...fields: Field[]): ComposedClassPart<Base, Mixin, Field>;
+    function composeClassPart<Base extends object, Mixin extends object, Field extends FuncPropNames<Mixin>>(base: Base, mixin: Mixin, ...fields: Field[]): ComposedClassPart<Base, Mixin, Field>;
     /**类组合
      * 将mixinList每个成员的字段混入base
      * @param base      - 基础类

package/dist/UtilFunctions.js

@@ -207,14 +207,16 @@ var UtilFunc;
     function composeClassPart(base, mixin, ...fields) {
         const compObj = base;
         for (const fd of fields) {
+            /**
             Object.defineProperty(compObj, fd, {
-                get: () => mixin[fd],
-                set: (value) => { mixin[fd] = value; },
-                enumerable: true,
+                get: ()=>mixin[fd],
+                set: (value)=>{mixin[fd] = value},
+                enumerable:true ,
                 //writable: true  ,
                 configurable: true
             });
-            //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+            */
+            compObj[fd] = mixin[fd].bind(mixin);
         }
         return compObj;
     }

package/dist/UtilInterfaces.d.ts

@@ -99,5 +99,5 @@ export type MethodsThisAs<Methods, T> = {
  * @template T      - 目标this类型
  * @param prototype - 类的原型
  */
-export declare function assignThisAs<Self, T>(prototype: MethodsThisAs<Self, T>): void;
+export declare function assertThisAs<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.assignThisAs = exports.stringifyJToken = void 0;
+exports.assertThisAs = exports.stringifyJToken = void 0;
 /**将JToken转换为字符串
  * @param token - 待转换的Token
  * @param space - 插入的空格 数字为空格数量 默认为制表符\t
@@ -19,5 +19,5 @@ exports.stringifyJToken = stringifyJToken;
  * @template T      - 目标this类型
  * @param prototype - 类的原型
  */
-function assignThisAs(prototype) { }
-exports.assignThisAs = assignThisAs;
+function assertThisAs(prototype) { }
+exports.assertThisAs = assertThisAs;

package/dist/test/composeTest.js

@@ -41,7 +41,7 @@ function composeC(obj) {
     return ob3;
 }
 exports.C = _C;
-(0, __1.assignThisAs)(exports.C.prototype);
+(0, __1.assertThisAs)(exports.C.prototype);
 const insc = exports.C.create(); //?
 insc.getC().testFunc(); //?
 insc.testFunc(); //?

package/package.json

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

package/src/UtilFunctions.ts

@@ -221,10 +221,11 @@ export async function repeatPromise<T>(procFn:PromiseProcFn<T>,verifyFn?:Promise
  * @returns 混合完成的类
  */
 export function composeClassPart
-    <Base extends object,Mixin extends object,Field extends keyof Mixin>
+    <Base extends object,Mixin extends object,Field extends FuncPropNames<Mixin>>
     (base:Base,mixin:Mixin,...fields:Field[]):ComposedClassPart<Base,Mixin,Field>{
     const compObj = base as any;
     for(const fd of fields){
+        /**
         Object.defineProperty(compObj, fd, {
             get: ()=>mixin[fd],
             set: (value)=>{mixin[fd] = value},
@@ -232,7 +233,8 @@ export function composeClassPart
             //writable: true  ,
             configurable: true
         });
-        //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+        */
+        (compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
     }
     return compObj;
 }

package/src/UtilInterfaces.ts

@@ -155,4 +155,4 @@ export type MethodsThisAs<Methods, T> = {
  * @template T      - 目标this类型
  * @param prototype - 类的原型
  */
-export function assignThisAs<Self,T>(prototype: MethodsThisAs<Self, T>) {}
+export function assertThisAs<Self,T>(prototype: MethodsThisAs<Self, T>) {}

package/src/test/composeTest.ts

@@ -1,4 +1,4 @@
-import { UtilFP, UtilFunc, assignThisAs } from ".."
+import { UtilFP, UtilFunc, assertThisAs } from ".."
 
 class A {
     private num = 1;
@@ -39,7 +39,7 @@ function composeC(obj:_C){
 }
 export type C = ReturnType<typeof composeC>;
 export const C = _C;
-assignThisAs<_C,C>(C.prototype);
+assertThisAs<_C,C>(C.prototype);
 
 const insc:C=C.create();//?
 insc.getC().testFunc()//?