mani-game-engine 1.0.0-pre.34 → 1.0.0-pre.36

package/lib/ecsInjector.js

@@ -1,150 +1,170 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.EcsInjector = exports.OnSignal = exports.staticSignalHandlers = exports.signalHandlers = exports.EntityComponent = exports.GetSignal = exports.GetContext = exports.GetEntity = exports.GetComponent = exports.entityComponents = void 0;
-const mani_signal_1 = require("mani-signal");
-const injector_1 = require("./injector");
-const systemContext_1 = require("./systemContext");
-exports.entityComponents = new Map();
-exports.GetComponent = (0, injector_1.createDependencyAnnotation)((type, index) => ({ kind: 'component', type, index }));
-exports.GetEntity = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'entity', index }));
-exports.GetContext = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'context', index }));
-const GetSignal = (id) => (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'signal', index, id }));
-exports.GetSignal = GetSignal;
-const EntityComponent = (target, propertyKey) => {
-    const entityClass = target.constructor;
-    const componentClass = Reflect.getMetadata('design:type', target, propertyKey);
-    if (componentClass === Object) {
-        throw new Error(`Object component type not allowed. Forgot to specify type of ${entityClass.name}.${propertyKey}?`);
-    }
-    const componentSet = (0, injector_1.putIfAbsent)(exports.entityComponents, entityClass, () => new Map());
-    componentSet.set(componentClass, propertyKey);
-};
-exports.EntityComponent = EntityComponent;
-exports.signalHandlers = new Map();
-exports.staticSignalHandlers = new Map();
-const OnSignal = (id) => (target, propertyKey, descriptor) => {
-    if (target instanceof Function) {
-        let mappingList = (0, injector_1.putIfAbsent)(exports.staticSignalHandlers, target, () => []);
-        mappingList.push([propertyKey, id]);
-    }
-    else {
-        let mappingList = (0, injector_1.putIfAbsent)(exports.signalHandlers, target.constructor, () => []);
-        mappingList.push([propertyKey, id]);
-    }
-};
-exports.OnSignal = OnSignal;
-const getComponentDependencies = (system) => {
-    const dependencies = injector_1.Injector.dependencyMap.get(system);
-    return dependencies
-        ? dependencies.filter((dependency) => dependency.kind === 'component')
-        : [];
-};
-const getEntityClassesForComponentDependencies = (componentTypes) => {
-    const result = [];
-    for (const [entityClass, componentMap] of exports.entityComponents) {
-        let allDependenciesMet = true;
-        for (const componentType of componentTypes) {
-            if (!componentMap.has(componentType)) {
-                allDependenciesMet = false;
-                break;
-            }
-        }
-        if (allDependenciesMet) {
-            result.push(entityClass);
-        }
-    }
-    return result;
-};
-const componentResolver = (context, dependency) => {
-    const kind = context.kind;
-    const type = context.type;
-    if (kind !== 'system') {
-        throw new Error(`Could not resolve Component ${type.name}. @GetComponent only allowed in system scope.`);
-    }
-    const entityClass = context.entityClass;
-    const key = exports.entityComponents.get(entityClass).get(dependency.type);
-    return (context) => context.entity[key];
-};
-const entityResolver = ({ type, kind }, _dependency) => {
-    if (kind !== 'system') {
-        throw new Error(`Could not resolve Entity in ${type.name}. @GetEntity only allowed in system scope.`);
-    }
-    return (context) => context.entity;
-};
-const contextResolver = ({ type, kind }, _dependency) => {
-    if (kind !== 'system') {
-        throw new Error(`Could not resolve Context in ${type.name}. @GetContext only allowed in system scope.`);
-    }
-    return (context) => context;
-};
-class EcsInjector extends injector_1.Injector {
-    constructor(parent) {
-        super(parent);
-        this.signalMap = parent ? parent.signalMap : new Map();
-        this.entitySystemMap = new Map();
-        this.entitySystemResolverTuples = new Map();
-        this.map(EcsInjector).toValue(this);
-        if (!parent) {
-            this.addExtensionResolver('entity', entityResolver);
-            this.addExtensionResolver('component', componentResolver);
-            this.addExtensionResolver('context', contextResolver);
-            const signalResolver = ({ kind }, dependency) => {
-                const signal = (0, injector_1.putIfAbsent)(this.signalMap, dependency.id, () => new mani_signal_1.Signal());
-                return (entity) => signal;
-            };
-            this.addExtensionResolver('signal', signalResolver);
-        }
-    }
-    newSignalScope() {
-        this.signalMap = new Map();
-    }
-    registerSystem(systemClass) {
-        const componentDependencies = getComponentDependencies(systemClass).map(dependency => dependency.type);
-        if (componentDependencies.length === 0) {
-            throw new Error(`${systemClass.name} needs at least one component dependency.`);
-        }
-        const entityClasses = getEntityClassesForComponentDependencies(componentDependencies);
-        if (entityClasses.length === 0) {
-            console.warn(`System '${systemClass.name}' has no matching entities.`);
-            return;
-        }
-        for (let entityClass of entityClasses) {
-            const systemClasses = (0, injector_1.putIfAbsent)(this.entitySystemMap, entityClass, () => []);
-            systemClasses.push(systemClass);
-        }
-    }
-    createSystems(entity) {
-        const systemResolverTuples = (0, injector_1.putIfAbsent)(this.entitySystemResolverTuples, entity.constructor, () => {
-            const systems = this.entitySystemMap.get(entity.constructor);
-            if (!systems) {
-                return [];
-            }
-            const result = [];
-            for (const systemClass of systems) {
-                result.push([systemClass, this.createResolverArray({ type: systemClass, kind: 'system', entityClass: entity.constructor })]);
-            }
-            return result;
-        });
-        const systemInstances = [];
-        for (const [system, resolver] of systemResolverTuples) {
-            const args = new Array(resolver.length);
-            const systemContext = new systemContext_1.SystemContext(entity);
-            for (let i = 0; i < args.length; i++) {
-                args[i] = resolver[i](systemContext);
-            }
-            systemContext.system = new system(...args);
-            systemInstances.push(systemContext);
-        }
-        return systemInstances;
-    }
-    getSignal(id) {
-        return (0, injector_1.putIfAbsent)(this.signalMap, id, () => new mani_signal_1.Signal());
-    }
-    dispose() {
-        for (const [key, signal] of this.signalMap) {
-            signal.detachAll();
-        }
-    }
-}
-exports.EcsInjector = EcsInjector;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EcsInjector = exports.OnSignal = exports.staticSignalHandlers = exports.signalHandlers = exports.EntityComponent = exports.GetEntitySignal = exports.GetSignal = exports.GetContext = exports.GetEntity = exports.GetComponent = exports.entityComponents = void 0;
+const mani_signal_1 = require("mani-signal");
+const injector_1 = require("./injector");
+const systemContext_1 = require("./systemContext");
+exports.entityComponents = new Map();
+exports.GetComponent = (0, injector_1.createDependencyAnnotation)((type, index) => ({ kind: 'component', type, index }));
+exports.GetEntity = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'entity', index }));
+exports.GetContext = (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'context', index }));
+const GetSignal = (id) => (0, injector_1.createDependencyAnnotation)((_type, index) => ({ kind: 'signal', index, id }));
+exports.GetSignal = GetSignal;
+const GetEntitySignal = (id) => (0, injector_1.createDependencyAnnotation)((_type, index) => ({
+    kind: 'entitySignal',
+    index,
+    id,
+}));
+exports.GetEntitySignal = GetEntitySignal;
+const EntityComponent = (target, propertyKey) => {
+    const entityClass = target.constructor;
+    const componentClass = Reflect.getMetadata('design:type', target, propertyKey);
+    if (componentClass === Object) {
+        throw new Error(`Object component type not allowed. Forgot to specify type of ${entityClass.name}.${propertyKey}?`);
+    }
+    const componentSet = (0, injector_1.putIfAbsent)(exports.entityComponents, entityClass, () => new Map());
+    componentSet.set(componentClass, propertyKey);
+};
+exports.EntityComponent = EntityComponent;
+exports.signalHandlers = new Map();
+exports.staticSignalHandlers = new Map();
+const OnSignal = (id) => (target, propertyKey, descriptor) => {
+    if (target instanceof Function) {
+        let mappingList = (0, injector_1.putIfAbsent)(exports.staticSignalHandlers, target, () => []);
+        mappingList.push([propertyKey, id]);
+    }
+    else {
+        let mappingList = (0, injector_1.putIfAbsent)(exports.signalHandlers, target.constructor, () => []);
+        mappingList.push([propertyKey, id]);
+    }
+};
+exports.OnSignal = OnSignal;
+const getComponentDependencies = (system) => {
+    const dependencies = injector_1.Injector.dependencyMap.get(system);
+    return dependencies
+        ? dependencies.filter((dependency) => dependency.kind === 'component')
+        : [];
+};
+const getEntityClassesForComponentDependencies = (componentTypes) => {
+    const result = [];
+    for (const [entityClass, componentMap] of exports.entityComponents) {
+        let allDependenciesMet = true;
+        for (const componentType of componentTypes) {
+            if (!componentMap.has(componentType)) {
+                allDependenciesMet = false;
+                break;
+            }
+        }
+        if (allDependenciesMet) {
+            result.push(entityClass);
+        }
+    }
+    return result;
+};
+const componentResolver = (context, dependency) => {
+    const kind = context.kind;
+    const type = context.type;
+    if (kind !== 'system') {
+        throw new Error(`Could not resolve Component ${type.name}. @GetComponent only allowed in system scope.`);
+    }
+    const entityClass = context.entityClass;
+    const key = exports.entityComponents.get(entityClass).get(dependency.type);
+    return (context) => context.entity[key];
+};
+const entityResolver = ({ type, kind }, _dependency) => {
+    if (kind !== 'system') {
+        throw new Error(`Could not resolve Entity in ${type.name}. @GetEntity only allowed in system scope.`);
+    }
+    return (context) => context.entity;
+};
+const entitySignalResolver = ({ type, kind }, dependency) => {
+    if (kind !== 'system') {
+        throw new Error(`Could not resolve Entity in ${type.name}. @GetEntity only allowed in system scope.`);
+    }
+    return (context) => context.entity.getSignal(dependency.id);
+};
+const contextResolver = ({ type, kind }, _dependency) => {
+    if (kind !== 'system') {
+        throw new Error(`Could not resolve Context in ${type.name}. @GetContext only allowed in system scope.`);
+    }
+    return (context) => context;
+};
+class EcsInjector extends injector_1.Injector {
+    constructor(parent) {
+        super(parent);
+        this.signalMap = parent ? parent.signalMap : new Map();
+        this.entitySystemMap = new Map();
+        this.entitySystemResolverTuples = new Map();
+        this.map(EcsInjector).toValue(this);
+        if (!parent) {
+            this.addExtensionResolver('entity', entityResolver);
+            this.addExtensionResolver('component', componentResolver);
+            this.addExtensionResolver('context', contextResolver);
+            const signalResolver = ({ kind }, dependency) => {
+                const signal = (0, injector_1.putIfAbsent)(this.signalMap, dependency.id, () => new mani_signal_1.Signal());
+                return (entity) => signal;
+            };
+            this.addExtensionResolver('signal', signalResolver);
+            this.addExtensionResolver('entitySignal', entitySignalResolver);
+        }
+    }
+    newSignalScope() {
+        this.signalMap = new Map();
+    }
+    registerSystem(systemClass) {
+        const componentDependencies = getComponentDependencies(systemClass).map(dependency => dependency.type);
+        if (componentDependencies.length === 0) {
+            throw new Error(`${systemClass.name} needs at least one component dependency.`);
+        }
+        const entityClasses = getEntityClassesForComponentDependencies(componentDependencies);
+        if (entityClasses.length === 0) {
+            console.warn(`System '${systemClass.name}' has no matching entities.`);
+            return;
+        }
+        for (let entityClass of entityClasses) {
+            const systemClasses = (0, injector_1.putIfAbsent)(this.entitySystemMap, entityClass, () => []);
+            systemClasses.push(systemClass);
+        }
+    }
+    createSystems(entity) {
+        const systemResolverTuples = (0, injector_1.putIfAbsent)(this.entitySystemResolverTuples, entity.constructor, () => {
+            const systems = this.entitySystemMap.get(entity.constructor);
+            if (!systems) {
+                return [];
+            }
+            const result = [];
+            for (const systemClass of systems) {
+                result.push([systemClass, this.createResolverArray({ type: systemClass, kind: 'system', entityClass: entity.constructor })]);
+            }
+            return result;
+        });
+        const systemInstances = [];
+        for (const [system, resolver] of systemResolverTuples) {
+            const args = new Array(resolver.length);
+            const systemContext = new systemContext_1.SystemContext(entity);
+            for (let i = 0; i < args.length; i++) {
+                args[i] = resolver[i](systemContext);
+            }
+            const newSystem = new system(...args);
+            const entitySignals = systemContext_1.entitySignalHandlers.get(system);
+            if (entitySignals === null || entitySignals === void 0 ? void 0 : entitySignals.length) {
+                for (const [propertyKey, id] of entitySignals) {
+                    entity.getSignal(id).add(newSystem[propertyKey], newSystem);
+                }
+            }
+            systemContext.system = newSystem;
+            systemInstances.push(systemContext);
+        }
+        return systemInstances;
+    }
+    getSignal(id) {
+        return (0, injector_1.putIfAbsent)(this.signalMap, id, () => new mani_signal_1.Signal());
+    }
+    dispose() {
+        for (const [key, signal] of this.signalMap) {
+            signal.detachAll();
+        }
+    }
+}
+exports.EcsInjector = EcsInjector;
 //# sourceMappingURL=ecsInjector.js.map

package/lib/ecsInjector.js.map

@@ -1 +1 @@
-{"version":3,"file":"ecsInjector.js","sourceRoot":"","sources":["../src/ecsInjector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ecsInjector.js","sourceRoot":"","sources":["../src/ecsInjector.ts"],"names":[],"mappings":"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"}

package/lib/entity.d.ts

@@ -1,23 +1,26 @@
-import { Signal } from 'mani-signal';
-import { Class } from './types';
-export declare class Entity {
-    readonly id: number;
-    readonly children: Set<Entity>;
-    private gameEngine?;
-    private _parent?;
-    readonly parentChanged: Signal<unknown>;
-    readonly onRemove: Signal<unknown>;
-    private markRemoval;
-    private _detached;
-    get detached(): boolean;
-    constructor();
-    onBeforeRemove?(): Promise<void>;
-    private setParent;
-    get parent(): Entity | undefined;
-    getComponent<T extends Class>(componentClass: T): InstanceType<T> | undefined;
-    add(entity: Entity): Promise<void>;
-    remove(entity: Entity): Promise<void>;
-    detach(): Promise<void>;
-    has(entity: Entity): boolean;
-    getAllEntities(target?: Entity[]): Entity[];
-}
+import { Signal } from 'mani-signal';
+import { Class } from './types';
+import { ID } from './injector';
+export declare class Entity {
+    readonly id: number;
+    readonly children: Set<Entity>;
+    private gameEngine?;
+    private _parent?;
+    readonly parentChanged: Signal<unknown>;
+    readonly onRemove: Signal<unknown>;
+    private markRemoval;
+    private _detached;
+    private readonly signalMap;
+    get detached(): boolean;
+    constructor();
+    onBeforeRemove?(): Promise<void>;
+    getSignal<T>(id: ID): Signal<T>;
+    private setParent;
+    get parent(): Entity | undefined;
+    getComponent<T extends Class>(componentClass: T): InstanceType<T> | undefined;
+    add(entity: Entity): Promise<void>;
+    remove(entity: Entity): Promise<void>;
+    detach(): Promise<void>;
+    has(entity: Entity): boolean;
+    getAllEntities(target?: Entity[]): Entity[];
+}

package/lib/entity.js

@@ -1,96 +1,102 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Entity = void 0;
-const mani_signal_1 = require("mani-signal");
-const ecsInjector_1 = require("./ecsInjector");
-let idCounter = 0;
-class Entity {
-    constructor() {
-        this.children = new Set();
-        this.parentChanged = new mani_signal_1.Signal();
-        this.onRemove = new mani_signal_1.Signal();
-        this.markRemoval = false;
-        this._detached = false;
-        this.id = idCounter++;
-    }
-    get detached() { return this._detached; }
-    setParent(parent) {
-        if (parent === this._parent) {
-            throw Error('same parent');
-        }
-        this._parent = parent;
-        this.parentChanged.dispatch();
-    }
-    get parent() {
-        return this._parent;
-    }
-    getComponent(componentClass) {
-        const componentMap = ecsInjector_1.entityComponents.get(this.constructor);
-        if (!componentMap) {
-            throw new Error(`No components in entity of type '${this.constructor.name}'.`);
-        }
-        const key = componentMap.get(componentClass);
-        return key && this[key];
-    }
-    async add(entity) {
-        if (entity.parent === this) {
-            throw new Error('Entity is already a child');
-        }
-        if (entity === this) {
-            throw new Error('Could not add Entity as a child of itself.');
-        }
-        if (entity.parent) {
-            entity.parent.children.delete(entity);
-        }
-        this.children.add(entity);
-        entity.setParent(this);
-        if (entity.gameEngine) {
-            if (this.gameEngine !== entity.gameEngine) {
-                throw new Error('cant add an active to a passive entity');
-            }
-        }
-        else {
-            if (this.gameEngine) {
-                await this.gameEngine.add(entity);
-            }
-        }
-        if (this.gameEngine && this.gameEngine !== entity.gameEngine) {
-        }
-    }
-    async remove(entity) {
-        if (!this.children.delete(entity)) {
-            throw new Error('Could not remove. Entity is not a child.');
-        }
-        entity.setParent(undefined);
-        if (this.gameEngine) {
-            return await this.gameEngine.remove(entity);
-        }
-    }
-    async detach() {
-        if (this._detached) {
-            throw new Error('entity already detached');
-        }
-        this._detached = true;
-        if (this.parent) {
-            await this.parent.remove(this);
-        }
-        else {
-            if (!this.gameEngine) {
-                throw new Error('entity isn\'t attached to a parent or the game engine');
-            }
-            await this.gameEngine.remove(this);
-        }
-    }
-    has(entity) {
-        return this.children.has(entity);
-    }
-    getAllEntities(target = []) {
-        target.push(this);
-        for (const child of this.children) {
-            child.getAllEntities(target);
-        }
-        return target;
-    }
-}
-exports.Entity = Entity;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Entity = void 0;
+const mani_signal_1 = require("mani-signal");
+const ecsInjector_1 = require("./ecsInjector");
+const injector_1 = require("./injector");
+let idCounter = 0;
+class Entity {
+    constructor() {
+        this.children = new Set();
+        this.parentChanged = new mani_signal_1.Signal();
+        this.onRemove = new mani_signal_1.Signal();
+        this.markRemoval = false;
+        this._detached = false;
+        this.signalMap = new Map();
+        this.id = idCounter++;
+    }
+    get detached() { return this._detached; }
+    getSignal(id) {
+        return (0, injector_1.putIfAbsent)(this.signalMap, id, () => new mani_signal_1.Signal());
+    }
+    setParent(parent) {
+        if (parent === this._parent) {
+            throw Error('same parent');
+        }
+        this._parent = parent;
+        this.parentChanged.dispatch();
+    }
+    get parent() {
+        return this._parent;
+    }
+    getComponent(componentClass) {
+        const componentMap = ecsInjector_1.entityComponents.get(this.constructor);
+        if (!componentMap) {
+            throw new Error(`No components in entity of type '${this.constructor.name}'.`);
+        }
+        const key = componentMap.get(componentClass);
+        return key && this[key];
+    }
+    async add(entity) {
+        if (entity.parent === this) {
+            throw new Error('Entity is already a child');
+        }
+        if (entity === this) {
+            throw new Error('Could not add Entity as a child of itself.');
+        }
+        if (entity.parent) {
+            entity.parent.children.delete(entity);
+        }
+        this.children.add(entity);
+        entity.setParent(this);
+        if (entity.gameEngine) {
+            if (this.gameEngine !== entity.gameEngine) {
+                throw new Error('cant add an active to a passive entity');
+            }
+        }
+        else {
+            if (this.gameEngine) {
+                await this.gameEngine.add(entity);
+            }
+        }
+        if (this.gameEngine && this.gameEngine !== entity.gameEngine) {
+        }
+    }
+    async remove(entity) {
+        if (!this.children.delete(entity)) {
+            throw new Error('Could not remove. Entity is not a child.');
+        }
+        entity.setParent(undefined);
+        if (this.gameEngine) {
+            return await this.gameEngine.remove(entity);
+        }
+        this.signalMap.forEach(signal => signal.detachAll());
+    }
+    async detach() {
+        if (this._detached) {
+            throw new Error('entity already detached');
+        }
+        this._detached = true;
+        if (this.parent) {
+            await this.parent.remove(this);
+        }
+        else {
+            if (!this.gameEngine) {
+                throw new Error('entity isn\'t attached to a parent or the game engine');
+            }
+            await this.gameEngine.remove(this);
+        }
+    }
+    has(entity) {
+        return this.children.has(entity);
+    }
+    getAllEntities(target = []) {
+        target.push(this);
+        for (const child of this.children) {
+            child.getAllEntities(target);
+        }
+        return target;
+    }
+}
+exports.Entity = Entity;
 //# sourceMappingURL=entity.js.map

package/lib/entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity.js","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"entity.js","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"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"}