@zwa73/utils 1.0.63 → 1.0.65

package/dist/UtilFunctions.js

@@ -207,14 +207,27 @@ 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);
+            */
+            if (typeof mixin[fd] === 'function') {
+                compObj[fd] = mixin[fd].bind(mixin);
+            }
+            else {
+                Object.defineProperty(compObj, fd, {
+                    get: () => mixin[fd],
+                    set: (value) => { mixin[fd] = value; },
+                    enumerable: true,
+                    //writable: true  ,
+                    configurable: true
+                });
+            }
         }
         return compObj;
     }

package/package.json

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

package/src/UtilFunctions.ts

@@ -225,6 +225,7 @@ export function composeClassPart
     (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,18 @@ export function composeClassPart
             //writable: true  ,
             configurable: true
         });
-        //(compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+        */
+        if(typeof mixin[fd] === 'function') {
+            (compObj as any)[fd] = (mixin[fd] as any).bind(mixin);
+        } else {
+            Object.defineProperty(compObj, fd, {
+                get: ()=>mixin[fd],
+                set: (value)=>{mixin[fd] = value},
+                enumerable:true ,
+                //writable: true  ,
+                configurable: true
+            });
+        }
     }
     return compObj;
 }