@sonarwatch/portfolio-core 0.11.34 → 0.11.36
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/CHANGELOG.md +8 -0
- package/package.json +1 -1
- package/src/utils/compareName.js +2 -2
- package/src/utils/compareName.js.map +1 -1
- package/src/utils/sortAssets.d.ts +5 -2
- package/src/utils/sortAssets.js +55 -8
- package/src/utils/sortAssets.js.map +1 -1
- package/src/utils/sortPortfolioElement.js +10 -10
- package/src/utils/sortPortfolioElement.js.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).
|
|
4
4
|
|
|
5
|
+
## [0.11.36](https://github.com/sonarwatch/portfolio/compare/core-0.11.35...core-0.11.36) (2024-01-05)
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
## [0.11.35](https://github.com/sonarwatch/portfolio/compare/core-0.11.34...core-0.11.35) (2024-01-05)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
5
13
|
## [0.11.34](https://github.com/sonarwatch/portfolio/compare/core-0.11.33...core-0.11.34) (2024-01-04)
|
|
6
14
|
|
|
7
15
|
|
package/package.json
CHANGED
package/src/utils/compareName.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compareName.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/compareName.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,SAAgB,WAAW,CACzB,CAAqB,EACrB,CAAqB;IAErB,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACtB,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"compareName.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/compareName.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,SAAgB,WAAW,CACzB,CAAqB,EACrB,CAAqB;IAErB,IAAI,CAAC,KAAK,CAAC;QAAE,OAAO,CAAC,CAAC;IACtB,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC;IAC9B,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC,CAAC;IAC/B,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC,CAAC;IACrB,IAAI,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC;IACpB,OAAO,CAAC,CAAC;AACX,CAAC;AAVD,kCAUC"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
|
-
import { PortfolioAsset } from '../Portfolio';
|
|
2
|
-
export declare function
|
|
1
|
+
import { PortfolioAsset, PortfolioAssetCollectible, PortfolioAssetGeneric, PortfolioAssetToken } from '../Portfolio';
|
|
2
|
+
export declare function sortMultipleAssets(assets: PortfolioAsset[]): PortfolioAsset[];
|
|
3
|
+
export declare function sortAssetCollectibles(a: PortfolioAssetCollectible, b: PortfolioAssetCollectible): number;
|
|
4
|
+
export declare function sortAssetTokens(a: PortfolioAssetToken, b: PortfolioAssetToken): number;
|
|
5
|
+
export declare function sortAssetGenerics(a: PortfolioAssetGeneric, b: PortfolioAssetGeneric): number;
|
package/src/utils/sortAssets.js
CHANGED
|
@@ -1,19 +1,66 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.sortAssetGenerics = exports.sortAssetTokens = exports.sortAssetCollectibles = exports.sortMultipleAssets = void 0;
|
|
4
|
+
const Portfolio_1 = require("../Portfolio");
|
|
4
5
|
const compareName_1 = require("./compareName");
|
|
5
6
|
const compareUsdValue_1 = require("./compareUsdValue");
|
|
6
|
-
function
|
|
7
|
+
function sortMultipleAssets(assets) {
|
|
7
8
|
const sortedAssets = [...assets];
|
|
8
9
|
sortedAssets.sort((a, b) => {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
result = (0, compareName_1.compareName)(a.name, b.name);
|
|
10
|
+
if (a.type === Portfolio_1.PortfolioAssetType.token &&
|
|
11
|
+
b.type === Portfolio_1.PortfolioAssetType.token) {
|
|
12
|
+
return sortAssetTokens(a, b);
|
|
13
13
|
}
|
|
14
|
-
|
|
14
|
+
if (a.type === Portfolio_1.PortfolioAssetType.collectible &&
|
|
15
|
+
b.type === Portfolio_1.PortfolioAssetType.collectible) {
|
|
16
|
+
return sortAssetCollectibles(a, b);
|
|
17
|
+
}
|
|
18
|
+
if (a.type === Portfolio_1.PortfolioAssetType.generic &&
|
|
19
|
+
b.type === Portfolio_1.PortfolioAssetType.generic) {
|
|
20
|
+
return sortAssetGenerics(a, b);
|
|
21
|
+
}
|
|
22
|
+
if (a.type === b.type) {
|
|
23
|
+
return (0, compareUsdValue_1.compareUsdValue)(a.value, b.value);
|
|
24
|
+
}
|
|
25
|
+
if (a.type === Portfolio_1.PortfolioAssetType.generic)
|
|
26
|
+
return 1;
|
|
27
|
+
if (b.type === Portfolio_1.PortfolioAssetType.generic)
|
|
28
|
+
return -1;
|
|
29
|
+
if (a.type === Portfolio_1.PortfolioAssetType.token)
|
|
30
|
+
return 1;
|
|
31
|
+
if (b.type === Portfolio_1.PortfolioAssetType.token)
|
|
32
|
+
return -1;
|
|
33
|
+
if (a.type === Portfolio_1.PortfolioAssetType.collectible)
|
|
34
|
+
return 1;
|
|
35
|
+
if (b.type === Portfolio_1.PortfolioAssetType.collectible)
|
|
36
|
+
return -1;
|
|
37
|
+
return 0;
|
|
15
38
|
});
|
|
16
39
|
return sortedAssets;
|
|
17
40
|
}
|
|
18
|
-
exports.
|
|
41
|
+
exports.sortMultipleAssets = sortMultipleAssets;
|
|
42
|
+
function sortAssetCollectibles(a, b) {
|
|
43
|
+
var _a, _b;
|
|
44
|
+
let r = (0, compareUsdValue_1.compareUsdValue)(a.value, b.value);
|
|
45
|
+
if (r === 0)
|
|
46
|
+
r = (0, compareName_1.compareName)((_a = a.data.collection) === null || _a === void 0 ? void 0 : _a.id, (_b = b.data.collection) === null || _b === void 0 ? void 0 : _b.id);
|
|
47
|
+
if (r === 0)
|
|
48
|
+
r = (0, compareName_1.compareName)(a.data.name, b.data.name);
|
|
49
|
+
return r;
|
|
50
|
+
}
|
|
51
|
+
exports.sortAssetCollectibles = sortAssetCollectibles;
|
|
52
|
+
function sortAssetTokens(a, b) {
|
|
53
|
+
let r = (0, compareUsdValue_1.compareUsdValue)(a.value, b.value);
|
|
54
|
+
if (r === 0)
|
|
55
|
+
r = (0, compareName_1.compareName)(a.data.address, b.data.address);
|
|
56
|
+
return r;
|
|
57
|
+
}
|
|
58
|
+
exports.sortAssetTokens = sortAssetTokens;
|
|
59
|
+
function sortAssetGenerics(a, b) {
|
|
60
|
+
let r = (0, compareUsdValue_1.compareUsdValue)(a.value, b.value);
|
|
61
|
+
if (r === 0)
|
|
62
|
+
r = (0, compareName_1.compareName)(a.data.name, b.data.name);
|
|
63
|
+
return r;
|
|
64
|
+
}
|
|
65
|
+
exports.sortAssetGenerics = sortAssetGenerics;
|
|
19
66
|
//# sourceMappingURL=sortAssets.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortAssets.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortAssets.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"sortAssets.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortAssets.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,16 +19,16 @@ function sortPortfolioElement(element) {
|
|
|
19
19
|
exports.sortPortfolioElement = sortPortfolioElement;
|
|
20
20
|
function sortElementMultiple(element) {
|
|
21
21
|
const sortedElement = element;
|
|
22
|
-
sortedElement.data.assets = (0, sortAssets_1.
|
|
22
|
+
sortedElement.data.assets = (0, sortAssets_1.sortMultipleAssets)(sortedElement.data.assets);
|
|
23
23
|
return sortedElement;
|
|
24
24
|
}
|
|
25
25
|
exports.sortElementMultiple = sortElementMultiple;
|
|
26
26
|
function sortElementBorrowLend(element) {
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
return
|
|
27
|
+
const sE = element;
|
|
28
|
+
sE.data.borrowedAssets = (0, sortAssets_1.sortMultipleAssets)(sE.data.borrowedAssets);
|
|
29
|
+
sE.data.suppliedAssets = (0, sortAssets_1.sortMultipleAssets)(sE.data.suppliedAssets);
|
|
30
|
+
sE.data.rewardAssets = (0, sortAssets_1.sortMultipleAssets)(sE.data.rewardAssets);
|
|
31
|
+
return sE;
|
|
32
32
|
}
|
|
33
33
|
exports.sortElementBorrowLend = sortElementBorrowLend;
|
|
34
34
|
function sortElementLiquidity(element) {
|
|
@@ -39,10 +39,10 @@ function sortElementLiquidity(element) {
|
|
|
39
39
|
}
|
|
40
40
|
exports.sortElementLiquidity = sortElementLiquidity;
|
|
41
41
|
function sortPortfolioLiquidity(portfolioLiquidity) {
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
return
|
|
42
|
+
const sLiquidity = portfolioLiquidity;
|
|
43
|
+
sLiquidity.assets = (0, sortAssets_1.sortMultipleAssets)(sLiquidity.assets);
|
|
44
|
+
sLiquidity.rewardAssets = (0, sortAssets_1.sortMultipleAssets)(sLiquidity.rewardAssets);
|
|
45
|
+
return sLiquidity;
|
|
46
46
|
}
|
|
47
47
|
exports.sortPortfolioLiquidity = sortPortfolioLiquidity;
|
|
48
48
|
//# sourceMappingURL=sortPortfolioElement.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sortPortfolioElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortPortfolioElement.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,4CAOsB;AACtB,
|
|
1
|
+
{"version":3,"file":"sortPortfolioElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortPortfolioElement.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,4CAOsB;AACtB,6CAAkD;AAElD,SAAgB,oBAAoB,CAClC,OAAyB;IAEzB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACtC,KAAK,gCAAoB,CAAC,UAAU;YAClC,OAAO,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACxC,KAAK,gCAAoB,CAAC,SAAS;YACjC,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;QACvC;YACE,OAAO,OAAO,CAAC;IACnB,CAAC;AACH,CAAC;AAbD,oDAaC;AAED,SAAgB,mBAAmB,CACjC,OAAiC;IAEjC,MAAM,aAAa,GAAG,OAAO,CAAC;IAC9B,aAAa,CAAC,IAAI,CAAC,MAAM,GAAG,IAAA,+BAAkB,EAAC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC1E,OAAO,aAAa,CAAC;AACvB,CAAC;AAND,kDAMC;AAED,SAAgB,qBAAqB,CACnC,OAAmC;IAEnC,MAAM,EAAE,GAAG,OAAO,CAAC;IACnB,EAAE,CAAC,IAAI,CAAC,cAAc,GAAG,IAAA,+BAAkB,EAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpE,EAAE,CAAC,IAAI,CAAC,cAAc,GAAG,IAAA,+BAAkB,EAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IACpE,EAAE,CAAC,IAAI,CAAC,YAAY,GAAG,IAAA,+BAAkB,EAAC,EAAE,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IAChE,OAAO,EAAE,CAAC;AACZ,CAAC;AARD,sDAQC;AAED,SAAgB,oBAAoB,CAClC,OAAkC;IAElC,MAAM,aAAa,GAAG,OAAO,CAAC;IAC9B,aAAa,CAAC,IAAI,CAAC,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACxE,sBAAsB,CAAC,CAAC,CAAC,CAC1B,CAAC;IACF,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAC3C,IAAA,iCAAe,EAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAClC,CAAC;IACF,OAAO,aAAa,CAAC;AACvB,CAAC;AAXD,oDAWC;AAED,SAAgB,sBAAsB,CACpC,kBAAsC;IAEtC,MAAM,UAAU,GAAG,kBAAkB,CAAC;IACtC,UAAU,CAAC,MAAM,GAAG,IAAA,+BAAkB,EAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IAC1D,UAAU,CAAC,YAAY,GAAG,IAAA,+BAAkB,EAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IACtE,OAAO,UAAU,CAAC;AACpB,CAAC;AAPD,wDAOC"}
|