dagger: function completion

completers/code_completer/cmd/action/extension.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 	"github.com/spf13/cobra"
 )
 
@@ -87,5 +87,5 @@ func ActionMicrosoftExtensions(category string) carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 		// Microsoft extensions are aliased and only found by the 'Microsoft' publisher (though the actual name differs)
 		return ActionExtensionSearch(category).Invoke(carapace.Context{Value: "Microsoft"}).ToA()
-	}).Cache(24*time.Hour, cache.String(category))
+	}).Cache(24*time.Hour, key.String(category))
 }

completers/dagger_completer/cmd/call.go

@@ -15,6 +15,7 @@ var callCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(callCmd).Standalone()
+	callCmd.Flags().SetInterspersed(false)
 
 	callCmd.PersistentFlags().Bool("focus", false, "Only show output for focused commands")
 	callCmd.PersistentFlags().Bool("json", false, "Present result as JSON")
@@ -28,6 +29,6 @@ func init() {
 	})
 
 	carapace.Gen(callCmd).PositionalAnyCompletion(
-		dagger.ActionFunctions(),
+		dagger.ActionFunctionsA(),
 	)
 }

completers/dagger_completer/cmd/functions.go

@@ -17,6 +17,7 @@ func init() {
 	carapace.Gen(functionsCmd).Standalone()
 
 	functionsCmd.PersistentFlags().Bool("focus", false, "Only show output for focused commands")
+	functionsCmd.PersistentFlags().Bool("json", false, "Output as json")
 	functionsCmd.PersistentFlags().StringP("mod", "m", "", "Path to dagger.json config file for the module or a directory containing that file. Either local path (e.g. \"/path/to/some/dir\") or a github repo (e.g. \"github.com/dagger/dagger/path/to/some/subdir\")")
 	rootCmd.AddCommand(functionsCmd)
 

completers/dagger_completer/cmd/run.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bridge/pkg/actions/bridge"
 	"github.com/spf13/cobra"
 )
 
@@ -15,8 +16,13 @@ var runCmd = &cobra.Command{
 
 func init() {
 	carapace.Gen(runCmd).Standalone()
+	runCmd.Flags().SetInterspersed(false)
 
 	runCmd.Flags().String("cleanup-timeout", "", "max duration to wait between SIGTERM and SIGKILL on interrupt")
 	runCmd.Flags().Bool("focus", false, "Only show output for focused commands.")
 	rootCmd.AddCommand(runCmd)
+
+	carapace.Gen(runCmd).PositionalAnyCompletion(
+		bridge.ActionCarapaceBin(),
+	)
 }

completers/gradle_completer/cmd/root.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 	"github.com/rsteube/carapace/pkg/style"
 	"github.com/rsteube/carapace/pkg/util"
 	"github.com/spf13/cobra"
@@ -126,7 +126,7 @@ func ActionTasks() carapace.Action {
 		if buildConfig, err := locateBuildConfig(); err != nil {
 			return "", err
 		} else {
-			return cache.FileChecksum(buildConfig)()
+			return key.FileChecksum(buildConfig)()
 		}
 	})
 }

completers/pulumi_completer/cmd/action/urn.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 	"github.com/spf13/cobra"
 )
 
@@ -47,7 +47,7 @@ func ActionUrns(cmd *cobra.Command) carapace.Action {
 					return "", err
 				}
 
-				return cache.String(absWd, stack)()
+				return key.String(absWd, stack)()
 			},
 		).Invoke(c).ToA()
 	})

completers/sdkmanager_completer/cmd/action/action.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 	"github.com/spf13/cobra"
 )
 
@@ -36,7 +36,7 @@ func ActionAvailablePackages(cmd *cobra.Command) carapace.Action {
 				}
 			}
 			return carapace.ActionValuesDescribed(vals...)
-		}).Cache(1*time.Hour, cache.String(sdk_root, channel))
+		}).Cache(1*time.Hour, key.String(sdk_root, channel))
 	})
 }
 

go.mod

@@ -25,3 +25,5 @@ require (
 )
 
 replace github.com/spf13/pflag => github.com/rsteube/carapace-pflag v0.2.0
+
+replace github.com/rsteube/carapace => ../carapace/

pkg/actions/fs/tar.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 	"github.com/rsteube/carapace/pkg/style"
 )
 
@@ -18,6 +18,6 @@ func ActionTarFileContents(file string) carapace.Action {
 		return carapace.ActionExecCommand("tar", "--list", "--file", file)(func(output []byte) carapace.Action {
 			lines := strings.Split(string(output), "\n")
 			return carapace.ActionValues(lines[:len(lines)-1]...)
-		}).Cache(24*time.Hour, cache.FileStats(file)).Invoke(c).ToMultiPartsA("/").StyleF(style.ForPathExt)
+		}).Cache(24*time.Hour, key.FileStats(file)).Invoke(c).ToMultiPartsA("/").StyleF(style.ForPathExt)
 	})
 }

pkg/actions/tools/dagger/function.go

@@ -1,10 +1,16 @@
 package dagger
 
 import (
+	"encoding/json"
+	"os"
 	"regexp"
 	"strings"
+	"time"
 
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
+	"github.com/spf13/cobra"
 )
 
 // ActionFunctions completes functions
@@ -25,3 +31,104 @@ func ActionFunctions() carapace.Action {
 		return carapace.ActionValuesDescribed(vals...)
 	})
 }
+
+type function struct {
+	Name        string `json:"Name"`
+	Description string `json:"Description"`
+	Args        []struct {
+		Name        string `json:"Name"`
+		Description string `json:"Description"`
+		TypeDef     struct {
+			Kind     string `json:"Kind"`
+			Optional bool   `json:"Optional"`
+			AsObject *struct {
+				Name             string `json:"Name"`
+				Functions        any    `json:"Functions"`
+				Fields           any    `json:"Fields"`
+				Constructor      any    `json:"Constructor"`
+				SourceModuleName string `json:"SourceModuleName"`
+			} `json:"AsObject"`
+			AsInterface any `json:"AsInterface"`
+			AsInput     any `json:"AsInput"`
+			AsList      any `json:"AsList"`
+		} `json:"TypeDef"`
+		DefaultValue string `json:"DefaultValue"`
+	} `json:"Args"`
+}
+
+type daggerFile struct {
+	Name   string
+	Sdk    string
+	Source string
+}
+
+func ActionFunctionsA() carapace.Action {
+	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		content, err := os.ReadFile("dagger.json")
+		if err != nil {
+			return carapace.ActionMessage(err.Error())
+		}
+
+		var d daggerFile
+		if err := json.Unmarshal(content, &d); err != nil {
+			return carapace.ActionMessage(err.Error())
+		}
+
+		output, err := cache.Cache(24*time.Hour, key.FolderStats(d.Source))(func() ([]byte, error) {
+			return c.Command("dagger", "functions", "--json").Output()
+		})
+		if err != nil {
+			return carapace.ActionMessage(err.Error())
+		}
+
+		var functions []function
+		if err := json.Unmarshal(output, &functions); err != nil {
+			return carapace.ActionMessage(err.Error())
+		}
+
+		cmd := &cobra.Command{}
+		carapace.Gen(cmd).Standalone()
+		for _, f := range functions {
+			subCmd := &cobra.Command{
+				Use:   f.Name,
+				Short: f.Description,
+				Run:   func(cmd *cobra.Command, args []string) {},
+			}
+			carapace.Gen(subCmd).Standalone()
+
+			for _, arg := range f.Args {
+				// TODO transform camelcase to kebab
+				switch arg.TypeDef.Kind { // TODO more types
+				case "STRING_KIND", "OBJECT_KIND":
+					subCmd.Flags().String(arg.Name, arg.DefaultValue, arg.Description)
+				default:
+					return carapace.ActionMessage("unknown kind %s", arg.TypeDef.Kind)
+				}
+
+				if arg.TypeDef.Optional {
+					subCmd.Flag(arg.Name).NoOptDefVal = " "
+				}
+
+				localArg := arg
+				carapace.Gen(subCmd).FlagCompletion(carapace.ActionMap{
+					arg.Name: carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+						if localArg.TypeDef.AsObject == nil {
+							return carapace.ActionValues()
+						}
+
+						switch localArg.TypeDef.AsObject.Name { // TODO more
+						case "Directory":
+							return carapace.ActionDirectories()
+						default:
+							return carapace.ActionValues()
+						}
+					}),
+				})
+			}
+
+			cmd.AddCommand(subCmd)
+		}
+
+		return carapace.ActionExecute(cmd)
+	})
+}

pkg/actions/tools/dbt/resource.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 	"github.com/rsteube/carapace/pkg/style"
 	"github.com/rsteube/carapace/pkg/util"
 )
@@ -36,8 +36,8 @@ func (o ResourceOpts) Default() ResourceOpts {
 	return o
 }
 
-func (o ResourceOpts) key() cache.Key {
-	return cache.String(
+func (o ResourceOpts) key() key.Key {
+	return key.String(
 		strconv.FormatBool(o.Analysis),
 		strconv.FormatBool(o.Exposure),
 		strconv.FormatBool(o.Metric),
@@ -118,6 +118,6 @@ func ActionResources(opts ResourceOpts) carapace.Action {
 				}
 			}
 			return carapace.ActionStyledValuesDescribed(vals...)
-		}).Cache(24*time.Hour, opts.key(), cache.FileStats(path)) // TODO opts , manifest.json constantly gets new modification time??
+		}).Cache(24*time.Hour, opts.key(), key.FileStats(path)) // TODO opts , manifest.json constantly gets new modification time??
 	}).Tag("resources")
 }

pkg/actions/tools/gh/gh.go

@@ -1,7 +1,9 @@
 // package gh contains github related actions
 package gh
 
-import "github.com/rsteube/carapace/pkg/cache"
+import (
+	"github.com/rsteube/carapace/pkg/cache/key"
+)
 
 type HostOpts struct {
 	Host string
@@ -27,4 +29,4 @@ type RepoOpts struct {
 	Name  string
 }
 
-func (o RepoOpts) cacheKey() cache.Key { return cache.String(o.Host, o.Owner, o.Name) }
+func (o RepoOpts) cacheKey() key.Key { return key.String(o.Host, o.Owner, o.Name) }

pkg/actions/tools/mvn/project.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 	"github.com/rsteube/carapace/pkg/util"
 )
 
@@ -26,6 +26,6 @@ func ActionProjects(file string) carapace.Action {
 		return carapace.ActionExecCommand("mvn", args...)(func(output []byte) carapace.Action {
 			lines := strings.Split(string(output), "\n")
 			return carapace.ActionValues(lines[:len(lines)-1]...)
-		}).Cache(-1, cache.FileStats(file))
+		}).Cache(-1, key.FileStats(file))
 	})
 }

pkg/actions/tools/youtubedl/youtubedl.go

@@ -7,7 +7,7 @@ import (
 	"time"
 
 	"github.com/rsteube/carapace"
-	"github.com/rsteube/carapace/pkg/cache"
+	"github.com/rsteube/carapace/pkg/cache/key"
 )
 
 // ActionFormats completes formats
@@ -35,7 +35,7 @@ func ActionFormats(url string) carapace.Action {
 				}
 			}
 			return carapace.ActionValuesDescribed(vals...)
-		}).Cache(1*time.Hour, cache.String(c.Args[0]))
+		}).Cache(1*time.Hour, key.String(c.Args[0]))
 	})
 }
 
@@ -64,6 +64,6 @@ func ActionSubLangs(url string) carapace.Action {
 				}
 			}
 			return carapace.ActionValuesDescribed(vals...)
-		}).Cache(1*time.Hour, cache.String(c.Args[0]))
+		}).Cache(1*time.Hour, key.String(c.Args[0]))
 	})
 }