mani-game-engine 1.0.0-pre.5 → 1.0.0-pre.51

package/lib/scope/scopeContext.d.ts

@@ -1,53 +1,71 @@
-import { Class, EcsInjector, Signal } from '../index';
-import { SignalCallback } from 'mani-signal/src/signal';
-export declare type ScopeSignalOptions = {
-    keepAlive?: boolean | Scope[];
-    group?: string;
-};
-export declare const scopeSignalHandlers: Map<Object, [string, string | symbol, (ScopeSignalOptions | undefined)?][]>;
-export declare const OnScopeSignal: (id: string | symbol, options?: ScopeSignalOptions | undefined) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
-export interface Scope {
-    [propName: string]: any;
-    onEnter?(): void;
-    onExit?(): void;
-    onSubReturn?(): void;
-    onSubExit?(): void;
-    onActivate?(): void;
-    onDeactivate?(): void;
-}
-export declare type ScopeMapping = (params: {
-    injector: EcsInjector;
-    registerScopeService: (serviceClass: Class) => void;
-}) => void;
-interface AddScopeSignalOptions extends ScopeSignalOptions {
-    context?: unknown;
-}
-export declare class ScopeContext {
-    private parent?;
-    readonly scope: Scope;
-    readonly injector: EcsInjector;
-    private readonly stack;
-    private readonly signalBindings;
-    private serviceBindings;
-    private closed;
-    private muteKeepAliveSignals;
-    constructor(injector: EcsInjector, scopeClass: Class, mapping?: ScopeMapping, parent?: ScopeContext | undefined);
-    get isRoot(): boolean;
-    get isActive(): boolean;
-    get activeContext(): ScopeContext;
-    enterScope(scopeClass: Class, mapping?: ScopeMapping): ScopeContext;
-    exitScope(target?: Scope): void;
-    closeSubScopes(): void;
-    private logStack;
-    getStackClasses(): Scope[];
-    addScopeSignal<T>(signal: Signal<T>, callback: SignalCallback<T>, params?: AddScopeSignalOptions): void;
-    disableKeepAliveSignals(): void;
-    enableKeepAliveSignals(): void;
-    private updateSignalBindings;
-    private detachSignalBindings;
-    private mapScopeSignals;
-    private mapServiceSignals;
-    private detachServiceBindings;
-    private exitThis;
-}
-export {};
+import { Class, EcsInjector, Signal, SignalCallback } from '../index';
+import { ID } from '../injector';
+export type ScopeSignalOptions = {
+    keepAlive?: boolean | Scope[];
+    group?: string;
+};
+export declare const scopeSignalHandlers: Map<Object, [string, ID, (ScopeSignalOptions | undefined)?][]>;
+export declare const OnScopeSignal: (id: ID, options?: ScopeSignalOptions) => (target: any, propertyKey: string, descriptor: PropertyDescriptor) => void;
+export declare const SCOPE_CONTEXT: {
+    log: boolean;
+};
+export interface Scope {
+    [propName: string]: any;
+    onEnter?(): void;
+    onExit?(): void;
+    onSubReturn?(): void;
+    onSubExit?(): void;
+    onActivate?(): void;
+    onDeactivate?(): void;
+}
+export type ScopeMapping = (params: {
+    injector: EcsInjector;
+    registerScopeService: (serviceClass: Class) => void;
+    onEnter: Signal<ScopeContext>;
+    onExit: Signal<ScopeContext>;
+    onSubReturn: Signal<ScopeContext>;
+    onSubExit: Signal<ScopeContext>;
+    onActivate: Signal<ScopeContext>;
+    onDeactivate: Signal<ScopeContext>;
+}) => any | Promise<void>;
+interface AddScopeSignalOptions extends ScopeSignalOptions {
+    context?: unknown;
+}
+export declare class ScopeContext {
+    private parent?;
+    readonly scope: Scope;
+    readonly injector: EcsInjector;
+    private readonly stack;
+    private readonly signalBindings;
+    private serviceBindings;
+    private closed;
+    private muteKeepAliveSignals;
+    readonly onEnter: Signal<ScopeContext>;
+    readonly onExit: Signal<ScopeContext>;
+    readonly onSubReturn: Signal<ScopeContext>;
+    readonly onSubExit: Signal<ScopeContext>;
+    readonly onActivate: Signal<ScopeContext>;
+    readonly onDeactivate: Signal<ScopeContext>;
+    private readonly creationTime;
+    get runtime(): number;
+    constructor(injector: EcsInjector, scopeClass: Class, mapping?: ScopeMapping, parent?: ScopeContext | undefined, resolve?: () => void);
+    get isRoot(): boolean;
+    get target(): Scope | undefined;
+    get isActive(): boolean;
+    get activeContext(): ScopeContext;
+    enterScope(scopeClass: Class, mapping?: ScopeMapping): Promise<ScopeContext | undefined>;
+    exitScope(target?: Scope): Promise<void>;
+    closeSubScopes(): void;
+    private logStack;
+    getStackClasses(): Scope[];
+    addScopeSignal<T>(signal: Signal<T>, callback: SignalCallback<T>, params?: AddScopeSignalOptions): void;
+    disableKeepAliveSignals(): void;
+    enableKeepAliveSignals(): void;
+    private updateSignalBindings;
+    private detachSignalBindings;
+    private mapScopeSignals;
+    private mapServiceSignals;
+    private detachServiceBindings;
+    private exitThis;
+}
+export {};

package/lib/scope/scopeContext.js

@@ -1,207 +1,298 @@
-import { putIfAbsent } from 'mani-injector';
-import { signalHandlers } from '../ecsInjector';
-export const scopeSignalHandlers = new Map();
-export const OnScopeSignal = (id, options) => (target, propertyKey, descriptor) => {
-    if (target instanceof Function) {
-        throw new Error('only allowed on non static methods');
-    }
-    else {
-        const mappingList = putIfAbsent(scopeSignalHandlers, target.constructor, () => []);
-        mappingList.push([propertyKey, id, options]);
-    }
-};
-class ScopeSignalBinding {
-    constructor(signalBinding, options) {
-        var _a, _b;
-        this.signalBinding = signalBinding;
-        this.keepAlive = (_a = options) === null || _a === void 0 ? void 0 : _a.keepAlive;
-        this.group = (_b = options) === null || _b === void 0 ? void 0 : _b.group;
-    }
-    activate() {
-        this.signalBinding.setActive(true);
-    }
-    deactivate() {
-        this.signalBinding.setActive(false);
-    }
-    detach() {
-        this.signalBinding.detach();
-    }
-}
-class ScopeStack {
-    constructor(rootScope) {
-        this.rootScope = rootScope;
-        this.stack = [];
-        this.stack.push(rootScope);
-    }
-    get rootContext() {
-        return this.stack[0];
-    }
-    get activeContext() {
-        return this.stack[this.stack.length - 1];
-    }
-}
-export class ScopeContext {
-    constructor(injector, scopeClass, mapping, parent) {
-        var _a, _b, _c, _d, _e;
-        this.parent = parent;
-        this.signalBindings = [];
-        this.serviceBindings = [];
-        this.closed = false;
-        this.muteKeepAliveSignals = false;
-        if (!parent) {
-            this.stack = new ScopeStack(this);
-        }
-        else {
-            this.stack = parent.stack;
-            this.stack.stack.push(this);
-        }
-        this.injector = injector.createChild();
-        this.injector.map(scopeClass).toSingleton();
-        this.injector.map(ScopeContext).toValue(this);
-        (_a = mapping) === null || _a === void 0 ? void 0 : _a({
-            injector: this.injector,
-            registerScopeService: serviceClass => {
-                this.injector.map(serviceClass).toSingleton();
-                this.mapServiceSignals(this.injector.get(serviceClass));
-            },
-        });
-        this.scope = this.injector.get(scopeClass);
-        this.mapScopeSignals();
-        this.updateSignalBindings();
-        (_c = (_b = this.scope).onEnter) === null || _c === void 0 ? void 0 : _c.call(_b);
-        (_e = (_d = this.scope).onActivate) === null || _e === void 0 ? void 0 : _e.call(_d);
-    }
-    get isRoot() {
-        return this === this.stack.rootScope;
-    }
-    get isActive() {
-        return this === this.stack.activeContext;
-    }
-    get activeContext() { return this.stack.activeContext; }
-    enterScope(scopeClass, mapping) {
-        var _a, _b, _c, _d;
-        (_b = (_a = this.activeContext.scope).onSubExit) === null || _b === void 0 ? void 0 : _b.call(_a);
-        (_d = (_c = this.activeContext.scope).onDeactivate) === null || _d === void 0 ? void 0 : _d.call(_c);
-        const newContext = new ScopeContext(this.activeContext.injector, scopeClass, mapping, this.activeContext);
-        this.logStack();
-        return newContext;
-    }
-    exitScope(target) {
-        if (this.closed)
-            throw new Error(`Scope already closed`);
-        if (!target)
-            target = this.scope.constructor;
-        while (true) {
-            const ctx = this.stack.stack.pop();
-            if (!ctx) {
-                throw new Error('no scope in stack');
-            }
-            ctx.exitThis();
-            if (ctx.scope.constructor === target) {
-                break;
-            }
-        }
-    }
-    closeSubScopes() {
-        while (!this.isActive) {
-            const ctx = this.stack.stack.pop();
-            if (!ctx) {
-                throw new Error('no scope in stack');
-            }
-            ctx.exitThis();
-        }
-    }
-    logStack() {
-        console.debug('%c' + this.stack.stack.map(c => c.scope.constructor.name).join(' >> '), 'color:yellow');
-    }
-    getStackClasses() {
-        return this.stack.stack.map(context => context.scope.constructor);
-    }
-    addScopeSignal(signal, callback, params) {
-        var _a;
-        const signalBinding = new ScopeSignalBinding(signal.add(callback, (_a = params) === null || _a === void 0 ? void 0 : _a.context), params);
-        this.signalBindings.push(signalBinding);
-    }
-    disableKeepAliveSignals() {
-        this.muteKeepAliveSignals = true;
-        this.updateSignalBindings();
-    }
-    enableKeepAliveSignals() {
-        this.muteKeepAliveSignals = false;
-        this.updateSignalBindings();
-    }
-    updateSignalBindings(muteKeepAlive = false) {
-        var _a;
-        for (const binding of this.signalBindings) {
-            if (this.isActive) {
-                binding.activate();
-            }
-            else if (muteKeepAlive) {
-                binding.deactivate();
-            }
-            else if (binding.keepAlive === true) {
-                binding.activate();
-            }
-            else if (!!(binding.keepAlive)) {
-                if (binding.keepAlive.indexOf(this.activeContext.scope.constructor) != -1) {
-                    binding.activate();
-                }
-                else {
-                    binding.deactivate();
-                }
-            }
-            else {
-                binding.deactivate();
-            }
-        }
-        muteKeepAlive = muteKeepAlive || this.muteKeepAliveSignals;
-        (_a = this.parent) === null || _a === void 0 ? void 0 : _a.updateSignalBindings(muteKeepAlive);
-    }
-    detachSignalBindings() {
-        for (const signalBinding of this.signalBindings) {
-            signalBinding.detach();
-        }
-    }
-    mapScopeSignals() {
-        const handlers = scopeSignalHandlers.get(this.scope.constructor);
-        if (!handlers)
-            return;
-        for (const [field, id, options] of handlers) {
-            const signal = this.injector.getSignal(id);
-            const callback = this.scope[field];
-            this.addScopeSignal(signal, callback, Object.assign(Object.assign({}, options), { context: this.scope }));
-        }
-    }
-    mapServiceSignals(scopeService) {
-        const handlers = signalHandlers.get(scopeService.constructor);
-        if (!handlers)
-            return;
-        for (const [field, id] of handlers) {
-            const signal = this.injector.getSignal(id);
-            const signalBinding = signal.add(scopeService[field], scopeService);
-            this.serviceBindings.push(signalBinding);
-        }
-    }
-    detachServiceBindings() {
-        for (const binding of this.serviceBindings) {
-            binding.detach();
-        }
-        this.serviceBindings = [];
-    }
-    exitThis() {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        if (!this.parent) {
-            throw new Error('can\'t exit root scope?!');
-        }
-        this.detachSignalBindings();
-        this.detachServiceBindings();
-        (_b = (_a = this.scope).onDeactivate) === null || _b === void 0 ? void 0 : _b.call(_a);
-        (_d = (_c = this.scope).onExit) === null || _d === void 0 ? void 0 : _d.call(_c);
-        this.parent.updateSignalBindings();
-        (_f = (_e = this.parent.scope).onSubReturn) === null || _f === void 0 ? void 0 : _f.call(_e);
-        (_h = (_g = this.parent.scope).onActivate) === null || _h === void 0 ? void 0 : _h.call(_g);
-        this.closed = true;
-        this.logStack();
-    }
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScopeContext = exports.SCOPE_CONTEXT = exports.OnScopeSignal = exports.scopeSignalHandlers = void 0;
+const index_1 = require("../index");
+const ecsInjector_1 = require("../ecsInjector");
+const injector_1 = require("../injector");
+exports.scopeSignalHandlers = new Map();
+const OnScopeSignal = (id, options) => (target, propertyKey, descriptor) => {
+    if (target instanceof Function) {
+        throw new Error('only allowed on non static methods');
+    }
+    else {
+        const mappingList = (0, injector_1.putIfAbsent)(exports.scopeSignalHandlers, target.constructor, () => []);
+        mappingList.push([propertyKey, id, options]);
+    }
+};
+exports.OnScopeSignal = OnScopeSignal;
+exports.SCOPE_CONTEXT = {
+    log: true,
+};
+class ScopeSignalBinding {
+    constructor(signalBinding, options) {
+        this.signalBinding = signalBinding;
+        this.keepAlive = options === null || options === void 0 ? void 0 : options.keepAlive;
+        this.group = options === null || options === void 0 ? void 0 : options.group;
+    }
+    activate() {
+        this.signalBinding.setActive(true);
+    }
+    deactivate() {
+        this.signalBinding.setActive(false);
+    }
+    detach() {
+        this.signalBinding.detach();
+    }
+}
+class ScopeStack {
+    constructor(rootScope) {
+        this.rootScope = rootScope;
+        this.stack = [];
+        this.queuedScopeChanges = [];
+        this.ongoingChange = false;
+        this.stack.push(rootScope);
+    }
+    get rootContext() {
+        return this.stack[0];
+    }
+    get activeContext() {
+        return this.stack[this.stack.length - 1];
+    }
+}
+class ScopeContext {
+    get runtime() {
+        return (performance.now() - this.creationTime) / 1000;
+    }
+    constructor(injector, scopeClass, mapping, parent, resolve) {
+        this.parent = parent;
+        this.signalBindings = [];
+        this.serviceBindings = [];
+        this.closed = false;
+        this.muteKeepAliveSignals = false;
+        this.onEnter = new index_1.Signal();
+        this.onExit = new index_1.Signal();
+        this.onSubReturn = new index_1.Signal();
+        this.onSubExit = new index_1.Signal();
+        this.onActivate = new index_1.Signal();
+        this.onDeactivate = new index_1.Signal();
+        this.creationTime = performance.now();
+        if (!parent) {
+            this.stack = new ScopeStack(this);
+        }
+        else {
+            this.stack = parent.stack;
+            this.stack.stack.push(this);
+        }
+        this.injector = injector.createChild();
+        this.injector.map(scopeClass).toSingleton();
+        this.injector.map(ScopeContext).toValue(this);
+        const result = mapping === null || mapping === void 0 ? void 0 : mapping({
+            injector: this.injector,
+            registerScopeService: serviceClass => {
+                this.injector.map(serviceClass).toSingleton();
+                this.mapServiceSignals(this.injector.get(serviceClass));
+            },
+            onEnter: this.onEnter,
+            onExit: this.onExit,
+            onSubReturn: this.onSubReturn,
+            onSubExit: this.onSubExit,
+            onActivate: this.onActivate,
+            onDeactivate: this.onDeactivate,
+        });
+        const completeScopeChange = () => {
+            var _a, _b, _c, _d;
+            this.scope = this.injector.get(scopeClass);
+            this.mapScopeSignals();
+            this.updateSignalBindings();
+            (_b = (_a = this.scope).onEnter) === null || _b === void 0 ? void 0 : _b.call(_a);
+            this.onEnter.dispatch(this);
+            (_d = (_c = this.scope).onActivate) === null || _d === void 0 ? void 0 : _d.call(_c);
+            this.onActivate.dispatch(this);
+            resolve === null || resolve === void 0 ? void 0 : resolve();
+        };
+        if (result instanceof Promise) {
+            result.then(completeScopeChange);
+        }
+        else {
+            completeScopeChange();
+        }
+    }
+    get isRoot() {
+        return this === this.stack.rootScope;
+    }
+    get target() {
+        return this.stack.target;
+    }
+    get isActive() {
+        return this === this.stack.activeContext;
+    }
+    get activeContext() { return this.stack.activeContext; }
+    async enterScope(scopeClass, mapping) {
+        let newContext;
+        const doChange = async () => {
+            var _a, _b, _c, _d;
+            (_b = (_a = this.activeContext.scope).onSubExit) === null || _b === void 0 ? void 0 : _b.call(_a);
+            this.activeContext.onSubExit.dispatch(this);
+            (_d = (_c = this.activeContext.scope).onDeactivate) === null || _d === void 0 ? void 0 : _d.call(_c);
+            this.activeContext.onDeactivate.dispatch(this);
+            await new Promise(resolve => {
+                newContext = new ScopeContext(this.activeContext.injector, scopeClass, mapping, this.activeContext, resolve);
+            });
+            this.logStack();
+            const nextChange = this.stack.queuedScopeChanges.shift();
+            if (nextChange) {
+                await nextChange();
+            }
+            else {
+                this.stack.ongoingChange = false;
+            }
+        };
+        if (!this.stack.ongoingChange) {
+            this.stack.ongoingChange = true;
+            await doChange();
+        }
+        else {
+            this.stack.queuedScopeChanges.push(doChange);
+        }
+        return newContext;
+    }
+    async exitScope(target) {
+        const doChange = async () => {
+            if (this.closed)
+                throw new Error(`Scope already closed`);
+            this.stack.target = target || this.scope.constructor;
+            while (true) {
+                const ctx = this.stack.stack.pop();
+                if (!ctx) {
+                    throw new Error('no scope in stack');
+                }
+                ctx.exitThis();
+                if (ctx.scope.constructor === this.stack.target) {
+                    break;
+                }
+            }
+            this.stack.target = undefined;
+            const nextChange = this.stack.queuedScopeChanges.shift();
+            if (nextChange) {
+                await nextChange();
+            }
+            else {
+                this.stack.ongoingChange = false;
+            }
+        };
+        if (!this.stack.ongoingChange) {
+            this.stack.ongoingChange = true;
+            await doChange();
+        }
+        else {
+            this.stack.queuedScopeChanges.push(doChange);
+        }
+    }
+    closeSubScopes() {
+        this.stack.target = this.scope.constructor;
+        while (!this.isActive) {
+            const ctx = this.stack.stack.pop();
+            if (!ctx) {
+                throw new Error('no scope in stack');
+            }
+            ctx.exitThis();
+        }
+        this.stack.target = undefined;
+    }
+    logStack() {
+        if (exports.SCOPE_CONTEXT.log) {
+            console.debug('%c' + this.stack.stack.map(c => c.scope.constructor.name).join(' -> '), 'color:yellow');
+        }
+    }
+    getStackClasses() {
+        return this.stack.stack.map(context => context.scope.constructor);
+    }
+    addScopeSignal(signal, callback, params) {
+        const signalBinding = new ScopeSignalBinding(signal.add(callback, params === null || params === void 0 ? void 0 : params.context), params);
+        this.signalBindings.push(signalBinding);
+    }
+    disableKeepAliveSignals() {
+        this.muteKeepAliveSignals = true;
+        this.updateSignalBindings();
+    }
+    enableKeepAliveSignals() {
+        this.muteKeepAliveSignals = false;
+        this.updateSignalBindings();
+    }
+    updateSignalBindings(muteKeepAlive = false) {
+        var _a;
+        for (const binding of this.signalBindings) {
+            if (this.isActive) {
+                binding.activate();
+            }
+            else if (muteKeepAlive) {
+                binding.deactivate();
+            }
+            else if (binding.keepAlive === true) {
+                binding.activate();
+            }
+            else if (!!(binding.keepAlive)) {
+                if (binding.keepAlive.indexOf(this.activeContext.scope.constructor) != -1) {
+                    binding.activate();
+                }
+                else {
+                    binding.deactivate();
+                }
+            }
+            else {
+                binding.deactivate();
+            }
+        }
+        muteKeepAlive = muteKeepAlive || this.muteKeepAliveSignals;
+        (_a = this.parent) === null || _a === void 0 ? void 0 : _a.updateSignalBindings(muteKeepAlive);
+    }
+    detachSignalBindings() {
+        for (const signalBinding of this.signalBindings) {
+            signalBinding.detach();
+        }
+    }
+    mapScopeSignals() {
+        const handlers = exports.scopeSignalHandlers.get(this.scope.constructor);
+        if (!handlers)
+            return;
+        for (const [field, id, options] of handlers) {
+            const signal = this.injector.getSignal(id);
+            const callback = this.scope[field];
+            this.addScopeSignal(signal, callback, Object.assign(Object.assign({}, options), { context: this.scope }));
+        }
+    }
+    mapServiceSignals(scopeService) {
+        const handlers = ecsInjector_1.signalHandlers.get(scopeService.constructor);
+        if (!handlers)
+            return;
+        for (const [field, id] of handlers) {
+            const signal = this.injector.getSignal(id);
+            const signalBinding = signal.add(scopeService[field], scopeService);
+            this.serviceBindings.push(signalBinding);
+        }
+    }
+    detachServiceBindings() {
+        for (const binding of this.serviceBindings) {
+            binding.detach();
+        }
+        this.serviceBindings = [];
+    }
+    exitThis() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!this.parent) {
+            throw new Error('can\'t exit root scope?!');
+        }
+        this.logStack();
+        this.detachSignalBindings();
+        this.detachServiceBindings();
+        (_b = (_a = this.scope).onDeactivate) === null || _b === void 0 ? void 0 : _b.call(_a);
+        this.onDeactivate.dispatch(this);
+        (_d = (_c = this.scope).onExit) === null || _d === void 0 ? void 0 : _d.call(_c);
+        this.onExit.dispatch(this);
+        this.injector._dispose();
+        this.parent.updateSignalBindings();
+        (_f = (_e = this.parent.scope).onSubReturn) === null || _f === void 0 ? void 0 : _f.call(_e);
+        this.onSubReturn.dispatch(this);
+        (_h = (_g = this.parent.scope).onActivate) === null || _h === void 0 ? void 0 : _h.call(_g);
+        this.parent.onActivate.dispatch(this);
+        this.closed = true;
+        this.onEnter.detachAll();
+        this.onExit.detachAll();
+        this.onSubReturn.detachAll();
+        this.onSubExit.detachAll();
+        this.onActivate.detachAll();
+        this.onDeactivate.detachAll();
+    }
+}
+exports.ScopeContext = ScopeContext;
 //# sourceMappingURL=scopeContext.js.map