Skip to content

Fix dedupe/redirect nondeterminism #2628

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

Merged
jakebailey merged 3 commits into from
Feb 2, 2026
Merged

Fix dedupe/redirect nondeterminism #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b1d075a
Fix dedupe/redirect nondeterminism
jakebailey Jan 31, 2026
b2280d0
Don't stable sort, allFileNames is randomly ordered
jakebailey Jan 31, 2026
421176c
Use full comparison
jakebailey Jan 31, 2026
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
9 changes: 7 additions & 2 deletions internal/modulespecifiers/specifiers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,11 @@ func getAllModulePathsWorker(
allFileNames[p.FileName] = p
}

useCaseSensitiveFileNames := info.UseCaseSensitiveFileNames
comparePaths := func(a, b ModulePath) int {
Copy link
Member

@DanielRosenwasser DanielRosenwasser Feb 2, 2026

Choose a reason for hiding this comment

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

This doesn't actually allocate, right? I assume it'll keep everything on the stack.

Copy link
Member Author

@jakebailey jakebailey Feb 2, 2026

Choose a reason for hiding this comment

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

Yeah, or at worst it'll be a single slot on the stack for the closure object

return comparePathsByRedirect(a, b, useCaseSensitiveFileNames)
}

// Sort by paths closest to importing file Name directory
sortedPaths := make([]ModulePath, 0, len(paths))
for directory := info.SourceDirectory; len(allFileNames) != 0; {
Expand All @@ -220,7 +225,7 @@ func getAllModulePathsWorker(
}
}
if len(pathsInDirectory) > 0 {
slices.SortStableFunc(pathsInDirectory, comparePathsByRedirectAndNumberOfDirectorySeparators)
slices.SortFunc(pathsInDirectory, comparePaths)
sortedPaths = append(sortedPaths, pathsInDirectory...)
}
newDirectory := tspath.GetDirectoryPath(directory)
Expand All @@ -231,7 +236,7 @@ func getAllModulePathsWorker(
}
if len(allFileNames) > 0 {
remainingPaths := slices.Collect(maps.Values(allFileNames))
slices.SortStableFunc(remainingPaths, comparePathsByRedirectAndNumberOfDirectorySeparators)
slices.SortFunc(remainingPaths, comparePaths)
sortedPaths = append(sortedPaths, remainingPaths...)
}
return sortedPaths
Expand Down
4 changes: 2 additions & 2 deletions internal/modulespecifiers/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ var (
regexPatternCache = make(map[regexPatternCacheKey]*regexp2.Regexp)
)

func comparePathsByRedirectAndNumberOfDirectorySeparators(a ModulePath, b ModulePath) int {
func comparePathsByRedirect(a ModulePath, b ModulePath, useCaseSensitiveFileNames bool) int {
if a.IsRedirect == b.IsRedirect {
return strings.Count(a.FileName, "/") - strings.Count(b.FileName, "/")
return tspath.ComparePaths(a.FileName, b.FileName, tspath.ComparePathsOptions{UseCaseSensitiveFileNames: useCaseSensitiveFileNames})
}
if a.IsRedirect {
return 1
Expand Down