epos-unit 1.8.0 → 1.10.0

package/dist/epos-unit.d.ts

@@ -1,25 +1,26 @@
 import * as mobx from 'mobx';
-import { Log, Cls } from '@eposlabs/utils';
+import { Cls } from 'eposlabs/types';
+import { Log } from 'eposlabs/utils';
 
 declare const _root_: unique symbol;
 declare const _parent_: unique symbol;
 declare const _disposers_: unique symbol;
 type Descriptors = Record<string | symbol, PropertyDescriptor>;
 declare class Unit<TRoot = unknown> {
+    static [epos.symbols.stateModelStrict]: boolean;
+    static [epos.symbols.stateModelVersioner]: unknown;
+    [epos.symbols.stateModelInit]: () => void;
+    [epos.symbols.stateModelDispose]: () => void;
     '@': string;
     log: Log;
     [':version']?: number;
     private [_root_];
     private [_parent_];
     private [_disposers_];
-    static get [epos.state.symbols.modelStrict](): boolean;
     constructor(parent: Unit<TRoot> | null);
-    [epos.state.symbols.modelInit](): void;
-    [epos.state.symbols.modelCleanup](): void;
-    static get [epos.state.symbols.modelVersioner](): unknown;
     static defineVersioner(versioner: Record<number, (this: any, unit: any) => void>): Record<number, (this: any, unit: any) => void>;
     get $(): TRoot;
-    up<T extends Unit>(Ancestor: Cls<T>): T | null;
+    closest<T extends Unit>(Ancestor: Cls<T>): T | null;
     autorun(...args: Parameters<typeof epos.libs.mobx.autorun>): mobx.IReactionDisposer;
     reaction(...args: Parameters<typeof epos.libs.mobx.reaction>): mobx.IReactionDisposer;
     setTimeout(...args: Parameters<typeof self.setTimeout>): number;

package/dist/epos-unit.js

@@ -1,11 +1,11 @@
 // src/epos-unit.ts
 import "epos";
-import { createLog } from "@eposlabs/utils";
-var _root_ = Symbol("root");
-var _parent_ = Symbol("parent");
-var _disposers_ = Symbol("disposers");
+import { createLog } from "eposlabs/utils";
+var _root_ = /* @__PURE__ */ Symbol("root");
+var _parent_ = /* @__PURE__ */ Symbol("parent");
+var _disposers_ = /* @__PURE__ */ Symbol("disposers");
 var Unit = class {
-  static get [epos.state.symbols.modelStrict]() {
+  static get [epos.symbols.stateModelStrict]() {
     return true;
   }
   constructor(parent) {
@@ -14,7 +14,7 @@ var Unit = class {
   // ---------------------------------------------------------------------------
   // INIT
   // ---------------------------------------------------------------------------
-  [epos.state.symbols.modelInit]() {
+  [epos.symbols.stateModelInit]() {
     const _this = this;
     const Unit2 = this.constructor;
     const descriptors = Object.getOwnPropertyDescriptors(Unit2.prototype);
@@ -30,30 +30,30 @@ var Unit = class {
     }
     for (const key of keys) {
       if (typeof key === "symbol") continue;
-      if (!key.startsWith("ui")) continue;
+      if (!key.endsWith("View")) continue;
       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]);
+      _this[key] = epos.component(_this[key]);
+      _this[key].displayName = `${this["@"]}.${key}`;
     }
     const log = createLog(this["@"]);
     Reflect.defineProperty(this, "log", { get: () => log });
     if (typeof _this.init === "function") _this.init();
   }
   // ---------------------------------------------------------------------------
-  // CLEANUP
+  // DISPOSE
   // ---------------------------------------------------------------------------
-  [epos.state.symbols.modelCleanup]() {
+  [epos.symbols.stateModelDispose]() {
     const _this = this;
     this[_disposers_].forEach((disposer) => disposer());
     this[_disposers_].clear();
-    if (typeof _this.cleanup === "function") _this.cleanup();
+    if (typeof _this.dispose === "function") _this.dispose();
   }
   // ---------------------------------------------------------------------------
   // VERSIONER
   // ---------------------------------------------------------------------------
-  static get [epos.state.symbols.modelVersioner]() {
+  static get [epos.symbols.stateModelVersioner]() {
     if (!("versioner" in this)) return null;
     return this.versioner;
   }
@@ -70,7 +70,7 @@ var Unit = class {
   // ---------------------------------------------------------------------------
   // METHODS
   // ---------------------------------------------------------------------------
-  up(Ancestor) {
+  closest(Ancestor) {
     let cursor = getParent(this);
     while (cursor) {
       if (cursor instanceof Ancestor) return cursor;
@@ -100,7 +100,7 @@ var Unit = class {
   }
 };
 function getParent(child) {
-  return child[_parent_] ?? child[epos.state.symbols.parent];
+  return child[_parent_] ?? child[epos.symbols.stateParent];
 }
 function findRoot(unit) {
   let root = unit;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "epos-unit",
-  "version": "1.8.0",
+  "version": "1.10.0",
   "type": "module",
   "license": "MIT",
   "author": "imkost",
   "description": "",
   "keywords": [],
   "scripts": {
-    "dev": "tsup --config ../tsup.config.ts --watch",
-    "build": "tsup --config ../tsup.config.ts",
+    "dev": "tsup --config ../../tsup.config.ts --watch",
+    "build": "tsup --config ../../tsup.config.ts",
     "lint": "tsc --noEmit",
     "release": "sh -c 'npm version ${1:-minor} && npm run build && npm publish' --"
   },
@@ -24,7 +24,7 @@
     "dist"
   ],
   "dependencies": {
-    "@eposlabs/utils": "^1.10.0",
-    "epos": "^1.19.0"
+    "epos": "^1.26.0",
+    "eposlabs": "^1.15.0"
   }
 }

package/src/epos-unit.ts

@@ -1,5 +1,6 @@
 import 'epos'
-import { createLog, type Cls, type Log } from '@eposlabs/utils'
+import type { Cls } from 'eposlabs/types'
+import { createLog, Log } from 'eposlabs/utils'
 import type { FC } from 'react'
 
 export const _root_ = Symbol('root')
@@ -15,7 +16,7 @@ export class Unit<TRoot = unknown> {
   declare private [_parent_]: Unit<TRoot> | null // Parent reference for not-yet-attached units
   declare private [_disposers_]: Set<() => void>
 
-  static get [epos.state.symbols.modelStrict]() {
+  static get [epos.symbols.stateModelStrict]() {
     return true
   }
 
@@ -28,7 +29,7 @@ export class Unit<TRoot = unknown> {
   // INIT
   // ---------------------------------------------------------------------------
 
-  [epos.state.symbols.modelInit]() {
+  [epos.symbols.stateModelInit]() {
     const _this = this as any
     const Unit = this.constructor
     const descriptors: Descriptors = Object.getOwnPropertyDescriptors(Unit.prototype)
@@ -47,15 +48,15 @@ export class Unit<TRoot = unknown> {
       _this[key] = descriptor.value.bind(this)
     }
 
-    // Wrap UI methods to components
+    // Create components out of `View` methods
     for (const key of keys) {
       if (typeof key === 'symbol') continue
-      if (!key.startsWith('ui')) continue
+      if (!key.endsWith('View')) continue
       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] as FC)
+      _this[key] = epos.component(_this[key] as FC)
+      _this[key].displayName = `${this['@']}.${key}`
     }
 
     // Define log method
@@ -67,25 +68,25 @@ export class Unit<TRoot = unknown> {
   }
 
   // ---------------------------------------------------------------------------
-  // CLEANUP
+  // DISPOSE
   // ---------------------------------------------------------------------------
 
-  [epos.state.symbols.modelCleanup]() {
+  [epos.symbols.stateModelDispose]() {
     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()
+    // Call dispose method
+    if (typeof _this.dispose === 'function') _this.dispose()
   }
 
   // ---------------------------------------------------------------------------
   // VERSIONER
   // ---------------------------------------------------------------------------
 
-  static get [epos.state.symbols.modelVersioner]() {
+  static get [epos.symbols.stateModelVersioner]() {
     if (!('versioner' in this)) return null
     return this.versioner
   }
@@ -107,7 +108,7 @@ export class Unit<TRoot = unknown> {
   // METHODS
   // ---------------------------------------------------------------------------
 
-  up<T extends Unit>(Ancestor: Cls<T>): T | null {
+  closest<T extends Unit>(Ancestor: Cls<T>): T | null {
     let cursor: unknown = getParent(this)
     while (cursor) {
       if (cursor instanceof Ancestor) return cursor
@@ -146,7 +147,7 @@ export class Unit<TRoot = unknown> {
 // ---------------------------------------------------------------------------
 
 function getParent(child: any) {
-  return child[_parent_] ?? child[epos.state.symbols.parent]
+  return child[_parent_] ?? child[epos.symbols.stateParent]
 }
 
 function findRoot(unit: Unit) {