bard-legends-framework 0.10.8 → 0.11.0

package/dist/game-entities/index.d.ts

@@ -1,12 +1,8 @@
-export { Attachable } from './base/attachable';
-export { AttachmentTarget } from './base/attachment-target';
-export { ActionsLibDecorator } from './base/helpers/decorate-actions-lib';
-export { ReferanceVariable } from './base/helpers/referance-variable';
-export * from './base/interfaces';
 export { ControllerDecorator, ControllerDecoratorMeta, ControllerLink } from './controller/controller';
 export { Entity, EntityDecorator } from './entity/entity';
 export { SingletonEntity } from './entity/singleton-entity';
 export { Scene, SceneDecorator } from './scene/scene';
 export { Service, ServiceDecorator } from './service/service';
+export { UnitTestHelper } from './unit-test.helper';
 export { UpdateCycle } from './update-cycle';
 export { View, ViewDecorator, ViewDecoratorMeta } from './view/view';

package/dist/game-entities/index.js

@@ -1,29 +1,6 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ViewDecorator = exports.View = exports.UpdateCycle = exports.ServiceDecorator = exports.Service = exports.SceneDecorator = exports.Scene = exports.SingletonEntity = exports.EntityDecorator = exports.Entity = exports.ControllerLink = exports.ControllerDecorator = exports.ReferanceVariable = exports.ActionsLibDecorator = exports.AttachmentTarget = exports.Attachable = void 0;
-var attachable_1 = require("./base/attachable");
-Object.defineProperty(exports, "Attachable", { enumerable: true, get: function () { return attachable_1.Attachable; } });
-var attachment_target_1 = require("./base/attachment-target");
-Object.defineProperty(exports, "AttachmentTarget", { enumerable: true, get: function () { return attachment_target_1.AttachmentTarget; } });
-var decorate_actions_lib_1 = require("./base/helpers/decorate-actions-lib");
-Object.defineProperty(exports, "ActionsLibDecorator", { enumerable: true, get: function () { return decorate_actions_lib_1.ActionsLibDecorator; } });
-var referance_variable_1 = require("./base/helpers/referance-variable");
-Object.defineProperty(exports, "ReferanceVariable", { enumerable: true, get: function () { return referance_variable_1.ReferanceVariable; } });
-__exportStar(require("./base/interfaces"), exports);
+exports.ViewDecorator = exports.View = exports.UpdateCycle = exports.UnitTestHelper = exports.ServiceDecorator = exports.Service = exports.SceneDecorator = exports.Scene = exports.SingletonEntity = exports.EntityDecorator = exports.Entity = exports.ControllerLink = exports.ControllerDecorator = void 0;
 var controller_1 = require("./controller/controller");
 Object.defineProperty(exports, "ControllerDecorator", { enumerable: true, get: function () { return controller_1.ControllerDecorator; } });
 Object.defineProperty(exports, "ControllerLink", { enumerable: true, get: function () { return controller_1.ControllerLink; } });
@@ -38,6 +15,8 @@ Object.defineProperty(exports, "SceneDecorator", { enumerable: true, get: functi
 var service_1 = require("./service/service");
 Object.defineProperty(exports, "Service", { enumerable: true, get: function () { return service_1.Service; } });
 Object.defineProperty(exports, "ServiceDecorator", { enumerable: true, get: function () { return service_1.ServiceDecorator; } });
+var unit_test_helper_1 = require("./unit-test.helper");
+Object.defineProperty(exports, "UnitTestHelper", { enumerable: true, get: function () { return unit_test_helper_1.UnitTestHelper; } });
 var update_cycle_1 = require("./update-cycle");
 Object.defineProperty(exports, "UpdateCycle", { enumerable: true, get: function () { return update_cycle_1.UpdateCycle; } });
 var view_1 = require("./view/view");

package/dist/game-entities/scene/scene.d.ts

@@ -1,12 +1,12 @@
-import { Variable } from 'actions-lib';
-import { AttachmentTarget } from '../base/attachment-target';
+import { Attachable } from 'actions-lib';
 export type SceneClassType = new (...services: unknown[]) => Scene<unknown, unknown>;
 type SceneInput<T> = T extends Scene<infer I, any> ? I : never;
 type SceneOutput<T> = T extends Scene<any, infer O> ? O : never;
 export declare function SceneDecorator(): (SceneClass: SceneClassType) => any;
-export declare abstract class Scene<InputType, OutputType> extends AttachmentTarget {
+export declare abstract class Scene<InputType, OutputType> extends Attachable {
     private static sceneTransitioning;
-    static activeScene: Variable<Scene<unknown, unknown> | undefined>;
+    private static readonly _activeScene;
+    static readonly activeScene: import("actions-lib").Notifier<Scene<unknown, unknown> | undefined>;
     static getActiveScene(this: typeof Scene): Scene<unknown, unknown> | undefined;
     static getActiveSceneOrFail(this: typeof Scene): Scene<unknown, unknown>;
     static isActive<T extends Scene<unknown, unknown>>(this: new (...args: unknown[]) => T): boolean;

package/dist/game-entities/scene/scene.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Scene = exports.SceneDecorator = void 0;
 const actions_lib_1 = require("actions-lib");
-const attachment_target_1 = require("../base/attachment-target");
 const service_1 = require("../service/service");
+const unit_test_helper_1 = require("../unit-test.helper");
 const update_cycle_1 = require("../update-cycle");
 function SceneDecorator() {
     return function (SceneClass) {
@@ -15,60 +15,59 @@ function SceneDecorator() {
     };
 }
 exports.SceneDecorator = SceneDecorator;
-class Scene extends attachment_target_1.AttachmentTarget {
+class Scene extends actions_lib_1.Attachable {
     static { this.sceneTransitioning = false; }
-    static { this.activeScene = new actions_lib_1.Variable(); }
+    static { this._activeScene = new actions_lib_1.Variable(undefined); }
+    static { this.activeScene = this._activeScene.notifier; }
     static getActiveScene() {
-        return Scene.activeScene.value;
+        return Scene._activeScene.value;
     }
     static getActiveSceneOrFail() {
-        if (!Scene.activeScene.value) {
+        if (!Scene._activeScene.value) {
             throw new Error(`Scene: getActiveSceneOrFail is called when there is no active scene!`);
         }
-        return Scene.activeScene.value;
+        return Scene._activeScene.value;
     }
     static isActive() {
-        return Scene.activeScene.value instanceof this;
+        return Scene._activeScene.value instanceof this;
     }
     static getInstance() {
-        return Scene.activeScene.value instanceof this ? Scene.activeScene.value : undefined;
+        return Scene._activeScene.value instanceof this ? Scene._activeScene.value : undefined;
     }
     static getInstanceOrFail() {
-        if (!Scene.activeScene.value) {
+        if (!Scene._activeScene.value) {
             throw new Error(`Scene: getInstance is called when there is no active scene!`);
         }
-        if (!(Scene.activeScene.value instanceof this)) {
-            throw new Error(`Scene: getInstance is called while "${this.name}" was not the active scene. Current scene is: "${Scene.activeScene.value.constructor.name}"!`);
+        if (!(Scene._activeScene.value instanceof this)) {
+            throw new Error(`Scene: getInstance is called while "${this.name}" was not the active scene. Current scene is: "${Scene._activeScene.value}"!`);
         }
-        return Scene.activeScene.value;
+        return Scene._activeScene.value;
     }
     static open(...args) {
         if (Scene.sceneTransitioning) {
             throw new Error('Scene: you cannot open a scene while a scene is transitioning!');
         }
-        else if (Scene.activeScene.value) {
+        else if (Scene._activeScene.value) {
             throw new Error('Scene: you cannot open a scene while there is already another active scene!');
         }
         let input = args[0];
         let onOpenResolve;
         let onCloseResolve;
-        let onOpen = new Promise((resolve, reject) => {
+        let onOpen = new Promise(resolve => {
             onOpenResolve = resolve;
         });
-        let onClose = new Promise((resolve, reject) => {
+        let onClose = new Promise(resolve => {
             onCloseResolve = resolve;
         });
         Scene.sceneTransitioning = true;
         let resolvedArgs = service_1.Service['resolveParameters']([], this.$meta.paramtypes);
         let scene = new this(...resolvedArgs).attachToRoot();
-        Scene.activeScene.set(scene);
+        Scene._activeScene.set(scene);
         scene.init(input).then(() => {
             Scene.sceneTransitioning = false;
             onOpenResolve();
         });
-        scene.closePromise.then(output => {
-            onCloseResolve(output);
-        });
+        scene.closePromise.then(output => onCloseResolve(output));
         return { onOpen, onClose };
     }
     constructor() {
@@ -84,22 +83,29 @@ class Scene extends attachment_target_1.AttachmentTarget {
     }
     async close(...args) {
         if (Scene.sceneTransitioning) {
-            throw new Error('Scene: you cannot close a scene while a scene is transitioning!');
+            if (Scene._activeScene.value === this) {
+                return;
+            }
+            else {
+                throw new Error('Scene: you cannot close a scene while a scene is transitioning!');
+            }
         }
-        else if (Scene.activeScene.value !== this) {
+        else if (Scene._activeScene.value !== this) {
             throw new Error('Internal Error: Scene instance is accessed while it is not the active scene!');
         }
         let output = args[0];
         Scene.sceneTransitioning = true;
         await this.prepareToClose();
         super.destroy();
-        Scene.activeScene.set(undefined);
+        Scene._activeScene.set(undefined);
         this.resolveClosePromise(output);
         Scene.sceneTransitioning = false;
     }
 }
 exports.Scene = Scene;
-update_cycle_1.UpdateCycle.hardResetAction.subscribe(() => {
-    Scene.activeScene.set(undefined);
-});
+unit_test_helper_1.UnitTestHelper.onHardReset
+    .subscribe(() => {
+    Scene['_activeScene'].set(undefined);
+})
+    .attachToRoot();
 //# sourceMappingURL=scene.js.map

package/dist/game-entities/scene/scene.test.js

@@ -1,50 +1,24 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ActionsLib = __importStar(require("actions-lib"));
-const helpers_lib_1 = require("helpers-lib");
 const vitest_1 = require("vitest");
-const decorate_actions_lib_1 = require("../base/helpers/decorate-actions-lib");
 const entity_1 = require("../entity/entity");
 const service_1 = require("../service/service");
+const unit_test_helper_1 = require("../unit-test.helper");
 const update_cycle_1 = require("../update-cycle");
 const view_1 = require("../view/view");
 const scene_1 = require("./scene");
-decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
 (0, vitest_1.describe)('SCENE', () => {
     (0, vitest_1.beforeEach)(() => {
-        update_cycle_1.UpdateCycle.hardResetAction.trigger();
+        unit_test_helper_1.UnitTestHelper.hardReset();
     });
     (0, vitest_1.test)('create scene', () => {
         let SampleScene = class SampleScene extends scene_1.Scene {
@@ -56,8 +30,8 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             (0, scene_1.SceneDecorator)()
         ], SampleScene);
         SampleScene.open();
-        (0, vitest_1.expect)(scene_1.Scene.activeScene.value).toBeDefined();
-        (0, vitest_1.expect)(scene_1.Scene.activeScene.value).toBeInstanceOf(SampleScene);
+        (0, vitest_1.expect)(scene_1.Scene.getActiveScene()).toBeDefined();
+        (0, vitest_1.expect)(scene_1.Scene.getActiveScene()).toBeInstanceOf(SampleScene);
     });
     (0, vitest_1.test)('arguments in open call should be passed to the init function', () => {
         let SampleScene = class SampleScene extends scene_1.Scene {
@@ -155,8 +129,11 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         let SampleEntity = class SampleEntity extends entity_1.Entity {
             static { SampleEntity_1 = this; }
             static { this.entityDestroyCalled = false; }
-            afterDestroy() {
-                SampleEntity_1.entityDestroyCalled = true;
+            destroy() {
+                if (!this.destroyed) {
+                    SampleEntity_1.entityDestroyCalled = true;
+                    super.destroy();
+                }
             }
         };
         SampleEntity = SampleEntity_1 = __decorate([
@@ -164,8 +141,11 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         ], SampleEntity);
         let viewDestroyCalled = false;
         let _SampleView = class _SampleView extends view_1.View {
-            afterDestroy() {
-                viewDestroyCalled = true;
+            destroy() {
+                if (!this.destroyed) {
+                    viewDestroyCalled = true;
+                    super.destroy();
+                }
             }
         };
         _SampleView = __decorate([
@@ -176,7 +156,6 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         await SampleScene.open().onOpen;
         new SampleEntity().attach(scene_1.Scene.getActiveSceneOrFail());
         await SampleScene.getInstanceOrFail().close();
-        await update_cycle_1.UpdateCycle.triggerUpdateTick(1); // Update cycle should take place to destroy functions to be called
         (0, vitest_1.expect)(SampleEntity.entityDestroyCalled).toBeTruthy();
         (0, vitest_1.expect)(viewDestroyCalled).toBeTruthy();
     });
@@ -216,7 +195,6 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         ], _SampleView);
         SampleScene.open();
         new SampleEntity().attach(scene_1.Scene.getActiveSceneOrFail());
-        await (0, helpers_lib_1.Wait)(); // Wait for the async view init to expect the update call
         update_cycle_1.UpdateCycle.triggerUpdateTick(1);
         (0, vitest_1.expect)(SampleScene.sceneUpdateCalled).toBeTruthy();
         (0, vitest_1.expect)(viewUpdateCalled).toBeTruthy();

package/dist/game-entities/service/service.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Service = exports.ServiceDecorator = void 0;
-const update_cycle_1 = require("../update-cycle");
+const unit_test_helper_1 = require("../unit-test.helper");
 require("reflect-metadata");
 function ServiceDecorator() {
     return function (ServiceClass) {
@@ -52,7 +52,9 @@ class Service {
     }
 }
 exports.Service = Service;
-update_cycle_1.UpdateCycle.hardResetAction.subscribe(() => {
+unit_test_helper_1.UnitTestHelper.onHardReset
+    .subscribe(() => {
     Service['serviceInstances'] = new Map();
-});
+})
+    .attachToRoot();
 //# sourceMappingURL=service.js.map

package/dist/game-entities/service/service.test.js

@@ -1,49 +1,23 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ActionsLib = __importStar(require("actions-lib"));
 const vitest_1 = require("vitest");
-const decorate_actions_lib_1 = require("../base/helpers/decorate-actions-lib");
 const entity_1 = require("../entity/entity");
 const scene_1 = require("../scene/scene");
-const update_cycle_1 = require("../update-cycle");
+const unit_test_helper_1 = require("../unit-test.helper");
 const view_1 = require("../view/view");
 const service_1 = require("./service");
-decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
 (0, vitest_1.describe)('SERVICE', () => {
     (0, vitest_1.beforeEach)(() => {
-        update_cycle_1.UpdateCycle.hardResetAction.trigger();
+        unit_test_helper_1.UnitTestHelper.hardReset();
     });
     (0, vitest_1.test)('get services', () => {
         var SampleService_1;

package/dist/game-entities/unit-test.helper.d.ts

@@ -0,0 +1,5 @@
+export declare class UnitTestHelper {
+    private static readonly _hardResetAction;
+    static readonly onHardReset: import("actions-lib").Notifier<void>;
+    static hardReset(): void;
+}

package/dist/game-entities/unit-test.helper.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UnitTestHelper = void 0;
+const actions_lib_1 = require("actions-lib");
+class UnitTestHelper {
+    static { this._hardResetAction = new actions_lib_1.Action(); }
+    static { this.onHardReset = this._hardResetAction.notifier; }
+    static hardReset() {
+        actions_lib_1.ActionLibUnitTestHelper.hardReset();
+        this._hardResetAction.trigger();
+    }
+}
+exports.UnitTestHelper = UnitTestHelper;
+//# sourceMappingURL=unit-test.helper.js.map

package/dist/game-entities/update-cycle.d.ts

@@ -1,15 +1,26 @@
 import { Action } from 'actions-lib';
 export declare class UpdateCycle {
-    static readonly hardResetAction: Action<void>;
-    static readonly beforeSceneUpdateAction: Action<{
+    static readonly _beforeSceneUpdateAction: Action<{
         time: number;
         delta: number;
     }>;
-    static readonly sceneUpdateAction: Action<{
+    static readonly beforeSceneUpdateAction: import("actions-lib").Notifier<{
         time: number;
         delta: number;
     }>;
-    static readonly afterSceneUpdateAction: Action<{
+    static readonly _sceneUpdateAction: Action<{
+        time: number;
+        delta: number;
+    }>;
+    static readonly sceneUpdateAction: import("actions-lib").Notifier<{
+        time: number;
+        delta: number;
+    }>;
+    static readonly _afterSceneUpdateAction: Action<{
+        time: number;
+        delta: number;
+    }>;
+    static readonly afterSceneUpdateAction: import("actions-lib").Notifier<{
         time: number;
         delta: number;
     }>;

package/dist/game-entities/update-cycle.js

@@ -2,11 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateCycle = void 0;
 const actions_lib_1 = require("actions-lib");
+const unit_test_helper_1 = require("./unit-test.helper");
 class UpdateCycle {
-    static { this.hardResetAction = new actions_lib_1.Action(); }
-    static { this.beforeSceneUpdateAction = new actions_lib_1.Action(); }
-    static { this.sceneUpdateAction = new actions_lib_1.Action(); }
-    static { this.afterSceneUpdateAction = new actions_lib_1.Action(); }
+    static { this._beforeSceneUpdateAction = new actions_lib_1.Action(); }
+    static { this.beforeSceneUpdateAction = this._beforeSceneUpdateAction.notifier; }
+    static { this._sceneUpdateAction = new actions_lib_1.Action(); }
+    static { this.sceneUpdateAction = this._sceneUpdateAction.notifier; }
+    static { this._afterSceneUpdateAction = new actions_lib_1.Action(); }
+    static { this.afterSceneUpdateAction = this._afterSceneUpdateAction.notifier; }
     static { this.time = 0; }
     static { this.updateModifierCallback = undefined; }
     static async wait(duration) {
@@ -39,9 +42,9 @@ class UpdateCycle {
         this.time += delta;
         this._lastDelta = delta;
         if (delta > 0) {
-            UpdateCycle.beforeSceneUpdateAction.trigger({ time: this.time, delta });
-            UpdateCycle.sceneUpdateAction.trigger({ time: this.time, delta });
-            UpdateCycle.afterSceneUpdateAction.trigger({ time: this.time, delta });
+            UpdateCycle._beforeSceneUpdateAction.trigger({ time: this.time, delta });
+            UpdateCycle._sceneUpdateAction.trigger({ time: this.time, delta });
+            UpdateCycle._afterSceneUpdateAction.trigger({ time: this.time, delta });
         }
     }
     static get lastDelta() {
@@ -50,7 +53,9 @@ class UpdateCycle {
     static { this._lastDelta = 0; }
 }
 exports.UpdateCycle = UpdateCycle;
-UpdateCycle.hardResetAction.subscribe(() => {
+unit_test_helper_1.UnitTestHelper.onHardReset
+    .subscribe(() => {
     UpdateCycle['time'] = 0;
-});
+})
+    .attachToRoot();
 //# sourceMappingURL=update-cycle.js.map

package/dist/game-entities/view/view.d.ts

@@ -1,17 +1,16 @@
-import { AttachmentTarget } from '../base/attachment-target';
-import { Entity } from '../entity/entity';
-export type ViewClassType<EntityType> = new (entity: EntityType, ...services: any[]) => View;
-export interface ViewDecoratorMeta<EntityType> {
-    entity: new (...args: any[]) => EntityType;
+import { Attachable } from 'actions-lib';
+import { Entity, EntityClassType } from '../entity/entity';
+export type ViewClassType<EntityType extends Entity> = new (entity: EntityType, ...services: any[]) => View;
+export interface ViewDecoratorMeta<EntityType extends Entity> {
+    entity: EntityClassType<EntityType>;
 }
 export declare function ViewDecorator<EntityType extends Entity>(meta: ViewDecoratorMeta<EntityType>): (ViewClass: ViewClassType<EntityType>) => any;
-export declare abstract class View extends AttachmentTarget {
-    private static viewClassNames;
+export declare abstract class View extends Attachable {
     static getInstance<T extends View>(this: new (...args: any[]) => T, entityId: string): T | undefined;
     static getInstanceOrFail<T extends View>(this: new (...args: any[]) => T, entityId: string): T;
     private _entityId;
     constructor();
-    protected destroySelf(): void;
+    destroy(): void;
     update(time: number, delta: number): void;
     private getViewInstances;
 }

package/dist/game-entities/view/view.js

@@ -1,40 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.View = exports.ViewDecorator = void 0;
-const attachment_target_1 = require("../base/attachment-target");
+const actions_lib_1 = require("actions-lib");
 const entity_views_helper_1 = require("../entity/helpers/entity-views.helper");
 const service_1 = require("../service/service");
-const update_cycle_1 = require("../update-cycle");
 function ViewDecorator(meta) {
     return function (ViewClass) {
-        if (View['viewClassNames'].has(ViewClass.name)) {
-            throw new Error(`View class names should be unique! This view name is already taken. name: "${ViewClass.name}"`);
-        }
-        else {
-            View['viewClassNames'].add(ViewClass.name);
-        }
         ViewClass.$meta = {
             paramtypes: service_1.Service.getParametersMeta(ViewClass),
             viewInstances: new Map(),
-            entityName: meta.entity.name,
+            entity: meta.entity,
             type: 'view'
         };
         entity_views_helper_1.EntityViewsHelper['registerView'](ViewClass, meta.entity);
     };
 }
 exports.ViewDecorator = ViewDecorator;
-class View extends attachment_target_1.AttachmentTarget {
-    static { this.viewClassNames = new Set(); }
+class View extends actions_lib_1.Attachable {
     static getInstance(entityId) {
-        if (entityId.substring(0, entityId.indexOf(':')) !== this.$meta.entityName) {
+        if (!this.$meta.entity.validateId(entityId)) {
             return undefined;
         }
         let viewInstances = this.$meta.viewInstances;
         return viewInstances.get(entityId);
     }
     static getInstanceOrFail(entityId) {
-        if (entityId.substring(0, entityId.indexOf(':')) !== this.$meta.entityName) {
-            throw new Error(`View: getInstance is called with entity id: "${entityId}", that is not belonging to the class: "${this.$meta.entityName}"`);
+        if (!this.$meta.entity.validateId(entityId)) {
+            throw new Error(`View: getInstance is called with entity id: "${entityId}", that is not belonging to the class: "${this.$meta.entity}"`);
         }
         let viewInstances = this.$meta.viewInstances;
         let view = viewInstances.get(entityId);
@@ -45,7 +37,7 @@ class View extends attachment_target_1.AttachmentTarget {
     }
     constructor() {
         super();
-        this.attachToRoot(); // View is always attached to its entity
+        this.attachToRoot();
         this._entityId = entity_views_helper_1.EntityViewsHelper.currentEntityId;
         this.getViewInstances().set(this._entityId, this);
         let originalUpdate = this.update.bind(this);
@@ -55,9 +47,11 @@ class View extends attachment_target_1.AttachmentTarget {
             }
         };
     }
-    destroySelf() {
-        super.destroySelf();
-        this.getViewInstances().delete(this._entityId);
+    destroy() {
+        if (!this.destroyed) {
+            this.getViewInstances().delete(this._entityId);
+            super.destroy();
+        }
     }
     update(time, delta) { }
     getViewInstances() {
@@ -65,7 +59,4 @@ class View extends attachment_target_1.AttachmentTarget {
     }
 }
 exports.View = View;
-update_cycle_1.UpdateCycle.hardResetAction.subscribe(() => {
-    View['viewClassNames'].clear();
-});
 //# sourceMappingURL=view.js.map