@ring-protocol/smart-order-router 0.5.4 → 0.5.6
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/build/main/providers/caching/route/model/cached-route.js +9 -1
- package/build/main/routers/alpha-router/functions/compute-all-routes.d.ts +1 -1
- package/build/main/routers/alpha-router/functions/compute-all-routes.js +3 -3
- package/build/main/tsconfig.tsbuildinfo +1 -1
- package/build/main/util/routes.js +16 -29
- package/build/module/providers/caching/route/model/cached-route.js +9 -1
- package/build/module/routers/alpha-router/functions/compute-all-routes.d.ts +1 -1
- package/build/module/routers/alpha-router/functions/compute-all-routes.js +3 -3
- package/build/module/tsconfig.module.tsbuildinfo +1 -1
- package/build/module/util/routes.js +21 -34
- package/package.json +1 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Pair as
|
|
1
|
+
import { Pair as FewV2Pair } from '@ring-protocol/few-v2-sdk';
|
|
2
2
|
import { Protocol } from '@ring-protocol/router-sdk';
|
|
3
3
|
import { Percent } from '@ring-protocol/sdk-core';
|
|
4
4
|
import { Pair } from '@ring-protocol/v2-sdk';
|
|
@@ -7,6 +7,7 @@ import { Pool as V4Pool } from '@ring-protocol/v4-sdk';
|
|
|
7
7
|
import _ from 'lodash';
|
|
8
8
|
import { addFn } from '../routers/alpha-router/functions/best-swap-route';
|
|
9
9
|
import { V3_CORE_FACTORY_ADDRESSES } from './addresses';
|
|
10
|
+
import { log } from './log';
|
|
10
11
|
import { CurrencyAmount, V4_ETH_WETH_FAKE_POOL } from '.';
|
|
11
12
|
export const routeToTokens = (route) => {
|
|
12
13
|
switch (route.protocol) {
|
|
@@ -46,11 +47,14 @@ export const poolToString = (pool) => {
|
|
|
46
47
|
else if (pool instanceof Pair) {
|
|
47
48
|
return ` -- [${Pair.getAddress(pool.token0, pool.token1)}]`;
|
|
48
49
|
}
|
|
49
|
-
else if (pool instanceof
|
|
50
|
-
return ` -- [${
|
|
50
|
+
else if (pool instanceof FewV2Pair) {
|
|
51
|
+
return ` -- [${FewV2Pair.getAddress(pool.token0, pool.token1)}]`;
|
|
51
52
|
}
|
|
52
53
|
else {
|
|
53
|
-
|
|
54
|
+
log.info('2025-12-16-15-30');
|
|
55
|
+
log.info(`Unsupported pool ${JSON.stringify(pool)}`);
|
|
56
|
+
return `-- [UnknownPool] ${JSON.stringify(pool)}`;
|
|
57
|
+
// throw new Error(`Unsupported pool ${JSON.stringify(pool)}`);
|
|
54
58
|
}
|
|
55
59
|
};
|
|
56
60
|
export const routeToString = (route) => {
|
|
@@ -63,8 +67,8 @@ export const routeToString = (route) => {
|
|
|
63
67
|
if (pool instanceof Pair) {
|
|
64
68
|
return ` -- [${Pair.getAddress(pool.token0, pool.token1)}]`;
|
|
65
69
|
}
|
|
66
|
-
else if (pool instanceof
|
|
67
|
-
return ` -- [${
|
|
70
|
+
else if (pool instanceof FewV2Pair) {
|
|
71
|
+
return ` -- [${FewV2Pair.getAddress(pool.token0, pool.token1)}]`;
|
|
68
72
|
}
|
|
69
73
|
else if (pool instanceof V3Pool) {
|
|
70
74
|
return ` -- ${pool.fee / 10000}% [${V3Pool.getAddress(pool.token0, pool.token1, pool.fee, undefined, V3_CORE_FACTORY_ADDRESSES[pool.chainId])}]`;
|
|
@@ -79,47 +83,27 @@ export const routeToString = (route) => {
|
|
|
79
83
|
return ` -- ${pool.fee / 10000}% [${V4Pool.getPoolId(pool.token0, pool.token1, pool.fee, pool.tickSpacing, pool.hooks)}]`;
|
|
80
84
|
}
|
|
81
85
|
else {
|
|
82
|
-
//
|
|
83
|
-
//
|
|
86
|
+
// Same fallback logic as poolToString: tolerate serialized / plain-object
|
|
87
|
+
// V2 pairs so that logging never causes a hard failure.
|
|
84
88
|
if (pool &&
|
|
85
89
|
typeof pool === 'object' &&
|
|
86
90
|
('liquidityToken' in pool || 'tokenAmounts' in pool)) {
|
|
87
|
-
|
|
88
|
-
// Try to extract token addresses from tokenAmounts
|
|
91
|
+
const poolObj = pool;
|
|
89
92
|
let token0Address;
|
|
90
93
|
let token1Address;
|
|
91
|
-
const poolObj = pool;
|
|
92
94
|
if (poolObj.tokenAmounts && Array.isArray(poolObj.tokenAmounts)) {
|
|
93
95
|
const token0 = (_a = poolObj.tokenAmounts[0]) === null || _a === void 0 ? void 0 : _a.currency;
|
|
94
96
|
const token1 = (_b = poolObj.tokenAmounts[1]) === null || _b === void 0 ? void 0 : _b.currency;
|
|
95
97
|
token0Address = (token0 === null || token0 === void 0 ? void 0 : token0.address) || (token0 === null || token0 === void 0 ? void 0 : token0.id);
|
|
96
98
|
token1Address = (token1 === null || token1 === void 0 ? void 0 : token1.address) || (token1 === null || token1 === void 0 ? void 0 : token1.id);
|
|
97
99
|
}
|
|
98
|
-
// If we can extract addresses, use them for the route string
|
|
99
|
-
// This allows the route to be logged even with serialized pairs
|
|
100
100
|
if (token0Address && token1Address) {
|
|
101
|
-
// For logging purposes, we'll use the addresses directly
|
|
102
|
-
// This is a fallback when Pair instances are not available
|
|
103
101
|
return ` -- [${token0Address}/${token1Address}]`;
|
|
104
102
|
}
|
|
105
103
|
}
|
|
106
|
-
//
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
const hasLiquidityToken = pool && typeof pool === 'object' && 'liquidityToken' in pool;
|
|
110
|
-
const hasTokenAmounts = pool && typeof pool === 'object' && 'tokenAmounts' in pool;
|
|
111
|
-
let errorMsg = `Unsupported pool type. `;
|
|
112
|
-
errorMsg += `Pool type: ${poolType}, `;
|
|
113
|
-
errorMsg += `Pool keys: ${poolKeys.join(', ')}, `;
|
|
114
|
-
errorMsg += `Route protocol: ${route.protocol}, `;
|
|
115
|
-
if (hasLiquidityToken || hasTokenAmounts) {
|
|
116
|
-
errorMsg += `Pool appears to be a serialized/deserialized Pair object. `;
|
|
117
|
-
errorMsg += `This may indicate routes are being incorrectly serialized or pools are not being properly instantiated. `;
|
|
118
|
-
errorMsg += `This typically happens when routes are cached and retrieved from external storage (e.g., Redis). `;
|
|
119
|
-
errorMsg += `The API layer should ensure Pair objects are properly reconstructed when deserializing cached routes. `;
|
|
120
|
-
}
|
|
121
|
-
errorMsg += `Pool data: ${JSON.stringify(pool).substring(0, 500)}`;
|
|
122
|
-
throw new Error(errorMsg);
|
|
104
|
+
// Last-resort fallback: don't throw, just emit an opaque marker so
|
|
105
|
+
// routeToString always succeeds.
|
|
106
|
+
return ' -- [UnknownPool]';
|
|
123
107
|
}
|
|
124
108
|
});
|
|
125
109
|
for (let i = 0; i < tokenPath.length; i++) {
|
|
@@ -170,7 +154,7 @@ export function shouldWipeoutCachedRoutes(cachedRoutes, routingConfig) {
|
|
|
170
154
|
return containsExcludedProtocolPools !== undefined;
|
|
171
155
|
}
|
|
172
156
|
function poolIsInExcludedProtocols(pool, excludedProtocolsFromMixed) {
|
|
173
|
-
var _a, _b, _c;
|
|
157
|
+
var _a, _b, _c, _d;
|
|
174
158
|
if (pool instanceof V4Pool) {
|
|
175
159
|
return (_a = excludedProtocolsFromMixed === null || excludedProtocolsFromMixed === void 0 ? void 0 : excludedProtocolsFromMixed.includes(Protocol.V4)) !== null && _a !== void 0 ? _a : false;
|
|
176
160
|
}
|
|
@@ -180,8 +164,11 @@ function poolIsInExcludedProtocols(pool, excludedProtocolsFromMixed) {
|
|
|
180
164
|
else if (pool instanceof Pair) {
|
|
181
165
|
return (_c = excludedProtocolsFromMixed === null || excludedProtocolsFromMixed === void 0 ? void 0 : excludedProtocolsFromMixed.includes(Protocol.V2)) !== null && _c !== void 0 ? _c : false;
|
|
182
166
|
}
|
|
167
|
+
else if (pool instanceof FewV2Pair) {
|
|
168
|
+
return (_d = excludedProtocolsFromMixed === null || excludedProtocolsFromMixed === void 0 ? void 0 : excludedProtocolsFromMixed.includes(Protocol.FEWV2)) !== null && _d !== void 0 ? _d : false;
|
|
169
|
+
}
|
|
183
170
|
else {
|
|
184
171
|
return false;
|
|
185
172
|
}
|
|
186
173
|
}
|
|
187
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
174
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routes.js","sourceRoot":"","sources":["../../../src/util/routes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAErD,OAAO,EAAqB,OAAO,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,IAAI,IAAI,MAAM,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,CAAC,MAAM,QAAQ,CAAC;AAOvB,OAAO,EAAE,KAAK,EAAE,MAAM,mDAAmD,CAAC;AAG1E,OAAO,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAE5B,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,GAAG,CAAC;AAE1D,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAsB,EAAc,EAAE;IAClE,QAAQ,KAAK,CAAC,QAAQ,EAAE;QACtB,KAAK,QAAQ,CAAC,EAAE;YACd,OAAO,KAAK,CAAC,YAAY,CAAC;QAC5B,KAAK,QAAQ,CAAC,EAAE;YACd,OAAO,KAAK,CAAC,SAAS,CAAC;QACzB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ,CAAC,KAAK,CAAC;QACpB,KAAK,QAAQ,CAAC,KAAK;YACjB,OAAO,KAAK,CAAC,IAAI,CAAC;QACpB;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACjE;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAsB,EAAW,EAAE;IAC9D,QAAQ,KAAK,CAAC,QAAQ,EAAE;QACtB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ,CAAC,EAAE,CAAC;QACjB,KAAK,QAAQ,CAAC,KAAK;YACjB,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,KAAK,QAAQ,CAAC,EAAE;YACd,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB,KAAK,QAAQ,CAAC,KAAK;YACjB,OAAO,KAAK,CAAC,KAAK,CAAC;QACrB;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;KACjE;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAW,EAAU,EAAE;IAClD,IAAI,IAAI,YAAY,MAAM,EAAE;QAC1B,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,MAAM,CAAC,SAAS,CAClD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,KAAK,CACX,GAAG,CAAC;KACN;SAAM,IAAI,IAAI,YAAY,MAAM,EAAE;QACjC,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,MAAM,CAAC,UAAU,CACnD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,SAAS,EACT,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CACxC,GAAG,CAAC;KACN;SAAM,IAAI,IAAI,YAAY,IAAI,EAAE;QAC/B,OAAO,QAAQ,IAAI,CAAC,UAAU,CAC3B,IAAa,CAAC,MAAM,EACpB,IAAa,CAAC,MAAM,CACtB,GAAG,CAAC;KACN;SAAM,IAAI,IAAI,YAAY,SAAS,EAAE;QACpC,OAAO,QAAQ,SAAS,CAAC,UAAU,CAChC,IAAkB,CAAC,MAAM,EACzB,IAAkB,CAAC,MAAM,CAC3B,GAAG,CAAC;KACN;SAAM;QACL,GAAG,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC7B,GAAG,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrD,OAAO,oBAAoB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QAClD,+DAA+D;KAChE;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAsB,EAAU,EAAE;IAC9D,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,MAAM,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC;IAClC,MAAM,WAAW,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;;QACxC,IAAI,IAAI,YAAY,IAAI,EAAE;YACxB,OAAO,QAAQ,IAAI,CAAC,UAAU,CAC3B,IAAa,CAAC,MAAM,EACpB,IAAa,CAAC,MAAM,CACtB,GAAG,CAAC;SACN;aAAM,IAAI,IAAI,YAAY,SAAS,EAAE;YACpC,OAAO,QAAQ,SAAS,CAAC,UAAU,CAChC,IAAkB,CAAC,MAAM,EACzB,IAAkB,CAAC,MAAM,CAC3B,GAAG,CAAC;SACN;aAAM,IAAI,IAAI,YAAY,MAAM,EAAE;YACjC,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,MAAM,CAAC,UAAU,CACnD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,SAAS,EACT,yBAAyB,CAAC,IAAI,CAAC,OAAO,CAAC,CACxC,GAAG,CAAC;SACN;aAAM,IAAI,IAAI,YAAY,MAAM,EAAE;YACjC,iDAAiD;YACjD,4FAA4F;YAC5F,IACE,IAAI,CAAC,WAAW;gBAChB,qBAAqB,CAAC,IAAI,CAAC,OAAkB,CAAC,CAAC,WAAW,EAC1D;gBACA,OAAO,OAAO,CAAC;aAChB;YAED,OAAO,OAAO,IAAI,CAAC,GAAG,GAAG,KAAK,MAAM,MAAM,CAAC,SAAS,CAClD,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,GAAG,EACR,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,KAAK,CACX,GAAG,CAAC;SACN;aAAM;YACL,0EAA0E;YAC1E,wDAAwD;YACxD,IACE,IAAI;gBACJ,OAAO,IAAI,KAAK,QAAQ;gBACxB,CAAC,gBAAgB,IAAI,IAAI,IAAI,cAAc,IAAI,IAAI,CAAC,EACpD;gBACA,MAAM,OAAO,GAAG,IAKf,CAAC;gBAEF,IAAI,aAAiC,CAAC;gBACtC,IAAI,aAAiC,CAAC;gBAEtC,IAAI,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;oBAC/D,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,0CAAE,QAAQ,CAAC;oBACjD,MAAM,MAAM,GAAG,MAAA,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,0CAAE,QAAQ,CAAC;oBACjD,aAAa,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,MAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAA,CAAC;oBAC9C,aAAa,GAAG,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,OAAO,MAAI,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAA,CAAC;iBAC/C;gBAED,IAAI,aAAa,IAAI,aAAa,EAAE;oBAClC,OAAO,QAAQ,aAAa,IAAI,aAAa,GAAG,CAAC;iBAClD;aACF;YAED,mEAAmE;YACnE,iCAAiC;YACjC,OAAO,mBAAmB,CAAC;SAC5B;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACzC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,GAAG,WAAW,CAAC,MAAM,EAAE;YAC1B,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/B;KACF;IAED,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,YAAmC,EAC3B,EAAE;IACV,MAAM,KAAK,GAAG,CAAC,CAAC,MAAM,CACpB,YAAY,EACZ,CAAC,KAAqB,EAAE,GAAwB,EAAE,EAAE;QAClD,OAAO,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAClC,CAAC,EACD,cAAc,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAClE,CAAC;IAEF,MAAM,YAAY,GAAG,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE;QACvE,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QACpE,kFAAkF;QAClF,OAAO,IAAI,QAAQ,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,QACvD,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,MAAM,UAAU,yBAAyB,CACvC,YAA2B,EAC3B,aAAiC;IAEjC,yEAAyE;IACzE,qGAAqG;IACrG,IACE,CAAA,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,yBAAyB;;QACxC,yEAAyE;QACzE,wGAAwG;QACxG,mDAAmD;QACnD,0BAA0B;QAC1B,sIAAsI;QACtI,iIAAiI;QACjI,sGAAsG;QACtG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,sBAAsB,CAAA,EACrC;QACA,OAAO,KAAK,CAAC;KACd;IAED,MAAM,6BAA6B,GAAG,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;QACxE,QAAQ,KAAK,CAAC,QAAQ,EAAE;YACtB,KAAK,QAAQ,CAAC,KAAK;gBACjB,OAAO,CACJ,KAAK,CAAC,KAAoB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;oBAChD,OAAO,yBAAyB,CAC9B,IAAI,EACJ,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,0BAA0B,CAC1C,CAAC;gBACJ,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CACd,CAAC;YACJ;gBACE,OAAO,KAAK,CAAC;SAChB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,6BAA6B,KAAK,SAAS,CAAC;AACrD,CAAC;AAED,SAAS,yBAAyB,CAChC,IAAW,EACX,0BAAuC;;IAEvC,IAAI,IAAI,YAAY,MAAM,EAAE;QAC1B,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,mCAAI,KAAK,CAAC;KACnE;SAAM,IAAI,IAAI,YAAY,MAAM,EAAE;QACjC,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,mCAAI,KAAK,CAAC;KACnE;SAAM,IAAI,IAAI,YAAY,IAAI,EAAE;QAC/B,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,mCAAI,KAAK,CAAC;KACnE;SAAM,IAAI,IAAI,YAAY,SAAS,EAAE;QACpC,OAAO,MAAA,0BAA0B,aAA1B,0BAA0B,uBAA1B,0BAA0B,CAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,mCAAI,KAAK,CAAC;KACtE;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}
|