@quantform/core 0.5.15 → 0.5.23
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/adapter/adapter-aggregate.d.ts +5 -4
- package/dist/adapter/adapter-aggregate.js +4 -4
- package/dist/adapter/adapter-aggregate.js.map +1 -1
- package/dist/adapter/adapter.d.ts +4 -15
- package/dist/adapter/adapter.js.map +1 -1
- package/dist/adapter/backtester/backtester-adapter.d.ts +3 -3
- package/dist/adapter/backtester/backtester-adapter.js +4 -4
- package/dist/adapter/backtester/backtester-adapter.js.map +1 -1
- package/dist/adapter/backtester/backtester-adapter.spec.js +7 -6
- package/dist/adapter/backtester/backtester-adapter.spec.js.map +1 -1
- package/dist/adapter/backtester/backtester-cursor.d.ts +4 -4
- package/dist/adapter/backtester/backtester-cursor.js.map +1 -1
- package/dist/adapter/backtester/backtester-cursor.spec.js +19 -17
- package/dist/adapter/backtester/backtester-cursor.spec.js.map +1 -1
- package/dist/adapter/backtester/backtester-streamer.d.ts +0 -1
- package/dist/adapter/backtester/backtester-streamer.js +4 -14
- package/dist/adapter/backtester/backtester-streamer.js.map +1 -1
- package/dist/adapter/backtester/backtester-streamer.spec.js +12 -11
- package/dist/adapter/backtester/backtester-streamer.spec.js.map +1 -1
- package/dist/adapter/paper/engine/paper-engine.js +20 -19
- package/dist/adapter/paper/engine/paper-engine.js.map +1 -1
- package/dist/adapter/paper/engine/paper-engine.spec.js +19 -19
- package/dist/adapter/paper/engine/paper-engine.spec.js.map +1 -1
- package/dist/adapter/paper/paper-adapter.d.ts +4 -3
- package/dist/adapter/paper/paper-adapter.js +8 -7
- package/dist/adapter/paper/paper-adapter.js.map +1 -1
- package/dist/adapter/paper/paper-adapter.spec.js +5 -4
- package/dist/adapter/paper/paper-adapter.spec.js.map +1 -1
- package/dist/cli/pull.js +5 -10
- package/dist/cli/pull.js.map +1 -1
- package/dist/domain/asset.d.ts +4 -4
- package/dist/domain/asset.js +4 -7
- package/dist/domain/asset.js.map +1 -1
- package/dist/domain/asset.spec.js +4 -4
- package/dist/domain/asset.spec.js.map +1 -1
- package/dist/domain/balance.d.ts +9 -9
- package/dist/domain/balance.js +16 -15
- package/dist/domain/balance.js.map +1 -1
- package/dist/domain/balance.spec.js +37 -36
- package/dist/domain/balance.spec.js.map +1 -1
- package/dist/domain/candle.d.ts +8 -8
- package/dist/domain/candle.js +3 -2
- package/dist/domain/candle.js.map +1 -1
- package/dist/domain/candle.operator.d.ts +3 -2
- package/dist/domain/candle.operator.js.map +1 -1
- package/dist/domain/candle.operator.spec.js +43 -42
- package/dist/domain/candle.operator.spec.js.map +1 -1
- package/dist/domain/candle.spec.js +11 -11
- package/dist/domain/candle.spec.js.map +1 -1
- package/dist/domain/commission.d.ts +10 -9
- package/dist/domain/commission.js +5 -5
- package/dist/domain/commission.js.map +1 -1
- package/dist/domain/commission.spec.js +13 -12
- package/dist/domain/commission.spec.js.map +1 -1
- package/dist/domain/error.d.ts +2 -1
- package/dist/domain/error.js +1 -1
- package/dist/domain/error.js.map +1 -1
- package/dist/domain/order.d.ts +13 -13
- package/dist/domain/order.js +10 -9
- package/dist/domain/order.js.map +1 -1
- package/dist/domain/order.operator.spec.js +6 -5
- package/dist/domain/order.operator.spec.js.map +1 -1
- package/dist/domain/order.spec.js +11 -10
- package/dist/domain/order.spec.js.map +1 -1
- package/dist/domain/orderbook.d.ts +18 -6
- package/dist/domain/orderbook.js +5 -4
- package/dist/domain/orderbook.js.map +1 -1
- package/dist/domain/position.d.ts +7 -7
- package/dist/domain/position.js +2 -2
- package/dist/domain/position.js.map +1 -1
- package/dist/domain/position.operator.d.ts +3 -2
- package/dist/domain/position.operator.js +3 -3
- package/dist/domain/position.operator.js.map +1 -1
- package/dist/domain/position.operator.spec.js +4 -3
- package/dist/domain/position.operator.spec.js.map +1 -1
- package/dist/domain/position.spec.js +10 -9
- package/dist/domain/position.spec.js.map +1 -1
- package/dist/domain/session.js +1 -1
- package/dist/domain/session.js.map +1 -1
- package/dist/domain/session.spec.js +1 -1
- package/dist/domain/session.spec.js.map +1 -1
- package/dist/domain/trade.d.ts +3 -3
- package/dist/indicator/atr.d.ts +2 -1
- package/dist/indicator/atr.js +3 -3
- package/dist/indicator/atr.js.map +1 -1
- package/dist/indicator/cross.d.ts +3 -2
- package/dist/indicator/cross.js +13 -13
- package/dist/indicator/cross.js.map +1 -1
- package/dist/indicator/cross.spec.js +22 -21
- package/dist/indicator/cross.spec.js.map +1 -1
- package/dist/indicator/donchian.d.ts +3 -2
- package/dist/indicator/donchian.js.map +1 -1
- package/dist/indicator/drawdown.d.ts +2 -1
- package/dist/indicator/drawdown.js +3 -2
- package/dist/indicator/drawdown.js.map +1 -1
- package/dist/indicator/ema.d.ts +2 -1
- package/dist/indicator/ema.js +3 -2
- package/dist/indicator/ema.js.map +1 -1
- package/dist/indicator/ema.spec.js +3 -2
- package/dist/indicator/ema.spec.js.map +1 -1
- package/dist/indicator/envelope.d.ts +4 -3
- package/dist/indicator/envelope.js +4 -4
- package/dist/indicator/envelope.js.map +1 -1
- package/dist/indicator/index.d.ts +1 -1
- package/dist/indicator/index.js +1 -1
- package/dist/indicator/index.js.map +1 -1
- package/dist/indicator/macd.d.ts +2 -1
- package/dist/indicator/macd.js +1 -1
- package/dist/indicator/macd.js.map +1 -1
- package/dist/indicator/min-max.d.ts +4 -3
- package/dist/indicator/min-max.js +5 -4
- package/dist/indicator/min-max.js.map +1 -1
- package/dist/indicator/rma.d.ts +2 -1
- package/dist/indicator/rma.js +3 -2
- package/dist/indicator/rma.js.map +1 -1
- package/dist/indicator/sma.d.ts +2 -1
- package/dist/indicator/sma.js +4 -6
- package/dist/indicator/sma.js.map +1 -1
- package/dist/indicator/sma.spec.js +3 -2
- package/dist/indicator/sma.spec.js.map +1 -1
- package/dist/indicator/swma.d.ts +2 -1
- package/dist/indicator/swma.js +5 -1
- package/dist/indicator/swma.js.map +1 -1
- package/dist/indicator/tma.d.ts +2 -1
- package/dist/indicator/tma.js.map +1 -1
- package/dist/indicator/tma.spec.js +3 -2
- package/dist/indicator/tma.spec.js.map +1 -1
- package/dist/indicator/trailing.d.ts +8 -7
- package/dist/indicator/trailing.js +12 -11
- package/dist/indicator/trailing.js.map +1 -1
- package/dist/indicator/trailing.spec.js +15 -14
- package/dist/indicator/trailing.spec.js.map +1 -1
- package/dist/indicator/true-range.d.ts +4 -0
- package/dist/indicator/true-range.js +20 -0
- package/dist/indicator/true-range.js.map +1 -0
- package/dist/indicator/{truerange.spec.d.ts → true-range.spec.d.ts} +0 -0
- package/dist/indicator/true-range.spec.js +28 -0
- package/dist/indicator/true-range.spec.js.map +1 -0
- package/dist/indicator/window.d.ts +1 -1
- package/dist/indicator/window.js +1 -1
- package/dist/indicator/window.js.map +1 -1
- package/dist/indicator/wma.d.ts +2 -1
- package/dist/indicator/wma.js +6 -5
- package/dist/indicator/wma.js.map +1 -1
- package/dist/indicator/wma.spec.js +3 -2
- package/dist/indicator/wma.spec.js.map +1 -1
- package/dist/shared/collections.d.ts +16 -0
- package/dist/shared/collections.js +83 -1
- package/dist/shared/collections.js.map +1 -1
- package/dist/shared/collections.spec.d.ts +1 -0
- package/dist/shared/collections.spec.js +28 -0
- package/dist/shared/collections.spec.js.map +1 -0
- package/dist/shared/decimals.d.ts +15 -6
- package/dist/shared/decimals.js +21 -34
- package/dist/shared/decimals.js.map +1 -1
- package/dist/shared/decimals.spec.js +17 -22
- package/dist/shared/decimals.spec.js.map +1 -1
- package/dist/shared/index.d.ts +1 -0
- package/dist/shared/index.js +1 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/pipe.d.ts +4 -0
- package/dist/shared/pipe.js +9 -0
- package/dist/shared/pipe.js.map +1 -0
- package/dist/storage/feed.d.ts +8 -4
- package/dist/storage/feed.js +55 -18
- package/dist/storage/feed.js.map +1 -1
- package/dist/store/store-balance.event.d.ts +6 -6
- package/dist/store/store-balance.event.js +2 -2
- package/dist/store/store-balance.event.js.map +1 -1
- package/dist/store/store-balance.event.spec.js +4 -4
- package/dist/store/store-balance.event.spec.js.map +1 -1
- package/dist/store/store-instrument.event.js.map +1 -1
- package/dist/store/store-instrument.event.spec.js +1 -1
- package/dist/store/store-instrument.event.spec.js.map +1 -1
- package/dist/store/store-order.event.d.ts +3 -3
- package/dist/store/store-order.event.js.map +1 -1
- package/dist/store/store-order.event.spec.js +1 -1
- package/dist/store/store-order.event.spec.js.map +1 -1
- package/dist/store/store-orderbook.event.d.ts +4 -6
- package/dist/store/store-orderbook.event.js +13 -13
- package/dist/store/store-orderbook.event.js.map +1 -1
- package/dist/store/store-orderbook.event.spec.d.ts +1 -0
- package/dist/store/store-orderbook.event.spec.js +28 -0
- package/dist/store/store-orderbook.event.spec.js.map +1 -0
- package/dist/store/store-position.event.d.ts +4 -4
- package/dist/store/store-position.event.js +23 -11
- package/dist/store/store-position.event.js.map +1 -1
- package/dist/store/store-trade.event.d.ts +4 -4
- package/dist/store/store-trade.event.js +2 -2
- package/dist/store/store-trade.event.js.map +1 -1
- package/dist/store/store-trade.event.spec.js +8 -8
- package/dist/store/store-trade.event.spec.js.map +1 -1
- package/dist/store/store.spec.js +15 -15
- package/dist/store/store.spec.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/jestconfig.json +1 -0
- package/package.json +3 -1
- package/src/adapter/adapter-aggregate.ts +16 -7
- package/src/adapter/adapter.ts +15 -18
- package/src/adapter/backtester/backtester-adapter.spec.ts +18 -9
- package/src/adapter/backtester/backtester-adapter.ts +14 -5
- package/src/adapter/backtester/backtester-cursor.spec.ts +20 -18
- package/src/adapter/backtester/backtester-cursor.ts +5 -5
- package/src/adapter/backtester/backtester-streamer.spec.ts +14 -13
- package/src/adapter/backtester/backtester-streamer.ts +5 -22
- package/src/adapter/paper/engine/paper-engine.spec.ts +30 -23
- package/src/adapter/paper/engine/paper-engine.ts +28 -21
- package/src/adapter/paper/paper-adapter.spec.ts +15 -6
- package/src/adapter/paper/paper-adapter.ts +20 -8
- package/src/cli/pull.ts +6 -5
- package/src/domain/asset.spec.ts +4 -4
- package/src/domain/asset.ts +7 -14
- package/src/domain/balance.spec.ts +37 -36
- package/src/domain/balance.ts +29 -29
- package/src/domain/candle.operator.spec.ts +43 -42
- package/src/domain/candle.operator.ts +4 -3
- package/src/domain/candle.spec.ts +13 -12
- package/src/domain/candle.ts +9 -9
- package/src/domain/commission.spec.ts +13 -12
- package/src/domain/commission.ts +13 -11
- package/src/domain/error.ts +5 -3
- package/src/domain/order.operator.spec.ts +6 -5
- package/src/domain/order.spec.ts +11 -10
- package/src/domain/order.ts +25 -22
- package/src/domain/orderbook.ts +14 -8
- package/src/domain/position.operator.spec.ts +5 -4
- package/src/domain/position.operator.ts +8 -5
- package/src/domain/position.spec.ts +10 -9
- package/src/domain/position.ts +8 -8
- package/src/domain/session.spec.ts +3 -3
- package/src/domain/session.ts +1 -3
- package/src/domain/trade.ts +3 -3
- package/src/indicator/atr.ts +6 -5
- package/src/indicator/cross.spec.ts +32 -47
- package/src/indicator/cross.ts +18 -10
- package/src/indicator/donchian.ts +5 -4
- package/src/indicator/drawdown.ts +7 -5
- package/src/indicator/ema.spec.ts +4 -3
- package/src/indicator/ema.ts +7 -6
- package/src/indicator/envelope.ts +11 -6
- package/src/indicator/index.ts +1 -1
- package/src/indicator/macd.ts +5 -4
- package/src/indicator/min-max.ts +10 -7
- package/src/indicator/rma.ts +7 -6
- package/src/indicator/sma.spec.ts +4 -3
- package/src/indicator/sma.ts +9 -8
- package/src/indicator/swma.ts +8 -4
- package/src/indicator/tma.spec.ts +4 -3
- package/src/indicator/tma.ts +4 -3
- package/src/indicator/trailing.spec.ts +29 -16
- package/src/indicator/trailing.ts +22 -16
- package/src/indicator/true-range.spec.ts +32 -0
- package/src/indicator/true-range.ts +32 -0
- package/src/indicator/window.ts +3 -3
- package/src/indicator/wma.spec.ts +4 -3
- package/src/indicator/wma.ts +8 -7
- package/src/shared/collections.spec.ts +30 -0
- package/src/shared/collections.ts +106 -0
- package/src/shared/decimals.spec.ts +18 -24
- package/src/shared/decimals.ts +22 -55
- package/src/shared/index.ts +1 -0
- package/src/shared/pipe.ts +12 -0
- package/src/storage/feed.ts +89 -34
- package/src/store/store-balance.event.spec.ts +5 -5
- package/src/store/store-balance.event.ts +6 -6
- package/src/store/store-instrument.event.spec.ts +2 -2
- package/src/store/store-instrument.event.ts +2 -2
- package/src/store/store-order.event.spec.ts +2 -2
- package/src/store/store-order.event.ts +2 -2
- package/src/store/store-orderbook.event.spec.ts +37 -0
- package/src/store/store-orderbook.event.ts +13 -13
- package/src/store/store-position.event.ts +27 -15
- package/src/store/store-trade.event.spec.ts +9 -9
- package/src/store/store-trade.event.ts +5 -5
- package/src/store/store.spec.ts +16 -16
- package/dist/indicator/truerange.d.ts +0 -3
- package/dist/indicator/truerange.js +0 -19
- package/dist/indicator/truerange.js.map +0 -1
- package/dist/indicator/truerange.spec.js +0 -28
- package/dist/indicator/truerange.spec.js.map +0 -1
- package/src/indicator/truerange.spec.ts +0 -32
- package/src/indicator/truerange.ts +0 -31
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const rxjs_1 = require("rxjs");
|
|
4
|
+
const shared_1 = require("../shared");
|
|
4
5
|
const store_1 = require("../store");
|
|
5
6
|
const asset_1 = require("./asset");
|
|
6
7
|
const instrument_1 = require("./instrument");
|
|
@@ -9,12 +10,12 @@ const order_operator_1 = require("./order.operator");
|
|
|
9
10
|
const instrument = new instrument_1.Instrument(new asset_1.Asset('abc', 'xyz', 4), new asset_1.Asset('def', 'xyz', 4), 'abc-def');
|
|
10
11
|
describe('order', () => {
|
|
11
12
|
test('should pipe an order', done => {
|
|
12
|
-
new rxjs_1.BehaviorSubject(order_1.Order.market(instrument, -100))
|
|
13
|
+
new rxjs_1.BehaviorSubject(order_1.Order.market(instrument, (0, shared_1.d)(-100)))
|
|
13
14
|
.pipe((0, order_operator_1.order)(instrument))
|
|
14
15
|
.subscribe({
|
|
15
16
|
next: it => {
|
|
16
17
|
expect(it.instrument).toEqual(instrument);
|
|
17
|
-
expect(it.quantity).toEqual(-100);
|
|
18
|
+
expect(it.quantity).toEqual((0, shared_1.d)(-100));
|
|
18
19
|
done();
|
|
19
20
|
}
|
|
20
21
|
});
|
|
@@ -31,9 +32,9 @@ describe('positions', () => {
|
|
|
31
32
|
let order1, order2, order3;
|
|
32
33
|
beforeEach(() => {
|
|
33
34
|
state = new store_1.State();
|
|
34
|
-
order1 = order_1.Order.market(instrument, -100);
|
|
35
|
-
order2 = order_1.Order.limit(instrument, 100, 10);
|
|
36
|
-
order3 = order_1.Order.market(instrument, 100);
|
|
35
|
+
order1 = order_1.Order.market(instrument, (0, shared_1.d)(-100));
|
|
36
|
+
order2 = order_1.Order.limit(instrument, (0, shared_1.d)(100), (0, shared_1.d)(10));
|
|
37
|
+
order3 = order_1.Order.market(instrument, (0, shared_1.d)(100));
|
|
37
38
|
state.order.upsert(new store_1.InnerSet(instrument.id, [order1, order2, order3]));
|
|
38
39
|
});
|
|
39
40
|
test('should pipe all orders on subscription start', done => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.operator.spec.js","sourceRoot":"","sources":["../../src/domain/order.operator.spec.ts"],"names":[],"mappings":";;AAAA,+BAAqD;AAErD,oCAA2C;AAC3C,mCAAgC;AAEhC,6CAA0C;AAC1C,mCAAgC;AAChC,qDAAiD;AAEjD,MAAM,UAAU,GAAG,IAAI,uBAAU,CAC/B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,SAAS,CACV,CAAC;AAEF,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,IAAI,CAAC,sBAAsB,EAAE,IAAI,CAAC,EAAE;QAClC,IAAI,sBAAe,CAAY,aAAK,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"order.operator.spec.js","sourceRoot":"","sources":["../../src/domain/order.operator.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,32 +1,33 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const shared_1 = require("../shared");
|
|
3
4
|
const asset_1 = require("./asset");
|
|
4
5
|
const instrument_1 = require("./instrument");
|
|
5
6
|
const order_1 = require("./order");
|
|
6
7
|
describe('Order', () => {
|
|
7
8
|
const instrument = new instrument_1.Instrument(new asset_1.Asset('abc', 'xyz', 4), new asset_1.Asset('def', 'xyz', 4), 'abc-def');
|
|
8
9
|
test('should construct a market buy order', () => {
|
|
9
|
-
const sut = order_1.Order.market(instrument, 100);
|
|
10
|
-
expect(sut.quantity).toEqual(100);
|
|
10
|
+
const sut = order_1.Order.market(instrument, (0, shared_1.d)(100));
|
|
11
|
+
expect(sut.quantity).toEqual((0, shared_1.d)(100));
|
|
11
12
|
expect(sut.rate).toEqual(undefined);
|
|
12
13
|
expect(sut.type).toEqual('MARKET');
|
|
13
14
|
});
|
|
14
15
|
test('should construct a market sell order', () => {
|
|
15
|
-
const sut = order_1.Order.market(instrument, -100);
|
|
16
|
-
expect(sut.quantity).toEqual(-100);
|
|
16
|
+
const sut = order_1.Order.market(instrument, (0, shared_1.d)(-100));
|
|
17
|
+
expect(sut.quantity).toEqual((0, shared_1.d)(-100));
|
|
17
18
|
expect(sut.rate).toEqual(undefined);
|
|
18
19
|
expect(sut.type).toEqual('MARKET');
|
|
19
20
|
});
|
|
20
21
|
test('should construct a limit buy order', () => {
|
|
21
|
-
const sut = order_1.Order.limit(instrument, 100, 2000);
|
|
22
|
-
expect(sut.quantity).toEqual(100);
|
|
23
|
-
expect(sut.rate).toEqual(2000);
|
|
22
|
+
const sut = order_1.Order.limit(instrument, (0, shared_1.d)(100), (0, shared_1.d)(2000));
|
|
23
|
+
expect(sut.quantity).toEqual((0, shared_1.d)(100));
|
|
24
|
+
expect(sut.rate).toEqual((0, shared_1.d)(2000));
|
|
24
25
|
expect(sut.type).toEqual('LIMIT');
|
|
25
26
|
});
|
|
26
27
|
test('should construct a limit sell order', () => {
|
|
27
|
-
const sut = order_1.Order.limit(instrument, -100, 2000);
|
|
28
|
-
expect(sut.quantity).toEqual(-100);
|
|
29
|
-
expect(sut.rate).toEqual(2000);
|
|
28
|
+
const sut = order_1.Order.limit(instrument, (0, shared_1.d)(-100), (0, shared_1.d)(2000));
|
|
29
|
+
expect(sut.quantity).toEqual((0, shared_1.d)(-100));
|
|
30
|
+
expect(sut.rate).toEqual((0, shared_1.d)(2000));
|
|
30
31
|
expect(sut.type).toEqual('LIMIT');
|
|
31
32
|
});
|
|
32
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.spec.js","sourceRoot":"","sources":["../../src/domain/order.spec.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAChC,6CAA0C;AAC1C,mCAAgC;AAEhC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,MAAM,UAAU,GAAG,IAAI,uBAAU,CAC/B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,SAAS,CACV,CAAC;IAEF,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC/C,MAAM,GAAG,GAAG,aAAK,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"order.spec.js","sourceRoot":"","sources":["../../src/domain/order.spec.ts"],"names":[],"mappings":";;AAAA,sCAA8B;AAC9B,mCAAgC;AAChC,6CAA0C;AAC1C,mCAAgC;AAEhC,QAAQ,CAAC,OAAO,EAAE,GAAG,EAAE;IACrB,MAAM,UAAU,GAAG,IAAI,uBAAU,CAC/B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,SAAS,CACV,CAAC;IAEF,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC/C,MAAM,GAAG,GAAG,aAAK,CAAC,MAAM,CAAC,UAAU,EAAE,IAAA,UAAC,EAAC,GAAG,CAAC,CAAC,CAAC;QAE7C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,GAAG,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,sCAAsC,EAAE,GAAG,EAAE;QAChD,MAAM,GAAG,GAAG,aAAK,CAAC,MAAM,CAAC,UAAU,EAAE,IAAA,UAAC,EAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QAE9C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;QAC9C,MAAM,GAAG,GAAG,aAAK,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,UAAC,EAAC,GAAG,CAAC,EAAE,IAAA,UAAC,EAAC,IAAI,CAAC,CAAC,CAAC;QAErD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,GAAG,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,IAAI,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,qCAAqC,EAAE,GAAG,EAAE;QAC/C,MAAM,GAAG,GAAG,aAAK,CAAC,KAAK,CAAC,UAAU,EAAE,IAAA,UAAC,EAAC,CAAC,GAAG,CAAC,EAAE,IAAA,UAAC,EAAC,IAAI,CAAC,CAAC,CAAC;QAEtD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,IAAI,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,16 +1,28 @@
|
|
|
1
1
|
import { Instrument } from '../domain';
|
|
2
|
-
import { timestamp } from '../shared';
|
|
2
|
+
import { decimal, timestamp } from '../shared';
|
|
3
3
|
import { Component } from './component';
|
|
4
|
+
export interface Liquidity {
|
|
5
|
+
rate: decimal;
|
|
6
|
+
quantity: decimal;
|
|
7
|
+
next: this;
|
|
8
|
+
}
|
|
9
|
+
export declare const LiquidityAskComparer: (lhs: {
|
|
10
|
+
rate: decimal;
|
|
11
|
+
}, rhs: {
|
|
12
|
+
rate: decimal;
|
|
13
|
+
}) => number;
|
|
14
|
+
export declare const LiquidityBidComparer: (lhs: {
|
|
15
|
+
rate: decimal;
|
|
16
|
+
}, rhs: {
|
|
17
|
+
rate: decimal;
|
|
18
|
+
}) => number;
|
|
4
19
|
export declare class Orderbook implements Component {
|
|
5
20
|
readonly instrument: Instrument;
|
|
6
21
|
id: string;
|
|
7
22
|
kind: string;
|
|
8
23
|
timestamp: timestamp;
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
bestBidRate: number;
|
|
12
|
-
bestBidQuantity: number;
|
|
13
|
-
get midRate(): number;
|
|
24
|
+
asks: Liquidity;
|
|
25
|
+
bids: Liquidity;
|
|
14
26
|
constructor(instrument: Instrument);
|
|
15
27
|
toString(): string;
|
|
16
28
|
}
|
package/dist/domain/orderbook.js
CHANGED
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.Orderbook = void 0;
|
|
3
|
+
exports.Orderbook = exports.LiquidityBidComparer = exports.LiquidityAskComparer = void 0;
|
|
4
|
+
const LiquidityAskComparer = (lhs, rhs) => lhs.rate.comparedTo(rhs.rate);
|
|
5
|
+
exports.LiquidityAskComparer = LiquidityAskComparer;
|
|
6
|
+
const LiquidityBidComparer = (lhs, rhs) => rhs.rate.comparedTo(lhs.rate);
|
|
7
|
+
exports.LiquidityBidComparer = LiquidityBidComparer;
|
|
4
8
|
class Orderbook {
|
|
5
9
|
constructor(instrument) {
|
|
6
10
|
this.instrument = instrument;
|
|
7
11
|
this.kind = 'orderbook';
|
|
8
12
|
this.id = instrument.id;
|
|
9
13
|
}
|
|
10
|
-
get midRate() {
|
|
11
|
-
return this.instrument.quote.fixed((this.bestAskRate + this.bestBidRate) / 2);
|
|
12
|
-
}
|
|
13
14
|
toString() {
|
|
14
15
|
return this.instrument.toString();
|
|
15
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orderbook.js","sourceRoot":"","sources":["../../src/domain/orderbook.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"orderbook.js","sourceRoot":"","sources":["../../src/domain/orderbook.ts"],"names":[],"mappings":";;;AAUO,MAAM,oBAAoB,GAAG,CAAC,GAAsB,EAAE,GAAsB,EAAE,EAAE,CACrF,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AADnB,QAAA,oBAAoB,wBACD;AACzB,MAAM,oBAAoB,GAAG,CAAC,GAAsB,EAAE,GAAsB,EAAE,EAAE,CACrF,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AADnB,QAAA,oBAAoB,wBACD;AAKhC,MAAa,SAAS;IAQpB,YAA4B,UAAsB;QAAtB,eAAU,GAAV,UAAU,CAAY;QANlD,SAAI,GAAG,WAAW,CAAC;QAOjB,IAAI,CAAC,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC;IAC1B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;IACpC,CAAC;CACF;AAfD,8BAeC"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
import { Instrument } from '../domain';
|
|
2
|
-
import { timestamp } from '../shared';
|
|
2
|
+
import { decimal, timestamp } from '../shared';
|
|
3
3
|
import { Component } from './component';
|
|
4
4
|
export declare type PositionMode = 'CROSS' | 'ISOLATED';
|
|
5
5
|
export declare class Position implements Component {
|
|
6
6
|
readonly id: string;
|
|
7
7
|
readonly instrument: Instrument;
|
|
8
8
|
readonly mode: PositionMode;
|
|
9
|
-
averageExecutionRate:
|
|
10
|
-
size:
|
|
9
|
+
averageExecutionRate: decimal;
|
|
10
|
+
size: decimal;
|
|
11
11
|
leverage: number;
|
|
12
12
|
kind: string;
|
|
13
13
|
timestamp: timestamp;
|
|
14
|
-
estimatedUnrealizedPnL?:
|
|
15
|
-
get margin():
|
|
16
|
-
constructor(id: string, instrument: Instrument, mode: PositionMode, averageExecutionRate:
|
|
17
|
-
calculateEstimatedUnrealizedPnL(rate:
|
|
14
|
+
estimatedUnrealizedPnL?: decimal;
|
|
15
|
+
get margin(): decimal;
|
|
16
|
+
constructor(id: string, instrument: Instrument, mode: PositionMode, averageExecutionRate: decimal, size: decimal, leverage: number);
|
|
17
|
+
calculateEstimatedUnrealizedPnL(rate: decimal): decimal;
|
|
18
18
|
toString(): string;
|
|
19
19
|
}
|
package/dist/domain/position.js
CHANGED
|
@@ -13,10 +13,10 @@ class Position {
|
|
|
13
13
|
this.kind = 'position';
|
|
14
14
|
}
|
|
15
15
|
get margin() {
|
|
16
|
-
return this.instrument.quote.
|
|
16
|
+
return this.instrument.quote.floor(this.size.abs().div(this.leverage));
|
|
17
17
|
}
|
|
18
18
|
calculateEstimatedUnrealizedPnL(rate) {
|
|
19
|
-
this.estimatedUnrealizedPnL = this.instrument.quote.
|
|
19
|
+
this.estimatedUnrealizedPnL = this.instrument.quote.floor((0, shared_1.pnl)(this.averageExecutionRate, rate, this.size));
|
|
20
20
|
return this.estimatedUnrealizedPnL;
|
|
21
21
|
}
|
|
22
22
|
toString() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../src/domain/position.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"position.js","sourceRoot":"","sources":["../../src/domain/position.ts"],"names":[],"mappings":";;;AACA,sCAAoD;AAKpD,MAAa,QAAQ;IASnB,YACW,EAAU,EACV,UAAsB,EACtB,IAAkB,EACpB,oBAA6B,EAC7B,IAAa,EACb,QAAgB;QALd,OAAE,GAAF,EAAE,CAAQ;QACV,eAAU,GAAV,UAAU,CAAY;QACtB,SAAI,GAAJ,IAAI,CAAc;QACpB,yBAAoB,GAApB,oBAAoB,CAAS;QAC7B,SAAI,GAAJ,IAAI,CAAS;QACb,aAAQ,GAAR,QAAQ,CAAQ;QAdzB,SAAI,GAAG,UAAU,CAAC;IAef,CAAC;IAXJ,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IACzE,CAAC;IAWD,+BAA+B,CAAC,IAAa;QAC3C,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,KAAK,CACvD,IAAA,YAAG,EAAC,IAAI,CAAC,oBAAoB,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAChD,CAAC;QAEF,OAAO,IAAI,CAAC,sBAAsB,CAAC;IACrC,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;CACF;AA7BD,4BA6BC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Observable } from 'rxjs';
|
|
2
|
+
import { decimal } from '../shared';
|
|
2
3
|
import { State } from '../store';
|
|
3
4
|
import { InstrumentSelector } from './instrument';
|
|
4
5
|
import { Position } from './position';
|
|
5
6
|
export declare function position(selector: InstrumentSelector): (source: Observable<Position>) => Observable<Readonly<Position>>;
|
|
6
7
|
export declare function positions(selector: InstrumentSelector, state: State): (source: Observable<Position>) => Observable<Position[]>;
|
|
7
8
|
export declare function flatten(): (source: Observable<Position[]>) => Observable<{
|
|
8
|
-
size:
|
|
9
|
-
rate:
|
|
9
|
+
size: decimal;
|
|
10
|
+
rate: decimal;
|
|
10
11
|
}>;
|
|
@@ -17,7 +17,7 @@ function flatten() {
|
|
|
17
17
|
return source.pipe((0, rxjs_1.map)(it => {
|
|
18
18
|
if (it.length > 1) {
|
|
19
19
|
return {
|
|
20
|
-
size: it.reduce((aggregate, position) => aggregate
|
|
20
|
+
size: it.reduce((aggregate, position) => aggregate.add(position.size), shared_1.d.Zero),
|
|
21
21
|
rate: (0, shared_1.weightedMean)(it.map(x => x.averageExecutionRate), it.map(x => x.size))
|
|
22
22
|
};
|
|
23
23
|
}
|
|
@@ -28,8 +28,8 @@ function flatten() {
|
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
return {
|
|
31
|
-
size:
|
|
32
|
-
rate:
|
|
31
|
+
size: shared_1.d.Zero,
|
|
32
|
+
rate: shared_1.d.Zero
|
|
33
33
|
};
|
|
34
34
|
}), (0, rxjs_1.share)());
|
|
35
35
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.operator.js","sourceRoot":"","sources":["../../src/domain/position.operator.ts"],"names":[],"mappings":";;;AAAA,+BAAiE;AAEjE,
|
|
1
|
+
{"version":3,"file":"position.operator.js","sourceRoot":"","sources":["../../src/domain/position.operator.ts"],"names":[],"mappings":";;;AAAA,+BAAiE;AAEjE,sCAAqD;AAKrD,SAAgB,QAAQ,CAAC,QAA4B;IACnD,OAAO,CAAC,MAA4B,EAAE,EAAE,CACtC,MAAM,CAAC,IAAI,CACT,IAAA,aAAM,EAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,IAAI,UAAU,IAAI,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,CAAC,EACtE,IAAA,UAAG,EAAC,EAAE,CAAC,EAAE,CAAC,EAAwB,CAAC,CACpC,CAAC;AACN,CAAC;AAND,4BAMC;AAED,SAAgB,SAAS,CAAC,QAA4B,EAAE,KAAY;IAClE,MAAM,MAAM,GAAG,GAAG,EAAE,CAClB,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,CACjE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,IAAI,QAAQ,CAAC,EAAE,CACtC,CAAC;IAEJ,OAAO,CAAC,MAA4B,EAAE,EAAE,CACtC,MAAM,CAAC,IAAI,CACT,QAAQ,CAAC,QAAQ,CAAC,EAClB,IAAA,UAAG,EAAC,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,EACnB,IAAA,gBAAS,EAAC,MAAM,EAAE,CAAC,CACpB,CAAC;AACN,CAAC;AAZD,8BAYC;AAED,SAAgB,OAAO;IACrB,OAAO,UACL,MAA8B;QAE9B,OAAO,MAAM,CAAC,IAAI,CAChB,IAAA,UAAG,EAAC,EAAE,CAAC,EAAE;YACP,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE;gBACjB,OAAO;oBACL,IAAI,EAAE,EAAE,CAAC,MAAM,CACb,CAAC,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,EACrD,UAAC,CAAC,IAAI,CACP;oBACD,IAAI,EAAE,IAAA,qBAAY,EAChB,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,EACnC,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CACpB;iBACF,CAAC;aACH;YAED,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC,EAAE;gBAClB,OAAO;oBACL,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;oBAChB,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,oBAAoB;iBACjC,CAAC;aACH;YAED,OAAO;gBACL,IAAI,EAAE,UAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,UAAC,CAAC,IAAI;aACb,CAAC;QACJ,CAAC,CAAC,EACF,IAAA,YAAK,GAAE,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAlCD,0BAkCC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const rxjs_1 = require("rxjs");
|
|
4
|
+
const shared_1 = require("../shared");
|
|
4
5
|
const store_1 = require("../store");
|
|
5
6
|
const asset_1 = require("./asset");
|
|
6
7
|
const balance_1 = require("./balance");
|
|
@@ -10,7 +11,7 @@ const position_operator_1 = require("./position.operator");
|
|
|
10
11
|
const instrument = new instrument_1.Instrument(new asset_1.Asset('abc', 'xyz', 4), new asset_1.Asset('def', 'xyz', 4), 'abc-def');
|
|
11
12
|
describe('position', () => {
|
|
12
13
|
test('should pipe a position', done => {
|
|
13
|
-
new rxjs_1.BehaviorSubject(new position_1.Position('1', instrument, 'CROSS', 10, 2, 3))
|
|
14
|
+
new rxjs_1.BehaviorSubject(new position_1.Position('1', instrument, 'CROSS', (0, shared_1.d)(10), (0, shared_1.d)(2), 3))
|
|
14
15
|
.pipe((0, position_operator_1.position)(instrument))
|
|
15
16
|
.subscribe({
|
|
16
17
|
next: it => {
|
|
@@ -29,8 +30,8 @@ describe('position', () => {
|
|
|
29
30
|
describe('positions', () => {
|
|
30
31
|
const state = new store_1.State();
|
|
31
32
|
const balance = new balance_1.Balance(instrument.quote);
|
|
32
|
-
const position1 = new position_1.Position('1', instrument, 'CROSS', 10, 2, 3);
|
|
33
|
-
const position2 = new position_1.Position('2', instrument, 'CROSS', 20, 2, 3);
|
|
33
|
+
const position1 = new position_1.Position('1', instrument, 'CROSS', (0, shared_1.d)(10), (0, shared_1.d)(2), 3);
|
|
34
|
+
const position2 = new position_1.Position('2', instrument, 'CROSS', (0, shared_1.d)(20), (0, shared_1.d)(2), 3);
|
|
34
35
|
beforeEach(() => {
|
|
35
36
|
state.balance.upsert(balance);
|
|
36
37
|
balance.position['1'] = position1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.operator.spec.js","sourceRoot":"","sources":["../../src/domain/position.operator.spec.ts"],"names":[],"mappings":";;AAAA,+
|
|
1
|
+
{"version":3,"file":"position.operator.spec.js","sourceRoot":"","sources":["../../src/domain/position.operator.spec.ts"],"names":[],"mappings":";;AAAA,+BAAgD;AAEhD,sCAA8B;AAC9B,oCAAiC;AACjC,mCAAgC;AAChC,uCAAoC;AAEpC,6CAA0C;AAC1C,yCAAsC;AACtC,2DAA0D;AAE1D,MAAM,UAAU,GAAG,IAAI,uBAAU,CAC/B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,SAAS,CACV,CAAC;AAEF,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,IAAI,CAAC,wBAAwB,EAAE,IAAI,CAAC,EAAE;QACpC,IAAI,sBAAe,CAAY,IAAI,mBAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,IAAA,UAAC,EAAC,EAAE,CAAC,EAAE,IAAA,UAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACnF,IAAI,CAAC,IAAA,4BAAQ,EAAC,UAAU,CAAC,CAAC;aAC1B,SAAS,CAAC;YACT,IAAI,EAAE,EAAE,CAAC,EAAE;gBACT,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;gBAC3B,IAAI,EAAE,CAAC;YACT,CAAC;SACF,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,oBAAoB,EAAE,IAAI,CAAC,EAAE;QAChC,IAAI,sBAAe,CAAY,UAAU,CAAC,CAAC,IAAI,CAAC,IAAA,4BAAQ,EAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;YAC9E,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE;YAClB,QAAQ,EAAE,IAAI,EAAE;SACjB,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;IACzB,MAAM,KAAK,GAAG,IAAI,aAAK,EAAE,CAAC;IAC1B,MAAM,OAAO,GAAG,IAAI,iBAAO,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,IAAI,mBAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,IAAA,UAAC,EAAC,EAAE,CAAC,EAAE,IAAA,UAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACzE,MAAM,SAAS,GAAG,IAAI,mBAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,IAAA,UAAC,EAAC,EAAE,CAAC,EAAE,IAAA,UAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEzE,UAAU,CAAC,GAAG,EAAE;QACd,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE9B,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QAClC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,yDAAyD,EAAE,IAAI,CAAC,EAAE;QACrE,IAAI,cAAO,EAAa,CAAC,IAAI,CAAC,IAAA,6BAAS,EAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;YACpE,IAAI,EAAE,EAAE,CAAC,EAAE;gBACT,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;gBAC7B,IAAI,EAAE,CAAC;YACT,CAAC;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,30 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const shared_1 = require("../shared");
|
|
3
4
|
const asset_1 = require("./asset");
|
|
4
5
|
const instrument_1 = require("./instrument");
|
|
5
6
|
const position_1 = require("./position");
|
|
6
7
|
describe('Position', () => {
|
|
7
8
|
const instrument = new instrument_1.Instrument(new asset_1.Asset('abc', 'xyz', 4), new asset_1.Asset('def', 'xyz', 4), 'abc-def');
|
|
8
9
|
test('should construct a position', () => {
|
|
9
|
-
const sut = new position_1.Position('1', instrument, 'CROSS', 10, 2, 3);
|
|
10
|
+
const sut = new position_1.Position('1', instrument, 'CROSS', (0, shared_1.d)(10), (0, shared_1.d)(2), 3);
|
|
10
11
|
expect(sut.id).toEqual('1');
|
|
11
12
|
expect(sut.mode).toEqual('CROSS');
|
|
12
|
-
expect(sut.averageExecutionRate).toEqual(10);
|
|
13
|
-
expect(sut.size).toEqual(2);
|
|
13
|
+
expect(sut.averageExecutionRate).toEqual((0, shared_1.d)(10));
|
|
14
|
+
expect(sut.size).toEqual((0, shared_1.d)(2));
|
|
14
15
|
expect(sut.leverage).toEqual(3);
|
|
15
16
|
expect(sut.estimatedUnrealizedPnL).toEqual(undefined);
|
|
16
17
|
expect(sut.id).toEqual('1');
|
|
17
18
|
});
|
|
18
19
|
test('should calculate correct margin', () => {
|
|
19
|
-
const sut = new position_1.Position('1', instrument, 'CROSS', 2511.81, 10.31, 20);
|
|
20
|
-
expect(sut.margin).toEqual(0.5155);
|
|
20
|
+
const sut = new position_1.Position('1', instrument, 'CROSS', (0, shared_1.d)(2511.81), (0, shared_1.d)(10.31), 20);
|
|
21
|
+
expect(sut.margin).toEqual((0, shared_1.d)(0.5155));
|
|
21
22
|
expect(sut.estimatedUnrealizedPnL).toEqual(undefined);
|
|
22
23
|
});
|
|
23
24
|
test('should calculate correct unrealized pnl', () => {
|
|
24
|
-
const sut = new position_1.Position('1', instrument, 'CROSS', 2511.81, 10.31, 20);
|
|
25
|
-
const pnl = sut.calculateEstimatedUnrealizedPnL(2576.44);
|
|
26
|
-
expect(pnl).toEqual(0.2652);
|
|
27
|
-
expect(sut.estimatedUnrealizedPnL).toEqual(0.2652);
|
|
25
|
+
const sut = new position_1.Position('1', instrument, 'CROSS', (0, shared_1.d)(2511.81), (0, shared_1.d)(10.31), 20);
|
|
26
|
+
const pnl = sut.calculateEstimatedUnrealizedPnL((0, shared_1.d)(2576.44));
|
|
27
|
+
expect(pnl).toEqual((0, shared_1.d)(0.2652));
|
|
28
|
+
expect(sut.estimatedUnrealizedPnL).toEqual((0, shared_1.d)(0.2652));
|
|
28
29
|
});
|
|
29
30
|
});
|
|
30
31
|
//# sourceMappingURL=position.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"position.spec.js","sourceRoot":"","sources":["../../src/domain/position.spec.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAChC,6CAA0C;AAC1C,yCAAsC;AAEtC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,MAAM,UAAU,GAAG,IAAI,uBAAU,CAC/B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,SAAS,CACV,CAAC;IAEF,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACvC,MAAM,GAAG,GAAG,IAAI,mBAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"position.spec.js","sourceRoot":"","sources":["../../src/domain/position.spec.ts"],"names":[],"mappings":";;AAAA,sCAA8B;AAC9B,mCAAgC;AAChC,6CAA0C;AAC1C,yCAAsC;AAEtC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;IACxB,MAAM,UAAU,GAAG,IAAI,uBAAU,CAC/B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,aAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,SAAS,CACV,CAAC;IAEF,IAAI,CAAC,6BAA6B,EAAE,GAAG,EAAE;QACvC,MAAM,GAAG,GAAG,IAAI,mBAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,IAAA,UAAC,EAAC,EAAE,CAAC,EAAE,IAAA,UAAC,EAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEnE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACtD,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9B,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,iCAAiC,EAAE,GAAG,EAAE;QAC3C,MAAM,GAAG,GAAG,IAAI,mBAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,IAAA,UAAC,EAAC,OAAO,CAAC,EAAE,IAAA,UAAC,EAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAE7E,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,MAAM,CAAC,CAAC,CAAC;QACtC,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,yCAAyC,EAAE,GAAG,EAAE;QACnD,MAAM,GAAG,GAAG,IAAI,mBAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,OAAO,EAAE,IAAA,UAAC,EAAC,OAAO,CAAC,EAAE,IAAA,UAAC,EAAC,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;QAE7E,MAAM,GAAG,GAAG,GAAG,CAAC,+BAA+B,CAAC,IAAA,UAAC,EAAC,OAAO,CAAC,CAAC,CAAC;QAE5D,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,MAAM,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC,OAAO,CAAC,IAAA,UAAC,EAAC,MAAM,CAAC,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/domain/session.js
CHANGED
|
@@ -91,7 +91,7 @@ class Session {
|
|
|
91
91
|
return this.store.changes$.pipe((0, order_operator_1.orders)(selector, this.store.snapshot));
|
|
92
92
|
}
|
|
93
93
|
history(selector, timeframe, length) {
|
|
94
|
-
return this.store.changes$.pipe((0, rxjs_1.startWith)(this.store.snapshot.universe.instrument.get(selector.id)), (0, rxjs_1.filter)(it => it instanceof domain_1.Instrument && it.id == selector.id), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.aggregate.history(
|
|
94
|
+
return this.store.changes$.pipe((0, rxjs_1.startWith)(this.store.snapshot.universe.instrument.get(selector.id)), (0, rxjs_1.filter)(it => it instanceof domain_1.Instrument && it.id == selector.id), (0, rxjs_1.switchMap)(() => (0, rxjs_1.from)(this.aggregate.history(selector, timeframe, length))), (0, rxjs_1.take)(1), (0, rxjs_1.shareReplay)(), (0, rxjs_1.mergeMap)(it => it));
|
|
95
95
|
}
|
|
96
96
|
}
|
|
97
97
|
exports.Session = Session;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/domain/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/domain/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ describe('Session', () => {
|
|
|
17
17
|
},
|
|
18
18
|
complete: done()
|
|
19
19
|
});
|
|
20
|
-
session.store.dispatch(new store_1.InstrumentPatchEvent((0, shared_1.now)(), new domain_1.Asset('de30', 'cex', 2), new domain_1.Asset('usd', 'cex', 2), new domain_1.Commission(
|
|
20
|
+
session.store.dispatch(new store_1.InstrumentPatchEvent((0, shared_1.now)(), new domain_1.Asset('de30', 'cex', 2), new domain_1.Asset('usd', 'cex', 2), new domain_1.Commission(shared_1.d.Zero, shared_1.d.Zero), ''), new store_1.InstrumentPatchEvent((0, shared_1.now)(), new domain_1.Asset('wig20', 'cex', 2), new domain_1.Asset('pln', 'cex', 2), new domain_1.Commission(shared_1.d.Zero, shared_1.d.Zero), ''));
|
|
21
21
|
});
|
|
22
22
|
});
|
|
23
23
|
//# sourceMappingURL=session.spec.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../src/domain/session.spec.ts"],"names":[],"mappings":";;AAAA,4CAAyC;AACzC,sCAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"session.spec.js","sourceRoot":"","sources":["../../src/domain/session.spec.ts"],"names":[],"mappings":";;AAAA,4CAAyC;AACzC,sCAA8C;AAC9C,sCAAmC;AACnC,oCAAgD;AAGhD,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACvB,MAAM,UAAU,GAAsB;QACpC,EAAE,EAAE,IAAA,YAAG,GAAE;QACT,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC,EAAE;QACjC,MAAM,OAAO,GAAG,IAAI,qBAAS,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC;QAElD,OAAO,CAAC,WAAW,EAAE,CAAC,SAAS,CAAC;YAC9B,IAAI,EAAE,EAAE,CAAC,EAAE;gBACT,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAC/B,CAAC;YACD,QAAQ,EAAE,IAAI,EAAE;SACjB,CAAC,CAAC;QAEH,OAAO,CAAC,KAAK,CAAC,QAAQ,CACpB,IAAI,4BAAoB,CACtB,IAAA,YAAG,GAAE,EACL,IAAI,cAAK,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,EAC3B,IAAI,cAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,mBAAU,CAAC,UAAC,CAAC,IAAI,EAAE,UAAC,CAAC,IAAI,CAAC,EAC9B,EAAE,CACH,EACD,IAAI,4BAAoB,CACtB,IAAA,YAAG,GAAE,EACL,IAAI,cAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC,EAC5B,IAAI,cAAK,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1B,IAAI,mBAAU,CAAC,UAAC,CAAC,IAAI,EAAE,UAAC,CAAC,IAAI,CAAC,EAC9B,EAAE,CACH,CACF,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
package/dist/domain/trade.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { timestamp } from '../shared';
|
|
1
|
+
import { decimal, timestamp } from '../shared';
|
|
2
2
|
import { Instrument } from '.';
|
|
3
3
|
import { Component } from './component';
|
|
4
4
|
export declare class Trade implements Component {
|
|
@@ -6,8 +6,8 @@ export declare class Trade implements Component {
|
|
|
6
6
|
id: string;
|
|
7
7
|
kind: string;
|
|
8
8
|
timestamp: timestamp;
|
|
9
|
-
rate:
|
|
10
|
-
quantity:
|
|
9
|
+
rate: decimal;
|
|
10
|
+
quantity: decimal;
|
|
11
11
|
constructor(instrument: Instrument);
|
|
12
12
|
toString(): string;
|
|
13
13
|
}
|
package/dist/indicator/atr.d.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Observable } from 'rxjs';
|
|
2
2
|
import { Candle } from '../domain';
|
|
3
|
-
|
|
3
|
+
import { decimal } from '../shared';
|
|
4
|
+
export declare function atr<T>(length: number, fn: (it: T) => Candle): (source: Observable<T>) => Observable<[T, decimal]>;
|
package/dist/indicator/atr.js
CHANGED
|
@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.atr = void 0;
|
|
4
4
|
const rxjs_1 = require("rxjs");
|
|
5
5
|
const rma_1 = require("./rma");
|
|
6
|
-
const
|
|
6
|
+
const true_range_1 = require("./true-range");
|
|
7
7
|
function atr(length, fn) {
|
|
8
8
|
return function (source) {
|
|
9
|
-
return source.pipe((0,
|
|
10
|
-
const tuple = [it,
|
|
9
|
+
return source.pipe((0, true_range_1.trueRange)(fn), (0, rma_1.rma)(length, ([, tr]) => tr), (0, rxjs_1.map)(([[it], tr]) => {
|
|
10
|
+
const tuple = [it, tr];
|
|
11
11
|
return tuple;
|
|
12
12
|
}), (0, rxjs_1.share)());
|
|
13
13
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atr.js","sourceRoot":"","sources":["../../src/indicator/atr.ts"],"names":[],"mappings":";;;AAAA,+BAA8C;
|
|
1
|
+
{"version":3,"file":"atr.js","sourceRoot":"","sources":["../../src/indicator/atr.ts"],"names":[],"mappings":";;;AAAA,+BAA8C;AAI9C,+BAA4B;AAC5B,6CAAyC;AAEzC,SAAgB,GAAG,CAAI,MAAc,EAAE,EAAqB;IAC1D,OAAO,UAAU,MAAqB;QACpC,OAAO,MAAM,CAAC,IAAI,CAChB,IAAA,sBAAS,EAAC,EAAE,CAAC,EACb,IAAA,SAAG,EAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAC3B,IAAA,UAAG,EAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;YACjB,MAAM,KAAK,GAAiB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAErC,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,EACF,IAAA,YAAK,GAAE,CACR,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAbD,kBAaC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
1
|
import { Observable } from 'rxjs';
|
|
2
|
-
|
|
3
|
-
export declare function
|
|
2
|
+
import { decimal } from '../shared';
|
|
3
|
+
export declare function crossUnder<T>(trigger: decimal | ((it: T) => decimal), value: (it: T) => decimal): (source: Observable<T>) => Observable<T>;
|
|
4
|
+
export declare function crossOver<T>(trigger: decimal | ((it: T) => decimal), value: (it: T) => decimal): (source: Observable<T>) => Observable<T>;
|
package/dist/indicator/cross.js
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.crossOver = exports.crossUnder = void 0;
|
|
4
4
|
const rxjs_1 = require("rxjs");
|
|
5
|
-
function
|
|
5
|
+
function crossUnder(trigger, value) {
|
|
6
6
|
return function (source) {
|
|
7
7
|
let triggered = false;
|
|
8
8
|
return source.pipe((0, rxjs_1.filter)(it => {
|
|
9
|
-
const limit =
|
|
10
|
-
const current =
|
|
11
|
-
if (current
|
|
9
|
+
const limit = typeof trigger == 'function' ? trigger(it) : trigger;
|
|
10
|
+
const current = value(it);
|
|
11
|
+
if (current.lessThan(limit)) {
|
|
12
12
|
triggered = true;
|
|
13
13
|
}
|
|
14
|
-
if (triggered && current
|
|
14
|
+
if (triggered && current.greaterThan(limit)) {
|
|
15
15
|
triggered = false;
|
|
16
16
|
return true;
|
|
17
17
|
}
|
|
@@ -19,17 +19,17 @@ function crossunder(limitFn, currentFn) {
|
|
|
19
19
|
}));
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
|
-
exports.
|
|
23
|
-
function
|
|
22
|
+
exports.crossUnder = crossUnder;
|
|
23
|
+
function crossOver(trigger, value) {
|
|
24
24
|
return function (source) {
|
|
25
25
|
let triggered = false;
|
|
26
26
|
return source.pipe((0, rxjs_1.filter)(it => {
|
|
27
|
-
const limit =
|
|
28
|
-
const current =
|
|
29
|
-
if (current
|
|
27
|
+
const limit = typeof trigger == 'function' ? trigger(it) : trigger;
|
|
28
|
+
const current = value(it);
|
|
29
|
+
if (current.greaterThan(limit)) {
|
|
30
30
|
triggered = true;
|
|
31
31
|
}
|
|
32
|
-
if (triggered && current
|
|
32
|
+
if (triggered && current.lessThan(limit)) {
|
|
33
33
|
triggered = false;
|
|
34
34
|
return true;
|
|
35
35
|
}
|
|
@@ -37,5 +37,5 @@ function crossover(limitFn, currentFn) {
|
|
|
37
37
|
}));
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
|
-
exports.
|
|
40
|
+
exports.crossOver = crossOver;
|
|
41
41
|
//# sourceMappingURL=cross.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cross.js","sourceRoot":"","sources":["../../src/indicator/cross.ts"],"names":[],"mappings":";;;AAAA,+BAA0C;
|
|
1
|
+
{"version":3,"file":"cross.js","sourceRoot":"","sources":["../../src/indicator/cross.ts"],"names":[],"mappings":";;;AAAA,+BAA0C;AAI1C,SAAgB,UAAU,CACxB,OAAuC,EACvC,KAAyB;IAEzB,OAAO,UAAU,MAAqB;QACpC,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,OAAO,MAAM,CAAC,IAAI,CAChB,IAAA,aAAM,EAAC,EAAE,CAAC,EAAE;YACV,MAAM,KAAK,GAAG,OAAO,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACnE,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;YAE1B,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBAC3B,SAAS,GAAG,IAAI,CAAC;aAClB;YAED,IAAI,SAAS,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBAC3C,SAAS,GAAG,KAAK,CAAC;gBAElB,OAAO,IAAI,CAAC;aACb;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA1BD,gCA0BC;AAED,SAAgB,SAAS,CACvB,OAAuC,EACvC,KAAyB;IAEzB,OAAO,UAAU,MAAqB;QACpC,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,OAAO,MAAM,CAAC,IAAI,CAChB,IAAA,aAAM,EAAC,EAAE,CAAC,EAAE;YACV,MAAM,KAAK,GAAG,OAAO,OAAO,IAAI,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;YACnE,MAAM,OAAO,GAAG,KAAK,CAAC,EAAE,CAAC,CAAC;YAE1B,IAAI,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE;gBAC9B,SAAS,GAAG,IAAI,CAAC;aAClB;YAED,IAAI,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;gBACxC,SAAS,GAAG,KAAK,CAAC;gBAElB,OAAO,IAAI,CAAC;aACb;YAED,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AA1BD,8BA0BC"}
|