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
6 changes: 5 additions & 1 deletion src/regex.ts
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,11 @@ export const timeUnitTokenRegex = createRegex()
.endGroup()
.anyOf("\t ").zeroOrMore()
.startCaptureGroup()
.letter().oneOrMore()
.startGroup()
.unicodeChar()
.or()
.unicodeSymbol()
.endGroup().oneOrMore()
.endGroup()
.global()
.toRegExp();
Expand Down
7 changes: 7 additions & 0 deletions src/utils/time.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,31 @@ const timeUnitToMinutes: Record<string, number> = {
seconds: 1 / 60,
seconde: 1 / 60,
secondes: 1 / 60,
秒: 1 / 60,
// minutes
m: 1,
min: 1,
minute: 1,
minutes: 1,
分: 1,
分間: 1,
// hours
h: 60,
hour: 60,
hours: 60,
heure: 60,
heures: 60,
時: 60,
時間: 60,
// days
d: 1440,
day: 1440,
days: 1440,
j: 1440,
jour: 1440,
jours: 1440,
日: 1440,
日間: 1440,
};

/**
Expand Down
16 changes: 16 additions & 0 deletions test/utils_time.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,22 @@ describe("parseTimeToMinutes", () => {
expect(parseTimeToMinutes("2 jours")).toBe(2880);
});

it("handles Japanese time units", () => {
expect(parseTimeToMinutes("30秒")).toBe(1);
expect(parseTimeToMinutes("45 秒")).toBe(1);
expect(parseTimeToMinutes("30分")).toBe(30);
expect(parseTimeToMinutes("30 分間")).toBe(30);
expect(parseTimeToMinutes("1時間")).toBe(60);
expect(parseTimeToMinutes("2 時")).toBe(120);
expect(parseTimeToMinutes("1日")).toBe(1440);
expect(parseTimeToMinutes("2 日間")).toBe(2880);
});

it("parses multiple space-separated Japanese pairs", () => {
expect(parseTimeToMinutes("1時間 30分")).toBe(90);
expect(parseTimeToMinutes("1日 2時間 30分")).toBe(1590);
});

it("handles all second aliases", () => {
expect(parseTimeToMinutes("60 s")).toBe(1);
expect(parseTimeToMinutes("60 sec")).toBe(1);
Expand Down