@sonarwatch/portfolio-core 0.14.119 → 0.14.120

package/README.md

@@ -1,3 +1,3 @@
-# @sonarwatch/portfolio-core
-
-This library is @sonarwatch/portfolio-core
+# @sonarwatch/portfolio-core
+
+This library is @sonarwatch/portfolio-core

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sonarwatch/portfolio-core",
-  "version": "0.14.119",
+  "version": "0.14.120",
   "type": "commonjs",
   "types": "./src/index.d.ts",
   "dependencies": {

package/src/Portfolio.d.ts

@@ -15,7 +15,7 @@ export type PortfolioAssetTypeType = (typeof PortfolioAssetType)[keyof typeof Po
 /**
  * Represents the label of a portfolio element.
  */
-export type PortfolioElementLabel = 'Wallet' | 'Staked' | 'LiquidityPool' | 'Farming' | 'Vault' | 'Lending' | 'Vesting' | 'Deposit' | 'Rewards' | 'Airdrop' | 'Margin' | 'Leverage';
+export type PortfolioElementLabel = 'Wallet' | 'Staked' | 'LiquidityPool' | 'Farming' | 'Vault' | 'Lending' | 'Vesting' | 'Deposit' | 'Rewards' | 'Airdrop' | 'Margin' | 'LimitOrder' | 'DCA' | 'Leverage';
 export type PortfolioAssetAttributes = {
     /**
      * Represents the date (in ms) when the asset will be unlocked.
@@ -44,6 +44,7 @@ export declare const PortfolioElementType: {
     readonly liquidity: "liquidity";
     readonly borrowlend: "borrowlend";
     readonly leverage: "leverage";
+    readonly trade: "trade";
 };
 export type PortfolioElementTypeType = (typeof PortfolioElementType)[keyof typeof PortfolioElementType];
 /**
@@ -200,6 +201,44 @@ export type PortfolioElementMultiple = PortfolioElementCommon & {
     type: 'multiple';
     data: PortfolioElementMultipleData;
 };
+/**
+ * Represents the data of a trade portfolio element.
+ */
+export type PortfolioElementTradeData = {
+    assets: {
+        input: PortfolioAsset;
+        output: PortfolioAsset | null;
+    };
+    inputAddress: string;
+    outputAddress: string;
+    initialInputAmount: number;
+    withdrawnOutputAmount: number;
+    expectedOutputAmount?: number;
+    inputPrice: UsdValue;
+    outputPrice: UsdValue;
+    /**
+     * Filled percentage between 0 and 1.
+     */
+    filledPercentage: number;
+    /**
+     * Created at timestamp in ms
+     */
+    createdAt?: number;
+    /**
+     * Expire at timestamp in ms
+     */
+    expireAt?: number;
+    ref?: string;
+    sourceRefs?: SourceRef[];
+    link?: string;
+};
+/**
+ * Represents a trade portfolio element.
+ */
+export type PortfolioElementTrade = PortfolioElementCommon & {
+    type: 'trade';
+    data: PortfolioElementTradeData;
+};
 /**
  * Represents a liquidity.
  */
@@ -232,24 +271,63 @@ export declare enum LeverageSide {
     long = "long",
     short = "short"
 }
-export type LevPosition = {
+export type IsoLevPosition = {
+    /**
+     * Address of the levareged asset if it exist
+     */
+    address?: string;
     name?: string;
     imageUri?: string;
-    address?: string;
-    size?: number;
-    sizeValue: UsdValue;
     collateralValue: UsdValue;
-    value: UsdValue;
-    liquidationPrice: UsdValue;
+    side: LeverageSide;
+    entryPrice: UsdValue;
+    markPrice: UsdValue;
+    size: number;
+    sizeValue: UsdValue;
     pnlValue: UsdValue;
+    liquidationPrice: UsdValue;
     leverage?: number;
-    side: LeverageSide;
+    tp?: {
+        gain: UsdValue;
+        price: UsdValue;
+    };
+    sl?: {
+        loss: UsdValue;
+        price: UsdValue;
+    };
+    value: UsdValue;
 };
+export type CrossLevPosition = Omit<IsoLevPosition, 'collateralValue'>;
 /**
  * Represents the data of a leverage portfolio element.
  */
 export type PortfolioElementLeverageData = {
-    positions: LevPosition[];
+    /**
+     * Isolated positions
+     */
+    isolated?: {
+        positions: IsoLevPosition[];
+        value: UsdValue;
+    };
+    /**
+     * Cross positions
+     */
+    cross?: {
+        /**
+         * Sum of positions sizeValue / cross value
+         */
+        leverage?: number;
+        /**
+         * If it reach 1, positions will be liquidated
+         */
+        collateralAssets?: PortfolioAsset[];
+        collateralValue: UsdValue;
+        positions: CrossLevPosition[];
+        value: UsdValue;
+    };
+    /**
+     * Total value (total equity)
+     */
     value: UsdValue;
     ref?: string;
     sourceRefs?: SourceRef[];
@@ -342,7 +420,7 @@ export type PortfolioElementBorrowLend = PortfolioElementCommon & {
 /**
  * Represents a portfolio element.
  */
-export type PortfolioElement = PortfolioElementMultiple | PortfolioElementLiquidity | PortfolioElementLeverage | PortfolioElementBorrowLend;
+export type PortfolioElement = PortfolioElementMultiple | PortfolioElementLiquidity | PortfolioElementLeverage | PortfolioElementBorrowLend | PortfolioElementTrade;
 /**
  * Represents the result of a fetcher.
  */

package/src/Portfolio.js

@@ -17,6 +17,7 @@ exports.PortfolioElementType = {
     liquidity: 'liquidity',
     borrowlend: 'borrowlend',
     leverage: 'leverage',
+    trade: 'trade',
 };
 var LeverageSide;
 (function (LeverageSide) {

package/src/Portfolio.js.map

@@ -1 +1 @@
-{"version":3,"file":"Portfolio.js","sourceRoot":"","sources":["../../../../packages/core/src/Portfolio.ts"],"names":[],"mappings":";;;AAMA;;GAEG;AACU,QAAA,kBAAkB,GAAG;IAChC,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;CAClB,CAAC;AA0CX;;GAEG;AACU,QAAA,oBAAoB,GAAG;IAClC,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;CACZ,CAAC;AA0NX,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,+BAAe,CAAA;AACjB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB"}
+{"version":3,"file":"Portfolio.js","sourceRoot":"","sources":["../../../../packages/core/src/Portfolio.ts"],"names":[],"mappings":";;;AAMA;;GAEG;AACU,QAAA,kBAAkB,GAAG;IAChC,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,WAAW,EAAE,aAAa;CAClB,CAAC;AA4CX;;GAEG;AACU,QAAA,oBAAoB,GAAG;IAClC,QAAQ,EAAE,UAAU;IACpB,SAAS,EAAE,WAAW;IACtB,UAAU,EAAE,YAAY;IACxB,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;CACN,CAAC;AAkQX,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,+BAAe,CAAA;AACjB,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB"}

package/src/utils/getAddressesFromElement.js

@@ -5,10 +5,12 @@ const Portfolio_1 = require("../Portfolio");
 const getAssetsFromElement_1 = require("./getAssetsFromElement");
 const getAddressesFromAssets_1 = require("./getAddressesFromAssets");
 function getAddressesFromElement(element, tokenOnly = true) {
+    var _a, _b;
     if (element.type === Portfolio_1.PortfolioElementType.leverage) {
-        return element.data.positions
-            .map((p) => p.address)
-            .filter((v) => v !== null);
+        return [
+            ...(((_a = element.data.isolated) === null || _a === void 0 ? void 0 : _a.positions.map((p) => p.address).filter((v) => v !== undefined)) || []),
+            ...(((_b = element.data.cross) === null || _b === void 0 ? void 0 : _b.positions.map((p) => p.address).filter((v) => v !== undefined)) || []),
+        ];
     }
     const assets = (0, getAssetsFromElement_1.getAssetsFromElement)(element);
     return (0, getAddressesFromAssets_1.getAddressesFromAssets)(assets, tokenOnly);

package/src/utils/getAddressesFromElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAddressesFromElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAddressesFromElement.ts"],"names":[],"mappings":";;;AAAA,4CAAsE;AACtE,iEAA8D;AAC9D,qEAAkE;AAElE,SAAgB,uBAAuB,CACrC,OAAyB,EACzB,SAAS,GAAG,IAAI;IAEhB,IAAI,OAAO,CAAC,IAAI,KAAK,gCAAoB,CAAC,QAAQ,EAAE,CAAC;QACnD,OAAO,OAAO,CAAC,IAAI,CAAC,SAAS;aAC1B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;aACrB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAa,CAAC;IAC3C,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,2CAAoB,EAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,IAAA,+CAAsB,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACnD,CAAC;AAXD,0DAWC"}
+{"version":3,"file":"getAddressesFromElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAddressesFromElement.ts"],"names":[],"mappings":";;;AAAA,4CAAsE;AACtE,iEAA8D;AAC9D,qEAAkE;AAElE,SAAgB,uBAAuB,CACrC,OAAyB,EACzB,SAAS,GAAG,IAAI;;IAEhB,IAAI,OAAO,CAAC,IAAI,KAAK,gCAAoB,CAAC,QAAQ,EAAE,CAAC;QACnD,OAAO;YACL,GAAI,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,QAAQ,0CAAE,SAAS,CAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,KAAI,EAAE,CAAc;YACrD,GAAI,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,KAAK,0CAAE,SAAS,CAC/B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,CAAC,KAAI,EAAE,CAAc;SACtD,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,IAAA,2CAAoB,EAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,IAAA,+CAAsB,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;AACnD,CAAC;AAhBD,0DAgBC"}

package/src/utils/getAssetsFromElement.js

@@ -5,23 +5,34 @@ const Portfolio_1 = require("../Portfolio");
 function getLongAssetsFromElement(element) {
     var _a;
     switch (element.type) {
-        case Portfolio_1.PortfolioElementType.multiple:
+        case Portfolio_1.PortfolioElementType.multiple: {
             return [...element.data.assets];
-        case Portfolio_1.PortfolioElementType.liquidity:
+        }
+        case Portfolio_1.PortfolioElementType.liquidity: {
             return [
                 ...element.data.liquidities.map((l) => l.assets).flat(1),
                 ...element.data.liquidities.map((l) => l.rewardAssets).flat(1),
             ];
-        case Portfolio_1.PortfolioElementType.borrowlend:
+        }
+        case Portfolio_1.PortfolioElementType.borrowlend: {
             return [
                 ...element.data.suppliedAssets,
                 ...element.data.rewardAssets,
                 ...(((_a = element.data.unsettled) === null || _a === void 0 ? void 0 : _a.assets) || []),
             ];
-        case Portfolio_1.PortfolioElementType.leverage:
+        }
+        case Portfolio_1.PortfolioElementType.leverage: {
             return [];
-        default:
+        }
+        case Portfolio_1.PortfolioElementType.trade: {
+            const assets = [element.data.assets.input];
+            if (element.data.assets.output)
+                assets.push(element.data.assets.output);
+            return assets;
+        }
+        default: {
             return [];
+        }
     }
 }
 exports.getLongAssetsFromElement = getLongAssetsFromElement;
@@ -35,6 +46,8 @@ function getShortAssetsFromElement(element) {
             return [...element.data.borrowedAssets];
         case Portfolio_1.PortfolioElementType.leverage:
             return [];
+        case Portfolio_1.PortfolioElementType.trade:
+            return [];
         default:
             return [];
     }

package/src/utils/getAssetsFromElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAssetsFromElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAssetsFromElement.ts"],"names":[],"mappings":";;;AAAA,4CAIsB;AAEtB,SAAgB,wBAAwB,CACtC,OAAyB;;IAEzB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClC,KAAK,gCAAoB,CAAC,SAAS;YACjC,OAAO;gBACL,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxD,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aAC/D,CAAC;QACJ,KAAK,gCAAoB,CAAC,UAAU;YAClC,OAAO;gBACL,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc;gBAC9B,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY;gBAC5B,GAAG,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,SAAS,0CAAE,MAAM,KAAI,EAAE,CAAC;aAC1C,CAAC;QACJ,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,EAAE,CAAC;QACZ;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAtBD,4DAsBC;AAED,SAAgB,yBAAyB,CACvC,OAAyB;IAEzB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,EAAE,CAAC;QACZ,KAAK,gCAAoB,CAAC,SAAS;YACjC,OAAO,EAAE,CAAC;QACZ,KAAK,gCAAoB,CAAC,UAAU;YAClC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,EAAE,CAAC;QACZ;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAfD,8DAeC;AAED,SAAgB,oBAAoB,CAClC,OAAyB;IAEzB,OAAO;QACL,GAAG,wBAAwB,CAAC,OAAO,CAAC;QACpC,GAAG,yBAAyB,CAAC,OAAO,CAAC;KACtC,CAAC;AACJ,CAAC;AAPD,oDAOC"}
+{"version":3,"file":"getAssetsFromElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/getAssetsFromElement.ts"],"names":[],"mappings":";;;AAAA,4CAIsB;AAEtB,SAAgB,wBAAwB,CACtC,OAAyB;;IAEzB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gCAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QAED,KAAK,gCAAoB,CAAC,SAAS,CAAC,CAAC,CAAC;YACpC,OAAO;gBACL,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBACxD,GAAG,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;aAC/D,CAAC;QACJ,CAAC;QAED,KAAK,gCAAoB,CAAC,UAAU,CAAC,CAAC,CAAC;YACrC,OAAO;gBACL,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc;gBAC9B,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY;gBAC5B,GAAG,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,SAAS,0CAAE,MAAM,KAAI,EAAE,CAAC;aAC1C,CAAC;QACJ,CAAC;QAED,KAAK,gCAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;YACnC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,KAAK,gCAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;YAChC,MAAM,MAAM,GAAqB,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7D,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;gBAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACxE,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,OAAO,CAAC,CAAC,CAAC;YACR,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;AACH,CAAC;AArCD,4DAqCC;AAED,SAAgB,yBAAyB,CACvC,OAAyB;IAEzB,QAAQ,OAAO,CAAC,IAAI,EAAE,CAAC;QACrB,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,EAAE,CAAC;QACZ,KAAK,gCAAoB,CAAC,SAAS;YACjC,OAAO,EAAE,CAAC;QACZ,KAAK,gCAAoB,CAAC,UAAU;YAClC,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QAC1C,KAAK,gCAAoB,CAAC,QAAQ;YAChC,OAAO,EAAE,CAAC;QACZ,KAAK,gCAAoB,CAAC,KAAK;YAC7B,OAAO,EAAE,CAAC;QACZ;YACE,OAAO,EAAE,CAAC;IACd,CAAC;AACH,CAAC;AAjBD,8DAiBC;AAED,SAAgB,oBAAoB,CAClC,OAAyB;IAEzB,OAAO;QACL,GAAG,wBAAwB,CAAC,OAAO,CAAC;QACpC,GAAG,yBAAyB,CAAC,OAAO,CAAC;KACtC,CAAC;AACJ,CAAC;AAPD,oDAOC"}

package/src/utils/index.d.ts

@@ -28,6 +28,7 @@ export * from './getCollectiblesFromAssets';
 export * from './getUsdValueSum';
 export * from './getUsdValueSumStrict';
 export * from './mergePortfolioElementMultiples';
+export * from './portfolioElementTradeToMultiple';
 export * from './sortAssets';
 export * from './sortPortfolioElement';
 export * from './sortPortfolioElements';

package/src/utils/index.js

@@ -44,6 +44,7 @@ __exportStar(require("./getCollectiblesFromAssets"), exports);
 __exportStar(require("./getUsdValueSum"), exports);
 __exportStar(require("./getUsdValueSumStrict"), exports);
 __exportStar(require("./mergePortfolioElementMultiples"), exports);
+__exportStar(require("./portfolioElementTradeToMultiple"), exports);
 __exportStar(require("./sortAssets"), exports);
 __exportStar(require("./sortPortfolioElement"), exports);
 __exportStar(require("./sortPortfolioElements"), exports);

package/src/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,oDAAkC;AAClC,kEAAgD;AAChD,sDAAoC;AACpC,iDAA+B;AAC/B,sDAAoC;AACpC,kDAAgC;AAChC,uDAAqC;AACrC,4DAA0C;AAC1C,+DAA6C;AAC7C,gDAA8B;AAC9B,oDAAkC;AAClC,mDAAiC;AACjC,wDAAsC;AACtC,qDAAmC;AACnC,+DAA6C;AAC7C,2DAAyC;AACzC,uDAAqC;AACrC,mDAAiC;AACjC,wDAAsC;AACtC,2DAAyC;AACzC,+DAA6C;AAC7C,kEAAgD;AAChD,yDAAuC;AACvC,0DAAwC;AACxC,4DAA0C;AAC1C,8DAA4C;AAC5C,mDAAiC;AACjC,yDAAuC;AACvC,mEAAiD;AACjD,+CAA6B;AAC7B,yDAAuC;AACvC,0DAAwC;AACxC,4DAA0C;AAC1C,wDAAsC;AACtC,2DAAyC;AACzC,sDAAoC;AACpC,uDAAqC;AACrC,uDAAqC;AACrC,sDAAoC;AACpC,uDAAqC;AACrC,8DAA4C;AAC5C,8DAA4C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,yCAAuB;AACvB,oDAAkC;AAClC,kEAAgD;AAChD,sDAAoC;AACpC,iDAA+B;AAC/B,sDAAoC;AACpC,kDAAgC;AAChC,uDAAqC;AACrC,4DAA0C;AAC1C,+DAA6C;AAC7C,gDAA8B;AAC9B,oDAAkC;AAClC,mDAAiC;AACjC,wDAAsC;AACtC,qDAAmC;AACnC,+DAA6C;AAC7C,2DAAyC;AACzC,uDAAqC;AACrC,mDAAiC;AACjC,wDAAsC;AACtC,2DAAyC;AACzC,+DAA6C;AAC7C,kEAAgD;AAChD,yDAAuC;AACvC,0DAAwC;AACxC,4DAA0C;AAC1C,8DAA4C;AAC5C,mDAAiC;AACjC,yDAAuC;AACvC,mEAAiD;AACjD,oEAAkD;AAClD,+CAA6B;AAC7B,yDAAuC;AACvC,0DAAwC;AACxC,4DAA0C;AAC1C,wDAAsC;AACtC,2DAAyC;AACzC,sDAAoC;AACpC,uDAAqC;AACrC,uDAAqC;AACrC,sDAAoC;AACpC,uDAAqC;AACrC,8DAA4C;AAC5C,8DAA4C"}

package/src/utils/portfolioElementTradeToMultiple.d.ts

@@ -0,0 +1,2 @@
+import { PortfolioElementMultiple, PortfolioElementTrade } from '../Portfolio';
+export declare function portfolioElementTradeToMultiple(element: PortfolioElementTrade): PortfolioElementMultiple;

package/src/utils/portfolioElementTradeToMultiple.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.portfolioElementTradeToMultiple = void 0;
+const Portfolio_1 = require("../Portfolio");
+function portfolioElementTradeToMultiple(element) {
+    const assets = [element.data.assets.input];
+    if (element.data.assets.output)
+        assets.push(element.data.assets.output);
+    return Object.assign(Object.assign({}, element), { type: Portfolio_1.PortfolioElementType.multiple, data: Object.assign(Object.assign({}, element.data), { assets }) });
+}
+exports.portfolioElementTradeToMultiple = portfolioElementTradeToMultiple;
+//# sourceMappingURL=portfolioElementTradeToMultiple.js.map

package/src/utils/portfolioElementTradeToMultiple.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"portfolioElementTradeToMultiple.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/portfolioElementTradeToMultiple.ts"],"names":[],"mappings":";;;AAAA,4CAIsB;AAEtB,SAAgB,+BAA+B,CAC7C,OAA8B;IAE9B,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM;QAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxE,uCACK,OAAO,KACV,IAAI,EAAE,gCAAoB,CAAC,QAAQ,EACnC,IAAI,kCACC,OAAO,CAAC,IAAI,KACf,MAAM,OAER;AACJ,CAAC;AAbD,0EAaC"}

package/src/utils/sortPortfolioElement.d.ts

@@ -1,7 +1,8 @@
-import { PortfolioElement, PortfolioElementBorrowLend, PortfolioElementLeverage, PortfolioElementLiquidity, PortfolioElementMultiple, PortfolioLiquidity } from '../Portfolio';
+import { PortfolioElement, PortfolioElementBorrowLend, PortfolioElementLeverage, PortfolioElementLiquidity, PortfolioElementMultiple, PortfolioElementTrade, PortfolioLiquidity } from '../Portfolio';
 export declare function sortPortfolioElement(element: PortfolioElement): PortfolioElement;
 export declare function sortElementMultiple(element: PortfolioElementMultiple): PortfolioElementMultiple;
 export declare function sortElementBorrowLend(element: PortfolioElementBorrowLend): PortfolioElementBorrowLend;
 export declare function sortElementLiquidity(element: PortfolioElementLiquidity): PortfolioElementLiquidity;
 export declare function sortPortfolioLiquidity(portfolioLiquidity: PortfolioLiquidity): PortfolioLiquidity;
 export declare function sortElementLeverage(element: PortfolioElementLeverage): PortfolioElementLeverage;
+export declare function sortElementTrade(element: PortfolioElementTrade): PortfolioElementTrade;

package/src/utils/sortPortfolioElement.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sortElementLeverage = exports.sortPortfolioLiquidity = exports.sortElementLiquidity = exports.sortElementBorrowLend = exports.sortElementMultiple = exports.sortPortfolioElement = void 0;
+exports.sortElementTrade = exports.sortElementLeverage = exports.sortPortfolioLiquidity = exports.sortElementLiquidity = exports.sortElementBorrowLend = exports.sortElementMultiple = exports.sortPortfolioElement = void 0;
 const compareUsdValue_1 = require("./compareUsdValue");
 const Portfolio_1 = require("../Portfolio");
 const sortAssets_1 = require("./sortAssets");
@@ -14,6 +14,8 @@ function sortPortfolioElement(element) {
             return sortElementLiquidity(element);
         case Portfolio_1.PortfolioElementType.leverage:
             return sortElementLeverage(element);
+        case Portfolio_1.PortfolioElementType.trade:
+            return sortElementTrade(element);
         default:
             return element;
     }
@@ -55,9 +57,15 @@ function sortPortfolioLiquidity(portfolioLiquidity) {
 }
 exports.sortPortfolioLiquidity = sortPortfolioLiquidity;
 function sortElementLeverage(element) {
+    var _a, _b;
     const sortedElement = Object.assign({}, element);
-    sortedElement.data.positions.sort((a, b) => (0, compareUsdValue_1.compareUsdValue)(a.value, b.value));
+    (_a = sortedElement.data.isolated) === null || _a === void 0 ? void 0 : _a.positions.sort((a, b) => (0, compareUsdValue_1.compareUsdValue)(a.value, b.value));
+    (_b = sortedElement.data.cross) === null || _b === void 0 ? void 0 : _b.positions.sort((a, b) => (0, compareUsdValue_1.compareUsdValue)(a.value, b.value));
     return sortedElement;
 }
 exports.sortElementLeverage = sortElementLeverage;
+function sortElementTrade(element) {
+    return element;
+}
+exports.sortElementTrade = sortElementTrade;
 //# sourceMappingURL=sortPortfolioElement.js.map

package/src/utils/sortPortfolioElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"sortPortfolioElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortPortfolioElement.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sortPortfolioElement.js","sourceRoot":"","sources":["../../../../../packages/core/src/utils/sortPortfolioElement.ts"],"names":[],"mappings":"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"}