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

Small lints #3244

Merged
merged 5 commits into from
Aug 25, 2024
Merged

Small lints #3244

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4267884
perf: small lints
romgrk Aug 22, 2024
1f73e47
revert
romgrk Aug 22, 2024
7833156
lint
romgrk Aug 22, 2024
c61f8b7
chore: add changeset
romgrk Aug 23, 2024
1fa3297
Update .changeset/curly-jars-punch.md
Andarist Aug 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/serialize/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ function createStringFromObject(
return string
}

let labelPattern = /label:\s*([^\s;\n{]+)\s*(;|$)/g
let labelPattern = /label:\s*([^\s;{]+)\s*(;|$)/g
Copy link
Contributor Author

Choose a reason for hiding this comment

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

\s contains \n. See node -p "'\\n'.match(/\\s/)"


let sourceMapPattern: RegExp | undefined
if (isDevelopment) {
Expand Down
4 changes: 2 additions & 2 deletions packages/utils/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ export function getRegisteredStyles(

classNames.split(' ').forEach(className => {
if (registered[className] !== undefined) {
registeredStyles.push(`${registered[className]};`)
} else {
registeredStyles.push(registered[className] as string)
Copy link
Contributor Author

Choose a reason for hiding this comment

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

registered contains serialized styles that are already terminated by a ; by the serialization code. It avoids allocating a new string.

Copy link
Member

Choose a reason for hiding this comment

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

This was added in #1656 . Maybe it's good to consider that a mistake in hindsight but it doesn't give me confidence that we can remove this safely now. I'm surprised that tests are OK with this change (well, some failed but I'm not sure if this is related, I see some hashes changed but I'd expect some functional break too). Maybe we are missing a test case?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The ; should definitely be changing the hash of strings passing through here, so that's expected.

The ; feels overly defensive to me and I don't like that it's also creating more strings for the same reasons explained in the other comment. It would be nice to ensure that what goes in cache.registered is strictly ; terminated, then we can safely do the change here and avoid modifying the strings everytime they pass here.

I'll revert it for now though, might require more investigation.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For more context, I frequently see strings like this one:

image

} else if (className) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

classNames could have multiple sequential spaces, in which case .split(' ') would produce empty strings.

Copy link
Member

Choose a reason for hiding this comment

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

a test case probably could be written for this, does it create a problem though? a rawClassName has already been allocated, can't this use some kind of string ropes or something to stay optimized?

Copy link
Contributor Author

@romgrk romgrk Aug 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Yeah someone might have inserted additional whitespaces in their classnames.

So sure engines will usually use a concatenated string like I describe here to optimize concat operations, but adding a single ' ' is likely too small to be worth it, engines are most likely just allocating a new string for those bytes.

I wrote a benchmark with only this difference, it does seem to have a positive impact: (I inserted a bunch of spaces to highlight the impact more clearly)

image

rawClassName += `${className} `
}
})
Expand Down
Loading