Merge pull request #1790 from rsteube/user-filterargs

use `Action.FilterArgs`

completers/ant_completer/cmd/root.go

@@ -75,7 +75,7 @@ func init() {
 			if flag := rootCmd.Flag("f"); flag.Changed {
 				path = flag.Value.String()
 			}
-			return action.ActionTargets(path).Invoke(c).Filter(c.Args).ToA()
+			return action.ActionTargets(path).FilterArgs()
 		}),
 	)
 }

completers/apt-get_completer/cmd/buildDep.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(buildDepCmd)
 
 	carapace.Gen(buildDepCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return apt.ActionPackageSearch().Invoke(c).Filter(c.Args).ToA()
-		}),
+		apt.ActionPackageSearch().FilterArgs(),
 	)
 }

completers/apt-get_completer/cmd/changelog.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(changelogCmd)
 
 	carapace.Gen(changelogCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return apt.ActionPackages().Invoke(c).Filter(c.Args).ToA()
-		}),
+		apt.ActionPackages().FilterArgs(),
 	)
 }

completers/apt-get_completer/cmd/download.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(downloadCmd)
 
 	carapace.Gen(downloadCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return apt.ActionPackageSearch().Invoke(c).Filter(c.Args).ToA()
-		}),
+		apt.ActionPackageSearch().FilterArgs(),
 	)
 }

completers/apt-get_completer/cmd/install.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(installCmd)
 
 	carapace.Gen(installCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return apt.ActionPackageSearch().Invoke(c).Filter(c.Args).ToA()
-		}),
+		apt.ActionPackageSearch().FilterArgs(),
 	)
 }

completers/apt-get_completer/cmd/purge.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(purgeCmd)
 
 	carapace.Gen(purgeCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return apt.ActionPackages().Invoke(c).Filter(c.Args).ToA()
-		}),
+		apt.ActionPackages().FilterArgs(),
 	)
 }

completers/apt-get_completer/cmd/remove.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(removeCmd)
 
 	carapace.Gen(removeCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return apt.ActionPackages().Invoke(c).Filter(c.Args).ToA()
-		}),
+		apt.ActionPackages().FilterArgs(),
 	)
 }

completers/apt-get_completer/cmd/source.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(sourceCmd)
 
 	carapace.Gen(sourceCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return apt.ActionPackageSearch().Invoke(c).Filter(c.Args).ToA()
-		}),
+		apt.ActionPackageSearch().FilterArgs(),
 	)
 }

completers/ar_completer/cmd/delete.go

@@ -24,7 +24,7 @@ func init() {
 
 	carapace.Gen(deleteCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return fs.ActionArFileContents(c.Args[0]).Invoke(c).Filter(c.Args[1:]).ToA()
+			return fs.ActionArFileContents(c.Args[0]).Invoke(c).Filter(c.Args[1:]...).ToA()
 		}),
 	)
 }

completers/ar_completer/cmd/extract.go

@@ -25,7 +25,7 @@ func init() {
 
 	carapace.Gen(extractCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return fs.ActionArFileContents(c.Args[0]).Invoke(c).Filter(c.Args[1:]).ToA()
+			return fs.ActionArFileContents(c.Args[0]).Invoke(c).Filter(c.Args[1:]...).ToA()
 		}),
 	)
 }

completers/ar_completer/cmd/move.go

@@ -33,14 +33,14 @@ func init() {
 					return carapace.ActionFiles()
 
 				default:
-					return fs.ActionArFileContents(c.Args[1]).Invoke(c).Filter(c.Args[1:]).ToA()
+					return fs.ActionArFileContents(c.Args[1]).Invoke(c).Filter(c.Args[1:]...).ToA()
 				}
 			}
 
 			if len(c.Args) == 0 {
 				return carapace.ActionFiles()
 			}
-			return fs.ActionArFileContents(c.Args[0]).Invoke(c).Filter(c.Args[1:]).ToA()
+			return fs.ActionArFileContents(c.Args[0]).Invoke(c).Filter(c.Args[1:]...).ToA()
 		}),
 	)
 }

completers/ar_completer/cmd/print.go

@@ -24,7 +24,7 @@ func init() {
 
 	carapace.Gen(printCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return fs.ActionArFileContents(c.Args[0]).Invoke(c).Filter(c.Args[1:]).ToA()
+			return fs.ActionArFileContents(c.Args[0]).Filter(c.Args[1:]...)
 		}),
 	)
 }

completers/brew_completer/cmd/list.go

@@ -35,8 +35,6 @@ func init() {
 	rootCmd.AddCommand(listCmd)
 
 	carapace.Gen(listCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionList(listCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionList(listCmd).FilterArgs(),
 	)
 }

completers/brew_completer/cmd/uninstall.go

@@ -29,8 +29,6 @@ func init() {
 	rootCmd.AddCommand(uninstallCmd)
 
 	carapace.Gen(uninstallCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionList(uninstallCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionList(uninstallCmd).FilterArgs(),
 	)
 }

completers/cargo-rm_completer/cmd/root.go

@@ -37,7 +37,7 @@ func init() {
 			return cargo.ActionDependencies(cargo.DependencyOpts{
 				Path:           rootCmd.Flag("manifest-path").Value.String(),
 				IncludeVersion: false,
-			}).Invoke(c).Filter(c.Args).ToA()
+			}).FilterArgs()
 		}),
 	)
 }

completers/cargo-upgrade_completer/cmd/root.go

@@ -42,7 +42,7 @@ func init() {
 			return cargo.ActionDependencies(cargo.DependencyOpts{
 				Path:           rootCmd.Flag("manifest-path").Value.String(),
 				IncludeVersion: false,
-			}).Invoke(c).Filter(c.Args).ToA()
+			}).FilterArgs()
 		}),
 	)
 }

completers/cargo_completer/cmd/action/package.go

@@ -49,7 +49,7 @@ func ActionGithubPackageSearch() carapace.Action {
 		if len(c.Args) < 2 {
 			batch = append(batch, actionGithubPackageIndex("2"))
 			batch = append(batch, carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-				return actionGithubPackageIndex("").Invoke(c).Filter([]string{"1", "2", "3", "config.json"}).ToA()
+				return actionGithubPackageIndex("").Filter("1", "2", "3", "config.json")
 			}))
 		}
 

completers/cargo_completer/cmd/remove.go

@@ -31,8 +31,6 @@ func init() {
 	})
 
 	carapace.Gen(removeCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionDependencies(removeCmd, false).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionDependencies(removeCmd, false).FilterArgs(),
 	)
 }

completers/cargo_completer/cmd/uninstall.go

@@ -33,7 +33,7 @@ func init() {
 
 	carapace.Gen(uninstallCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionInstalledPackages(uninstallCmd.Flag("root").Value.String()).Invoke(c).Filter(c.Args).ToA()
+			return action.ActionInstalledPackages(uninstallCmd.Flag("root").Value.String()).FilterArgs()
 		}),
 	)
 }

completers/conda_completer/cmd/init.go

@@ -25,7 +25,7 @@ func init() {
 
 	carapace.Gen(initCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return carapace.ActionValues("bash", "fish", "powershell", "tcsh", "xonsh", "zsh").Invoke(c).Filter(c.Args).ToA()
+			return carapace.ActionValues("bash", "fish", "powershell", "tcsh", "xonsh", "zsh").FilterArgs()
 		}),
 	)
 }

completers/conda_completer/cmd/remove.go

@@ -45,8 +45,6 @@ func init() {
 	})
 
 	carapace.Gen(removeCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionPackages(removeCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionPackages(removeCmd).FilterArgs(),
 	)
 }

completers/conda_completer/cmd/update.go

@@ -54,8 +54,6 @@ func init() {
 	})
 
 	carapace.Gen(updateCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionPackages(updateCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionPackages(updateCmd).FilterArgs(),
 	)
 }

completers/consul_completer/cmd/rtt.go

@@ -22,7 +22,7 @@ func init() {
 	carapace.Gen(rttCmd).PositionalCompletion(
 		action.ActionNodes(rttCmd),
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionNodes(rttCmd).Invoke(c).Filter(c.Args[:1]).ToA()
+			return action.ActionNodes(rttCmd).Invoke(c).Filter(c.Args[:1]...).ToA() // TODO should work with FilterArgs
 		}),
 	)
 }

completers/dart_completer/cmd/pub_downgrade.go

@@ -23,8 +23,6 @@ func init() {
 	pubCmd.AddCommand(pub_downgradeCmd)
 
 	carapace.Gen(pub_downgradeCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pub.ActionDependencies().Invoke(c).Filter(c.Args).ToA()
-		}),
+		pub.ActionDependencies().FilterArgs(),
 	)
 }

completers/dart_completer/cmd/pub_upgrade.go

@@ -26,8 +26,6 @@ func init() {
 	pubCmd.AddCommand(pub_upgradeCmd)
 
 	carapace.Gen(pub_upgradeCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return pub.ActionDependencies().Invoke(c).Filter(c.Args).ToA()
-		}),
+		pub.ActionDependencies().FilterArgs(),
 	)
 }

completers/dbt_completer/cmd/root.go

@@ -71,9 +71,7 @@ func addModelsFlag(cmd *cobra.Command) {
 	cmd.Flag("models").Nargs = -1
 
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
-		"models": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return dbt.ActionResources(dbt.ResourceOpts{Model: true}).Invoke(c).Filter(c.Parts).ToA()
-		}),
+		"models": dbt.ActionResources(dbt.ResourceOpts{Model: true}).FilterParts(), // TODO test this
 	})
 }
 
@@ -95,11 +93,7 @@ func addSelectionFlags(cmd *cobra.Command) {
 	cmd.Flag("select").Nargs = -1
 
 	carapace.Gen(cmd).FlagCompletion(carapace.ActionMap{
-		"exclude": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return dbt.ActionResources(dbt.ResourceOpts{}.Default()).Invoke(c).Filter(c.Parts).ToA()
-		}),
-		"select": carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return dbt.ActionResources(dbt.ResourceOpts{}.Default()).Invoke(c).Filter(c.Parts).ToA()
-		}),
+		"exclude": dbt.ActionResources(dbt.ResourceOpts{}.Default()).FilterParts(),
+		"select":  dbt.ActionResources(dbt.ResourceOpts{}.Default()).FilterParts(),
 	})
 }

completers/dd_completer/cmd/root.go

@@ -45,7 +45,7 @@ func init() {
 					"seek", "skip N obs-sized blocks at start of output",
 					"skip", "skip N ibs-sized blocks at start of input",
 					"status", "The LEVEL of information to print to stderr",
-				).Invoke(c).Filter(keys).Suffix("=").ToA()
+				).Invoke(c).Filter(keys...).Suffix("=").ToA()
 			case 1:
 				switch c.Parts[0] {
 				case "conv":

completers/devbox_completer/cmd/rm.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/rsteube/carapace"
 	"github.com/rsteube/carapace-bin/pkg/actions/tools/devbox"
+	"github.com/rsteube/carapace/pkg/traverse"
 	"github.com/spf13/cobra"
 )
 
@@ -22,9 +23,8 @@ func init() {
 	})
 
 	carapace.Gen(rmCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			dir := rmCmd.Flag("config").Value.String()
-			return devbox.ActionInstalledPackages().Chdir(dir).Invoke(c).Filter(c.Args).ToA()
-		}),
+		devbox.ActionInstalledPackages().
+			ChdirF(traverse.Flag(rmCmd.Flag("config"))).
+			FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/build.go

@@ -36,8 +36,6 @@ func init() {
 	})
 
 	carapace.Gen(buildCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(buildCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(buildCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/config.go

@@ -37,8 +37,6 @@ func init() {
 	})
 
 	carapace.Gen(configCmd).PositionalCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(configCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(configCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/create.go

@@ -30,8 +30,6 @@ func init() {
 	})
 
 	carapace.Gen(createCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(createCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(createCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/events.go

@@ -19,8 +19,6 @@ func init() {
 	rootCmd.AddCommand(eventsCmd)
 
 	carapace.Gen(eventsCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(eventsCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(eventsCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/images.go

@@ -24,8 +24,6 @@ func init() {
 	})
 
 	carapace.Gen(imagesCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(imagesCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(imagesCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/kill.go

@@ -25,8 +25,6 @@ func init() {
 	})
 
 	carapace.Gen(killCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(killCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(killCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/logs.go

@@ -25,8 +25,6 @@ func init() {
 	rootCmd.AddCommand(logsCmd)
 
 	carapace.Gen(logsCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(logsCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(logsCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/pause.go

@@ -18,8 +18,6 @@ func init() {
 	rootCmd.AddCommand(pauseCmd)
 
 	carapace.Gen(pauseCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(pauseCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(pauseCmd).FilterArgs(),
 	)
 }

completers/docker-compose_completer/cmd/ps.go

@@ -29,8 +29,6 @@ func init() {
 	})
 
 	carapace.Gen(psCmd).PositionalAnyCompletion(
-		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return action.ActionServices(psCmd).Invoke(c).Filter(c.Args).ToA()
-		}),
+		action.ActionServices(psCmd).FilterArgs(),
 	)
 }