-
Notifications
You must be signed in to change notification settings - Fork 6.3k
chore: refactor the generateBlogData
function (again) (#7607)
#7618
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dario-piotrowicz
wants to merge
4
commits into
nodejs:main
Choose a base branch
from
dario-piotrowicz:dario/refactor-generateBlogData
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+229
−55
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
177 changes: 177 additions & 0 deletions
177
apps/site/next-data/generators/__tests__/blogData.test.mjs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
import { normalize } from 'node:path'; | ||
import { Readable } from 'node:stream'; | ||
|
||
import generateBlogData from '@/next-data/generators/blogData.mjs'; | ||
|
||
let files = []; | ||
|
||
jest.mock('node:fs', () => ({ | ||
createReadStream: jest.fn(filename => { | ||
const readable = new Readable(); | ||
const file = files.find(f => filename.endsWith(normalize(f.path))); | ||
readable.push(`---\n`); | ||
file.frontMatterContent.forEach(line => readable.push(`${line}\n`)); | ||
readable.push(`---\n`); | ||
readable.push(null); | ||
readable.close = () => {}; | ||
return readable; | ||
}), | ||
})); | ||
|
||
jest.mock('../../../next.helpers.mjs', () => ({ | ||
getMarkdownFiles: () => Promise.resolve(files.map(file => file.path)), | ||
})); | ||
|
||
describe('generateBlogData', () => { | ||
it('should return zero posts and only the default "all" category is no md file is found', async () => { | ||
files = []; | ||
|
||
const blogData = await generateBlogData(); | ||
|
||
expect(blogData.categories).toStrictEqual(['all']); | ||
expect(blogData.posts).toStrictEqual([]); | ||
}); | ||
|
||
it('should collect the data from a single md file if only one is found', async () => { | ||
files = [ | ||
{ | ||
path: 'pages/en/blog/post1.md', | ||
frontMatterContent: [ | ||
`date: '2020-01-01T00:00:00.000Z'`, | ||
`title: POST 1`, | ||
`author: author`, | ||
], | ||
}, | ||
]; | ||
|
||
const blogData = await generateBlogData(); | ||
|
||
expect(blogData.posts.length).toBe(1); | ||
const post = blogData.posts[0]; | ||
expect(post.title).toEqual('POST 1'); | ||
expect(post.date).toEqual(new Date('2020-01-01T00:00:00.000Z')); | ||
expect(post.author).toEqual('author'); | ||
}); | ||
|
||
it('should collect the data from multiple md files', async () => { | ||
const currentDate = new Date(); | ||
|
||
files = [ | ||
{ | ||
path: 'pages/en/blog/post1.md', | ||
frontMatterContent: [ | ||
`date: '2020-01-01T00:00:00.000Z'`, | ||
`title: POST 1`, | ||
`author: author-a`, | ||
], | ||
}, | ||
{ | ||
path: 'pages/en/blog/post2.md', | ||
frontMatterContent: [ | ||
`date: '2020-01-02T00:00:00.000Z'`, | ||
`title: POST 2`, | ||
`author: author-b`, | ||
], | ||
}, | ||
{ | ||
path: 'pages/en/blog/post3.md', | ||
frontMatterContent: [ | ||
// no date specified (the date defaults to the current date) | ||
`title: POST 3`, | ||
`author: author-c`, | ||
], | ||
}, | ||
]; | ||
|
||
const blogData = await generateBlogData(); | ||
|
||
expect(blogData.posts.length).toBe(3); | ||
expect(blogData.posts[0].title).toEqual('POST 1'); | ||
expect(blogData.posts[0].date).toEqual( | ||
new Date('2020-01-01T00:00:00.000Z') | ||
); | ||
expect(blogData.posts[0].author).toEqual('author-a'); | ||
expect(blogData.posts[1].title).toEqual('POST 2'); | ||
expect(blogData.posts[1].date).toEqual( | ||
new Date('2020-01-02T00:00:00.000Z') | ||
); | ||
expect(blogData.posts[1].author).toEqual('author-b'); | ||
expect(blogData.posts[2].title).toEqual('POST 3'); | ||
expect(blogData.posts[2].date.setMilliseconds(0)).toEqual( | ||
currentDate.setMilliseconds(0) | ||
); | ||
expect(blogData.posts[2].author).toEqual('author-c'); | ||
}); | ||
|
||
it('should generate categories based on the categories of md files and their years', async () => { | ||
files = [ | ||
{ | ||
path: 'pages/en/blog/post1.md', | ||
frontMatterContent: [ | ||
"date: '2020-01-01T00:00:00.000Z'", | ||
'category: category-a', | ||
], | ||
}, | ||
{ | ||
path: 'pages/en/blog/sub-dir/post2.md', | ||
frontMatterContent: [ | ||
"date: '2020-01-02T00:00:00.000Z'", | ||
'category: category-b', | ||
], | ||
}, | ||
{ | ||
path: 'pages/en/blog/post3.md', | ||
frontMatterContent: [ | ||
"date: '2021-03-13T00:00:00.000Z'", | ||
// no category specified (it should be "uncategorized") | ||
], | ||
}, | ||
{ | ||
path: 'pages/en/blog/post4.md', | ||
frontMatterContent: [ | ||
// no date specified (the date defaults to the current date) | ||
'category: category-b', | ||
], | ||
}, | ||
]; | ||
|
||
const blogData = await generateBlogData(); | ||
|
||
expect(blogData.categories.sort()).toStrictEqual([ | ||
'all', | ||
'category-a', | ||
'category-b', | ||
'uncategorized', | ||
'year-2020', | ||
'year-2021', | ||
`year-${new Date().getUTCFullYear()}`, | ||
]); | ||
}); | ||
|
||
it('should generate slugs based on the md filenames and categories', async () => { | ||
files = [ | ||
{ | ||
path: 'pages/en/blog/post1.md', | ||
frontMatterContent: ['category: category-a'], | ||
}, | ||
{ | ||
path: 'pages/en/blog/post2.md', | ||
frontMatterContent: ['category: category-b'], | ||
}, | ||
{ | ||
path: 'pages/en/blog/post3.md', | ||
frontMatterContent: [ | ||
// no category specified | ||
], | ||
}, | ||
]; | ||
|
||
const blogData = await generateBlogData(); | ||
|
||
expect(blogData.posts.map(p => p.slug).sort()).toStrictEqual([ | ||
'/blog/category-a/post1', | ||
'/blog/category-b/post2', | ||
'/blog/uncategorized/post3', | ||
]); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why we removing these categories? 👀
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nono, these are still being added anyways to the
blogCategories
array, I'm just doing it from thecategories
array here: https://github.com/nodejs/nodejs.org/pull/7618/files/7004629e8ff0dfcdc7a57109d5132fe34ef301c3#diff-5ddcf76b865830c001627fef7abd06107b3eafeb210d21737305db2416a279beR95-R98