Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions packages/utils/src/shorthand-time.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ export const shorthandToMilliseconds = (

// Check if the string is purely numeric
if (Number.isNaN(Number(shorthand))) {
// Use a case-insensitive regex that supports decimals and 'ms' unit
const match = /^([\d.]+)\s*(ms|s|m|h|hr|d)$/i.exec(shorthand);
// Require at least one digit and at most one decimal point.
// Keep the decimal part in one group to prevent excess backtracking.
const match = /^(\d+(?:\.\d*)?|\.\d+)\s*(ms|s|m|h|hr|d)$/i.exec(
shorthand,
);

if (!match) {
throw new Error(
Expand Down
14 changes: 14 additions & 0 deletions packages/utils/test/shorthand-time.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,20 @@ describe("time parser", () => {
"Unsupported time format: \"1z\". Use 'ms', 's', 'm', 'h', 'hr', or 'd'.",
);
});
test.each(["1.2.3s", "1..5s", "..s", ".s", ".m"])(
'reject a malformed number in "%s"',
(value) => {
expect(() => shorthandToMilliseconds(value)).toThrowError(
`Unsupported time format: "${value}"`,
);
},
);
test.each([
[".5s", 500],
["5.s", 5000],
])('convert "%s" to milliseconds', (value, expected) => {
expect(shorthandToMilliseconds(value)).toBe(expected);
});
test("send in string with number", () => {
expect(shorthandToMilliseconds("1000")).toBe(1000);
});
Expand Down
Loading