Skip to content
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.

Sign up for GitHub

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

Jump to bottom

perf: reduce system calls on eslint plugin #52359

Merged
merged 5 commits into from
Jul 7, 2023
Merged

perf: reduce system calls on eslint plugin #52359

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9bcb3eb
perf: reduce system calls on eslint plugin
anonrig Jul 6, 2023
8e95cf7
Merge branch 'canary' into eslint-plugin-next
styfle Jul 6, 2023
56c4064
Merge branch 'canary' into eslint-plugin-next
kodiakhq[bot] Jul 7, 2023
43b38c0
Merge branch 'canary' into eslint-plugin-next
timneutkens Jul 7, 2023
1a1cfdc
Merge branch 'canary' into eslint-plugin-next
styfle Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 14 additions & 34 deletions packages/eslint-plugin-next/src/utils/url.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,6 @@
import * as path from 'path'
import * as fs from 'fs'

// Cache for fs.lstatSync lookup.
// Prevent multiple blocking IO requests that have already been calculated.
const fsLstatSyncCache = {}
const fsLstatSync = (source) => {
fsLstatSyncCache[source] = fsLstatSyncCache[source] || fs.lstatSync(source)
return fsLstatSyncCache[source]
}

/**
* Checks if the source is a directory.
*/
function isDirectory(source: string) {
return fsLstatSync(source).isDirectory()
}

/**
* Checks if the source is a directory.
*/
function isSymlink(source: string) {
return fsLstatSync(source).isSymbolicLink()
}

// Cache for fs.readdirSync lookup.
// Prevent multiple blocking IO requests that have already been calculated.
const fsReadDirSyncCache = {}
Expand All @@ -31,21 +9,24 @@ const fsReadDirSyncCache = {}
* Recursively parse directory for page URLs.
*/
function parseUrlForPages(urlprefix: string, directory: string) {
fsReadDirSyncCache[directory] =
fsReadDirSyncCache[directory] || fs.readdirSync(directory)
fsReadDirSyncCache[directory] ??= fs.readdirSync(directory, {
withFileTypes: true,
})
const res = []
fsReadDirSyncCache[directory].forEach((fname) => {
fsReadDirSyncCache[directory].forEach((dirent) => {
// TODO: this should account for all page extensions
// not just js(x) and ts(x)
if (/(\.(j|t)sx?)$/.test(fname)) {
if (/^index(\.(j|t)sx?)$/.test(fname)) {
res.push(`${urlprefix}${fname.replace(/^index(\.(j|t)sx?)$/, '')}`)
if (/(\.(j|t)sx?)$/.test(dirent.name)) {
if (/^index(\.(j|t)sx?)$/.test(dirent.name)) {
res.push(
`${urlprefix}${dirent.name.replace(/^index(\.(j|t)sx?)$/, '')}`
)
}
res.push(`${urlprefix}${fname.replace(/(\.(j|t)sx?)$/, '')}`)
res.push(`${urlprefix}${dirent.name.replace(/(\.(j|t)sx?)$/, '')}`)
} else {
const dirPath = path.join(directory, fname)
if (isDirectory(dirPath) && !isSymlink(dirPath)) {
res.push(...parseUrlForPages(urlprefix + fname + '/', dirPath))
const dirPath = path.join(directory, dirent.name)
if (dirent.isDirectory() && !dirent.isSymbolicLink()) {
res.push(...parseUrlForPages(urlprefix + dirent.name + '/', dirPath))
}
}
})
Expand Down Expand Up @@ -84,8 +65,7 @@ export function getUrlFromPagesDirectories(
// De-duplicate similar pages across multiple directories.
new Set(
directories
.map((directory) => parseUrlForPages(urlPrefix, directory))
.flat()
.flatMap((directory) => parseUrlForPages(urlPrefix, directory))
.map(
// Since the URLs are normalized we add `^` and `$` to the RegExp to make sure they match exactly.
(url) => `^${normalizeURL(url)}$`
Expand Down