improve filename sanitization using a library

Author: Commandtechno

.gitignore

@@ -1 +1 @@
-output
+test

go.mod

@@ -3,6 +3,8 @@ module sourcerer
 go 1.17
 
 require (
-	github.com/golang-demos/chalk v1.1.1
-	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
+	github.com/golang-demos/chalk v1.1.3
+	golang.org/x/net v0.7.0
 )
+
+require github.com/flytam/filenamify v1.1.2

go.sum

@@ -1,4 +1,15 @@
+github.com/flytam/filenamify v1.1.2 h1:dGlfWU4zrhDlsmvob4IFcfgjG5vIjfo4UwLyec6Wx94=
+github.com/flytam/filenamify v1.1.2/go.mod h1:Dzf9kVycwcsBlr2ATg6uxjqiFgKGH+5SKFuhdeP5zu8=
 github.com/golang-demos/chalk v1.1.1 h1:5TzT+8d8jqmTDhZhCBM2pGKeZ0j8HJtuUzBoYVLg518=
 github.com/golang-demos/chalk v1.1.1/go.mod h1:6oOi3j1Ghmt/Vnfr/xTkVRwOt3tx+oU/aQvIG0gbQHA=
+github.com/golang-demos/chalk v1.1.3 h1:1WV1SHjKQ4C14z5dkBxwK17eBX8tSrMy7ljHy4G9o8c=
+github.com/golang-demos/chalk v1.1.3/go.mod h1:6oOi3j1Ghmt/Vnfr/xTkVRwOt3tx+oU/aQvIG0gbQHA=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd h1:O7DYs+zxREGLKzKoMQrtrEacpb0ZVXA5rIwylE2Xchk=
 golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
+golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

sourceMap.go

@@ -6,6 +6,8 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/flytam/filenamify"
 )
 
 type SourceMap struct {
@@ -37,13 +39,20 @@ func fromSourceMap(ctx Context, res *http.Response) {
 			source = source[:queryIndex]
 		}
 
+		hashIndex := strings.Index(source, "?")
+		if hashIndex != -1 {
+			source = source[:hashIndex]
+		}
+
 		// remove reserved characters
-		// https://docs.microsoft.com/en-us/windows/win32/fileio/naming-a-file
-		source = strings.ReplaceAll(source, "<", "")
-		source = strings.ReplaceAll(source, ">", "")
-		source = strings.ReplaceAll(source, ":", "")
-		source = strings.ReplaceAll(source, "\"", "")
-		source = strings.ReplaceAll(source, "<", "")
+		source, err := filenamify.FilenamifyV2(source, func(options *filenamify.Options) {
+			options.Replacement = "_"
+		})
+
+		if err != nil {
+			error(ctx.Depth, "Failed to filenamify source:", err)
+			continue
+		}
 
 		path := filepath.Join(filepath.Clean(ctx.Dir), source)
 		dir := filepath.Dir(path)
@@ -59,4 +68,4 @@ func fromSourceMap(ctx Context, res *http.Response) {
 			continue
 		}
 	}
-}
+}