bard-legends-framework 0.10.1 → 0.10.3

package/dist/game-entities/base/destroyable.d.ts

@@ -12,6 +12,6 @@ export declare abstract class Destroyable {
     protected afterDestroy(): void;
     protected destroySelf(): void;
     attach(parent: IAttachable | string): this;
-    skipAttachCheck(): this;
+    attachToRoot(): this;
     protected destroyAttachment(object: CanBeAttached): void;
 }

package/dist/game-entities/base/destroyable.js

@@ -50,7 +50,7 @@ class Destroyable {
         }
         return this;
     }
-    skipAttachCheck() {
+    attachToRoot() {
         if (this._attachIsCalled) {
             throw new Error(`Destroyable: The object is already attached to something!`);
         }

package/dist/game-entities/base/helpers/decorate-actions-lib.d.ts

@@ -2,12 +2,12 @@ import { Attachable } from '../attachable';
 declare module 'actions-lib' {
     interface ActionSubscription {
         attach(parent: Attachable | string): ActionSubscription;
-        skipAttachCheck(): ActionSubscription;
+        attachToRoot(): ActionSubscription;
         decorateActionSubscription(): ActionSubscription;
     }
     interface ReducerEffectChannel<EffectType, ResponseType> {
         attach(parent: Attachable | string): ReducerEffectChannel<EffectType, ResponseType>;
-        skipAttachCheck(): ReducerEffectChannel<EffectType, ResponseType>;
+        attachToRoot(): ReducerEffectChannel<EffectType, ResponseType>;
         decorateEffectChannel(): ReducerEffectChannel<EffectType, ResponseType>;
     }
 }

package/dist/game-entities/base/helpers/decorate-actions-lib.js

@@ -43,7 +43,7 @@ class ActionsLibDecorator {
             this.$meta = { attachIsCalled: true, attachedParent: parentEntity };
             return this;
         };
-        actionsLib.ActionSubscription.prototype.skipAttachCheck = function () {
+        actionsLib.ActionSubscription.prototype.attachToRoot = function () {
             this.$meta = { attachIsCalled: true };
             return this;
         };
@@ -57,7 +57,7 @@ class ActionsLibDecorator {
         };
         let originalCombine = actionsLib.ActionSubscription.combine;
         actionsLib.ActionSubscription.combine = function (subscriptions) {
-            subscriptions.forEach(subscription => subscription.skipAttachCheck());
+            subscriptions.forEach(subscription => subscription.attachToRoot());
             return originalCombine(subscriptions);
         };
         actionsLib.ReducerEffectChannel.prototype.attach = function (parent) {
@@ -66,7 +66,7 @@ class ActionsLibDecorator {
             this.$meta = { attachIsCalled: true, attachedParent: parentEntity };
             return this;
         };
-        actionsLib.ReducerEffectChannel.prototype.skipAttachCheck = function () {
+        actionsLib.ReducerEffectChannel.prototype.attachToRoot = function () {
             this.$meta = { attachIsCalled: true };
             return this;
         };

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

@@ -1,12 +1,6 @@
 import { Attachable } from '../base/attachable';
 export type EntityClassType = new (...args: any[]) => Entity;
-/**
- * @param destroyOnSceneClose - Default: true. If true, the entity will be destroyed when the scene is closed.
- */
-export interface EntityDecoratorMeta {
-    destroyOnSceneClose: boolean;
-}
-export declare function EntityDecorator(meta?: EntityDecoratorMeta): (EntityClass: EntityClassType) => any;
+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;
@@ -15,7 +9,6 @@ export declare abstract class Entity extends Attachable {
     constructor();
     protected destroySelf(): void;
     attach(parent: Attachable | string): this;
-    skipAttachCheck(): this;
+    attachToRoot(): this;
     update(time: number, delta: number): void;
-    private updateTick;
 }

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

@@ -2,14 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Entity = exports.EntityDecorator = void 0;
 const attachable_1 = require("../base/attachable");
-const scene_1 = require("../scene/scene");
+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");
-function EntityDecorator(meta) {
+function EntityDecorator() {
     return function (EntityClass) {
         EntityClass.$meta = {
-            type: 'entity',
-            destroyOnSceneClose: meta?.destroyOnSceneClose ?? true
+            type: 'entity'
         };
         entity_store_helper_1.EntityStoreHelper.registerEntityClass(EntityClass);
     };
@@ -34,19 +33,19 @@ class Entity extends attachable_1.Attachable {
     constructor() {
         super();
         this.viewCreationHelper = new entity_views_helper_1.EntityViewsHelper(this);
-        let destroyOnSceneClose = this.constructor.$meta.destroyOnSceneClose;
-        if (destroyOnSceneClose) {
-            scene_1.Scene['registerEntity'](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);
+            }
+        })
+            .attach(this);
     }
     destroySelf() {
         super.destroySelf();
         this.viewCreationHelper.destroyViews();
-        let destroyOnSceneClose = this.constructor.$meta.destroyOnSceneClose;
-        if (destroyOnSceneClose) {
-            scene_1.Scene['unregisterEntity'](this);
-        }
         entity_store_helper_1.EntityStoreHelper.unregisterEntity(this.constructor.name, this.id);
     }
     attach(parent) {
@@ -54,19 +53,12 @@ class Entity extends attachable_1.Attachable {
         this.viewCreationHelper.createViews();
         return this;
     }
-    skipAttachCheck() {
-        super.skipAttachCheck();
+    attachToRoot() {
+        super.attachToRoot();
         this.viewCreationHelper.createViews();
         return this;
     }
     update(time, delta) { }
-    // Triggered by Scene
-    updateTick(time, delta) {
-        if (!this.destroyed) {
-            this.update(time, delta);
-            this.viewCreationHelper.updateViews(time, delta);
-        }
-    }
 }
 exports.Entity = Entity;
 //# sourceMappingURL=entity.js.map

package/dist/game-entities/entity/helpers/entity-views.helper.d.ts

@@ -3,6 +3,7 @@ import { Entity, EntityClassType } from '../entity';
 export declare class EntityViewsHelper {
     private entity;
     private static viewRegistries;
+    static currentEntityId: string;
     static registerView<T>(ViewClass: ViewClassType<T>, EntityClass: EntityClassType): void;
     private static createView;
     private views;

package/dist/game-entities/entity/helpers/entity-views.helper.js

@@ -18,19 +18,17 @@ class EntityViewsHelper {
         });
     }
     static createView(entity, ViewClass) {
-        let timeout = setTimeout(() => {
-            console.warn(`View - createView: view init is taking too long! entity: "${ViewClass.name}"`);
-        }, 1000);
         try {
             let resolvedViewArgs = service_1.Service.resolveParameters([this], ViewClass.$meta.paramtypes);
+            EntityViewsHelper.currentEntityId = entity.id;
             let view = new ViewClass(entity, ...resolvedViewArgs.slice(1));
-            view['_entityId'] = entity.id;
-            view['_entityIsDestroyed'] = false;
-            view['init']().then(() => {
-                clearTimeout(timeout);
-                view['afterInit']();
-            });
-            entity['viewCreationHelper'].views.push(view);
+            if (entity.destroyed) {
+                // Created view might destroy its entity in constructor, which should also destroy the view
+                view.destroy();
+            }
+            else {
+                entity['viewCreationHelper'].views.push(view);
+            }
         }
         catch (e) {
             console.error(e);
@@ -57,7 +55,6 @@ class EntityViewsHelper {
     }
     destroyViews() {
         this.views.forEach(view => {
-            view['_entityIsDestroyed'] = true;
             view.destroy();
         });
     }

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

@@ -26,7 +26,7 @@ class SingletonEntity extends entity_1.Entity {
                         resolve(createdEntity);
                     }
                 })
-                    .skipAttachCheck();
+                    .attachToRoot();
             });
         }
     }
@@ -51,7 +51,7 @@ class SingletonEntity extends entity_1.Entity {
                             subscribe();
                         }
                     })
-                        .skipAttachCheck();
+                        .attachToRoot();
                 }
             });
         };
@@ -66,7 +66,7 @@ class SingletonEntity extends entity_1.Entity {
         super();
         let entities = this.constructor.getEntities();
         if (entities.length > 1) {
-            this.skipAttachCheck();
+            this.attachToRoot();
             throw new Error(`SingletonEntity: entity is decorated as singleton but multiple instances are created! Name: "${this.constructor.name}"`);
         }
         else {

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

@@ -9,12 +9,8 @@ export declare abstract class Scene<InputType> extends Attachable {
     static isActive<T extends Scene<any>>(this: new (...args: any[]) => T): boolean;
     static getInstance<T extends Scene<any>>(this: new (...args: any[]) => T): T | undefined;
     static getInstanceOrFail<T extends Scene<any>>(this: new (...args: any[]) => T): T;
-    private static registerEntity;
-    private static unregisterEntity;
     static open<InputType>(this: new (...args: any[]) => Scene<InputType>, input: InputType): Promise<void>;
     static close(): Promise<void>;
-    private entities;
-    private updateSubscription;
     constructor();
     protected destroySelf(): void;
     protected init(input: InputType): Promise<void>;

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

@@ -40,18 +40,6 @@ class Scene extends attachable_1.Attachable {
         }
         return Scene.sceneInstance;
     }
-    static registerEntity(entity) {
-        if (!Scene.activeScene) {
-            throw new Error(`Scene: registerEntity is called when there is no active scene!`);
-        }
-        Scene.activeScene.entities.add(entity);
-    }
-    static unregisterEntity(entity) {
-        if (!Scene.activeScene) {
-            throw new Error(`Scene: unregisterEntity is called when there is no active scene!`);
-        }
-        Scene.activeScene.entities.delete(entity);
-    }
     static async open(input) {
         if (!Scene.sceneTransitioning) {
             Scene.sceneTransitioning = true;
@@ -76,22 +64,17 @@ class Scene extends attachable_1.Attachable {
     }
     constructor() {
         super();
-        this.entities = new Set();
-        this.skipAttachCheck(); // Scene is always attached to itself
-        this.updateSubscription = update_cycle_1.UpdateCycle.sceneUpdateAction
+        this.attachToRoot(); // Scene is always attached to itself
+        update_cycle_1.UpdateCycle.sceneUpdateAction
             .subscribe(updateData => {
             if (!this.destroyed) {
                 this.update(updateData.time, updateData.delta);
-                this.entities.forEach(entity => entity['updateTick'](updateData.time, updateData.delta));
             }
         })
             .attach(this);
     }
     destroySelf() {
         super.destroySelf();
-        this.updateSubscription.unsubscribe();
-        this.entities.forEach(entity => entity.destroy());
-        this.entities = new Set();
     }
     async init(input) { }
     update(time, delta) { }

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

@@ -18,7 +18,7 @@ class UpdateCycle {
                     resolve();
                 }
             })
-                .skipAttachCheck();
+                .attachToRoot();
         });
     }
     static registerUpdateModifier(callback) {

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

@@ -7,17 +7,12 @@ export interface ViewDecoratorMeta<EntityType> {
 export declare function ViewDecorator<EntityType extends Entity>(meta: ViewDecoratorMeta<EntityType>): (ViewClass: ViewClassType<EntityType>) => any;
 export declare abstract class View extends Attachable {
     private static viewClassNames;
-    static getInstanceSync<T extends View>(this: new (...args: any[]) => T, entityId: string): T | undefined;
-    static getInstance<T extends View>(this: new (...args: any[]) => T, entityId: string): Promise<T | undefined>;
-    static getInstanceOrFail<T extends View>(this: new (...args: any[]) => T, entityId: string): Promise<T>;
+    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;
     protected childUpdate: (time: number, delta: number) => void;
-    private created;
-    private viewsCreated;
     private _entityId;
-    private _entityIsDestroyed;
     constructor();
     protected destroySelf(): void;
-    protected init(): Promise<void>;
     update(time: number, delta: number): void;
-    protected afterInit(): void;
+    private getViewInstances;
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.View = exports.ViewDecorator = void 0;
-const actions_lib_1 = require("actions-lib");
 const attachable_1 = require("../base/attachable");
 const entity_views_helper_1 = require("../entity/helpers/entity-views.helper");
 const service_1 = require("../service/service");
@@ -16,7 +15,7 @@ function ViewDecorator(meta) {
         }
         ViewClass.$meta = {
             paramtypes: service_1.Service.getParametersMeta(ViewClass),
-            viewsCreated: new actions_lib_1.ObservableMap(),
+            viewInstances: new Map(),
             entityName: meta.entity.name,
             type: 'view'
         };
@@ -26,81 +25,43 @@ function ViewDecorator(meta) {
 exports.ViewDecorator = ViewDecorator;
 class View extends attachable_1.Attachable {
     static { this.viewClassNames = new Set(); }
-    static getInstanceSync(entityId) {
+    static getInstance(entityId) {
         if (entityId.substring(0, entityId.indexOf(':')) !== this.$meta.entityName) {
             return undefined;
         }
-        let observableMap = this.$meta.viewsCreated;
-        return observableMap.get(entityId);
+        let viewInstances = this.$meta.viewInstances;
+        return viewInstances.get(entityId);
     }
-    static async getInstance(entityId) {
-        return new Promise(resolve => {
-            let timeout = setTimeout(() => {
-                resolve(undefined);
-            }, 1000);
-            if (entityId.substring(0, entityId.indexOf(':')) !== this.$meta.entityName) {
-                clearTimeout(timeout);
-                resolve(undefined);
-            }
-            let observableMap = this.$meta.viewsCreated;
-            observableMap.waitUntilAddedSync(entityId, response => {
-                clearTimeout(timeout);
-                if (response._entityIsDestroyed) {
-                    resolve(undefined);
-                }
-                else {
-                    resolve(response);
-                }
-            });
-        });
-    }
-    static async getInstanceOrFail(entityId) {
-        let timeout = setTimeout(() => {
-            console.warn(`View: getInstance is taking too long! View: ${View.name}, entityId: "${entityId}"`);
-        }, 1000);
+    static getInstanceOrFail(entityId) {
         if (entityId.substring(0, entityId.indexOf(':')) !== this.$meta.entityName) {
-            clearTimeout(timeout);
             throw new Error(`View: getInstance is called with entity id: "${entityId}", that is not belonging to the class: "${this.$meta.entityName}"`);
         }
-        return new Promise((resolve, reject) => {
-            let observableMap = this.$meta.viewsCreated;
-            observableMap.waitUntilAddedSync(entityId, response => {
-                clearTimeout(timeout);
-                if (response._entityIsDestroyed) {
-                    reject(new Error(`View: getInstanceOrFail is called with destroyed entity id: "${entityId}". Consider using getInstance instead.`));
-                }
-                else {
-                    resolve(response);
-                }
-            });
-        });
+        let viewInstances = this.$meta.viewInstances;
+        let view = viewInstances.get(entityId);
+        if (!view) {
+            throw new Error(`View: getInstanceOrFail is called with entity id: "${entityId}", that is not found!`);
+        }
+        return view;
     }
     constructor() {
         super();
         this.childUpdate = this.update.bind(this);
-        this.created = false;
-        this.skipAttachCheck(); // View is always attached to its entity
-        this.viewsCreated = this.constructor.$meta.viewsCreated;
+        this.attachToRoot(); // View is always attached to its entity
+        this._entityId = entity_views_helper_1.EntityViewsHelper.currentEntityId;
+        this.getViewInstances().set(this._entityId, this);
         this.update = function (time, delta) {
-            if (!this.destroyed && this.created) {
+            if (!this.destroyed) {
                 this.childUpdate(time, delta);
             }
         };
     }
     destroySelf() {
         super.destroySelf();
-        this.viewsCreated.remove(this._entityId);
+        this.getViewInstances().delete(this._entityId);
     }
-    async init() { }
     update(time, delta) { }
-    // Called by view-creation.helper.ts
-    afterInit() {
-        this.created = true;
-        let observableMap = this.constructor.$meta.viewsCreated;
-        observableMap.set(this._entityId, this);
-        if (this.destroyed) {
-            this.viewsCreated.remove(this._entityId);
-        }
+    getViewInstances() {
+        return this.constructor.$meta.viewInstances;
     }
 }
 exports.View = View;