bard-legends-framework 0.10.9 → 0.12.0

package/dist/actions-performance.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/actions-performance.test.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const actions_lib_1 = require("actions-lib");
+const helpers_lib_1 = require("helpers-lib");
+const vitest_1 = require("vitest");
+vitest_1.describe.skipIf(!process.env.MANUAL)('Performance Tests', () => {
+    (0, vitest_1.test)('lib test', async () => {
+        let sequence = actions_lib_1.SingleEvent.instant()
+            .read(() => { })
+            .attachToRoot();
+        sequence.destroy();
+    }, 60000);
+    (0, vitest_1.test)('instant single event', async () => {
+        await helpers_lib_1.UnitTestHelper.testPerformance(() => {
+            let sequence = actions_lib_1.SingleEvent.instant()
+                .read(() => { })
+                .attachToRoot();
+            sequence.destroy();
+        });
+        // sequence: 1.2411999702453613
+    }, 60000);
+    (0, vitest_1.test)('sequence instant', async () => {
+        await helpers_lib_1.UnitTestHelper.testPerformance(() => {
+            let sequence = actions_lib_1.Sequence.instant()
+                .read(() => { })
+                .attachToRoot();
+            sequence.destroy();
+        });
+        // 1.1551003456115723
+    }, 60000);
+    (0, vitest_1.test)('sequence 10x map and resolve', async () => {
+        await helpers_lib_1.UnitTestHelper.testPerformance(() => {
+            let resolve;
+            let sequence = actions_lib_1.Sequence.create(r => {
+                resolve = r;
+            });
+            sequence
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .attachToRoot();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            resolve();
+            sequence.destroy();
+        });
+        // 17.77519989013672
+    }, 60000);
+    (0, vitest_1.test)('sequence 10x map', async () => {
+        await helpers_lib_1.UnitTestHelper.testPerformance(() => {
+            let sequence = actions_lib_1.SingleEvent.create(resolve => resolve())
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .map(() => { })
+                .attachToRoot();
+            sequence.destroy();
+        });
+        // 3.063300132751465
+    }, 60000);
+});
+//# sourceMappingURL=actions-performance.test.js.map

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

@@ -1,8 +1,7 @@
 export declare class ControllerLink {
-    private controllers;
-    private registeredFunctionNames;
+    private _controllers;
+    private _registeredFunctionNames;
     trigger<T>(functionName: string, ...args: any[]): T;
-    private registerController;
 }
 export interface ControllerDecoratorMeta {
     controllerLink: ControllerLink;

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

@@ -4,11 +4,11 @@ exports.ControllerDecorator = exports.ControllerLink = void 0;
 const service_1 = require("../service/service");
 class ControllerLink {
     constructor() {
-        this.controllers = [];
-        this.registeredFunctionNames = [];
+        this._controllers = [];
+        this._registeredFunctionNames = [];
     }
     trigger(functionName, ...args) {
-        let correspondingController = this.controllers.find(controller => !!controller[functionName]);
+        let correspondingController = this._controllers.find(controller => !!controller[functionName]);
         if (!correspondingController) {
             throw new Error(`ServiceLink: no defined function with the name: "${functionName}", found in the linked controllers!`);
         }
@@ -16,30 +16,31 @@ class ControllerLink {
             return correspondingController[functionName](...args);
         }
     }
+    /** @internal */
     registerController(controller) {
         Reflect.ownKeys(controller.constructor.prototype)
             .filter(functionName => functionName !== 'constructor')
             .map(functionName => functionName.toString())
             .forEach(functionName => {
-            if (this.registeredFunctionNames.includes(functionName)) {
+            if (this._registeredFunctionNames.includes(functionName)) {
                 throw new Error(`ServiceLink: the function is already registered, function name: "${functionName}"`);
             }
             else {
-                this.registeredFunctionNames.push(functionName);
+                this._registeredFunctionNames.push(functionName);
             }
         });
-        this.controllers.push(controller);
+        this._controllers.push(controller);
     }
 }
 exports.ControllerLink = ControllerLink;
 function ControllerDecorator(meta) {
     return function (ControllerClass) {
-        let paramtypes = service_1.Service.getParametersMeta(ControllerClass);
+        let paramtypes = service_1.Service._getParametersMeta(ControllerClass);
         if (paramtypes.some(type => !type)) {
             console.error(`Circular dependency: ${ControllerClass.name}`);
         }
         else {
-            let resolvedArgs = service_1.Service.resolveParameters([], paramtypes);
+            let resolvedArgs = service_1.Service._resolveParameters([], paramtypes);
             let controller = new ControllerClass(...resolvedArgs);
             meta.controllerLink.registerController(controller);
         }

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

@@ -7,12 +7,12 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const vitest_1 = require("vitest");
+const hard_reset_1 = require("../hard-reset");
 const service_1 = require("../service/service");
-const update_cycle_1 = require("../update-cycle");
 const controller_1 = require("./controller");
 (0, vitest_1.describe)('CONTROLLER', () => {
     (0, vitest_1.beforeEach)(() => {
-        update_cycle_1.UpdateCycle.hardResetAction.trigger();
+        hard_reset_1.BardLegendsHardReset.hardReset();
     });
     (0, vitest_1.test)('when gateway triggers service link, it should trigger the controller function', () => {
         let sampleLink = new controller_1.ControllerLink();

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

@@ -1,13 +1,15 @@
-import { Attachable } from '../base/attachable';
-export type EntityClassType = new (...args: any[]) => Entity;
-export declare function EntityDecorator(): (EntityClass: EntityClassType) => any;
-export declare abstract class Entity extends Attachable {
-    static getInstanceById<T extends Entity>(this: new (...args: any[]) => T, entityId: string | undefined): T | undefined;
-    static getInstanceByIdOrFail<T extends Entity>(this: new (...args: any[]) => T, entityId: string): T;
-    static getEntities<T extends Entity>(this: new (...args: any[]) => T): T[];
-    private viewCreationHelper;
+import { Attachable, IDAttachable } from 'actions-lib';
+export type EntityClassType<T extends Entity = Entity> = (new (...args: any[]) => T) & {
+    id: number;
+};
+export declare function EntityDecorator(): <T extends Entity>(EntityClass: EntityClassType<T>) => any;
+export declare abstract class Entity extends IDAttachable {
+    static getInstanceByID<T extends Entity>(this: EntityClassType<T>, entityID: number | undefined): T | undefined;
+    static getInstanceByIDOrFail<T extends Entity>(this: EntityClassType<T>, entityID: number): T;
+    static getEntities<T extends Entity>(this: EntityClassType<T>): T[];
     constructor();
     destroy(): void;
-    attach(parent: Attachable | string): this;
+    attach(parent: Attachable): this;
+    attachByID(id: number): this;
     attachToRoot(): this;
 }

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = exports.EntityDecorator = void 0;
-const attachable_1 = require("../base/attachable");
+const actions_lib_1 = require("actions-lib");
 const update_cycle_1 = require("../update-cycle");
 const entity_store_helper_1 = require("./helpers/entity-store.helper");
 const entity_views_helper_1 = require("./helpers/entity-views.helper");
@@ -14,16 +14,16 @@ function EntityDecorator() {
     };
 }
 exports.EntityDecorator = EntityDecorator;
-class Entity extends attachable_1.Attachable {
-    static getInstanceById(entityId) {
-        if (entityId) {
-            return entity_store_helper_1.EntityStoreHelper.getIdToEntityMap(this).get(entityId);
+class Entity extends actions_lib_1.IDAttachable {
+    static getInstanceByID(entityID) {
+        if (entityID) {
+            return entity_store_helper_1.EntityStoreHelper.getEntity(this, entityID);
         }
     }
-    static getInstanceByIdOrFail(entityId) {
-        let entity = entity_store_helper_1.EntityStoreHelper.getIdToEntityMap(this).get(entityId);
+    static getInstanceByIDOrFail(entityID) {
+        let entity = entity_store_helper_1.EntityStoreHelper.getEntity(this, entityID);
         if (!entity) {
-            throw new Error(`Entity: entity is not found! Name: "${this.name}", id: "${entityId}"`);
+            throw new Error(`Entity: entity is not found! Name: "${this.name}", id: "${entityID}"`);
         }
         return entity;
     }
@@ -32,34 +32,38 @@ class Entity extends attachable_1.Attachable {
     }
     constructor() {
         super();
-        this.viewCreationHelper = new entity_views_helper_1.EntityViewsHelper(this);
+        /** @internal */
+        this._viewCreationHelper = new entity_views_helper_1.EntityViewsHelper(this);
         entity_store_helper_1.EntityStoreHelper.registerEntity(this);
         update_cycle_1.UpdateCycle.sceneUpdateAction
             .subscribe(updateData => {
             if (!this.destroyed) {
                 this.update(updateData.time, updateData.delta);
-                this.viewCreationHelper.updateViews(updateData.time, updateData.delta);
+                this._viewCreationHelper.updateViews(updateData.time, updateData.delta);
             }
         })
             .attach(this);
     }
     destroy() {
         if (!this.destroyed) {
-            this.viewCreationHelper.destroyViews();
-            entity_store_helper_1.EntityStoreHelper.unregisterEntity(this.constructor.name, this.id);
+            this._viewCreationHelper.destroyViews();
+            entity_store_helper_1.EntityStoreHelper.unregisterEntity(this.constructor, this.id);
             super.destroy();
         }
     }
-    // make the destroy function non-internal
     attach(parent) {
         super.attach(parent);
-        this.viewCreationHelper.createViews();
+        this._viewCreationHelper.createViews();
+        return this;
+    }
+    attachByID(id) {
+        super.attachByID(id);
+        this._viewCreationHelper.createViews();
         return this;
     }
-    // make the destroy function non-internal
     attachToRoot() {
         super.attachToRoot();
-        this.viewCreationHelper.createViews();
+        this._viewCreationHelper.createViews();
         return this;
     }
     /** @internal */

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

@@ -1,137 +1,38 @@
 "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 actions_lib_1 = require("actions-lib");
 const vitest_1 = require("vitest");
-const decorate_actions_lib_1 = require("../base/helpers/decorate-actions-lib");
+const hard_reset_1 = require("../hard-reset");
 const scene_1 = require("../scene/scene");
 const update_cycle_1 = require("../update-cycle");
 const view_1 = require("../view/view");
 const entity_1 = require("./entity");
-decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
 (0, vitest_1.describe)('ENTITY', () => {
     (0, vitest_1.beforeEach)(() => {
-        update_cycle_1.UpdateCycle.hardResetAction.trigger();
+        hard_reset_1.BardLegendsHardReset.hardReset();
         let SampleScene = class SampleScene extends scene_1.Scene {
-            async init() { }
+            init() {
+                return actions_lib_1.SingleEvent.instant();
+            }
             update() { }
-            async prepareToClose() { }
+            prepareToClose() {
+                return actions_lib_1.SingleEvent.instant();
+            }
         };
         SampleScene = __decorate([
             (0, scene_1.SceneDecorator)()
         ], SampleScene);
         SampleScene.open();
     });
-    (0, vitest_1.test)('entities should have ids', () => {
-        let Sample = class Sample extends entity_1.Entity {
-        };
-        Sample = __decorate([
-            (0, entity_1.EntityDecorator)()
-        ], Sample);
-        let sample = new Sample().attach(scene_1.Scene.getActiveSceneOrFail());
-        (0, vitest_1.expect)(sample.id).toBeDefined();
-    });
-    (0, vitest_1.test)('entities ids should be unique', () => {
-        let BaseEntity = class BaseEntity extends entity_1.Entity {
-        };
-        BaseEntity = __decorate([
-            (0, entity_1.EntityDecorator)()
-        ], BaseEntity);
-        let baseEntity = new BaseEntity().attach(scene_1.Scene.getActiveSceneOrFail());
-        let Sample = class Sample extends entity_1.Entity {
-        };
-        Sample = __decorate([
-            (0, entity_1.EntityDecorator)()
-        ], Sample);
-        let sample1 = new Sample().attach(baseEntity);
-        let sample2 = new Sample().attach(baseEntity);
-        (0, vitest_1.expect)(sample1.id !== sample2.id).toBeTruthy();
-    });
-    (0, vitest_1.test)('class names should be unique', () => {
-        (0, vitest_1.expect)(() => {
-            {
-                let _Sample = class _Sample extends entity_1.Entity {
-                };
-                _Sample = __decorate([
-                    (0, entity_1.EntityDecorator)()
-                ], _Sample);
-            }
-            {
-                let _Sample = class _Sample extends entity_1.Entity {
-                };
-                _Sample = __decorate([
-                    (0, entity_1.EntityDecorator)()
-                ], _Sample);
-            }
-        }).toThrow();
-    });
-    (0, vitest_1.test)('attach', async () => {
-        var Child_1;
-        let Parent = class Parent extends entity_1.Entity {
-        };
-        Parent = __decorate([
-            (0, entity_1.EntityDecorator)()
-        ], Parent);
-        let Child = class Child extends entity_1.Entity {
-            static { Child_1 = this; }
-            static { this.destroyCalled = false; }
-            destroy() {
-                if (!this.destroyed) {
-                    Child_1.destroyCalled = true;
-                    super.destroy();
-                }
-            }
-        };
-        Child = Child_1 = __decorate([
-            (0, entity_1.EntityDecorator)()
-        ], Child);
-        let parent = new Parent().attach(scene_1.Scene.getActiveSceneOrFail());
-        new Child().attach(parent);
-        parent.destroy();
-        await update_cycle_1.UpdateCycle.triggerUpdateTick(1); // Update cycle should take place to destroy functions to be called
-        (0, vitest_1.expect)(Child.destroyCalled).toBeTruthy();
-    });
-    (0, vitest_1.test)('decorator should not effect static variables', () => {
-        let Sample = class Sample extends entity_1.Entity {
-            static { this.test = 'test'; }
-        };
-        Sample = __decorate([
-            (0, entity_1.EntityDecorator)()
-        ], Sample);
-        (0, vitest_1.expect)(Sample.test).toEqual('test');
-    });
     (0, vitest_1.test)('get entity by id basic sample', () => {
         let Sample = class Sample extends entity_1.Entity {
         };
@@ -139,35 +40,45 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             (0, entity_1.EntityDecorator)()
         ], Sample);
         let sample = new Sample().attach(scene_1.Scene.getActiveSceneOrFail());
-        (0, vitest_1.expect)(Sample.getInstanceById(sample.id)).toEqual(sample);
+        (0, vitest_1.expect)(Sample.getInstanceByID(sample.id)).toEqual(sample);
     });
     (0, vitest_1.test)('get entity by id or fail should return error', () => {
         let Sample1 = class Sample1 extends entity_1.Entity {
+            constructor(foo) {
+                super();
+                this.foo = foo;
+            }
         };
         Sample1 = __decorate([
-            (0, entity_1.EntityDecorator)()
+            (0, entity_1.EntityDecorator)(),
+            __metadata("design:paramtypes", [String])
         ], Sample1);
         let Sample2 = class Sample2 extends entity_1.Entity {
+            constructor(foo) {
+                super();
+                this.foo = foo;
+            }
         };
         Sample2 = __decorate([
-            (0, entity_1.EntityDecorator)()
+            (0, entity_1.EntityDecorator)(),
+            __metadata("design:paramtypes", [String])
         ], Sample2);
-        let sample1 = new Sample1().attach(scene_1.Scene.getActiveSceneOrFail());
-        new Sample2().attach(sample1);
-        (0, vitest_1.expect)(() => Sample2.getInstanceByIdOrFail(sample1.id)).toThrow();
-        (0, vitest_1.expect)(() => Sample2.getInstanceByIdOrFail('notValidId')).toThrow();
+        // Foo is added to see that there should not be type complaining about the constructor parameters
+        let sample1 = new Sample1('foo').attach(scene_1.Scene.getActiveSceneOrFail());
+        new Sample2('foo').attach(sample1);
+        (0, vitest_1.expect)(() => Sample2.getInstanceByIDOrFail(sample1.id)).toThrow();
+        (0, vitest_1.expect)(() => Sample2.getInstanceByIDOrFail(-1)).toThrow();
     });
-    (0, vitest_1.test)('destroyed entities should not be reached by getInstanceById', async () => {
+    (0, vitest_1.test)('destroyed entities should not be reached by getInstanceByID', () => {
         let Sample = class Sample extends entity_1.Entity {
         };
         Sample = __decorate([
             (0, entity_1.EntityDecorator)()
         ], Sample);
         let sample = new Sample().attach(scene_1.Scene.getActiveSceneOrFail());
-        (0, vitest_1.expect)(Sample.getInstanceById(sample.id)).toBeDefined();
+        (0, vitest_1.expect)(Sample.getInstanceByID(sample.id)).toBeDefined();
         sample.destroy();
-        await update_cycle_1.UpdateCycle.triggerUpdateTick(1); // Update cycle should take place to destroy functions to be called
-        (0, vitest_1.expect)(Sample.getInstanceById(sample.id)).toBeUndefined();
+        (0, vitest_1.expect)(Sample.getInstanceByID(sample.id)).toBeUndefined();
     });
     (0, vitest_1.test)('select entities', () => {
         let BaseEntity = class BaseEntity extends entity_1.Entity {
@@ -185,25 +96,77 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         let sample2 = new Sample().attach(baseEntity);
         (0, vitest_1.expect)(Sample.getEntities()).toEqual([sample1, sample2]);
     });
-    (0, vitest_1.test)('lifecycle events', async () => {
-        scene_1.Scene.activeScene.set(undefined);
+    (0, vitest_1.test)('decorator should not complain aboutentity with constructor parameters', () => {
+        let _Sample = class _Sample extends entity_1.Entity {
+            constructor(foo) {
+                super();
+                this.foo = foo;
+            }
+        };
+        _Sample = __decorate([
+            (0, entity_1.EntityDecorator)(),
+            __metadata("design:paramtypes", [String])
+        ], _Sample);
+    });
+    (0, vitest_1.test)('if entity get destroyed, the update should not be called', () => {
+        scene_1.Scene['_activeScene'].set(undefined);
+        let updateCount = 0;
+        let entity;
+        let _SampleScene = class _SampleScene extends scene_1.Scene {
+            init() {
+                return actions_lib_1.SingleEvent.instant();
+            }
+            update() {
+                if (entity) {
+                    entity.destroy();
+                    entity = undefined;
+                }
+            }
+            prepareToClose() {
+                return actions_lib_1.SingleEvent.instant();
+            }
+        };
+        _SampleScene = __decorate([
+            (0, scene_1.SceneDecorator)()
+        ], _SampleScene);
+        let Sample = class Sample extends entity_1.Entity {
+            update() {
+                updateCount++;
+            }
+        };
+        Sample = __decorate([
+            (0, entity_1.EntityDecorator)()
+        ], Sample);
+        _SampleScene.open();
+        (0, vitest_1.expect)(scene_1.Scene.getActiveScene()).toEqual(_SampleScene.getInstance());
+        (0, vitest_1.expect)(scene_1.Scene.getActiveScene()).toBeDefined();
+        entity = new Sample().attach(scene_1.Scene.getActiveSceneOrFail());
+        (0, vitest_1.expect)(updateCount).toEqual(0);
+        update_cycle_1.UpdateCycle.triggerUpdateTick(1);
+        (0, vitest_1.expect)(updateCount).toEqual(0);
+    });
+    (0, vitest_1.test)('lifecycle events', () => {
+        scene_1.Scene['_activeScene'].set(undefined);
         let callStack = [];
         let SampleScene = class SampleScene extends scene_1.Scene {
             constructor() {
                 super();
                 callStack.push('scene constructor');
-                this.onDestroy
-                    .subscribe(() => {
+                this.onDestroy()
+                    .tap(() => {
                     callStack.push('scene destroy');
                 })
-                    .attach(this);
+                    .attachToRoot();
+            }
+            init() {
+                return actions_lib_1.SingleEvent.instant();
             }
-            async init() { }
             update() {
                 callStack.push('scene update');
             }
-            async prepareToClose() {
+            prepareToClose() {
                 callStack.push('scene prepare to close');
+                return actions_lib_1.SingleEvent.instant();
             }
         };
         SampleScene = __decorate([
@@ -211,9 +174,13 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             __metadata("design:paramtypes", [])
         ], SampleScene);
         let OtherScene = class OtherScene extends scene_1.Scene {
-            async init() { }
+            init() {
+                return actions_lib_1.SingleEvent.instant();
+            }
             update() { }
-            async prepareToClose() { }
+            prepareToClose() {
+                return actions_lib_1.SingleEvent.instant();
+            }
         };
         OtherScene = __decorate([
             (0, scene_1.SceneDecorator)()
@@ -222,12 +189,11 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             constructor() {
                 super();
                 callStack.push('entity constructor');
-                this.onDestroy
-                    .subscribe(() => {
-                    console.log('entity destroy');
+                this.onDestroy()
+                    .tap(() => {
                     callStack.push('entity destroy');
                 })
-                    .attach(this);
+                    .attachToRoot();
             }
             update() {
                 callStack.push('entity update');
@@ -238,14 +204,14 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             __metadata("design:paramtypes", [])
         ], Sample);
         let _SampleView = class _SampleView extends view_1.View {
-            constructor(entity) {
+            constructor(_) {
                 super();
                 callStack.push('view constructor');
-                this.onDestroy
-                    .subscribe(() => {
+                this.onDestroy()
+                    .tap(() => {
                     callStack.push('view destroy');
                 })
-                    .attach(this);
+                    .attachToRoot();
             }
             update() {
                 callStack.push('view update');
@@ -255,17 +221,19 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             (0, view_1.ViewDecorator)({ entity: Sample }),
             __metadata("design:paramtypes", [Sample])
         ], _SampleView);
-        SampleScene.open();
-        await (0, helpers_lib_1.Wait)(); // Wait for the async scene open to be done
-        await update_cycle_1.UpdateCycle.triggerUpdateTick(1);
-        new Sample().attach(SampleScene.getInstanceOrFail());
-        await (0, helpers_lib_1.Wait)(); // Wait for the async view init to expect the update call
-        await update_cycle_1.UpdateCycle.triggerUpdateTick(1);
-        SampleScene.getInstanceOrFail().close();
-        await (0, helpers_lib_1.Wait)(); // Wait for the async scene close to be done
-        OtherScene.open();
-        await (0, helpers_lib_1.Wait)(); // Wait for the async scene open to be done
-        await update_cycle_1.UpdateCycle.triggerUpdateTick(1); // Update cycle should take place to destroy functions to be called
+        let finalized = false;
+        SampleScene.open()
+            .asyncMap(() => {
+            update_cycle_1.UpdateCycle.triggerUpdateTick(1);
+            new Sample().attach(SampleScene.getInstanceOrFail());
+            update_cycle_1.UpdateCycle.triggerUpdateTick(1);
+            return SampleScene.getInstanceOrFail().close();
+        })
+            .asyncMap(() => OtherScene.open())
+            .tap(() => {
+            finalized = true;
+        })
+            .attachToRoot();
         (0, vitest_1.expect)(callStack).toEqual([
             'scene constructor',
             'scene update',
@@ -279,6 +247,7 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             'entity destroy',
             'scene destroy'
         ]);
+        (0, vitest_1.expect)(finalized).toBeTruthy();
     });
 });
 //# sourceMappingURL=entity.test.js.map