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

improve sourcemap performance #1881

Merged
merged 3 commits into from Sep 18, 2023
Merged

improve sourcemap performance #1881

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de33cf6
improve sourcemap performance
romainmenke Sep 16, 2023
efa442c
Update lib/map-generator.js
romainmenke Sep 16, 2023
6a291d6
apply suggestions from code review
romainmenke Sep 16, 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
32 changes: 26 additions & 6 deletions lib/map-generator.js
View file
Open in desktop
Expand Up @@ -17,6 +17,10 @@ class MapGenerator {
this.opts = opts
this.css = cssString
this.usesFileUrls = !this.mapOpts.from && this.mapOpts.absolute

this.memoizedFileURLs = new Map();
this.memoizedPaths = new Map();
this.memoizedURLs = new Map();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Specific operations were done very frequently and were slow.
As far as I can tell these can be memoized.
This dramatically improves performance of sourcemap generation.

I don't have a strong opinion on naming or best practices here.
Please advice if there is a more idiomatic way to memoize these values within PostCSS.

}

addAnnotation() {
Expand Down Expand Up @@ -241,18 +245,20 @@ class MapGenerator {
}

path(file) {
if (file.indexOf('<') === 0) return file
ai marked this conversation as resolved.
Show resolved Hide resolved
if (/^\w+:\/\//.test(file)) return file
if (this.mapOpts.absolute) return file
if (file.charCodeAt(0) === 60 /* `<` */) return file
if (/^\w+:\/\//.test(file)) return file
if (this.memoizedPaths.has(file)) return this.memoizedPaths.get(file);
romainmenke marked this conversation as resolved.
Show resolved Hide resolved

let from = this.opts.to ? dirname(this.opts.to) : '.'

if (typeof this.mapOpts.annotation === 'string') {
from = dirname(resolve(from, this.mapOpts.annotation))
}

file = relative(from, file)
return file
let path = relative(from, file)
this.memoizedPaths.set(file, path);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

;

return path
}

previous() {
Expand Down Expand Up @@ -318,8 +324,14 @@ class MapGenerator {
}

toFileUrl(path) {
if (this.memoizedFileURLs.has(path)) {
return this.memoizedFileURLs.get(path);
}
if (pathToFileURL) {
return pathToFileURL(path).toString()
let fileURL = pathToFileURL(path).toString()
this.memoizedFileURLs.set(path, fileURL)

return fileURL
} else {
throw new Error(
'`map.absolute` option is not available in this PostCSS build'
Expand All @@ -328,10 +340,18 @@ class MapGenerator {
}

toUrl(path) {
if (this.memoizedURLs.has(path)) {
return this.memoizedURLs.get(path);
}

if (sep === '\\') {
path = path.replace(/\\/g, '/')
}
return encodeURI(path).replace(/[#?]/g, encodeURIComponent)

let url = encodeURI(path).replace(/[#?]/g, encodeURIComponent);
this.memoizedURLs.set(path, url);

return url
}
}

Expand Down