Skip to content

Commit ee10336

Browse files
glennmichael123glennmichael123
committed
feat: datetime
1 parent c71e1b8 commit ee10336

File tree

2 files changed

+24
-159
lines changed

2 files changed

+24
-159
lines changed

‎src/validators/dates.ts‎

Lines changed: 10 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -10,96 +10,25 @@ export class DateValidator extends BaseValidator<Date> {
1010
})
1111
}
1212

13-
min(date: Date): this {
13+
timestamp(): this {
1414
return this.addRule({
15-
name: 'min',
16-
test: (value: Date) => value.getTime() >= date.getTime(),
17-
message: 'Must be on or after {date}',
18-
params: { date: date.toISOString() },
19-
})
20-
}
21-
22-
max(date: Date): this {
23-
return this.addRule({
24-
name: 'max',
25-
test: (value: Date) => value.getTime() <= date.getTime(),
26-
message: 'Must be on or before {date}',
27-
params: { date: date.toISOString() },
28-
})
29-
}
30-
31-
between(start: Date, end: Date): this {
32-
return this.addRule({
33-
name: 'between',
34-
test: (value: Date) => {
35-
const time = value.getTime()
36-
return time >= start.getTime() && time <= end.getTime()
37-
},
38-
message: 'Must be between {start} and {end}',
39-
params: { start: start.toISOString(), end: end.toISOString() },
40-
})
41-
}
42-
43-
isBefore(date: Date): this {
44-
return this.addRule({
45-
name: 'isBefore',
46-
test: (value: Date) => value.getTime() < date.getTime(),
47-
message: 'Must be before {date}',
48-
params: { date: date.toISOString() },
49-
})
50-
}
51-
52-
isAfter(date: Date): this {
53-
return this.addRule({
54-
name: 'isAfter',
55-
test: (value: Date) => value.getTime() > date.getTime(),
56-
message: 'Must be after {date}',
57-
params: { date: date.toISOString() },
58-
})
59-
}
60-
61-
isToday(): this {
62-
return this.addRule({
63-
name: 'isToday',
64-
test: (value: Date) => {
65-
const today = new Date()
66-
return (
67-
value.getDate() === today.getDate()
68-
&& value.getMonth() === today.getMonth()
69-
&& value.getFullYear() === today.getFullYear()
70-
)
71-
},
72-
message: 'Must be today',
73-
})
74-
}
75-
76-
isWeekend(): this {
77-
return this.addRule({
78-
name: 'isWeekend',
15+
name: 'timestamp',
7916
test: (value: Date) => {
80-
const day = value.getDay()
81-
return day === 0 || day === 6
17+
const timestamp = value.getTime()
18+
return timestamp >= 0 && timestamp <= Number.MAX_SAFE_INTEGER
8219
},
83-
message: 'Must be a weekend day',
20+
message: 'Must be a valid timestamp',
8421
})
8522
}
8623

87-
isWeekday(): this {
24+
datetime(): this {
8825
return this.addRule({
89-
name: 'isWeekday',
26+
name: 'datetime',
9027
test: (value: Date) => {
91-
const day = value.getDay()
92-
return day !== 0 && day !== 6
28+
const timestamp = value.getTime()
29+
return timestamp >= 0 && timestamp <= Number.MAX_SAFE_INTEGER
9330
},
94-
message: 'Must be a weekday',
95-
})
96-
}
97-
98-
custom(fn: (value: Date) => boolean, message: string): this {
99-
return this.addRule({
100-
name: 'custom',
101-
test: fn,
102-
message,
31+
message: 'Must be a valid datetime',
10332
})
10433
}
10534
}

‎test/validation.test.ts‎

Lines changed: 14 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -206,84 +206,20 @@ describe('Validation Library', () => {
206206
expect(validator.test(123 as any)).toBe(false)
207207
})
208208

209-
test('min date validation', () => {
210-
const minDate = new Date('2023-01-01')
211-
const validator = v.date().min(minDate)
212-
expect(validator.test(new Date('2023-01-01'))).toBe(true)
213-
expect(validator.test(new Date('2023-02-01'))).toBe(true)
214-
expect(validator.test(new Date('2022-12-31'))).toBe(false)
215-
})
216-
217-
test('max date validation', () => {
218-
const maxDate = new Date('2023-12-31')
219-
const validator = v.date().max(maxDate)
220-
expect(validator.test(new Date('2023-12-31'))).toBe(true)
221-
expect(validator.test(new Date('2023-06-15'))).toBe(true)
222-
expect(validator.test(new Date('2024-01-01'))).toBe(false)
223-
})
224-
225-
test('between dates validation', () => {
226-
const start = new Date('2023-01-01')
227-
const end = new Date('2023-12-31')
228-
const validator = v.date().between(start, end)
229-
expect(validator.test(new Date('2023-06-15'))).toBe(true)
230-
expect(validator.test(new Date('2023-01-01'))).toBe(true)
231-
expect(validator.test(new Date('2023-12-31'))).toBe(true)
232-
expect(validator.test(new Date('2022-12-31'))).toBe(false)
233-
expect(validator.test(new Date('2024-01-01'))).toBe(false)
234-
})
235-
236-
test('isBefore validation', () => {
237-
const date = new Date('2023-12-31')
238-
const validator = v.date().isBefore(date)
239-
expect(validator.test(new Date('2023-12-30'))).toBe(true)
240-
expect(validator.test(new Date('2023-12-31'))).toBe(false)
241-
expect(validator.test(new Date('2024-01-01'))).toBe(false)
242-
})
243-
244-
test('isAfter validation', () => {
245-
const date = new Date('2023-01-01')
246-
const validator = v.date().isAfter(date)
247-
expect(validator.test(new Date('2023-01-02'))).toBe(true)
248-
expect(validator.test(new Date('2023-01-01'))).toBe(false)
249-
expect(validator.test(new Date('2022-12-31'))).toBe(false)
250-
})
251-
252-
test('isToday validation', () => {
253-
const validator = v.date().isToday()
254-
expect(validator.test(new Date())).toBe(true)
255-
expect(validator.test(new Date('2023-01-01'))).toBe(false)
256-
})
257-
258-
test('isWeekend validation', () => {
259-
const validator = v.date().isWeekend()
260-
// Saturday
261-
expect(validator.test(new Date('2023-01-07'))).toBe(true)
262-
// Sunday
263-
expect(validator.test(new Date('2023-01-08'))).toBe(true)
264-
// Monday
265-
expect(validator.test(new Date('2023-01-09'))).toBe(false)
266-
})
267-
268-
test('isWeekday validation', () => {
269-
const validator = v.date().isWeekday()
270-
// Monday
271-
expect(validator.test(new Date('2023-01-09'))).toBe(true)
272-
// Friday
273-
expect(validator.test(new Date('2023-01-13'))).toBe(true)
274-
// Saturday
275-
expect(validator.test(new Date('2023-01-07'))).toBe(false)
276-
// Sunday
277-
expect(validator.test(new Date('2023-01-08'))).toBe(false)
278-
})
279-
280-
test('custom date validation', () => {
281-
const validator = v.date().custom(
282-
date => date.getFullYear() >= 2023,
283-
'Must be in 2023 or later',
284-
)
285-
expect(validator.test(new Date('2023-01-01'))).toBe(true)
286-
expect(validator.test(new Date('2022-12-31'))).toBe(false)
209+
test('timestamp validation', () => {
210+
const validator = v.date().timestamp()
211+
expect(validator.test(new Date(1683912345000))).toBe(true)
212+
expect(validator.test(new Date(0))).toBe(true)
213+
expect(validator.test(new Date(-1))).toBe(false)
214+
expect(validator.test(new Date(Number.MAX_SAFE_INTEGER + 1))).toBe(false)
215+
})
216+
217+
test('datetime validation', () => {
218+
const validator = v.date().datetime()
219+
expect(validator.test(new Date(1683912345000))).toBe(true)
220+
expect(validator.test(new Date(0))).toBe(true)
221+
expect(validator.test(new Date(-1))).toBe(false)
222+
expect(validator.test(new Date(Number.MAX_SAFE_INTEGER + 1))).toBe(false)
287223
})
288224
})
289225

0 commit comments

Comments
 (0)