@gearbox-protocol/sdk 16.0.0-next.32 → 16.0.0-next.33

package/dist/cjs/sdk/positions/mergePositionList.js

@@ -4,7 +4,11 @@ require("../../model/index.js");
 const require_sdk_utils_mergeChains = require("../utils/mergeChains.js");
 //#region src/sdk/positions/mergePositionList.ts
 function mergePositionList(onchain, offchain, maxLagSeconds) {
-	const merged = require_sdk_utils_mergeChains.mergeChainList(onchain, offchain, maxLagSeconds);
+	const onchainGroups = splitPositionsByKind(onchain);
+	const offchainGroups = splitPositionsByKind(offchain);
+	return combineGroups(overlayBackendStrategyFields(require_sdk_utils_mergeChains.mergeChainList(onchainGroups.nonLiquidations, offchainGroups.nonLiquidations, maxLagSeconds), offchainGroups.nonLiquidations), require_sdk_utils_mergeChains.mergeChainList(onchainGroups.liquidations, offchainGroups.liquidations, maxLagSeconds));
+}
+function overlayBackendStrategyFields(merged, offchain) {
 	if (!merged || !offchain) return merged;
 	const backendById = new Map(offchain.data.filter((row) => row.kind === "strategy").map((row) => [require_model_positions.positionId(row), row]));
 	return {
@@ -19,5 +23,45 @@ function mergePositionList(onchain, offchain, maxLagSeconds) {
 		})
 	};
 }
+function splitPositionsByKind(response) {
+	if (!response) return {
+		nonLiquidations: void 0,
+		liquidations: void 0
+	};
+	const nonLiquidationRows = [];
+	const liquidationRows = [];
+	for (const row of response.data) if (row.kind === "liquidation") liquidationRows.push(row);
+	else nonLiquidationRows.push(row);
+	return {
+		nonLiquidations: {
+			...response,
+			data: nonLiquidationRows
+		},
+		liquidations: liquidationRowsToResponse(response, liquidationRows)
+	};
+}
+/**
+* Liquidation rows of one source, or `undefined` when it served none, so
+* {@link mergeChainList} cannot pick an empty backend list over on-chain rows.
+**/
+function liquidationRowsToResponse(source, rows) {
+	if (rows.length === 0) return;
+	const chainIds = new Set(rows.map((row) => row.chainId));
+	return {
+		data: rows,
+		meta: {
+			...source.meta,
+			chains: source.meta.chains.filter((chain) => chainIds.has(chain.chainId))
+		}
+	};
+}
+function combineGroups(nonLiquidations, liquidations) {
+	if (!nonLiquidations) return liquidations;
+	if (!liquidations) return nonLiquidations;
+	return {
+		...nonLiquidations,
+		data: [...nonLiquidations.data, ...liquidations.data]
+	};
+}
 //#endregion
 exports.mergePositionList = mergePositionList;

package/dist/esm/sdk/positions/mergePositionList.js

@@ -3,7 +3,11 @@ import "../../model/index.js";
 import { mergeChainList } from "../utils/mergeChains.js";
 //#region src/sdk/positions/mergePositionList.ts
 function mergePositionList(onchain, offchain, maxLagSeconds) {
-	const merged = mergeChainList(onchain, offchain, maxLagSeconds);
+	const onchainGroups = splitPositionsByKind(onchain);
+	const offchainGroups = splitPositionsByKind(offchain);
+	return combineGroups(overlayBackendStrategyFields(mergeChainList(onchainGroups.nonLiquidations, offchainGroups.nonLiquidations, maxLagSeconds), offchainGroups.nonLiquidations), mergeChainList(onchainGroups.liquidations, offchainGroups.liquidations, maxLagSeconds));
+}
+function overlayBackendStrategyFields(merged, offchain) {
 	if (!merged || !offchain) return merged;
 	const backendById = new Map(offchain.data.filter((row) => row.kind === "strategy").map((row) => [positionId(row), row]));
 	return {
@@ -18,5 +22,45 @@ function mergePositionList(onchain, offchain, maxLagSeconds) {
 		})
 	};
 }
+function splitPositionsByKind(response) {
+	if (!response) return {
+		nonLiquidations: void 0,
+		liquidations: void 0
+	};
+	const nonLiquidationRows = [];
+	const liquidationRows = [];
+	for (const row of response.data) if (row.kind === "liquidation") liquidationRows.push(row);
+	else nonLiquidationRows.push(row);
+	return {
+		nonLiquidations: {
+			...response,
+			data: nonLiquidationRows
+		},
+		liquidations: liquidationRowsToResponse(response, liquidationRows)
+	};
+}
+/**
+* Liquidation rows of one source, or `undefined` when it served none, so
+* {@link mergeChainList} cannot pick an empty backend list over on-chain rows.
+**/
+function liquidationRowsToResponse(source, rows) {
+	if (rows.length === 0) return;
+	const chainIds = new Set(rows.map((row) => row.chainId));
+	return {
+		data: rows,
+		meta: {
+			...source.meta,
+			chains: source.meta.chains.filter((chain) => chainIds.has(chain.chainId))
+		}
+	};
+}
+function combineGroups(nonLiquidations, liquidations) {
+	if (!nonLiquidations) return liquidations;
+	if (!liquidations) return nonLiquidations;
+	return {
+		...nonLiquidations,
+		data: [...nonLiquidations.data, ...liquidations.data]
+	};
+}
 //#endregion
 export { mergePositionList };

package/dist/types/sdk/positions/mergePositionList.d.ts

@@ -9,6 +9,11 @@ import { MergeListResult } from "../utils/types.js";
  * `name` onto every strategy row the backend has — even when that chain was
  * served from on-chain data because the backend was stale.
  *
+ * Liquidation rows are merged independently: the backend does not serve them
+ * yet, so a fresh off-chain list must not drop on-chain liquidations. Once it
+ * does return them, they follow the same freshness rule as the rest of the
+ * list.
+ *
  * The chain resolves `targetCollateral` from a per-account override or the
  * credit manager's single target token. The backend's historical value is
  * still preferred when it has the row. `name` is derived from that collateral,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "16.0.0-next.32",
+  "version": "16.0.0-next.33",
   "description": "Gearbox SDK",
   "license": "MIT",
   "repository": {