bard-legends-framework 0.10.8 → 0.10.9

package/dist/game-entities/base/helpers/attachable.store.test.js

@@ -0,0 +1,234 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const vitest_1 = require("vitest");
+const attachable_1 = require("../attachable");
+const attachable_store_1 = require("./attachable.store");
+(0, vitest_1.describe)('AttachableStore', () => {
+    (0, vitest_1.beforeEach)(() => {
+        attachable_store_1.AttachableStore.hardReset();
+    });
+    (0, vitest_1.describe)('registerAttachmentTarget', () => {
+        (0, vitest_1.test)('generates unique id for single instance', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance = new TestClass().attachToRoot();
+            let id = instance.id;
+            (0, vitest_1.expect)(id).toBe('1:1');
+        });
+        (0, vitest_1.test)('generates sequential ids for multiple instances of same class', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance1 = new TestClass().attachToRoot();
+            let instance2 = new TestClass().attachToRoot();
+            let instance3 = new TestClass().attachToRoot();
+            (0, vitest_1.expect)([instance1.id, instance2.id, instance3.id]).toEqual(['1:1', '1:2', '1:3']);
+        });
+        (0, vitest_1.test)('generates different class ids for different classes', () => {
+            class TestClass1 extends attachable_1.Attachable {
+            }
+            class TestClass2 extends attachable_1.Attachable {
+            }
+            let instance1 = new TestClass1().attachToRoot();
+            let instance2 = new TestClass2().attachToRoot();
+            (0, vitest_1.expect)(instance1.id).toBe('1:1');
+            (0, vitest_1.expect)(instance2.id).toBe('2:1');
+        });
+        (0, vitest_1.test)('maintains separate numbering for different classes', () => {
+            class TestClass1 extends attachable_1.Attachable {
+            }
+            class TestClass2 extends attachable_1.Attachable {
+            }
+            let instance1a = new TestClass1().attachToRoot();
+            let instance2a = new TestClass2().attachToRoot();
+            let instance1b = new TestClass1().attachToRoot();
+            let instance2b = new TestClass2().attachToRoot();
+            (0, vitest_1.expect)([instance1a.id, instance2a.id, instance1b.id, instance2b.id]).toEqual(['1:1', '2:1', '1:2', '2:2']);
+        });
+    });
+    (0, vitest_1.describe)('findAttachmentTarget', () => {
+        (0, vitest_1.test)('finds registered attachable by string id', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance = new TestClass().attachToRoot();
+            let found = attachable_store_1.AttachableStore.findAttachmentTarget(instance.id);
+            (0, vitest_1.expect)(found).toBe(instance);
+        });
+        (0, vitest_1.test)('returns same object when passed an Attachable instance', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance = new TestClass().attachToRoot();
+            let found = attachable_store_1.AttachableStore.findAttachmentTarget(instance);
+            (0, vitest_1.expect)(found).toBe(instance);
+        });
+        (0, vitest_1.test)('throws error for non-existent id', () => {
+            (0, vitest_1.expect)(() => {
+                attachable_store_1.AttachableStore.findAttachmentTarget('999:999');
+            }).toThrow('Attachable: attachable not found by id! id: 999:999');
+        });
+        (0, vitest_1.test)('throws error for empty string id', () => {
+            (0, vitest_1.expect)(() => {
+                attachable_store_1.AttachableStore.findAttachmentTarget('');
+            }).toThrow('Attachable: attachable not found by id! id: ');
+        });
+    });
+    (0, vitest_1.describe)('unregisterAttachmentTarget', () => {
+        (0, vitest_1.test)('removes attachable from store', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance = new TestClass().attachToRoot();
+            let id = instance.id;
+            attachable_store_1.AttachableStore.unregisterAttachmentTarget(instance);
+            (0, vitest_1.expect)(() => {
+                attachable_store_1.AttachableStore.findAttachmentTarget(id);
+            }).toThrow(`Attachable: attachable not found by id! id: ${id}`);
+        });
+        (0, vitest_1.test)('allows reusing id after unregister and hardReset', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance1 = new TestClass().attachToRoot();
+            let firstId = instance1.id;
+            attachable_store_1.AttachableStore.unregisterAttachmentTarget(instance1);
+            attachable_store_1.AttachableStore.hardReset();
+            let instance2 = new TestClass().attachToRoot();
+            let secondId = instance2.id;
+            (0, vitest_1.expect)(secondId).toBe(firstId);
+        });
+    });
+    (0, vitest_1.describe)('validateIdForClass', () => {
+        (0, vitest_1.test)('returns true for matching class', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance = new TestClass().attachToRoot();
+            let isValid = attachable_store_1.AttachableStore.validateIdForClass(instance.id, TestClass);
+            (0, vitest_1.expect)(isValid).toBe(true);
+        });
+        (0, vitest_1.test)('returns false for non-matching class', () => {
+            class TestClass1 extends attachable_1.Attachable {
+            }
+            class TestClass2 extends attachable_1.Attachable {
+            }
+            let instance = new TestClass1().attachToRoot();
+            let isValid = attachable_store_1.AttachableStore.validateIdForClass(instance.id, TestClass2);
+            (0, vitest_1.expect)(isValid).toBe(false);
+        });
+        (0, vitest_1.test)('returns false for non-existent id', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let isValid = attachable_store_1.AttachableStore.validateIdForClass('999:999', TestClass);
+            (0, vitest_1.expect)(isValid).toBe(false);
+        });
+        (0, vitest_1.test)('validates correctly for derived classes', () => {
+            class BaseClass extends attachable_1.Attachable {
+            }
+            class DerivedClass extends BaseClass {
+            }
+            let instance = new DerivedClass().attachToRoot();
+            let isValidForDerived = attachable_store_1.AttachableStore.validateIdForClass(instance.id, DerivedClass);
+            let isValidForBase = attachable_store_1.AttachableStore.validateIdForClass(instance.id, BaseClass);
+            (0, vitest_1.expect)(isValidForDerived).toBe(true);
+            (0, vitest_1.expect)(isValidForBase).toBe(false);
+        });
+    });
+    (0, vitest_1.describe)('hardReset', () => {
+        (0, vitest_1.test)('resets class id counter', () => {
+            class TestClass1 extends attachable_1.Attachable {
+            }
+            class TestClass2 extends attachable_1.Attachable {
+            }
+            new TestClass1().attachToRoot();
+            new TestClass2().attachToRoot();
+            attachable_store_1.AttachableStore.hardReset();
+            class TestClass3 extends attachable_1.Attachable {
+            }
+            let instance = new TestClass3().attachToRoot();
+            (0, vitest_1.expect)(instance.id).toBe('1:1');
+        });
+        (0, vitest_1.test)('resets instance id counters', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            new TestClass().attachToRoot();
+            new TestClass().attachToRoot();
+            attachable_store_1.AttachableStore.hardReset();
+            let instance = new TestClass().attachToRoot();
+            (0, vitest_1.expect)(instance.id).toBe('1:1');
+        });
+        (0, vitest_1.test)('clears all registered attachables', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance = new TestClass().attachToRoot();
+            let id = instance.id;
+            attachable_store_1.AttachableStore.hardReset();
+            (0, vitest_1.expect)(() => {
+                attachable_store_1.AttachableStore.findAttachmentTarget(id);
+            }).toThrow(`Attachable: attachable not found by id! id: ${id}`);
+        });
+        (0, vitest_1.test)('clears class validation data', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance = new TestClass().attachToRoot();
+            let id = instance.id;
+            attachable_store_1.AttachableStore.hardReset();
+            let isValid = attachable_store_1.AttachableStore.validateIdForClass(id, TestClass);
+            (0, vitest_1.expect)(isValid).toBe(false);
+        });
+    });
+    (0, vitest_1.describe)('multiple classes interaction', () => {
+        (0, vitest_1.test)('handles multiple classes with multiple instances each', () => {
+            class ClassA extends attachable_1.Attachable {
+            }
+            class ClassB extends attachable_1.Attachable {
+            }
+            class ClassC extends attachable_1.Attachable {
+            }
+            let a1 = new ClassA().attachToRoot();
+            let a2 = new ClassA().attachToRoot();
+            let b1 = new ClassB().attachToRoot();
+            let c1 = new ClassC().attachToRoot();
+            let c2 = new ClassC().attachToRoot();
+            let c3 = new ClassC().attachToRoot();
+            (0, vitest_1.expect)([a1.id, a2.id, b1.id, c1.id, c2.id, c3.id]).toEqual(['1:1', '1:2', '2:1', '3:1', '3:2', '3:3']);
+        });
+        (0, vitest_1.test)('finds correct instances after complex registration', () => {
+            class ClassA extends attachable_1.Attachable {
+            }
+            class ClassB extends attachable_1.Attachable {
+            }
+            let a1 = new ClassA().attachToRoot();
+            let b1 = new ClassB().attachToRoot();
+            let a2 = new ClassA().attachToRoot();
+            let foundA1 = attachable_store_1.AttachableStore.findAttachmentTarget(a1.id);
+            let foundB1 = attachable_store_1.AttachableStore.findAttachmentTarget(b1.id);
+            let foundA2 = attachable_store_1.AttachableStore.findAttachmentTarget(a2.id);
+            (0, vitest_1.expect)(foundA1).toBe(a1);
+            (0, vitest_1.expect)(foundB1).toBe(b1);
+            (0, vitest_1.expect)(foundA2).toBe(a2);
+        });
+    });
+    (0, vitest_1.describe)('edge cases', () => {
+        (0, vitest_1.test)('handles rapid registration and unregistration', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance1 = new TestClass().attachToRoot();
+            let id1 = instance1.id;
+            attachable_store_1.AttachableStore.unregisterAttachmentTarget(instance1);
+            let instance2 = new TestClass().attachToRoot();
+            let id2 = instance2.id;
+            (0, vitest_1.expect)(id2).toBe('1:2');
+            (0, vitest_1.expect)(() => {
+                attachable_store_1.AttachableStore.findAttachmentTarget(id1);
+            }).toThrow();
+        });
+        (0, vitest_1.test)('validates after partial unregistration', () => {
+            class TestClass extends attachable_1.Attachable {
+            }
+            let instance1 = new TestClass().attachToRoot();
+            let instance2 = new TestClass().attachToRoot();
+            attachable_store_1.AttachableStore.unregisterAttachmentTarget(instance1);
+            let isValid1 = attachable_store_1.AttachableStore.validateIdForClass(instance1.id, TestClass);
+            let isValid2 = attachable_store_1.AttachableStore.validateIdForClass(instance2.id, TestClass);
+            (0, vitest_1.expect)(isValid1).toBe(false);
+            (0, vitest_1.expect)(isValid2).toBe(true);
+        });
+    });
+});
+//# sourceMappingURL=attachable.store.test.js.map

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

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

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

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ActionsLibDecorator = void 0;
 const ActionsLib = __importStar(require("actions-lib"));
-const attachment_target_store_1 = require("./attachment-target.store");
+const attachable_store_1 = require("./attachable.store");
 class ActionsLibDecorator {
     static decorate(actionsLib) {
         this.decorateAttachFunctions(actionsLib);
@@ -38,7 +38,7 @@ class ActionsLibDecorator {
     }
     static decorateAttachFunctions(actionsLib) {
         actionsLib.ActionSubscription.prototype.attach = function (parent) {
-            let parentEntity = attachment_target_store_1.AttachmentTargetStore.findAttachableParent(parent);
+            let parentEntity = attachable_store_1.AttachableStore.findAttachmentTarget(parent);
             parentEntity['setAttachment'](this);
             this.$meta = { attachIsCalled: true, attachedParent: parentEntity };
             return this;
@@ -61,7 +61,7 @@ class ActionsLibDecorator {
             return originalCombine(subscriptions);
         };
         actionsLib.ReducerEffectChannel.prototype.attach = function (parent) {
-            let parentEntity = attachment_target_store_1.AttachmentTargetStore.findAttachableParent(parent);
+            let parentEntity = attachable_store_1.AttachableStore.findAttachmentTarget(parent);
             parentEntity['setAttachment'](this);
             this.$meta = { attachIsCalled: true, attachedParent: parentEntity };
             return this;
@@ -84,7 +84,7 @@ class ActionsLibDecorator {
         actionsLib.ActionSubscription.prototype.unsubscribe = function () {
             let parentEntity = this.$meta?.attachedParent;
             if (parentEntity) {
-                parentEntity['removeAttachment'](this);
+                parentEntity.removeAttachment(this);
                 this.$meta.attachedParent = undefined;
             }
             originalUnsubscribe.call(this);
@@ -93,7 +93,7 @@ class ActionsLibDecorator {
         actionsLib.ReducerEffectChannel.prototype.unsubscribe = function () {
             let parentEntity = this.$meta?.attachedParent;
             if (parentEntity) {
-                parentEntity['removeAttachment'](this);
+                parentEntity.removeAttachment(this);
                 this.$meta.attachedParent = undefined;
             }
             originalEffectUnsubscribe.call(this);

package/dist/game-entities/base/helpers/referance-variable.d.ts

@@ -1,5 +1,5 @@
 import { ActionListenerCallbackFunction, ActionSubscription, IVariable } from 'actions-lib';
-import { AttachmentTarget } from '../attachment-target';
+import { Attachable } from '../attachable';
 export declare class ReferanceVariable implements IVariable<string | undefined> {
     private options;
     private variable;
@@ -8,7 +8,7 @@ export declare class ReferanceVariable implements IVariable<string | undefined>
     set value(value: string | undefined);
     get listenerCount(): number;
     constructor(options: {
-        attachTo: AttachmentTarget;
+        attachTo: Attachable;
     });
     set(data: string | undefined): this;
     subscribe(callback: ActionListenerCallbackFunction<string | undefined>): ActionSubscription;

package/dist/game-entities/base/helpers/referance-variable.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferanceVariable = void 0;
 const actions_lib_1 = require("actions-lib");
-const attachment_target_store_1 = require("./attachment-target.store");
+const attachable_store_1 = require("./attachable.store");
 class ReferanceVariable {
     get value() {
         return this.variable.value;
@@ -22,7 +22,7 @@ class ReferanceVariable {
             this.destroySubscription?.unsubscribe();
             this.destroySubscription = undefined;
             if (data) {
-                this.destroySubscription = attachment_target_store_1.AttachmentTargetStore.findAttachableParent(data)
+                this.destroySubscription = attachable_store_1.AttachableStore.findAttachmentTarget(data)
                     .onDestroy.subscribe(() => {
                     this.set(undefined);
                 })

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

@@ -1,14 +1,13 @@
-import { AttachmentTarget } from '../base/attachment-target';
+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 AttachmentTarget {
+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;
     constructor();
     destroy(): void;
-    protected destroySelf(): void;
-    attach(parent: AttachmentTarget | string): this;
+    attach(parent: Attachable | string): 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 attachment_target_1 = require("../base/attachment-target");
+const attachable_1 = require("../base/attachable");
 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,7 +14,7 @@ function EntityDecorator() {
     };
 }
 exports.EntityDecorator = EntityDecorator;
-class Entity extends attachment_target_1.AttachmentTarget {
+class Entity extends attachable_1.Attachable {
     static getInstanceById(entityId) {
         if (entityId) {
             return entity_store_helper_1.EntityStoreHelper.getIdToEntityMap(this).get(entityId);
@@ -43,14 +43,12 @@ class Entity extends attachment_target_1.AttachmentTarget {
         })
             .attach(this);
     }
-    // make the destroy function non-internal
     destroy() {
-        super.destroy();
-    }
-    destroySelf() {
-        super.destroySelf();
-        this.viewCreationHelper.destroyViews();
-        entity_store_helper_1.EntityStoreHelper.unregisterEntity(this.constructor.name, this.id);
+        if (!this.destroyed) {
+            this.viewCreationHelper.destroyViews();
+            entity_store_helper_1.EntityStoreHelper.unregisterEntity(this.constructor.name, this.id);
+            super.destroy();
+        }
     }
     // make the destroy function non-internal
     attach(parent) {

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

@@ -107,8 +107,11 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         let Child = class Child extends entity_1.Entity {
             static { Child_1 = this; }
             static { this.destroyCalled = false; }
-            afterDestroy() {
-                Child_1.destroyCalled = true;
+            destroy() {
+                if (!this.destroyed) {
+                    Child_1.destroyCalled = true;
+                    super.destroy();
+                }
             }
         };
         Child = Child_1 = __decorate([
@@ -120,17 +123,6 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         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)(`attach to self should throw error`, () => {
-        let Sample = class Sample extends entity_1.Entity {
-        };
-        Sample = __decorate([
-            (0, entity_1.EntityDecorator)()
-        ], Sample);
-        let sample = new Sample();
-        (0, vitest_1.expect)(() => {
-            sample.attach(sample);
-        }).toThrow(`Entity cannot be attach to itself!`);
-    });
     (0, vitest_1.test)('decorator should not effect static variables', () => {
         let Sample = class Sample extends entity_1.Entity {
             static { this.test = 'test'; }
@@ -200,14 +192,18 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             constructor() {
                 super();
                 callStack.push('scene constructor');
+                this.onDestroy
+                    .subscribe(() => {
+                    callStack.push('scene destroy');
+                })
+                    .attach(this);
             }
             async init() { }
             update() {
                 callStack.push('scene update');
             }
-            async prepareToClose() { }
-            afterDestroy() {
-                callStack.push('scene destroy');
+            async prepareToClose() {
+                callStack.push('scene prepare to close');
             }
         };
         SampleScene = __decorate([
@@ -226,13 +222,16 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             constructor() {
                 super();
                 callStack.push('entity constructor');
+                this.onDestroy
+                    .subscribe(() => {
+                    console.log('entity destroy');
+                    callStack.push('entity destroy');
+                })
+                    .attach(this);
             }
             update() {
                 callStack.push('entity update');
             }
-            afterDestroy() {
-                callStack.push('entity destroy');
-            }
         };
         Sample = __decorate([
             (0, entity_1.EntityDecorator)(),
@@ -242,13 +241,15 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             constructor(entity) {
                 super();
                 callStack.push('view constructor');
+                this.onDestroy
+                    .subscribe(() => {
+                    callStack.push('view destroy');
+                })
+                    .attach(this);
             }
             update() {
                 callStack.push('view update');
             }
-            afterDestroy() {
-                callStack.push('view destroy');
-            }
         };
         _SampleView = __decorate([
             (0, view_1.ViewDecorator)({ entity: Sample }),
@@ -257,7 +258,7 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
         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(scene_1.Scene.getActiveSceneOrFail());
+        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();
@@ -273,6 +274,7 @@ decorate_actions_lib_1.ActionsLibDecorator.decorate(ActionsLib);
             'scene update',
             'entity update',
             'view update',
+            'scene prepare to close',
             'view destroy',
             'entity destroy',
             'scene destroy'

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

@@ -1,8 +1,6 @@
 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';

package/dist/game-entities/index.js

@@ -1,29 +1,12 @@
 "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;
+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.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);
 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; } });

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

@@ -1,10 +1,10 @@
 import { Variable } from 'actions-lib';
-import { AttachmentTarget } from '../base/attachment-target';
+import { Attachable } from '../base/attachable';
 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>;
     static getActiveScene(this: typeof Scene): Scene<unknown, unknown> | undefined;

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

@@ -2,7 +2,7 @@
 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 attachable_1 = require("../base/attachable");
 const service_1 = require("../service/service");
 const update_cycle_1 = require("../update-cycle");
 function SceneDecorator() {
@@ -15,7 +15,7 @@ function SceneDecorator() {
     };
 }
 exports.SceneDecorator = SceneDecorator;
-class Scene extends attachment_target_1.AttachmentTarget {
+class Scene extends attachable_1.Attachable {
     static { this.sceneTransitioning = false; }
     static { this.activeScene = new actions_lib_1.Variable(); }
     static getActiveScene() {

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

@@ -155,8 +155,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 +167,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([

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

@@ -1,17 +1,17 @@
-import { AttachmentTarget } from '../base/attachment-target';
+import { Attachable } from '../base/attachable';
 import { Entity } from '../entity/entity';
 export type ViewClassType<EntityType> = new (entity: EntityType, ...services: any[]) => View;
 export interface ViewDecoratorMeta<EntityType> {
     entity: new (...args: any[]) => EntityType;
 }
 export declare function ViewDecorator<EntityType extends Entity>(meta: ViewDecoratorMeta<EntityType>): (ViewClass: ViewClassType<EntityType>) => any;
-export declare abstract class View extends AttachmentTarget {
+export declare abstract class View extends Attachable {
     private static viewClassNames;
     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;
 }