Skip to content

Commit d72f4b5

Browse files
committed
refactor: simplify blog date validation and error reporting
1 parent 7da7888 commit d72f4b5

2 files changed

Lines changed: 14 additions & 152 deletions

File tree

‎scripts/data/blog.mjs‎

Lines changed: 9 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -11,69 +11,13 @@ const OUTPUT = join(ROOT, 'generated', 'blog.json');
1111

1212
const titleFromBody = body => body.match(/^#\s+(.+)$/m)?.[1].trim() ?? null;
1313

14-
class InvalidBlogDateError extends Error {
15-
constructor(file, display) {
16-
super(
17-
`Invalid blog date in ${join('pages', 'blog', 'posts', file)}: ${display} ` +
18-
'(expected an ISO 8601 date or timestamp)'
19-
);
20-
this.name = 'InvalidBlogDateError';
21-
}
22-
}
23-
24-
const daysInMonth = (year, month) => {
25-
if (month === 2) {
26-
return year % 4 === 0 && (year % 100 !== 0 || year % 400 === 0) ? 29 : 28;
27-
}
28-
29-
return [31, 0, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month - 1] ?? 0;
30-
};
31-
32-
const normalizeDate = (value, file, source) => {
33-
const rawDate = source
34-
.match(/^---\r?\n([\s\S]*?)\r?\n---(?:\r?\n|$)/)?.[1]
35-
?.match(/^date:\s*(.*?)\s*$/m)?.[1];
36-
const calendar = rawDate?.match(
37-
/^['"]?(\d{4})-(\d{1,2})-(\d{1,2})(?:(?:[Tt]|[ \t]+)(\d{1,2}):(\d{2})(?::(\d{2}))?)?/
38-
);
39-
40-
if (
41-
calendar &&
42-
(Number(calendar[2]) < 1 ||
43-
Number(calendar[2]) > 12 ||
44-
Number(calendar[3]) < 1 ||
45-
Number(calendar[3]) >
46-
daysInMonth(Number(calendar[1]), Number(calendar[2])) ||
47-
(calendar[4] !== undefined &&
48-
(Number(calendar[4]) > 24 ||
49-
(Number(calendar[4]) === 24 &&
50-
(Number(calendar[5]) !== 0 ||
51-
(calendar[6] !== undefined && Number(calendar[6]) !== 0))))) ||
52-
(calendar[5] !== undefined && Number(calendar[5]) > 59) ||
53-
(calendar[6] !== undefined && Number(calendar[6]) > 59))
54-
) {
55-
const display = JSON.stringify(rawDate.trim());
56-
throw new InvalidBlogDateError(file, display);
57-
}
58-
59-
const date =
60-
value instanceof Date
61-
? value
62-
: typeof value === 'string' && value.trim()
63-
? new Date(
64-
/^\d{4}-\d{1,2}-\d{1,2}(?:[Tt]|[ \t]+)\d{1,2}:\d{2}(?::\d{2}(?:\.\d+)?)?$/.test(
65-
value.trim()
66-
)
67-
? `${value.trim().replace(/[ \t]+/, 'T')}Z`
68-
: value
69-
)
70-
: null;
14+
const parseDate = (value, file) => {
15+
const date = value ? new Date(value) : null;
7116

7217
if (!date || Number.isNaN(date.getTime())) {
73-
const displayValue = rawDate?.trim() || value;
74-
const display =
75-
displayValue === undefined ? '<missing>' : JSON.stringify(displayValue);
76-
throw new InvalidBlogDateError(file, display);
18+
throw new Error(
19+
`Invalid or missing blog date in pages/blog/posts/${file}: ${JSON.stringify(value ?? '<missing>')}`
20+
);
7721
}
7822

7923
return date.toISOString();
@@ -86,14 +30,15 @@ const readPosts = async () => {
8630
const posts = await Promise.all(
8731
files.map(async file => {
8832
const slug = file.replace(/\.md$/, '');
89-
const source = await readFile(join(POSTS_DIR, file), 'utf8');
90-
const { data, content } = matter(source);
33+
const { data, content } = matter(
34+
await readFile(join(POSTS_DIR, file), 'utf8')
35+
);
9136

9237
return {
9338
slug,
9439
title: titleFromBody(content) ?? slug,
9540
authors: data.authors?.split(',').map(s => s.trim()),
96-
date: normalizeDate(data.date, file, source),
41+
date: parseDate(data.date, file),
9742
category: data.category ?? null,
9843
image: data.image ?? null,
9944
...(data.description && { description: data.description }),

‎tests/data/blog.test.mjs‎

Lines changed: 5 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ const createFixture = async content => {
2828
return root;
2929
};
3030

31-
const runFixture = (root, timeZone = 'UTC') =>
32-
execFileAsync(process.execPath, ['scripts/data/blog.mjs'], {
33-
cwd: root,
34-
env: { ...process.env, TZ: timeZone },
35-
});
31+
const runFixture = root =>
32+
execFileAsync(process.execPath, ['scripts/data/blog.mjs'], { cwd: root });
3633

3734
test('generates blog data for valid dates', async t => {
3835
const root = await createFixture("---\ndate: '2026-09-22'\n---\n# Test\n");
@@ -46,105 +43,25 @@ test('generates blog data for valid dates', async t => {
4643
assert.equal(posts[0].date, '2026-09-22T00:00:00.000Z');
4744
});
4845

49-
test('normalizes offset-less quoted date-times as UTC', async t => {
50-
const root = await createFixture(
51-
"---\ndate: '2026-09-22 10:00'\n---\n# Test\n"
52-
);
53-
t.after(() => rm(root, { recursive: true, force: true }));
54-
55-
const dates = [];
56-
for (const timeZone of ['UTC', 'America/Los_Angeles']) {
57-
await runFixture(root, timeZone);
58-
const posts = JSON.parse(
59-
await readFile(join(root, 'generated', 'blog.json'), 'utf8')
60-
);
61-
dates.push(posts[0].date);
62-
}
63-
64-
assert.deepEqual(dates, [
65-
'2026-09-22T10:00:00.000Z',
66-
'2026-09-22T10:00:00.000Z',
67-
]);
68-
});
69-
7046
test('reports the file for an invalid blog date', async t => {
7147
const root = await createFixture('---\ndate: not-a-date\n---\n# Test\n');
7248
t.after(() => rm(root, { recursive: true, force: true }));
7349

7450
await assert.rejects(runFixture(root), error => {
75-
assert.match(error.stderr, /InvalidBlogDateError: Invalid blog date/);
51+
assert.match(error.stderr, /Invalid or missing blog date/);
7652
assert.match(error.stderr, /pages[\\/]blog[\\/]posts[\\/]example\.md/);
7753
assert.match(error.stderr, /not-a-date/);
7854
return true;
7955
});
8056
});
8157

82-
test('rejects nonexistent calendar dates', async t => {
83-
const root = await createFixture('---\ndate: 2026-02-30\n---\n# Test\n');
84-
t.after(() => rm(root, { recursive: true, force: true }));
85-
86-
await assert.rejects(runFixture(root), error => {
87-
assert.match(error.stderr, /Invalid blog date/);
88-
assert.match(error.stderr, /2026-02-30/);
89-
return true;
90-
});
91-
});
92-
93-
test('rejects one-digit dates that roll over', async t => {
94-
const root = await createFixture(
95-
'---\ndate: 2024-2-30 10:00:00\n---\n# Test\n'
96-
);
97-
t.after(() => rm(root, { recursive: true, force: true }));
98-
99-
await assert.rejects(runFixture(root), error => {
100-
assert.match(error.stderr, /Invalid blog date/);
101-
assert.match(error.stderr, /2024-2-30/);
102-
return true;
103-
});
104-
});
105-
106-
test('rejects out-of-range time components', async t => {
107-
const root = await createFixture(
108-
'---\ndate: 2024-01-01 25:60:60\n---\n# Test\n'
109-
);
110-
t.after(() => rm(root, { recursive: true, force: true }));
111-
112-
await assert.rejects(runFixture(root), error => {
113-
assert.match(error.stderr, /Invalid blog date/);
114-
assert.match(error.stderr, /25:60:60/);
115-
return true;
116-
});
117-
});
118-
119-
test('accepts ISO end-of-day timestamps', async t => {
120-
for (const value of ['2026-09-22T24:00:00Z', '2026-09-22 24:00']) {
121-
const root = await createFixture(`---\ndate: '${value}'\n---\n# Test\n`);
122-
t.after(() => rm(root, { recursive: true, force: true }));
123-
124-
await runFixture(root);
125-
}
126-
});
127-
128-
test('rejects nonzero end-of-day time components', async t => {
129-
const root = await createFixture(
130-
"---\ndate: '2026-09-22T24:00:01Z'\n---\n# Test\n"
131-
);
132-
t.after(() => rm(root, { recursive: true, force: true }));
133-
134-
await assert.rejects(runFixture(root), error => {
135-
assert.match(error.stderr, /Invalid blog date/);
136-
assert.match(error.stderr, /24:00:01/);
137-
return true;
138-
});
139-
});
140-
14158
test('reports the file for a missing blog date', async t => {
14259
const root = await createFixture('---\ntitle: Test\n---\n# Test\n');
14360
t.after(() => rm(root, { recursive: true, force: true }));
14461

14562
await assert.rejects(runFixture(root), error => {
146-
assert.match(error.stderr, /Invalid blog date/);
147-
assert.match(error.stderr, /example\.md/);
63+
assert.match(error.stderr, /Invalid or missing blog date/);
64+
assert.match(error.stderr, /pages[\\/]blog[\\/]posts[\\/]example\.md/);
14865
assert.match(error.stderr, /<missing>/);
14966
return true;
15067
});

0 commit comments

Comments
 (0)