mani-game-engine 1.0.0-pre.10 → 1.0.0-pre.100

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2020 Jan Mankopf
+Copyright (c) 2022 Jan Mankopf
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/clock.d.ts

@@ -6,8 +6,14 @@ declare const defaultOptions: {
     maxFrameTime: number;
     timeScale: number;
 };
-export declare type GameClockOptions = Partial<typeof defaultOptions>;
+export type Timeout = {
+    recall?: number;
+    callback: Function;
+    callTime: number;
+};
+export type GameClockOptions = Partial<typeof defaultOptions>;
 export interface Clock {
+    readonly gameTime: number;
     onPrepare: Signal<unknown>;
     onEarlyUpdate: Signal<OnEarlyUpdateParams>;
     onUpdate: Signal<OnUpdateParams>;
@@ -15,26 +21,44 @@ export interface Clock {
     timeScale: number;
     start(): this;
     stop(): this;
+    dispose(): void;
+    processFrame(time: number): void;
+    readonly fixedDeltaTime: number;
+    setTimeout(callback: Function, delay: number): number;
+    setInterval(callback: Function, delay: number): number;
+    clearTimeout(timeoutId: number): boolean;
+    fixedTween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
+    tween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
 }
 export declare class GameClock implements Clock {
+    get gameTime(): number;
+    get animationTime(): number;
+    private _animationTime;
+    private nextTimeoutId;
+    private timeouts;
     private isRunning;
-    private requestId;
     private currentTime;
     private accumulator;
-    private gameTime;
+    private _gameTime;
     private readonly _fixedDeltaTime;
-    private update;
-    private maxFrameTime;
+    processFrame(time: number): void;
+    private readonly maxFrameTime;
     readonly onPrepare: Signal<unknown>;
     readonly onEarlyUpdate: Signal<OnEarlyUpdateParams>;
     readonly onUpdate: Signal<OnUpdateParams>;
     readonly onFixedUpdate: Signal<OnFixedUpdateParams>;
     constructor(options?: GameClockOptions);
+    dispose(): void;
     get fixedDeltaTime(): number;
     private _timeScale;
     get timeScale(): number;
     set timeScale(value: number);
     start(): this;
     stop(): this;
+    setTimeout(callback: Function, delay: number): number;
+    setInterval(callback: Function, delay: number): number;
+    fixedTween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
+    tween(duration: number, from: number, to: number, onUpdate: (t: number) => void): Promise<void>;
+    clearTimeout(timeoutId: number): boolean;
 }
 export {};

package/lib/clock.js

@@ -1,4 +1,7 @@
-import { Signal } from 'mani-signal';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GameClock = void 0;
+const mani_signal_1 = require("mani-signal");
 const MIN_TIME_SCALE = 0.00001;
 const defaultOptions = {
     autoStart: true,
@@ -6,47 +9,60 @@ const defaultOptions = {
     maxFrameTime: 0.25,
     timeScale: 1,
 };
-export class GameClock {
+class GameClock {
+    get gameTime() {
+        return this._gameTime;
+    }
+    get animationTime() {
+        return this._animationTime;
+    }
+    processFrame(time) {
+        if (!this.isRunning) {
+            return;
+        }
+        const newTime = time * 0.001;
+        const rawDelta = newTime - this.currentTime;
+        let clampedDelta = rawDelta;
+        if (clampedDelta > this.maxFrameTime) {
+            clampedDelta = this.maxFrameTime;
+        }
+        const frameTime = clampedDelta * this.timeScale;
+        this.currentTime = newTime;
+        this.accumulator += frameTime;
+        while (this.accumulator >= this._fixedDeltaTime) {
+            this.onEarlyUpdate.dispatch({ time: this._gameTime, deltaTime: this._fixedDeltaTime });
+            this.onPrepare.dispatch();
+            for (const [id, timeOut] of this.timeouts) {
+                if (this._gameTime >= timeOut.callTime) {
+                    timeOut.callback();
+                    if (timeOut.recall) {
+                        timeOut.callTime += timeOut.recall;
+                    }
+                    else {
+                        this.timeouts.delete(id);
+                    }
+                }
+            }
+            this.onFixedUpdate.dispatch({ time: this._gameTime, deltaTime: this._fixedDeltaTime });
+            this.accumulator -= this._fixedDeltaTime;
+            this._gameTime += this._fixedDeltaTime;
+        }
+        const alpha = this.accumulator / this._fixedDeltaTime;
+        this._animationTime = this._gameTime + alpha * this._fixedDeltaTime;
+        this.onUpdate.dispatch({ time: this._animationTime, deltaTime: frameTime, alpha: alpha });
+    }
     constructor(options) {
+        this._animationTime = 0;
+        this.nextTimeoutId = 0;
+        this.timeouts = new Map();
         this.isRunning = false;
-        this.requestId = 0;
         this.currentTime = 0;
         this.accumulator = 0;
-        this.gameTime = 0;
-        this.update = (time) => {
-            const newTime = time * 0.001;
-            if (!this.isRunning) {
-                this.currentTime = newTime;
-                this.isRunning = true;
-            }
-            let frameTime = (newTime - this.currentTime) * this.timeScale;
-            if (frameTime > this.maxFrameTime) {
-                frameTime = this.maxFrameTime;
-            }
-            this.currentTime = newTime;
-            this.accumulator += frameTime;
-            let isMultipleFixedUpdate = false;
-            this.onPrepare.dispatch();
-            this.onEarlyUpdate.dispatch({ time: this.gameTime, deltaTime: frameTime });
-            while (this.accumulator >= this._fixedDeltaTime) {
-                if (isMultipleFixedUpdate) {
-                    this.onPrepare.dispatch();
-                }
-                this.onFixedUpdate.dispatch({ time: this.gameTime, deltaTime: this._fixedDeltaTime });
-                isMultipleFixedUpdate = true;
-                this.accumulator -= this._fixedDeltaTime;
-                this.gameTime += this._fixedDeltaTime;
-            }
-            const alpha = this.accumulator / this._fixedDeltaTime;
-            this.onUpdate.dispatch({ time: this.gameTime + alpha * this._fixedDeltaTime, deltaTime: frameTime, alpha: alpha });
-            if (this.isRunning) {
-                this.requestId = requestAnimationFrame(this.update);
-            }
-        };
-        this.onPrepare = new Signal();
-        this.onEarlyUpdate = new Signal();
-        this.onUpdate = new Signal();
-        this.onFixedUpdate = new Signal();
+        this._gameTime = 0;
+        this.onPrepare = new mani_signal_1.Signal();
+        this.onEarlyUpdate = new mani_signal_1.Signal();
+        this.onUpdate = new mani_signal_1.Signal();
+        this.onFixedUpdate = new mani_signal_1.Signal();
         this._timeScale = 1;
         const opts = Object.assign(Object.assign({}, defaultOptions), options);
         this._fixedDeltaTime = opts.fixedDeltaTime;
@@ -54,18 +70,28 @@ export class GameClock {
         this.timeScale = opts.timeScale;
         opts.autoStart && this.start();
     }
+    dispose() {
+        this.stop();
+        this.timeouts.clear();
+        this.onPrepare.detachAll();
+        this.onEarlyUpdate.detachAll();
+        this.onUpdate.detachAll();
+        this.onFixedUpdate.detachAll();
+    }
     get fixedDeltaTime() { return this._fixedDeltaTime; }
     get timeScale() {
         return this._timeScale;
     }
     set timeScale(value) {
-        this._timeScale = Math.max(value, MIN_TIME_SCALE);
+        this._timeScale = value === 0 ? 0 : Math.max(value, MIN_TIME_SCALE);
     }
     start() {
         if (this.isRunning) {
             return this;
         }
-        this.requestId = requestAnimationFrame(this.update);
+        this.isRunning = true;
+        this.currentTime = performance.now() * 0.001;
+        this.accumulator = 0;
         return this;
     }
     stop() {
@@ -73,8 +99,49 @@ export class GameClock {
             return this;
         }
         this.isRunning = false;
-        cancelAnimationFrame(this.requestId);
         return this;
     }
+    setTimeout(callback, delay) {
+        const timeOut = { callback, callTime: this._gameTime + delay };
+        this.nextTimeoutId++;
+        this.timeouts.set(this.nextTimeoutId, timeOut);
+        return this.nextTimeoutId;
+    }
+    setInterval(callback, delay) {
+        const timeOut = { callback, callTime: this._gameTime + delay, recall: delay };
+        this.nextTimeoutId++;
+        this.timeouts.set(this.nextTimeoutId, timeOut);
+        return this.nextTimeoutId;
+    }
+    async fixedTween(duration, from, to, onUpdate) {
+        return new Promise((resolve) => {
+            const startTime = this.gameTime;
+            const binding = this.onFixedUpdate.add(({ time }) => {
+                const t = Math.min(1, (this.gameTime - startTime) / duration);
+                onUpdate(from + (to - from) * t);
+                if (t >= 1) {
+                    binding.detach();
+                    resolve();
+                }
+            });
+        });
+    }
+    async tween(duration, from, to, onUpdate) {
+        return new Promise((resolve) => {
+            const startTime = this._animationTime;
+            const binding = this.onUpdate.add(({ time }) => {
+                const t = Math.min(1, (this._animationTime - startTime) / duration);
+                onUpdate(from + (to - from) * t);
+                if (t >= 1) {
+                    binding.detach();
+                    resolve();
+                }
+            });
+        });
+    }
+    clearTimeout(timeoutId) {
+        return this.timeouts.delete(timeoutId);
+    }
 }
+exports.GameClock = GameClock;
 //# sourceMappingURL=clock.js.map

package/lib/clock.js.map

@@ -1 +1 @@
-{"version":3,"file":"clock.js","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAGnC,MAAM,cAAc,GAAG,OAAO,CAAC;AAI/B,MAAM,cAAc,GAAG;IACnB,SAAS,EAAE,IAAI;IACf,cAAc,EAAE,CAAC,GAAG,EAAE;IACtB,YAAY,EAAE,IAAI;IAClB,SAAS,EAAE,CAAC;CACf,CAAC;AAeF,MAAM,OAAO,SAAS;IAkDlB,YAAY,OAA0B;QAjD9B,cAAS,GAAG,KAAK,CAAC;QAClB,cAAS,GAAG,CAAC,CAAC;QACd,gBAAW,GAAG,CAAC,CAAC;QAChB,gBAAW,GAAG,CAAC,CAAC;QAChB,aAAQ,GAAG,CAAC,CAAC;QAGb,WAAM,GAAG,CAAC,IAAY,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;gBACjB,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;gBAC3B,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;aACzB;YAED,IAAI,SAAS,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC;YAE9D,IAAI,SAAS,GAAG,IAAI,CAAC,YAAY,EAAE;gBAC/B,SAAS,GAAG,IAAI,CAAC,YAAY,CAAC;aACjC;YAED,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC;YAC3B,IAAI,CAAC,WAAW,IAAI,SAAS,CAAC;YAC9B,IAAI,qBAAqB,GAAG,KAAK,CAAC;YAElC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;YAC1B,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,SAAS,EAAC,CAAC,CAAC;YACzE,OAAO,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,eAAe,EAAE;gBAC7C,IAAI,qBAAqB,EAAE;oBACvB,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,CAAC;iBAC7B;gBACD,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,eAAe,EAAC,CAAC,CAAC;gBACpF,qBAAqB,GAAG,IAAI,CAAC;gBAC7B,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,eAAe,CAAC;gBACzC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,eAAe,CAAC;aACzC;YACD,MAAM,KAAK,GAAG,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,eAAe,CAAC;YACtD,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,GAAG,KAAK,GAAG,IAAI,CAAC,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC,CAAC;YACjH,IAAI,IAAI,CAAC,SAAS,EAAE;gBAChB,IAAI,CAAC,SAAS,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACvD;QACL,CAAC,CAAC;QAIO,cAAS,GAAG,IAAI,MAAM,EAAE,CAAC;QACzB,kBAAa,GAAG,IAAI,MAAM,EAAuB,CAAC;QAClD,aAAQ,GAAG,IAAI,MAAM,EAAkB,CAAC;QACxC,kBAAa,GAAG,IAAI,MAAM,EAAuB,CAAC;QAanD,eAAU,GAAG,CAAC,CAAC;QAVnB,MAAM,IAAI,GAAG,gCAAI,cAAc,GAAK,OAAO,CAA+B,CAAC;QAC3E,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,cAAc,CAAC;QAC3C,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC;QAEhC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;IAED,IAAI,cAAc,KAAa,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC;IAI7D,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS,CAAC,KAAa;QACvB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACtD,CAAC;IAED,KAAK;QACD,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,SAAS,GAAG,qBAAqB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACpD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,OAAO,IAAI,CAAC;SACf;QACD,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;QACvB,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IAChB,CAAC;CACJ"}
+{"version":3,"file":"clock.js","sourceRoot":"","sources":["../src/clock.ts"],"names":[],"mappings":"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"}

package/lib/ecsInjector.d.ts

@@ -1,25 +1,45 @@
-import { Class, ID, Injector, ResolverFunction } from 'mani-injector';
 import { Signal } from 'mani-signal';
+import { Class, Dependency, ID, Injector, ResolverFunction } from './injector';
 import { SystemContext } from './systemContext';
-declare type ComponentClass = Class;
-declare type EntityClass = Class;
-declare type SystemResolvers<T extends Class> = [T, ResolverFunction[]];
-export declare const entityComponents: Map<EntityClass, Map<ComponentClass, string>>;
-export declare const GetComponent: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
-export declare const GetEntity: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
-export declare const GetContext: (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
-export declare const GetSignal: (id: ID) => (dependantType: Class<any>, _propertyKey: string | symbol, index: number) => any;
+import { Entity } from './entity';
+type ComponentClass = Class;
+type EntityClass = Class;
+type ComponentDependency = Dependency & {
+    kind: 'component';
+    index: number;
+    type: Class;
+};
+type DynamicComponentDependency = Dependency & {
+    kind: 'dynamic';
+    index: number;
+    type: Class;
+};
+export declare const GetComponent: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
+export declare const GetDynamicComponent: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
+export declare const GetEntity: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
+export declare const GetContext: (dependantType: Class<any>, _propertyKey: any, index: number) => any;
+export declare const GetSignal: (id: ID) => (dependantType: Class<any>, _propertyKey: any, index: number) => any;
+export declare const GetEntitySignal: (id: ID) => (dependantType: Class<any>, _propertyKey: any, index: number) => any;
 export declare const EntityComponent: (target: object, propertyKey: string) => any;
 export declare const signalHandlers: Map<Object, [string, ID][]>;
 export declare const staticSignalHandlers: Map<Object, [string, ID][]>;
 export declare const OnSignal: (id: ID) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
 export declare class EcsInjector<SystemClass extends Class = Class> extends Injector {
+    static warnNoMatchingEntities: boolean;
+    static entityComponents: Map<EntityClass, Map<ComponentClass, string>>;
+    protected componentDependencyMap: Map<Class, ComponentDependency[]>;
+    protected dynamicComponentDependencyMap: Map<Class, DynamicComponentDependency[]>;
     protected entitySystemMap: Map<Class, SystemClass[]>;
-    protected entitySystemResolverTuples: Map<Class, SystemResolvers<SystemClass>[]>;
-    private signalMap;
+    protected dynamicComponentSystemMap: Map<Class, SystemClass[]>;
+    protected entitySystemResolverTuples: Map<Class, Map<SystemClass, ResolverFunction[]>>;
+    protected registeredClasses: Set<SystemClass>;
+    private readonly signalMap;
     constructor(parent?: EcsInjector<SystemClass>);
     registerSystem<T extends SystemClass>(systemClass: T): void;
-    createSystems(entity: Object): SystemContext[];
+    createSystemsForDynamicComponents(dynamicComponentClass: Class, entity: Entity): Set<SystemContext<import("./types").System>> | undefined;
+    createSystemsForEntity(entity: Entity): Set<SystemContext>;
+    private createSystems;
+    private getSystemResolverTuples;
     getSignal<T>(id: ID): Signal<T>;
     dispose(): void;
 }

package/lib/ecsInjector.js

@@ -1,41 +1,58 @@
-import { createDependencyAnnotation, Injector, putIfAbsent } from 'mani-injector';
-import { Signal } from 'mani-signal';
-import { SystemContext } from './systemContext';
-export const entityComponents = new Map();
-export const GetComponent = createDependencyAnnotation((type, index) => ({ kind: 'component', type, index }));
-export const GetEntity = createDependencyAnnotation((_type, index) => ({ kind: 'entity', index }));
-export const GetContext = createDependencyAnnotation((_type, index) => ({ kind: 'context', index }));
-export const GetSignal = (id) => createDependencyAnnotation((_type, index) => ({ kind: 'signal', index, id }));
-export const EntityComponent = (target, propertyKey) => {
+"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.GetDynamicComponent = exports.GetComponent = void 0;
+const mani_signal_1 = require("mani-signal");
+const injector_1 = require("./injector");
+const systemContext_1 = require("./systemContext");
+exports.GetComponent = (0, injector_1.createDependencyAnnotation)((type, index) => ({ kind: 'component', type, index }));
+exports.GetDynamicComponent = (0, injector_1.createDependencyAnnotation)((type, index) => ({
+    kind: 'dynamic',
+    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 = putIfAbsent(entityComponents, entityClass, () => new Map());
+    const componentSet = (0, injector_1.putIfAbsent)(EcsInjector.entityComponents, entityClass, () => new Map());
     componentSet.set(componentClass, propertyKey);
 };
-export const signalHandlers = new Map();
-export const staticSignalHandlers = new Map();
-export const OnSignal = (id) => (target, propertyKey, descriptor) => {
+exports.EntityComponent = EntityComponent;
+exports.signalHandlers = new Map();
+exports.staticSignalHandlers = new Map();
+const OnSignal = (id) => (target, propertyKey, descriptor) => {
     if (target instanceof Function) {
-        let mappingList = putIfAbsent(staticSignalHandlers, target, () => []);
+        let mappingList = (0, injector_1.putIfAbsent)(exports.staticSignalHandlers, target, () => []);
         mappingList.push([propertyKey, id]);
     }
     else {
-        let mappingList = putIfAbsent(signalHandlers, target.constructor, () => []);
+        let mappingList = (0, injector_1.putIfAbsent)(exports.signalHandlers, target.constructor, () => []);
         mappingList.push([propertyKey, id]);
     }
 };
-const getComponentDependencies = (system) => {
-    const dependencies = Injector.dependencyMap.get(system);
-    return dependencies
-        ? dependencies.filter((dependency) => dependency.kind === 'component')
-        : [];
+exports.OnSignal = OnSignal;
+const extractDependenciesWithType = (type) => {
+    const result = new Map();
+    injector_1.Injector.dependencyMap.forEach((dependency, system) => {
+        (0, injector_1.putIfAbsent)(result, system, () => [...dependency.filter((dependency) => dependency.kind === type)]);
+    });
+    return result;
 };
 const getEntityClassesForComponentDependencies = (componentTypes) => {
     const result = [];
-    for (const [entityClass, componentMap] of entityComponents) {
+    for (const [entityClass, componentMap] of EcsInjector.entityComponents) {
         let allDependenciesMet = true;
         for (const componentType of componentTypes) {
             if (!componentMap.has(componentType)) {
@@ -56,80 +73,144 @@ const componentResolver = (context, dependency) => {
         throw new Error(`Could not resolve Component ${type.name}. @GetComponent only allowed in system scope.`);
     }
     const entityClass = context.entityClass;
-    const key = entityComponents.get(entityClass).get(dependency.type);
+    const key = EcsInjector.entityComponents.get(entityClass).get(dependency.type);
     return (context) => context.entity[key];
 };
+const dynamicComponentResolver = (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.`);
+    }
+    return (context) => context.entity.getDynamicComponent(dependency.type);
+};
 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;
 };
-export class EcsInjector extends Injector {
+class EcsInjector extends injector_1.Injector {
     constructor(parent) {
         super(parent);
+        this.componentDependencyMap = extractDependenciesWithType('component');
+        this.dynamicComponentDependencyMap = extractDependenciesWithType('dynamic');
+        this.registeredClasses = new Set();
         this.signalMap = parent ? parent.signalMap : new Map();
-        this.entitySystemMap = parent ? parent.entitySystemMap : new Map();
-        this.entitySystemResolverTuples = parent ? parent.entitySystemResolverTuples : new Map();
+        this.entitySystemMap = new Map();
+        this.dynamicComponentSystemMap = new Map();
+        this.entitySystemResolverTuples = new Map();
         this.map(EcsInjector).toValue(this);
         if (!parent) {
             this.addExtensionResolver('entity', entityResolver);
             this.addExtensionResolver('component', componentResolver);
+            this.addExtensionResolver('dynamic', dynamicComponentResolver);
             this.addExtensionResolver('context', contextResolver);
             const signalResolver = ({ kind }, dependency) => {
-                const signal = putIfAbsent(this.signalMap, dependency.id, () => new Signal());
+                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);
         }
     }
     registerSystem(systemClass) {
-        const componentDependencies = getComponentDependencies(systemClass).map(dependency => dependency.type);
+        var _a;
+        if (this.registeredClasses.has(systemClass)) {
+            throw new Error(`System ${systemClass.name} already registered.`);
+        }
+        this.registeredClasses.add(systemClass);
+        const componentDependencies = ((_a = this.componentDependencyMap.get(systemClass)) === null || _a === void 0 ? void 0 : _a.map(it => it.type)) || [];
+        const dynamicComponentDependencies = this.dynamicComponentDependencyMap.get(systemClass) || [];
+        for (const dynamicComponentDependency of dynamicComponentDependencies) {
+            const systemClassesForDynamicComponent = (0, injector_1.putIfAbsent)(this.dynamicComponentSystemMap, dynamicComponentDependency.type, () => []);
+            systemClassesForDynamicComponent.push(systemClass);
+        }
         if (componentDependencies.length === 0) {
             throw new Error(`${systemClass.name} needs at least one component dependency.`);
         }
         const entityClasses = getEntityClassesForComponentDependencies(componentDependencies);
-        if (entityClasses.length === 0) {
+        if (entityClasses.length === 0 && EcsInjector.warnNoMatchingEntities) {
             console.warn(`System '${systemClass.name}' has no matching entities.`);
             return;
         }
         for (let entityClass of entityClasses) {
-            const systemClasses = putIfAbsent(this.entitySystemMap, entityClass, () => []);
+            const systemClasses = (0, injector_1.putIfAbsent)(this.entitySystemMap, entityClass, () => []);
             systemClasses.push(systemClass);
         }
     }
-    createSystems(entity) {
-        const systemResolverTuples = 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 })]);
+    createSystemsForDynamicComponents(dynamicComponentClass, entity) {
+        const potentialSystems = this.getSystemResolverTuples(entity);
+        const systems = this.dynamicComponentSystemMap.get(dynamicComponentClass);
+        if (!systems) {
+            return undefined;
+        }
+        const finalSystemResolverEntries = new Map();
+        for (const system of systems) {
+            const resolverTuples = potentialSystems.get(system);
+            if (resolverTuples) {
+                finalSystemResolverEntries.set(system, resolverTuples);
             }
-            return result;
-        });
-        const systemInstances = [];
-        for (const [system, resolver] of systemResolverTuples) {
+        }
+        return this.createSystems(finalSystemResolverEntries, entity);
+    }
+    createSystemsForEntity(entity) {
+        const systemResolverTuples = this.getSystemResolverTuples(entity);
+        return this.createSystems(systemResolverTuples, entity);
+    }
+    createSystems(systemResolverMap, entity) {
+        const systemInstances = new Set();
+        for (const [system, resolver] of systemResolverMap) {
             const args = new Array(resolver.length);
-            const systemContext = new SystemContext(entity);
+            const dynamicDependencies = this.dynamicComponentDependencyMap.get(system) || [];
+            const hasUnfulfilledDynamicDependencies = dynamicDependencies.some((dependency, index) => {
+                return !entity.hasDynamicComponentClass(dependency.type);
+            });
+            if (hasUnfulfilledDynamicDependencies) {
+                continue;
+            }
+            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);
+            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], { context: newSystem });
+                }
+            }
+            systemContext.system = newSystem;
+            systemInstances.add(systemContext);
         }
         return systemInstances;
     }
+    getSystemResolverTuples(entity) {
+        return (0, injector_1.putIfAbsent)(this.entitySystemResolverTuples, entity.constructor, () => {
+            const systems = this.entitySystemMap.get(entity.constructor);
+            if (!systems)
+                return [];
+            const result = new Map();
+            for (const systemClass of systems) {
+                result.set(systemClass, this.createResolverArray({ type: systemClass, kind: 'system', entityClass: entity.constructor }));
+            }
+            return result;
+        });
+    }
     getSignal(id) {
-        return putIfAbsent(this.signalMap, id, () => new Signal());
+        return (0, injector_1.putIfAbsent)(this.signalMap, id, () => new mani_signal_1.Signal());
     }
     dispose() {
         for (const [key, signal] of this.signalMap) {
@@ -137,4 +218,7 @@ export class EcsInjector extends Injector {
         }
     }
 }
+exports.EcsInjector = EcsInjector;
+EcsInjector.warnNoMatchingEntities = true;
+EcsInjector.entityComponents = new Map();
 //# sourceMappingURL=ecsInjector.js.map