uid: escape paths

Author: rsteube

Diff for: action.go

@@ -485,8 +485,8 @@ func (a Action) Uid(scheme, host string, opts ...string) Action {
 		for index, v := range invoked.action.rawValues {
 			uid := url.URL{
 				Scheme: scheme,
-				Host:   host,
-				Path:   v.Value,
+				Host:   url.PathEscape(host),
+				Path:   uid.PathEscape(v.Value),
 			}
 			if len(opts) > 0 {
 				values := uid.Query()

Diff for: defaultActions.go

@@ -143,7 +143,7 @@ func ActionDirectories() Action {
 				if err != nil {
 					return nil, err
 				}
-				return url.Parse("file://" + abs)
+				return url.Parse("file://" + uid.PathEscape(abs))
 			})
 	}).Tag("directories")
 }
@@ -159,7 +159,7 @@ func ActionFiles(suffix ...string) Action {
 				if err != nil {
 					return nil, err
 				}
-				return url.Parse("file://" + abs)
+				return url.Parse("file://" + uid.PathEscape(abs))
 			})
 	}).Tag("files")
 }
@@ -458,7 +458,7 @@ func ActionExecutables(dirs ...string) Action {
 		}
 		return batch.ToA().
 			UidF(func(s string, uc uid.Context) (*url.URL, error) {
-				return &url.URL{Scheme: "cmd", Host: s}, nil
+				return &url.URL{Scheme: "cmd", Host: uid.PathEscape(s)}, nil
 			})
 	}).Tag("executables")
 }
@@ -480,7 +480,7 @@ func actionDirectoryExecutables(dir string, prefix string, manDescriptions map[s
 				}
 			}
 			return ActionStyledValuesDescribed(vals...).UidF(func(s string, uc uid.Context) (*url.URL, error) {
-				return url.Parse(fmt.Sprintf("file://%v/%v", dir, s)) // TODO trim slash suffix from dir | backslash path possible? (windows)
+				return url.Parse(fmt.Sprintf("file://%v/%v", uid.PathEscape(dir), uid.PathEscape(s))) // TODO trim slash suffix from dir | backslash path possible? (windows)
 			})
 		}
 		return ActionValues()
@@ -555,9 +555,9 @@ func ActionCommands(cmd *cobra.Command) Action {
 
 			switch uid.Path {
 			case "":
-				uid.Path = s
+				uid.Path = url.PathEscape(s)
 			default:
-				uid.Path = uid.Path + "/" + s
+				uid.Path = uid.Path + "/" + url.PathEscape(s)
 			}
 			return uid, nil
 		})

Diff for: example-nonposix/go.mod

@@ -4,8 +4,8 @@ go 1.15
 
 require (
 	github.com/carapace-sh/carapace v0.50.3-0.20240311124258-a5adf91d8b8f
-	github.com/spf13/cobra v1.8.0
-	github.com/spf13/pflag v1.0.5
+	github.com/spf13/cobra v1.9.1
+	github.com/spf13/pflag v1.0.6
 )
 
 replace github.com/carapace-sh/carapace => ../

Diff for: example-nonposix/go.sum

@@ -1,13 +1,10 @@
 github.com/carapace-sh/carapace-pflag v1.0.0 h1:uJMhl+vwEM/Eb0UdxZUuv4jo4rUAyPijkRGP5gfCuCE=
 github.com/carapace-sh/carapace-pflag v1.0.0/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/carapace-sh/carapace-shlex v1.0.0 h1:uUi+hovGpxWF6KjptrqAOHsFPT3mcMx0JKdq20hswDI=
-github.com/carapace-sh/carapace-shlex v1.0.0/go.mod h1:lJ4ZsdxytE0wHJ8Ta9S7Qq0XpjgjU0mdfCqiI2FHx7M=
-github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/carapace-sh/carapace-shlex v1.0.1 h1:ww0JCgWpOVuqWG7k3724pJ18Lq8gh5pHQs9j3ojUs1c=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=
-github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

Diff for: example/cmd/_test_files/files_linux.go

@@ -22,6 +22,8 @@ package testfiles
 //go:generate touch -- quote_double_".txt
 //go:generate touch -- quote_both_'".txt
 //go:generate touch -- hash_#.txt
+//go:generate touch -- percent_d_%d.txt
+//go:generate touch -- percent_2f_%2F.txt
 //go:generate touch -- pipe_|.txt
 //go:generate touch -- question_?.txt
 //go:generate touch -- round-bracket_left_(.txt

Diff for: go.work

@@ -1,6 +1,7 @@
-go 1.19
+go 1.24.0
 
 use (
 	.
 	./example-nonposix
+	./example/cmd/_test_files
 )

Diff for: pkg/uid/path.go

@@ -0,0 +1,15 @@
+package uid
+
+import (
+	"net/url"
+	"strings"
+)
+
+// PathEscape is like url.PathEscape but keeps '/'.
+func PathEscape(s string) string {
+	segments := strings.Split(s, "/")
+	for index, segment := range segments {
+		segments[index] = url.PathEscape(segment)
+	}
+	return strings.Join(segments, "/")
+}

Diff for: pkg/uid/uid.go

@@ -21,7 +21,7 @@ type Context interface {
 func Command(cmd *cobra.Command) *url.URL {
 	path := []string{cmd.Name()}
 	for parent := cmd.Parent(); parent != nil; parent = parent.Parent() {
-		path = append(path, parent.Name())
+		path = append(path, url.PathEscape(parent.Name()))
 	}
 	reverse(path) // TODO slices.Reverse
 	return &url.URL{