Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restrict negative values for parseTime function #2596

Open
wants to merge 3 commits into
base: main-beta
Choose a base branch
from
Open

Restrict negative values for parseTime function #2596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ab981e5
feat(esl-utils): restrict negative values
Natalie-Smirnova Aug 16, 2024
ab00802
Revert "feat(esl-utils): restrict negative values"
Natalie-Smirnova Aug 16, 2024
bf14b35
refactor(esl-utils): restrict negative values
Natalie-Smirnova Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/modules/esl-utils/misc/format.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,11 @@ export function format(str: string, source: Record<string, any>, matcher: RegExp
*/
export function parseTime(timeStr: string): number {
const str = timeStr.trim().toLowerCase();
const parseNoEmpty = (s: string): number => s ? +s : NaN;
const parseNoEmpty = (s: string): number => {
const num = s ? +s : NaN;
if (Object.is(num, -0) || num < 0) return NaN;
return num;
};
if (str.endsWith('ms')) return parseNoEmpty(str.slice(0, -2));
if (str.endsWith('s')) return parseNoEmpty(str.slice(0, -1)) * 1000;
return +str; // empty string without unit is treated as 0
Expand Down
8 changes: 4 additions & 4 deletions src/modules/esl-utils/misc/test/format.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,13 @@ describe('misc/format helper tests', () => {
['.124s', 124],
['.3ms', 0.3],
// Negative integer
['-456ms', -456],
['-456ms', NaN],
// Case insensitive
['14mS', 14],
['14S', 14000],
// Zero with leading +/-
['+0s', 0],
['-0ms', -0],
['-0ms', NaN],
// Digits without unit should be parsed as milliseconds
['0', 0],
['100', 100],
Expand Down Expand Up @@ -213,13 +213,13 @@ describe('misc/format helper tests', () => {
['.124s', 124],
['.3ms', 0.3],
// Negative integer
['-456ms', -456],
['-456ms', NaN],
// Case insensitive
['14mS', 14],
['14S', 14000],
// Zero with leading +/-
['+0s', 0],
['-0ms', -0]
['-0ms', NaN]
])(
'valid time = %s parsed as %s',
(time: string, result: number) => expect(parseCSSTime(time)).toBe(result)
Expand Down
Loading