@lucid-evolution/utils 0.1.16 → 0.1.18

package/dist/index.cjs

@@ -1115,16 +1115,29 @@ var selectUTxOs = (utxos, totalAssets) => {
     return [];
   return selectedUtxos;
 };
-var sortUTxOs = (utxos, order = "descending") => {
-  return [...utxos].sort((a, b) => {
-    if (a.assets["lovelace"] > b.assets["lovelace"]) {
-      return order === "ascending" ? 1 : -1;
-    }
-    if (a.assets["lovelace"] < b.assets["lovelace"]) {
-      return order === "ascending" ? -1 : 1;
-    }
-    return 0;
-  });
+var sortUTxOs = (utxos, order = "LargestFirst") => {
+  switch (order) {
+    case "LargestFirst":
+      return [...utxos].sort(largestFirst);
+    case "SmallestFirst":
+      return [...utxos].sort(smallestFirst);
+  }
+};
+var largestFirst = (a, b) => {
+  const lovelaceA = Number(a.assets["lovelace"]);
+  const lovelaceB = Number(b.assets["lovelace"]);
+  if (lovelaceA === lovelaceB) {
+    return Object.keys(a.assets).length - Object.keys(b.assets).length;
+  }
+  return -1 * (lovelaceA - lovelaceB);
+};
+var smallestFirst = (a, b) => {
+  const lovelaceA = Number(a.assets["lovelace"]);
+  const lovelaceB = Number(b.assets["lovelace"]);
+  if (lovelaceA == lovelaceB) {
+    return Object.keys(a.assets).length - Object.keys(b.assets).length;
+  }
+  return lovelaceA - lovelaceB;
 };
 var isEqualUTxO = (self, that) => self.txHash === that.txHash && self.outputIndex === that.outputIndex;
 

package/dist/index.d.cts

@@ -61,15 +61,26 @@ declare function coreToTxOutput(output: CML.TransactionOutput): TxOutput;
 declare function coresToTxOutputs(outputs: CML.TransactionOutput[]): TxOutput[];
 declare const selectUTxOs: (utxos: UTxO[], totalAssets: Assets) => UTxO[];
 /**
- * Sorts an array of UTXOs by the amount of "lovelace" in ascending or descending order.
+ * Union type for specifying sorting order in function "sortUTxOs"
+ */
+type SortOrder = 
+/**
+ * Largest amount of "lovelace" with least number of unique assets first
+ */
+"LargestFirst"
+/**
+ * Smallest amount of "lovelace" with least number of unique assets first
+ */
+ | "SmallestFirst";
+/**
+ * Sorts an array of UTXOs according to specified sort order ("LargestFirst" by default).
  *
  * @param {UTxO[]} utxos - The array of UTXO objects to be sorted.
- * @param {"ascending" | "descending"} [order="descending"] - The order in which to sort the UTXOs.
- *      Use "ascending" for ascending order and "descending" for descending order.
+ * @param {SortOrder} [order="LargestFirst"] - The order in which to sort the UTXOs.
  * @returns {UTxO[]} - The sorted array of UTXOs.
  *
  */
-declare const sortUTxOs: (utxos: UTxO[], order?: "ascending" | "descending") => UTxO[];
+declare const sortUTxOs: (utxos: UTxO[], order?: SortOrder) => UTxO[];
 declare const isEqualUTxO: (self: UTxO, that: UTxO) => boolean;
 
 declare function valueToAssets(value: CML.Value): Assets;
@@ -92,4 +103,4 @@ declare function addAssets(...assets: Assets[]): Assets;
 
 declare const stringify: (data: any) => string;
 
-export { PROTOCOL_PARAMETERS_DEFAULT, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, isEqualUTxO, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortUTxOs, stakeCredentialOf, stringify, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };
+export { PROTOCOL_PARAMETERS_DEFAULT, type SortOrder, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, isEqualUTxO, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortUTxOs, stakeCredentialOf, stringify, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };

package/dist/index.d.ts

@@ -61,15 +61,26 @@ declare function coreToTxOutput(output: CML.TransactionOutput): TxOutput;
 declare function coresToTxOutputs(outputs: CML.TransactionOutput[]): TxOutput[];
 declare const selectUTxOs: (utxos: UTxO[], totalAssets: Assets) => UTxO[];
 /**
- * Sorts an array of UTXOs by the amount of "lovelace" in ascending or descending order.
+ * Union type for specifying sorting order in function "sortUTxOs"
+ */
+type SortOrder = 
+/**
+ * Largest amount of "lovelace" with least number of unique assets first
+ */
+"LargestFirst"
+/**
+ * Smallest amount of "lovelace" with least number of unique assets first
+ */
+ | "SmallestFirst";
+/**
+ * Sorts an array of UTXOs according to specified sort order ("LargestFirst" by default).
  *
  * @param {UTxO[]} utxos - The array of UTXO objects to be sorted.
- * @param {"ascending" | "descending"} [order="descending"] - The order in which to sort the UTXOs.
- *      Use "ascending" for ascending order and "descending" for descending order.
+ * @param {SortOrder} [order="LargestFirst"] - The order in which to sort the UTXOs.
  * @returns {UTxO[]} - The sorted array of UTXOs.
  *
  */
-declare const sortUTxOs: (utxos: UTxO[], order?: "ascending" | "descending") => UTxO[];
+declare const sortUTxOs: (utxos: UTxO[], order?: SortOrder) => UTxO[];
 declare const isEqualUTxO: (self: UTxO, that: UTxO) => boolean;
 
 declare function valueToAssets(value: CML.Value): Assets;
@@ -92,4 +103,4 @@ declare function addAssets(...assets: Assets[]): Assets;
 
 declare const stringify: (data: any) => string;
 
-export { PROTOCOL_PARAMETERS_DEFAULT, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, isEqualUTxO, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortUTxOs, stakeCredentialOf, stringify, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };
+export { PROTOCOL_PARAMETERS_DEFAULT, type SortOrder, addAssets, addressFromHexOrBech32, applyDoubleCborEncoding, applyParamsToScript, assetsToValue, coreToOutRef, coreToTxOutput, coreToUtxo, coresToOutRefs, coresToTxOutputs, coresToUtxos, createCostModels, credentialToAddress, credentialToRewardAddress, datumToHash, fromLabel, fromScriptRef, fromUnit, generatePrivateKey, generateSeedPhrase, getAddressDetails, isEqualUTxO, keyHashToCredential, mintingPolicyToId, nativeFromJson, nativeJSFromJson, nativeScriptFromJson, networkToId, paymentCredentialOf, scriptHashToCredential, selectUTxOs, slotToUnixTime, sortUTxOs, stakeCredentialOf, stringify, toLabel, toNativeScript, toPublicKey, toScriptRef, toUnit, unixTimeToSlot, utxoToCore, utxoToTransactionInput, utxoToTransactionOutput, utxosToCores, validatorToAddress, validatorToRewardAddress, validatorToScriptHash, valueToAssets };

package/dist/index.js

@@ -1034,16 +1034,29 @@ var selectUTxOs = (utxos, totalAssets) => {
     return [];
   return selectedUtxos;
 };
-var sortUTxOs = (utxos, order = "descending") => {
-  return [...utxos].sort((a, b) => {
-    if (a.assets["lovelace"] > b.assets["lovelace"]) {
-      return order === "ascending" ? 1 : -1;
-    }
-    if (a.assets["lovelace"] < b.assets["lovelace"]) {
-      return order === "ascending" ? -1 : 1;
-    }
-    return 0;
-  });
+var sortUTxOs = (utxos, order = "LargestFirst") => {
+  switch (order) {
+    case "LargestFirst":
+      return [...utxos].sort(largestFirst);
+    case "SmallestFirst":
+      return [...utxos].sort(smallestFirst);
+  }
+};
+var largestFirst = (a, b) => {
+  const lovelaceA = Number(a.assets["lovelace"]);
+  const lovelaceB = Number(b.assets["lovelace"]);
+  if (lovelaceA === lovelaceB) {
+    return Object.keys(a.assets).length - Object.keys(b.assets).length;
+  }
+  return -1 * (lovelaceA - lovelaceB);
+};
+var smallestFirst = (a, b) => {
+  const lovelaceA = Number(a.assets["lovelace"]);
+  const lovelaceB = Number(b.assets["lovelace"]);
+  if (lovelaceA == lovelaceB) {
+    return Object.keys(a.assets).length - Object.keys(b.assets).length;
+  }
+  return lovelaceA - lovelaceB;
 };
 var isEqualUTxO = (self, that) => self.txHash === that.txHash && self.outputIndex === that.outputIndex;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lucid-evolution/utils",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -29,11 +29,11 @@
     "@dcspark/cardano-multiplatform-lib-browser": "^5.3.0",
     "cborg": "^4.2.0",
     "@lucid-evolution/bip39": "0.2.7",
-    "@lucid-evolution/core-types": "0.1.6",
+    "@lucid-evolution/core-types": "0.1.7",
     "@lucid-evolution/core-utils": "0.1.6",
     "@lucid-evolution/crc8": "0.1.6",
-    "@lucid-evolution/plutus": "0.1.9",
-    "@lucid-evolution/uplc": "0.2.5"
+    "@lucid-evolution/plutus": "0.1.10",
+    "@lucid-evolution/uplc": "0.2.6"
   },
   "devDependencies": {
     "@types/node": "^20.12.8",