epos-unit 1.1.5 → 1.1.7

package/dist/epos-unit.d.ts

@@ -8,10 +8,10 @@ type Descriptors = Record<string | symbol, PropertyDescriptor>;
 declare class Unit<TRoot = unknown> {
     '@': string;
     log: Log;
+    [':version']?: number;
     private [_root_];
     private [_parent_];
     private [_disposers_];
-    [key: PropertyKey]: unknown;
     constructor(parent: Unit<TRoot> | null);
     [epos.state.symbols.modelInit](): void;
     [epos.state.symbols.modelCleanup](): void;

package/dist/epos-unit.js

@@ -12,6 +12,7 @@ var Unit = class {
   // INIT
   // ---------------------------------------------------------------------------
   [epos.state.symbols.modelInit]() {
+    const _this = this;
     const Unit2 = this.constructor;
     const descriptors = Object.getOwnPropertyDescriptors(Unit2.prototype);
     const keys = Reflect.ownKeys(descriptors);
@@ -22,28 +23,29 @@ var Unit = class {
       const descriptor = descriptors[key];
       if (descriptor.get || descriptor.set) continue;
       if (typeof descriptor.value !== "function") continue;
-      this[key] = descriptor.value.bind(this);
+      _this[key] = descriptor.value.bind(this);
     }
     for (const key of keys) {
       if (typeof key === "symbol") continue;
       if (!key.startsWith("ui")) continue;
       const descriptor = descriptors[key];
       if (descriptor.get || descriptor.set) continue;
-      if (typeof this[key] !== "function") continue;
+      if (typeof _this[key] !== "function") continue;
       const componentName = [this["@"], key.replace("ui", "")].filter(Boolean).join("-");
-      this[key] = epos.component(componentName, this[key]);
+      _this[key] = epos.component(componentName, _this[key]);
     }
     const log = createLog(this["@"]);
     Reflect.defineProperty(this, "log", { get: () => log });
-    if (typeof this.init === "function") this.init();
+    if (typeof _this.init === "function") _this.init();
   }
   // ---------------------------------------------------------------------------
   // CLEANUP
   // ---------------------------------------------------------------------------
   [epos.state.symbols.modelCleanup]() {
+    const _this = this;
     this[_disposers_].forEach((disposer) => disposer());
     this[_disposers_].clear();
-    if (typeof this.cleanup === "function") this.cleanup();
+    if (typeof _this.cleanup === "function") _this.cleanup();
   }
   // ---------------------------------------------------------------------------
   // VERSIONER

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "epos-unit",
-  "version": "1.1.5",
+  "version": "1.1.7",
   "type": "module",
   "license": "MIT",
   "author": "imkost",
@@ -24,7 +24,7 @@
     "dist"
   ],
   "dependencies": {
-    "@eposlabs/utils": "^1.2.1",
-    "epos": "^1.8.4"
+    "@eposlabs/utils": "^1.2.2",
+    "epos": "^1.8.5"
   }
 }

package/src/epos-unit.ts

@@ -9,11 +9,11 @@ export type Descriptors = Record<string | symbol, PropertyDescriptor>
 
 export class Unit<TRoot = unknown> {
   declare '@': string
-  declare log: Log
+  declare log: Log;
+  declare [':version']?: number
   declare private [_root_]: TRoot
   declare private [_parent_]: Unit<TRoot> | null // Parent reference for not-yet-attached units
-  declare private [_disposers_]: Set<() => void>;
-  [key: PropertyKey]: unknown
+  declare private [_disposers_]: Set<() => void>
 
   constructor(parent: Unit<TRoot> | null) {
     // Define parent for not-yet-attached units
@@ -25,6 +25,7 @@ export class Unit<TRoot = unknown> {
   // ---------------------------------------------------------------------------
 
   [epos.state.symbols.modelInit]() {
+    const _this = this as any
     const Unit = this.constructor
     const descriptors: Descriptors = Object.getOwnPropertyDescriptors(Unit.prototype)
     const keys = Reflect.ownKeys(descriptors)
@@ -39,7 +40,7 @@ export class Unit<TRoot = unknown> {
       const descriptor = descriptors[key]
       if (descriptor.get || descriptor.set) continue
       if (typeof descriptor.value !== 'function') continue
-      this[key] = descriptor.value.bind(this)
+      _this[key] = descriptor.value.bind(this)
     }
 
     // Wrap UI methods to components
@@ -48,9 +49,9 @@ export class Unit<TRoot = unknown> {
       if (!key.startsWith('ui')) continue
       const descriptor = descriptors[key]
       if (descriptor.get || descriptor.set) continue
-      if (typeof this[key] !== 'function') continue
+      if (typeof _this[key] !== 'function') continue
       const componentName = [this['@'], key.replace('ui', '')].filter(Boolean).join('-')
-      this[key] = epos.component(componentName, this[key] as FC)
+      _this[key] = epos.component(componentName, _this[key] as FC)
     }
 
     // Define log method
@@ -58,7 +59,7 @@ export class Unit<TRoot = unknown> {
     Reflect.defineProperty(this, 'log', { get: () => log })
 
     // Call init method
-    if (typeof this.init === 'function') this.init()
+    if (typeof _this.init === 'function') _this.init()
   }
 
   // ---------------------------------------------------------------------------
@@ -66,12 +67,14 @@ export class Unit<TRoot = unknown> {
   // ---------------------------------------------------------------------------
 
   [epos.state.symbols.modelCleanup]() {
+    const _this = this as any
+
     // Call disposers
     this[_disposers_].forEach(disposer => disposer())
     this[_disposers_].clear()
 
     // Call cleanup method
-    if (typeof this.cleanup === 'function') this.cleanup()
+    if (typeof _this.cleanup === 'function') _this.cleanup()
   }
 
   // ---------------------------------------------------------------------------