@w3ux/utils 2.0.7-alpha.2 → 2.0.9

package/base.cjs

@@ -34,10 +34,11 @@ __export(base_exports, {
   rmCommas: () => rmCommas,
   rmDecimals: () => rmDecimals,
   shuffle: () => shuffle,
-  withTimeout: () => withTimeout
+  withTimeout: () => withTimeout,
+  withTimeoutThrow: () => withTimeoutThrow
 });
 module.exports = __toCommonJS(base_exports);
-var import_substrate_bindings = require("@polkadot-api/substrate-bindings");
+var import_utils = require("dedot/utils");
 var minDecimalPlaces = (val, minDecimals) => {
   try {
     const retainCommas = typeof val === "string" && val.includes(",");
@@ -136,12 +137,22 @@ var withTimeout = (ms, promise, options) => {
   );
   return Promise.race([promise, timeout]);
 };
+var withTimeoutThrow = (ms, promise, options) => {
+  const timeout = new Promise(
+    (reject) => setTimeout(async () => {
+      if (typeof options?.onTimeout === "function") {
+        options.onTimeout();
+      }
+      reject("Function timeout");
+    }, ms)
+  );
+  return Promise.race([promise, timeout]);
+};
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
 var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const codec = (0, import_substrate_bindings.AccountId)(ss58Prefix);
-    return codec.dec(codec.enc(address));
+    return (0, import_utils.encodeAddress)(address, ss58Prefix);
   } catch (e) {
     return null;
   }
@@ -175,7 +186,8 @@ var minBigInt = (...values) => values.reduce((min, current) => current < min ? c
   rmCommas,
   rmDecimals,
   shuffle,
-  withTimeout
+  withTimeout,
+  withTimeoutThrow
 });
 /* @license Copyright 2024 w3ux authors & contributors
 SPDX-License-Identifier: GPL-3.0-only */

package/base.d.cts

@@ -58,6 +58,13 @@ declare const shuffle: <T>(array: T[]) => T[];
 declare const withTimeout: (ms: number, promise: Promise<unknown>, options?: {
     onTimeout?: () => void;
 }) => Promise<unknown>;
+/**
+ * @name withTimeoutThrow
+ * @summary Timeout a promise after a specified number of milliseconds by throwing an error
+ */
+declare const withTimeoutThrow: <T>(ms: number, promise: Promise<T>, options?: {
+    onTimeout?: () => void;
+}) => Promise<unknown>;
 /**
  * @name appendOrEmpty
  * @summary Returns ` value` if a condition is truthy, or an empty string otherwise.
@@ -104,4 +111,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, rmDecimals, shuffle, withTimeout };
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout, withTimeoutThrow };

package/base.d.ts

@@ -58,6 +58,13 @@ declare const shuffle: <T>(array: T[]) => T[];
 declare const withTimeout: (ms: number, promise: Promise<unknown>, options?: {
     onTimeout?: () => void;
 }) => Promise<unknown>;
+/**
+ * @name withTimeoutThrow
+ * @summary Timeout a promise after a specified number of milliseconds by throwing an error
+ */
+declare const withTimeoutThrow: <T>(ms: number, promise: Promise<T>, options?: {
+    onTimeout?: () => void;
+}) => Promise<unknown>;
 /**
  * @name appendOrEmpty
  * @summary Returns ` value` if a condition is truthy, or an empty string otherwise.
@@ -104,4 +111,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, rmDecimals, shuffle, withTimeout };
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout, withTimeoutThrow };

package/base.js

@@ -1,5 +1,5 @@
 // src/base.ts
-import { AccountId } from "@polkadot-api/substrate-bindings";
+import { encodeAddress } from "dedot/utils";
 var minDecimalPlaces = (val, minDecimals) => {
   try {
     const retainCommas = typeof val === "string" && val.includes(",");
@@ -98,12 +98,22 @@ var withTimeout = (ms, promise, options) => {
   );
   return Promise.race([promise, timeout]);
 };
+var withTimeoutThrow = (ms, promise, options) => {
+  const timeout = new Promise(
+    (reject) => setTimeout(async () => {
+      if (typeof options?.onTimeout === "function") {
+        options.onTimeout();
+      }
+      reject("Function timeout");
+    }, ms)
+  );
+  return Promise.race([promise, timeout]);
+};
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
 var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const codec = AccountId(ss58Prefix);
-    return codec.dec(codec.enc(address));
+    return encodeAddress(address, ss58Prefix);
   } catch (e) {
     return null;
   }
@@ -136,7 +146,8 @@ export {
   rmCommas,
   rmDecimals,
   shuffle,
-  withTimeout
+  withTimeout,
+  withTimeoutThrow
 };
 /* @license Copyright 2024 w3ux authors & contributors
 SPDX-License-Identifier: GPL-3.0-only */

package/index.cjs

@@ -57,12 +57,13 @@ __export(index_exports, {
   unimplemented: () => unimplemented,
   unitToPlanck: () => unitToPlanck,
   varToUrlHash: () => varToUrlHash,
-  withTimeout: () => withTimeout
+  withTimeout: () => withTimeout,
+  withTimeoutThrow: () => withTimeoutThrow
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/base.ts
-var import_substrate_bindings = require("@polkadot-api/substrate-bindings");
+var import_utils = require("dedot/utils");
 var minDecimalPlaces = (val, minDecimals) => {
   try {
     const retainCommas = typeof val === "string" && val.includes(",");
@@ -161,12 +162,22 @@ var withTimeout = (ms, promise, options) => {
   );
   return Promise.race([promise, timeout]);
 };
+var withTimeoutThrow = (ms, promise, options) => {
+  const timeout = new Promise(
+    (reject) => setTimeout(async () => {
+      if (typeof options?.onTimeout === "function") {
+        options.onTimeout();
+      }
+      reject("Function timeout");
+    }, ms)
+  );
+  return Promise.race([promise, timeout]);
+};
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
 var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const codec = (0, import_substrate_bindings.AccountId)(ss58Prefix);
-    return codec.dec(codec.enc(address));
+    return (0, import_utils.encodeAddress)(address, ss58Prefix);
   } catch (e) {
     return null;
   }
@@ -197,7 +208,7 @@ var u8aConcat = (...u8as) => {
 };
 
 // src/unit.ts
-var import_substrate_bindings2 = require("@polkadot-api/substrate-bindings");
+var import_utils2 = require("dedot/utils");
 var planckToUnit = (val, units) => {
   try {
     units = Math.max(Math.round(units), 0);
@@ -255,8 +266,7 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    const codec = (0, import_substrate_bindings2.AccountId)();
-    codec.dec(codec.enc(address));
+    (0, import_utils2.decodeAddress)(address);
     return true;
   } catch (e) {
     return false;
@@ -434,7 +444,8 @@ var mergeDeep = (target, ...sources) => {
   unimplemented,
   unitToPlanck,
   varToUrlHash,
-  withTimeout
+  withTimeout,
+  withTimeoutThrow
 });
 /* @license Copyright 2024 w3ux authors & contributors
 SPDX-License-Identifier: GPL-3.0-only */

package/index.d.cts

@@ -1,4 +1,4 @@
-export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout } from './base.cjs';
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout, withTimeoutThrow } from './base.cjs';
 export { u8aConcat } from './convert.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 'react';

package/index.d.ts

@@ -1,4 +1,4 @@
-export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout } from './base.js';
+export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58, isSuperset, maxBigInt, minBigInt, minDecimalPlaces, pageFromUri, removeHexPrefix, rmCommas, rmDecimals, shuffle, withTimeout, withTimeoutThrow } from './base.js';
 export { u8aConcat } from './convert.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 'react';

package/index.js

@@ -1,5 +1,5 @@
 // src/base.ts
-import { AccountId } from "@polkadot-api/substrate-bindings";
+import { encodeAddress } from "dedot/utils";
 var minDecimalPlaces = (val, minDecimals) => {
   try {
     const retainCommas = typeof val === "string" && val.includes(",");
@@ -98,12 +98,22 @@ var withTimeout = (ms, promise, options) => {
   );
   return Promise.race([promise, timeout]);
 };
+var withTimeoutThrow = (ms, promise, options) => {
+  const timeout = new Promise(
+    (reject) => setTimeout(async () => {
+      if (typeof options?.onTimeout === "function") {
+        options.onTimeout();
+      }
+      reject("Function timeout");
+    }, ms)
+  );
+  return Promise.race([promise, timeout]);
+};
 var appendOrEmpty = (condition, value) => condition ? ` ${value}` : "";
 var appendOr = (condition, value, fallback) => condition ? ` ${value}` : ` ${fallback}`;
 var formatAccountSs58 = (address, ss58Prefix) => {
   try {
-    const codec = AccountId(ss58Prefix);
-    return codec.dec(codec.enc(address));
+    return encodeAddress(address, ss58Prefix);
   } catch (e) {
     return null;
   }
@@ -134,7 +144,7 @@ var u8aConcat = (...u8as) => {
 };
 
 // src/unit.ts
-import { AccountId as AccountId2 } from "@polkadot-api/substrate-bindings";
+import { decodeAddress } from "dedot/utils";
 var planckToUnit = (val, units) => {
   try {
     units = Math.max(Math.round(units), 0);
@@ -192,8 +202,7 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    const codec = AccountId2();
-    codec.dec(codec.enc(address));
+    decodeAddress(address);
     return true;
   } catch (e) {
     return false;
@@ -370,7 +379,8 @@ export {
   unimplemented,
   unitToPlanck,
   varToUrlHash,
-  withTimeout
+  withTimeout,
+  withTimeoutThrow
 };
 /* @license Copyright 2024 w3ux authors & contributors
 SPDX-License-Identifier: GPL-3.0-only */

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@w3ux/utils",
-  "version": "2.0.7-alpha.2",
+  "version": "2.0.9",
   "license": "GPL-3.0-only",
   "dependencies": {
-    "@polkadot-api/substrate-bindings": "^0.11.1"
+    "dedot": "^0.8.1"
   },
   "main": "index.cjs",
   "module": "index.js",

package/unit.cjs

@@ -43,10 +43,10 @@ __export(unit_exports, {
   varToUrlHash: () => varToUrlHash
 });
 module.exports = __toCommonJS(unit_exports);
-var import_substrate_bindings2 = require("@polkadot-api/substrate-bindings");
+var import_utils2 = require("dedot/utils");
 
 // src/base.ts
-var import_substrate_bindings = require("@polkadot-api/substrate-bindings");
+var import_utils = require("dedot/utils");
 var rmCommas = (val) => val.replace(/,/g, "");
 var rmDecimals = (str) => str.split(".")[0];
 
@@ -108,8 +108,7 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    const codec = (0, import_substrate_bindings2.AccountId)();
-    codec.dec(codec.enc(address));
+    (0, import_utils2.decodeAddress)(address);
     return true;
   } catch (e) {
     return false;

package/unit.js

@@ -1,8 +1,8 @@
 // src/unit.ts
-import { AccountId as AccountId2 } from "@polkadot-api/substrate-bindings";
+import { decodeAddress } from "dedot/utils";
 
 // src/base.ts
-import { AccountId } from "@polkadot-api/substrate-bindings";
+import { encodeAddress } from "dedot/utils";
 var rmCommas = (val) => val.replace(/,/g, "");
 var rmDecimals = (str) => str.split(".")[0];
 
@@ -64,8 +64,7 @@ var localStorageOrDefault = (key, _default, parse = false) => {
 };
 var isValidAddress = (address) => {
   try {
-    const codec = AccountId2();
-    codec.dec(codec.enc(address));
+    decodeAddress(address);
     return true;
   } catch (e) {
     return false;