epos-unit 1.0.4 → 1.0.6

package/dist/epos-unit.d.ts

@@ -1,8 +1,9 @@
-import { type Log, type Cls } from '@eposlabs/utils';
+import { type Cls, type Log } from '@eposlabs/utils';
 import { epos } from 'epos';
 export declare const _root_: unique symbol;
 export declare const _parent_: unique symbol;
 export declare const _disposers_: unique symbol;
+export type Descriptors = Record<string | symbol, PropertyDescriptor>;
 export declare class Unit<TRoot = unknown> {
     '@': string;
     log: Log;

package/dist/epos-unit.js

@@ -5,6 +5,7 @@ export const _parent_ = Symbol('parent');
 export const _disposers_ = Symbol('disposers');
 export class Unit {
     constructor(parent) {
+        // Define parent for not-yet-attached units
         Reflect.defineProperty(this, _parent_, { get: () => parent });
     }
     // ---------------------------------------------------------------------------
@@ -12,23 +13,32 @@ export class Unit {
     // ---------------------------------------------------------------------------
     [epos.state.symbols.model.init]() {
         const Unit = this.constructor;
-        const prototypeKeys = Object.getOwnPropertyNames(Unit.prototype);
-        // Set disposers container
+        const descriptors = Object.getOwnPropertyDescriptors(Unit.prototype);
+        const keys = Reflect.ownKeys(descriptors);
+        // Setup disposers container
         const disposers = new Set();
         Reflect.defineProperty(this, _disposers_, { get: () => disposers });
         // Bind all methods
-        for (const key of prototypeKeys) {
-            if (typeof this[key] !== 'function')
-                continue;
+        for (const key of keys) {
             if (key === 'constructor')
                 continue;
-            this[key] = this[key].bind(this);
+            const descriptor = descriptors[key];
+            if (descriptor.get || descriptor.set)
+                continue;
+            if (typeof descriptor.value !== 'function')
+                continue;
+            this[key] = descriptor.value.bind(this);
         }
         // Wrap UI methods to components
-        for (const key of prototypeKeys) {
-            if (typeof this[key] !== 'function')
+        for (const key of keys) {
+            if (typeof key === 'symbol')
+                continue;
+            if (!key.startsWith('ui'))
                 continue;
-            if (!isUiKey(key))
+            const descriptor = descriptors[key];
+            if (descriptor.get || descriptor.set)
+                continue;
+            if (typeof this[key] !== 'function')
                 continue;
             const componentName = [this['@'], key.replace('ui', '')].filter(Boolean).join('-');
             this[key] = epos.component(componentName, this[key]);
@@ -63,12 +73,15 @@ export class Unit {
         return versioner;
     }
     // ---------------------------------------------------------------------------
-    // GETTERS & METHODS
+    // ROOT
     // ---------------------------------------------------------------------------
     get $() {
         this[_root_] ??= findRoot(this);
         return this[_root_];
     }
+    // ---------------------------------------------------------------------------
+    // METHODS
+    // ---------------------------------------------------------------------------
     up(Ancestor) {
         let cursor = getParent(this);
         while (cursor) {
@@ -102,9 +115,6 @@ export class Unit {
 // ---------------------------------------------------------------------------
 // HELPERS
 // ---------------------------------------------------------------------------
-function isUiKey(key) {
-    return key.startsWith('ui');
-}
 function getParent(child) {
     return child[_parent_] ?? child[epos.state.symbols.model.parent];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epos-unit",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "type": "module",
   "license": "MIT",
   "author": "imkost",