From 20e01defe3a77892f7883144171975f411956c82 Mon Sep 17 00:00:00 2001 From: Anton Golub Date: Sun, 30 May 2021 01:37:01 +0300 Subject: [PATCH 1/3] fix(string-utils): detect 0.1 as a number like --- lib/string-utils.ts | 2 +- test/string-utils.cjs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/string-utils.ts b/lib/string-utils.ts index 3f315c17..fa9e2fc7 100644 --- a/lib/string-utils.ts +++ b/lib/string-utils.ts @@ -58,6 +58,6 @@ export function looksLikeNumber (x: null | undefined | number | string): boolean // hexadecimal. if (/^0x[0-9a-f]+$/i.test(x)) return true // don't treat 0123 as a number; as it drops the leading '0'. - if (x.length > 1 && x[0] === '0') return false + if (x.length > 1 && x[0] === '0' && x[1] !== '.') return false return /^[-]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x) } diff --git a/test/string-utils.cjs b/test/string-utils.cjs index 74d618d4..eb65bb1f 100644 --- a/test/string-utils.cjs +++ b/test/string-utils.cjs @@ -28,7 +28,9 @@ describe('string-utils', function () { strictEqual(looksLikeNumber('3293'), true) strictEqual(looksLikeNumber('0x10'), true) strictEqual(looksLikeNumber('0x10'), true) + strictEqual(looksLikeNumber('0.1'), true) + strictEqual(looksLikeNumber('00.1'), false) strictEqual(looksLikeNumber('0100'), false) strictEqual(looksLikeNumber('apple'), false) }) From ed50d1130555829024e685a1fd53a2cb206ebf0b Mon Sep 17 00:00:00 2001 From: Anton Golub Date: Sun, 30 May 2021 09:25:52 +0300 Subject: [PATCH 2/3] refactor(string-utils): simplify `looksLikeNumber` condition --- lib/string-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/string-utils.ts b/lib/string-utils.ts index fa9e2fc7..9c52197d 100644 --- a/lib/string-utils.ts +++ b/lib/string-utils.ts @@ -58,6 +58,6 @@ export function looksLikeNumber (x: null | undefined | number | string): boolean // hexadecimal. if (/^0x[0-9a-f]+$/i.test(x)) return true // don't treat 0123 as a number; as it drops the leading '0'. - if (x.length > 1 && x[0] === '0' && x[1] !== '.') return false + if (/^0[^.]/.test(x)) return false return /^[-]?(?:\d+(?:\.\d*)?|\.\d+)(e[-+]?\d+)?$/.test(x) } From 81b8707f79297ea269f365708e9cd65b532535fb Mon Sep 17 00:00:00 2001 From: Anton Golub Date: Fri, 4 Jun 2021 09:39:54 +0300 Subject: [PATCH 3/3] test(string-utils): extend `looksLikeNumber` test cases --- test/string-utils.cjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/string-utils.cjs b/test/string-utils.cjs index eb65bb1f..081dd084 100644 --- a/test/string-utils.cjs +++ b/test/string-utils.cjs @@ -27,8 +27,9 @@ describe('string-utils', function () { it('it detects strings that could be parsed as numbers', () => { strictEqual(looksLikeNumber('3293'), true) strictEqual(looksLikeNumber('0x10'), true) - strictEqual(looksLikeNumber('0x10'), true) + strictEqual(looksLikeNumber('.1'), true) strictEqual(looksLikeNumber('0.1'), true) + strictEqual(looksLikeNumber('0.10'), true) strictEqual(looksLikeNumber('00.1'), false) strictEqual(looksLikeNumber('0100'), false)