Compare commits

..
22 Commits
Author SHA1 Message Date
Github Actions 3351fb1cba [CI Skip] 2.11.1
skip-checks: true
2020-05-26 07:00:59 +00:00
Jaco Greeff 32d176e424 2.11 (#604) 2020-05-26 08:57:31 +02:00
Github Actions aec1e26cb9 [CI Skip] 2.11.0-beta.2
skip-checks: true
2020-05-24 17:08:04 +00:00
Jaco Greeff 7d529b6c93 Type adjustments for meta 2020-05-24 19:04:15 +02:00
Github Actions e22b39ae01 [CI Skip] 2.11.0-beta.1
skip-checks: true
2020-05-23 12:26:33 +00:00
Jaco Greeff 18a202c460 Bump dev w/ eslint (#603)
* Bump dev w/ eslint

* Mop-up remaining lint issues

* Update stringShorten expectation
2020-05-23 14:23:13 +02:00
Github Actions fd9ce319a5 [CI Skip] 2.11.0-beta.0
skip-checks: true
2020-05-15 10:37:46 +00:00
Jaco Greeff a04c0a5e82 Bump deps (#601) 2020-05-15 12:34:22 +02:00
Github Actions 06cb5e57a0 [CI Skip] 2.10.1
skip-checks: true
2020-05-14 05:42:04 +00:00
Jaco Greeff 103ea045bf 2.10 (#599) 2020-05-14 07:38:43 +02:00
Github Actions 4315c76814 [CI Skip] 2.10.0-beta.5
skip-checks: true
2020-05-11 12:01:35 +00:00
Jaco Greeff 6de6b871cd Adjust DeriveJunction (types & BigInt) (#598) 2020-05-11 13:57:59 +02:00
Github Actions 82e5d76821 [CI Skip] 2.10.0-beta.4
skip-checks: true
2020-05-11 09:58:13 +00:00
Jaco Greeff d9a18a4acf Bump berry (#597) 2020-05-11 11:54:45 +02:00
Github Actions 2d1d4f808e [CI Skip] 2.10.0-beta.3
skip-checks: true
2020-05-11 08:00:19 +00:00
Jaco Greeff d1de30907f TextEncoder allows non-Uint8Array Buffers (#596)
* TextEncoder allows non-Uint8Array Buffers

* Add eslintrc to eslintignore
2020-05-11 09:57:00 +02:00
Github Actions d3583dc432 [CI Skip] 2.10.0-beta.2
skip-checks: true
2020-05-08 18:15:33 +00:00
Wei Tang bb04fa28f7 ss58: add Kulupu prefix to the list (#595) 2020-05-08 20:12:17 +02:00
Github Actions bd8e862b62 [CI Skip] 2.10.0-beta.1
skip-checks: true
2020-04-30 06:06:24 +00:00
Jaco Greeff 0f45b7fbf3 Bump deps (#594) 2020-04-30 08:03:20 +02:00
Github Actions 03eb72f128 [CI Skip] 2.10.0-beta.0
skip-checks: true
2020-04-30 05:31:32 +00:00
Jaco Greeff f76a4a98be beta bump (#593) 2020-04-30 07:28:35 +02:00
72 changed files with 3541 additions and 3205 deletions
+1
View File
@@ -1,3 +1,4 @@
.eslintrc.js
**/build/*
**/coverage/*
**/node_modules/*
+14 -8
View File
File diff suppressed because one or more lines are too long
+13 -1
View File
@@ -1,4 +1,16 @@
# 2.9.1 Apr 23, 2020
# 2.11.1 May 26, 2020
- Internal cleanups on typings
- Support for latest TypeScript, eslint & typescript-eslint
# 2.10.1 May 14, 2020
- Add Kulupu ss58 prefix as an allowed value (Thanks to https://github.com/sorpaas)
- Make the `TextEncoder` polyfill handle non-compliant Buffer implementations (newer versions of Jest)
- `DeriveJunction` now also allows for BigInt values (aligning with number types elsewhere)
- Small code-flow optimizations
# 2.9.1 Apr 30, 2020
- Add support for ECDSA keypairs (Thanks to https://github.com/akru)
- Added `createKeyMulti` & `createKeySub` to create utility sub & multi keys
+1 -1
View File
@@ -9,5 +9,5 @@
"packages": [
"packages/*"
],
"version": "2.9.1"
"version": "2.11.1"
}
+5 -5
View File
@@ -7,7 +7,7 @@
"packages/*"
],
"resolutions": {
"typescript": "^3.8.3"
"babel-core": "^7.0.0-bridge.0"
},
"scripts": {
"build": "polkadot-dev-build-ts",
@@ -21,9 +21,9 @@
"test:one": "polkadot-dev-run-test"
},
"devDependencies": {
"@babel/core": "^7.9.0",
"@polkadot/dev": "^0.52.11",
"@polkadot/ts": "^0.3.18",
"@types/jest": "^25.2.1"
"@babel/core": "^7.9.6",
"@polkadot/dev": "^0.54.1",
"@polkadot/ts": "^0.3.23",
"@types/jest": "^25.2.3"
}
}
+4 -4
View File
@@ -1,6 +1,6 @@
{
"name": "@polkadot/keyring",
"version": "2.9.1",
"version": "2.11.1",
"description": "Keyring management",
"main": "index.js",
"publishConfig": {
@@ -27,8 +27,8 @@
},
"homepage": "https://github.com/polkadot-js/common/tree/master/packages/keyring#readme",
"dependencies": {
"@babel/runtime": "^7.9.2",
"@polkadot/util": "2.9.1",
"@polkadot/util-crypto": "2.9.1"
"@babel/runtime": "^7.9.6",
"@polkadot/util": "2.11.1",
"@polkadot/util-crypto": "2.11.1"
}
}
+3 -2
View File
@@ -7,9 +7,10 @@ import { KeyringPair$Json, KeyringPair$Meta } from '../types';
import { u8aToHex } from '@polkadot/util';
type PairStateJson = KeyringPair$Meta & {
interface PairStateJson {
address: string;
};
meta: KeyringPair$Meta;
}
export default function toJson (type: KeypairType, { address, meta }: PairStateJson, encoded: Uint8Array, isEncrypted: boolean): KeyringPair$Json {
return {
+1 -4
View File
@@ -10,10 +10,7 @@ export interface KeyringOptions {
type?: KeypairType;
}
export interface KeyringPair$Meta {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[index: string]: any;
}
export type KeyringPair$Meta = Record<string, unknown>;
export type KeyringPair$JsonVersion = '0' | '1' | '2';
+5 -5
View File
@@ -1,6 +1,6 @@
{
"name": "@polkadot/util-crypto",
"version": "2.9.1",
"version": "2.11.1",
"description": "A collection of useful crypto utilities for @polkadot",
"main": "index.js",
"keywords": [
@@ -25,13 +25,13 @@
},
"homepage": "https://github.com/polkadot-js/common/tree/master/packages/util-crypto#readme",
"dependencies": {
"@babel/runtime": "^7.9.2",
"@polkadot/util": "2.9.1",
"@babel/runtime": "^7.9.6",
"@polkadot/util": "2.11.1",
"@polkadot/wasm-crypto": "^1.2.1",
"base-x": "^3.0.8",
"bip39": "^3.0.2",
"blakejs": "^1.1.0",
"bn.js": "^5.1.1",
"bn.js": "^5.1.2",
"bs58": "^4.0.1",
"elliptic": "^6.5.2",
"js-sha3": "^0.8.0",
@@ -44,6 +44,6 @@
"@types/bs58": "^4.0.1",
"@types/elliptic": "^6.4.12",
"@types/pbkdf2": "^3.0.0",
"@types/xxhashjs": "^0.2.1"
"@types/xxhashjs": "^0.2.2"
}
}
+1 -1
View File
@@ -20,7 +20,7 @@ export default function decode (encoded: string | Uint8Array, ignoreChecksum?: b
const decoded = bufferToU8a(bs58.decode(encoded));
const error = (message: string): string =>
`Decoding ${encoded}: ${message}`;
`Decoding ${encoded as string}: ${message}`;
// assert(defaults.allowedPrefix.includes(decoded[0] as Prefix), error('Invalid decoded address prefix'));
assert(defaults.allowedEncodedLengths.includes(decoded.length), error('Invalid decoded address length'));
+1 -1
View File
@@ -17,7 +17,7 @@ export default function encode (_key: Uint8Array | string, ss58Format: Prefix =
// decode it, this means we can re-encode an address
const key = decode(_key);
assert(defaults.allowedDecodedLengths.includes(key.length), `Expected a valid key to convert, with length ${defaults.allowedDecodedLengths}`);
assert(defaults.allowedDecodedLengths.includes(key.length), `Expected a valid key to convert, with length ${defaults.allowedDecodedLengths.join(', ')}`);
const isPublicKey = key.length === 32;
+2
View File
@@ -7,6 +7,8 @@ export const allowedSS58 = [
0, 1,
// Kusama
2, 3,
// Kulupu
16, 17,
// Dothereum
20,
// Substrate default
@@ -2,8 +2,9 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
import BN from 'bn.js';
import { bnToHex, compactAddLength, hexToU8a, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util';
import type BN from 'bn.js';
import { bnToHex, compactAddLength, hexToU8a, isBigInt, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util';
import blake2AsU8a from '../blake2/asU8a';
@@ -21,10 +22,10 @@ export default class DeriveJunction {
#isHard = false;
public static from (value: string): DeriveJunction {
const result = new DeriveJunction();
const [code, isHard] = value.startsWith('/')
? [value.substr(1), true]
: [value, false];
const result = new DeriveJunction();
result.soft(
RE_NUMBER.test(code)
@@ -49,7 +50,7 @@ export default class DeriveJunction {
return !this.#isHard;
}
public hard (value: number | BN | string | Uint8Array): DeriveJunction {
public hard (value: number | string | BigInt | BN | Uint8Array): DeriveJunction {
return this.soft(value).harden();
}
@@ -59,8 +60,8 @@ export default class DeriveJunction {
return this;
}
public soft (value: number | BN | string | Uint8Array): DeriveJunction {
if (isNumber(value) || isBn(value)) {
public soft (value: number | string | BigInt | BN | Uint8Array): DeriveJunction {
if (isNumber(value) || isBn(value) || isBigInt(value)) {
return this.soft(bnToHex(value, BN_OPTIONS));
} else if (isString(value)) {
return isHex(value)
+9 -9
View File
@@ -33,19 +33,19 @@ describe('naclOpen', (): void => {
// Receiver sends encrypting public key to receive message to decrypt with his private key
const receiverIdBoxKey = naclBoxKeypairFromSecret(receiverIdKey.secretKey);
console.log(`Receiver sends receiver's public key to sender ${receiverIdBoxKey.publicKey}`);
console.log(`Receiver sends receiver's public key to sender ${receiverIdBoxKey.publicKey.toString()}`);
// Sender encrypts message to send with the public key the receiver sent and send it to receiver
const senderIdBoxKey = naclBoxKeypairFromSecret(senderIdKey.secretKey);
const message = new Uint8Array([1, 2, 3, 4, 5, 4, 3, 2, 1]);
const { nonce, sealed } = naclSeal(message, senderIdBoxKey.secretKey, receiverIdBoxKey.publicKey);
console.log(`Sender sends encrypted message to receiver ${sealed}, ${nonce}`);
console.log(`Sender sends encrypted message to receiver ${sealed.toString()}, ${nonce.toString()}`);
// Receiver opens encrypted message from the sender
let opened = naclOpen(sealed, nonce, senderIdBoxKey.publicKey, receiverIdBoxKey.secretKey);
console.log(`The sealed message is ${opened}`);
console.log(`The sealed message is ${opened?.toString() || 'null'}`);
// Oh no the Id key is hacked, derive Id key again from another index
const senderIdKey2 = fromPath(sender, keyExtractPath('//1//1//1//2').path, 'ed25519');
@@ -54,7 +54,7 @@ describe('naclOpen', (): void => {
// Receiver sends encrypting public key to receive message to decrypt with his private key
const receiverIdBoxKey2 = naclBoxKeypairFromSecret(receiverIdKey2.secretKey);
console.log(`Receiver sends receiver's public key to sender ${receiverIdBoxKey2.publicKey}`);
console.log(`Receiver sends receiver's public key to sender ${receiverIdBoxKey2.publicKey.toString()}`);
// Sender encrypts message to send with the public key the receiver sent and send it to receiver
const senderIdBoxKey2 = naclBoxKeypairFromSecret(senderIdKey2.secretKey);
@@ -63,17 +63,17 @@ describe('naclOpen', (): void => {
const sealed2 = ctx.sealed;
const nonce2 = ctx.nonce;
console.log(`Sender sends encrypted message to receiver ${sealed}, ${nonce}`);
console.log(`Sender sends encrypted message to receiver ${sealed.toString()}, ${nonce.toString()}`);
// Receiver opens encrypted message from the sender
opened = naclOpen(sealed2, nonce2, senderIdBoxKey2.publicKey, receiverIdBoxKey2.secretKey);
console.log(`The sealed message is ${opened}`);
console.log(`The sealed message is ${opened?.toString() || 'null'}`);
// This time derive key for each message to send and receive
// Receiver sends encrypting public key to receive message to decrypt with his private key
const receiverIdBoxKey2One = naclBoxKeypairFromSecret(receiverIdBoxKey2.secretKey);
console.log(`Receiver sends receiver's public key to sender ${receiverIdBoxKey2One.publicKey}`);
console.log(`Receiver sends receiver's public key to sender ${receiverIdBoxKey2One.publicKey.toString()}`);
// Sender encrypts message to send with the public key the receiver sent and send it to receiver
const senderIdBoxKey2One = naclBoxKeypairFromSecret(senderIdBoxKey2.secretKey);
@@ -84,11 +84,11 @@ describe('naclOpen', (): void => {
const sealed3 = ctx.sealed;
const nonce3 = ctx.nonce;
console.log(`Sender sends encrypted message to receiver ${sealed3}, ${nonce3}`);
console.log(`Sender sends encrypted message to receiver ${sealed3.toString()}, ${nonce3.toString()}`);
// Receiver opens encrypted message from the sender
opened = naclOpen(sealed2, nonce2, senderIdBoxKey2One.publicKey, receiverIdBoxKey2One.secretKey);
console.log(`The sealed message is ${opened}`);
console.log(`The sealed message is ${opened?.toString() || 'null'}`);
});
it('returns null on invalid', (): void => {
@@ -14,11 +14,12 @@ const ec = new EC('secp256k1');
* @description Returns a object containing a `publicKey` & `secretKey` generated from the supplied seed.
*/
export default function secp256k1KeypairFromSeed (seed: Uint8Array): Keypair {
assert(seed.length === 32, 'Expected valid 32-byte private key as a seed: ' + seed);
assert(seed.length === 32, 'Expected valid 32-byte private key as a seed');
const key = ec.keyFromPrivate(seed);
return {
publicKey: new Uint8Array(key.getPublic().encodeCompressed('array')),
secretKey: hexToU8a('0x' + key.getPrivate('hex'))
secretKey: hexToU8a(`0x${key.getPrivate('hex')}`)
};
}
@@ -13,6 +13,7 @@ const ec = new EC('secp256k1');
*/
export default function secp256k1Recover (message: Uint8Array, signature: Uint8Array, recovery: number): Uint8Array {
return new Uint8Array(
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ec
.recoverPubKey(message, { r: signature.slice(0, 32), s: signature.slice(32, 64) }, recovery)
.encode(null, true)
@@ -21,6 +21,7 @@ export default function secp256k1Verify (message: Uint8Array | string, signature
};
const recovery = signatureU8a[64];
const publicKey = new Uint8Array(
// eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
ec.recoverPubKey(blake2AsU8a(message, 256), sig, recovery)
.encodeCompressed(null)
);
+3 -3
View File
@@ -1,6 +1,6 @@
{
"name": "@polkadot/util",
"version": "2.9.1",
"version": "2.11.1",
"description": "A collection of useful utilities for @polkadot",
"main": "index.js",
"keywords": [
@@ -25,9 +25,9 @@
},
"homepage": "https://github.com/polkadot-js/common/tree/master/packages/util#readme",
"dependencies": {
"@babel/runtime": "^7.9.2",
"@babel/runtime": "^7.9.6",
"@types/bn.js": "^4.11.6",
"bn.js": "^5.1.1",
"bn.js": "^5.1.2",
"camelcase": "^5.3.1",
"chalk": "^4.0.0",
"ip-regex": "^4.1.0"
+4 -4
View File
@@ -21,8 +21,8 @@ import isUndefined from '../is/undefined';
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function arrayFilter (array: any[], allowNulls = true): any[] {
return array.filter((value): boolean => {
return !isUndefined(value) && (allowNulls || !isNull(value));
});
export default function arrayFilter <T = any> (array: T[], allowNulls = true): T[] {
return array.filter((value) =>
!isUndefined(value) && (allowNulls || !isNull(value))
);
}
+1 -1
View File
@@ -22,7 +22,7 @@ type MessageFn = () => string;
* assert(false, () => 'message'); // Error with 'message'
* ```
*/
export default function assert (condition: boolean | object | string | number | undefined | null, message: string | MessageFn): asserts condition {
export default function assert (condition: unknown, message: string | MessageFn): asserts condition {
if (!condition) {
throw new Error(
isFunction(message)
+1 -1
View File
@@ -21,7 +21,7 @@ describe('bnToBn', (): void => {
it('converts BigInt values to BN', (): void => {
expect(
bnToBn(128_821n).toNumber()
bnToBn(128821n).toNumber()
).toEqual(128821);
});
+1 -1
View File
@@ -10,7 +10,7 @@ describe('bnToU8a', (): void => {
it('converts null values to 0x00', (): void => {
expect(
bnToU8a(null, -1, false)
).toEqual(new Uint8Array([]));
).toEqual(new Uint8Array());
});
it('converts null values to 0x00000000 (bitLength)', (): void => {
+1 -1
View File
@@ -43,7 +43,7 @@ function bnToU8a (value: BN | BigInt | number | null, arg1: number | Options = {
if (!value) {
return _options.bitLength === -1
? new Uint8Array([])
? new Uint8Array()
: new Uint8Array(byteLength);
}
+1 -1
View File
@@ -8,7 +8,7 @@ describe('bufferToU8a', (): void => {
it('returns an empty buffer when null provided', (): void => {
expect(
bufferToU8a(null)
).toEqual(new Uint8Array([]));
).toEqual(new Uint8Array());
});
it('returns a Uint8Buffer with the correct values', (): void => {
+1 -5
View File
@@ -17,9 +17,5 @@
* ```
*/
export default function bufferToU8a (buffer?: Buffer | number[] | null): Uint8Array {
if (!buffer) {
return new Uint8Array([]);
}
return new Uint8Array(buffer);
return new Uint8Array(buffer || []);
}
@@ -23,7 +23,7 @@ describe('formatBalance', (): void => {
it('formats BigInt numbers', (): void => {
expect(
formatBalance(123_456_789_000n, { decimals: 15, withSi: true })
formatBalance(123456789000n, { decimals: 15, withSi: true })
).toEqual('123.456µ Unit');
});
@@ -27,7 +27,7 @@ describe('formatNumber', (): void => {
it('formats BigInt numbers', (): void => {
expect(
formatNumber(123_456_789n)
formatNumber(123456789n)
).toEqual('123,456,789');
});
+6
View File
@@ -53,6 +53,12 @@ describe('hexToBn', (): void => {
).toBe(-1234);
});
it('handles negative numbers (LE, 128)', (): void => {
expect(
hexToBn('0x00009c584c491ff2ffffffffffffffff', { isLe: true, isNegative: true }).toString()
).toEqual('-1000000000000000000');
});
it('handles starting zeros correctly (BE)', (): void => {
expect(
hexToBn('0x0000000000000100', { isLe: false }).toNumber()
+1 -1
View File
@@ -23,7 +23,7 @@ import hexStripPrefix from './stripPrefix';
*/
export default function hexToU8a (_value?: string | null, bitLength = -1): Uint8Array {
if (!_value) {
return new Uint8Array([]);
return new Uint8Array();
}
assert(isHex(_value), `Expected hex value to convert, found '${_value}'`);
+2 -2
View File
@@ -7,13 +7,13 @@ import { isBigInt } from '.';
describe('isBigInt', (): void => {
it('returns true when a BigInt value', (): void => {
expect(
isBigInt(123_456n)
isBigInt(123456n)
).toEqual(true);
});
it('returns true when a BigInt value', (): void => {
expect(
isBigInt(BigInt(123_456))
isBigInt(BigInt(123456))
).toEqual(true);
});
+1 -1
View File
@@ -16,6 +16,6 @@
* console.log('isBigInt', isBigInt(123_456n)); // => true
* ```
*/
export default function isBigInt (value: BigInt | object | string | number | undefined | null): value is BigInt {
export default function isBigInt (value: unknown): value is BigInt {
return typeof value === 'bigint';
}
+1 -1
View File
@@ -19,6 +19,6 @@ import BN from 'bn.js';
* console.log('isBn', isBn(new BN(1))); // => true
* ```
*/
export default function isBn (value: object | string | number | undefined | null): value is BN {
export default function isBn (value: unknown): value is BN {
return BN.isBN(value);
}
+1 -2
View File
@@ -16,7 +16,6 @@
* isBoolean(false); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isBoolean (value: any): value is boolean {
export default function isBoolean (value: unknown): value is boolean {
return typeof value === 'boolean';
}
+1 -2
View File
@@ -18,7 +18,6 @@ import isInstanceOf from './instanceOf';
* console.log('isBuffer', isBuffer(Buffer.from([]))); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isBuffer (value: any): value is Buffer {
export default function isBuffer (value: unknown): value is Buffer {
return isInstanceOf(value, Buffer);
}
+1 -2
View File
@@ -18,7 +18,6 @@ import isInstanceOf from './instanceOf';
* console.log('isError', isError(new Error('message'))); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isError (value: any): value is Error {
export default function isError (value: unknown): value is Error {
return isInstanceOf(value, Error);
}
+2 -2
View File
@@ -16,7 +16,7 @@
* isFunction(() => false); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isFunction (value: any): value is Function {
// eslint-disable-next-line @typescript-eslint/ban-types
export default function isFunction (value: unknown): value is Function {
return typeof value === 'function';
}
+4 -4
View File
@@ -21,13 +21,13 @@ const HEX_REGEX = /^0x[a-fA-F0-9]+$/;
* isHex('0x1234', 8); // => false
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/ban-types
export default function isHex (value: any, bitLength = -1, ignoreLength = false): value is string | String {
// eslint-disable-next-line @typescript-eslint/ban-types
export default function isHex (value: unknown, bitLength = -1, ignoreLength = false): value is string | String {
const isValidHex = value === '0x' || (isString(value) && HEX_REGEX.test(value.toString()));
if (isValidHex && bitLength !== -1) {
return value.length === (2 + Math.ceil(bitLength / 4));
return (value as string).length === (2 + Math.ceil(bitLength / 4));
}
return isValidHex && (ignoreLength || (value.length % 2 === 0));
return isValidHex && (ignoreLength || ((value as string).length % 2 === 0));
}
+2 -2
View File
@@ -16,7 +16,7 @@
* console.log('isInstanceOf', isInstanceOf(new Array(0), Array)); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isInstanceOf (value: any, clazz: any): boolean {
// eslint-disable-next-line @typescript-eslint/ban-types
export default function isInstanceOf (value: unknown, clazz: Function): boolean {
return value instanceof clazz;
}
+4 -6
View File
@@ -31,17 +31,15 @@ interface ObjectIndexed {
* isJsonObject('not an object'); // => false
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isJsonObject (value: any): value is ObjectIndexed {
value = typeof value !== 'string'
export default function isJsonObject (value: unknown): value is ObjectIndexed {
const str = typeof value !== 'string'
? JSON.stringify(value)
: value;
try {
value = JSON.parse(value);
const obj = JSON.parse(str) as unknown;
return (typeof value === 'object' && value !== null);
return (typeof obj === 'object' && obj !== null);
} catch (e) {
return false;
}
+1 -2
View File
@@ -16,7 +16,6 @@
* console.log('isNull', isNull(null)); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isNull (value?: any): value is null {
export default function isNull (value?: unknown): value is null {
return value === null;
}
+1 -2
View File
@@ -16,7 +16,6 @@
* console.log('isNumber', isNumber(1234)); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isNumber (value: any): value is number {
export default function isNumber (value: unknown): value is number {
return typeof value === 'number';
}
+1 -2
View File
@@ -22,7 +22,6 @@ interface ObjectIndexed {
* isObject('something'); // => false
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isObject (value: any): value is ObjectIndexed {
export default function isObject (value: unknown): value is ObjectIndexed {
return typeof value === 'object';
}
+1 -2
View File
@@ -24,7 +24,6 @@ interface Observable {
* console.log('isObservable', isObservable(...));
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isObservable (value: any): value is Observable {
export default function isObservable (value: unknown): value is Observable {
return isObject(value) && isFunction((value as Observable).next);
}
+2 -2
View File
@@ -16,7 +16,7 @@
* console.log('isString', isString('test')); // => true
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/ban-types
export default function isString (value: any): value is string | String {
// eslint-disable-next-line @typescript-eslint/ban-types
export default function isString (value: unknown): value is string | String {
return typeof value === 'string' || value instanceof String;
}
+1 -2
View File
@@ -6,7 +6,6 @@ import { ToBn } from '../types';
import isFunction from './function';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isToBn (value?: any): value is ToBn {
export default function isToBn (value?: unknown): value is ToBn {
return !!value && isFunction((value as ToBn).toBn);
}
+1 -1
View File
@@ -19,7 +19,7 @@ describe('isUint8Array', (): void => {
it('returns true on Uint8Array values', (): void => {
expect(
isU8a(new Uint8Array([]))
isU8a(new Uint8Array())
).toEqual(true);
});
});
+1 -2
View File
@@ -18,7 +18,6 @@ import isInstanceOf from './instanceOf';
* console.log('isU8a', isU8a([])); // => false
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isU8a (value?: any): value is Uint8Array {
export default function isU8a (value?: unknown): value is Uint8Array {
return isInstanceOf(value, Uint8Array);
}
+1 -1
View File
@@ -17,6 +17,6 @@
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function isUndefined (value?: any): value is undefined {
export default function isUndefined (value?: unknown): value is undefined {
return typeof value === 'undefined';
}
+5 -6
View File
@@ -8,10 +8,8 @@ import { logger } from '.';
import { format } from './logger';
describe('logger', (): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let dateMatch: any;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let prefixMatch: any;
let dateMatch: unknown;
let prefixMatch: unknown;
let l: Logger;
let ln: Logger;
let spy: Partial<Console>;
@@ -34,7 +32,9 @@ describe('logger', (): void => {
};
global.console = spy as Console;
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
dateMatch = expect.stringMatching(/20[0-9]{2}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}/);
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
prefixMatch = expect.stringMatching(/TEST:/);
});
@@ -146,8 +146,7 @@ describe('logger', (): void => {
});
it('does not debug log when no process.env', (): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
process.env = undefined as any;
process.env = undefined as unknown as NodeJS.ProcessEnv;
l = logger('test');
l.debug('test');
+5 -9
View File
@@ -31,22 +31,17 @@ const chalked = {
warn: chalk.yellow
};
// eslint-disable-next-line @typescript-eslint/no-explicit-any
function formatObject (value: Record<string, any>): any {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const result: Record<string, any> = {};
function formatObject (value: Record<string, unknown>): Record<string, unknown> {
const result: Record<string, unknown> = {};
// eslint-disable-next-line @typescript-eslint/no-explicit-any
return Object.keys(value).reduce((result, key): Record<string, any> => {
// eslint-disable-next-line @typescript-eslint/no-use-before-define
return Object.keys(value).reduce((result, key): Record<string, unknown> => {
result[key] = format(value[key]);
return result;
}, result);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function format (value: any): any {
export function format (value: unknown): unknown {
if (Array.isArray(value)) {
return value.map(format);
}
@@ -72,6 +67,7 @@ export function format (value: any): any {
function apply (log: LogType, type: string, values: Logger$Data): void {
if (values.length === 1 && isFunction(values[0])) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/ban-types
const fnResult = (values[0] as Function)();
return apply(log, type, Array.isArray(fnResult) ? fnResult : [fnResult]);
+4 -4
View File
@@ -8,25 +8,25 @@ describe('numberToU8a', (): void => {
it('converts 0 to empty', (): void => {
expect(
numberToU8a(0)
).toEqual(new Uint8Array([]));
).toEqual(new Uint8Array());
});
it('converts undefined to empty', (): void => {
expect(
numberToU8a()
).toEqual(new Uint8Array([]));
).toEqual(new Uint8Array());
});
it('converts null to empty', (): void => {
expect(
numberToU8a(null)
).toEqual(new Uint8Array([]));
).toEqual(new Uint8Array());
});
it('converts NaN to empty', (): void => {
expect(
numberToU8a(NaN)
).toEqual(new Uint8Array([]));
).toEqual(new Uint8Array());
});
it('converts values to the u8a', (): void => {
+1 -1
View File
@@ -21,7 +21,7 @@ import numberToHex from './toHex';
*/
export default function numberToU8a (value?: number | null, bitLength = -1): Uint8Array {
if (!value || isNaN(value)) {
return new Uint8Array([]);
return new Uint8Array();
}
return hexToU8a(
+2 -1
View File
@@ -2,7 +2,6 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
/* eslint-disable @typescript-eslint/ban-ts-ignore */
/* eslint-disable no-extend-native */
/* eslint-disable @typescript-eslint/unbound-method */
@@ -15,8 +14,10 @@ describe('Array.fill', (): void => {
arrayFill = Array.prototype.fill;
u8aFill = Uint8Array.prototype.fill;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
Array.prototype.fill = null;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
Uint8Array.prototype.fill = null;
+5 -1
View File
@@ -13,9 +13,11 @@ if (!Array.prototype.fill) {
throw new TypeError('this is null or not defined');
}
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const A = Object(this);
// Steps 3-5.
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
const len = A.length >>> 0;
// Steps 6-7.
@@ -38,17 +40,19 @@ if (!Array.prototype.fill) {
// Step 12.
while (k < final) {
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
A[k] = value;
k++;
}
// Step 13.
// eslint-disable-next-line @typescript-eslint/no-unsafe-return
return A;
};
}
if (!Uint8Array.prototype.fill) {
// eslint-disable-next-line @typescript-eslint/ban-ts-ignore
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
Uint8Array.prototype.fill = Array.prototype.fill;
}
+1 -1
View File
@@ -10,7 +10,7 @@ describe('String padEnd', (): void => {
beforeEach((): void => {
stringEnd = String.prototype.padEnd;
// eslint-disable-next-line no-extend-native,@typescript-eslint/no-explicit-any
// eslint-disable-next-line no-extend-native,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment
String.prototype.padEnd = null as any;
require('./padEnd');
+1 -1
View File
@@ -10,7 +10,7 @@ describe('String padStart', (): void => {
beforeEach((): void => {
stringStart = String.prototype.padStart;
// eslint-disable-next-line no-extend-native,@typescript-eslint/no-explicit-any
// eslint-disable-next-line no-extend-native,@typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment
String.prototype.padStart = null as any;
require('./padStart');
@@ -3,16 +3,14 @@
// of the Apache-2.0 license. See the LICENSE file for details.
/* eslint-disable no-proto */
/* eslint-disable @typescript-eslint/ban-ts-ignore */
/* eslint-disable @typescript-eslint/unbound-method */
describe('setPrototypeOf', (): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
let orig: (o: any, proto: object | null) => any;
let orig: (o: Record<string, unknown>, proto: Record<string, unknown> | null) => Record<string, unknown>;
beforeEach((): void => {
orig = Object.setPrototypeOf;
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
Object.setPrototypeOf = null;
@@ -27,6 +25,7 @@ describe('setPrototypeOf', (): void => {
const obj = {};
const proto = { foo: 'bar' };
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
expect(Object.setPrototypeOf(obj, proto).__proto__).toBe(proto);
});
});
+2 -5
View File
@@ -2,13 +2,10 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
/* eslint-disable @typescript-eslint/unbound-method */
// React Native does not have Object.setPrototypeOf
if (!Object.setPrototypeOf) {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Object.setPrototypeOf = function (obj: any, proto: object | null): void {
// eslint-disable-next-line no-proto
Object.setPrototypeOf = function (obj: Record<string, unknown>, proto: Record<string, unknown> | null): Record<string, unknown> {
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,no-proto
obj.__proto__ = proto;
return obj;
@@ -6,32 +6,32 @@ describe('TextDecoder', (): void => {
let origTD: TextDecoder;
beforeEach((): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
origTD = (global as any).TextDecoder;
});
afterEach((): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
(global as any).TextDecoder = origTD;
});
it('polyfills with no exceptions (without TextDecoder)', (): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
(global as any).TextDecoder = null;
// eslint-disable-next-line @typescript-eslint/no-var-requires
expect(require('./textDecoder')).toBeDefined();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
expect((global as any).TextDecoder).toBeDefined();
});
it('polyfills with no exceptions (with TextDecoder)', (): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
(global as any).TextDecoder = require('util').TextDecoder;
// eslint-disable-next-line @typescript-eslint/no-var-requires
expect(require('./textDecoder')).toBeDefined();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
expect((global as any).TextDecoder).toBeDefined();
});
});
+5 -2
View File
@@ -4,8 +4,11 @@
if (typeof TextDecoder === 'undefined') {
try {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(global as any).TextDecoder = require('util').TextDecoder;
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-var-requires
const { TextDecoder: UTD } = require('util') as { TextDecoder: { new(): TextDecoder } };
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-member-access
(global as any).TextDecoder = UTD;
} catch (error) {
// noop
}
@@ -6,32 +6,32 @@ describe('TextEncoder', (): void => {
let origTE: TextEncoder;
beforeEach((): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
origTE = (global as any).TextEncoder;
});
afterEach((): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
(global as any).TextEncoder = origTE;
});
it('polyfills with no exceptions (without TextEncoder)', (): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
(global as any).TextEncoder = null;
// eslint-disable-next-line @typescript-eslint/no-var-requires
expect(require('./textEncoder')).toBeDefined();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
expect((global as any).TextEncoder).toBeDefined();
});
it('polyfills with no exceptions (with TextEncoder)', (): void => {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
(global as any).TextEncoder = require('util').TextEncoder;
// eslint-disable-next-line @typescript-eslint/no-var-requires
expect(require('./textEncoder')).toBeDefined();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-unsafe-member-access
expect((global as any).TextEncoder).toBeDefined();
});
});
+18 -2
View File
@@ -4,8 +4,24 @@
if (typeof TextEncoder === 'undefined') {
try {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
(global as any).TextEncoder = require('util').TextEncoder;
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment,@typescript-eslint/no-var-requires
const { TextEncoder: UTE } = require('util') as { TextEncoder: { new(): TextEncoder } };
// eslint-disable-next-line @typescript-eslint/no-explicit-any,@typescript-eslint/no-unsafe-member-access
(global as any).TextEncoder = class {
#encoder: TextEncoder;
constructor () {
this.#encoder = new UTE();
}
// For a Jest 26.0.1 environment, Buffer !== Uint8Array
encode (value: string): Uint8Array {
const encoded = this.#encoder.encode(value);
return Uint8Array.from(encoded);
}
};
} catch (error) {
// noop
}
+2 -2
View File
@@ -22,7 +22,7 @@ describe('promisify', (): void => {
.then((): void => {
throw new Error('Received unexpected result');
})
.catch((error): void => {
.catch((error: Error): void => {
expect(error.message).toEqual('test reject');
});
});
@@ -38,7 +38,7 @@ describe('promisify', (): void => {
it('handles functions with parameters (reject)', (): Promise<void> => {
const fn = (a: number, b: boolean, c: string, cb: (error: Error | null, result?: [number, boolean, string]) => void): void =>
cb(new Error(`test reject: ${a},${b},${c}`));
cb(new Error(`test reject: ${a},${b.toString()},${c}`));
return promisify(null, fn, 3, 'string', true).catch((error: Error): void => {
expect(error.message).toEqual('test reject: 3,string,true');
+4 -5
View File
@@ -2,8 +2,6 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
/* eslint-disable @typescript-eslint/no-explicit-any */
/**
* @name promisify
* @summary Wraps an async callback into a `Promise`
@@ -19,9 +17,10 @@
* await promisify(null, (cb) => cb(new Error('error!'))); // rejects with `error!`
* ```
*/
export default function promisify (self: any, fn: Function, ...params: any[]): Promise<any> {
// eslint-disable-next-line @typescript-eslint/ban-types,@typescript-eslint/explicit-module-boundary-types,@typescript-eslint/no-explicit-any
export default function promisify <R = any> (self: unknown, fn: Function, ...params: any[]): Promise<R> {
return new Promise((resolve, reject): void => {
const handler = (error: Error | null, result?: any): void => {
const handler = (error: Error | null, result?: R): void => {
if (error) {
reject(error);
} else {
@@ -29,6 +28,6 @@ export default function promisify (self: any, fn: Function, ...params: any[]): P
}
};
fn.apply(self, [...params, handler]);
fn.apply(self, params.concat(handler));
});
}
+1 -13
View File
@@ -14,18 +14,6 @@ describe('stringShorten', (): void => {
it('returns the shortened value when > maxLength', (): void => {
expect(
stringShorten('0123456789', 3)
).toEqual('012..789');
});
it('returns undefined as undefined', (): void => {
expect(
stringShorten()
).toEqual('undefined');
});
it('returns non-string values as strings', (): void => {
expect(
stringShorten(12345678, 2)
).toEqual('12..78');
).toEqual('012…789');
});
});
+3 -5
View File
@@ -6,7 +6,7 @@
* @name stringShorten
* @summary Returns a string with maximum length
* @description
* Checks the string against the `prefixLength`, if longer than dopuble this, shortens it by placing `..` in the middle of it
* Checks the string against the `prefixLength`, if longer than double this, shortens it by placing `..` in the middle of it
* @example
* <BR>
*
@@ -17,12 +17,10 @@
* ```
*/
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export default function stringShorten (_value?: any, prefixLength = 6): string {
const value = `${_value}`;
export default function stringShorten (value: string, prefixLength = 6): string {
if (value.length <= 2 + 2 * prefixLength) {
return value;
}
return `${value.substr(0, prefixLength)}..${value.slice(-prefixLength)}`;
return `${value.substr(0, prefixLength)}…${value.slice(-prefixLength)}`;
}
+1 -1
View File
@@ -8,7 +8,7 @@ describe('stringToU8a', (): void => {
it('decodes to an empty string for undefined', (): void => {
expect(
stringToU8a()
).toEqual(new Uint8Array([]));
).toEqual(new Uint8Array());
});
it('encodes the string correctly', (): void => {
+1 -1
View File
@@ -39,5 +39,5 @@ try {
export default function stringToU8a (value?: string): Uint8Array {
return value
? encoder.encode(value)
: new Uint8Array([]);
: new Uint8Array();
}
+1 -1
View File
@@ -2,7 +2,7 @@
// This software may be modified and distributed under the terms
// of the Apache-2.0 license. See the LICENSE file for details.
import BN from 'bn.js';
import type BN from 'bn.js';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export interface Constructor<T = any> {
+1 -1
View File
@@ -33,7 +33,7 @@ describe('u8aToBn', (): void => {
it('converts empty', (): void => {
expect(
u8aToBn(
new Uint8Array([]),
new Uint8Array(),
{ isLe: true }
).toString(16)
).toBe('0');
+1 -1
View File
@@ -13,7 +13,7 @@ describe('u8aToString', (): void => {
it('decodes to an empty string for empty buffer', (): void => {
expect(
u8aToString(new Uint8Array([]))
u8aToString(new Uint8Array())
).toEqual('');
});
+3339 -3017
View File
File diff suppressed because it is too large Load Diff