ignore "\" vs "/" when validating path metadata

Author: evanw

internal/bundler/bundler.go

@@ -969,14 +969,6 @@ func loaderFromFileExtension(extensionToLoader map[string]config.Loader, base st
 	return config.LoaderNone
 }
 
-// Identify the path by its lowercase absolute path name with Windows-specific
-// slashes substituted for standard slashes. This should hopefully avoid path
-// issues on Windows where multiple different paths can refer to the same
-// underlying file.
-func canonicalFileSystemPathForWindows(absPath string) string {
-	return strings.ReplaceAll(strings.ToLower(absPath), "\\", "/")
-}
-
 func hashForFileName(hashBytes []byte) string {
 	return base32.StdEncoding.EncodeToString(hashBytes)[:8]
 }
@@ -1160,7 +1152,7 @@ func (s *scanner) maybeParseFile(
 	path := resolveResult.PathPair.Primary
 	visitedKey := path
 	if visitedKey.Namespace == "file" {
-		visitedKey.Text = canonicalFileSystemPathForWindows(visitedKey.Text)
+		visitedKey.Text = logger.CanonicalFileSystemPathForWindows(visitedKey.Text)
 	}
 
 	// Only parse a given file path once
@@ -1382,7 +1374,7 @@ func (s *scanner) preprocessInjectedFiles() {
 	j := 0
 	for _, absPath := range s.options.InjectAbsPaths {
 		prettyPath := s.res.PrettyPath(logger.Path{Text: absPath, Namespace: "file"})
-		absPathKey := canonicalFileSystemPathForWindows(absPath)
+		absPathKey := logger.CanonicalFileSystemPathForWindows(absPath)
 
 		if duplicateInjectedFiles[absPathKey] {
 			s.log.Add(logger.Error, nil, logger.Range{}, fmt.Sprintf("Duplicate injected file %q", prettyPath))
@@ -1782,7 +1774,7 @@ func (s *scanner) processScannedFiles() []scannerFile {
 				if resolveResult.PathPair.HasSecondary() {
 					secondaryKey := resolveResult.PathPair.Secondary
 					if secondaryKey.Namespace == "file" {
-						secondaryKey.Text = canonicalFileSystemPathForWindows(secondaryKey.Text)
+						secondaryKey.Text = logger.CanonicalFileSystemPathForWindows(secondaryKey.Text)
 					}
 					if secondaryVisited, ok := s.visited[secondaryKey]; ok {
 						record.SourceIndex = ast.MakeIndex32(secondaryVisited.sourceIndex)
@@ -1842,7 +1834,7 @@ func (s *scanner) processScannedFiles() []scannerFile {
 						} else if !css.JSSourceIndex.IsValid() {
 							stubKey := otherFile.inputFile.Source.KeyPath
 							if stubKey.Namespace == "file" {
-								stubKey.Text = canonicalFileSystemPathForWindows(stubKey.Text)
+								stubKey.Text = logger.CanonicalFileSystemPathForWindows(stubKey.Text)
 							}
 							sourceIndex := s.allocateSourceIndex(stubKey, cache.SourceIndexJSStubForCSS)
 							source := logger.Source{
@@ -2222,12 +2214,12 @@ func (b *Bundle) Compile(log logger.Log, options config.Options, timer *helpers.
 			for _, sourceIndex := range allReachableFiles {
 				keyPath := b.files[sourceIndex].inputFile.Source.KeyPath
 				if keyPath.Namespace == "file" {
-					absPathKey := canonicalFileSystemPathForWindows(keyPath.Text)
+					absPathKey := logger.CanonicalFileSystemPathForWindows(keyPath.Text)
 					sourceAbsPaths[absPathKey] = sourceIndex
 				}
 			}
 			for _, outputFile := range outputFiles {
-				absPathKey := canonicalFileSystemPathForWindows(outputFile.AbsPath)
+				absPathKey := logger.CanonicalFileSystemPathForWindows(outputFile.AbsPath)
 				if sourceIndex, ok := sourceAbsPaths[absPathKey]; ok {
 					hint := ""
 					switch logger.API {
@@ -2254,7 +2246,7 @@ func (b *Bundle) Compile(log logger.Log, options config.Options, timer *helpers.
 		outputFileMap := make(map[string][]byte)
 		end := 0
 		for _, outputFile := range outputFiles {
-			absPathKey := canonicalFileSystemPathForWindows(outputFile.AbsPath)
+			absPathKey := logger.CanonicalFileSystemPathForWindows(outputFile.AbsPath)
 			contents, ok := outputFileMap[absPathKey]
 
 			// If this isn't a duplicate, keep the output file

internal/logger/logger.go

@@ -254,6 +254,24 @@ func (a Path) ComesBeforeInSortedOrder(b Path) bool {
 				(a.Flags == b.Flags && a.IgnoredSuffix < b.IgnoredSuffix)))))
 }
 
+func (a Path) IsEquivalentTo(b Path) bool {
+	if a.Namespace == "file" {
+		a.Text = CanonicalFileSystemPathForWindows(a.Text)
+	}
+	if b.Namespace == "file" {
+		b.Text = CanonicalFileSystemPathForWindows(b.Text)
+	}
+	return a == b
+}
+
+// Identify the path by its lowercase absolute path name with Windows-specific
+// slashes substituted for standard slashes. This should hopefully avoid path
+// issues on Windows where multiple different paths can refer to the same
+// underlying file.
+func CanonicalFileSystemPathForWindows(absPath string) string {
+	return strings.ReplaceAll(strings.ToLower(absPath), "\\", "/")
+}
+
 var noColorResult bool
 var noColorOnce sync.Once
 

internal/resolver/resolver.go

@@ -196,12 +196,12 @@ func (old *ResolveResult) Compare(new *ResolveResult) (diff []string) {
 		newDiff = append(newDiff, prettyPrintPluginName("+", "pluginName", new.PluginName))
 	}
 
-	if old.PathPair.Primary != new.PathPair.Primary {
+	if !old.PathPair.Primary.IsEquivalentTo(new.PathPair.Primary) {
 		oldDiff = append(oldDiff, prettyPrintPath("-", "path", old.PathPair.Primary))
 		newDiff = append(newDiff, prettyPrintPath("+", "path", new.PathPair.Primary))
 	}
 
-	if old.PathPair.Secondary != new.PathPair.Secondary {
+	if !old.PathPair.Secondary.IsEquivalentTo(new.PathPair.Secondary) {
 		oldDiff = append(oldDiff, prettyPrintPath("-", "secondaryPath", old.PathPair.Secondary))
 		newDiff = append(newDiff, prettyPrintPath("+", "secondaryPath", new.PathPair.Secondary))
 	}