@ichidao/ichi-vaults-sdk 0.0.67 → 0.0.68
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/src/functions/calculateApr.js +2 -2
- package/dist/src/functions/calculateDtr.js +4 -2
- package/dist/src/functions/calculateDtr.js.map +1 -1
- package/dist/src/functions/calculateFees.js +8 -4
- package/dist/src/functions/calculateFees.js.map +1 -1
- package/dist/src/functions/priceFromPool.js +3 -3
- package/dist/src/functions/vaultMetrics.js +3 -3
- package/dist/src/functions/vaultTvl.js +8 -3
- package/dist/src/functions/vaultTvl.js.map +1 -1
- package/dist/src/index.cjs.js +1 -1
- package/dist/src/index.esm.js +1 -1
- package/package.json +1 -1
|
@@ -59,11 +59,11 @@ function getLpPriceAt(vaultEvents, daysAgo, isVaultInverted, token0decimals, tok
|
|
|
59
59
|
}
|
|
60
60
|
else {
|
|
61
61
|
var depositTokenDecimals = isVaultInverted ? token1decimals : token0decimals;
|
|
62
|
-
var
|
|
62
|
+
var scarceTokenDecimals = isVaultInverted ? token0decimals : token1decimals;
|
|
63
63
|
var totalAmount0 = e.totalAmount0, totalAmount1 = e.totalAmount1, sqrtPrice = e.sqrtPrice;
|
|
64
64
|
var formattedTotalAmount0 = (0, formatBigInt_1.default)(totalAmount0, token0decimals);
|
|
65
65
|
var formattedTotalAmount1 = (0, formatBigInt_1.default)(totalAmount1, token1decimals);
|
|
66
|
-
var price = (0, getPrice_1.default)(isVaultInverted, ethers_1.BigNumber.from(sqrtPrice), depositTokenDecimals,
|
|
66
|
+
var price = (0, getPrice_1.default)(isVaultInverted, ethers_1.BigNumber.from(sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
67
67
|
var tvl = !isVaultInverted
|
|
68
68
|
? Number(formattedTotalAmount0) + Number(formattedTotalAmount1) * price
|
|
69
69
|
: Number(formattedTotalAmount1) + Number(formattedTotalAmount0) * price;
|
|
@@ -64,12 +64,14 @@ var priceFromPool_1 = require("./priceFromPool");
|
|
|
64
64
|
var _vaultEvents_1 = require("./_vaultEvents");
|
|
65
65
|
// total amounts at deposit or withdrawal in deposit tokens
|
|
66
66
|
function getTotalAmountsAtTransactionEvent(objTransactionEvent, isVaultInverted, token0Decimals, token1Decimals, beforeEvent) {
|
|
67
|
+
var depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
|
|
68
|
+
var scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
|
|
67
69
|
var price0 = !isVaultInverted
|
|
68
70
|
? 1
|
|
69
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice),
|
|
71
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
70
72
|
var price1 = isVaultInverted
|
|
71
73
|
? 1
|
|
72
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice),
|
|
74
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
73
75
|
var amount0 = beforeEvent
|
|
74
76
|
? Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0BeforeEvent), token0Decimals)) * price0
|
|
75
77
|
: Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0), token0Decimals)) * price0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateDtr.js","sourceRoot":"","sources":["../../../src/functions/calculateDtr.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGjD,sDAAqD;AAErD,2CAA2C;AAC3C,iCAA4C;AAC5C,mDAAoD;AACpD,uEAAiD;AACjD,kDAAyD;AACzD,qCAA2C;AAC3C,+DAAyC;AACzC,iDAAsE;AACtE,iDAAgD;AAChD,+CAAsG;AAEtG,2DAA2D;AAC3D,SAAS,iCAAiC,CACxC,mBAA0C,EAC1C,eAAwB,EACxB,cAAsB,EACtB,cAAsB,EACtB,WAAoB;IAEpB,IAAM,MAAM,GAAG,CAAC,eAAe;QAC7B,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAA,kBAAQ,
|
|
1
|
+
{"version":3,"file":"calculateDtr.js","sourceRoot":"","sources":["../../../src/functions/calculateDtr.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,24 +61,28 @@ function getCollectedTokenAmountBN(ind, feesDataset) {
|
|
|
61
61
|
return amountBN;
|
|
62
62
|
}
|
|
63
63
|
function getTotalAmountsAtFeeCollectionEvent(objFees, isVaultInverted, token0Decimals, token1Decimals) {
|
|
64
|
+
var depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
|
|
65
|
+
var scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
|
|
64
66
|
var price0 = !isVaultInverted
|
|
65
67
|
? 1
|
|
66
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice),
|
|
68
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
67
69
|
var price1 = isVaultInverted
|
|
68
70
|
? 1
|
|
69
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice),
|
|
71
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
70
72
|
var amount0 = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objFees.totalAmount0), token0Decimals)) * price0;
|
|
71
73
|
var amount1 = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objFees.totalAmount1), token1Decimals)) * price1;
|
|
72
74
|
return [amount0, amount1];
|
|
73
75
|
}
|
|
74
76
|
exports.getTotalAmountsAtFeeCollectionEvent = getTotalAmountsAtFeeCollectionEvent;
|
|
75
77
|
function getFeesAmountInBaseTokens(objFees, isVaultInverted, token0Decimals, token1Decimals) {
|
|
78
|
+
var depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
|
|
79
|
+
var scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
|
|
76
80
|
var price0 = !isVaultInverted
|
|
77
81
|
? 1
|
|
78
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice),
|
|
82
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
79
83
|
var price1 = isVaultInverted
|
|
80
84
|
? 1
|
|
81
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice),
|
|
85
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objFees.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
82
86
|
var amount0 = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objFees.feeAmount0), token0Decimals)) * price0;
|
|
83
87
|
var amount1 = Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objFees.feeAmount1), token1Decimals)) * price1;
|
|
84
88
|
return amount0 + amount1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculateFees.js","sourceRoot":"","sources":["../../../src/functions/calculateFees.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;AACjD,oCAAoC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGpC,sDAAqD;AAErD,iCAA4C;AAC5C,mDAAoD;AACpD,uEAAiD;AACjD,kDAAyD;AACzD,qCAA2C;AAC3C,+DAAyC;AACzC,iDAA8C;AAC9C,uEAAiD;AACjD,+CAAyE;AAEzE,SAAS,yBAAyB,CAAC,GAAU,EAAE,WAAmB;IAChE,IAAM,OAAO,GACX,GAAG,KAAK,CAAC;QACP,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,EAA5B,CAA4B,CAAC;QACtD,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,UAAC,CAAC,IAAK,OAAA,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,EAA5B,CAA4B,CAAC,CAAC;IAC3D,IAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,UAAC,KAAK,EAAE,IAAI,IAAK,OAAA,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAf,CAAe,EAAE,qBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IACrF,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,mCAAmC,CACjD,OAAmB,EACnB,eAAwB,EACxB,cAAsB,EACtB,cAAsB;IAEtB,IAAM,MAAM,GAAG,CAAC,eAAe;QAC7B,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAA,kBAAQ,EAAC,eAAe,EAAE,qBAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"calculateFees.js","sourceRoot":"","sources":["../../../src/functions/calculateFees.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,7 +96,7 @@ exports.getSqrtPriceFromPool = getSqrtPriceFromPool;
|
|
|
96
96
|
// current price in pool of scarse token in deposit tokens
|
|
97
97
|
function getCurrPrice(vault, jsonProvider, chainId, dex, isVaultInverted, token0decimals, token1decimals) {
|
|
98
98
|
return __awaiter(this, void 0, void 0, function () {
|
|
99
|
-
var sqrtPrice, depositTokenDecimals,
|
|
99
|
+
var sqrtPrice, depositTokenDecimals, scarceTokenDecimals, price, e_2;
|
|
100
100
|
return __generator(this, function (_a) {
|
|
101
101
|
switch (_a.label) {
|
|
102
102
|
case 0:
|
|
@@ -105,8 +105,8 @@ function getCurrPrice(vault, jsonProvider, chainId, dex, isVaultInverted, token0
|
|
|
105
105
|
case 1:
|
|
106
106
|
sqrtPrice = _a.sent();
|
|
107
107
|
depositTokenDecimals = isVaultInverted ? token1decimals : token0decimals;
|
|
108
|
-
|
|
109
|
-
price = (0, getPrice_1.default)(isVaultInverted, sqrtPrice, depositTokenDecimals,
|
|
108
|
+
scarceTokenDecimals = isVaultInverted ? token0decimals : token1decimals;
|
|
109
|
+
price = (0, getPrice_1.default)(isVaultInverted, sqrtPrice, depositTokenDecimals, scarceTokenDecimals, 15);
|
|
110
110
|
return [2 /*return*/, price];
|
|
111
111
|
case 2:
|
|
112
112
|
e_2 = _a.sent();
|
|
@@ -67,7 +67,7 @@ var _vaultEvents_1 = require("./_vaultEvents");
|
|
|
67
67
|
function getVaultMetrics(vaultAddress, jsonProvider, dex, timeIntervals) {
|
|
68
68
|
var _a, _b;
|
|
69
69
|
return __awaiter(this, void 0, void 0, function () {
|
|
70
|
-
var _c, chainId, vault, decimals0, decimals1, isInv, depositTokenDecimals,
|
|
70
|
+
var _c, chainId, vault, decimals0, decimals1, isInv, depositTokenDecimals, scarceTokenDecimals, vaultContract, arrDays, maxTimeInterval, currLpPrice, currTvl, totalAmountsBN, totalAmounts, sqrtPrice, poolAddress, poolContract, globalState, poolContract, globalState, poolContract, slot0, price, totalSupplyBN, totalSupply, e_1, rebalances, collectedFees, deposits, withdraws, vaultEvents, arrRebalances, arrOtherFees, arrDeposits, arrWithdraws, currentDtr, allDtrs, result;
|
|
71
71
|
var _d;
|
|
72
72
|
return __generator(this, function (_e) {
|
|
73
73
|
switch (_e.label) {
|
|
@@ -83,7 +83,7 @@ function getVaultMetrics(vaultAddress, jsonProvider, dex, timeIntervals) {
|
|
|
83
83
|
decimals1 = _e.sent();
|
|
84
84
|
isInv = vault.allowTokenB;
|
|
85
85
|
depositTokenDecimals = isInv ? decimals1 : decimals0;
|
|
86
|
-
|
|
86
|
+
scarceTokenDecimals = isInv ? decimals0 : decimals1;
|
|
87
87
|
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
88
88
|
arrDays = timeIntervals && timeIntervals.length > 0 ? timeIntervals : [1, 7, 30];
|
|
89
89
|
maxTimeInterval = Math.max.apply(Math, arrDays);
|
|
@@ -129,7 +129,7 @@ function getVaultMetrics(vaultAddress, jsonProvider, dex, timeIntervals) {
|
|
|
129
129
|
sqrtPrice = slot0.sqrtPriceX96;
|
|
130
130
|
_e.label = 13;
|
|
131
131
|
case 13:
|
|
132
|
-
price = (0, getPrice_1.default)(isInv, sqrtPrice, depositTokenDecimals,
|
|
132
|
+
price = (0, getPrice_1.default)(isInv, sqrtPrice, depositTokenDecimals, scarceTokenDecimals, 15);
|
|
133
133
|
currTvl = !isInv
|
|
134
134
|
? Number(totalAmounts.total0) + Number(totalAmounts.total1) * price
|
|
135
135
|
: Number(totalAmounts.total1) + Number(totalAmounts.total0) * price;
|
|
@@ -74,16 +74,21 @@ function formatVaultEvent(dtr, tvl, fee, lpPrice, poolPrice) {
|
|
|
74
74
|
}
|
|
75
75
|
// get price from the pool/vault
|
|
76
76
|
function getPoolPriceAtTransactionEvent(objTransactionEvent, isVaultInverted, token0Decimals, token1Decimals) {
|
|
77
|
-
|
|
77
|
+
var depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
|
|
78
|
+
var scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
|
|
79
|
+
var price = (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
80
|
+
return price;
|
|
78
81
|
}
|
|
79
82
|
// total amounts at deposit or withdrawal in deposit tokens
|
|
80
83
|
function getTotalAmountsAtTransactionEvent(objTransactionEvent, isVaultInverted, token0Decimals, token1Decimals, beforeEvent) {
|
|
84
|
+
var depositTokenDecimals = isVaultInverted ? token1Decimals : token0Decimals;
|
|
85
|
+
var scarceTokenDecimals = isVaultInverted ? token0Decimals : token1Decimals;
|
|
81
86
|
var price0 = !isVaultInverted
|
|
82
87
|
? 1
|
|
83
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice),
|
|
88
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
84
89
|
var price1 = isVaultInverted
|
|
85
90
|
? 1
|
|
86
|
-
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice),
|
|
91
|
+
: (0, getPrice_1.default)(isVaultInverted, bignumber_1.BigNumber.from(objTransactionEvent.sqrtPrice), depositTokenDecimals, scarceTokenDecimals, 15);
|
|
87
92
|
var amount0 = beforeEvent
|
|
88
93
|
? Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0BeforeEvent), token0Decimals)) * price0
|
|
89
94
|
: Number((0, formatBigInt_1.default)(bignumber_1.BigNumber.from(objTransactionEvent.totalAmount0), token0Decimals)) * price0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vaultTvl.js","sourceRoot":"","sources":["../../../src/functions/vaultTvl.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGjD,sDAAqD;AAErD,2CAA2C;AAC3C,iCAA4C;AAC5C,mDAAoD;AACpD,uEAAiD;AACjD,kDAAyD;AACzD,+DAAyC;AACzC,iDAAiG;AACjG,iDAA2F;AAC3F,+CAAsG;AACtG,+CAAsF;AAWtF,SAAS,gBAAgB,CACvB,GAAsB,EACtB,GAAW,EACX,GAAW,EACX,OAAe,EACf,SAAiB;IAEjB,OAAO;QACL,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,GAAG,EAAE,GAAG,CAAC,OAAO;QAChB,GAAG,KAAA;QACH,SAAS,EAAE,GAAG;QACd,OAAO,SAAA;QACP,SAAS,WAAA;KACV,CAAC;AACJ,CAAC;AAED,gCAAgC;AAChC,SAAS,8BAA8B,CACrC,mBAA+B,EAC/B,eAAwB,EACxB,cAAsB,EACtB,cAAsB;IAEtB,
|
|
1
|
+
{"version":3,"file":"vaultTvl.js","sourceRoot":"","sources":["../../../src/functions/vaultTvl.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGjD,sDAAqD;AAErD,2CAA2C;AAC3C,iCAA4C;AAC5C,mDAAoD;AACpD,uEAAiD;AACjD,kDAAyD;AACzD,+DAAyC;AACzC,iDAAiG;AACjG,iDAA2F;AAC3F,+CAAsG;AACtG,+CAAsF;AAWtF,SAAS,gBAAgB,CACvB,GAAsB,EACtB,GAAW,EACX,GAAW,EACX,OAAe,EACf,SAAiB;IAEjB,OAAO;QACL,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,GAAG,EAAE,GAAG,CAAC,OAAO;QAChB,GAAG,KAAA;QACH,SAAS,EAAE,GAAG;QACd,OAAO,SAAA;QACP,SAAS,WAAA;KACV,CAAC;AACJ,CAAC;AAED,gCAAgC;AAChC,SAAS,8BAA8B,CACrC,mBAA+B,EAC/B,eAAwB,EACxB,cAAsB,EACtB,cAAsB;IAEtB,IAAM,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;IAC/E,IAAM,mBAAmB,GAAG,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;IAC9E,IAAM,KAAK,GAAG,IAAA,kBAAQ,EACpB,eAAe,EACf,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAC7C,oBAAoB,EACpB,mBAAmB,EACnB,EAAE,CACH,CAAC;IACF,OAAO,KAAK,CAAC;AACf,CAAC;AAED,2DAA2D;AAC3D,SAAS,iCAAiC,CACxC,mBAA0C,EAC1C,eAAwB,EACxB,cAAsB,EACtB,cAAsB,EACtB,WAAoB;IAEpB,IAAM,oBAAoB,GAAG,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;IAC/E,IAAM,mBAAmB,GAAG,eAAe,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,cAAc,CAAC;IAC9E,IAAM,MAAM,GAAG,CAAC,eAAe;QAC7B,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAA,kBAAQ,EACN,eAAe,EACf,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAC7C,oBAAoB,EACpB,mBAAmB,EACnB,EAAE,CACH,CAAC;IACN,IAAM,MAAM,GAAG,eAAe;QAC5B,CAAC,CAAC,CAAC;QACH,CAAC,CAAC,IAAA,kBAAQ,EACN,eAAe,EACf,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAC7C,oBAAoB,EACpB,mBAAmB,EACnB,EAAE,CACH,CAAC;IACN,IAAM,OAAO,GAAG,WAAW;QACzB,CAAC,CAAC,MAAM,CAAC,IAAA,sBAAY,EAAC,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,MAAM;QAC5G,CAAC,CAAC,MAAM,CAAC,IAAA,sBAAY,EAAC,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC;IACpG,IAAM,OAAO,GAAG,WAAW;QACzB,CAAC,CAAC,MAAM,CAAC,IAAA,sBAAY,EAAC,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,MAAM;QAC5G,CAAC,CAAC,MAAM,CAAC,IAAA,sBAAY,EAAC,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,YAAY,CAAC,EAAE,cAAc,CAAC,CAAC,GAAG,MAAM,CAAC;IACpG,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAgB,wBAAwB,CACtC,mBAA0C,EAC1C,KAAgB,EAChB,cAAsB,EACtB,cAAsB;IAEtB,IAAM,eAAe,GAAG,KAAK,CAAC,WAAW,CAAC;IAC1C,IAAM,YAAY,GAAG,iCAAiC,CACpD,mBAAmB,EACnB,eAAe,EACf,cAAc,EACd,cAAc,EACd,KAAK,CACN,CAAC;IACF,IAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAE9C,OAAO,GAAG,CAAC;AACb,CAAC;AAjBD,4DAiBC;AAED,SAAgB,0BAA0B,CACxC,qBAAiC,EACjC,KAAgB,EAChB,cAAsB,EACtB,cAAsB;IAEtB,IAAM,eAAe,GAAG,KAAK,CAAC,WAAW,CAAC;IAC1C,IAAM,YAAY,GAAG,IAAA,mDAAmC,EACtD,qBAAqB,EACrB,eAAe,EACf,cAAc,EACd,cAAc,CACf,CAAC;IACF,IAAM,GAAG,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;IAC9C,OAAO,GAAG,CAAC;AACb,CAAC;AAfD,gEAeC;AAED,SAAS,8BAA8B,CACrC,mBAA+B,EAC/B,KAAgB,EAChB,cAAsB,EACtB,cAAsB;IAEtB,IAAM,GAAG,GAAG,0BAA0B,CAAC,mBAAmB,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IACnG,IAAM,WAAW,GAAG,MAAM,CAAC,IAAA,sBAAY,EAAC,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9F,OAAO,GAAG,GAAG,WAAW,CAAC;AAC3B,CAAC;AAED,SAAS,4BAA4B,CACnC,mBAA0C,EAC1C,KAAgB,EAChB,cAAsB,EACtB,cAAsB;IAEtB,IAAM,GAAG,GAAG,wBAAwB,CAAC,mBAAmB,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;IACjG,IAAM,WAAW,GAAG,MAAM,CAAC,IAAA,sBAAY,EAAC,qBAAS,CAAC,IAAI,CAAC,mBAAmB,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IAC9F,OAAO,GAAG,GAAG,WAAW,CAAC;AAC3B,CAAC;AAED,wBAAwB;AACxB,SAAsB,6BAA6B,CACjD,YAAoB,EACpB,YAA6B,EAC7B,GAAiB,EACjB,YAAoB;;;;;;wBAEO,qBAAM,IAAA,yBAAiB,EAAC,YAAY,EAAE,YAAY,EAAE,GAAG,CAAC,EAAA;;oBAA7E,KAAqB,SAAwD,EAA3E,OAAO,aAAA,EAAE,KAAK,WAAA;oBACC,qBAAM,IAAA,iCAAgB,EAAC,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,EAAA;;oBAA5E,cAAc,GAAG,SAA2D;oBAC3D,qBAAM,IAAA,iCAAgB,EAAC,KAAK,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,EAAA;;oBAA5E,cAAc,GAAG,SAA2D;oBAC5E,eAAe,GAAG,KAAK,CAAC,WAAW,CAAC;oBAEvB,qBAAM,IAAA,6BAAc,EAAC,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAA;;oBAA3E,UAAU,GAAG,SAA8D;oBACjF,IAAI,CAAC,UAAU;wBAAE,MAAM,IAAI,KAAK,CAAC,4CAAqC,OAAO,kBAAQ,YAAY,CAAE,CAAC,CAAC;oBAC/E,qBAAM,IAAA,sCAAuB,EAAC,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAA;;oBAAvF,aAAa,GAAG,SAAuE;oBAC7F,IAAI,CAAC,aAAa;wBAAE,MAAM,IAAI,KAAK,CAAC,gDAAyC,OAAO,kBAAQ,YAAY,CAAE,CAAC,CAAC;oBAC3F,qBAAM,IAAA,2BAAY,EAAC,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAA;;oBAAvE,QAAQ,GAAG,SAA4D;oBAC7E,IAAI,CAAC,QAAQ;wBAAE,MAAM,IAAI,KAAK,CAAC,0CAAmC,OAAO,kBAAQ,YAAY,CAAE,CAAC,CAAC;oBAC/E,qBAAM,IAAA,4BAAa,EAAC,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAA;;oBAAzE,SAAS,GAAG,SAA6D;oBAC/E,IAAI,CAAC,SAAS;wBAAE,MAAM,IAAI,KAAK,CAAC,2CAAoC,OAAO,kBAAQ,YAAY,CAAE,CAAC,CAAC;oBAE7F,aAAa,GAAG,UAAU;yBAC7B,KAAK,EAAE;yBACP,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,+BAAkB,EAAC,YAAY,CAAC,EAAnF,CAAmF,CAAC;yBAClG,GAAG,CAAC,UAAC,CAAC;wBACL,OAAA,gBAAgB,CACd,IAAA,yCAA0B,EAAC,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,EAChF,0BAA0B,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EACpE,IAAA,yCAAyB,EAAC,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,EAC/E,8BAA8B,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EACxE,8BAA8B,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,CACnF;oBAND,CAMC,CACF,CAAC;oBACE,YAAY,GAAG,aAAa;yBAC/B,KAAK,EAAE;yBACP,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,+BAAkB,EAAC,YAAY,CAAC,EAAnF,CAAmF,CAAC;yBAClG,GAAG,CAAC,UAAC,CAAC;wBACL,OAAA,gBAAgB,CACd,IAAA,yCAA0B,EAAC,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,EAChF,0BAA0B,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EACpE,IAAA,yCAAyB,EAAC,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,EAC/E,8BAA8B,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EACxE,8BAA8B,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,CACnF;oBAND,CAMC,CACF,CAAC;oBACE,WAAW,GAAG,QAAQ;yBACzB,KAAK,EAAE;yBACP,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,+BAAkB,EAAC,YAAY,CAAC,EAAnF,CAAmF,CAAC;yBAClG,GAAG,CAAC,UAAC,CAAC;wBACL,OAAA,gBAAgB,CACd,IAAA,uCAAwB,EAAC,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,EAC9E,wBAAwB,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EAClE,CAAC,EACD,4BAA4B,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EACtE,8BAA8B,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,CACnF;oBAND,CAMC,CACF,CAAC;oBACE,YAAY,GAAG,SAAS;yBAC3B,KAAK,EAAE;yBACP,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAA,+BAAkB,EAAC,YAAY,CAAC,EAAnF,CAAmF,CAAC;yBAClG,GAAG,CAAC,UAAC,CAAC;wBACL,OAAA,gBAAgB,CACd,IAAA,uCAAwB,EAAC,CAAC,EAAE,KAAK,CAAC,WAAW,EAAE,cAAc,EAAE,cAAc,CAAC,EAC9E,wBAAwB,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EAClE,CAAC,EACD,4BAA4B,CAAC,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,cAAc,CAAC,EACtE,8BAA8B,CAAC,CAAC,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,CACnF;oBAND,CAMC,CACF,CAAC;;wBAEF,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,QAAQ,EAAE;;oBAChD,qBAAM,IAAA,6BAAa,EAAC,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,EAAA;;oBAA1G,MAAG,GAAE,SAAqG;oBACrG,qBAAM,IAAA,2BAAW,EAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,EAAA;;oBAA1G,MAAG,GAAE,SAAqG;wBAC1G,YAAS,GAAE,CAAC;oBACH,qBAAM,IAAA,8BAAc,EAAC,KAAK,EAAE,YAAY,EAAE,GAAG,EAAE,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,EAAA;;oBAAjH,UAAO,GAAE,SAAwG;oBACtG,qBAAM,IAAA,4BAAY,EAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,EAAE,eAAe,EAAE,cAAc,EAAE,cAAc,CAAC,EAAA;;oBAN7G,iBAAiB,GAAG,CAMxB,YAAS,GAAE,SAAsG;0BACpG,CAAA;oBAET,MAAM,GAAG,0EAAI,WAAW,SAAK,YAAY,SAAK,aAAa,SAAK,YAAY,UAAE,iBAAiB,UAAE,IAAI,CACzG,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,EAA7C,CAA6C,CACxD,CAAC;oBAEF,sBAAO,MAAM,EAAC;;;;CACf;AAlFD,sEAkFC"}
|
package/dist/src/index.cjs.js
CHANGED
package/dist/src/index.esm.js
CHANGED