@mrpelz/observable 3.0.1 → 3.1.0
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.
- package/dist/main.d.ts +0 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +1 -8
- package/dist/main.js.map +1 -1
- package/dist/timer.d.ts +2 -2
- package/dist/timer.d.ts.map +1 -1
- package/dist/timer.js +12 -4
- package/dist/timer.js.map +1 -1
- package/package.json +1 -1
package/dist/main.d.ts
CHANGED
|
@@ -39,7 +39,6 @@ export declare class ProxyObservable<T, S = T> {
|
|
|
39
39
|
private readonly _get;
|
|
40
40
|
private readonly _observable;
|
|
41
41
|
private readonly _set;
|
|
42
|
-
private _suspend;
|
|
43
42
|
constructor(observable: AnyObservable<T>, get: ProxyFn<T, S>, set: ProxyFn<S, T | typeof ProxyObservable.doNotSet>);
|
|
44
43
|
get listeners(): number;
|
|
45
44
|
get value(): S;
|
package/dist/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -80,7 +80,6 @@ export class ProxyObservable {
|
|
|
80
80
|
_get;
|
|
81
81
|
_observable;
|
|
82
82
|
_set;
|
|
83
|
-
_suspend = false;
|
|
84
83
|
constructor(observable, get, set) {
|
|
85
84
|
this._observable = observable;
|
|
86
85
|
this._get = get;
|
|
@@ -95,19 +94,13 @@ export class ProxyObservable {
|
|
|
95
94
|
set value(value) {
|
|
96
95
|
if (!isWritableObservable(this._observable))
|
|
97
96
|
return;
|
|
98
|
-
this._suspend = true;
|
|
99
97
|
const nextValue = this._set(value);
|
|
100
98
|
if (nextValue !== ProxyObservable.doNotSet) {
|
|
101
99
|
this._observable.value = nextValue;
|
|
102
100
|
}
|
|
103
|
-
this._suspend = false;
|
|
104
101
|
}
|
|
105
102
|
observe(observerCallback, forcedReport = false) {
|
|
106
|
-
return this._observable.observe((value, observer, changed) =>
|
|
107
|
-
if (this._suspend)
|
|
108
|
-
return;
|
|
109
|
-
observerCallback(this._get(value), observer, changed);
|
|
110
|
-
}, forcedReport);
|
|
103
|
+
return this._observable.observe((value, observer, changed) => observerCallback(this._get(value), observer, changed), forcedReport);
|
|
111
104
|
}
|
|
112
105
|
}
|
|
113
106
|
export class ObservableGroup extends Observable {
|
package/dist/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AA+B1D,MAAM,OAAO,UAAU;IACJ,UAAU,CAAwC;IAC3D,MAAM,CAAI;IAElB,YACE,YAAe,EACf,gBAA0C,EAC1C,YAAY,GAAG,IAAI;QAEnB,IAAI,CAAC,MAAM,GAAG,YAAY,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,gBAAgB;YAChC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC,CAAC;YAC7C,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;IAChB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IAED,IAAI,KAAK,CAAC,KAAQ;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QAEpB,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC;QAEzC,KAAK,MAAM,CAAC,QAAQ,EAAE,YAAY,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACvD,IAAI,CAAC,OAAO,IAAI,CAAC,YAAY;gBAAE,SAAS;YAExC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,CAAC;IACH,CAAC;IAED,OAAO,CACL,gBAAqC,EACrC,YAAY,GAAG,KAAK;QAEpB,IAAI,QAAkB,CAAC;QAEvB,MAAM,oBAAoB,GAAG,CAAC,KAAQ,EAAE,OAAgB,EAAE,EAAE;YAC1D,gBAAgB,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;QAC7C,CAAC,CAAC;QAEF,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC;QAExD,QAAQ,GAAG;YACT,MAAM,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,oBAAoB,CAAC;SAC3D,CAAC;QAEF,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF;AAED,MAAM,OAAO,kBAAkB;IACZ,WAAW,CAAmB;IAE/C,YAAY,UAA4B;QACtC,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;IAChC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC;IAChC,CAAC;IAED,OAAO,CACL,gBAAqC,EACrC,YAAY,GAAG,KAAK;QAEpB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;IAClE,CAAC;CACF;AAED,MAAM,OAAO,uBAAuB;IACjB,IAAI,CAAgB;IACpB,WAAW,CAAmB;IAE/C,YAAY,UAA4B,EAAE,GAAkB;QAC1D,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO,CACL,gBAAqC,EACrC,YAAY,GAAG,KAAK;QAEpB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAC7B,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAC3B,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,EACvD,YAAY,CACb,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAuB,EACY,EAAE;IACrC,IAAI,KAAK,YAAY,kBAAkB;QAAE,OAAO,KAAK,CAAC;IACtD,IAAI,KAAK,YAAY,uBAAuB;QAAE,OAAO,KAAK,CAAC;IAE3D,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,OAAO,eAAe;IAC1B,MAAM,CAAU,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAE7B,IAAI,CAAgB;IACpB,WAAW,CAAmB;IAC9B,IAAI,CAAkD;IAEvE,YACE,UAA4B,EAC5B,GAAkB,EAClB,GAAoD;QAEpD,IAAI,CAAC,WAAW,GAAG,UAAU,CAAC;QAC9B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;QAChB,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,IAAI,KAAK,CAAC,KAAQ;QAChB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC;YAAE,OAAO;QAEpD,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,SAAS,KAAK,eAAe,CAAC,QAAQ,EAAE,CAAC;YAC3C,IAAI,CAAC,WAAW,CAAC,KAAK,GAAG,SAAS,CAAC;QACrC,CAAC;IACH,CAAC;IAED,OAAO,CACL,gBAAqC,EACrC,YAAY,GAAG,KAAK;QAEpB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,CAC7B,CAAC,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,CAC3B,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,EACvD,YAAY,CACb,CAAC;IACJ,CAAC;;AAGH,MAAM,OAAO,eAAmB,SAAQ,UAAa;IAChC,YAAY,CAAwB;IAEvD,YAAY,YAAe,EAAE,cAAkC,EAAE;QAC/D,KAAK,CAAC,YAAY,CAAC,CAAC;QAEpB,IAAI,CAAC,YAAY,GAAG,WAAW,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;QAEnE,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YACtC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC;QACxD,CAAC;IACH,CAAC;IAED,IAAI,WAAW;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,KAAK,CAAC,KAAQ;QAChB,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;YAC3C,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;gBACtC,SAAS;YACX,CAAC;YAED,UAAU,CAAC,KAAK,GAAG,KAAK,CAAC;QAC3B,CAAC;QAED,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC;IACtB,CAAC;IAES,MAAM;QACd,MAAM,IAAI,KAAK,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;IAC1D,CAAC;CACF;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,CAC1B,KAAc,EAEe,EAAE;IAC/B,IAAI,KAAK,YAAY,UAAU;QAAE,OAAO,IAAI,CAAC;IAC7C,IAAI,KAAK,YAAY,kBAAkB;QAAE,OAAO,IAAI,CAAC;IACrD,IAAI,KAAK,YAAY,eAAe;QAAE,OAAO,IAAI,CAAC;IAClD,IAAI,KAAK,YAAY,uBAAuB;QAAE,OAAO,IAAI,CAAC;IAE1D,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,KAAc,EAEuB,EAAE;IACvC,IAAI,KAAK,YAAY,kBAAkB;QAAE,OAAO,IAAI,CAAC;IACrD,IAAI,KAAK,YAAY,uBAAuB;QAAE,OAAO,IAAI,CAAC;IAE1D,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAI,EAAsB,EAAsB,EAAE;IACzE,MAAM,UAAU,GAAG,IAAI,UAAU,CAAW,IAAI,CAAC,CAAC;IAClD,MAAM,OAAO,GAAG,KAAK,IAAI,EAAE;QACzB,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC;QACxC,UAAU,CAAC,KAAK,GAAG,MAAM,CAAC;IAC5B,CAAC,CAAC;IAEF,OAAO,CAAC,IAAI,kBAAkB,CAAC,UAAU,CAAC,EAAE,OAAO,CAAC,CAAC;AACvD,CAAC,CAAC"}
|
package/dist/timer.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { AnyReadOnlyObservable, ReadOnlyProxyObservable } from './main.js';
|
|
1
|
+
import { AnyReadOnlyObservable, Observable, ReadOnlyProxyObservable } from './main.js';
|
|
2
2
|
import { BooleanState, NullState } from './state.js';
|
|
3
3
|
export declare class Timer extends NullState {
|
|
4
|
-
private readonly _time;
|
|
5
4
|
private _timeout;
|
|
6
5
|
private readonly _triggerTime;
|
|
7
6
|
readonly isEnabled: BooleanState;
|
|
8
7
|
readonly runoutTime: ReadOnlyProxyObservable<number | null>;
|
|
8
|
+
readonly time: Observable<number>;
|
|
9
9
|
constructor(time?: number, enableFromStart?: boolean);
|
|
10
10
|
get isActive(): AnyReadOnlyObservable<boolean>;
|
|
11
11
|
get triggerTime(): AnyReadOnlyObservable<number | null>;
|
package/dist/timer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,
|
|
1
|
+
{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,UAAU,EAEV,uBAAuB,EACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAErD,qBAAa,KAAM,SAAQ,SAAS;IAClC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAuC;IAEpE,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,uBAAuB,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC5D,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC;gBAEtB,IAAI,SAAI,EAAE,eAAe,UAAO;IAyB5C,IAAI,QAAQ,IAAI,qBAAqB,CAAC,OAAO,CAAC,CAE7C;IAED,IAAI,WAAW,IAAI,qBAAqB,CAAC,MAAM,GAAG,IAAI,CAAC,CAEtD;IAED,OAAO,CAAC,WAAW;IAKnB,OAAO,IAAI,IAAI;IAIf,MAAM,IAAI,IAAI;IAId,KAAK,CAAC,OAAO,UAAO,GAAG,IAAI;IAW3B,IAAI,IAAI,IAAI;CAOb"}
|
package/dist/timer.js
CHANGED
|
@@ -1,23 +1,29 @@
|
|
|
1
1
|
import { Observable, ReadOnlyObservable, ReadOnlyProxyObservable, } from './main.js';
|
|
2
2
|
import { BooleanState, NullState } from './state.js';
|
|
3
3
|
export class Timer extends NullState {
|
|
4
|
-
_time;
|
|
5
4
|
_timeout;
|
|
6
5
|
_triggerTime = new Observable(null);
|
|
7
6
|
isEnabled;
|
|
8
7
|
runoutTime;
|
|
8
|
+
time;
|
|
9
9
|
constructor(time = 0, enableFromStart = true) {
|
|
10
10
|
super();
|
|
11
|
-
this._time = time;
|
|
12
11
|
this.isEnabled = new BooleanState(enableFromStart, (enabled) => {
|
|
13
12
|
if (enabled)
|
|
14
13
|
return;
|
|
15
14
|
this.stop();
|
|
16
15
|
});
|
|
16
|
+
this.time = new Observable(time, (_, changed) => {
|
|
17
|
+
if (!changed)
|
|
18
|
+
return;
|
|
19
|
+
if (!this.isActive.value)
|
|
20
|
+
return;
|
|
21
|
+
this.start();
|
|
22
|
+
});
|
|
17
23
|
this.runoutTime = new ReadOnlyProxyObservable(this._triggerTime, (value) => {
|
|
18
24
|
if (value === null)
|
|
19
25
|
return null;
|
|
20
|
-
return value + this.
|
|
26
|
+
return value + this.time.value;
|
|
21
27
|
});
|
|
22
28
|
}
|
|
23
29
|
get isActive() {
|
|
@@ -37,12 +43,14 @@ export class Timer extends NullState {
|
|
|
37
43
|
this.isEnabled.value = true;
|
|
38
44
|
}
|
|
39
45
|
start(restart = true) {
|
|
46
|
+
if (this.time.value)
|
|
47
|
+
return;
|
|
40
48
|
if (!this.isEnabled.value)
|
|
41
49
|
return;
|
|
42
50
|
if (this._timeout && !restart)
|
|
43
51
|
return;
|
|
44
52
|
this.stop();
|
|
45
|
-
this._timeout = setTimeout(() => this._handleFire(), this.
|
|
53
|
+
this._timeout = setTimeout(() => this._handleFire(), this.time.value);
|
|
46
54
|
this._triggerTime.value = Date.now();
|
|
47
55
|
}
|
|
48
56
|
stop() {
|
package/dist/timer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,OAAO,KAAM,SAAQ,SAAS;
|
|
1
|
+
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../src/timer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EACV,kBAAkB,EAClB,uBAAuB,GACxB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAErD,MAAM,OAAO,KAAM,SAAQ,SAAS;IAC1B,QAAQ,CAAwB;IACvB,YAAY,GAAG,IAAI,UAAU,CAAgB,IAAI,CAAC,CAAC;IAE3D,SAAS,CAAe;IACxB,UAAU,CAAyC;IACnD,IAAI,CAAqB;IAElC,YAAY,IAAI,GAAG,CAAC,EAAE,eAAe,GAAG,IAAI;QAC1C,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,SAAS,GAAG,IAAI,YAAY,CAAC,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE;YAC7D,IAAI,OAAO;gBAAE,OAAO;YAEpB,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE;YAC9C,IAAI,CAAC,OAAO;gBAAE,OAAO;YACrB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK;gBAAE,OAAO;YAEjC,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,GAAG,IAAI,uBAAuB,CAC3C,IAAI,CAAC,YAAY,EACjB,CAAC,KAAK,EAAE,EAAE;YACR,IAAI,KAAK,KAAK,IAAI;gBAAE,OAAO,IAAI,CAAC;YAChC,OAAO,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QACjC,CAAC,CACF,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,uBAAuB,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;IACjE,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,kBAAkB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACnD,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,IAAI,EAAE,CAAC;QACZ,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,OAAO;QACL,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,KAAK,CAAC;IAC/B,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,OAAO,GAAG,IAAI;QAClB,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK;YAAE,OAAO;QAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK;YAAE,OAAO;QAClC,IAAI,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO;YAAE,OAAO;QAEtC,IAAI,CAAC,IAAI,EAAE,CAAC;QAEZ,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACtE,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvC,CAAC;IAED,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,OAAO;QAE3B,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,YAAY,CAAC,KAAK,GAAG,IAAI,CAAC;IACjC,CAAC;CACF"}
|