Merge pull request #1496 from rsteube/fix-yargs

fix yargs

docs/src/spec/bride.md

@@ -84,6 +84,15 @@ completion:
   positionalany: ["$_bridge.Posener(vault)"]
 ````
 
+## Yargs
+[yargs/yargs] based commands can be bridged with the [`bridge.Yargs`] macro:
+
+```yaml
+name: example
+description: example description
+completion:
+  positionalany: ["$_bridge.Yargs(example)"]
+````
 
 [lazycomplete]:https://github.com/rsteube/lazycomplete
 [shell startup delay]:https://jzelinskie.com/posts/dont-recommend-sourcing-shell-completion/
@@ -109,3 +118,6 @@ completion:
 
 [posener/complete]:https://github.com/posener/complete
 [`bridge.Posener`]:https://pkg.go.dev/github.com/rsteube/carapace-bin/pkg/actions/bridge#ActionPosener
+
+[yargs/yargs]:https://github.com/yargs/yargs
+[`bridge.Yargs`]:https://pkg.go.dev/github.com/rsteube/carapace-bin/pkg/actions/bridge#ActionYargs

pkg/actions/bridge/yargs.go

@@ -32,22 +32,22 @@ func ActionYargs(command string) carapace.Action {
 			return carapace.ActionMessage(err.Error())
 		}
 
-		args := c.Args
-		current := c.CallbackValue
+		c.Setenv("SHELL", "zsh")
 
-		compLine := strings.Join(append(args, current), " ") // TODO escape/quote special characters
-		return carapace.ActionExecCommand(command, "--get-yargs-completions", compLine)(func(output []byte) carapace.Action {
+		args := []string{"--get-yargs-completions"}
+		args = append(args, c.Args...)
+		args = append(args, c.CallbackValue)
+		return carapace.ActionExecCommand(command, args...)(func(output []byte) carapace.Action {
 			lines := strings.Split(string(output), "\n")
 
 			vals := make([]string, 0)
 			for _, line := range lines {
 				if line != "" {
-					line = strings.Replace(line, `\:`, "\001", 1)
 					splitted := strings.SplitN(line, ":", 2)
-					name := strings.Replace(splitted[0], "\001", `\:`, 1)
+					name := splitted[0]
 					description := ""
 					if len(splitted) > 1 {
-						description = strings.Replace(splitted[1], "\001", `\:`, 1)
+						description = splitted[1]
 					}
 					vals = append(vals, name, description)
 				}