@w3ux/utils 1.1.1-beta.8 → 1.2.0

package/base.cjs

@@ -32,6 +32,7 @@ __export(base_exports, {
   pageFromUri: () => pageFromUri,
   removeHexPrefix: () => removeHexPrefix,
   rmCommas: () => rmCommas,
+  rmDecimals: () => rmDecimals,
   shuffle: () => shuffle,
   withTimeout: () => withTimeout
 });
@@ -110,6 +111,7 @@ var pageFromUri = (pathname, fallback) => {
   return page.trim();
 };
 var rmCommas = (val) => val.replace(/,/g, "");
+var rmDecimals = (str) => str.split(".")[0];
 var shuffle = (array) => {
   let currentIndex = array.length;
   let randomIndex;
@@ -171,6 +173,7 @@ var minBigInt = (...values) => values.reduce((min, current) => current < min ? c
   pageFromUri,
   removeHexPrefix,
   rmCommas,
+  rmDecimals,
   shuffle,
   withTimeout
 });

package/base.d.cts

@@ -43,6 +43,11 @@ declare const pageFromUri: (pathname: string, fallback: string) => string;
  * @summary Removes the commas from a string.
  */
 declare const rmCommas: (val: string) => string;
+/**
+ * @name rmDecimals
+ * @summary Removes the decimal point and decimals from a string.
+ */
+declare const rmDecimals: (str: any) => any;
 /**
  * @name shuffle
  * @summary Shuffle a set of objects.
@@ -101,4 +106,4 @@ declare const maxBigInt: (...values: bigint[]) => bigint;
  */
 declare const minBigInt: (...values: bigint[]) => bigint;
 
-export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, shuffle, withTimeout };
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout };

package/base.d.ts

@@ -43,6 +43,11 @@ declare const pageFromUri: (pathname: string, fallback: string) => string;
  * @summary Removes the commas from a string.
  */
 declare const rmCommas: (val: string) => string;
+/**
+ * @name rmDecimals
+ * @summary Removes the decimal point and decimals from a string.
+ */
+declare const rmDecimals: (str: any) => any;
 /**
  * @name shuffle
  * @summary Shuffle a set of objects.
@@ -101,4 +106,4 @@ declare const maxBigInt: (...values: bigint[]) => bigint;
  */
 declare const minBigInt: (...values: bigint[]) => bigint;
 
-export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, shuffle, withTimeout };
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout };

package/base.js

@@ -73,6 +73,7 @@ var pageFromUri = (pathname, fallback) => {
   return page.trim();
 };
 var rmCommas = (val) => val.replace(/,/g, "");
+var rmDecimals = (str) => str.split(".")[0];
 var shuffle = (array) => {
   let currentIndex = array.length;
   let randomIndex;
@@ -133,6 +134,7 @@ export {
   pageFromUri,
   removeHexPrefix,
   rmCommas,
+  rmDecimals,
   shuffle,
   withTimeout
 };

package/index.cjs

@@ -25,7 +25,6 @@ __export(src_exports, {
   applyWidthAsPadding: () => applyWidthAsPadding,
   camelize: () => camelize,
   capitalizeFirstLetter: () => capitalizeFirstLetter,
-  determinePoolDisplay: () => determinePoolDisplay,
   ellipsisFn: () => ellipsisFn,
   eqSet: () => eqSet,
   extractUrlValue: () => extractUrlValue,
@@ -48,6 +47,7 @@ __export(src_exports, {
   removeVarFromUrlHash: () => removeVarFromUrlHash,
   removedFrom: () => removedFrom,
   rmCommas: () => rmCommas,
+  rmDecimals: () => rmDecimals,
   setStateWithRef: () => setStateWithRef,
   shuffle: () => shuffle,
   snakeToCamel: () => snakeToCamel,
@@ -136,6 +136,7 @@ var pageFromUri = (pathname, fallback) => {
   return page.trim();
 };
 var rmCommas = (val) => val.replace(/,/g, "");
+var rmDecimals = (str) => str.split(".")[0];
 var shuffle = (array) => {
   let currentIndex = array.length;
   let randomIndex;
@@ -196,13 +197,12 @@ var u8aConcat = (...u8as) => {
 };
 
 // src/unit.ts
-var import_util = require("@polkadot/util");
 var import_substrate_bindings2 = require("@polkadot-api/substrate-bindings");
 var planckToUnit = (val, units) => {
   try {
     units = Math.max(Math.round(units), 0);
     const bigIntVal = typeof val === "bigint" ? val : BigInt(
-      typeof val === "number" ? Math.floor(val).toString() : rmCommas(val)
+      typeof val === "number" ? Math.floor(val).toString() : rmDecimals(rmCommas(val))
     );
     const divisor = units === 0 ? 1n : BigInt(10) ** BigInt(units);
     const integerPart = bigIntVal / divisor;
@@ -262,18 +262,6 @@ var isValidAddress = (address) => {
     return false;
   }
 };
-var determinePoolDisplay = (address, batchItem) => {
-  const defaultDisplay = ellipsisFn(address, 6);
-  let display = batchItem ?? defaultDisplay;
-  const displayAsBytes = (0, import_util.u8aToString)((0, import_util.u8aUnwrapBytes)(display));
-  if (displayAsBytes !== "") {
-    display = displayAsBytes;
-  }
-  if (display === "") {
-    display = defaultDisplay;
-  }
-  return display;
-};
 var extractUrlValue = (key, url) => {
   if (typeof url === "undefined") {
     url = window.location.href;
@@ -414,7 +402,6 @@ var mergeDeep = (target, ...sources) => {
   applyWidthAsPadding,
   camelize,
   capitalizeFirstLetter,
-  determinePoolDisplay,
   ellipsisFn,
   eqSet,
   extractUrlValue,
@@ -437,6 +424,7 @@ var mergeDeep = (target, ...sources) => {
   removeVarFromUrlHash,
   removedFrom,
   rmCommas,
+  rmDecimals,
   setStateWithRef,
   shuffle,
   snakeToCamel,

package/index.d.cts

@@ -1,6 +1,6 @@
-export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, shuffle, withTimeout } from './base.cjs';
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout } from './base.cjs';
 export { u8aConcat } from './convert.cjs';
-export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, determinePoolDisplay, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash } from './unit.cjs';
+export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash } from './unit.cjs';
 import '@w3ux/types';
 import 'react';
 import './types.cjs';

package/index.d.ts

@@ -1,6 +1,6 @@
-export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, shuffle, withTimeout } from './base.js';
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout } from './base.js';
 export { u8aConcat } from './convert.js';
-export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, determinePoolDisplay, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash } from './unit.js';
+export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash } from './unit.js';
 import '@w3ux/types';
 import 'react';
 import './types.js';

package/index.js

@@ -73,6 +73,7 @@ var pageFromUri = (pathname, fallback) => {
   return page.trim();
 };
 var rmCommas = (val) => val.replace(/,/g, "");
+var rmDecimals = (str) => str.split(".")[0];
 var shuffle = (array) => {
   let currentIndex = array.length;
   let randomIndex;
@@ -133,13 +134,12 @@ var u8aConcat = (...u8as) => {
 };
 
 // src/unit.ts
-import { u8aToString, u8aUnwrapBytes } from "@polkadot/util";
 import { AccountId as AccountId2 } from "@polkadot-api/substrate-bindings";
 var planckToUnit = (val, units) => {
   try {
     units = Math.max(Math.round(units), 0);
     const bigIntVal = typeof val === "bigint" ? val : BigInt(
-      typeof val === "number" ? Math.floor(val).toString() : rmCommas(val)
+      typeof val === "number" ? Math.floor(val).toString() : rmDecimals(rmCommas(val))
     );
     const divisor = units === 0 ? 1n : BigInt(10) ** BigInt(units);
     const integerPart = bigIntVal / divisor;
@@ -199,18 +199,6 @@ var isValidAddress = (address) => {
     return false;
   }
 };
-var determinePoolDisplay = (address, batchItem) => {
-  const defaultDisplay = ellipsisFn(address, 6);
-  let display = batchItem ?? defaultDisplay;
-  const displayAsBytes = u8aToString(u8aUnwrapBytes(display));
-  if (displayAsBytes !== "") {
-    display = displayAsBytes;
-  }
-  if (display === "") {
-    display = defaultDisplay;
-  }
-  return display;
-};
 var extractUrlValue = (key, url) => {
   if (typeof url === "undefined") {
     url = window.location.href;
@@ -350,7 +338,6 @@ export {
   applyWidthAsPadding,
   camelize,
   capitalizeFirstLetter,
-  determinePoolDisplay,
   ellipsisFn,
   eqSet,
   extractUrlValue,
@@ -373,6 +360,7 @@ export {
   removeVarFromUrlHash,
   removedFrom,
   rmCommas,
+  rmDecimals,
   setStateWithRef,
   shuffle,
   snakeToCamel,

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "@w3ux/utils",
-  "version": "1.1.1-beta.8",
+  "version": "1.2.0",
   "license": "GPL-3.0-only",
   "dependencies": {
-    "@polkadot-api/substrate-bindings": "^0.9.3",
-    "@polkadot/util": "^13.2.2"
+    "@polkadot-api/substrate-bindings": "^0.9.3"
   },
   "main": "index.cjs",
   "module": "index.js",

package/unit.cjs

@@ -22,7 +22,6 @@ __export(unit_exports, {
   addedTo: () => addedTo,
   applyWidthAsPadding: () => applyWidthAsPadding,
   capitalizeFirstLetter: () => capitalizeFirstLetter,
-  determinePoolDisplay: () => determinePoolDisplay,
   extractUrlValue: () => extractUrlValue,
   inChrome: () => inChrome,
   isValidAddress: () => isValidAddress,
@@ -44,37 +43,11 @@ __export(unit_exports, {
   varToUrlHash: () => varToUrlHash
 });
 module.exports = __toCommonJS(unit_exports);
-var import_util = require("@polkadot/util");
 
 // src/base.ts
 var import_substrate_bindings = require("@polkadot-api/substrate-bindings");
-var ellipsisFn = (str, amount = 6, position = "center") => {
-  const half = str.length / 2;
-  if (amount <= 4) {
-    if (position === "center") {
-      return str.slice(0, 4) + "..." + str.slice(-4);
-    }
-    if (position === "end") {
-      return str.slice(0, 4) + "...";
-    }
-    return "..." + str.slice(-4);
-  }
-  if (position === "center") {
-    return amount >= (str.length - 2) / 2 ? str.slice(0, half - 3) + "..." + str.slice(-(half - 3)) : str.slice(0, amount) + "..." + str.slice(-amount);
-  }
-  if (amount >= str.length) {
-    if (position === "end") {
-      return str.slice(0, str.length - 3) + "...";
-    }
-    return "..." + str.slice(-(str.length - 3));
-  } else {
-    if (position === "end") {
-      return str.slice(0, amount) + "...";
-    }
-    return "..." + str.slice(amount);
-  }
-};
 var rmCommas = (val) => val.replace(/,/g, "");
+var rmDecimals = (str) => str.split(".")[0];
 
 // src/unit.ts
 var import_substrate_bindings2 = require("@polkadot-api/substrate-bindings");
@@ -82,7 +55,7 @@ var planckToUnit = (val, units) => {
   try {
     units = Math.max(Math.round(units), 0);
     const bigIntVal = typeof val === "bigint" ? val : BigInt(
-      typeof val === "number" ? Math.floor(val).toString() : rmCommas(val)
+      typeof val === "number" ? Math.floor(val).toString() : rmDecimals(rmCommas(val))
     );
     const divisor = units === 0 ? 1n : BigInt(10) ** BigInt(units);
     const integerPart = bigIntVal / divisor;
@@ -142,18 +115,6 @@ var isValidAddress = (address) => {
     return false;
   }
 };
-var determinePoolDisplay = (address, batchItem) => {
-  const defaultDisplay = ellipsisFn(address, 6);
-  let display = batchItem ?? defaultDisplay;
-  const displayAsBytes = (0, import_util.u8aToString)((0, import_util.u8aUnwrapBytes)(display));
-  if (displayAsBytes !== "") {
-    display = displayAsBytes;
-  }
-  if (display === "") {
-    display = defaultDisplay;
-  }
-  return display;
-};
 var extractUrlValue = (key, url) => {
   if (typeof url === "undefined") {
     url = window.location.href;
@@ -291,7 +252,6 @@ var mergeDeep = (target, ...sources) => {
   addedTo,
   applyWidthAsPadding,
   capitalizeFirstLetter,
-  determinePoolDisplay,
   extractUrlValue,
   inChrome,
   isValidAddress,

package/unit.d.cts

@@ -57,11 +57,6 @@ declare const localStorageOrDefault: <T>(key: string, _default: T, parse?: boole
  * @summary Return whether an address is valid Substrate address.
  */
 declare const isValidAddress: (address: string) => boolean;
-/**
- * @name determinePoolDisplay
- * @summary A pool will be displayed with either its set metadata or its address.
- */
-declare const determinePoolDisplay: (address: string, batchItem: AnyJson) => any;
 /**
  * @name extractUrlValue
  * @summary Extracts a URL value from a URL string.
@@ -150,4 +145,4 @@ declare const unimplemented: ({ ...props }: {
  */
 declare const mergeDeep: (target: AnyObject, ...sources: AnyObject[]) => AnyObject;
 
-export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, determinePoolDisplay, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash };
+export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash };

package/unit.d.ts

@@ -57,11 +57,6 @@ declare const localStorageOrDefault: <T>(key: string, _default: T, parse?: boole
  * @summary Return whether an address is valid Substrate address.
  */
 declare const isValidAddress: (address: string) => boolean;
-/**
- * @name determinePoolDisplay
- * @summary A pool will be displayed with either its set metadata or its address.
- */
-declare const determinePoolDisplay: (address: string, batchItem: AnyJson) => any;
 /**
  * @name extractUrlValue
  * @summary Extracts a URL value from a URL string.
@@ -150,4 +145,4 @@ declare const unimplemented: ({ ...props }: {
  */
 declare const mergeDeep: (target: AnyObject, ...sources: AnyObject[]) => AnyObject;
 
-export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, determinePoolDisplay, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash };
+export { addedTo, applyWidthAsPadding, capitalizeFirstLetter, extractUrlValue, inChrome, isValidAddress, isValidHttpUrl, localStorageOrDefault, makeCancelable, matchedProperties, mergeDeep, planckToUnit, remToUnit, removeVarFromUrlHash, removedFrom, setStateWithRef, snakeToCamel, sortWithNull, unescape, unimplemented, unitToPlanck, varToUrlHash };

package/unit.js

@@ -1,35 +1,7 @@
-// src/unit.ts
-import { u8aToString, u8aUnwrapBytes } from "@polkadot/util";
-
 // src/base.ts
 import { AccountId } from "@polkadot-api/substrate-bindings";
-var ellipsisFn = (str, amount = 6, position = "center") => {
-  const half = str.length / 2;
-  if (amount <= 4) {
-    if (position === "center") {
-      return str.slice(0, 4) + "..." + str.slice(-4);
-    }
-    if (position === "end") {
-      return str.slice(0, 4) + "...";
-    }
-    return "..." + str.slice(-4);
-  }
-  if (position === "center") {
-    return amount >= (str.length - 2) / 2 ? str.slice(0, half - 3) + "..." + str.slice(-(half - 3)) : str.slice(0, amount) + "..." + str.slice(-amount);
-  }
-  if (amount >= str.length) {
-    if (position === "end") {
-      return str.slice(0, str.length - 3) + "...";
-    }
-    return "..." + str.slice(-(str.length - 3));
-  } else {
-    if (position === "end") {
-      return str.slice(0, amount) + "...";
-    }
-    return "..." + str.slice(amount);
-  }
-};
 var rmCommas = (val) => val.replace(/,/g, "");
+var rmDecimals = (str) => str.split(".")[0];
 
 // src/unit.ts
 import { AccountId as AccountId2 } from "@polkadot-api/substrate-bindings";
@@ -37,7 +9,7 @@ var planckToUnit = (val, units) => {
   try {
     units = Math.max(Math.round(units), 0);
     const bigIntVal = typeof val === "bigint" ? val : BigInt(
-      typeof val === "number" ? Math.floor(val).toString() : rmCommas(val)
+      typeof val === "number" ? Math.floor(val).toString() : rmDecimals(rmCommas(val))
     );
     const divisor = units === 0 ? 1n : BigInt(10) ** BigInt(units);
     const integerPart = bigIntVal / divisor;
@@ -97,18 +69,6 @@ var isValidAddress = (address) => {
     return false;
   }
 };
-var determinePoolDisplay = (address, batchItem) => {
-  const defaultDisplay = ellipsisFn(address, 6);
-  let display = batchItem ?? defaultDisplay;
-  const displayAsBytes = u8aToString(u8aUnwrapBytes(display));
-  if (displayAsBytes !== "") {
-    display = displayAsBytes;
-  }
-  if (display === "") {
-    display = defaultDisplay;
-  }
-  return display;
-};
 var extractUrlValue = (key, url) => {
   if (typeof url === "undefined") {
     url = window.location.href;
@@ -245,7 +205,6 @@ export {
   addedTo,
   applyWidthAsPadding,
   capitalizeFirstLetter,
-  determinePoolDisplay,
   extractUrlValue,
   inChrome,
   isValidAddress,