@w3ux/utils 2.0.7-alpha.1 → 2.0.8

package/base.cjs

@@ -37,7 +37,7 @@ __export(base_exports, {
   withTimeout: () => withTimeout
 });
 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(",");
@@ -140,8 +140,7 @@ 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;
   }

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(",");
@@ -102,8 +102,7 @@ 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;
   }

package/index.cjs

@@ -62,7 +62,7 @@ __export(index_exports, {
 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(",");
@@ -165,8 +165,7 @@ 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 +196,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 +254,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/index.d.cts

@@ -2,3 +2,4 @@ export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58
 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';
+import './types.cjs';

package/index.d.ts

@@ -2,3 +2,4 @@ export { appendOr, appendOrEmpty, camelize, ellipsisFn, eqSet, formatAccountSs58
 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';
+import './types.js';

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(",");
@@ -102,8 +102,7 @@ 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 +133,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 +191,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;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@w3ux/utils",
-  "version": "2.0.7-alpha.1",
+  "version": "2.0.8",
   "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.d.cts

@@ -1,4 +1,5 @@
-import { RefObject } from 'react';
+import { MutableRefObject, RefObject } from 'react';
+import { AnyObject } from './types.cjs';
 
 /**
  * Converts an on-chain balance value from planck to a decimal value in token units.
@@ -43,7 +44,7 @@ declare const snakeToCamel: (str: string) => string;
  * @name setStateWithRef
  * @summary Synchronize React state and its reference with the provided value.
  */
-declare const setStateWithRef: <T>(value: T, setState: (_state: T) => void, ref: RefObject<T>) => void;
+declare const setStateWithRef: <T>(value: T, setState: (_state: T) => void, ref: MutableRefObject<T>) => void;
 /**
  * @name localStorageOrDefault
  * @summary Retrieve the local stroage value with the key, return defult value if it is not
@@ -100,19 +101,19 @@ declare const inChrome: () => boolean;
  * @summary Given 2 objects and some keys, return items in the fresh object that do not exist in the
  * stale object by matching the given common key values of both objects.
  */
-declare const addedTo: (fresh: object[], stale: object[], keys: string[]) => object[];
+declare const addedTo: (fresh: AnyObject[], stale: AnyObject[], keys: string[]) => AnyObject[];
 /**
  * @name removedFrom
  * @summary Given 2 objects and some keys, return items in the stale object that do not exist in the
  * fresh object by matching the given common key values of both objects.
  */
-declare const removedFrom: (fresh: object[], stale: object[], keys: string[]) => object[];
+declare const removedFrom: (fresh: AnyObject[], stale: AnyObject[], keys: string[]) => AnyObject[];
 /**
  * @name matchedProperties
  * @summary Given 2 objects and some keys, return items in object 1 that also exist in object 2 by
  * matching the given common key values of both objects.
  */
-declare const matchedProperties: (objX: object[], objY: object[], keys: string[]) => object[];
+declare const matchedProperties: (objX: AnyObject[], objY: AnyObject[], keys: string[]) => AnyObject[];
 /**
  * @name isValidHttpUrl
  * @summary Give a string, return whether it is a valid http URL.
@@ -124,7 +125,7 @@ declare const isValidHttpUrl: (string: string) => boolean;
  * @summary Makes a promise cancellable.
  * @param promise  - The promise to make cancellable.
  */
-declare const makeCancelable: <T>(promise: Promise<T>) => {
+declare const makeCancelable: (promise: Promise<AnyObject>) => {
     promise: Promise<unknown>;
     cancel: () => void;
 };
@@ -141,6 +142,6 @@ declare const unimplemented: ({ ...props }: {
  * @param target
  * @param ...sources
  */
-declare const mergeDeep: (target: object, ...sources: object[]) => any;
+declare const mergeDeep: (target: AnyObject, ...sources: AnyObject[]) => AnyObject;
 
 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

@@ -1,4 +1,5 @@
-import { RefObject } from 'react';
+import { MutableRefObject, RefObject } from 'react';
+import { AnyObject } from './types.js';
 
 /**
  * Converts an on-chain balance value from planck to a decimal value in token units.
@@ -43,7 +44,7 @@ declare const snakeToCamel: (str: string) => string;
  * @name setStateWithRef
  * @summary Synchronize React state and its reference with the provided value.
  */
-declare const setStateWithRef: <T>(value: T, setState: (_state: T) => void, ref: RefObject<T>) => void;
+declare const setStateWithRef: <T>(value: T, setState: (_state: T) => void, ref: MutableRefObject<T>) => void;
 /**
  * @name localStorageOrDefault
  * @summary Retrieve the local stroage value with the key, return defult value if it is not
@@ -100,19 +101,19 @@ declare const inChrome: () => boolean;
  * @summary Given 2 objects and some keys, return items in the fresh object that do not exist in the
  * stale object by matching the given common key values of both objects.
  */
-declare const addedTo: (fresh: object[], stale: object[], keys: string[]) => object[];
+declare const addedTo: (fresh: AnyObject[], stale: AnyObject[], keys: string[]) => AnyObject[];
 /**
  * @name removedFrom
  * @summary Given 2 objects and some keys, return items in the stale object that do not exist in the
  * fresh object by matching the given common key values of both objects.
  */
-declare const removedFrom: (fresh: object[], stale: object[], keys: string[]) => object[];
+declare const removedFrom: (fresh: AnyObject[], stale: AnyObject[], keys: string[]) => AnyObject[];
 /**
  * @name matchedProperties
  * @summary Given 2 objects and some keys, return items in object 1 that also exist in object 2 by
  * matching the given common key values of both objects.
  */
-declare const matchedProperties: (objX: object[], objY: object[], keys: string[]) => object[];
+declare const matchedProperties: (objX: AnyObject[], objY: AnyObject[], keys: string[]) => AnyObject[];
 /**
  * @name isValidHttpUrl
  * @summary Give a string, return whether it is a valid http URL.
@@ -124,7 +125,7 @@ declare const isValidHttpUrl: (string: string) => boolean;
  * @summary Makes a promise cancellable.
  * @param promise  - The promise to make cancellable.
  */
-declare const makeCancelable: <T>(promise: Promise<T>) => {
+declare const makeCancelable: (promise: Promise<AnyObject>) => {
     promise: Promise<unknown>;
     cancel: () => void;
 };
@@ -141,6 +142,6 @@ declare const unimplemented: ({ ...props }: {
  * @param target
  * @param ...sources
  */
-declare const mergeDeep: (target: object, ...sources: object[]) => any;
+declare const mergeDeep: (target: AnyObject, ...sources: AnyObject[]) => AnyObject;
 
 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,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;