From 7a43354ecef4664984b0637c38a46229643f5824 Mon Sep 17 00:00:00 2001 From: Amaury Martiny Date: Mon, 12 Nov 2018 16:23:18 +0100 Subject: [PATCH] isString true for String object (#245) * Fix isString * value is * Fix isHex too * Fix isHex * Add hex test with String --- packages/util/src/is/hex.spec.js | 7 +++++++ packages/util/src/is/hex.ts | 5 ++--- packages/util/src/is/string.spec.js | 6 ++++++ packages/util/src/is/string.ts | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/packages/util/src/is/hex.spec.js b/packages/util/src/is/hex.spec.js index b476ef860..26f35de02 100644 --- a/packages/util/src/is/hex.spec.js +++ b/packages/util/src/is/hex.spec.js @@ -19,6 +19,13 @@ describe('isHex', () => { ).toEqual(true); }); + + it('returns true on hex values with String', () => { + expect( + isHex(new String(`0x${test}`)) + ).toEqual(true); + }); + it('returns false on hex values (non % 2)', () => { expect( isHex(`0x${test}0`) diff --git a/packages/util/src/is/hex.ts b/packages/util/src/is/hex.ts index 84f8b3bc2..e891ac272 100644 --- a/packages/util/src/is/hex.ts +++ b/packages/util/src/is/hex.ts @@ -22,9 +22,8 @@ const HEX_REGEX = /^0x[a-fA-F0-9]+$/; * isHex('0x1234', 8); // => false * ``` */ -export default function isHex (_value: any, bitLength: number = -1, ignoreLength: boolean = false): boolean { - const value = (_value as string); - const isValidHex = value === '0x' || (isString(value) && HEX_REGEX.test(value)); +export default function isHex (value: any, bitLength: number = -1, ignoreLength: boolean = 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)); diff --git a/packages/util/src/is/string.spec.js b/packages/util/src/is/string.spec.js index fd4d3a1d5..2659acedd 100644 --- a/packages/util/src/is/string.spec.js +++ b/packages/util/src/is/string.spec.js @@ -17,6 +17,12 @@ describe('isString', () => { ).toEqual(true); }); + it('returns true on String object', () => { + expect( + isString(new String('foo')) + ).toEqual(true); + }); + it('returns false on invalid numbers', () => { expect( isString(2) diff --git a/packages/util/src/is/string.ts b/packages/util/src/is/string.ts index 17868cbef..e0e30ca59 100644 --- a/packages/util/src/is/string.ts +++ b/packages/util/src/is/string.ts @@ -17,6 +17,6 @@ * console.log('isString', isString('test')); // => true * ``` */ -export default function isString (value: any): value is string { - return typeof value === 'string'; +export default function isString (value: any): value is string | String { + return typeof value === 'string' || value instanceof String; }