Skip to content

Commit 8b62e68

Browse files
committed
fix(opencode): validate filter dates in UTC
Refs: ccusage#801
1 parent c2cea10 commit 8b62e68

2 files changed

Lines changed: 32 additions & 13 deletions

File tree

‎apps/opencode/src/_shared-args.ts‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import type { Args } from 'gunshi';
22
import * as v from 'valibot';
3+
import { parseYYYYMMDD } from './date-utils.ts';
34

45
/**
56
* Filter date schema for YYYYMMDD format (e.g., 20250125)
@@ -17,7 +18,11 @@ export const filterDateSchema = v.pipe(
1718
* @returns Validated date string
1819
*/
1920
function parseDateArg(value: string): string {
20-
return v.parse(filterDateSchema, value);
21+
const parsed = v.parse(filterDateSchema, value);
22+
if (parseYYYYMMDD(parsed) == null) {
23+
throw new Error('Date must be a valid calendar date (YYYYMMDD).');
24+
}
25+
return parsed;
2126
}
2227

2328
/**
@@ -46,3 +51,15 @@ export const sharedArgs = {
4651
description: 'Force compact table mode',
4752
},
4853
} as const satisfies Args;
54+
55+
if (import.meta.vitest != null) {
56+
describe('parseDateArg', () => {
57+
it('accepts valid calendar dates', () => {
58+
expect(parseDateArg('20250125')).toBe('20250125');
59+
});
60+
61+
it('rejects invalid calendar dates', () => {
62+
expect(() => parseDateArg('20240230')).toThrow('Date must be a valid calendar date');
63+
});
64+
});
65+
}

‎apps/opencode/src/date-utils.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* @param dateStr - Date string in YYYYMMDD format
1313
* @returns Date object or null if invalid
1414
*/
15-
function parseYYYYMMDD(dateStr: string): Date | null {
15+
export function parseYYYYMMDD(dateStr: string): Date | null {
1616
if (dateStr.length !== 8) {
1717
return null;
1818
}
@@ -33,9 +33,9 @@ function parseYYYYMMDD(dateStr: string): Date | null {
3333
return null;
3434
}
3535

36-
const date = new Date(year, month, day);
36+
const date = new Date(Date.UTC(year, month, day));
3737
// Check if the date is valid (e.g., not Feb 30)
38-
if (date.getFullYear() !== year || date.getMonth() !== month || date.getDate() !== day) {
38+
if (date.getUTCFullYear() !== year || date.getUTCMonth() !== month || date.getUTCDate() !== day) {
3939
return null;
4040
}
4141

@@ -51,15 +51,17 @@ function parseYYYYMMDD(dateStr: string): Date | null {
5151
*/
5252
export function isDateInRange(date: Date, since: string | null, until: string | null): boolean {
5353
// Normalize date to midnight UTC for consistent comparison
54-
const normalizedDate = new Date(Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()));
54+
const normalizedDate = new Date(
55+
Date.UTC(date.getUTCFullYear(), date.getUTCMonth(), date.getUTCDate()),
56+
);
5557

5658
if (since != null) {
5759
const sinceDate = parseYYYYMMDD(since);
5860
if (sinceDate == null) {
5961
return false;
6062
}
6163
const normalizedSince = new Date(
62-
Date.UTC(sinceDate.getFullYear(), sinceDate.getMonth(), sinceDate.getDate()),
64+
Date.UTC(sinceDate.getUTCFullYear(), sinceDate.getUTCMonth(), sinceDate.getUTCDate()),
6365
);
6466
if (normalizedDate < normalizedSince) {
6567
return false;
@@ -72,7 +74,7 @@ export function isDateInRange(date: Date, since: string | null, until: string |
7274
return false;
7375
}
7476
const normalizedUntil = new Date(
75-
Date.UTC(untilDate.getFullYear(), untilDate.getMonth(), untilDate.getDate()),
77+
Date.UTC(untilDate.getUTCFullYear(), untilDate.getUTCMonth(), untilDate.getUTCDate()),
7678
);
7779
if (normalizedDate > normalizedUntil) {
7880
return false;
@@ -90,17 +92,17 @@ if (import.meta.vitest != null) {
9092
it('should parse valid dates', () => {
9193
const date = parseYYYYMMDD('20250128');
9294
expect(date).not.toBeNull();
93-
expect(date?.getFullYear()).toBe(2025);
94-
expect(date?.getMonth()).toBe(0); // January
95-
expect(date?.getDate()).toBe(28);
95+
expect(date?.getUTCFullYear()).toBe(2025);
96+
expect(date?.getUTCMonth()).toBe(0); // January
97+
expect(date?.getUTCDate()).toBe(28);
9698
});
9799

98100
it('should handle leap years', () => {
99101
const date = parseYYYYMMDD('20240229');
100102
expect(date).not.toBeNull();
101-
expect(date?.getFullYear()).toBe(2024);
102-
expect(date?.getMonth()).toBe(1); // February
103-
expect(date?.getDate()).toBe(29);
103+
expect(date?.getUTCFullYear()).toBe(2024);
104+
expect(date?.getUTCMonth()).toBe(1); // February
105+
expect(date?.getUTCDate()).toBe(29);
104106
});
105107

106108
it('should reject invalid dates', () => {

0 commit comments

Comments
 (0)