mani-game-engine 1.0.0-pre.55 → 1.0.0-pre.56
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -31,29 +31,34 @@ export type ScopeMapping = (params: {
|
|
|
31
31
|
interface AddScopeSignalOptions extends ScopeSignalOptions {
|
|
32
32
|
context?: unknown;
|
|
33
33
|
}
|
|
34
|
-
export
|
|
34
|
+
export type ScopeChangeParams = {
|
|
35
|
+
from: ScopeContext;
|
|
36
|
+
to: ScopeContext;
|
|
37
|
+
};
|
|
38
|
+
export declare class ScopeContext<T extends Class = Class<Scope>> {
|
|
35
39
|
private parent?;
|
|
36
|
-
readonly scope:
|
|
40
|
+
readonly scope: InstanceType<T>;
|
|
37
41
|
readonly injector: EcsInjector;
|
|
38
42
|
private readonly stack;
|
|
39
43
|
private readonly signalBindings;
|
|
40
44
|
private serviceBindings;
|
|
41
45
|
private closed;
|
|
42
46
|
private muteKeepAliveSignals;
|
|
43
|
-
readonly onEnter: Signal<ScopeContext
|
|
44
|
-
readonly onExit: Signal<ScopeContext
|
|
45
|
-
readonly onSubReturn: Signal<ScopeContext
|
|
46
|
-
readonly onSubExit: Signal<ScopeContext
|
|
47
|
-
readonly onActivate: Signal<ScopeContext
|
|
48
|
-
readonly onDeactivate: Signal<ScopeContext
|
|
47
|
+
readonly onEnter: Signal<ScopeContext<Class<Scope>>>;
|
|
48
|
+
readonly onExit: Signal<ScopeContext<Class<Scope>>>;
|
|
49
|
+
readonly onSubReturn: Signal<ScopeContext<Class<Scope>>>;
|
|
50
|
+
readonly onSubExit: Signal<ScopeContext<Class<Scope>>>;
|
|
51
|
+
readonly onActivate: Signal<ScopeContext<Class<Scope>>>;
|
|
52
|
+
readonly onDeactivate: Signal<ScopeContext<Class<Scope>>>;
|
|
49
53
|
private readonly creationTime;
|
|
54
|
+
readonly onScopeChange: Signal<ScopeChangeParams>;
|
|
50
55
|
get runtime(): number;
|
|
51
|
-
constructor(injector: EcsInjector, scopeClass:
|
|
56
|
+
constructor(injector: EcsInjector, scopeClass: T, mapping?: ScopeMapping, parent?: ScopeContext<Class<Scope>> | undefined, resolve?: () => void);
|
|
52
57
|
get isRoot(): boolean;
|
|
53
58
|
get target(): Scope | undefined;
|
|
54
59
|
get isActive(): boolean;
|
|
55
|
-
get activeContext(): ScopeContext
|
|
56
|
-
enterScope(scopeClass: Class, mapping?: ScopeMapping): Promise<ScopeContext | undefined>;
|
|
60
|
+
get activeContext(): ScopeContext<Class<Scope>>;
|
|
61
|
+
enterScope(scopeClass: Class, mapping?: ScopeMapping): Promise<ScopeContext<Class<Scope>> | undefined>;
|
|
57
62
|
exitScope(target?: Scope): Promise<void>;
|
|
58
63
|
closeSubScopes(): void;
|
|
59
64
|
private logStack;
|
|
@@ -68,9 +68,11 @@ class ScopeContext {
|
|
|
68
68
|
this.creationTime = performance.now();
|
|
69
69
|
if (!parent) {
|
|
70
70
|
this.stack = new ScopeStack(this);
|
|
71
|
+
this.onScopeChange = new index_1.Signal();
|
|
71
72
|
}
|
|
72
73
|
else {
|
|
73
74
|
this.stack = parent.stack;
|
|
75
|
+
this.onScopeChange = parent.onScopeChange;
|
|
74
76
|
this.stack.stack.push(this);
|
|
75
77
|
}
|
|
76
78
|
this.injector = injector.createChild();
|
|
@@ -121,6 +123,7 @@ class ScopeContext {
|
|
|
121
123
|
let newContext;
|
|
122
124
|
const doChange = async () => {
|
|
123
125
|
var _a, _b, _c, _d;
|
|
126
|
+
const oldContext = this.activeContext;
|
|
124
127
|
(_b = (_a = this.activeContext.scope).onSubExit) === null || _b === void 0 ? void 0 : _b.call(_a);
|
|
125
128
|
this.activeContext.onSubExit.dispatch(this);
|
|
126
129
|
(_d = (_c = this.activeContext.scope).onDeactivate) === null || _d === void 0 ? void 0 : _d.call(_c);
|
|
@@ -129,6 +132,10 @@ class ScopeContext {
|
|
|
129
132
|
newContext = new ScopeContext(this.activeContext.injector, scopeClass, mapping, this.activeContext, resolve);
|
|
130
133
|
});
|
|
131
134
|
this.logStack();
|
|
135
|
+
this.onScopeChange.dispatch({
|
|
136
|
+
from: oldContext,
|
|
137
|
+
to: newContext,
|
|
138
|
+
});
|
|
132
139
|
const nextChange = this.stack.queuedScopeChanges.shift();
|
|
133
140
|
if (nextChange) {
|
|
134
141
|
await nextChange();
|
|
@@ -279,6 +286,7 @@ class ScopeContext {
|
|
|
279
286
|
this.onDeactivate.dispatch(this);
|
|
280
287
|
(_d = (_c = this.scope).onExit) === null || _d === void 0 ? void 0 : _d.call(_c);
|
|
281
288
|
this.onExit.dispatch(this);
|
|
289
|
+
this.onScopeChange.dispatch({ from: this, to: this.parent });
|
|
282
290
|
this.injector._dispose();
|
|
283
291
|
this.parent.updateSignalBindings();
|
|
284
292
|
(_f = (_e = this.parent.scope).onSubReturn) === null || _f === void 0 ? void 0 : _f.call(_e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeContext.js","sourceRoot":"","sources":["../../src/scope/scopeContext.ts"],"names":[],"mappings":";;;AAAA,oCAAmF;AACnF,gDAA8C;AAC9C,0CAA4C;AAI/B,QAAA,mBAAmB,GAAG,IAAI,GAAG,EAA+C,CAAC;AAEnF,MAAM,aAAa,GAAG,CAAC,EAAM,EAAE,OAA4B,EAAE,EAAE,CAAC,CAAC,MAAW,EAAE,WAAmB,EAAE,UAA8B,EAAE,EAAE;IACxI,IAAI,MAAM,YAAY,QAAQ,EAAE;QAC5B,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;KACzD;SAAM;QACH,MAAM,WAAW,GAAG,IAAA,sBAAW,EAAC,2BAAmB,EAAE,MAAM,CAAC,WAAW,EAAE,GAAwC,EAAE,CAAC,EAAE,CAAC,CAAC;QACxH,WAAW,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC,CAAC;KAChD;AACL,CAAC,CAAC;AAPW,QAAA,aAAa,iBAOxB;AAEW,QAAA,aAAa,GAAG;IACzB,GAAG,EAAE,IAAI;CACZ,CAAC;AAYF,MAAM,kBAAkB;IAIpB,YAAoB,aAA4B,EAAE,OAA4B;QAA1D,kBAAa,GAAb,aAAa,CAAe;QAC5C,IAAI,CAAC,SAAS,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS,CAAC;QACpC,IAAI,CAAC,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;IAChC,CAAC;IAED,QAAQ;QACJ,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,UAAU;QACN,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,MAAM;QACF,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC;IAChC,CAAC;CACJ;AAED,MAAM,UAAU;IAMZ,YAAqB,SAAuB;QAAvB,cAAS,GAAT,SAAS,CAAc;QALnC,UAAK,GAAmB,EAAE,CAAC;QACpC,uBAAkB,GAA4B,EAAE,CAAC;QACjD,kBAAa,GAAG,KAAK,CAAC;QAIlB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,WAAW;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,aAAa;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7C,CAAC;
|
|
1
|
+
{"version":3,"file":"scopeContext.js","sourceRoot":"","sources":["../../src/scope/scopeContext.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -50,7 +50,7 @@ class ScopeSignalBinding {
|
|
|
50
50
|
this.signalBinding.detach();
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
|
-
|
|
53
|
+
// TODO: rename to ScopeStack to something like InternalScopeTreeSingleton with an interface
|
|
54
54
|
class ScopeStack {
|
|
55
55
|
readonly stack: ScopeContext[] = [];
|
|
56
56
|
queuedScopeChanges: (() => Promise<void>)[] = [];
|
|
@@ -68,7 +68,6 @@ class ScopeStack {
|
|
|
68
68
|
get activeContext() {
|
|
69
69
|
return this.stack[this.stack.length - 1];
|
|
70
70
|
}
|
|
71
|
-
|
|
72
71
|
}
|
|
73
72
|
|
|
74
73
|
export type ScopeMapping = (params: {
|
|
@@ -87,9 +86,14 @@ interface AddScopeSignalOptions extends ScopeSignalOptions {
|
|
|
87
86
|
context?: unknown;
|
|
88
87
|
}
|
|
89
88
|
|
|
89
|
+
export type ScopeChangeParams = {
|
|
90
|
+
from: ScopeContext;
|
|
91
|
+
to: ScopeContext;
|
|
92
|
+
}
|
|
93
|
+
|
|
90
94
|
// TODO: maybe move Signal resolver to Injector and dont use EcsInjector here?
|
|
91
|
-
export class ScopeContext {
|
|
92
|
-
readonly scope!:
|
|
95
|
+
export class ScopeContext<T extends Class = Class<Scope>> {
|
|
96
|
+
readonly scope!: InstanceType<T>;
|
|
93
97
|
readonly injector: EcsInjector;
|
|
94
98
|
private readonly stack: ScopeStack; // TODO: naming
|
|
95
99
|
private readonly signalBindings: ScopeSignalBinding[] = [];
|
|
@@ -107,18 +111,21 @@ export class ScopeContext {
|
|
|
107
111
|
readonly onActivate = new Signal<ScopeContext>();
|
|
108
112
|
readonly onDeactivate = new Signal<ScopeContext>();
|
|
109
113
|
private readonly creationTime: DOMHighResTimeStamp;
|
|
114
|
+
readonly onScopeChange: Signal<ScopeChangeParams>;
|
|
110
115
|
|
|
111
116
|
get runtime() {
|
|
112
117
|
return (performance.now() - this.creationTime) / 1000;
|
|
113
118
|
}
|
|
114
119
|
|
|
115
|
-
constructor(injector: EcsInjector, scopeClass:
|
|
120
|
+
constructor(injector: EcsInjector, scopeClass: T, mapping?: ScopeMapping, private parent?: ScopeContext, resolve?: () => void) {
|
|
116
121
|
this.creationTime = performance.now();
|
|
117
122
|
if (!parent) {
|
|
118
123
|
this.stack = new ScopeStack(this);
|
|
124
|
+
this.onScopeChange = new Signal<ScopeChangeParams>();
|
|
119
125
|
|
|
120
126
|
} else {
|
|
121
127
|
this.stack = parent.stack;
|
|
128
|
+
this.onScopeChange = parent.onScopeChange;
|
|
122
129
|
this.stack.stack.push(this);
|
|
123
130
|
}
|
|
124
131
|
|
|
@@ -162,7 +169,7 @@ export class ScopeContext {
|
|
|
162
169
|
}
|
|
163
170
|
}
|
|
164
171
|
|
|
165
|
-
get isRoot() {
|
|
172
|
+
get isRoot(): boolean {
|
|
166
173
|
return this === this.stack.rootScope;
|
|
167
174
|
}
|
|
168
175
|
|
|
@@ -171,7 +178,7 @@ export class ScopeContext {
|
|
|
171
178
|
return this.stack.target;
|
|
172
179
|
}
|
|
173
180
|
|
|
174
|
-
get isActive() {
|
|
181
|
+
get isActive(): boolean {
|
|
175
182
|
return this === this.stack.activeContext;
|
|
176
183
|
}
|
|
177
184
|
|
|
@@ -185,7 +192,7 @@ export class ScopeContext {
|
|
|
185
192
|
async enterScope(scopeClass: Class, mapping?: ScopeMapping) {
|
|
186
193
|
let newContext: ScopeContext | undefined;
|
|
187
194
|
const doChange = async () => {
|
|
188
|
-
|
|
195
|
+
const oldContext = this.activeContext;
|
|
189
196
|
this.activeContext.scope.onSubExit?.();
|
|
190
197
|
this.activeContext.onSubExit.dispatch(this);
|
|
191
198
|
this.activeContext.scope.onDeactivate?.();
|
|
@@ -196,6 +203,10 @@ export class ScopeContext {
|
|
|
196
203
|
});
|
|
197
204
|
|
|
198
205
|
this.logStack();
|
|
206
|
+
this.onScopeChange.dispatch({
|
|
207
|
+
from: oldContext,
|
|
208
|
+
to: newContext!,
|
|
209
|
+
})
|
|
199
210
|
const nextChange = this.stack.queuedScopeChanges.shift();
|
|
200
211
|
if (nextChange) {
|
|
201
212
|
await nextChange();
|
|
@@ -359,7 +370,7 @@ export class ScopeContext {
|
|
|
359
370
|
|
|
360
371
|
this.scope.onExit?.();
|
|
361
372
|
this.onExit.dispatch(this);
|
|
362
|
-
|
|
373
|
+
this.onScopeChange.dispatch({from: this, to: this.parent});
|
|
363
374
|
this.injector._dispose();
|
|
364
375
|
|
|
365
376
|
this.parent.updateSignalBindings();
|