+
+
Your new coding bestie, now available in your favourite terminal.
Your tools, your code, and your workflows, wired into your LLM of choice.
+ { pkgs = import {}; }).repos.charmbracelet.crush'
```
-Note that Crush doesn't support Windows yet, however Windows support is planned and in progress.
+
+
+Nix (NUR)
+ +Crush is available via [NUR](https://github.com/nix-community/NUR) in `nur.repos.charmbracelet.crush`. + +You can also try out Crush via `nix-shell`: + +```bash +# Add the NUR channel. +nix-channel --add https://github.com/nix-community/NUR/archive/main.tar.gz nur +nix-channel --update + +# Get Crush in a Nix shell. +nix-shell -p '(import
+
+
+Debian/Ubuntu
+ +```bash +sudo mkdir -p /etc/apt/keyrings +curl -fsSL https://repo.charm.sh/apt/gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/charm.gpg +echo "deb [signed-by=/etc/apt/keyrings/charm.gpg] https://repo.charm.sh/apt/ * *" | sudo tee /etc/apt/sources.list.d/charm.list +sudo apt update && sudo apt install crush +``` + +
+
+
+Or, download it:
+
+- [Packages][releases] are available in Debian and RPM formats
+- [Binaries][releases] are available for Linux, macOS, Windows, FreeBSD, OpenBSD, and NetBSD
+
+[releases]: https://github.com/charmbracelet/crush/releases
+
+Or just install it with Go:
+
+```
+go install github.com/charmbracelet/crush@latest
+```
+
+> [!WARNING]
+> Productivity may increase when using Crush and you may find yourself nerd
+> sniped when first using the application. If the symptoms persist, join the
+> [Discord][discord] and nerd snipe the rest of us.
## Getting Started
-For now, the quickest way to get started is to set an environment variable for
-your preferred provider. Note that you can switch between providers mid-
-sessions, so you're welcome to set environment variables for multiple
-providers.
+The quickest way to get started is to grab an API key for your preferred
+provider such as Anthropic, OpenAI, Groq, or OpenRouter and just start
+Crush. You'll be prompted to enter your API key.
+
+That said, you can also set environment variables for preferred providers.
| Environment Variable | Provider |
| -------------------------- | -------------------------------------------------- |
| `ANTHROPIC_API_KEY` | Anthropic |
| `OPENAI_API_KEY` | OpenAI |
+| `OPENROUTER_API_KEY` | OpenRouter |
| `GEMINI_API_KEY` | Google Gemini |
| `VERTEXAI_PROJECT` | Google Cloud VertexAI (Gemini) |
| `VERTEXAI_LOCATION` | Google Cloud VertexAI (Gemini) |
@@ -49,20 +128,51 @@ providers.
| `AZURE_OPENAI_API_KEY` | Azure OpenAI models (optional when using Entra ID) |
| `AZURE_OPENAI_API_VERSION` | Azure OpenAI models |
+### By the Way
+
+Is there a provider you’d like to see in Crush? Is there an existing model that needs an update?
+
+Crush’s default model listing is managed in [Catwalk](https://github.com/charmbracelet/catwalk), an community-supported, open source repository of Crush-compatible models, and you’re welcome to contribute.
+
+Fedora/RHEL
+ +```bash +echo '[charm] +name=Charm +baseurl=https://repo.charm.sh/yum/ +enabled=1 +gpgcheck=1 +gpgkey=https://repo.charm.sh/yum/gpg.key' | sudo tee /etc/yum.repos.d/charm.repo +sudo yum install crush +``` + +
+
Charm热爱开源 • Charm loves open source
diff --git a/Taskfile.yaml b/Taskfile.yaml
index 077c994ea7c6ce79fabbc18f76cfb3ef27af8d5e..be2da27fe53087cef2723766821ce90c910c7490 100644
--- a/Taskfile.yaml
+++ b/Taskfile.yaml
@@ -48,5 +48,5 @@ tasks:
schema:
desc: Generate JSON schema for configuration
cmds:
- - go run cmd/schema/main.go > crush-schema.json
- - echo "Generated crush-schema.json"
+ - go run main.go schema > schema.json
+ - echo "Generated schema.json"
diff --git a/cmd/logs.go b/cmd/logs.go
deleted file mode 100644
index d690625de90d8a0f7ec42d366f5d414c21dbebf0..0000000000000000000000000000000000000000
--- a/cmd/logs.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package cmd
-
-import (
- "encoding/json"
- "fmt"
- "os"
- "path/filepath"
- "slices"
- "time"
-
- "github.com/charmbracelet/crush/internal/config"
- "github.com/charmbracelet/log/v2"
- "github.com/nxadm/tail"
- "github.com/spf13/cobra"
-)
-
-func init() {
- rootCmd.AddCommand(logsCmd)
-}
-
-var logsCmd = &cobra.Command{
- Use: "logs",
- Short: "View crush logs",
- Long: `View the logs generated by Crush. This command allows you to see the log output for debugging and monitoring purposes.`,
- RunE: func(cmd *cobra.Command, args []string) error {
- cwd, err := cmd.Flags().GetString("cwd")
- if err != nil {
- return fmt.Errorf("failed to get current working directory: %v", err)
- }
- log.SetLevel(log.DebugLevel)
- cfg, err := config.Load(cwd, false)
- if err != nil {
- return fmt.Errorf("failed to load configuration: %v", err)
- }
- logsFile := filepath.Join(cfg.WorkingDir(), cfg.Options.DataDirectory, "logs", "crush.log")
- _, err = os.Stat(logsFile)
- if os.IsNotExist(err) {
- log.Warn("Looks like you are not in a crush project. No logs found.")
- return nil
- }
- t, err := tail.TailFile(logsFile, tail.Config{Follow: true, ReOpen: true, Logger: tail.DiscardingLogger})
- if err != nil {
- return fmt.Errorf("failed to tail log file: %v", err)
- }
-
- // Print the text of each received line
- for line := range t.Lines {
- var data map[string]any
- if err := json.Unmarshal([]byte(line.Text), &data); err != nil {
- continue
- }
- msg := data["msg"]
- level := data["level"]
- otherData := []any{}
- keys := []string{}
- for k := range data {
- keys = append(keys, k)
- }
- slices.Sort(keys)
- for _, k := range keys {
- switch k {
- case "msg", "level", "time":
- continue
- case "source":
- source, ok := data[k].(map[string]any)
- if !ok {
- continue
- }
- sourceFile := fmt.Sprintf("%s:%d", source["file"], int(source["line"].(float64)))
- otherData = append(otherData, "source", sourceFile)
-
- default:
- otherData = append(otherData, k, data[k])
- }
- }
- log.SetTimeFunction(func(_ time.Time) time.Time {
- // parse the timestamp from the log line if available
- t, err := time.Parse(time.RFC3339, data["time"].(string))
- if err != nil {
- return time.Now() // fallback to current time if parsing fails
- }
- return t
- })
- switch level {
- case "INFO":
- log.Info(msg, otherData...)
- case "DEBUG":
- log.Debug(msg, otherData...)
- case "ERROR":
- log.Error(msg, otherData...)
- case "WARN":
- log.Warn(msg, otherData...)
- default:
- log.Info(msg, otherData...)
- }
- }
- return nil
- },
-}
diff --git a/cmd/root.go b/cmd/root.go
deleted file mode 100644
index 9ae26b993dd1be7374907305ae4cc90036cb05d6..0000000000000000000000000000000000000000
--- a/cmd/root.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package cmd
-
-import (
- "context"
- "fmt"
- "io"
- "log/slog"
- "os"
- "time"
-
- tea "github.com/charmbracelet/bubbletea/v2"
- "github.com/charmbracelet/crush/internal/app"
- "github.com/charmbracelet/crush/internal/config"
- "github.com/charmbracelet/crush/internal/db"
- "github.com/charmbracelet/crush/internal/llm/agent"
- "github.com/charmbracelet/crush/internal/log"
- "github.com/charmbracelet/crush/internal/tui"
- "github.com/charmbracelet/crush/internal/version"
- "github.com/charmbracelet/fang"
- "github.com/charmbracelet/x/term"
- "github.com/spf13/cobra"
-)
-
-var rootCmd = &cobra.Command{
- Use: "crush",
- Short: "Terminal-based AI assistant for software development",
- Long: `Crush is a powerful terminal-based AI assistant that helps with software development tasks.
-It provides an interactive chat interface with AI capabilities, code analysis, and LSP integration
-to assist developers in writing, debugging, and understanding code directly from the terminal.`,
- Example: `
- # Run in interactive mode
- crush
-
- # Run with debug logging
- crush -d
-
- # Run with debug slog.in a specific directory
- crush -d -c /path/to/project
-
- # Print version
- crush -v
-
- # Run a single non-interactive prompt
- crush -p "Explain the use of context in Go"
-
- # Run a single non-interactive prompt with JSON output format
- crush -p "Explain the use of context in Go" -f json
- `,
- RunE: func(cmd *cobra.Command, args []string) error {
- // Load the config
- debug, _ := cmd.Flags().GetBool("debug")
- cwd, _ := cmd.Flags().GetString("cwd")
- prompt, _ := cmd.Flags().GetString("prompt")
- quiet, _ := cmd.Flags().GetBool("quiet")
-
- if cwd != "" {
- err := os.Chdir(cwd)
- if err != nil {
- return fmt.Errorf("failed to change directory: %v", err)
- }
- }
- if cwd == "" {
- c, err := os.Getwd()
- if err != nil {
- return fmt.Errorf("failed to get current working directory: %v", err)
- }
- cwd = c
- }
-
- cfg, err := config.Init(cwd, debug)
- if err != nil {
- return err
- }
-
- ctx := cmd.Context()
-
- // Connect DB, this will also run migrations
- conn, err := db.Connect(ctx, cfg.Options.DataDirectory)
- if err != nil {
- return err
- }
-
- app, err := app.New(ctx, conn, cfg)
- if err != nil {
- slog.Error(fmt.Sprintf("Failed to create app instance: %v", err))
- return err
- }
- // Defer shutdown here so it runs for both interactive and non-interactive modes
- defer app.Shutdown()
-
- // Initialize MCP tools early for both modes
- initMCPTools(ctx, app, cfg)
-
- prompt, err = maybePrependStdin(prompt)
- if err != nil {
- slog.Error(fmt.Sprintf("Failed to read from stdin: %v", err))
- return err
- }
-
- // Non-interactive mode
- if prompt != "" {
- // Run non-interactive flow using the App method
- return app.RunNonInteractive(ctx, prompt, quiet)
- }
-
- // Set up the TUI
- program := tea.NewProgram(
- tui.New(app),
- tea.WithAltScreen(),
- tea.WithKeyReleases(),
- tea.WithUniformKeyLayout(),
- tea.WithMouseCellMotion(), // Use cell motion instead of all motion to reduce event flooding
- tea.WithFilter(tui.MouseEventFilter), // Filter mouse events based on focus state
- )
-
- go app.Subscribe(program)
-
- if _, err := program.Run(); err != nil {
- slog.Error(fmt.Sprintf("TUI run error: %v", err))
- return fmt.Errorf("TUI error: %v", err)
- }
- app.Shutdown()
- return nil
- },
-}
-
-func initMCPTools(ctx context.Context, app *app.App, cfg *config.Config) {
- go func() {
- defer log.RecoverPanic("MCP-goroutine", nil)
-
- // Create a context with timeout for the initial MCP tools fetch
- ctxWithTimeout, cancel := context.WithTimeout(ctx, 30*time.Second)
- defer cancel()
-
- // Set this up once with proper error handling
- agent.GetMcpTools(ctxWithTimeout, app.Permissions, cfg)
- slog.Info("MCP message handling goroutine exiting")
- }()
-}
-
-func Execute() {
- if err := fang.Execute(
- context.Background(),
- rootCmd,
- fang.WithVersion(version.Version),
- fang.WithNotifySignal(os.Interrupt),
- ); err != nil {
- os.Exit(1)
- }
-}
-
-func init() {
- rootCmd.PersistentFlags().StringP("cwd", "c", "", "Current working directory")
-
- rootCmd.Flags().BoolP("help", "h", false, "Help")
- rootCmd.Flags().BoolP("debug", "d", false, "Debug")
- rootCmd.Flags().StringP("prompt", "p", "", "Prompt to run in non-interactive mode")
-
- // Add quiet flag to hide spinner in non-interactive mode
- rootCmd.Flags().BoolP("quiet", "q", false, "Hide spinner in non-interactive mode")
-}
-
-func maybePrependStdin(prompt string) (string, error) {
- if term.IsTerminal(os.Stdin.Fd()) {
- return prompt, nil
- }
- fi, err := os.Stdin.Stat()
- if err != nil {
- return prompt, err
- }
- if fi.Mode()&os.ModeNamedPipe == 0 {
- return prompt, nil
- }
- bts, err := io.ReadAll(os.Stdin)
- if err != nil {
- return prompt, err
- }
- return string(bts) + "\n\n" + prompt, nil
-}
diff --git a/crush.json b/crush.json
index 871fb446260509f306c9b9ded89b9a2243b8b711..ba4dc18bc63381ad4bdbca5470a1527986c74205 100644
--- a/crush.json
+++ b/crush.json
@@ -1,6 +1,7 @@
{
+ "$schema": "https://charm.land/crush.json",
"lsp": {
- "go": {
+ "Go": {
"command": "gopls"
}
}
diff --git a/cspell.json b/cspell.json
index 34247df510135ec19d9129f3cd4f388437454299..713684deb4cf3f066d92b6a71a063df90cddf0fc 100644
--- a/cspell.json
+++ b/cspell.json
@@ -1 +1 @@
-{"words":["afero","alecthomas","bubbletea","charmbracelet","charmtone","Charple","crush","diffview","Emph","filepicker","Focusable","fsext","GROQ","Guac","imageorient","Lanczos","lipgloss","lsps","lucasb","nfnt","oksvg","Preproc","rasterx","rivo","Sourcegraph","srwiley","Strikethrough","termenv","textinput","trashhalo","uniseg","Unticked","genai","jsonschema","preconfigured","jsons","qjebbs","LOCALAPPDATA","USERPROFILE","stretchr","cursorrules","VERTEXAI","VERTEXAI"],"flagWords":[],"language":"en","version":"0.2"}
\ No newline at end of file
+{"flagWords":[],"version":"0.2","language":"en","words":["afero","agentic","alecthomas","anthropics","aymanbagabas","azidentity","bmatcuk","bubbletea","charlievieth","charmbracelet","charmtone","Charple","chkconfig","crush","curlie","cursorrules","diffview","doas","Dockerfiles","doublestar","dpkg","Emph","fastwalk","fdisk","filepicker","Focusable","fseventsd","fsext","genai","goquery","GROQ","Guac","imageorient","Inex","jetta","jsons","jsonschema","jspm","Kaufmann","killall","Lanczos","lipgloss","LOCALAPPDATA","lsps","lucasb","makepkg","mcps","MSYS","mvdan","natefinch","nfnt","noctx","nohup","nolint","nslookup","oksvg","Oneshot","openrouter","opkg","pacman","paru","pfctl","postamble","postambles","preconfigured","Preproc","Proactiveness","Puerkito","pycache","pytest","qjebbs","rasterx","rivo","sabhiram","sess","shortlog","sjson","Sourcegraph","srwiley","SSEMCP","Streamable","stretchr","Strikethrough","substrs","Suscriber","systeminfo","tasklist","termenv","textinput","tidwall","timedout","trashhalo","udiff","uniseg","Unticked","urllib","USERPROFILE","VERTEXAI","webp","whatis","whereis","sahilm","csync"]}
\ No newline at end of file
diff --git a/go.mod b/go.mod
index d510a774a03c27ceca623400257228763cc2e9a1..3749dfdb75209486a80e386547b708b7002e3807 100644
--- a/go.mod
+++ b/go.mod
@@ -2,39 +2,37 @@ module github.com/charmbracelet/crush
go 1.24.3
-replace github.com/charmbracelet/bubbletea/v2 => github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250710185017-3c0ffd25e595
-
-replace github.com/charmbracelet/lipgloss/v2 => github.com/charmbracelet/lipgloss-internal/v2 v2.0.0-20250710185058-03664cb9cecb
-
require (
- github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0
github.com/JohannesKaufmann/html-to-markdown v1.6.0
github.com/MakeNowJust/heredoc v1.0.0
github.com/PuerkitoBio/goquery v1.9.2
- github.com/alecthomas/chroma/v2 v2.15.0
- github.com/anthropics/anthropic-sdk-go v1.4.0
+ github.com/alecthomas/chroma/v2 v2.20.0
+ github.com/anthropics/anthropic-sdk-go v1.6.2
+ github.com/atotto/clipboard v0.1.4
github.com/aymanbagabas/go-udiff v0.3.1
- github.com/bmatcuk/doublestar/v4 v4.8.1
+ github.com/bmatcuk/doublestar/v4 v4.9.1
github.com/charlievieth/fastwalk v1.0.11
- github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198
- github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1
+ github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250716191546-1e2ffbbcf5c5
+ github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.4.0.20250805190305-70e94a2e0b2d
+ github.com/charmbracelet/catwalk v0.4.6
github.com/charmbracelet/fang v0.3.1-0.20250711140230-d5ebb8c1d674
github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe
- github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3
+ github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250721205738-ea66aa652ee0
github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706
- github.com/charmbracelet/x/ansi v0.9.3
+ github.com/charmbracelet/x/ansi v0.10.0
github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3
github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a
github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec
- github.com/fsnotify/fsnotify v1.8.0
+ github.com/fsnotify/fsnotify v1.9.0
github.com/google/uuid v1.6.0
+ github.com/invopop/jsonschema v0.13.0
github.com/joho/godotenv v1.5.1
- github.com/mark3labs/mcp-go v0.33.0
+ github.com/mark3labs/mcp-go v0.37.0
github.com/muesli/termenv v0.16.0
github.com/ncruces/go-sqlite3 v0.25.0
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/nxadm/tail v1.4.11
- github.com/openai/openai-go v1.8.2
+ github.com/openai/openai-go v1.11.1
github.com/pressly/goose/v3 v3.24.2
github.com/qjebbs/go-jsons v0.0.0-20221222033332-a534c5fc1c4c
github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
@@ -44,9 +42,23 @@ require (
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef
github.com/stretchr/testify v1.10.0
github.com/tidwall/sjson v1.2.5
- golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
+ github.com/u-root/u-root v0.14.1-0.20250724181933-b01901710169
+ github.com/zeebo/xxh3 v1.0.2
gopkg.in/natefinch/lumberjack.v2 v2.2.1
- mvdan.cc/sh/v3 v3.11.0
+ mvdan.cc/sh/v3 v3.12.1-0.20250726150758-e256f53bade8
+)
+
+require (
+ cloud.google.com/go/auth/oauth2adapt v0.2.6 // indirect
+ github.com/bahlo/generic-list-go v0.2.0 // indirect
+ github.com/buger/jsonparser v1.1.1 // indirect
+ github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
+ go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 // indirect
+ golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
+ golang.org/x/oauth2 v0.30.0 // indirect
+ golang.org/x/time v0.8.0 // indirect
+ google.golang.org/api v0.211.0 // indirect
)
require (
@@ -55,9 +67,7 @@ require (
cloud.google.com/go/compute/metadata v0.6.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
- github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
- github.com/atotto/clipboard v0.1.4 // indirect
github.com/aws/aws-sdk-go-v2 v1.30.3 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.27.27 // indirect
@@ -75,7 +85,7 @@ require (
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/charmbracelet/colorprofile v0.3.1 // indirect
- github.com/charmbracelet/ultraviolet v0.0.0-20250708152637-0fe0235c8db9 // indirect
+ github.com/charmbracelet/ultraviolet v0.0.0-20250805154935-01be9d7ef65d // indirect
github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa // indirect
github.com/charmbracelet/x/exp/slice v0.0.0-20250611152503-f53cdd7e01ef
github.com/charmbracelet/x/term v0.2.1
@@ -83,13 +93,12 @@ require (
github.com/charmbracelet/x/windows v0.2.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/disintegration/gift v1.1.2 // indirect
- github.com/dlclark/regexp2 v1.11.4 // indirect
+ github.com/dlclark/regexp2 v1.11.5 // indirect
github.com/dustin/go-humanize v1.0.1 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logfmt/logfmt v0.6.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
- github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/s2a-go v0.1.8 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect
@@ -97,7 +106,7 @@ require (
github.com/gorilla/css v1.0.1 // indirect
github.com/gorilla/websocket v1.5.3 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
- github.com/kylelemons/godebug v1.1.0 // indirect
+ github.com/klauspost/cpuid/v2 v2.0.9 // indirect
github.com/lucasb-eyer/go-colorful v1.2.0
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
@@ -109,13 +118,12 @@ require (
github.com/muesli/mango-pflag v0.1.0 // indirect
github.com/muesli/roff v0.1.0 // indirect
github.com/ncruces/julianday v1.0.0 // indirect
- github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rivo/uniseg v0.4.7
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
github.com/sethvargo/go-retry v0.3.0 // indirect
github.com/spf13/cast v1.7.1 // indirect
- github.com/spf13/pflag v1.0.6 // indirect
+ github.com/spf13/pflag v1.0.7 // indirect
github.com/tetratelabs/wazero v1.9.0 // indirect
github.com/tidwall/gjson v1.18.0 // indirect
github.com/tidwall/match v1.1.1 // indirect
@@ -130,13 +138,13 @@ require (
go.opentelemetry.io/otel/metric v1.35.0 // indirect
go.opentelemetry.io/otel/trace v1.35.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
- golang.org/x/crypto v0.37.0 // indirect
+ golang.org/x/crypto v0.38.0 // indirect
golang.org/x/image v0.26.0 // indirect
- golang.org/x/net v0.39.0 // indirect
- golang.org/x/sync v0.15.0 // indirect
- golang.org/x/sys v0.33.0 // indirect
- golang.org/x/term v0.31.0 // indirect
- golang.org/x/text v0.24.0 // indirect
+ golang.org/x/net v0.40.0 // indirect
+ golang.org/x/sync v0.16.0 // indirect
+ golang.org/x/sys v0.34.0
+ golang.org/x/term v0.32.0 // indirect
+ golang.org/x/text v0.27.0
google.golang.org/genai v1.3.0
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 // indirect
google.golang.org/grpc v1.71.0 // indirect
diff --git a/go.sum b/go.sum
index d7004401154b86ce0658162c06bfc610a0c77126..07607afea2b6ea6392d2767f17bd70f90df5f23c 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U=
cloud.google.com/go/auth v0.13.0 h1:8Fu8TZy167JkW8Tj3q7dIkr2v4cndv41ouecJx0PAHs=
cloud.google.com/go/auth v0.13.0/go.mod h1:COOjD9gwfKNKz+IIduatIhYJQIc0mG3H102r/EMxX6Q=
+cloud.google.com/go/auth/oauth2adapt v0.2.6 h1:V6a6XDu2lTwPZWOawrAa9HUK+DB2zfJyTuciBG5hFkU=
+cloud.google.com/go/auth/oauth2adapt v0.2.6/go.mod h1:AlmsELtlEBnaNTL7jCj8VQFLy6mbZv0s4Q7NGBeQ5E8=
cloud.google.com/go/compute/metadata v0.6.0 h1:A6hENjEsCDtC1k8byVsgwvVcioamEHvZ4j01OwKxG9I=
cloud.google.com/go/compute/metadata v0.6.0/go.mod h1:FjyFAW1MW0C203CEOMDTu3Dk1FlqW3Rga40jzHL4hfg=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 h1:g0EZJwz7xkXQiZAI5xi9f3WWFYBlX1CPTrR+NDToRkQ=
@@ -20,14 +22,14 @@ github.com/PuerkitoBio/goquery v1.9.2 h1:4/wZksC3KgkQw7SQgkKotmKljk0M6V8TUvA8Wb4
github.com/PuerkitoBio/goquery v1.9.2/go.mod h1:GHPCaP0ODyyxqcNoFGYlAprUFH81NuRPd0GX3Zu2Mvk=
github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
-github.com/alecthomas/chroma/v2 v2.15.0 h1:LxXTQHFoYrstG2nnV9y2X5O94sOBzf0CIUpSTbpxvMc=
-github.com/alecthomas/chroma/v2 v2.15.0/go.mod h1:gUhVLrPDXPtp/f+L1jo9xepo9gL4eLwRuGAunSZMkio=
-github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
-github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
+github.com/alecthomas/chroma/v2 v2.20.0 h1:sfIHpxPyR07/Oylvmcai3X/exDlE8+FA820NTz+9sGw=
+github.com/alecthomas/chroma/v2 v2.20.0/go.mod h1:e7tViK0xh/Nf4BYHl00ycY6rV7b8iXBksI9E359yNmA=
+github.com/alecthomas/repr v0.5.1 h1:E3G4t2QbHTSNpPKBgMTln5KLkZHLOcU7r37J4pXBuIg=
+github.com/alecthomas/repr v0.5.1/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
github.com/andybalholm/cascadia v1.3.2 h1:3Xi6Dw5lHF15JtdcmAHD3i1+T8plmv7BQ/nsViSLyss=
github.com/andybalholm/cascadia v1.3.2/go.mod h1:7gtRlve5FxPPgIgX36uWBX58OdBsSS6lUvCFb+h7KvU=
-github.com/anthropics/anthropic-sdk-go v1.4.0 h1:fU1jKxYbQdQDiEXCxeW5XZRIOwKevn/PMg8Ay1nnUx0=
-github.com/anthropics/anthropic-sdk-go v1.4.0/go.mod h1:AapDW22irxK2PSumZiQXYUFvsdQgkwIWlpESweWZI/c=
+github.com/anthropics/anthropic-sdk-go v1.6.2 h1:oORA212y0/zAxe7OPvdgIbflnn/x5PGk5uwjF60GqXM=
+github.com/anthropics/anthropic-sdk-go v1.6.2/go.mod h1:3qSNQ5NrAmjC8A2ykuruSQttfqfdEYNZY5o8c0XSHB8=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
github.com/aws/aws-sdk-go-v2 v1.30.3 h1:jUeBtG0Ih+ZIFH0F4UkmL9w3cSpaMv9tYYDbzILP8dY=
@@ -64,28 +66,34 @@ github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3v
github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
-github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
-github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
+github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
+github.com/bmatcuk/doublestar/v4 v4.9.1 h1:X8jg9rRZmJd4yRy7ZeNDRnM+T3ZfHv15JiBJ/avrEXE=
+github.com/bmatcuk/doublestar/v4 v4.9.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/buger/jsonparser v1.1.1 h1:2PnMjfWD7wBILjqQbt530v576A/cAbQvEW9gGIpYMUs=
+github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/charlievieth/fastwalk v1.0.11 h1:5sLT/q9+d9xMdpKExawLppqvXFZCVKf6JHnr2u/ufj8=
github.com/charlievieth/fastwalk v1.0.11/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=
-github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198 h1:CkMS9Ah9ac1Ego5JDC5NJyZyAAqu23Z+O0yDwsa3IxM=
-github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=
-github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250710185017-3c0ffd25e595 h1:wLMjzOqrwoM7Em9UR9sGbn4375G8WuxcwFB3kjZiqHo=
-github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250710185017-3c0ffd25e595/go.mod h1:+Tl7rePElw6OKt382t04zXwtPFoPXxAaJzNrYmtsLds=
+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250716191546-1e2ffbbcf5c5 h1:GTcMIfDQJKyNKS+xVt7GkNIwz+tBuQtIuiP50WpzNgs=
+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250716191546-1e2ffbbcf5c5/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=
+github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.4.0.20250805190305-70e94a2e0b2d h1:1C2whi5rgs+APtsQDE4riA+W5neYaMNY+Y+5o6J/rDU=
+github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.4.0.20250805190305-70e94a2e0b2d/go.mod h1:XIQ1qQfRph6Z5o2EikCydjumo0oDInQySRHuPATzbZc=
+github.com/charmbracelet/catwalk v0.4.6 h1:Y0JDq5V4agK8oO3lKC/hhInrYXePGwZPNo8I1Lk08jc=
+github.com/charmbracelet/catwalk v0.4.6/go.mod h1:WnKgNPmQHuMyk7GtwAQwl+ezHusfH40IvzML2qwUGwc=
github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
github.com/charmbracelet/fang v0.3.1-0.20250711140230-d5ebb8c1d674 h1:+Cz+VfxD5DO+JT1LlswXWhre0HYLj6l2HW8HVGfMuC0=
github.com/charmbracelet/fang v0.3.1-0.20250711140230-d5ebb8c1d674/go.mod h1:9gCUAHmVx5BwSafeyNr3GI0GgvlB1WYjL21SkPp1jyU=
github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe h1:i6ce4CcAlPpTj2ER69m1DBeLZ3RRcHnKExuwhKa3GfY=
github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe/go.mod h1:p3Q+aN4eQKeM5jhrmXPMgPrlKbmc59rWSnMsSA3udhk=
-github.com/charmbracelet/lipgloss-internal/v2 v2.0.0-20250710185058-03664cb9cecb h1:lswj7CYZVYbLn2OhYJsXOMRQQGdRIfyuSnh5FdVSMr0=
-github.com/charmbracelet/lipgloss-internal/v2 v2.0.0-20250710185058-03664cb9cecb/go.mod h1:wEc/TRrTAIDJYjVCg3+y8WeKaN+F88gpYfGbUuP6W3A=
+github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250721205738-ea66aa652ee0 h1:sWRGoSw/JsO2S4t2+fmmEkRbkOxphI0AxZkQPQVKWbs=
+github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250721205738-ea66aa652ee0/go.mod h1:XIuqKpZTUXtVyeyiN1k9Tc/U7EzfaDnVc34feFHfBws=
github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 h1:WkwO6Ks3mSIGnGuSdKl9qDSyfbYK50z2wc2gGMggegE=
github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706/go.mod h1:mjJGp00cxcfvD5xdCa+bso251Jt4owrQvuimJtVmEmM=
-github.com/charmbracelet/ultraviolet v0.0.0-20250708152637-0fe0235c8db9 h1:+LLFCLxtb/sHegwY3zYdFAbaOgI/I9pv/pxdUlI1Q9s=
-github.com/charmbracelet/ultraviolet v0.0.0-20250708152637-0fe0235c8db9/go.mod h1:/O+B00+dYG6lqRAWIaNxSvywnDrIH6dmLYQAsH0LRTg=
-github.com/charmbracelet/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0=
-github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
+github.com/charmbracelet/ultraviolet v0.0.0-20250805154935-01be9d7ef65d h1:miSXsyi0ARm35O+DulTdaLYoUioWdGkoBfFoIhdqpCA=
+github.com/charmbracelet/ultraviolet v0.0.0-20250805154935-01be9d7ef65d/go.mod h1:XrrgNFfXLrFAyd9DUmrqVc3yQFVv8Uk+okj4PsNNzpc=
+github.com/charmbracelet/x/ansi v0.10.0 h1:jnOP9pFxY6/gw5nYjkpi6f17K0P/sN4fqT0Y1ioaORI=
+github.com/charmbracelet/x/ansi v0.10.0/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa h1:lphz0Z3rsiOtMYiz8axkT24i9yFiueDhJbzyNUADmME=
github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa/go.mod h1:xBlh2Yi3DL3zy/2n15kITpg0YZardf/aa/hgUaIM6Rk=
github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3 h1:1xwHZg6eMZ9Wv5TE1UGub6ARubyOd1Lo5kPUI/6VL50=
@@ -110,8 +118,8 @@ github.com/disintegration/gift v1.1.2 h1:9ZyHJr+kPamiH10FX3Pynt1AxFUob812bU9Wt4G
github.com/disintegration/gift v1.1.2/go.mod h1:Jh2i7f7Q2BM7Ezno3PhfezbR1xpUg9dUg3/RlKGr4HI=
github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec h1:YrB6aVr9touOt75I9O1SiancmR2GMg45U9UYf0gtgWg=
github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec/go.mod h1:K0KBFIr1gWu/C1Gp10nFAcAE4hsB7JxE6OgLijrJ8Sk=
-github.com/dlclark/regexp2 v1.11.4 h1:rPYF9/LECdNymJufQKmri9gV604RvvABwgOA8un7yAo=
-github.com/dlclark/regexp2 v1.11.4/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
+github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -119,8 +127,8 @@ github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSw
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
-github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
-github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
github.com/go-logfmt/logfmt v0.6.0 h1:wGYYu3uicYdqXVgoYbvnkrPVXkuLM1p1ifugDMEdRi4=
github.com/go-logfmt/logfmt v0.6.0/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs=
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
@@ -152,8 +160,13 @@ github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUq
github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/invopop/jsonschema v0.13.0 h1:KvpoAJWEjR3uD9Kbm2HWJmqsEaHt8lBUpd0qHcIi21E=
+github.com/invopop/jsonschema v0.13.0/go.mod h1:ffZ5Km5SWWRAIN6wbDXItl95euhFz2uON45H2qjYt+0=
github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
+github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
@@ -165,8 +178,10 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mark3labs/mcp-go v0.33.0 h1:naxhjnTIs/tyPZmWUZFuG0lDmdA6sUyYGGf3gsHvTCc=
-github.com/mark3labs/mcp-go v0.33.0/go.mod h1:rXqOudj/djTORU/ThxYx8fqEVj/5pvTuuebQ2RC7uk4=
+github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mark3labs/mcp-go v0.37.0 h1:BywvZLPRT6Zx6mMG/MJfxLSZQkTGIcJSEGKsvr4DsoQ=
+github.com/mark3labs/mcp-go v0.37.0/go.mod h1:T7tUa2jO6MavG+3P25Oy/jR7iCeJPHImCZHRymCn39g=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
@@ -197,8 +212,8 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
-github.com/openai/openai-go v1.8.2 h1:UqSkJ1vCOPUpz9Ka5tS0324EJFEuOvMc+lA/EarJWP8=
-github.com/openai/openai-go v1.8.2/go.mod h1:g461MYGXEXBVdV5SaR/5tNzNbSfwTBBefwc+LlDCK0Y=
+github.com/openai/openai-go v1.11.1 h1:fTQ4Sr9eoRiWFAoHzXiZZpVi6KtLeoTMyGrcOCudjNU=
+github.com/openai/openai-go v1.11.1/go.mod h1:g461MYGXEXBVdV5SaR/5tNzNbSfwTBBefwc+LlDCK0Y=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -232,8 +247,9 @@ github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
-github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/pflag v1.0.7 h1:vN6T9TfwStFPFM5XzjsvmzZkLuaLX+HS+0SeFLRgU6M=
+github.com/spf13/pflag v1.0.7/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c h1:km8GpoQut05eY3GiYWEedbTT0qnSxrCjsVbb7yKY1KE=
github.com/srwiley/oksvg v0.0.0-20221011165216-be6e8873101c/go.mod h1:cNQ3dwVJtS5Hmnjxy6AgTPd0Inb3pW05ftPSX7NZO7Q=
github.com/srwiley/rasterx v0.0.0-20220730225603-2ab79fcdd4ef h1:Ch6Q+AZUxDBCVqdkI8FSpFyZDtCVBc2VmejdNrm5rRQ=
@@ -256,6 +272,10 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
+github.com/u-root/u-root v0.14.1-0.20250724181933-b01901710169 h1:f4cp2yGKkMuGpCwAyNEjzcw8szgVXmemK/wfOu4l5gc=
+github.com/u-root/u-root v0.14.1-0.20250724181933-b01901710169/go.mod h1:/0Qr7qJeDwWxoKku2xKQ4Szc+SwBE3g9VE8jNiamsmc=
+github.com/wk8/go-ordered-map/v2 v2.1.8 h1:5h/BUHu93oj4gIdvHHHGsScSTMijfx5PeYkE/fJgbpc=
+github.com/wk8/go-ordered-map/v2 v2.1.8/go.mod h1:5nJHM5DyteebpVlHnWMV0rPz6Zp7+xBAnxjb1X5vnTw=
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no=
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
@@ -266,8 +286,14 @@ github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
github.com/yuin/goldmark-emoji v1.0.5 h1:EMVWyCGPlXJfUXBXpuMu+ii3TIaxbVBnEX9uaDC4cIk=
github.com/yuin/goldmark-emoji v1.0.5/go.mod h1:tTkZEbwu5wkPmgTcitqddVxY9osFZiavD+r4AzQrh1U=
+github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
+github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
+github.com/zeebo/xxh3 v1.0.2 h1:xZmwmqxHZA8AI603jOQ0tMqmBr9lPeFwGg6d+xy9DC0=
+github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaDcA=
go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0 h1:r6I7RJCN86bpD/FQwedZ0vSixDpwuWREjW9oRMsmqDc=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.54.0/go.mod h1:B9yO6b04uB80CzjedvewuqDhxJxi11s7/GtiGa8bAjI=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0 h1:TT4fX+nBOA/+LUkobKGW1ydGcn+G3vRw9+g5HwCphpk=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.54.0/go.mod h1:L7UH0GbB0p47T4Rri3uHjbpCFYrVrwc1I25QhNPiGK8=
go.opentelemetry.io/otel v1.35.0 h1:xKWKPxrxB6OtMCbmMY021CqC45J+3Onta9MqjhnusiQ=
@@ -287,8 +313,8 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
golang.org/x/crypto v0.22.0/go.mod h1:vr6Su+7cTlO45qkww3VDJlzDn0ctJvRgYbC2NvXHt+M=
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
-golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
-golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
+golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 h1:nDVHiLt8aIbd/VzvPWN6kSOPE7+F/fNFDSXLVYkE/Iw=
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394/go.mod h1:sIifuuw/Yco/y6yb6+bDNfyeQ/MdPUy/hKEMYQV17cM=
golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
@@ -304,20 +330,21 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
golang.org/x/net v0.24.0/go.mod h1:2Q7sJY5mzlzWjKtYUEXSlBWCdyaioyXzRB2RtU8KVE8=
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
-golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
-golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
+golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
+golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
-golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
+golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -325,8 +352,8 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
+golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -335,8 +362,8 @@ golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
golang.org/x/term v0.19.0/go.mod h1:2CuTdWZ7KHSQwUzKva0cbMg6q2DMI3Mmxp+gKJbskEk=
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
-golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
-golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
+golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
@@ -344,13 +371,17 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
-golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
+golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg=
+golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/api v0.211.0 h1:IUpLjq09jxBSV1lACO33CGY3jsRcbctfGzhj+ZSE/Bg=
+google.golang.org/api v0.211.0/go.mod h1:XOloB4MXFH4UTlQSGuNUxw0UT74qdENK8d6JNsXKLi0=
google.golang.org/genai v1.3.0 h1:tXhPJF30skOjnnDY7ZnjK3q7IKy4PuAlEA0fk7uEaEI=
google.golang.org/genai v1.3.0/go.mod h1:TyfOKRz/QyCaj6f/ZDt505x+YreXnY40l2I6k8TvgqY=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250324211829-b45e905df463 h1:e0AIkUUhxyBKh6ssZNrAMeqhA7RKUj42346d1y02i2g=
@@ -381,5 +412,5 @@ modernc.org/memory v1.9.1 h1:V/Z1solwAVmMW1yttq3nDdZPJqV1rM05Ccq6KMSZ34g=
modernc.org/memory v1.9.1/go.mod h1:/JP4VbVC+K5sU2wZi9bHoq2MAkCnrt2r98UGeSK7Mjw=
modernc.org/sqlite v1.36.2 h1:vjcSazuoFve9Wm0IVNHgmJECoOXLZM1KfMXbcX2axHA=
modernc.org/sqlite v1.36.2/go.mod h1:ADySlx7K4FdY5MaJcEv86hTJ0PjedAloTUuif0YS3ws=
-mvdan.cc/sh/v3 v3.11.0 h1:q5h+XMDRfUGUedCqFFsjoFjrhwf2Mvtt1rkMvVz0blw=
-mvdan.cc/sh/v3 v3.11.0/go.mod h1:LRM+1NjoYCzuq/WZ6y44x14YNAI0NK7FLPeQSaFagGg=
+mvdan.cc/sh/v3 v3.12.1-0.20250726150758-e256f53bade8 h1:yOKqXg3uKDx7VxqnrKRUzB+InP3whTBi7jeggyFkfX0=
+mvdan.cc/sh/v3 v3.12.1-0.20250726150758-e256f53bade8/go.mod h1:Se6Cj17eYSn+sNooLZiEUnNNmNxg0imoYlTu4CyaGyg=
diff --git a/internal/ansiext/ansi.go b/internal/ansiext/ansi.go
new file mode 100644
index 0000000000000000000000000000000000000000..4ec76a70ebf6f4edd963e1542ec83eaa09bd8ebf
--- /dev/null
+++ b/internal/ansiext/ansi.go
@@ -0,0 +1,25 @@
+package ansiext
+
+import (
+ "strings"
+
+ "github.com/charmbracelet/x/ansi"
+)
+
+// Escape replaces control characters with their Unicode Control Picture
+// representations to ensure they are displayed correctly in the UI.
+func Escape(content string) string {
+ var sb strings.Builder
+ sb.Grow(len(content))
+ for _, r := range content {
+ switch {
+ case r >= 0 && r <= 0x1f: // Control characters 0x00-0x1F
+ sb.WriteRune('\u2400' + r)
+ case r == ansi.DEL:
+ sb.WriteRune('\u2421')
+ default:
+ sb.WriteRune(r)
+ }
+ }
+ return sb.String()
+}
diff --git a/internal/app/app.go b/internal/app/app.go
index c3dae3d88a2be7c4cd5491e089b97695b08a7a23..c8f6fe75ed2db719fa7ace6d9507f46fd2b441f3 100644
--- a/internal/app/app.go
+++ b/internal/app/app.go
@@ -12,6 +12,7 @@ import (
tea "github.com/charmbracelet/bubbletea/v2"
"github.com/charmbracelet/crush/internal/config"
+ "github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/db"
"github.com/charmbracelet/crush/internal/format"
"github.com/charmbracelet/crush/internal/history"
@@ -37,8 +38,7 @@ type App struct {
clientsMutex sync.RWMutex
- watcherCancelFuncs []context.CancelFunc
- cancelFuncsMutex sync.Mutex
+ watcherCancelFuncs *csync.Slice[context.CancelFunc]
lspWatcherWG sync.WaitGroup
config *config.Config
@@ -53,23 +53,31 @@ type App struct {
cleanupFuncs []func()
}
+// New initializes a new applcation instance.
func New(ctx context.Context, conn *sql.DB, cfg *config.Config) (*App, error) {
q := db.New(conn)
sessions := session.NewService(q)
messages := message.NewService(q)
files := history.NewService(q, conn)
+ skipPermissionsRequests := cfg.Permissions != nil && cfg.Permissions.SkipRequests
+ allowedTools := []string{}
+ if cfg.Permissions != nil && cfg.Permissions.AllowedTools != nil {
+ allowedTools = cfg.Permissions.AllowedTools
+ }
app := &App{
Sessions: sessions,
Messages: messages,
History: files,
- Permissions: permission.NewPermissionService(cfg.WorkingDir()),
+ Permissions: permission.NewPermissionService(cfg.WorkingDir(), skipPermissionsRequests, allowedTools),
LSPClients: make(map[string]*lsp.Client),
globalCtx: ctx,
config: cfg,
+ watcherCancelFuncs: csync.NewSlice[context.CancelFunc](),
+
events: make(chan tea.Msg, 100),
serviceEventsWG: &sync.WaitGroup{},
tuiWG: &sync.WaitGroup{},
@@ -77,10 +85,10 @@ func New(ctx context.Context, conn *sql.DB, cfg *config.Config) (*App, error) {
app.setupEvents()
- // Initialize LSP clients in the background
- go app.initLSPClients(ctx)
+ // Initialize LSP clients in the background.
+ app.initLSPClients(ctx)
- // TODO: remove the concept of agent config most likely
+ // TODO: remove the concept of agent config, most likely.
if cfg.IsConfigured() {
if err := app.InitCoderAgent(); err != nil {
return nil, fmt.Errorf("failed to initialize coder agent: %w", err)
@@ -91,20 +99,27 @@ func New(ctx context.Context, conn *sql.DB, cfg *config.Config) (*App, error) {
return app, nil
}
-// RunNonInteractive handles the execution flow when a prompt is provided via CLI flag.
-func (a *App) RunNonInteractive(ctx context.Context, prompt string, quiet bool) error {
+// Config returns the application configuration.
+func (app *App) Config() *config.Config {
+ return app.config
+}
+
+// RunNonInteractive handles the execution flow when a prompt is provided via
+// CLI flag.
+func (app *App) RunNonInteractive(ctx context.Context, prompt string, quiet bool) error {
slog.Info("Running in non-interactive mode")
ctx, cancel := context.WithCancel(ctx)
defer cancel()
- // Start spinner if not in quiet mode
+ // Start spinner if not in quiet mode.
var spinner *format.Spinner
if !quiet {
spinner = format.NewSpinner(ctx, cancel, "Generating")
spinner.Start()
}
- // Helper function to stop spinner once
+
+ // Helper function to stop spinner once.
stopSpinner := func() {
if !quiet && spinner != nil {
spinner.Stop()
@@ -124,21 +139,21 @@ func (a *App) RunNonInteractive(ctx context.Context, prompt string, quiet bool)
}
title := titlePrefix + titleSuffix
- sess, err := a.Sessions.Create(ctx, title)
+ sess, err := app.Sessions.Create(ctx, title)
if err != nil {
return fmt.Errorf("failed to create session for non-interactive mode: %w", err)
}
slog.Info("Created session for non-interactive run", "session_id", sess.ID)
// Automatically approve all permission requests for this non-interactive session
- a.Permissions.AutoApproveSession(sess.ID)
+ app.Permissions.AutoApproveSession(sess.ID)
- done, err := a.CoderAgent.Run(ctx, sess.ID, prompt)
+ done, err := app.CoderAgent.Run(ctx, sess.ID, prompt)
if err != nil {
return fmt.Errorf("failed to start agent processing stream: %w", err)
}
- messageEvents := a.Messages.Subscribe(ctx)
+ messageEvents := app.Messages.Subscribe(ctx)
readBts := 0
for {
@@ -148,16 +163,20 @@ func (a *App) RunNonInteractive(ctx context.Context, prompt string, quiet bool)
if result.Error != nil {
if errors.Is(result.Error, context.Canceled) || errors.Is(result.Error, agent.ErrRequestCancelled) {
- slog.Info("Agent processing cancelled", "session_id", sess.ID)
+ slog.Info("Non-interactive: agent processing cancelled", "session_id", sess.ID)
return nil
}
return fmt.Errorf("agent processing failed: %w", result.Error)
}
- part := result.Message.Content().String()[readBts:]
- fmt.Println(part)
+ msgContent := result.Message.Content().String()
+ if len(msgContent) < readBts {
+ slog.Error("Non-interactive: message content is shorter than read bytes", "message_length", len(msgContent), "read_bytes", readBts)
+ return fmt.Errorf("message content is shorter than read bytes: %d < %d", len(msgContent), readBts)
+ }
+ fmt.Println(msgContent[readBts:])
- slog.Info("Non-interactive run completed", "session_id", sess.ID)
+ slog.Info("Non-interactive: run completed", "session_id", sess.ID)
return nil
case event := <-messageEvents:
@@ -186,7 +205,10 @@ func (app *App) setupEvents() {
setupSubscriber(ctx, app.serviceEventsWG, "sessions", app.Sessions.Subscribe, app.events)
setupSubscriber(ctx, app.serviceEventsWG, "messages", app.Messages.Subscribe, app.events)
setupSubscriber(ctx, app.serviceEventsWG, "permissions", app.Permissions.Subscribe, app.events)
+ setupSubscriber(ctx, app.serviceEventsWG, "permissions-notifications", app.Permissions.SubscribeNotifications, app.events)
setupSubscriber(ctx, app.serviceEventsWG, "history", app.History.Subscribe, app.events)
+ setupSubscriber(ctx, app.serviceEventsWG, "mcp", agent.SubscribeMCPEvents, app.events)
+ setupSubscriber(ctx, app.serviceEventsWG, "lsp", SubscribeLSPEvents, app.events)
cleanupFunc := func() {
cancel()
app.serviceEventsWG.Wait()
@@ -236,6 +258,7 @@ func (app *App) InitCoderAgent() error {
}
var err error
app.CoderAgent, err = agent.NewAgent(
+ app.globalCtx,
coderAgentCfg,
app.Permissions,
app.Sessions,
@@ -247,13 +270,18 @@ func (app *App) InitCoderAgent() error {
slog.Error("Failed to create coder agent", "err", err)
return err
}
+
+ // Add MCP client cleanup to shutdown process
+ app.cleanupFuncs = append(app.cleanupFuncs, agent.CloseMCPClients)
+
setupSubscriber(app.eventsCtx, app.serviceEventsWG, "coderAgent", app.CoderAgent.Subscribe, app.events)
return nil
}
+// Subscribe sends events to the TUI as tea.Msgs.
func (app *App) Subscribe(program *tea.Program) {
defer log.RecoverPanic("app.Subscribe", func() {
- slog.Info("TUI subscription panic - attempting graceful shutdown")
+ slog.Info("TUI subscription panic: attempting graceful shutdown")
program.Quit()
})
@@ -265,6 +293,7 @@ func (app *App) Subscribe(program *tea.Program) {
app.tuiWG.Wait()
})
defer app.tuiWG.Done()
+
for {
select {
case <-tuiCtx.Done():
@@ -280,20 +309,26 @@ func (app *App) Subscribe(program *tea.Program) {
}
}
-// Shutdown performs a clean shutdown of the application
+// Shutdown performs a graceful shutdown of the application.
func (app *App) Shutdown() {
- app.cancelFuncsMutex.Lock()
- for _, cancel := range app.watcherCancelFuncs {
+ if app.CoderAgent != nil {
+ app.CoderAgent.CancelAll()
+ }
+
+ for cancel := range app.watcherCancelFuncs.Seq() {
cancel()
}
- app.cancelFuncsMutex.Unlock()
+
+ // Wait for all LSP watchers to finish.
app.lspWatcherWG.Wait()
+ // Get all LSP clients.
app.clientsMutex.RLock()
clients := make(map[string]*lsp.Client, len(app.LSPClients))
maps.Copy(clients, app.LSPClients)
app.clientsMutex.RUnlock()
+ // Shutdown all LSP clients.
for name, client := range clients {
shutdownCtx, cancel := context.WithTimeout(app.globalCtx, 5*time.Second)
if err := client.Shutdown(shutdownCtx); err != nil {
@@ -301,10 +336,8 @@ func (app *App) Shutdown() {
}
cancel()
}
- if app.CoderAgent != nil {
- app.CoderAgent.CancelAll()
- }
+ // Call call cleanup functions.
for _, cleanup := range app.cleanupFuncs {
if cleanup != nil {
cleanup()
diff --git a/internal/app/lsp.go b/internal/app/lsp.go
index 33506016690645dd714c682ddd2e65e992d2d1f9..e5b16d3c5e8efb4f7569e426bda6e30dceb127c5 100644
--- a/internal/app/lsp.go
+++ b/internal/app/lsp.go
@@ -10,10 +10,9 @@ import (
"github.com/charmbracelet/crush/internal/lsp/watcher"
)
+// initLSPClients initializes LSP clients.
func (app *App) initLSPClients(ctx context.Context) {
- // Initialize LSP clients
for name, clientConfig := range app.config.LSP {
- // Start each client initialization in its own goroutine
go app.createAndStartLSPClient(ctx, name, clientConfig.Command, clientConfig.Args...)
}
slog.Info("LSP clients initialization started in background")
@@ -21,68 +20,76 @@ func (app *App) initLSPClients(ctx context.Context) {
// createAndStartLSPClient creates a new LSP client, initializes it, and starts its workspace watcher
func (app *App) createAndStartLSPClient(ctx context.Context, name string, command string, args ...string) {
- // Create a specific context for initialization with a timeout
slog.Info("Creating LSP client", "name", name, "command", command, "args", args)
- // Create the LSP client
- lspClient, err := lsp.NewClient(ctx, command, args...)
+ // Update state to starting
+ updateLSPState(name, lsp.StateStarting, nil, nil, 0)
+
+ // Create LSP client.
+ lspClient, err := lsp.NewClient(ctx, name, command, args...)
if err != nil {
slog.Error("Failed to create LSP client for", name, err)
+ updateLSPState(name, lsp.StateError, err, nil, 0)
return
}
- // Create a longer timeout for initialization (some servers take time to start)
+ // Set diagnostics callback
+ lspClient.SetDiagnosticsCallback(updateLSPDiagnostics)
+
+ // Increase initialization timeout as some servers take more time to start.
initCtx, cancel := context.WithTimeout(ctx, 30*time.Second)
defer cancel()
- // Initialize with the initialization context
+ // Initialize LSP client.
_, err = lspClient.InitializeLSPClient(initCtx, app.config.WorkingDir())
if err != nil {
slog.Error("Initialize failed", "name", name, "error", err)
- // Clean up the client to prevent resource leaks
+ updateLSPState(name, lsp.StateError, err, lspClient, 0)
lspClient.Close()
return
}
- // Wait for the server to be ready
+ // Wait for the server to be ready.
if err := lspClient.WaitForServerReady(initCtx); err != nil {
slog.Error("Server failed to become ready", "name", name, "error", err)
- // We'll continue anyway, as some functionality might still work
+ // Server never reached a ready state, but let's continue anyway, as
+ // some functionality might still work.
lspClient.SetServerState(lsp.StateError)
+ updateLSPState(name, lsp.StateError, err, lspClient, 0)
} else {
+ // Server reached a ready state scuccessfully.
slog.Info("LSP server is ready", "name", name)
lspClient.SetServerState(lsp.StateReady)
+ updateLSPState(name, lsp.StateReady, nil, lspClient, 0)
}
slog.Info("LSP client initialized", "name", name)
- // Create a child context that can be canceled when the app is shutting down
+ // Create a child context that can be canceled when the app is shutting
+ // down.
watchCtx, cancelFunc := context.WithCancel(ctx)
- // Create the workspace watcher
+ // Create the workspace watcher.
workspaceWatcher := watcher.NewWorkspaceWatcher(name, lspClient)
- // Store the cancel function to be called during cleanup
- app.cancelFuncsMutex.Lock()
- app.watcherCancelFuncs = append(app.watcherCancelFuncs, cancelFunc)
- app.cancelFuncsMutex.Unlock()
-
- // Add the watcher to a WaitGroup to track active goroutines
- app.lspWatcherWG.Add(1)
+ // Store the cancel function to be called during cleanup.
+ app.watcherCancelFuncs.Append(cancelFunc)
// Add to map with mutex protection before starting goroutine
app.clientsMutex.Lock()
app.LSPClients[name] = lspClient
app.clientsMutex.Unlock()
+ // Run workspace watcher.
+ app.lspWatcherWG.Add(1)
go app.runWorkspaceWatcher(watchCtx, name, workspaceWatcher)
}
-// runWorkspaceWatcher executes the workspace watcher for an LSP client
+// runWorkspaceWatcher executes the workspace watcher for an LSP client.
func (app *App) runWorkspaceWatcher(ctx context.Context, name string, workspaceWatcher *watcher.WorkspaceWatcher) {
defer app.lspWatcherWG.Done()
defer log.RecoverPanic("LSP-"+name, func() {
- // Try to restart the client
+ // Try to restart the client.
app.restartLSPClient(ctx, name)
})
@@ -90,31 +97,32 @@ func (app *App) runWorkspaceWatcher(ctx context.Context, name string, workspaceW
slog.Info("Workspace watcher stopped", "client", name)
}
-// restartLSPClient attempts to restart a crashed or failed LSP client
+// restartLSPClient attempts to restart a crashed or failed LSP client.
func (app *App) restartLSPClient(ctx context.Context, name string) {
- // Get the original configuration
+ // Get the original configuration.
clientConfig, exists := app.config.LSP[name]
if !exists {
slog.Error("Cannot restart client, configuration not found", "client", name)
return
}
- // Clean up the old client if it exists
+ // Clean up the old client if it exists.
app.clientsMutex.Lock()
oldClient, exists := app.LSPClients[name]
if exists {
- delete(app.LSPClients, name) // Remove from map before potentially slow shutdown
+ // Remove from map before potentially slow shutdown.
+ delete(app.LSPClients, name)
}
app.clientsMutex.Unlock()
if exists && oldClient != nil {
- // Try to shut it down gracefully, but don't block on errors
+ // Try to shut down client gracefully, but don't block on errors.
shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
_ = oldClient.Shutdown(shutdownCtx)
cancel()
}
- // Create a new client using the shared function
+ // Create a new client using the shared function.
app.createAndStartLSPClient(ctx, name, clientConfig.Command, clientConfig.Args...)
slog.Info("Successfully restarted LSP client", "client", name)
}
diff --git a/internal/app/lsp_events.go b/internal/app/lsp_events.go
new file mode 100644
index 0000000000000000000000000000000000000000..5961ec5c13e05fc42ff4eab7fbee744224a49694
--- /dev/null
+++ b/internal/app/lsp_events.go
@@ -0,0 +1,102 @@
+package app
+
+import (
+ "context"
+ "time"
+
+ "github.com/charmbracelet/crush/internal/csync"
+ "github.com/charmbracelet/crush/internal/lsp"
+ "github.com/charmbracelet/crush/internal/pubsub"
+)
+
+// LSPEventType represents the type of LSP event
+type LSPEventType string
+
+const (
+ LSPEventStateChanged LSPEventType = "state_changed"
+ LSPEventDiagnosticsChanged LSPEventType = "diagnostics_changed"
+)
+
+// LSPEvent represents an event in the LSP system
+type LSPEvent struct {
+ Type LSPEventType
+ Name string
+ State lsp.ServerState
+ Error error
+ DiagnosticCount int
+}
+
+// LSPClientInfo holds information about an LSP client's state
+type LSPClientInfo struct {
+ Name string
+ State lsp.ServerState
+ Error error
+ Client *lsp.Client
+ DiagnosticCount int
+ ConnectedAt time.Time
+}
+
+var (
+ lspStates = csync.NewMap[string, LSPClientInfo]()
+ lspBroker = pubsub.NewBroker[LSPEvent]()
+)
+
+// SubscribeLSPEvents returns a channel for LSP events
+func SubscribeLSPEvents(ctx context.Context) <-chan pubsub.Event[LSPEvent] {
+ return lspBroker.Subscribe(ctx)
+}
+
+// GetLSPStates returns the current state of all LSP clients
+func GetLSPStates() map[string]LSPClientInfo {
+ states := make(map[string]LSPClientInfo)
+ for name, info := range lspStates.Seq2() {
+ states[name] = info
+ }
+ return states
+}
+
+// GetLSPState returns the state of a specific LSP client
+func GetLSPState(name string) (LSPClientInfo, bool) {
+ return lspStates.Get(name)
+}
+
+// updateLSPState updates the state of an LSP client and publishes an event
+func updateLSPState(name string, state lsp.ServerState, err error, client *lsp.Client, diagnosticCount int) {
+ info := LSPClientInfo{
+ Name: name,
+ State: state,
+ Error: err,
+ Client: client,
+ DiagnosticCount: diagnosticCount,
+ }
+ if state == lsp.StateReady {
+ info.ConnectedAt = time.Now()
+ }
+ lspStates.Set(name, info)
+
+ // Publish state change event
+ lspBroker.Publish(pubsub.UpdatedEvent, LSPEvent{
+ Type: LSPEventStateChanged,
+ Name: name,
+ State: state,
+ Error: err,
+ DiagnosticCount: diagnosticCount,
+ })
+}
+
+// updateLSPDiagnostics updates the diagnostic count for an LSP client and publishes an event
+func updateLSPDiagnostics(name string, diagnosticCount int) {
+ if info, exists := lspStates.Get(name); exists {
+ info.DiagnosticCount = diagnosticCount
+ lspStates.Set(name, info)
+
+ // Publish diagnostics change event
+ lspBroker.Publish(pubsub.UpdatedEvent, LSPEvent{
+ Type: LSPEventDiagnosticsChanged,
+ Name: name,
+ State: info.State,
+ Error: info.Error,
+ DiagnosticCount: diagnosticCount,
+ })
+ }
+}
diff --git a/internal/cmd/logs.go b/internal/cmd/logs.go
new file mode 100644
index 0000000000000000000000000000000000000000..8e8fcac3aa5502d393200c9e3fa7cacff1301a2e
--- /dev/null
+++ b/internal/cmd/logs.go
@@ -0,0 +1,207 @@
+package cmd
+
+import (
+ "context"
+ "encoding/json"
+ "fmt"
+ "io"
+ "os"
+ "path/filepath"
+ "slices"
+ "time"
+
+ "github.com/charmbracelet/crush/internal/config"
+ "github.com/charmbracelet/log/v2"
+ "github.com/nxadm/tail"
+ "github.com/spf13/cobra"
+)
+
+const defaultTailLines = 1000
+
+var logsCmd = &cobra.Command{
+ Use: "logs",
+ Short: "View crush logs",
+ Long: `View the logs generated by Crush. This command allows you to see the log output for debugging and monitoring.`,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ cwd, err := cmd.Flags().GetString("cwd")
+ if err != nil {
+ return fmt.Errorf("failed to get current working directory: %v", err)
+ }
+
+ follow, err := cmd.Flags().GetBool("follow")
+ if err != nil {
+ return fmt.Errorf("failed to get follow flag: %v", err)
+ }
+
+ tailLines, err := cmd.Flags().GetInt("tail")
+ if err != nil {
+ return fmt.Errorf("failed to get tail flag: %v", err)
+ }
+
+ log.SetLevel(log.DebugLevel)
+ log.SetOutput(os.Stdout)
+
+ cfg, err := config.Load(cwd, false)
+ if err != nil {
+ return fmt.Errorf("failed to load configuration: %v", err)
+ }
+ logsFile := filepath.Join(cfg.WorkingDir(), cfg.Options.DataDirectory, "logs", "crush.log")
+ _, err = os.Stat(logsFile)
+ if os.IsNotExist(err) {
+ log.Warn("Looks like you are not in a crush project. No logs found.")
+ return nil
+ }
+
+ if follow {
+ return followLogs(cmd.Context(), logsFile, tailLines)
+ }
+
+ return showLogs(logsFile, tailLines)
+ },
+}
+
+func init() {
+ logsCmd.Flags().BoolP("follow", "f", false, "Follow log output")
+ logsCmd.Flags().IntP("tail", "t", defaultTailLines, "Show only the last N lines default: 1000 for performance")
+ rootCmd.AddCommand(logsCmd)
+}
+
+func followLogs(ctx context.Context, logsFile string, tailLines int) error {
+ t, err := tail.TailFile(logsFile, tail.Config{
+ Follow: false,
+ ReOpen: false,
+ Logger: tail.DiscardingLogger,
+ })
+ if err != nil {
+ return fmt.Errorf("failed to tail log file: %v", err)
+ }
+
+ var lines []string
+ for line := range t.Lines {
+ if line.Err != nil {
+ continue
+ }
+ lines = append(lines, line.Text)
+ if len(lines) > tailLines {
+ lines = lines[len(lines)-tailLines:]
+ }
+ }
+ t.Stop()
+
+ for _, line := range lines {
+ printLogLine(line)
+ }
+
+ if len(lines) == tailLines {
+ fmt.Fprintf(os.Stderr, "\nShowing last %d lines. Full logs available at: %s\n", tailLines, logsFile)
+ fmt.Fprintf(os.Stderr, "Following new log entries...\n\n")
+ }
+
+ t, err = tail.TailFile(logsFile, tail.Config{
+ Follow: true,
+ ReOpen: true,
+ Logger: tail.DiscardingLogger,
+ Location: &tail.SeekInfo{Offset: 0, Whence: io.SeekEnd},
+ })
+ if err != nil {
+ return fmt.Errorf("failed to tail log file: %v", err)
+ }
+ defer t.Stop()
+
+ for {
+ select {
+ case line := <-t.Lines:
+ if line.Err != nil {
+ continue
+ }
+ printLogLine(line.Text)
+ case <-ctx.Done():
+ return nil
+ }
+ }
+}
+
+func showLogs(logsFile string, tailLines int) error {
+ t, err := tail.TailFile(logsFile, tail.Config{
+ Follow: false,
+ ReOpen: false,
+ Logger: tail.DiscardingLogger,
+ MaxLineSize: 0,
+ })
+ if err != nil {
+ return fmt.Errorf("failed to tail log file: %v", err)
+ }
+ defer t.Stop()
+
+ var lines []string
+ for line := range t.Lines {
+ if line.Err != nil {
+ continue
+ }
+ lines = append(lines, line.Text)
+ if len(lines) > tailLines {
+ lines = lines[len(lines)-tailLines:]
+ }
+ }
+
+ for _, line := range lines {
+ printLogLine(line)
+ }
+
+ if len(lines) == tailLines {
+ fmt.Fprintf(os.Stderr, "\nShowing last %d lines. Full logs available at: %s\n", tailLines, logsFile)
+ }
+
+ return nil
+}
+
+func printLogLine(lineText string) {
+ var data map[string]any
+ if err := json.Unmarshal([]byte(lineText), &data); err != nil {
+ return
+ }
+ msg := data["msg"]
+ level := data["level"]
+ otherData := []any{}
+ keys := []string{}
+ for k := range data {
+ keys = append(keys, k)
+ }
+ slices.Sort(keys)
+ for _, k := range keys {
+ switch k {
+ case "msg", "level", "time":
+ continue
+ case "source":
+ source, ok := data[k].(map[string]any)
+ if !ok {
+ continue
+ }
+ sourceFile := fmt.Sprintf("%s:%d", source["file"], int(source["line"].(float64)))
+ otherData = append(otherData, "source", sourceFile)
+
+ default:
+ otherData = append(otherData, k, data[k])
+ }
+ }
+ log.SetTimeFunction(func(_ time.Time) time.Time {
+ // parse the timestamp from the log line if available
+ t, err := time.Parse(time.RFC3339, data["time"].(string))
+ if err != nil {
+ return time.Now() // fallback to current time if parsing fails
+ }
+ return t
+ })
+ switch level {
+ case "INFO":
+ log.Info(msg, otherData...)
+ case "DEBUG":
+ log.Debug(msg, otherData...)
+ case "ERROR":
+ log.Error(msg, otherData...)
+ case "WARN":
+ log.Warn(msg, otherData...)
+ default:
+ log.Info(msg, otherData...)
+ }
+}
diff --git a/internal/cmd/root.go b/internal/cmd/root.go
new file mode 100644
index 0000000000000000000000000000000000000000..184ac45b7796bda483fedd6b6612498e8b178af9
--- /dev/null
+++ b/internal/cmd/root.go
@@ -0,0 +1,162 @@
+package cmd
+
+import (
+ "context"
+ "fmt"
+ "io"
+ "log/slog"
+ "os"
+
+ tea "github.com/charmbracelet/bubbletea/v2"
+ "github.com/charmbracelet/crush/internal/app"
+ "github.com/charmbracelet/crush/internal/config"
+ "github.com/charmbracelet/crush/internal/db"
+ "github.com/charmbracelet/crush/internal/tui"
+ "github.com/charmbracelet/crush/internal/version"
+ "github.com/charmbracelet/fang"
+ "github.com/charmbracelet/x/term"
+ "github.com/spf13/cobra"
+)
+
+func init() {
+ rootCmd.PersistentFlags().StringP("cwd", "c", "", "Current working directory")
+ rootCmd.PersistentFlags().BoolP("debug", "d", false, "Debug")
+
+ rootCmd.Flags().BoolP("help", "h", false, "Help")
+ rootCmd.Flags().BoolP("yolo", "y", false, "Automatically accept all permissions (dangerous mode)")
+
+ rootCmd.AddCommand(runCmd)
+}
+
+var rootCmd = &cobra.Command{
+ Use: "crush",
+ Short: "Terminal-based AI assistant for software development",
+ Long: `Crush is a powerful terminal-based AI assistant that helps with software development tasks.
+It provides an interactive chat interface with AI capabilities, code analysis, and LSP integration
+to assist developers in writing, debugging, and understanding code directly from the terminal.`,
+ Example: `
+# Run in interactive mode
+crush
+
+# Run with debug logging
+crush -d
+
+# Run with debug logging in a specific directory
+crush -d -c /path/to/project
+
+# Print version
+crush -v
+
+# Run a single non-interactive prompt
+crush run "Explain the use of context in Go"
+
+# Run in dangerous mode (auto-accept all permissions)
+crush -y
+ `,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ app, err := setupApp(cmd)
+ if err != nil {
+ return err
+ }
+ defer app.Shutdown()
+
+ // Set up the TUI.
+ program := tea.NewProgram(
+ tui.New(app),
+ tea.WithAltScreen(),
+ tea.WithContext(cmd.Context()),
+ tea.WithMouseCellMotion(), // Use cell motion instead of all motion to reduce event flooding
+ tea.WithFilter(tui.MouseEventFilter), // Filter mouse events based on focus state
+ )
+
+ go app.Subscribe(program)
+
+ if _, err := program.Run(); err != nil {
+ slog.Error("TUI run error", "error", err)
+ return fmt.Errorf("TUI error: %v", err)
+ }
+ return nil
+ },
+}
+
+func Execute() {
+ if err := fang.Execute(
+ context.Background(),
+ rootCmd,
+ fang.WithVersion(version.Version),
+ fang.WithNotifySignal(os.Interrupt),
+ ); err != nil {
+ os.Exit(1)
+ }
+}
+
+// setupApp handles the common setup logic for both interactive and non-interactive modes.
+// It returns the app instance, config, cleanup function, and any error.
+func setupApp(cmd *cobra.Command) (*app.App, error) {
+ debug, _ := cmd.Flags().GetBool("debug")
+ yolo, _ := cmd.Flags().GetBool("yolo")
+ ctx := cmd.Context()
+
+ cwd, err := ResolveCwd(cmd)
+ if err != nil {
+ return nil, err
+ }
+
+ cfg, err := config.Init(cwd, debug)
+ if err != nil {
+ return nil, err
+ }
+
+ if cfg.Permissions == nil {
+ cfg.Permissions = &config.Permissions{}
+ }
+ cfg.Permissions.SkipRequests = yolo
+
+ // Connect to DB; this will also run migrations.
+ conn, err := db.Connect(ctx, cfg.Options.DataDirectory)
+ if err != nil {
+ return nil, err
+ }
+
+ appInstance, err := app.New(ctx, conn, cfg)
+ if err != nil {
+ slog.Error("Failed to create app instance", "error", err)
+ return nil, err
+ }
+
+ return appInstance, nil
+}
+
+func MaybePrependStdin(prompt string) (string, error) {
+ if term.IsTerminal(os.Stdin.Fd()) {
+ return prompt, nil
+ }
+ fi, err := os.Stdin.Stat()
+ if err != nil {
+ return prompt, err
+ }
+ if fi.Mode()&os.ModeNamedPipe == 0 {
+ return prompt, nil
+ }
+ bts, err := io.ReadAll(os.Stdin)
+ if err != nil {
+ return prompt, err
+ }
+ return string(bts) + "\n\n" + prompt, nil
+}
+
+func ResolveCwd(cmd *cobra.Command) (string, error) {
+ cwd, _ := cmd.Flags().GetString("cwd")
+ if cwd != "" {
+ err := os.Chdir(cwd)
+ if err != nil {
+ return "", fmt.Errorf("failed to change directory: %v", err)
+ }
+ return cwd, nil
+ }
+ cwd, err := os.Getwd()
+ if err != nil {
+ return "", fmt.Errorf("failed to get current working directory: %v", err)
+ }
+ return cwd, nil
+}
diff --git a/internal/cmd/run.go b/internal/cmd/run.go
new file mode 100644
index 0000000000000000000000000000000000000000..219239298bfe89cc8085e1021a0d510ad760898c
--- /dev/null
+++ b/internal/cmd/run.go
@@ -0,0 +1,58 @@
+package cmd
+
+import (
+ "fmt"
+ "log/slog"
+ "strings"
+
+ "github.com/spf13/cobra"
+)
+
+var runCmd = &cobra.Command{
+ Use: "run [prompt...]",
+ Short: "Run a single non-interactive prompt",
+ Long: `Run a single prompt in non-interactive mode and exit.
+The prompt can be provided as arguments or piped from stdin.`,
+ Example: `
+# Run a simple prompt
+crush run Explain the use of context in Go
+
+# Pipe input from stdin
+echo "What is this code doing?" | crush run
+
+# Run with quiet mode (no spinner)
+crush run -q "Generate a README for this project"
+ `,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ quiet, _ := cmd.Flags().GetBool("quiet")
+
+ app, err := setupApp(cmd)
+ if err != nil {
+ return err
+ }
+ defer app.Shutdown()
+
+ if !app.Config().IsConfigured() {
+ return fmt.Errorf("no providers configured - please run 'crush' to set up a provider interactively")
+ }
+
+ prompt := strings.Join(args, " ")
+
+ prompt, err = MaybePrependStdin(prompt)
+ if err != nil {
+ slog.Error("Failed to read from stdin", "error", err)
+ return err
+ }
+
+ if prompt == "" {
+ return fmt.Errorf("no prompt provided")
+ }
+
+ // Run non-interactive flow using the App method
+ return app.RunNonInteractive(cmd.Context(), prompt, quiet)
+ },
+}
+
+func init() {
+ runCmd.Flags().BoolP("quiet", "q", false, "Hide spinner")
+}
diff --git a/internal/cmd/schema.go b/internal/cmd/schema.go
new file mode 100644
index 0000000000000000000000000000000000000000..f835e250c24ea91a9d5084c9a414ed0e1ae28474
--- /dev/null
+++ b/internal/cmd/schema.go
@@ -0,0 +1,30 @@
+package cmd
+
+import (
+ "encoding/json"
+ "fmt"
+
+ "github.com/charmbracelet/crush/internal/config"
+ "github.com/invopop/jsonschema"
+ "github.com/spf13/cobra"
+)
+
+var schemaCmd = &cobra.Command{
+ Use: "schema",
+ Short: "Generate JSON schema for configuration",
+ Long: "Generate JSON schema for the crush configuration file",
+ Hidden: true,
+ RunE: func(cmd *cobra.Command, args []string) error {
+ reflector := new(jsonschema.Reflector)
+ bts, err := json.MarshalIndent(reflector.Reflect(&config.Config{}), "", " ")
+ if err != nil {
+ return fmt.Errorf("failed to marshal schema: %w", err)
+ }
+ fmt.Println(string(bts))
+ return nil
+ },
+}
+
+func init() {
+ rootCmd.AddCommand(schemaCmd)
+}
diff --git a/internal/config/config.go b/internal/config/config.go
index 5108a5cbee1684b92f779243b35aa3a50f162e60..b4682ce876bb4980bbe119c187538bf467d2f514 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -1,12 +1,19 @@
package config
import (
+ "context"
"fmt"
+ "log/slog"
+ "net/http"
+ "net/url"
"os"
"slices"
"strings"
+ "time"
- "github.com/charmbracelet/crush/internal/fur/provider"
+ "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "github.com/charmbracelet/crush/internal/csync"
+ "github.com/charmbracelet/crush/internal/env"
"github.com/tidwall/sjson"
)
@@ -30,6 +37,9 @@ var defaultContextPaths = []string{
"Crush.local.md",
"CRUSH.md",
"CRUSH.local.md",
+ "AGENTS.md",
+ "agents.md",
+ "Agents.md",
}
type SelectedModelType string
@@ -42,43 +52,48 @@ const (
type SelectedModel struct {
// The model id as used by the provider API.
// Required.
- Model string `json:"model"`
+ Model string `json:"model" jsonschema:"required,description=The model ID as used by the provider API,example=gpt-4o"`
// The model provider, same as the key/id used in the providers config.
// Required.
- Provider string `json:"provider"`
+ Provider string `json:"provider" jsonschema:"required,description=The model provider ID that matches a key in the providers config,example=openai"`
// Only used by models that use the openai provider and need this set.
- ReasoningEffort string `json:"reasoning_effort,omitempty"`
+ ReasoningEffort string `json:"reasoning_effort,omitempty" jsonschema:"description=Reasoning effort level for OpenAI models that support it,enum=low,enum=medium,enum=high"`
// Overrides the default model configuration.
- MaxTokens int64 `json:"max_tokens,omitempty"`
+ MaxTokens int64 `json:"max_tokens,omitempty" jsonschema:"description=Maximum number of tokens for model responses,minimum=1,maximum=200000,example=4096"`
// Used by anthropic models that can reason to indicate if the model should think.
- Think bool `json:"think,omitempty"`
+ Think bool `json:"think,omitempty" jsonschema:"description=Enable thinking mode for Anthropic models that support reasoning"`
}
type ProviderConfig struct {
// The provider's id.
- ID string `json:"id,omitempty"`
+ ID string `json:"id,omitempty" jsonschema:"description=Unique identifier for the provider,example=openai"`
// The provider's name, used for display purposes.
- Name string `json:"name,omitempty"`
+ Name string `json:"name,omitempty" jsonschema:"description=Human-readable name for the provider,example=OpenAI"`
// The provider's API endpoint.
- BaseURL string `json:"base_url,omitempty"`
+ BaseURL string `json:"base_url,omitempty" jsonschema:"description=Base URL for the provider's API,format=uri,example=https://api.openai.com/v1"`
// The provider type, e.g. "openai", "anthropic", etc. if empty it defaults to openai.
- Type provider.Type `json:"type,omitempty"`
+ Type catwalk.Type `json:"type,omitempty" jsonschema:"description=Provider type that determines the API format,enum=openai,enum=anthropic,enum=gemini,enum=azure,enum=vertexai,default=openai"`
// The provider's API key.
- APIKey string `json:"api_key,omitempty"`
+ APIKey string `json:"api_key,omitempty" jsonschema:"description=API key for authentication with the provider,example=$OPENAI_API_KEY"`
// Marks the provider as disabled.
- Disable bool `json:"disable,omitempty"`
+ Disable bool `json:"disable,omitempty" jsonschema:"description=Whether this provider is disabled,default=false"`
+
+ // Custom system prompt prefix.
+ SystemPromptPrefix string `json:"system_prompt_prefix,omitempty" jsonschema:"description=Custom prefix to add to system prompts for this provider"`
// Extra headers to send with each request to the provider.
- ExtraHeaders map[string]string `json:"extra_headers,omitempty"`
+ ExtraHeaders map[string]string `json:"extra_headers,omitempty" jsonschema:"description=Additional HTTP headers to send with requests"`
+ // Extra body
+ ExtraBody map[string]any `json:"extra_body,omitempty" jsonschema:"description=Additional fields to include in request bodies"`
// Used to pass extra parameters to the provider.
ExtraParams map[string]string `json:"-"`
// The provider models
- Models []provider.Model `json:"models,omitempty"`
+ Models []catwalk.Model `json:"models,omitempty" jsonschema:"description=List of models available from this provider"`
}
type MCPType string
@@ -90,37 +105,41 @@ const (
)
type MCPConfig struct {
- Command string `json:"command,omitempty" `
- Env []string `json:"env,omitempty"`
- Args []string `json:"args,omitempty"`
- Type MCPType `json:"type"`
- URL string `json:"url,omitempty"`
- Disabled bool `json:"disabled,omitempty"`
+ Command string `json:"command,omitempty" jsonschema:"description=Command to execute for stdio MCP servers,example=npx"`
+ Env map[string]string `json:"env,omitempty" jsonschema:"description=Environment variables to set for the MCP server"`
+ Args []string `json:"args,omitempty" jsonschema:"description=Arguments to pass to the MCP server command"`
+ Type MCPType `json:"type" jsonschema:"required,description=Type of MCP connection,enum=stdio,enum=sse,enum=http,default=stdio"`
+ URL string `json:"url,omitempty" jsonschema:"description=URL for HTTP or SSE MCP servers,format=uri,example=http://localhost:3000/mcp"`
+ Disabled bool `json:"disabled,omitempty" jsonschema:"description=Whether this MCP server is disabled,default=false"`
// TODO: maybe make it possible to get the value from the env
- Headers map[string]string `json:"headers,omitempty"`
+ Headers map[string]string `json:"headers,omitempty" jsonschema:"description=HTTP headers for HTTP/SSE MCP servers"`
}
type LSPConfig struct {
- Disabled bool `json:"enabled,omitempty"`
- Command string `json:"command"`
- Args []string `json:"args,omitempty"`
- Options any `json:"options,omitempty"`
+ Disabled bool `json:"enabled,omitempty" jsonschema:"description=Whether this LSP server is disabled,default=false"`
+ Command string `json:"command" jsonschema:"required,description=Command to execute for the LSP server,example=gopls"`
+ Args []string `json:"args,omitempty" jsonschema:"description=Arguments to pass to the LSP server command"`
+ Options any `json:"options,omitempty" jsonschema:"description=LSP server-specific configuration options"`
}
type TUIOptions struct {
- CompactMode bool `json:"compact_mode,omitempty"`
+ CompactMode bool `json:"compact_mode,omitempty" jsonschema:"description=Enable compact mode for the TUI interface,default=false"`
// Here we can add themes later or any TUI related options
}
+type Permissions struct {
+ AllowedTools []string `json:"allowed_tools,omitempty" jsonschema:"description=List of tools that don't require permission prompts,example=bash,example=view"` // Tools that don't require permission prompts
+ SkipRequests bool `json:"-"` // Automatically accept all permissions (YOLO mode)
+}
+
type Options struct {
- ContextPaths []string `json:"context_paths,omitempty"`
- TUI *TUIOptions `json:"tui,omitempty"`
- Debug bool `json:"debug,omitempty"`
- DebugLSP bool `json:"debug_lsp,omitempty"`
- DisableAutoSummarize bool `json:"disable_auto_summarize,omitempty"`
- // Relative to the cwd
- DataDirectory string `json:"data_directory,omitempty"`
+ ContextPaths []string `json:"context_paths,omitempty" jsonschema:"description=Paths to files containing context information for the AI,example=.cursorrules,example=CRUSH.md"`
+ TUI *TUIOptions `json:"tui,omitempty" jsonschema:"description=Terminal user interface options"`
+ Debug bool `json:"debug,omitempty" jsonschema:"description=Enable debug logging,default=false"`
+ DebugLSP bool `json:"debug_lsp,omitempty" jsonschema:"description=Enable debug logging for LSP servers,default=false"`
+ DisableAutoSummarize bool `json:"disable_auto_summarize,omitempty" jsonschema:"description=Disable automatic conversation summarization,default=false"`
+ DataDirectory string `json:"data_directory,omitempty" jsonschema:"description=Directory for storing application data (relative to working directory),default=.crush,example=.crush"` // Relative to the cwd
}
type MCPs map[string]MCPConfig
@@ -165,6 +184,37 @@ func (l LSPs) Sorted() []LSP {
return sorted
}
+func (m MCPConfig) ResolvedEnv() []string {
+ resolver := NewShellVariableResolver(env.New())
+ for e, v := range m.Env {
+ var err error
+ m.Env[e], err = resolver.ResolveValue(v)
+ if err != nil {
+ slog.Error("error resolving environment variable", "error", err, "variable", e, "value", v)
+ continue
+ }
+ }
+
+ env := make([]string, 0, len(m.Env))
+ for k, v := range m.Env {
+ env = append(env, fmt.Sprintf("%s=%s", k, v))
+ }
+ return env
+}
+
+func (m MCPConfig) ResolvedHeaders() map[string]string {
+ resolver := NewShellVariableResolver(env.New())
+ for e, v := range m.Headers {
+ var err error
+ m.Headers[e], err = resolver.ResolveValue(v)
+ if err != nil {
+ slog.Error("error resolving header variable", "error", err, "variable", e, "value", v)
+ continue
+ }
+ }
+ return m.Headers
+}
+
type Agent struct {
ID string `json:"id,omitempty"`
Name string `json:"name,omitempty"`
@@ -172,7 +222,7 @@ type Agent struct {
// This is the id of the system prompt used by the agent
Disabled bool `json:"disabled,omitempty"`
- Model SelectedModelType `json:"model"`
+ Model SelectedModelType `json:"model" jsonschema:"required,description=The model type to use for this agent,enum=large,enum=small,default=large"`
// The available tools for the agent
// if this is nil, all tools are available
@@ -195,16 +245,18 @@ type Agent struct {
// Config holds the configuration for crush.
type Config struct {
// We currently only support large/small as values here.
- Models map[SelectedModelType]SelectedModel `json:"models,omitempty"`
+ Models map[SelectedModelType]SelectedModel `json:"models,omitempty" jsonschema:"description=Model configurations for different model types,example={\"large\":{\"model\":\"gpt-4o\",\"provider\":\"openai\"}}"`
// The providers that are configured
- Providers map[string]ProviderConfig `json:"providers,omitempty"`
+ Providers *csync.Map[string, ProviderConfig] `json:"providers,omitempty" jsonschema:"description=AI provider configurations"`
+
+ MCP MCPs `json:"mcp,omitempty" jsonschema:"description=Model Context Protocol server configurations"`
- MCP MCPs `json:"mcp,omitempty"`
+ LSP LSPs `json:"lsp,omitempty" jsonschema:"description=Language Server Protocol configurations"`
- LSP LSPs `json:"lsp,omitempty"`
+ Options *Options `json:"options,omitempty" jsonschema:"description=General application options"`
- Options *Options `json:"options,omitempty"`
+ Permissions *Permissions `json:"permissions,omitempty" jsonschema:"description=Permission settings for tool usage"`
// Internal
workingDir string `json:"-"`
@@ -212,8 +264,8 @@ type Config struct {
Agents map[string]Agent `json:"-"`
// TODO: find a better way to do this this should probably not be part of the config
resolver VariableResolver
- dataConfigDir string `json:"-"`
- knownProviders []provider.Provider `json:"-"`
+ dataConfigDir string `json:"-"`
+ knownProviders []catwalk.Provider `json:"-"`
}
func (c *Config) WorkingDir() string {
@@ -221,8 +273,8 @@ func (c *Config) WorkingDir() string {
}
func (c *Config) EnabledProviders() []ProviderConfig {
- enabled := make([]ProviderConfig, 0, len(c.Providers))
- for _, p := range c.Providers {
+ var enabled []ProviderConfig
+ for p := range c.Providers.Seq() {
if !p.Disable {
enabled = append(enabled, p)
}
@@ -235,8 +287,8 @@ func (c *Config) IsConfigured() bool {
return len(c.EnabledProviders()) > 0
}
-func (c *Config) GetModel(provider, model string) *provider.Model {
- if providerConfig, ok := c.Providers[provider]; ok {
+func (c *Config) GetModel(provider, model string) *catwalk.Model {
+ if providerConfig, ok := c.Providers.Get(provider); ok {
for _, m := range providerConfig.Models {
if m.ID == model {
return &m
@@ -251,13 +303,13 @@ func (c *Config) GetProviderForModel(modelType SelectedModelType) *ProviderConfi
if !ok {
return nil
}
- if providerConfig, ok := c.Providers[model.Provider]; ok {
+ if providerConfig, ok := c.Providers.Get(model.Provider); ok {
return &providerConfig
}
return nil
}
-func (c *Config) GetModelByType(modelType SelectedModelType) *provider.Model {
+func (c *Config) GetModelByType(modelType SelectedModelType) *catwalk.Model {
model, ok := c.Models[modelType]
if !ok {
return nil
@@ -265,7 +317,7 @@ func (c *Config) GetModelByType(modelType SelectedModelType) *provider.Model {
return c.GetModel(model.Provider, model.Model)
}
-func (c *Config) LargeModel() *provider.Model {
+func (c *Config) LargeModel() *catwalk.Model {
model, ok := c.Models[SelectedModelTypeLarge]
if !ok {
return nil
@@ -273,7 +325,7 @@ func (c *Config) LargeModel() *provider.Model {
return c.GetModel(model.Provider, model.Model)
}
-func (c *Config) SmallModel() *provider.Model {
+func (c *Config) SmallModel() *catwalk.Model {
model, ok := c.Models[SelectedModelTypeSmall]
if !ok {
return nil
@@ -319,7 +371,7 @@ func (c *Config) SetConfigField(key string, value any) error {
if err != nil {
return fmt.Errorf("failed to set config field %s: %w", key, err)
}
- if err := os.WriteFile(c.dataConfigDir, []byte(newValue), 0o644); err != nil {
+ if err := os.WriteFile(c.dataConfigDir, []byte(newValue), 0o600); err != nil {
return fmt.Errorf("failed to write config file: %w", err)
}
return nil
@@ -332,18 +384,14 @@ func (c *Config) SetProviderAPIKey(providerID, apiKey string) error {
return fmt.Errorf("failed to save API key to config file: %w", err)
}
- if c.Providers == nil {
- c.Providers = make(map[string]ProviderConfig)
- }
-
- providerConfig, exists := c.Providers[providerID]
+ providerConfig, exists := c.Providers.Get(providerID)
if exists {
providerConfig.APIKey = apiKey
- c.Providers[providerID] = providerConfig
+ c.Providers.Set(providerID, providerConfig)
return nil
}
- var foundProvider *provider.Provider
+ var foundProvider *catwalk.Provider
for _, p := range c.knownProviders {
if string(p.ID) == providerID {
foundProvider = &p
@@ -368,7 +416,7 @@ func (c *Config) SetProviderAPIKey(providerID, apiKey string) error {
return fmt.Errorf("provider with ID %s not found in known providers", providerID)
}
// Store the updated provider config
- c.Providers[providerID] = providerConfig
+ c.Providers.Set(providerID, providerConfig)
return nil
}
@@ -402,3 +450,58 @@ func (c *Config) SetupAgents() {
}
c.Agents = agents
}
+
+func (c *Config) Resolver() VariableResolver {
+ return c.resolver
+}
+
+func (c *ProviderConfig) TestConnection(resolver VariableResolver) error {
+ testURL := ""
+ headers := make(map[string]string)
+ apiKey, _ := resolver.ResolveValue(c.APIKey)
+ switch c.Type {
+ case catwalk.TypeOpenAI:
+ baseURL, _ := resolver.ResolveValue(c.BaseURL)
+ if baseURL == "" {
+ baseURL = "https://api.openai.com/v1"
+ }
+ testURL = baseURL + "/models"
+ headers["Authorization"] = "Bearer " + apiKey
+ case catwalk.TypeAnthropic:
+ baseURL, _ := resolver.ResolveValue(c.BaseURL)
+ if baseURL == "" {
+ baseURL = "https://api.anthropic.com/v1"
+ }
+ testURL = baseURL + "/models"
+ headers["x-api-key"] = apiKey
+ headers["anthropic-version"] = "2023-06-01"
+ case catwalk.TypeGemini:
+ baseURL, _ := resolver.ResolveValue(c.BaseURL)
+ if baseURL == "" {
+ baseURL = "https://generativelanguage.googleapis.com"
+ }
+ testURL = baseURL + "/v1beta/models?key=" + url.QueryEscape(apiKey)
+ }
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ client := &http.Client{}
+ req, err := http.NewRequestWithContext(ctx, "GET", testURL, nil)
+ if err != nil {
+ return fmt.Errorf("failed to create request for provider %s: %w", c.ID, err)
+ }
+ for k, v := range headers {
+ req.Header.Set(k, v)
+ }
+ for k, v := range c.ExtraHeaders {
+ req.Header.Set(k, v)
+ }
+ b, err := client.Do(req)
+ if err != nil {
+ return fmt.Errorf("failed to create request for provider %s: %w", c.ID, err)
+ }
+ if b.StatusCode != http.StatusOK {
+ return fmt.Errorf("failed to connect to provider %s: %s", c.ID, b.Status)
+ }
+ _ = b.Body.Close()
+ return nil
+}
diff --git a/internal/config/init.go b/internal/config/init.go
index 12b30efd75f88d438e0734571cbb5c634ba231bc..ff44d43bb878f579d003c84537fcd970f9e52f9e 100644
--- a/internal/config/init.go
+++ b/internal/config/init.go
@@ -5,7 +5,6 @@ import (
"os"
"path/filepath"
"strings"
- "sync"
"sync/atomic"
)
@@ -18,26 +17,20 @@ type ProjectInitFlag struct {
}
// TODO: we need to remove the global config instance keeping it now just until everything is migrated
-var (
- instance atomic.Pointer[Config]
- cwd string
- once sync.Once // Ensures the initialization happens only once
-)
+var instance atomic.Pointer[Config]
func Init(workingDir string, debug bool) (*Config, error) {
- var err error
- once.Do(func() {
- cwd = workingDir
- var cfg *Config
- cfg, err = Load(cwd, debug)
- instance.Store(cfg)
- })
-
- return instance.Load(), err
+ cfg, err := Load(workingDir, debug)
+ if err != nil {
+ return nil, err
+ }
+ instance.Store(cfg)
+ return instance.Load(), nil
}
func Get() *Config {
- return instance.Load()
+ cfg := instance.Load()
+ return cfg
}
func ProjectNeedsInitialization() (bool, error) {
@@ -109,5 +102,5 @@ func HasInitialDataConfig() bool {
if _, err := os.Stat(cfgPath); err != nil {
return false
}
- return true
+ return Get().IsConfigured()
}
diff --git a/internal/config/load.go b/internal/config/load.go
index 81cb4398e5b3a7a2147ab5388b37088788ea041b..a2d2155048a8abf634958293056da8a4713e1400 100644
--- a/internal/config/load.go
+++ b/internal/config/load.go
@@ -4,19 +4,22 @@ import (
"encoding/json"
"fmt"
"io"
+ "log/slog"
+ "maps"
"os"
"path/filepath"
"runtime"
"slices"
"strings"
+ "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/env"
- "github.com/charmbracelet/crush/internal/fur/client"
- "github.com/charmbracelet/crush/internal/fur/provider"
"github.com/charmbracelet/crush/internal/log"
- "golang.org/x/exp/slog"
)
+const defaultCatwalkURL = "https://catwalk.charm.sh"
+
// LoadReader config via io.Reader.
func LoadReader(fd io.Reader) (*Config, error) {
data, err := io.ReadAll(fd)
@@ -60,8 +63,8 @@ func Load(workingDir string, debug bool) (*Config, error) {
cfg.Options.Debug,
)
- // Load known providers, this loads the config from fur
- providers, err := LoadProviders(client.New())
+ // Load known providers, this loads the config from catwalk
+ providers, err := Providers()
if err != nil || len(providers) == 0 {
return nil, fmt.Errorf("failed to load providers: %w", err)
}
@@ -87,16 +90,16 @@ func Load(workingDir string, debug bool) (*Config, error) {
return cfg, nil
}
-func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, knownProviders []provider.Provider) error {
+func (c *Config) configureProviders(env env.Env, resolver VariableResolver, knownProviders []catwalk.Provider) error {
knownProviderNames := make(map[string]bool)
for _, p := range knownProviders {
knownProviderNames[string(p.ID)] = true
- config, configExists := cfg.Providers[string(p.ID)]
+ config, configExists := c.Providers.Get(string(p.ID))
// if the user configured a known provider we need to allow it to override a couple of parameters
if configExists {
if config.Disable {
slog.Debug("Skipping provider due to disable flag", "provider", p.ID)
- delete(cfg.Providers, string(p.ID))
+ c.Providers.Del(string(p.ID))
continue
}
if config.BaseURL != "" {
@@ -106,7 +109,7 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
p.APIKey = config.APIKey
}
if len(config.Models) > 0 {
- models := []provider.Model{}
+ models := []catwalk.Model{}
seen := make(map[string]bool)
for _, model := range config.Models {
@@ -114,8 +117,8 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
continue
}
seen[model.ID] = true
- if model.Model == "" {
- model.Model = model.ID
+ if model.Name == "" {
+ model.Name = model.ID
}
models = append(models, model)
}
@@ -124,8 +127,8 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
continue
}
seen[model.ID] = true
- if model.Model == "" {
- model.Model = model.ID
+ if model.Name == "" {
+ model.Name = model.ID
}
models = append(models, model)
}
@@ -133,38 +136,63 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
p.Models = models
}
}
+
+ headers := map[string]string{}
+ if len(p.DefaultHeaders) > 0 {
+ maps.Copy(headers, p.DefaultHeaders)
+ }
+ if len(config.ExtraHeaders) > 0 {
+ maps.Copy(headers, config.ExtraHeaders)
+ }
prepared := ProviderConfig{
- ID: string(p.ID),
- Name: p.Name,
- BaseURL: p.APIEndpoint,
- APIKey: p.APIKey,
- Type: p.Type,
- Disable: config.Disable,
- ExtraHeaders: config.ExtraHeaders,
- ExtraParams: make(map[string]string),
- Models: p.Models,
+ ID: string(p.ID),
+ Name: p.Name,
+ BaseURL: p.APIEndpoint,
+ APIKey: p.APIKey,
+ Type: p.Type,
+ Disable: config.Disable,
+ SystemPromptPrefix: config.SystemPromptPrefix,
+ ExtraHeaders: headers,
+ ExtraBody: config.ExtraBody,
+ ExtraParams: make(map[string]string),
+ Models: p.Models,
}
switch p.ID {
// Handle specific providers that require additional configuration
- case provider.InferenceProviderVertexAI:
+ case catwalk.InferenceProviderVertexAI:
if !hasVertexCredentials(env) {
if configExists {
slog.Warn("Skipping Vertex AI provider due to missing credentials")
- delete(cfg.Providers, string(p.ID))
+ c.Providers.Del(string(p.ID))
}
continue
}
- prepared.ExtraParams["project"] = env.Get("GOOGLE_CLOUD_PROJECT")
- prepared.ExtraParams["location"] = env.Get("GOOGLE_CLOUD_LOCATION")
- case provider.InferenceProviderBedrock:
+ prepared.ExtraParams["project"] = env.Get("VERTEXAI_PROJECT")
+ prepared.ExtraParams["location"] = env.Get("VERTEXAI_LOCATION")
+ case catwalk.InferenceProviderAzure:
+ endpoint, err := resolver.ResolveValue(p.APIEndpoint)
+ if err != nil || endpoint == "" {
+ if configExists {
+ slog.Warn("Skipping Azure provider due to missing API endpoint", "provider", p.ID, "error", err)
+ c.Providers.Del(string(p.ID))
+ }
+ continue
+ }
+ prepared.BaseURL = endpoint
+ prepared.ExtraParams["apiVersion"] = env.Get("AZURE_OPENAI_API_VERSION")
+ case catwalk.InferenceProviderBedrock:
if !hasAWSCredentials(env) {
if configExists {
slog.Warn("Skipping Bedrock provider due to missing AWS credentials")
- delete(cfg.Providers, string(p.ID))
+ c.Providers.Del(string(p.ID))
}
continue
}
+ prepared.ExtraParams["region"] = env.Get("AWS_REGION")
+ if prepared.ExtraParams["region"] == "" {
+ prepared.ExtraParams["region"] = env.Get("AWS_DEFAULT_REGION")
+ }
for _, model := range p.Models {
if !strings.HasPrefix(model.ID, "anthropic.") {
return fmt.Errorf("bedrock provider only supports anthropic models for now, found: %s", model.ID)
@@ -176,16 +204,16 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
if v == "" || err != nil {
if configExists {
slog.Warn("Skipping provider due to missing API key", "provider", p.ID)
- delete(cfg.Providers, string(p.ID))
+ c.Providers.Del(string(p.ID))
}
continue
}
}
- cfg.Providers[string(p.ID)] = prepared
+ c.Providers.Set(string(p.ID), prepared)
}
// validate the custom providers
- for id, providerConfig := range cfg.Providers {
+ for id, providerConfig := range c.Providers.Seq2() {
if knownProviderNames[id] {
continue
}
@@ -197,12 +225,12 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
}
// default to OpenAI if not set
if providerConfig.Type == "" {
- providerConfig.Type = provider.TypeOpenAI
+ providerConfig.Type = catwalk.TypeOpenAI
}
if providerConfig.Disable {
slog.Debug("Skipping custom provider due to disable flag", "provider", id)
- delete(cfg.Providers, id)
+ c.Providers.Del(id)
continue
}
if providerConfig.APIKey == "" {
@@ -210,17 +238,17 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
}
if providerConfig.BaseURL == "" {
slog.Warn("Skipping custom provider due to missing API endpoint", "provider", id)
- delete(cfg.Providers, id)
+ c.Providers.Del(id)
continue
}
if len(providerConfig.Models) == 0 {
slog.Warn("Skipping custom provider because the provider has no models", "provider", id)
- delete(cfg.Providers, id)
+ c.Providers.Del(id)
continue
}
- if providerConfig.Type != provider.TypeOpenAI {
+ if providerConfig.Type != catwalk.TypeOpenAI && providerConfig.Type != catwalk.TypeAnthropic {
slog.Warn("Skipping custom provider because the provider type is not supported", "provider", id, "type", providerConfig.Type)
- delete(cfg.Providers, id)
+ c.Providers.Del(id)
continue
}
@@ -231,50 +259,50 @@ func (cfg *Config) configureProviders(env env.Env, resolver VariableResolver, kn
baseURL, err := resolver.ResolveValue(providerConfig.BaseURL)
if baseURL == "" || err != nil {
slog.Warn("Skipping custom provider due to missing API endpoint", "provider", id, "error", err)
- delete(cfg.Providers, id)
+ c.Providers.Del(id)
continue
}
- cfg.Providers[id] = providerConfig
+ c.Providers.Set(id, providerConfig)
}
return nil
}
-func (cfg *Config) setDefaults(workingDir string) {
- cfg.workingDir = workingDir
- if cfg.Options == nil {
- cfg.Options = &Options{}
+func (c *Config) setDefaults(workingDir string) {
+ c.workingDir = workingDir
+ if c.Options == nil {
+ c.Options = &Options{}
}
- if cfg.Options.TUI == nil {
- cfg.Options.TUI = &TUIOptions{}
+ if c.Options.TUI == nil {
+ c.Options.TUI = &TUIOptions{}
}
- if cfg.Options.ContextPaths == nil {
- cfg.Options.ContextPaths = []string{}
+ if c.Options.ContextPaths == nil {
+ c.Options.ContextPaths = []string{}
}
- if cfg.Options.DataDirectory == "" {
- cfg.Options.DataDirectory = filepath.Join(workingDir, defaultDataDirectory)
+ if c.Options.DataDirectory == "" {
+ c.Options.DataDirectory = filepath.Join(workingDir, defaultDataDirectory)
}
- if cfg.Providers == nil {
- cfg.Providers = make(map[string]ProviderConfig)
+ if c.Providers == nil {
+ c.Providers = csync.NewMap[string, ProviderConfig]()
}
- if cfg.Models == nil {
- cfg.Models = make(map[SelectedModelType]SelectedModel)
+ if c.Models == nil {
+ c.Models = make(map[SelectedModelType]SelectedModel)
}
- if cfg.MCP == nil {
- cfg.MCP = make(map[string]MCPConfig)
+ if c.MCP == nil {
+ c.MCP = make(map[string]MCPConfig)
}
- if cfg.LSP == nil {
- cfg.LSP = make(map[string]LSPConfig)
+ if c.LSP == nil {
+ c.LSP = make(map[string]LSPConfig)
}
// Add the default context paths if they are not already present
- cfg.Options.ContextPaths = append(defaultContextPaths, cfg.Options.ContextPaths...)
- slices.Sort(cfg.Options.ContextPaths)
- cfg.Options.ContextPaths = slices.Compact(cfg.Options.ContextPaths)
+ c.Options.ContextPaths = append(defaultContextPaths, c.Options.ContextPaths...)
+ slices.Sort(c.Options.ContextPaths)
+ c.Options.ContextPaths = slices.Compact(c.Options.ContextPaths)
}
-func (cfg *Config) defaultModelSelection(knownProviders []provider.Provider) (largeModel SelectedModel, smallModel SelectedModel, err error) {
- if len(knownProviders) == 0 && len(cfg.Providers) == 0 {
+func (c *Config) defaultModelSelection(knownProviders []catwalk.Provider) (largeModel SelectedModel, smallModel SelectedModel, err error) {
+ if len(knownProviders) == 0 && c.Providers.Len() == 0 {
err = fmt.Errorf("no providers configured, please configure at least one provider")
return
}
@@ -282,11 +310,11 @@ func (cfg *Config) defaultModelSelection(knownProviders []provider.Provider) (la
// Use the first provider enabled based on the known providers order
// if no provider found that is known use the first provider configured
for _, p := range knownProviders {
- providerConfig, ok := cfg.Providers[string(p.ID)]
+ providerConfig, ok := c.Providers.Get(string(p.ID))
if !ok || providerConfig.Disable {
continue
}
- defaultLargeModel := cfg.GetModel(string(p.ID), p.DefaultLargeModelID)
+ defaultLargeModel := c.GetModel(string(p.ID), p.DefaultLargeModelID)
if defaultLargeModel == nil {
err = fmt.Errorf("default large model %s not found for provider %s", p.DefaultLargeModelID, p.ID)
return
@@ -298,7 +326,7 @@ func (cfg *Config) defaultModelSelection(knownProviders []provider.Provider) (la
ReasoningEffort: defaultLargeModel.DefaultReasoningEffort,
}
- defaultSmallModel := cfg.GetModel(string(p.ID), p.DefaultSmallModelID)
+ defaultSmallModel := c.GetModel(string(p.ID), p.DefaultSmallModelID)
if defaultSmallModel == nil {
err = fmt.Errorf("default small model %s not found for provider %s", p.DefaultSmallModelID, p.ID)
return
@@ -312,7 +340,7 @@ func (cfg *Config) defaultModelSelection(knownProviders []provider.Provider) (la
return
}
- enabledProviders := cfg.EnabledProviders()
+ enabledProviders := c.EnabledProviders()
slices.SortFunc(enabledProviders, func(a, b ProviderConfig) int {
return strings.Compare(a.ID, b.ID)
})
@@ -327,13 +355,13 @@ func (cfg *Config) defaultModelSelection(knownProviders []provider.Provider) (la
err = fmt.Errorf("provider %s has no models configured", providerConfig.ID)
return
}
- defaultLargeModel := cfg.GetModel(providerConfig.ID, providerConfig.Models[0].ID)
+ defaultLargeModel := c.GetModel(providerConfig.ID, providerConfig.Models[0].ID)
largeModel = SelectedModel{
Provider: providerConfig.ID,
Model: defaultLargeModel.ID,
MaxTokens: defaultLargeModel.DefaultMaxTokens,
}
- defaultSmallModel := cfg.GetModel(providerConfig.ID, providerConfig.Models[0].ID)
+ defaultSmallModel := c.GetModel(providerConfig.ID, providerConfig.Models[0].ID)
smallModel = SelectedModel{
Provider: providerConfig.ID,
Model: defaultSmallModel.ID,
@@ -342,14 +370,14 @@ func (cfg *Config) defaultModelSelection(knownProviders []provider.Provider) (la
return
}
-func (cfg *Config) configureSelectedModels(knownProviders []provider.Provider) error {
- defaultLarge, defaultSmall, err := cfg.defaultModelSelection(knownProviders)
+func (c *Config) configureSelectedModels(knownProviders []catwalk.Provider) error {
+ defaultLarge, defaultSmall, err := c.defaultModelSelection(knownProviders)
if err != nil {
return fmt.Errorf("failed to select default models: %w", err)
}
large, small := defaultLarge, defaultSmall
- largeModelSelected, largeModelConfigured := cfg.Models[SelectedModelTypeLarge]
+ largeModelSelected, largeModelConfigured := c.Models[SelectedModelTypeLarge]
if largeModelConfigured {
if largeModelSelected.Model != "" {
large.Model = largeModelSelected.Model
@@ -357,11 +385,11 @@ func (cfg *Config) configureSelectedModels(knownProviders []provider.Provider) e
if largeModelSelected.Provider != "" {
large.Provider = largeModelSelected.Provider
}
- model := cfg.GetModel(large.Provider, large.Model)
+ model := c.GetModel(large.Provider, large.Model)
if model == nil {
large = defaultLarge
// override the model type to large
- err := cfg.UpdatePreferredModel(SelectedModelTypeLarge, large)
+ err := c.UpdatePreferredModel(SelectedModelTypeLarge, large)
if err != nil {
return fmt.Errorf("failed to update preferred large model: %w", err)
}
@@ -377,7 +405,7 @@ func (cfg *Config) configureSelectedModels(knownProviders []provider.Provider) e
large.Think = largeModelSelected.Think
}
}
- smallModelSelected, smallModelConfigured := cfg.Models[SelectedModelTypeSmall]
+ smallModelSelected, smallModelConfigured := c.Models[SelectedModelTypeSmall]
if smallModelConfigured {
if smallModelSelected.Model != "" {
small.Model = smallModelSelected.Model
@@ -386,11 +414,11 @@ func (cfg *Config) configureSelectedModels(knownProviders []provider.Provider) e
small.Provider = smallModelSelected.Provider
}
- model := cfg.GetModel(small.Provider, small.Model)
+ model := c.GetModel(small.Provider, small.Model)
if model == nil {
small = defaultSmall
// override the model type to small
- err := cfg.UpdatePreferredModel(SelectedModelTypeSmall, small)
+ err := c.UpdatePreferredModel(SelectedModelTypeSmall, small)
if err != nil {
return fmt.Errorf("failed to update preferred small model: %w", err)
}
@@ -404,8 +432,8 @@ func (cfg *Config) configureSelectedModels(knownProviders []provider.Provider) e
small.Think = smallModelSelected.Think
}
}
- cfg.Models[SelectedModelTypeLarge] = large
- cfg.Models[SelectedModelTypeSmall] = small
+ c.Models[SelectedModelTypeLarge] = large
+ c.Models[SelectedModelTypeSmall] = small
return nil
}
@@ -442,10 +470,9 @@ func loadFromReaders(readers []io.Reader) (*Config, error) {
}
func hasVertexCredentials(env env.Env) bool {
- useVertex := env.Get("GOOGLE_GENAI_USE_VERTEXAI") == "true"
- hasProject := env.Get("GOOGLE_CLOUD_PROJECT") != ""
- hasLocation := env.Get("GOOGLE_CLOUD_LOCATION") != ""
- return useVertex && hasProject && hasLocation
+ hasProject := env.Get("VERTEXAI_PROJECT") != ""
+ hasLocation := env.Get("VERTEXAI_LOCATION") != ""
+ return hasProject && hasLocation
}
func hasAWSCredentials(env env.Env) bool {
diff --git a/internal/config/load_test.go b/internal/config/load_test.go
index b96ca5e81cd265cbcd1bdf9d456603ad3f22c558..7d9a3038e1c56ec0ab1672ba9a53e4752e418804 100644
--- a/internal/config/load_test.go
+++ b/internal/config/load_test.go
@@ -8,9 +8,10 @@ import (
"strings"
"testing"
+ "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/env"
- "github.com/charmbracelet/crush/internal/fur/provider"
- "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
func TestMain(m *testing.M) {
@@ -27,11 +28,12 @@ func TestConfig_LoadFromReaders(t *testing.T) {
loadedConfig, err := loadFromReaders([]io.Reader{data1, data2, data3})
- assert.NoError(t, err)
- assert.NotNil(t, loadedConfig)
- assert.Len(t, loadedConfig.Providers, 1)
- assert.Equal(t, "key2", loadedConfig.Providers["openai"].APIKey)
- assert.Equal(t, "https://api.openai.com/v2", loadedConfig.Providers["openai"].BaseURL)
+ require.NoError(t, err)
+ require.NotNil(t, loadedConfig)
+ require.Equal(t, 1, loadedConfig.Providers.Len())
+ pc, _ := loadedConfig.Providers.Get("openai")
+ require.Equal(t, "key2", pc.APIKey)
+ require.Equal(t, "https://api.openai.com/v2", pc.BaseURL)
}
func TestConfig_setDefaults(t *testing.T) {
@@ -39,27 +41,27 @@ func TestConfig_setDefaults(t *testing.T) {
cfg.setDefaults("/tmp")
- assert.NotNil(t, cfg.Options)
- assert.NotNil(t, cfg.Options.TUI)
- assert.NotNil(t, cfg.Options.ContextPaths)
- assert.NotNil(t, cfg.Providers)
- assert.NotNil(t, cfg.Models)
- assert.NotNil(t, cfg.LSP)
- assert.NotNil(t, cfg.MCP)
- assert.Equal(t, filepath.Join("/tmp", ".crush"), cfg.Options.DataDirectory)
+ require.NotNil(t, cfg.Options)
+ require.NotNil(t, cfg.Options.TUI)
+ require.NotNil(t, cfg.Options.ContextPaths)
+ require.NotNil(t, cfg.Providers)
+ require.NotNil(t, cfg.Models)
+ require.NotNil(t, cfg.LSP)
+ require.NotNil(t, cfg.MCP)
+ require.Equal(t, filepath.Join("/tmp", ".crush"), cfg.Options.DataDirectory)
for _, path := range defaultContextPaths {
- assert.Contains(t, cfg.Options.ContextPaths, path)
+ require.Contains(t, cfg.Options.ContextPaths, path)
}
- assert.Equal(t, "/tmp", cfg.workingDir)
+ require.Equal(t, "/tmp", cfg.workingDir)
}
func TestConfig_configureProviders(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$OPENAI_API_KEY",
APIEndpoint: "https://api.openai.com/v1",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
@@ -72,42 +74,42 @@ func TestConfig_configureProviders(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
- assert.Len(t, cfg.Providers, 1)
+ require.NoError(t, err)
+ require.Equal(t, 1, cfg.Providers.Len())
// We want to make sure that we keep the configured API key as a placeholder
- assert.Equal(t, "$OPENAI_API_KEY", cfg.Providers["openai"].APIKey)
+ pc, _ := cfg.Providers.Get("openai")
+ require.Equal(t, "$OPENAI_API_KEY", pc.APIKey)
}
func TestConfig_configureProvidersWithOverride(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$OPENAI_API_KEY",
APIEndpoint: "https://api.openai.com/v1",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
- "openai": {
- APIKey: "xyz",
- BaseURL: "https://api.openai.com/v2",
- Models: []provider.Model{
- {
- ID: "test-model",
- Model: "Updated",
- },
- {
- ID: "another-model",
- },
- },
+ Providers: csync.NewMap[string, ProviderConfig](),
+ }
+ cfg.Providers.Set("openai", ProviderConfig{
+ APIKey: "xyz",
+ BaseURL: "https://api.openai.com/v2",
+ Models: []catwalk.Model{
+ {
+ ID: "test-model",
+ Name: "Updated",
+ },
+ {
+ ID: "another-model",
},
},
- }
+ })
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{
@@ -115,40 +117,41 @@ func TestConfig_configureProvidersWithOverride(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
- assert.Len(t, cfg.Providers, 1)
+ require.NoError(t, err)
+ require.Equal(t, 1, cfg.Providers.Len())
// We want to make sure that we keep the configured API key as a placeholder
- assert.Equal(t, "xyz", cfg.Providers["openai"].APIKey)
- assert.Equal(t, "https://api.openai.com/v2", cfg.Providers["openai"].BaseURL)
- assert.Len(t, cfg.Providers["openai"].Models, 2)
- assert.Equal(t, "Updated", cfg.Providers["openai"].Models[0].Model)
+ pc, _ := cfg.Providers.Get("openai")
+ require.Equal(t, "xyz", pc.APIKey)
+ require.Equal(t, "https://api.openai.com/v2", pc.BaseURL)
+ require.Len(t, pc.Models, 2)
+ require.Equal(t, "Updated", pc.Models[0].Name)
}
func TestConfig_configureProvidersWithNewProvider(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$OPENAI_API_KEY",
APIEndpoint: "https://api.openai.com/v1",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "xyz",
BaseURL: "https://api.someendpoint.com/v2",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "test-model",
},
},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{
@@ -156,28 +159,29 @@ func TestConfig_configureProvidersWithNewProvider(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
// Should be to because of the env variable
- assert.Len(t, cfg.Providers, 2)
+ require.Equal(t, cfg.Providers.Len(), 2)
// We want to make sure that we keep the configured API key as a placeholder
- assert.Equal(t, "xyz", cfg.Providers["custom"].APIKey)
+ pc, _ := cfg.Providers.Get("custom")
+ require.Equal(t, "xyz", pc.APIKey)
// Make sure we set the ID correctly
- assert.Equal(t, "custom", cfg.Providers["custom"].ID)
- assert.Equal(t, "https://api.someendpoint.com/v2", cfg.Providers["custom"].BaseURL)
- assert.Len(t, cfg.Providers["custom"].Models, 1)
+ require.Equal(t, "custom", pc.ID)
+ require.Equal(t, "https://api.someendpoint.com/v2", pc.BaseURL)
+ require.Len(t, pc.Models, 1)
- _, ok := cfg.Providers["openai"]
- assert.True(t, ok, "OpenAI provider should still be present")
+ _, ok := cfg.Providers.Get("openai")
+ require.True(t, ok, "OpenAI provider should still be present")
}
func TestConfig_configureProvidersBedrockWithCredentials(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderBedrock,
+ ID: catwalk.InferenceProviderBedrock,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "anthropic.claude-sonnet-4-20250514-v1:0",
}},
},
@@ -191,22 +195,22 @@ func TestConfig_configureProvidersBedrockWithCredentials(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
- assert.Len(t, cfg.Providers, 1)
+ require.NoError(t, err)
+ require.Equal(t, cfg.Providers.Len(), 1)
- bedrockProvider, ok := cfg.Providers["bedrock"]
- assert.True(t, ok, "Bedrock provider should be present")
- assert.Len(t, bedrockProvider.Models, 1)
- assert.Equal(t, "anthropic.claude-sonnet-4-20250514-v1:0", bedrockProvider.Models[0].ID)
+ bedrockProvider, ok := cfg.Providers.Get("bedrock")
+ require.True(t, ok, "Bedrock provider should be present")
+ require.Len(t, bedrockProvider.Models, 1)
+ require.Equal(t, "anthropic.claude-sonnet-4-20250514-v1:0", bedrockProvider.Models[0].ID)
}
func TestConfig_configureProvidersBedrockWithoutCredentials(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderBedrock,
+ ID: catwalk.InferenceProviderBedrock,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "anthropic.claude-sonnet-4-20250514-v1:0",
}},
},
@@ -217,18 +221,18 @@ func TestConfig_configureProvidersBedrockWithoutCredentials(t *testing.T) {
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
// Provider should not be configured without credentials
- assert.Len(t, cfg.Providers, 0)
+ require.Equal(t, cfg.Providers.Len(), 0)
}
func TestConfig_configureProvidersBedrockWithoutUnsupportedModel(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderBedrock,
+ ID: catwalk.InferenceProviderBedrock,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "some-random-model",
}},
},
@@ -242,16 +246,16 @@ func TestConfig_configureProvidersBedrockWithoutUnsupportedModel(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.Error(t, err)
+ require.Error(t, err)
}
func TestConfig_configureProvidersVertexAIWithCredentials(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderVertexAI,
+ ID: catwalk.InferenceProviderVertexAI,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "gemini-pro",
}},
},
@@ -260,30 +264,29 @@ func TestConfig_configureProvidersVertexAIWithCredentials(t *testing.T) {
cfg := &Config{}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{
- "GOOGLE_GENAI_USE_VERTEXAI": "true",
- "GOOGLE_CLOUD_PROJECT": "test-project",
- "GOOGLE_CLOUD_LOCATION": "us-central1",
+ "VERTEXAI_PROJECT": "test-project",
+ "VERTEXAI_LOCATION": "us-central1",
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
- assert.Len(t, cfg.Providers, 1)
-
- vertexProvider, ok := cfg.Providers["vertexai"]
- assert.True(t, ok, "VertexAI provider should be present")
- assert.Len(t, vertexProvider.Models, 1)
- assert.Equal(t, "gemini-pro", vertexProvider.Models[0].ID)
- assert.Equal(t, "test-project", vertexProvider.ExtraParams["project"])
- assert.Equal(t, "us-central1", vertexProvider.ExtraParams["location"])
+ require.NoError(t, err)
+ require.Equal(t, cfg.Providers.Len(), 1)
+
+ vertexProvider, ok := cfg.Providers.Get("vertexai")
+ require.True(t, ok, "VertexAI provider should be present")
+ require.Len(t, vertexProvider.Models, 1)
+ require.Equal(t, "gemini-pro", vertexProvider.Models[0].ID)
+ require.Equal(t, "test-project", vertexProvider.ExtraParams["project"])
+ require.Equal(t, "us-central1", vertexProvider.ExtraParams["location"])
}
func TestConfig_configureProvidersVertexAIWithoutCredentials(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderVertexAI,
+ ID: catwalk.InferenceProviderVertexAI,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "gemini-pro",
}},
},
@@ -298,18 +301,18 @@ func TestConfig_configureProvidersVertexAIWithoutCredentials(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
// Provider should not be configured without proper credentials
- assert.Len(t, cfg.Providers, 0)
+ require.Equal(t, cfg.Providers.Len(), 0)
}
func TestConfig_configureProvidersVertexAIMissingProject(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderVertexAI,
+ ID: catwalk.InferenceProviderVertexAI,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "gemini-pro",
}},
},
@@ -323,18 +326,18 @@ func TestConfig_configureProvidersVertexAIMissingProject(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
// Provider should not be configured without project
- assert.Len(t, cfg.Providers, 0)
+ require.Equal(t, cfg.Providers.Len(), 0)
}
func TestConfig_configureProvidersSetProviderID(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$OPENAI_API_KEY",
APIEndpoint: "https://api.openai.com/v1",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
@@ -347,17 +350,18 @@ func TestConfig_configureProvidersSetProviderID(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
- assert.Len(t, cfg.Providers, 1)
+ require.NoError(t, err)
+ require.Equal(t, cfg.Providers.Len(), 1)
// Provider ID should be set
- assert.Equal(t, "openai", cfg.Providers["openai"].ID)
+ pc, _ := cfg.Providers.Get("openai")
+ require.Equal(t, "openai", pc.ID)
}
func TestConfig_EnabledProviders(t *testing.T) {
t.Run("all providers enabled", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"openai": {
ID: "openai",
APIKey: "key1",
@@ -368,16 +372,16 @@ func TestConfig_EnabledProviders(t *testing.T) {
APIKey: "key2",
Disable: false,
},
- },
+ }),
}
enabled := cfg.EnabledProviders()
- assert.Len(t, enabled, 2)
+ require.Len(t, enabled, 2)
})
t.Run("some providers disabled", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"openai": {
ID: "openai",
APIKey: "key1",
@@ -388,50 +392,50 @@ func TestConfig_EnabledProviders(t *testing.T) {
APIKey: "key2",
Disable: true,
},
- },
+ }),
}
enabled := cfg.EnabledProviders()
- assert.Len(t, enabled, 1)
- assert.Equal(t, "openai", enabled[0].ID)
+ require.Len(t, enabled, 1)
+ require.Equal(t, "openai", enabled[0].ID)
})
t.Run("empty providers map", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{},
+ Providers: csync.NewMap[string, ProviderConfig](),
}
enabled := cfg.EnabledProviders()
- assert.Len(t, enabled, 0)
+ require.Len(t, enabled, 0)
})
}
func TestConfig_IsConfigured(t *testing.T) {
t.Run("returns true when at least one provider is enabled", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"openai": {
ID: "openai",
APIKey: "key1",
Disable: false,
},
- },
+ }),
}
- assert.True(t, cfg.IsConfigured())
+ require.True(t, cfg.IsConfigured())
})
t.Run("returns false when no providers are configured", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{},
+ Providers: csync.NewMap[string, ProviderConfig](),
}
- assert.False(t, cfg.IsConfigured())
+ require.False(t, cfg.IsConfigured())
})
t.Run("returns false when all providers are disabled", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"openai": {
ID: "openai",
APIKey: "key1",
@@ -442,31 +446,31 @@ func TestConfig_IsConfigured(t *testing.T) {
APIKey: "key2",
Disable: true,
},
- },
+ }),
}
- assert.False(t, cfg.IsConfigured())
+ require.False(t, cfg.IsConfigured())
})
}
func TestConfig_configureProvidersWithDisabledProvider(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$OPENAI_API_KEY",
APIEndpoint: "https://api.openai.com/v1",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"openai": {
Disable: true,
},
- },
+ }),
}
cfg.setDefaults("/tmp")
@@ -475,185 +479,214 @@ func TestConfig_configureProvidersWithDisabledProvider(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
// Provider should be removed from config when disabled
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["openai"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("openai")
+ require.False(t, exists)
}
func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
t.Run("custom provider with missing API key is allowed, but not known providers", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
BaseURL: "https://api.custom.com/v1",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
"openai": {
APIKey: "$MISSING",
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
- err := cfg.configureProviders(env, resolver, []provider.Provider{})
- assert.NoError(t, err)
+ err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 1)
- _, exists := cfg.Providers["custom"]
- assert.True(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 1)
+ _, exists := cfg.Providers.Get("custom")
+ require.True(t, exists)
})
t.Run("custom provider with missing BaseURL is removed", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
- err := cfg.configureProviders(env, resolver, []provider.Provider{})
- assert.NoError(t, err)
+ err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["custom"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("custom")
+ require.False(t, exists)
})
t.Run("custom provider with no models is removed", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
BaseURL: "https://api.custom.com/v1",
- Models: []provider.Model{},
+ Models: []catwalk.Model{},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
- err := cfg.configureProviders(env, resolver, []provider.Provider{})
- assert.NoError(t, err)
+ err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["custom"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("custom")
+ require.False(t, exists)
})
t.Run("custom provider with unsupported type is removed", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
BaseURL: "https://api.custom.com/v1",
Type: "unsupported",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
- err := cfg.configureProviders(env, resolver, []provider.Provider{})
- assert.NoError(t, err)
+ err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["custom"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("custom")
+ require.False(t, exists)
})
t.Run("valid custom provider is kept and ID is set", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
BaseURL: "https://api.custom.com/v1",
- Type: provider.TypeOpenAI,
- Models: []provider.Model{{
+ Type: catwalk.TypeOpenAI,
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
- err := cfg.configureProviders(env, resolver, []provider.Provider{})
- assert.NoError(t, err)
-
- assert.Len(t, cfg.Providers, 1)
- customProvider, exists := cfg.Providers["custom"]
- assert.True(t, exists)
- assert.Equal(t, "custom", customProvider.ID)
- assert.Equal(t, "test-key", customProvider.APIKey)
- assert.Equal(t, "https://api.custom.com/v1", customProvider.BaseURL)
+ err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
+ require.NoError(t, err)
+
+ require.Equal(t, cfg.Providers.Len(), 1)
+ customProvider, exists := cfg.Providers.Get("custom")
+ require.True(t, exists)
+ require.Equal(t, "custom", customProvider.ID)
+ require.Equal(t, "test-key", customProvider.APIKey)
+ require.Equal(t, "https://api.custom.com/v1", customProvider.BaseURL)
+ })
+
+ t.Run("custom anthropic provider is supported", func(t *testing.T) {
+ cfg := &Config{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
+ "custom-anthropic": {
+ APIKey: "test-key",
+ BaseURL: "https://api.anthropic.com/v1",
+ Type: catwalk.TypeAnthropic,
+ Models: []catwalk.Model{{
+ ID: "claude-3-sonnet",
+ }},
+ },
+ }),
+ }
+ cfg.setDefaults("/tmp")
+
+ env := env.NewFromMap(map[string]string{})
+ resolver := NewEnvironmentVariableResolver(env)
+ err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
+ require.NoError(t, err)
+
+ require.Equal(t, cfg.Providers.Len(), 1)
+ customProvider, exists := cfg.Providers.Get("custom-anthropic")
+ require.True(t, exists)
+ require.Equal(t, "custom-anthropic", customProvider.ID)
+ require.Equal(t, "test-key", customProvider.APIKey)
+ require.Equal(t, "https://api.anthropic.com/v1", customProvider.BaseURL)
+ require.Equal(t, catwalk.TypeAnthropic, customProvider.Type)
})
t.Run("disabled custom provider is removed", func(t *testing.T) {
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
BaseURL: "https://api.custom.com/v1",
- Type: provider.TypeOpenAI,
+ Type: catwalk.TypeOpenAI,
Disable: true,
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
- err := cfg.configureProviders(env, resolver, []provider.Provider{})
- assert.NoError(t, err)
+ err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["custom"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("custom")
+ require.False(t, exists)
})
}
func TestConfig_configureProvidersEnhancedCredentialValidation(t *testing.T) {
t.Run("VertexAI provider removed when credentials missing with existing config", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderVertexAI,
+ ID: catwalk.InferenceProviderVertexAI,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "gemini-pro",
}},
},
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"vertexai": {
BaseURL: "custom-url",
},
- },
+ }),
}
cfg.setDefaults("/tmp")
@@ -662,93 +695,93 @@ func TestConfig_configureProvidersEnhancedCredentialValidation(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["vertexai"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("vertexai")
+ require.False(t, exists)
})
t.Run("Bedrock provider removed when AWS credentials missing with existing config", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
- ID: provider.InferenceProviderBedrock,
+ ID: catwalk.InferenceProviderBedrock,
APIKey: "",
APIEndpoint: "",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "anthropic.claude-sonnet-4-20250514-v1:0",
}},
},
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"bedrock": {
BaseURL: "custom-url",
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["bedrock"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("bedrock")
+ require.False(t, exists)
})
t.Run("provider removed when API key missing with existing config", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$MISSING_API_KEY",
APIEndpoint: "https://api.openai.com/v1",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"openai": {
BaseURL: "custom-url",
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 0)
- _, exists := cfg.Providers["openai"]
- assert.False(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 0)
+ _, exists := cfg.Providers.Get("openai")
+ require.False(t, exists)
})
t.Run("known provider should still be added if the endpoint is missing the client will use default endpoints", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$OPENAI_API_KEY",
APIEndpoint: "$MISSING_ENDPOINT",
- Models: []provider.Model{{
+ Models: []catwalk.Model{{
ID: "test-model",
}},
},
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"openai": {
APIKey: "test-key",
},
- },
+ }),
}
cfg.setDefaults("/tmp")
@@ -757,23 +790,23 @@ func TestConfig_configureProvidersEnhancedCredentialValidation(t *testing.T) {
})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
- assert.Len(t, cfg.Providers, 1)
- _, exists := cfg.Providers["openai"]
- assert.True(t, exists)
+ require.Equal(t, cfg.Providers.Len(), 1)
+ _, exists := cfg.Providers.Get("openai")
+ require.True(t, exists)
})
}
func TestConfig_defaultModelSelection(t *testing.T) {
t.Run("default behavior uses the default models for given provider", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "abc",
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "large-model",
DefaultMaxTokens: 1000,
@@ -791,25 +824,25 @@ func TestConfig_defaultModelSelection(t *testing.T) {
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
large, small, err := cfg.defaultModelSelection(knownProviders)
- assert.NoError(t, err)
- assert.Equal(t, "large-model", large.Model)
- assert.Equal(t, "openai", large.Provider)
- assert.Equal(t, int64(1000), large.MaxTokens)
- assert.Equal(t, "small-model", small.Model)
- assert.Equal(t, "openai", small.Provider)
- assert.Equal(t, int64(500), small.MaxTokens)
+ require.NoError(t, err)
+ require.Equal(t, "large-model", large.Model)
+ require.Equal(t, "openai", large.Provider)
+ require.Equal(t, int64(1000), large.MaxTokens)
+ require.Equal(t, "small-model", small.Model)
+ require.Equal(t, "openai", small.Provider)
+ require.Equal(t, int64(500), small.MaxTokens)
})
t.Run("should error if no providers configured", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$MISSING_KEY",
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "large-model",
DefaultMaxTokens: 1000,
@@ -827,19 +860,19 @@ func TestConfig_defaultModelSelection(t *testing.T) {
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
_, _, err = cfg.defaultModelSelection(knownProviders)
- assert.Error(t, err)
+ require.Error(t, err)
})
t.Run("should error if model is missing", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "abc",
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "not-large-model",
DefaultMaxTokens: 1000,
@@ -857,19 +890,19 @@ func TestConfig_defaultModelSelection(t *testing.T) {
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
_, _, err = cfg.defaultModelSelection(knownProviders)
- assert.Error(t, err)
+ require.Error(t, err)
})
t.Run("should configure the default models with a custom provider", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$MISSING", // will not be included in the config
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "not-large-model",
DefaultMaxTokens: 1000,
@@ -883,42 +916,42 @@ func TestConfig_defaultModelSelection(t *testing.T) {
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
BaseURL: "https://api.custom.com/v1",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "model",
DefaultMaxTokens: 600,
},
},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
large, small, err := cfg.defaultModelSelection(knownProviders)
- assert.NoError(t, err)
- assert.Equal(t, "model", large.Model)
- assert.Equal(t, "custom", large.Provider)
- assert.Equal(t, int64(600), large.MaxTokens)
- assert.Equal(t, "model", small.Model)
- assert.Equal(t, "custom", small.Provider)
- assert.Equal(t, int64(600), small.MaxTokens)
+ require.NoError(t, err)
+ require.Equal(t, "model", large.Model)
+ require.Equal(t, "custom", large.Provider)
+ require.Equal(t, int64(600), large.MaxTokens)
+ require.Equal(t, "model", small.Model)
+ require.Equal(t, "custom", small.Provider)
+ require.Equal(t, int64(600), small.MaxTokens)
})
t.Run("should fail if no model configured", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "$MISSING", // will not be included in the config
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "not-large-model",
DefaultMaxTokens: 1000,
@@ -932,30 +965,30 @@ func TestConfig_defaultModelSelection(t *testing.T) {
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
BaseURL: "https://api.custom.com/v1",
- Models: []provider.Model{},
+ Models: []catwalk.Model{},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
_, _, err = cfg.defaultModelSelection(knownProviders)
- assert.Error(t, err)
+ require.Error(t, err)
})
t.Run("should use the default provider first", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "set",
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "large-model",
DefaultMaxTokens: 1000,
@@ -969,44 +1002,44 @@ func TestConfig_defaultModelSelection(t *testing.T) {
}
cfg := &Config{
- Providers: map[string]ProviderConfig{
+ Providers: csync.NewMapFrom(map[string]ProviderConfig{
"custom": {
APIKey: "test-key",
BaseURL: "https://api.custom.com/v1",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "large-model",
DefaultMaxTokens: 1000,
},
},
},
- },
+ }),
}
cfg.setDefaults("/tmp")
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
large, small, err := cfg.defaultModelSelection(knownProviders)
- assert.NoError(t, err)
- assert.Equal(t, "large-model", large.Model)
- assert.Equal(t, "openai", large.Provider)
- assert.Equal(t, int64(1000), large.MaxTokens)
- assert.Equal(t, "small-model", small.Model)
- assert.Equal(t, "openai", small.Provider)
- assert.Equal(t, int64(500), small.MaxTokens)
+ require.NoError(t, err)
+ require.Equal(t, "large-model", large.Model)
+ require.Equal(t, "openai", large.Provider)
+ require.Equal(t, int64(1000), large.MaxTokens)
+ require.Equal(t, "small-model", small.Model)
+ require.Equal(t, "openai", small.Provider)
+ require.Equal(t, int64(500), small.MaxTokens)
})
}
func TestConfig_configureSelectedModels(t *testing.T) {
t.Run("should override defaults", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "abc",
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "larger-model",
DefaultMaxTokens: 2000,
@@ -1034,27 +1067,27 @@ func TestConfig_configureSelectedModels(t *testing.T) {
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
err = cfg.configureSelectedModels(knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
large := cfg.Models[SelectedModelTypeLarge]
small := cfg.Models[SelectedModelTypeSmall]
- assert.Equal(t, "larger-model", large.Model)
- assert.Equal(t, "openai", large.Provider)
- assert.Equal(t, int64(2000), large.MaxTokens)
- assert.Equal(t, "small-model", small.Model)
- assert.Equal(t, "openai", small.Provider)
- assert.Equal(t, int64(500), small.MaxTokens)
+ require.Equal(t, "larger-model", large.Model)
+ require.Equal(t, "openai", large.Provider)
+ require.Equal(t, int64(2000), large.MaxTokens)
+ require.Equal(t, "small-model", small.Model)
+ require.Equal(t, "openai", small.Provider)
+ require.Equal(t, int64(500), small.MaxTokens)
})
t.Run("should be possible to use multiple providers", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "abc",
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "large-model",
DefaultMaxTokens: 1000,
@@ -1070,7 +1103,7 @@ func TestConfig_configureSelectedModels(t *testing.T) {
APIKey: "abc",
DefaultLargeModelID: "a-large-model",
DefaultSmallModelID: "a-small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "a-large-model",
DefaultMaxTokens: 1000,
@@ -1096,28 +1129,28 @@ func TestConfig_configureSelectedModels(t *testing.T) {
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
err = cfg.configureSelectedModels(knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
large := cfg.Models[SelectedModelTypeLarge]
small := cfg.Models[SelectedModelTypeSmall]
- assert.Equal(t, "large-model", large.Model)
- assert.Equal(t, "openai", large.Provider)
- assert.Equal(t, int64(1000), large.MaxTokens)
- assert.Equal(t, "a-small-model", small.Model)
- assert.Equal(t, "anthropic", small.Provider)
- assert.Equal(t, int64(300), small.MaxTokens)
+ require.Equal(t, "large-model", large.Model)
+ require.Equal(t, "openai", large.Provider)
+ require.Equal(t, int64(1000), large.MaxTokens)
+ require.Equal(t, "a-small-model", small.Model)
+ require.Equal(t, "anthropic", small.Provider)
+ require.Equal(t, int64(300), small.MaxTokens)
})
t.Run("should override the max tokens only", func(t *testing.T) {
- knownProviders := []provider.Provider{
+ knownProviders := []catwalk.Provider{
{
ID: "openai",
APIKey: "abc",
DefaultLargeModelID: "large-model",
DefaultSmallModelID: "small-model",
- Models: []provider.Model{
+ Models: []catwalk.Model{
{
ID: "large-model",
DefaultMaxTokens: 1000,
@@ -1141,13 +1174,13 @@ func TestConfig_configureSelectedModels(t *testing.T) {
env := env.NewFromMap(map[string]string{})
resolver := NewEnvironmentVariableResolver(env)
err := cfg.configureProviders(env, resolver, knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
err = cfg.configureSelectedModels(knownProviders)
- assert.NoError(t, err)
+ require.NoError(t, err)
large := cfg.Models[SelectedModelTypeLarge]
- assert.Equal(t, "large-model", large.Model)
- assert.Equal(t, "openai", large.Provider)
- assert.Equal(t, int64(100), large.MaxTokens)
+ require.Equal(t, "large-model", large.Model)
+ require.Equal(t, "openai", large.Provider)
+ require.Equal(t, int64(100), large.MaxTokens)
})
}
diff --git a/internal/config/provider.go b/internal/config/provider.go
index b8369b934963aca0a7f449fb219764ee079493ef..e1efc503cac556f529f390c63d7dde51870c729b 100644
--- a/internal/config/provider.go
+++ b/internal/config/provider.go
@@ -1,23 +1,26 @@
package config
import (
+ "cmp"
"encoding/json"
+ "fmt"
+ "log/slog"
"os"
"path/filepath"
"runtime"
"sync"
+ "time"
- "github.com/charmbracelet/crush/internal/fur/client"
- "github.com/charmbracelet/crush/internal/fur/provider"
+ "github.com/charmbracelet/catwalk/pkg/catwalk"
)
type ProviderClient interface {
- GetProviders() ([]provider.Provider, error)
+ GetProviders() ([]catwalk.Provider, error)
}
var (
providerOnce sync.Once
- providerList []provider.Provider
+ providerList []catwalk.Provider
)
// file to cache provider data
@@ -41,58 +44,90 @@ func providerCacheFileData() string {
return filepath.Join(os.Getenv("HOME"), ".local", "share", appName, "providers.json")
}
-func saveProvidersInCache(path string, providers []provider.Provider) error {
- dir := filepath.Dir(path)
- if err := os.MkdirAll(dir, 0o755); err != nil {
- return err
+func saveProvidersInCache(path string, providers []catwalk.Provider) error {
+ slog.Info("Saving cached provider data", "path", path)
+ if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
+ return fmt.Errorf("failed to create directory for provider cache: %w", err)
}
data, err := json.MarshalIndent(providers, "", " ")
if err != nil {
- return err
+ return fmt.Errorf("failed to marshal provider data: %w", err)
}
- return os.WriteFile(path, data, 0o644)
+ if err := os.WriteFile(path, data, 0o644); err != nil {
+ return fmt.Errorf("failed to write provider data to cache: %w", err)
+ }
+ return nil
}
-func loadProvidersFromCache(path string) ([]provider.Provider, error) {
+func loadProvidersFromCache(path string) ([]catwalk.Provider, error) {
data, err := os.ReadFile(path)
if err != nil {
- return nil, err
+ return nil, fmt.Errorf("failed to read provider cache file: %w", err)
}
- var providers []provider.Provider
- err = json.Unmarshal(data, &providers)
- return providers, err
-}
-
-func loadProviders(path string, client ProviderClient) ([]provider.Provider, error) {
- providers, err := client.GetProviders()
- if err != nil {
- fallbackToCache, err := loadProvidersFromCache(path)
- if err != nil {
- return nil, err
- }
- providers = fallbackToCache
- } else {
- if err := saveProvidersInCache(path, providerList); err != nil {
- return nil, err
- }
+ var providers []catwalk.Provider
+ if err := json.Unmarshal(data, &providers); err != nil {
+ return nil, fmt.Errorf("failed to unmarshal provider data from cache: %w", err)
}
return providers, nil
}
-func Providers() ([]provider.Provider, error) {
- return LoadProviders(client.New())
+func Providers() ([]catwalk.Provider, error) {
+ catwalkURL := cmp.Or(os.Getenv("CATWALK_URL"), defaultCatwalkURL)
+ client := catwalk.NewWithURL(catwalkURL)
+ path := providerCacheFileData()
+ return loadProvidersOnce(client, path)
}
-func LoadProviders(client ProviderClient) ([]provider.Provider, error) {
+func loadProvidersOnce(client ProviderClient, path string) ([]catwalk.Provider, error) {
var err error
providerOnce.Do(func() {
- providerList, err = loadProviders(providerCacheFileData(), client)
+ providerList, err = loadProviders(client, path)
})
if err != nil {
return nil, err
}
return providerList, nil
}
+
+func loadProviders(client ProviderClient, path string) (providerList []catwalk.Provider, err error) {
+ // if cache is not stale, load from it
+ stale, exists := isCacheStale(path)
+ if !stale {
+ slog.Info("Using cached provider data", "path", path)
+ providerList, err = loadProvidersFromCache(path)
+ if len(providerList) > 0 && err == nil {
+ go func() {
+ slog.Info("Updating provider cache in background")
+ updated, uerr := client.GetProviders()
+ if len(updated) > 0 && uerr == nil {
+ _ = saveProvidersInCache(path, updated)
+ }
+ }()
+ return
+ }
+ }
+
+ slog.Info("Getting live provider data")
+ providerList, err = client.GetProviders()
+ if len(providerList) > 0 && err == nil {
+ err = saveProvidersInCache(path, providerList)
+ return
+ }
+ if !exists {
+ err = fmt.Errorf("failed to load providers")
+ return
+ }
+ providerList, err = loadProvidersFromCache(path)
+ return
+}
+
+func isCacheStale(path string) (stale, exists bool) {
+ info, err := os.Stat(path)
+ if err != nil {
+ return true, false
+ }
+ return time.Since(info.ModTime()) > 24*time.Hour, true
+}
diff --git a/internal/config/provider_empty_test.go b/internal/config/provider_empty_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..cb71cabfa5a01cb16b6ef2b6708d1780e31951a9
--- /dev/null
+++ b/internal/config/provider_empty_test.go
@@ -0,0 +1,47 @@
+package config
+
+import (
+ "encoding/json"
+ "os"
+ "testing"
+
+ "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "github.com/stretchr/testify/require"
+)
+
+type emptyProviderClient struct{}
+
+func (m *emptyProviderClient) GetProviders() ([]catwalk.Provider, error) {
+ return []catwalk.Provider{}, nil
+}
+
+func TestProvider_loadProvidersEmptyResult(t *testing.T) {
+ client := &emptyProviderClient{}
+ tmpPath := t.TempDir() + "/providers.json"
+
+ providers, err := loadProviders(client, tmpPath)
+ require.EqualError(t, err, "failed to load providers")
+ require.Empty(t, providers)
+ require.Len(t, providers, 0)
+
+ // Check that no cache file was created for empty results
+ require.NoFileExists(t, tmpPath, "Cache file should not exist for empty results")
+}
+
+func TestProvider_loadProvidersEmptyCache(t *testing.T) {
+ client := &mockProviderClient{shouldFail: false}
+ tmpPath := t.TempDir() + "/providers.json"
+
+ // Create an empty cache file
+ emptyProviders := []catwalk.Provider{}
+ data, err := json.Marshal(emptyProviders)
+ require.NoError(t, err)
+ require.NoError(t, os.WriteFile(tmpPath, data, 0o644))
+
+ // Should refresh and get real providers instead of using empty cache
+ providers, err := loadProviders(client, tmpPath)
+ require.NoError(t, err)
+ require.NotNil(t, providers)
+ require.Len(t, providers, 1)
+ require.Equal(t, "Mock", providers[0].Name)
+}
diff --git a/internal/config/provider_test.go b/internal/config/provider_test.go
index a3562838c7103239aa303c906c866220164a4ba0..ed2568d68a840798872af60c5132707e84a5cbbf 100644
--- a/internal/config/provider_test.go
+++ b/internal/config/provider_test.go
@@ -6,19 +6,19 @@ import (
"os"
"testing"
- "github.com/charmbracelet/crush/internal/fur/provider"
- "github.com/stretchr/testify/assert"
+ "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "github.com/stretchr/testify/require"
)
type mockProviderClient struct {
shouldFail bool
}
-func (m *mockProviderClient) GetProviders() ([]provider.Provider, error) {
+func (m *mockProviderClient) GetProviders() ([]catwalk.Provider, error) {
if m.shouldFail {
return nil, errors.New("failed to load providers")
}
- return []provider.Provider{
+ return []catwalk.Provider{
{
Name: "Mock",
},
@@ -28,22 +28,22 @@ func (m *mockProviderClient) GetProviders() ([]provider.Provider, error) {
func TestProvider_loadProvidersNoIssues(t *testing.T) {
client := &mockProviderClient{shouldFail: false}
tmpPath := t.TempDir() + "/providers.json"
- providers, err := loadProviders(tmpPath, client)
- assert.NoError(t, err)
- assert.NotNil(t, providers)
- assert.Len(t, providers, 1)
+ providers, err := loadProviders(client, tmpPath)
+ require.NoError(t, err)
+ require.NotNil(t, providers)
+ require.Len(t, providers, 1)
// check if file got saved
fileInfo, err := os.Stat(tmpPath)
- assert.NoError(t, err)
- assert.False(t, fileInfo.IsDir(), "Expected a file, not a directory")
+ require.NoError(t, err)
+ require.False(t, fileInfo.IsDir(), "Expected a file, not a directory")
}
func TestProvider_loadProvidersWithIssues(t *testing.T) {
client := &mockProviderClient{shouldFail: true}
tmpPath := t.TempDir() + "/providers.json"
// store providers to a temporary file
- oldProviders := []provider.Provider{
+ oldProviders := []catwalk.Provider{
{
Name: "OldProvider",
},
@@ -57,17 +57,17 @@ func TestProvider_loadProvidersWithIssues(t *testing.T) {
if err != nil {
t.Fatalf("Failed to write old providers to file: %v", err)
}
- providers, err := loadProviders(tmpPath, client)
- assert.NoError(t, err)
- assert.NotNil(t, providers)
- assert.Len(t, providers, 1)
- assert.Equal(t, "OldProvider", providers[0].Name, "Expected to keep old provider when loading fails")
+ providers, err := loadProviders(client, tmpPath)
+ require.NoError(t, err)
+ require.NotNil(t, providers)
+ require.Len(t, providers, 1)
+ require.Equal(t, "OldProvider", providers[0].Name, "Expected to keep old provider when loading fails")
}
func TestProvider_loadProvidersWithIssuesAndNoCache(t *testing.T) {
client := &mockProviderClient{shouldFail: true}
tmpPath := t.TempDir() + "/providers.json"
- providers, err := loadProviders(tmpPath, client)
- assert.Error(t, err)
- assert.Nil(t, providers, "Expected nil providers when loading fails and no cache exists")
+ providers, err := loadProviders(client, tmpPath)
+ require.Error(t, err)
+ require.Nil(t, providers, "Expected nil providers when loading fails and no cache exists")
}
diff --git a/internal/config/resolve.go b/internal/config/resolve.go
index 3c97a6456cf7fe5968311746d62b2772b21d6aaa..3ef3522b09e504d3c57105e8bbe393b0f7c38b2b 100644
--- a/internal/config/resolve.go
+++ b/internal/config/resolve.go
@@ -35,34 +35,120 @@ func NewShellVariableResolver(env env.Env) VariableResolver {
}
// ResolveValue is a method for resolving values, such as environment variables.
-// it will expect strings that start with `$` to be resolved as environment variables or shell commands.
-// if the string does not start with `$`, it will return the string as is.
+// it will resolve shell-like variable substitution anywhere in the string, including:
+// - $(command) for command substitution
+// - $VAR or ${VAR} for environment variables
func (r *shellVariableResolver) ResolveValue(value string) (string, error) {
- if !strings.HasPrefix(value, "$") {
+ // Special case: lone $ is an error (backward compatibility)
+ if value == "$" {
+ return "", fmt.Errorf("invalid value format: %s", value)
+ }
+
+ // If no $ found, return as-is
+ if !strings.Contains(value, "$") {
return value, nil
}
- if strings.HasPrefix(value, "$(") && strings.HasSuffix(value, ")") {
- command := strings.TrimSuffix(strings.TrimPrefix(value, "$("), ")")
+ result := value
+
+ // Handle command substitution: $(command)
+ for {
+ start := strings.Index(result, "$(")
+ if start == -1 {
+ break
+ }
+
+ // Find matching closing parenthesis
+ depth := 0
+ end := -1
+ for i := start + 2; i < len(result); i++ {
+ if result[i] == '(' {
+ depth++
+ } else if result[i] == ')' {
+ if depth == 0 {
+ end = i
+ break
+ }
+ depth--
+ }
+ }
+
+ if end == -1 {
+ return "", fmt.Errorf("unmatched $( in value: %s", value)
+ }
+
+ command := result[start+2 : end]
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
- defer cancel()
stdout, _, err := r.shell.Exec(ctx, command)
+ cancel()
if err != nil {
- return "", fmt.Errorf("command execution failed: %w", err)
+ return "", fmt.Errorf("command execution failed for '%s': %w", command, err)
}
- return strings.TrimSpace(stdout), nil
+
+ // Replace the $(command) with the output
+ replacement := strings.TrimSpace(stdout)
+ result = result[:start] + replacement + result[end+1:]
}
- if after, ok := strings.CutPrefix(value, "$"); ok {
- varName := after
- value = r.env.Get(varName)
- if value == "" {
+ // Handle environment variables: $VAR and ${VAR}
+ searchStart := 0
+ for {
+ start := strings.Index(result[searchStart:], "$")
+ if start == -1 {
+ break
+ }
+ start += searchStart // Adjust for the offset
+
+ // Skip if this is part of $( which we already handled
+ if start+1 < len(result) && result[start+1] == '(' {
+ // Skip past this $(...)
+ searchStart = start + 1
+ continue
+ }
+ var varName string
+ var end int
+
+ if start+1 < len(result) && result[start+1] == '{' {
+ // Handle ${VAR} format
+ closeIdx := strings.Index(result[start+2:], "}")
+ if closeIdx == -1 {
+ return "", fmt.Errorf("unmatched ${ in value: %s", value)
+ }
+ varName = result[start+2 : start+2+closeIdx]
+ end = start + 2 + closeIdx + 1
+ } else {
+ // Handle $VAR format - variable names must start with letter or underscore
+ if start+1 >= len(result) {
+ return "", fmt.Errorf("incomplete variable reference at end of string: %s", value)
+ }
+
+ if result[start+1] != '_' &&
+ (result[start+1] < 'a' || result[start+1] > 'z') &&
+ (result[start+1] < 'A' || result[start+1] > 'Z') {
+ return "", fmt.Errorf("invalid variable name starting with '%c' in: %s", result[start+1], value)
+ }
+
+ end = start + 1
+ for end < len(result) && (result[end] == '_' ||
+ (result[end] >= 'a' && result[end] <= 'z') ||
+ (result[end] >= 'A' && result[end] <= 'Z') ||
+ (result[end] >= '0' && result[end] <= '9')) {
+ end++
+ }
+ varName = result[start+1 : end]
+ }
+
+ envValue := r.env.Get(varName)
+ if envValue == "" {
return "", fmt.Errorf("environment variable %q not set", varName)
}
- return value, nil
+
+ result = result[:start] + envValue + result[end:]
+ searchStart = start + len(envValue) // Continue searching after the replacement
}
- return "", fmt.Errorf("invalid value format: %s", value)
+
+ return result, nil
}
type environmentVariableResolver struct {
diff --git a/internal/config/resolve_test.go b/internal/config/resolve_test.go
index 7cdcd2a7913cb581e5312f787791e8e89e699281..ec9b06c25bdc023acebffc71f043b54a8da21597 100644
--- a/internal/config/resolve_test.go
+++ b/internal/config/resolve_test.go
@@ -6,7 +6,7 @@ import (
"testing"
"github.com/charmbracelet/crush/internal/env"
- "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
// mockShell implements the Shell interface for testing
@@ -47,17 +47,7 @@ func TestShellVariableResolver_ResolveValue(t *testing.T) {
envVars: map[string]string{},
expectError: true,
},
- {
- name: "shell command execution",
- value: "$(echo hello)",
- shellFunc: func(ctx context.Context, command string) (stdout, stderr string, err error) {
- if command == "echo hello" {
- return "hello\n", "", nil
- }
- return "", "", errors.New("unexpected command")
- },
- expected: "hello",
- },
+
{
name: "shell command with whitespace trimming",
value: "$(echo ' spaced ')",
@@ -95,10 +85,175 @@ func TestShellVariableResolver_ResolveValue(t *testing.T) {
result, err := resolver.ResolveValue(tt.value)
if tt.expectError {
- assert.Error(t, err)
+ require.Error(t, err)
+ } else {
+ require.NoError(t, err)
+ require.Equal(t, tt.expected, result)
+ }
+ })
+ }
+}
+
+func TestShellVariableResolver_EnhancedResolveValue(t *testing.T) {
+ tests := []struct {
+ name string
+ value string
+ envVars map[string]string
+ shellFunc func(ctx context.Context, command string) (stdout, stderr string, err error)
+ expected string
+ expectError bool
+ }{
+ {
+ name: "command substitution within string",
+ value: "Bearer $(echo token123)",
+ shellFunc: func(ctx context.Context, command string) (stdout, stderr string, err error) {
+ if command == "echo token123" {
+ return "token123\n", "", nil
+ }
+ return "", "", errors.New("unexpected command")
+ },
+ expected: "Bearer token123",
+ },
+ {
+ name: "environment variable within string",
+ value: "Bearer $TOKEN",
+ envVars: map[string]string{"TOKEN": "sk-ant-123"},
+ expected: "Bearer sk-ant-123",
+ },
+ {
+ name: "environment variable with braces within string",
+ value: "Bearer ${TOKEN}",
+ envVars: map[string]string{"TOKEN": "sk-ant-456"},
+ expected: "Bearer sk-ant-456",
+ },
+ {
+ name: "mixed command and environment substitution",
+ value: "$USER-$(date +%Y)-$HOST",
+ envVars: map[string]string{
+ "USER": "testuser",
+ "HOST": "localhost",
+ },
+ shellFunc: func(ctx context.Context, command string) (stdout, stderr string, err error) {
+ if command == "date +%Y" {
+ return "2024\n", "", nil
+ }
+ return "", "", errors.New("unexpected command")
+ },
+ expected: "testuser-2024-localhost",
+ },
+ {
+ name: "multiple command substitutions",
+ value: "$(echo hello) $(echo world)",
+ shellFunc: func(ctx context.Context, command string) (stdout, stderr string, err error) {
+ switch command {
+ case "echo hello":
+ return "hello\n", "", nil
+ case "echo world":
+ return "world\n", "", nil
+ }
+ return "", "", errors.New("unexpected command")
+ },
+ expected: "hello world",
+ },
+ {
+ name: "nested parentheses in command",
+ value: "$(echo $(echo inner))",
+ shellFunc: func(ctx context.Context, command string) (stdout, stderr string, err error) {
+ if command == "echo $(echo inner)" {
+ return "nested\n", "", nil
+ }
+ return "", "", errors.New("unexpected command")
+ },
+ expected: "nested",
+ },
+ {
+ name: "lone dollar with non-variable chars",
+ value: "prefix$123suffix", // Numbers can't start variable names
+ expectError: true,
+ },
+ {
+ name: "dollar with special chars",
+ value: "a$@b$#c", // Special chars aren't valid in variable names
+ expectError: true,
+ },
+ {
+ name: "empty environment variable substitution",
+ value: "Bearer $EMPTY_VAR",
+ envVars: map[string]string{},
+ expectError: true,
+ },
+ {
+ name: "unmatched command substitution opening",
+ value: "Bearer $(echo test",
+ expectError: true,
+ },
+ {
+ name: "unmatched environment variable braces",
+ value: "Bearer ${TOKEN",
+ expectError: true,
+ },
+ {
+ name: "command substitution with error",
+ value: "Bearer $(false)",
+ shellFunc: func(ctx context.Context, command string) (stdout, stderr string, err error) {
+ return "", "", errors.New("command failed")
+ },
+ expectError: true,
+ },
+ {
+ name: "complex real-world example",
+ value: "Bearer $(cat /tmp/token.txt | base64 -w 0)",
+ shellFunc: func(ctx context.Context, command string) (stdout, stderr string, err error) {
+ if command == "cat /tmp/token.txt | base64 -w 0" {
+ return "c2stYW50LXRlc3Q=\n", "", nil
+ }
+ return "", "", errors.New("unexpected command")
+ },
+ expected: "Bearer c2stYW50LXRlc3Q=",
+ },
+ {
+ name: "environment variable with underscores and numbers",
+ value: "Bearer $API_KEY_V2",
+ envVars: map[string]string{"API_KEY_V2": "sk-test-123"},
+ expected: "Bearer sk-test-123",
+ },
+ {
+ name: "no substitution needed",
+ value: "Bearer sk-ant-static-token",
+ expected: "Bearer sk-ant-static-token",
+ },
+ {
+ name: "incomplete variable at end",
+ value: "Bearer $",
+ expectError: true,
+ },
+ {
+ name: "variable with invalid character",
+ value: "Bearer $VAR-NAME", // Hyphen not allowed in variable names
+ expectError: true,
+ },
+ {
+ name: "multiple invalid variables",
+ value: "$1$2$3",
+ expectError: true,
+ },
+ }
+
+ for _, tt := range tests {
+ t.Run(tt.name, func(t *testing.T) {
+ testEnv := env.NewFromMap(tt.envVars)
+ resolver := &shellVariableResolver{
+ shell: &mockShell{execFunc: tt.shellFunc},
+ env: testEnv,
+ }
+
+ result, err := resolver.ResolveValue(tt.value)
+
+ if tt.expectError {
+ require.Error(t, err)
} else {
- assert.NoError(t, err)
- assert.Equal(t, tt.expected, result)
+ require.NoError(t, err)
+ require.Equal(t, tt.expected, result)
}
})
}
@@ -151,10 +306,10 @@ func TestEnvironmentVariableResolver_ResolveValue(t *testing.T) {
result, err := resolver.ResolveValue(tt.value)
if tt.expectError {
- assert.Error(t, err)
+ require.Error(t, err)
} else {
- assert.NoError(t, err)
- assert.Equal(t, tt.expected, result)
+ require.NoError(t, err)
+ require.Equal(t, tt.expected, result)
}
})
}
@@ -164,14 +319,14 @@ func TestNewShellVariableResolver(t *testing.T) {
testEnv := env.NewFromMap(map[string]string{"TEST": "value"})
resolver := NewShellVariableResolver(testEnv)
- assert.NotNil(t, resolver)
- assert.Implements(t, (*VariableResolver)(nil), resolver)
+ require.NotNil(t, resolver)
+ require.Implements(t, (*VariableResolver)(nil), resolver)
}
func TestNewEnvironmentVariableResolver(t *testing.T) {
testEnv := env.NewFromMap(map[string]string{"TEST": "value"})
resolver := NewEnvironmentVariableResolver(testEnv)
- assert.NotNil(t, resolver)
- assert.Implements(t, (*VariableResolver)(nil), resolver)
+ require.NotNil(t, resolver)
+ require.Implements(t, (*VariableResolver)(nil), resolver)
}
diff --git a/internal/csync/doc.go b/internal/csync/doc.go
new file mode 100644
index 0000000000000000000000000000000000000000..b44fa2dac52172a8753e620e19f5c8d0a0481618
--- /dev/null
+++ b/internal/csync/doc.go
@@ -0,0 +1,3 @@
+// Package csync provides concurrent data structures for safe access in
+// multi-threaded environments.
+package csync
diff --git a/internal/csync/maps.go b/internal/csync/maps.go
new file mode 100644
index 0000000000000000000000000000000000000000..67796baff9f68b2a02382de625de70b78e204f4a
--- /dev/null
+++ b/internal/csync/maps.go
@@ -0,0 +1,117 @@
+package csync
+
+import (
+ "encoding/json"
+ "iter"
+ "maps"
+ "sync"
+)
+
+// Map is a concurrent map implementation that provides thread-safe access.
+type Map[K comparable, V any] struct {
+ inner map[K]V
+ mu sync.RWMutex
+}
+
+// NewMap creates a new thread-safe map with the specified key and value types.
+func NewMap[K comparable, V any]() *Map[K, V] {
+ return &Map[K, V]{
+ inner: make(map[K]V),
+ }
+}
+
+// NewMapFrom creates a new thread-safe map from an existing map.
+func NewMapFrom[K comparable, V any](m map[K]V) *Map[K, V] {
+ return &Map[K, V]{
+ inner: m,
+ }
+}
+
+// Set sets the value for the specified key in the map.
+func (m *Map[K, V]) Set(key K, value V) {
+ m.mu.Lock()
+ defer m.mu.Unlock()
+ m.inner[key] = value
+}
+
+// Del deletes the specified key from the map.
+func (m *Map[K, V]) Del(key K) {
+ m.mu.Lock()
+ defer m.mu.Unlock()
+ delete(m.inner, key)
+}
+
+// Get gets the value for the specified key from the map.
+func (m *Map[K, V]) Get(key K) (V, bool) {
+ m.mu.RLock()
+ defer m.mu.RUnlock()
+ v, ok := m.inner[key]
+ return v, ok
+}
+
+// Len returns the number of items in the map.
+func (m *Map[K, V]) Len() int {
+ m.mu.RLock()
+ defer m.mu.RUnlock()
+ return len(m.inner)
+}
+
+// Take gets an item and then deletes it.
+func (m *Map[K, V]) Take(key K) (V, bool) {
+ m.mu.Lock()
+ defer m.mu.Unlock()
+ v, ok := m.inner[key]
+ delete(m.inner, key)
+ return v, ok
+}
+
+// Seq2 returns an iter.Seq2 that yields key-value pairs from the map.
+func (m *Map[K, V]) Seq2() iter.Seq2[K, V] {
+ dst := make(map[K]V)
+ m.mu.RLock()
+ maps.Copy(dst, m.inner)
+ m.mu.RUnlock()
+ return func(yield func(K, V) bool) {
+ for k, v := range dst {
+ if !yield(k, v) {
+ return
+ }
+ }
+ }
+}
+
+// Seq returns an iter.Seq that yields values from the map.
+func (m *Map[K, V]) Seq() iter.Seq[V] {
+ return func(yield func(V) bool) {
+ for _, v := range m.Seq2() {
+ if !yield(v) {
+ return
+ }
+ }
+ }
+}
+
+var (
+ _ json.Unmarshaler = &Map[string, any]{}
+ _ json.Marshaler = &Map[string, any]{}
+)
+
+func (Map[K, V]) JSONSchemaAlias() any { //nolint
+ m := map[K]V{}
+ return m
+}
+
+// UnmarshalJSON implements json.Unmarshaler.
+func (m *Map[K, V]) UnmarshalJSON(data []byte) error {
+ m.mu.Lock()
+ defer m.mu.Unlock()
+ m.inner = make(map[K]V)
+ return json.Unmarshal(data, &m.inner)
+}
+
+// MarshalJSON implements json.Marshaler.
+func (m *Map[K, V]) MarshalJSON() ([]byte, error) {
+ m.mu.RLock()
+ defer m.mu.RUnlock()
+ return json.Marshal(m.inner)
+}
diff --git a/internal/csync/maps_test.go b/internal/csync/maps_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..2b1f1387f14a5feae3ad86d77482baaf4494c718
--- /dev/null
+++ b/internal/csync/maps_test.go
@@ -0,0 +1,677 @@
+package csync
+
+import (
+ "encoding/json"
+ "maps"
+ "sync"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestNewMap(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ require.NotNil(t, m)
+ require.NotNil(t, m.inner)
+ require.Equal(t, 0, m.Len())
+}
+
+func TestNewMapFrom(t *testing.T) {
+ t.Parallel()
+
+ original := map[string]int{
+ "key1": 1,
+ "key2": 2,
+ }
+
+ m := NewMapFrom(original)
+ require.NotNil(t, m)
+ require.Equal(t, original, m.inner)
+ require.Equal(t, 2, m.Len())
+
+ value, ok := m.Get("key1")
+ require.True(t, ok)
+ require.Equal(t, 1, value)
+}
+
+func TestMap_Set(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+
+ m.Set("key1", 42)
+ value, ok := m.Get("key1")
+ require.True(t, ok)
+ require.Equal(t, 42, value)
+ require.Equal(t, 1, m.Len())
+
+ m.Set("key1", 100)
+ value, ok = m.Get("key1")
+ require.True(t, ok)
+ require.Equal(t, 100, value)
+ require.Equal(t, 1, m.Len())
+}
+
+func TestMap_Get(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+
+ value, ok := m.Get("nonexistent")
+ require.False(t, ok)
+ require.Equal(t, 0, value)
+
+ m.Set("key1", 42)
+ value, ok = m.Get("key1")
+ require.True(t, ok)
+ require.Equal(t, 42, value)
+}
+
+func TestMap_Del(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 42)
+ m.Set("key2", 100)
+
+ require.Equal(t, 2, m.Len())
+
+ m.Del("key1")
+ _, ok := m.Get("key1")
+ require.False(t, ok)
+ require.Equal(t, 1, m.Len())
+
+ value, ok := m.Get("key2")
+ require.True(t, ok)
+ require.Equal(t, 100, value)
+
+ m.Del("nonexistent")
+ require.Equal(t, 1, m.Len())
+}
+
+func TestMap_Len(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ require.Equal(t, 0, m.Len())
+
+ m.Set("key1", 1)
+ require.Equal(t, 1, m.Len())
+
+ m.Set("key2", 2)
+ require.Equal(t, 2, m.Len())
+
+ m.Del("key1")
+ require.Equal(t, 1, m.Len())
+
+ m.Del("key2")
+ require.Equal(t, 0, m.Len())
+}
+
+func TestMap_Take(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 42)
+ m.Set("key2", 100)
+
+ require.Equal(t, 2, m.Len())
+
+ value, ok := m.Take("key1")
+ require.True(t, ok)
+ require.Equal(t, 42, value)
+ require.Equal(t, 1, m.Len())
+
+ _, exists := m.Get("key1")
+ require.False(t, exists)
+
+ value, ok = m.Get("key2")
+ require.True(t, ok)
+ require.Equal(t, 100, value)
+}
+
+func TestMap_Take_NonexistentKey(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 42)
+
+ value, ok := m.Take("nonexistent")
+ require.False(t, ok)
+ require.Equal(t, 0, value)
+ require.Equal(t, 1, m.Len())
+
+ value, ok = m.Get("key1")
+ require.True(t, ok)
+ require.Equal(t, 42, value)
+}
+
+func TestMap_Take_EmptyMap(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+
+ value, ok := m.Take("key1")
+ require.False(t, ok)
+ require.Equal(t, 0, value)
+ require.Equal(t, 0, m.Len())
+}
+
+func TestMap_Take_SameKeyTwice(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 42)
+
+ value, ok := m.Take("key1")
+ require.True(t, ok)
+ require.Equal(t, 42, value)
+ require.Equal(t, 0, m.Len())
+
+ value, ok = m.Take("key1")
+ require.False(t, ok)
+ require.Equal(t, 0, value)
+ require.Equal(t, 0, m.Len())
+}
+
+func TestMap_Seq2(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 1)
+ m.Set("key2", 2)
+ m.Set("key3", 3)
+
+ collected := maps.Collect(m.Seq2())
+
+ require.Equal(t, 3, len(collected))
+ require.Equal(t, 1, collected["key1"])
+ require.Equal(t, 2, collected["key2"])
+ require.Equal(t, 3, collected["key3"])
+}
+
+func TestMap_Seq2_EarlyReturn(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 1)
+ m.Set("key2", 2)
+ m.Set("key3", 3)
+
+ count := 0
+ for range m.Seq2() {
+ count++
+ if count == 2 {
+ break
+ }
+ }
+
+ require.Equal(t, 2, count)
+}
+
+func TestMap_Seq2_EmptyMap(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+
+ count := 0
+ for range m.Seq2() {
+ count++
+ }
+
+ require.Equal(t, 0, count)
+}
+
+func TestMap_Seq(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 1)
+ m.Set("key2", 2)
+ m.Set("key3", 3)
+
+ collected := make([]int, 0)
+ for v := range m.Seq() {
+ collected = append(collected, v)
+ }
+
+ require.Equal(t, 3, len(collected))
+ require.Contains(t, collected, 1)
+ require.Contains(t, collected, 2)
+ require.Contains(t, collected, 3)
+}
+
+func TestMap_Seq_EarlyReturn(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 1)
+ m.Set("key2", 2)
+ m.Set("key3", 3)
+
+ count := 0
+ for range m.Seq() {
+ count++
+ if count == 2 {
+ break
+ }
+ }
+
+ require.Equal(t, 2, count)
+}
+
+func TestMap_Seq_EmptyMap(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+
+ count := 0
+ for range m.Seq() {
+ count++
+ }
+
+ require.Equal(t, 0, count)
+}
+
+func TestMap_MarshalJSON(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("key1", 1)
+ m.Set("key2", 2)
+
+ data, err := json.Marshal(m)
+ require.NoError(t, err)
+
+ result := &Map[string, int]{}
+ err = json.Unmarshal(data, result)
+ require.NoError(t, err)
+ require.Equal(t, 2, result.Len())
+ v1, _ := result.Get("key1")
+ v2, _ := result.Get("key2")
+ require.Equal(t, 1, v1)
+ require.Equal(t, 2, v2)
+}
+
+func TestMap_MarshalJSON_EmptyMap(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+
+ data, err := json.Marshal(m)
+ require.NoError(t, err)
+ require.Equal(t, "{}", string(data))
+}
+
+func TestMap_UnmarshalJSON(t *testing.T) {
+ t.Parallel()
+
+ jsonData := `{"key1": 1, "key2": 2}`
+
+ m := NewMap[string, int]()
+ err := json.Unmarshal([]byte(jsonData), m)
+ require.NoError(t, err)
+
+ require.Equal(t, 2, m.Len())
+ value, ok := m.Get("key1")
+ require.True(t, ok)
+ require.Equal(t, 1, value)
+
+ value, ok = m.Get("key2")
+ require.True(t, ok)
+ require.Equal(t, 2, value)
+}
+
+func TestMap_UnmarshalJSON_EmptyJSON(t *testing.T) {
+ t.Parallel()
+
+ jsonData := `{}`
+
+ m := NewMap[string, int]()
+ err := json.Unmarshal([]byte(jsonData), m)
+ require.NoError(t, err)
+ require.Equal(t, 0, m.Len())
+}
+
+func TestMap_UnmarshalJSON_InvalidJSON(t *testing.T) {
+ t.Parallel()
+
+ jsonData := `{"key1": 1, "key2":}`
+
+ m := NewMap[string, int]()
+ err := json.Unmarshal([]byte(jsonData), m)
+ require.Error(t, err)
+}
+
+func TestMap_UnmarshalJSON_OverwritesExistingData(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[string, int]()
+ m.Set("existing", 999)
+
+ jsonData := `{"key1": 1, "key2": 2}`
+ err := json.Unmarshal([]byte(jsonData), m)
+ require.NoError(t, err)
+
+ require.Equal(t, 2, m.Len())
+ _, ok := m.Get("existing")
+ require.False(t, ok)
+
+ value, ok := m.Get("key1")
+ require.True(t, ok)
+ require.Equal(t, 1, value)
+}
+
+func TestMap_JSONRoundTrip(t *testing.T) {
+ t.Parallel()
+
+ original := NewMap[string, int]()
+ original.Set("key1", 1)
+ original.Set("key2", 2)
+ original.Set("key3", 3)
+
+ data, err := json.Marshal(original)
+ require.NoError(t, err)
+
+ restored := NewMap[string, int]()
+ err = json.Unmarshal(data, restored)
+ require.NoError(t, err)
+
+ require.Equal(t, original.Len(), restored.Len())
+
+ for k, v := range original.Seq2() {
+ restoredValue, ok := restored.Get(k)
+ require.True(t, ok)
+ require.Equal(t, v, restoredValue)
+ }
+}
+
+func TestMap_ConcurrentAccess(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[int, int]()
+ const numGoroutines = 100
+ const numOperations = 100
+
+ var wg sync.WaitGroup
+ wg.Add(numGoroutines)
+
+ for i := range numGoroutines {
+ go func(id int) {
+ defer wg.Done()
+ for j := range numOperations {
+ key := id*numOperations + j
+ m.Set(key, key*2)
+ value, ok := m.Get(key)
+ require.True(t, ok)
+ require.Equal(t, key*2, value)
+ }
+ }(i)
+ }
+
+ wg.Wait()
+
+ require.Equal(t, numGoroutines*numOperations, m.Len())
+}
+
+func TestMap_ConcurrentReadWrite(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[int, int]()
+ const numReaders = 50
+ const numWriters = 50
+ const numOperations = 100
+
+ for i := range 1000 {
+ m.Set(i, i)
+ }
+
+ var wg sync.WaitGroup
+ wg.Add(numReaders + numWriters)
+
+ for range numReaders {
+ go func() {
+ defer wg.Done()
+ for j := range numOperations {
+ key := j % 1000
+ value, ok := m.Get(key)
+ if ok {
+ require.Equal(t, key, value)
+ }
+ _ = m.Len()
+ }
+ }()
+ }
+
+ for i := range numWriters {
+ go func(id int) {
+ defer wg.Done()
+ for j := range numOperations {
+ key := 1000 + id*numOperations + j
+ m.Set(key, key)
+ if j%10 == 0 {
+ m.Del(key)
+ }
+ }
+ }(i)
+ }
+
+ wg.Wait()
+}
+
+func TestMap_ConcurrentSeq2(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[int, int]()
+ for i := range 100 {
+ m.Set(i, i*2)
+ }
+
+ var wg sync.WaitGroup
+ const numIterators = 10
+
+ wg.Add(numIterators)
+ for range numIterators {
+ go func() {
+ defer wg.Done()
+ count := 0
+ for k, v := range m.Seq2() {
+ require.Equal(t, k*2, v)
+ count++
+ }
+ require.Equal(t, 100, count)
+ }()
+ }
+
+ wg.Wait()
+}
+
+func TestMap_ConcurrentSeq(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[int, int]()
+ for i := range 100 {
+ m.Set(i, i*2)
+ }
+
+ var wg sync.WaitGroup
+ const numIterators = 10
+
+ wg.Add(numIterators)
+ for range numIterators {
+ go func() {
+ defer wg.Done()
+ count := 0
+ values := make(map[int]bool)
+ for v := range m.Seq() {
+ values[v] = true
+ count++
+ }
+ require.Equal(t, 100, count)
+ for i := range 100 {
+ require.True(t, values[i*2])
+ }
+ }()
+ }
+
+ wg.Wait()
+}
+
+func TestMap_ConcurrentTake(t *testing.T) {
+ t.Parallel()
+
+ m := NewMap[int, int]()
+ const numItems = 1000
+
+ for i := range numItems {
+ m.Set(i, i*2)
+ }
+
+ var wg sync.WaitGroup
+ const numWorkers = 10
+ taken := make([][]int, numWorkers)
+
+ wg.Add(numWorkers)
+ for i := range numWorkers {
+ go func(workerID int) {
+ defer wg.Done()
+ taken[workerID] = make([]int, 0)
+ for j := workerID; j < numItems; j += numWorkers {
+ if value, ok := m.Take(j); ok {
+ taken[workerID] = append(taken[workerID], value)
+ }
+ }
+ }(i)
+ }
+
+ wg.Wait()
+
+ require.Equal(t, 0, m.Len())
+
+ allTaken := make(map[int]bool)
+ for _, workerTaken := range taken {
+ for _, value := range workerTaken {
+ require.False(t, allTaken[value], "Value %d was taken multiple times", value)
+ allTaken[value] = true
+ }
+ }
+
+ require.Equal(t, numItems, len(allTaken))
+ for i := range numItems {
+ require.True(t, allTaken[i*2], "Expected value %d to be taken", i*2)
+ }
+}
+
+func TestMap_TypeSafety(t *testing.T) {
+ t.Parallel()
+
+ stringIntMap := NewMap[string, int]()
+ stringIntMap.Set("key", 42)
+ value, ok := stringIntMap.Get("key")
+ require.True(t, ok)
+ require.Equal(t, 42, value)
+
+ intStringMap := NewMap[int, string]()
+ intStringMap.Set(42, "value")
+ strValue, ok := intStringMap.Get(42)
+ require.True(t, ok)
+ require.Equal(t, "value", strValue)
+
+ structMap := NewMap[string, struct{ Name string }]()
+ structMap.Set("key", struct{ Name string }{Name: "test"})
+ structValue, ok := structMap.Get("key")
+ require.True(t, ok)
+ require.Equal(t, "test", structValue.Name)
+}
+
+func TestMap_InterfaceCompliance(t *testing.T) {
+ t.Parallel()
+
+ var _ json.Marshaler = &Map[string, any]{}
+ var _ json.Unmarshaler = &Map[string, any]{}
+}
+
+func BenchmarkMap_Set(b *testing.B) {
+ m := NewMap[int, int]()
+
+ for i := 0; b.Loop(); i++ {
+ m.Set(i, i*2)
+ }
+}
+
+func BenchmarkMap_Get(b *testing.B) {
+ m := NewMap[int, int]()
+ for i := range 1000 {
+ m.Set(i, i*2)
+ }
+
+ for i := 0; b.Loop(); i++ {
+ m.Get(i % 1000)
+ }
+}
+
+func BenchmarkMap_Seq2(b *testing.B) {
+ m := NewMap[int, int]()
+ for i := range 1000 {
+ m.Set(i, i*2)
+ }
+
+ for b.Loop() {
+ for range m.Seq2() {
+ }
+ }
+}
+
+func BenchmarkMap_Seq(b *testing.B) {
+ m := NewMap[int, int]()
+ for i := range 1000 {
+ m.Set(i, i*2)
+ }
+
+ for b.Loop() {
+ for range m.Seq() {
+ }
+ }
+}
+
+func BenchmarkMap_Take(b *testing.B) {
+ m := NewMap[int, int]()
+ for i := range 1000 {
+ m.Set(i, i*2)
+ }
+
+ b.ResetTimer()
+ for i := 0; b.Loop(); i++ {
+ key := i % 1000
+ m.Take(key)
+ if i%1000 == 999 {
+ b.StopTimer()
+ for j := range 1000 {
+ m.Set(j, j*2)
+ }
+ b.StartTimer()
+ }
+ }
+}
+
+func BenchmarkMap_ConcurrentReadWrite(b *testing.B) {
+ m := NewMap[int, int]()
+ for i := range 1000 {
+ m.Set(i, i*2)
+ }
+
+ b.ResetTimer()
+ b.RunParallel(func(pb *testing.PB) {
+ i := 0
+ for pb.Next() {
+ if i%2 == 0 {
+ m.Get(i % 1000)
+ } else {
+ m.Set(i+1000, i*2)
+ }
+ i++
+ }
+ })
+}
diff --git a/internal/csync/slices.go b/internal/csync/slices.go
new file mode 100644
index 0000000000000000000000000000000000000000..b7717f0c6df667701f5b64658b0073eaf73fc248
--- /dev/null
+++ b/internal/csync/slices.go
@@ -0,0 +1,147 @@
+package csync
+
+import (
+ "iter"
+ "slices"
+ "sync"
+)
+
+// LazySlice is a thread-safe lazy-loaded slice.
+type LazySlice[K any] struct {
+ inner []K
+ wg sync.WaitGroup
+}
+
+// NewLazySlice creates a new slice and runs the [load] function in a goroutine
+// to populate it.
+func NewLazySlice[K any](load func() []K) *LazySlice[K] {
+ s := &LazySlice[K]{}
+ s.wg.Add(1)
+ go func() {
+ s.inner = load()
+ s.wg.Done()
+ }()
+ return s
+}
+
+// Seq returns an iterator that yields elements from the slice.
+func (s *LazySlice[K]) Seq() iter.Seq[K] {
+ s.wg.Wait()
+ return func(yield func(K) bool) {
+ for _, v := range s.inner {
+ if !yield(v) {
+ return
+ }
+ }
+ }
+}
+
+// Slice is a thread-safe slice implementation that provides concurrent access.
+type Slice[T any] struct {
+ inner []T
+ mu sync.RWMutex
+}
+
+// NewSlice creates a new thread-safe slice.
+func NewSlice[T any]() *Slice[T] {
+ return &Slice[T]{
+ inner: make([]T, 0),
+ }
+}
+
+// NewSliceFrom creates a new thread-safe slice from an existing slice.
+func NewSliceFrom[T any](s []T) *Slice[T] {
+ inner := make([]T, len(s))
+ copy(inner, s)
+ return &Slice[T]{
+ inner: inner,
+ }
+}
+
+// Append adds an element to the end of the slice.
+func (s *Slice[T]) Append(items ...T) {
+ s.mu.Lock()
+ defer s.mu.Unlock()
+ s.inner = append(s.inner, items...)
+}
+
+// Prepend adds an element to the beginning of the slice.
+func (s *Slice[T]) Prepend(item T) {
+ s.mu.Lock()
+ defer s.mu.Unlock()
+ s.inner = append([]T{item}, s.inner...)
+}
+
+// Delete removes the element at the specified index.
+func (s *Slice[T]) Delete(index int) bool {
+ s.mu.Lock()
+ defer s.mu.Unlock()
+ if index < 0 || index >= len(s.inner) {
+ return false
+ }
+ s.inner = slices.Delete(s.inner, index, index+1)
+ return true
+}
+
+// Get returns the element at the specified index.
+func (s *Slice[T]) Get(index int) (T, bool) {
+ s.mu.RLock()
+ defer s.mu.RUnlock()
+ var zero T
+ if index < 0 || index >= len(s.inner) {
+ return zero, false
+ }
+ return s.inner[index], true
+}
+
+// Set updates the element at the specified index.
+func (s *Slice[T]) Set(index int, item T) bool {
+ s.mu.Lock()
+ defer s.mu.Unlock()
+ if index < 0 || index >= len(s.inner) {
+ return false
+ }
+ s.inner[index] = item
+ return true
+}
+
+// Len returns the number of elements in the slice.
+func (s *Slice[T]) Len() int {
+ s.mu.RLock()
+ defer s.mu.RUnlock()
+ return len(s.inner)
+}
+
+// SetSlice replaces the entire slice with a new one.
+func (s *Slice[T]) SetSlice(items []T) {
+ s.mu.Lock()
+ defer s.mu.Unlock()
+ s.inner = make([]T, len(items))
+ copy(s.inner, items)
+}
+
+// Seq returns an iterator that yields elements from the slice.
+func (s *Slice[T]) Seq() iter.Seq[T] {
+ return func(yield func(T) bool) {
+ for _, v := range s.Seq2() {
+ if !yield(v) {
+ return
+ }
+ }
+ }
+}
+
+// Seq2 returns an iterator that yields index-value pairs from the slice.
+func (s *Slice[T]) Seq2() iter.Seq2[int, T] {
+ s.mu.RLock()
+ items := make([]T, len(s.inner))
+ copy(items, s.inner)
+ s.mu.RUnlock()
+ return func(yield func(int, T) bool) {
+ for i, v := range items {
+ if !yield(i, v) {
+ return
+ }
+ }
+ }
+}
diff --git a/internal/csync/slices_test.go b/internal/csync/slices_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..24e43b0758bd45fe76cc9ebb19d6037750160bcc
--- /dev/null
+++ b/internal/csync/slices_test.go
@@ -0,0 +1,283 @@
+package csync
+
+import (
+ "slices"
+ "sync"
+ "sync/atomic"
+ "testing"
+ "time"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestLazySlice_Seq(t *testing.T) {
+ t.Parallel()
+
+ data := []string{"a", "b", "c"}
+ s := NewLazySlice(func() []string {
+ // TODO: use synctest when new Go is out.
+ time.Sleep(10 * time.Millisecond) // Small delay to ensure loading happens
+ return data
+ })
+
+ var result []string
+ for v := range s.Seq() {
+ result = append(result, v)
+ }
+
+ require.Equal(t, data, result)
+}
+
+func TestLazySlice_SeqWaitsForLoading(t *testing.T) {
+ t.Parallel()
+
+ var loaded atomic.Bool
+ data := []string{"x", "y", "z"}
+
+ s := NewLazySlice(func() []string {
+ // TODO: use synctest when new Go is out.
+ time.Sleep(100 * time.Millisecond)
+ loaded.Store(true)
+ return data
+ })
+
+ require.False(t, loaded.Load(), "should not be loaded immediately")
+
+ var result []string
+ for v := range s.Seq() {
+ result = append(result, v)
+ }
+
+ require.True(t, loaded.Load(), "should be loaded after Seq")
+ require.Equal(t, data, result)
+}
+
+func TestLazySlice_EmptySlice(t *testing.T) {
+ t.Parallel()
+
+ s := NewLazySlice(func() []string {
+ return []string{}
+ })
+
+ var result []string
+ for v := range s.Seq() {
+ result = append(result, v)
+ }
+
+ require.Empty(t, result)
+}
+
+func TestLazySlice_EarlyBreak(t *testing.T) {
+ t.Parallel()
+
+ data := []string{"a", "b", "c", "d", "e"}
+ s := NewLazySlice(func() []string {
+ // TODO: use synctest when new Go is out.
+ time.Sleep(10 * time.Millisecond) // Small delay to ensure loading happens
+ return data
+ })
+
+ var result []string
+ for v := range s.Seq() {
+ result = append(result, v)
+ if len(result) == 2 {
+ break
+ }
+ }
+
+ require.Equal(t, []string{"a", "b"}, result)
+}
+
+func TestSlice(t *testing.T) {
+ t.Run("NewSlice", func(t *testing.T) {
+ s := NewSlice[int]()
+ require.Equal(t, 0, s.Len())
+ })
+
+ t.Run("NewSliceFrom", func(t *testing.T) {
+ original := []int{1, 2, 3}
+ s := NewSliceFrom(original)
+ require.Equal(t, 3, s.Len())
+
+ // Verify it's a copy, not a reference
+ original[0] = 999
+ val, ok := s.Get(0)
+ require.True(t, ok)
+ require.Equal(t, 1, val)
+ })
+
+ t.Run("Append", func(t *testing.T) {
+ s := NewSlice[string]()
+ s.Append("hello")
+ s.Append("world")
+
+ require.Equal(t, 2, s.Len())
+ val, ok := s.Get(0)
+ require.True(t, ok)
+ require.Equal(t, "hello", val)
+
+ val, ok = s.Get(1)
+ require.True(t, ok)
+ require.Equal(t, "world", val)
+ })
+
+ t.Run("Prepend", func(t *testing.T) {
+ s := NewSlice[string]()
+ s.Append("world")
+ s.Prepend("hello")
+
+ require.Equal(t, 2, s.Len())
+ val, ok := s.Get(0)
+ require.True(t, ok)
+ require.Equal(t, "hello", val)
+
+ val, ok = s.Get(1)
+ require.True(t, ok)
+ require.Equal(t, "world", val)
+ })
+
+ t.Run("Delete", func(t *testing.T) {
+ s := NewSliceFrom([]int{1, 2, 3, 4, 5})
+
+ // Delete middle element
+ ok := s.Delete(2)
+ require.True(t, ok)
+ require.Equal(t, 4, s.Len())
+
+ expected := []int{1, 2, 4, 5}
+ actual := slices.Collect(s.Seq())
+ require.Equal(t, expected, actual)
+
+ // Delete out of bounds
+ ok = s.Delete(10)
+ require.False(t, ok)
+ require.Equal(t, 4, s.Len())
+
+ // Delete negative index
+ ok = s.Delete(-1)
+ require.False(t, ok)
+ require.Equal(t, 4, s.Len())
+ })
+
+ t.Run("Get", func(t *testing.T) {
+ s := NewSliceFrom([]string{"a", "b", "c"})
+
+ val, ok := s.Get(1)
+ require.True(t, ok)
+ require.Equal(t, "b", val)
+
+ // Out of bounds
+ _, ok = s.Get(10)
+ require.False(t, ok)
+
+ // Negative index
+ _, ok = s.Get(-1)
+ require.False(t, ok)
+ })
+
+ t.Run("Set", func(t *testing.T) {
+ s := NewSliceFrom([]string{"a", "b", "c"})
+
+ ok := s.Set(1, "modified")
+ require.True(t, ok)
+
+ val, ok := s.Get(1)
+ require.True(t, ok)
+ require.Equal(t, "modified", val)
+
+ // Out of bounds
+ ok = s.Set(10, "invalid")
+ require.False(t, ok)
+
+ // Negative index
+ ok = s.Set(-1, "invalid")
+ require.False(t, ok)
+ })
+
+ t.Run("SetSlice", func(t *testing.T) {
+ s := NewSlice[int]()
+ s.Append(1)
+ s.Append(2)
+
+ newItems := []int{10, 20, 30}
+ s.SetSlice(newItems)
+
+ require.Equal(t, 3, s.Len())
+ require.Equal(t, newItems, slices.Collect(s.Seq()))
+
+ // Verify it's a copy
+ newItems[0] = 999
+ val, ok := s.Get(0)
+ require.True(t, ok)
+ require.Equal(t, 10, val)
+ })
+
+ t.Run("Slice", func(t *testing.T) {
+ original := []int{1, 2, 3}
+ s := NewSliceFrom(original)
+
+ copied := slices.Collect(s.Seq())
+ require.Equal(t, original, copied)
+
+ // Verify it's a copy
+ copied[0] = 999
+ val, ok := s.Get(0)
+ require.True(t, ok)
+ require.Equal(t, 1, val)
+ })
+
+ t.Run("Seq", func(t *testing.T) {
+ s := NewSliceFrom([]int{1, 2, 3})
+
+ var result []int
+ for v := range s.Seq() {
+ result = append(result, v)
+ }
+
+ require.Equal(t, []int{1, 2, 3}, result)
+ })
+
+ t.Run("SeqWithIndex", func(t *testing.T) {
+ s := NewSliceFrom([]string{"a", "b", "c"})
+
+ var indices []int
+ var values []string
+ for i, v := range s.Seq2() {
+ indices = append(indices, i)
+ values = append(values, v)
+ }
+
+ require.Equal(t, []int{0, 1, 2}, indices)
+ require.Equal(t, []string{"a", "b", "c"}, values)
+ })
+
+ t.Run("ConcurrentAccess", func(t *testing.T) {
+ s := NewSlice[int]()
+ const numGoroutines = 100
+ const itemsPerGoroutine = 10
+
+ var wg sync.WaitGroup
+
+ // Concurrent appends
+ for i := range numGoroutines {
+ wg.Add(2)
+ go func(start int) {
+ defer wg.Done()
+ for j := range itemsPerGoroutine {
+ s.Append(start*itemsPerGoroutine + j)
+ }
+ }(i)
+ go func() {
+ defer wg.Done()
+ for range itemsPerGoroutine {
+ s.Len() // Just read the length
+ }
+ }()
+ }
+
+ wg.Wait()
+
+ // Should have all items
+ require.Equal(t, numGoroutines*itemsPerGoroutine, s.Len())
+ })
+}
diff --git a/internal/env/env_test.go b/internal/env/env_test.go
index 73fcb1c2cec876d88f686b8cb2861bb02fd1a632..6bd323e0cb169c2fd06397ed7b015de98145b105 100644
--- a/internal/env/env_test.go
+++ b/internal/env/env_test.go
@@ -1,26 +1,24 @@
package env
import (
- "os"
"strings"
"testing"
- "github.com/stretchr/testify/assert"
+ "github.com/stretchr/testify/require"
)
func TestOsEnv_Get(t *testing.T) {
env := New()
// Test getting an existing environment variable
- os.Setenv("TEST_VAR", "test_value")
- defer os.Unsetenv("TEST_VAR")
+ t.Setenv("TEST_VAR", "test_value")
value := env.Get("TEST_VAR")
- assert.Equal(t, "test_value", value)
+ require.Equal(t, "test_value", value)
// Test getting a non-existent environment variable
value = env.Get("NON_EXISTENT_VAR")
- assert.Equal(t, "", value)
+ require.Equal(t, "", value)
}
func TestOsEnv_Env(t *testing.T) {
@@ -29,12 +27,12 @@ func TestOsEnv_Env(t *testing.T) {
envVars := env.Env()
// Environment should not be empty in normal circumstances
- assert.NotNil(t, envVars)
- assert.Greater(t, len(envVars), 0)
+ require.NotNil(t, envVars)
+ require.Greater(t, len(envVars), 0)
// Each environment variable should be in key=value format
for _, envVar := range envVars {
- assert.Contains(t, envVar, "=")
+ require.Contains(t, envVar, "=")
}
}
@@ -45,8 +43,8 @@ func TestNewFromMap(t *testing.T) {
}
env := NewFromMap(testMap)
- assert.NotNil(t, env)
- assert.IsType(t, &mapEnv{}, env)
+ require.NotNil(t, env)
+ require.IsType(t, &mapEnv{}, env)
}
func TestMapEnv_Get(t *testing.T) {
@@ -58,11 +56,11 @@ func TestMapEnv_Get(t *testing.T) {
env := NewFromMap(testMap)
// Test getting existing keys
- assert.Equal(t, "value1", env.Get("KEY1"))
- assert.Equal(t, "value2", env.Get("KEY2"))
+ require.Equal(t, "value1", env.Get("KEY1"))
+ require.Equal(t, "value2", env.Get("KEY2"))
// Test getting non-existent key
- assert.Equal(t, "", env.Get("NON_EXISTENT"))
+ require.Equal(t, "", env.Get("NON_EXISTENT"))
}
func TestMapEnv_Env(t *testing.T) {
@@ -75,30 +73,30 @@ func TestMapEnv_Env(t *testing.T) {
env := NewFromMap(testMap)
envVars := env.Env()
- assert.Len(t, envVars, 2)
+ require.Len(t, envVars, 2)
// Convert to map for easier testing (order is not guaranteed)
envMap := make(map[string]string)
for _, envVar := range envVars {
parts := strings.SplitN(envVar, "=", 2)
- assert.Len(t, parts, 2)
+ require.Len(t, parts, 2)
envMap[parts[0]] = parts[1]
}
- assert.Equal(t, "value1", envMap["KEY1"])
- assert.Equal(t, "value2", envMap["KEY2"])
+ require.Equal(t, "value1", envMap["KEY1"])
+ require.Equal(t, "value2", envMap["KEY2"])
})
t.Run("empty map", func(t *testing.T) {
env := NewFromMap(map[string]string{})
envVars := env.Env()
- assert.Nil(t, envVars)
+ require.Nil(t, envVars)
})
t.Run("nil map", func(t *testing.T) {
env := NewFromMap(nil)
envVars := env.Env()
- assert.Nil(t, envVars)
+ require.Nil(t, envVars)
})
}
@@ -111,8 +109,8 @@ func TestMapEnv_GetEmptyValue(t *testing.T) {
env := NewFromMap(testMap)
// Test that empty values are returned correctly
- assert.Equal(t, "", env.Get("EMPTY_KEY"))
- assert.Equal(t, "value", env.Get("NORMAL_KEY"))
+ require.Equal(t, "", env.Get("EMPTY_KEY"))
+ require.Equal(t, "value", env.Get("NORMAL_KEY"))
}
func TestMapEnv_EnvFormat(t *testing.T) {
@@ -124,7 +122,7 @@ func TestMapEnv_EnvFormat(t *testing.T) {
env := NewFromMap(testMap)
envVars := env.Env()
- assert.Len(t, envVars, 2)
+ require.Len(t, envVars, 2)
// Check that the format is correct even with special characters
found := make(map[string]bool)
@@ -137,6 +135,6 @@ func TestMapEnv_EnvFormat(t *testing.T) {
}
}
- assert.True(t, found["equals"], "Should handle values with equals signs")
- assert.True(t, found["spaces"], "Should handle values with spaces")
+ require.True(t, found["equals"], "Should handle values with equals signs")
+ require.True(t, found["spaces"], "Should handle values with spaces")
}
diff --git a/internal/format/spinner.go b/internal/format/spinner.go
index da64fb93ce262e04a0b5fb9da8c4aea8403d10d8..69e443d0f67adadd1e3f9b9a13129850324b6184 100644
--- a/internal/format/spinner.go
+++ b/internal/format/spinner.go
@@ -20,7 +20,7 @@ type Spinner struct {
type model struct {
cancel context.CancelFunc
- anim anim.Anim
+ anim *anim.Anim
}
func (m model) Init() tea.Cmd { return m.anim.Init() }
@@ -37,7 +37,7 @@ func (m model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
}
mm, cmd := m.anim.Update(msg)
- m.anim = mm.(anim.Anim)
+ m.anim = mm.(*anim.Anim)
return m, cmd
}
diff --git a/internal/fsext/expand.go b/internal/fsext/expand.go
new file mode 100644
index 0000000000000000000000000000000000000000..d4265ca6381f43056032ffdf35ab61f137d1752f
--- /dev/null
+++ b/internal/fsext/expand.go
@@ -0,0 +1,29 @@
+package fsext
+
+import (
+ "os"
+ "strings"
+
+ "mvdan.cc/sh/v3/expand"
+ "mvdan.cc/sh/v3/syntax"
+)
+
+// Expand is a wrapper around [expand.Literal]. It will escape the input
+// string, expand any shell symbols (such as '~') and resolve any environment
+// variables.
+func Expand(s string) (string, error) {
+ if s == "" {
+ return "", nil
+ }
+ p := syntax.NewParser()
+ word, err := p.Document(strings.NewReader(s))
+ if err != nil {
+ return "", err
+ }
+ cfg := &expand.Config{
+ Env: expand.FuncEnviron(os.Getenv),
+ ReadDir2: os.ReadDir,
+ GlobStar: true,
+ }
+ return expand.Literal(cfg, word)
+}
diff --git a/internal/fsext/fileutil.go b/internal/fsext/fileutil.go
index 462dcc6761f261a5be02658317884eb64fb07ebc..27b5e48f62e388d707cbfdf62780779e54129dab 100644
--- a/internal/fsext/fileutil.go
+++ b/internal/fsext/fileutil.go
@@ -2,9 +2,7 @@ package fsext
import (
"fmt"
- "log/slog"
"os"
- "os/exec"
"path/filepath"
"sort"
"strings"
@@ -12,55 +10,10 @@ import (
"github.com/bmatcuk/doublestar/v4"
"github.com/charlievieth/fastwalk"
- "github.com/charmbracelet/crush/internal/log"
ignore "github.com/sabhiram/go-gitignore"
)
-var rgPath string
-
-func init() {
- var err error
- rgPath, err = exec.LookPath("rg")
- if err != nil {
- if log.Initialized() {
- slog.Warn("Ripgrep (rg) not found in $PATH. Some grep features might be limited or slower.")
- }
- }
-}
-
-func GetRgCmd(globPattern string) *exec.Cmd {
- if rgPath == "" {
- return nil
- }
- rgArgs := []string{
- "--files",
- "-L",
- "--null",
- }
- if globPattern != "" {
- if !filepath.IsAbs(globPattern) && !strings.HasPrefix(globPattern, "/") {
- globPattern = "/" + globPattern
- }
- rgArgs = append(rgArgs, "--glob", globPattern)
- }
- return exec.Command(rgPath, rgArgs...)
-}
-
-func GetRgSearchCmd(pattern, path, include string) *exec.Cmd {
- if rgPath == "" {
- return nil
- }
- // Use -n to show line numbers and include the matched line
- args := []string{"-H", "-n", pattern}
- if include != "" {
- args = append(args, "--glob", include)
- }
- args = append(args, path)
-
- return exec.Command(rgPath, args...)
-}
-
type FileInfo struct {
Path string
ModTime time.Time
@@ -88,8 +41,6 @@ func SkipHidden(path string) bool {
"obj": true,
"out": true,
"coverage": true,
- "tmp": true,
- "temp": true,
"logs": true,
"generated": true,
"bower_components": true,
@@ -107,8 +58,9 @@ func SkipHidden(path string) bool {
// FastGlobWalker provides gitignore-aware file walking with fastwalk
type FastGlobWalker struct {
- gitignore *ignore.GitIgnore
- rootPath string
+ gitignore *ignore.GitIgnore
+ crushignore *ignore.GitIgnore
+ rootPath string
}
func NewFastGlobWalker(searchPath string) *FastGlobWalker {
@@ -124,17 +76,36 @@ func NewFastGlobWalker(searchPath string) *FastGlobWalker {
}
}
+ // Load crushignore if it exists
+ crushignorePath := filepath.Join(searchPath, ".crushignore")
+ if _, err := os.Stat(crushignorePath); err == nil {
+ if ci, err := ignore.CompileIgnoreFile(crushignorePath); err == nil {
+ walker.crushignore = ci
+ }
+ }
+
return walker
}
-func (w *FastGlobWalker) shouldSkip(path string) bool {
+// ShouldSkip checks if a path should be skipped based on gitignore, crushignore, and hidden file rules
+func (w *FastGlobWalker) ShouldSkip(path string) bool {
if SkipHidden(path) {
return true
}
+ relPath, err := filepath.Rel(w.rootPath, path)
+ if err != nil {
+ return false
+ }
+
if w.gitignore != nil {
- relPath, err := filepath.Rel(w.rootPath, path)
- if err == nil && w.gitignore.MatchesPath(relPath) {
+ if w.gitignore.MatchesPath(relPath) {
+ return true
+ }
+ }
+
+ if w.crushignore != nil {
+ if w.crushignore.MatchesPath(relPath) {
return true
}
}
@@ -157,13 +128,13 @@ func GlobWithDoubleStar(pattern, searchPath string, limit int) ([]string, bool,
}
if d.IsDir() {
- if walker.shouldSkip(path) {
+ if walker.ShouldSkip(path) {
return filepath.SkipDir
}
return nil
}
- if walker.shouldSkip(path) {
+ if walker.ShouldSkip(path) {
return nil
}
@@ -242,3 +213,23 @@ func DirTrim(pwd string, lim int) string {
out = filepath.Join("~", out)
return out
}
+
+// PathOrPrefix returns the prefix if the path starts with it, or falls back to
+// the path otherwise.
+func PathOrPrefix(path, prefix string) string {
+ if HasPrefix(path, prefix) {
+ return prefix
+ }
+ return path
+}
+
+// HasPrefix checks if the given path starts with the specified prefix.
+// Uses filepath.Rel to determine if path is within prefix.
+func HasPrefix(path, prefix string) bool {
+ rel, err := filepath.Rel(prefix, path)
+ if err != nil {
+ return false
+ }
+ // If path is within prefix, Rel will not return a path starting with ".."
+ return !strings.HasPrefix(rel, "..")
+}
diff --git a/internal/fsext/ignore_test.go b/internal/fsext/ignore_test.go
new file mode 100644
index 0000000000000000000000000000000000000000..48a56667d0f3776c4054e8abbeff8eaeb67c9dfe
--- /dev/null
+++ b/internal/fsext/ignore_test.go
@@ -0,0 +1,44 @@
+package fsext
+
+import (
+ "os"
+ "testing"
+
+ "github.com/stretchr/testify/require"
+)
+
+func TestCrushIgnore(t *testing.T) {
+ // Create a temporary directory for testing
+ tempDir := t.TempDir()
+
+ // Change to temp directory
+ oldWd, _ := os.Getwd()
+ err := os.Chdir(tempDir)
+ require.NoError(t, err)
+ defer os.Chdir(oldWd)
+
+ // Create test files
+ require.NoError(t, os.WriteFile("test1.txt", []byte("test"), 0o644))
+ require.NoError(t, os.WriteFile("test2.log", []byte("test"), 0o644))
+ require.NoError(t, os.WriteFile("test3.tmp", []byte("test"), 0o644))
+
+ // Create a .crushignore file that ignores .log files
+ require.NoError(t, os.WriteFile(".crushignore", []byte("*.log\n"), 0o644))
+
+ // Test DirectoryLister
+ t.Run("DirectoryLister respects .crushignore", func(t *testing.T) {
+ dl := NewDirectoryLister(tempDir)
+
+ // Test that .log files are ignored
+ require.True(t, dl.gitignore == nil, "gitignore should be nil")
+ require.NotNil(t, dl.crushignore, "crushignore should not be nil")
+ })
+
+ // Test FastGlobWalker
+ t.Run("FastGlobWalker respects .crushignore", func(t *testing.T) {
+ walker := NewFastGlobWalker(tempDir)
+
+ require.True(t, walker.gitignore == nil, "gitignore should be nil")
+ require.NotNil(t, walker.crushignore, "crushignore should not be nil")
+ })
+}
diff --git a/internal/fsext/ls.go b/internal/fsext/ls.go
index 9f93baedb0e6487e39faef9de7c6a00f22547b1a..e800e921de74e41a9d46f4d1fafd6fc59bcf65a0 100644
--- a/internal/fsext/ls.go
+++ b/internal/fsext/ls.go
@@ -3,7 +3,6 @@ package fsext
import (
"os"
"path/filepath"
- "strings"
"github.com/charlievieth/fastwalk"
ignore "github.com/sabhiram/go-gitignore"
@@ -69,6 +68,7 @@ var CommonIgnorePatterns = []string{
type DirectoryLister struct {
gitignore *ignore.GitIgnore
+ crushignore *ignore.GitIgnore
commonIgnore *ignore.GitIgnore
rootPath string
}
@@ -86,6 +86,14 @@ func NewDirectoryLister(rootPath string) *DirectoryLister {
}
}
+ // Load crushignore if it exists
+ crushignorePath := filepath.Join(rootPath, ".crushignore")
+ if _, err := os.Stat(crushignorePath); err == nil {
+ if ci, err := ignore.CompileIgnoreFile(crushignorePath); err == nil {
+ dl.crushignore = ci
+ }
+ }
+
// Create common ignore patterns
dl.commonIgnore = ignore.CompileIgnoreLines(CommonIgnorePatterns...)
@@ -108,12 +116,13 @@ func (dl *DirectoryLister) shouldIgnore(path string, ignorePatterns []string) bo
return true
}
- base := filepath.Base(path)
-
- if base != "." && strings.HasPrefix(base, ".") {
+ // Check crushignore patterns if available
+ if dl.crushignore != nil && dl.crushignore.MatchesPath(relPath) {
return true
}
+ base := filepath.Base(path)
+
for _, pattern := range ignorePatterns {
matched, err := filepath.Match(pattern, base)
if err == nil && matched {
@@ -161,7 +170,7 @@ func ListDirectory(initialPath string, ignorePatterns []string, limit int) ([]st
return nil
})
- if err != nil {
+ if err != nil && len(results) == 0 {
return nil, truncated, err
}
diff --git a/internal/fur/client/client.go b/internal/fur/client/client.go
deleted file mode 100644
index d007c9aee18f77c8b03fe804726b4196e474d0b4..0000000000000000000000000000000000000000
--- a/internal/fur/client/client.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Package client provides a client for interacting with the fur service.
-package client
-
-import (
- "encoding/json"
- "fmt"
- "net/http"
- "os"
-
- "github.com/charmbracelet/crush/internal/fur/provider"
-)
-
-const defaultURL = "https://fur.charm.sh"
-
-// Client represents a client for the fur service.
-type Client struct {
- baseURL string
- httpClient *http.Client
-}
-
-// New creates a new client instance
-// Uses FUR_URL environment variable or falls back to localhost:8080.
-func New() *Client {
- baseURL := os.Getenv("FUR_URL")
- if baseURL == "" {
- baseURL = defaultURL
- }
-
- return &Client{
- baseURL: baseURL,
- httpClient: &http.Client{},
- }
-}
-
-// NewWithURL creates a new client with a specific URL.
-func NewWithURL(url string) *Client {
- return &Client{
- baseURL: url,
- httpClient: &http.Client{},
- }
-}
-
-// GetProviders retrieves all available providers from the service.
-func (c *Client) GetProviders() ([]provider.Provider, error) {
- url := fmt.Sprintf("%s/providers", c.baseURL)
-
- resp, err := c.httpClient.Get(url) //nolint:noctx
- if err != nil {
- return nil, fmt.Errorf("failed to make request: %w", err)
- }
- defer resp.Body.Close() //nolint:errcheck
-
- if resp.StatusCode != http.StatusOK {
- return nil, fmt.Errorf("unexpected status code: %d", resp.StatusCode)
- }
-
- var providers []provider.Provider
- if err := json.NewDecoder(resp.Body).Decode(&providers); err != nil {
- return nil, fmt.Errorf("failed to decode response: %w", err)
- }
-
- return providers, nil
-}
diff --git a/internal/fur/provider/provider.go b/internal/fur/provider/provider.go
deleted file mode 100644
index 44a8cb419f55e80bf3eeb2d92b029ceec962c44a..0000000000000000000000000000000000000000
--- a/internal/fur/provider/provider.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Package provider provides types and constants for AI providers.
-package provider
-
-// Type represents the type of AI provider.
-type Type string
-
-// All the supported AI provider types.
-const (
- TypeOpenAI Type = "openai"
- TypeAnthropic Type = "anthropic"
- TypeGemini Type = "gemini"
- TypeAzure Type = "azure"
- TypeBedrock Type = "bedrock"
- TypeVertexAI Type = "vertexai"
- TypeXAI Type = "xai"
-)
-
-// InferenceProvider represents the inference provider identifier.
-type InferenceProvider string
-
-// All the inference providers supported by the system.
-const (
- InferenceProviderOpenAI InferenceProvider = "openai"
- InferenceProviderAnthropic InferenceProvider = "anthropic"
- InferenceProviderGemini InferenceProvider = "gemini"
- InferenceProviderAzure InferenceProvider = "azure"
- InferenceProviderBedrock InferenceProvider = "bedrock"
- InferenceProviderVertexAI InferenceProvider = "vertexai"
- InferenceProviderXAI InferenceProvider = "xai"
- InferenceProviderOpenRouter InferenceProvider = "openrouter"
-)
-
-// Provider represents an AI provider configuration.
-type Provider struct {
- Name string `json:"name"`
- ID InferenceProvider `json:"id"`
- APIKey string `json:"api_key,omitempty"`
- APIEndpoint string `json:"api_endpoint,omitempty"`
- Type Type `json:"type,omitempty"`
- DefaultLargeModelID string `json:"default_large_model_id,omitempty"`
- DefaultSmallModelID string `json:"default_small_model_id,omitempty"`
- Models []Model `json:"models,omitempty"`
-}
-
-// Model represents an AI model configuration.
-type Model struct {
- ID string `json:"id"`
- Model string `json:"model"`
- CostPer1MIn float64 `json:"cost_per_1m_in"`
- CostPer1MOut float64 `json:"cost_per_1m_out"`
- CostPer1MInCached float64 `json:"cost_per_1m_in_cached"`
- CostPer1MOutCached float64 `json:"cost_per_1m_out_cached"`
- ContextWindow int64 `json:"context_window"`
- DefaultMaxTokens int64 `json:"default_max_tokens"`
- CanReason bool `json:"can_reason"`
- HasReasoningEffort bool `json:"has_reasoning_efforts"`
- DefaultReasoningEffort string `json:"default_reasoning_effort,omitempty"`
- SupportsImages bool `json:"supports_attachments"`
-}
-
-// KnownProviders returns all the known inference providers.
-func KnownProviders() []InferenceProvider {
- return []InferenceProvider{
- InferenceProviderOpenAI,
- InferenceProviderAnthropic,
- InferenceProviderGemini,
- InferenceProviderAzure,
- InferenceProviderBedrock,
- InferenceProviderVertexAI,
- InferenceProviderXAI,
- InferenceProviderOpenRouter,
- }
-}
diff --git a/internal/llm/agent/agent.go b/internal/llm/agent/agent.go
index fbb5b4fd8c6390ff0dfad0e072af35342355ba41..57c30f41078f9a577d2f7bdbca5303da0eb83724 100644
--- a/internal/llm/agent/agent.go
+++ b/internal/llm/agent/agent.go
@@ -7,11 +7,11 @@ import (
"log/slog"
"slices"
"strings"
- "sync"
"time"
+ "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
- fur "github.com/charmbracelet/crush/internal/fur/provider"
+ "github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/history"
"github.com/charmbracelet/crush/internal/llm/prompt"
"github.com/charmbracelet/crush/internal/llm/provider"
@@ -22,6 +22,7 @@ import (
"github.com/charmbracelet/crush/internal/permission"
"github.com/charmbracelet/crush/internal/pubsub"
"github.com/charmbracelet/crush/internal/session"
+ "github.com/charmbracelet/crush/internal/shell"
)
// Common errors
@@ -51,7 +52,7 @@ type AgentEvent struct {
type Service interface {
pubsub.Suscriber[AgentEvent]
- Model() fur.Model
+ Model() catwalk.Model
Run(ctx context.Context, sessionID string, content string, attachments ...message.Attachment) (<-chan AgentEvent, error)
Cancel(sessionID string)
CancelAll()
@@ -66,8 +67,10 @@ type agent struct {
agentCfg config.Agent
sessions session.Service
messages message.Service
+ mcpTools []McpTool
+
+ tools *csync.LazySlice[tools.BaseTool]
- tools []tools.BaseTool
provider provider.Provider
providerID string
@@ -75,7 +78,7 @@ type agent struct {
summarizeProvider provider.Provider
summarizeProviderID string
- activeRequests sync.Map
+ activeRequests *csync.Map[string, context.CancelFunc]
}
var agentPromptMap = map[string]prompt.PromptID{
@@ -84,6 +87,7 @@ var agentPromptMap = map[string]prompt.PromptID{
}
func NewAgent(
+ ctx context.Context,
agentCfg config.Agent,
// These services are needed in the tools
permissions permission.Service,
@@ -92,47 +96,22 @@ func NewAgent(
history history.Service,
lspClients map[string]*lsp.Client,
) (Service, error) {
- ctx := context.Background()
cfg := config.Get()
- otherTools := GetMcpTools(ctx, permissions, cfg)
- if len(lspClients) > 0 {
- otherTools = append(otherTools, tools.NewDiagnosticsTool(lspClients))
- }
-
- cwd := cfg.WorkingDir()
- allTools := []tools.BaseTool{
- tools.NewBashTool(permissions, cwd),
- tools.NewEditTool(lspClients, permissions, history, cwd),
- tools.NewFetchTool(permissions, cwd),
- tools.NewGlobTool(cwd),
- tools.NewGrepTool(cwd),
- tools.NewLsTool(cwd),
- tools.NewSourcegraphTool(),
- tools.NewViewTool(lspClients, cwd),
- tools.NewWriteTool(lspClients, permissions, history, cwd),
- }
+ var agentTool tools.BaseTool
if agentCfg.ID == "coder" {
taskAgentCfg := config.Get().Agents["task"]
if taskAgentCfg.ID == "" {
return nil, fmt.Errorf("task agent not found in config")
}
- taskAgent, err := NewAgent(taskAgentCfg, permissions, sessions, messages, history, lspClients)
+ taskAgent, err := NewAgent(ctx, taskAgentCfg, permissions, sessions, messages, history, lspClients)
if err != nil {
return nil, fmt.Errorf("failed to create task agent: %w", err)
}
- allTools = append(
- allTools,
- NewAgentTool(
- taskAgent,
- sessions,
- messages,
- ),
- )
+ agentTool = NewAgentTool(taskAgent, sessions, messages)
}
- allTools = append(allTools, otherTools...)
providerCfg := config.Get().GetProviderForModel(agentCfg.Model)
if providerCfg == nil {
return nil, fmt.Errorf("provider for agent %s not found in config", agentCfg.Name)
@@ -180,81 +159,109 @@ func NewAgent(
if err != nil {
return nil, err
}
+
summarizeOpts := []provider.ProviderClientOption{
- provider.WithModel(config.SelectedModelTypeSmall),
- provider.WithSystemMessage(prompt.GetPrompt(prompt.PromptSummarizer, smallModelProviderCfg.ID)),
+ provider.WithModel(config.SelectedModelTypeLarge),
+ provider.WithSystemMessage(prompt.GetPrompt(prompt.PromptSummarizer, providerCfg.ID)),
}
- summarizeProvider, err := provider.NewProvider(*smallModelProviderCfg, summarizeOpts...)
+ summarizeProvider, err := provider.NewProvider(*providerCfg, summarizeOpts...)
if err != nil {
return nil, err
}
- agentTools := []tools.BaseTool{}
- if agentCfg.AllowedTools == nil {
- agentTools = allTools
- } else {
+ toolFn := func() []tools.BaseTool {
+ slog.Info("Initializing agent tools", "agent", agentCfg.ID)
+ defer func() {
+ slog.Info("Initialized agent tools", "agent", agentCfg.ID)
+ }()
+
+ cwd := cfg.WorkingDir()
+ allTools := []tools.BaseTool{
+ tools.NewBashTool(permissions, cwd),
+ tools.NewDownloadTool(permissions, cwd),
+ tools.NewEditTool(lspClients, permissions, history, cwd),
+ tools.NewMultiEditTool(lspClients, permissions, history, cwd),
+ tools.NewFetchTool(permissions, cwd),
+ tools.NewGlobTool(cwd),
+ tools.NewGrepTool(cwd),
+ tools.NewLsTool(permissions, cwd),
+ tools.NewSourcegraphTool(),
+ tools.NewViewTool(lspClients, permissions, cwd),
+ tools.NewWriteTool(lspClients, permissions, history, cwd),
+ }
+
+ mcpToolsOnce.Do(func() {
+ mcpTools = doGetMCPTools(ctx, permissions, cfg)
+ })
+ allTools = append(allTools, mcpTools...)
+
+ if len(lspClients) > 0 {
+ allTools = append(allTools, tools.NewDiagnosticsTool(lspClients))
+ }
+
+ if agentTool != nil {
+ allTools = append(allTools, agentTool)
+ }
+
+ if agentCfg.AllowedTools == nil {
+ return allTools
+ }
+
+ var filteredTools []tools.BaseTool
for _, tool := range allTools {
if slices.Contains(agentCfg.AllowedTools, tool.Name()) {
- agentTools = append(agentTools, tool)
+ filteredTools = append(filteredTools, tool)
}
}
+ return filteredTools
}
- agent := &agent{
+ return &agent{
Broker: pubsub.NewBroker[AgentEvent](),
agentCfg: agentCfg,
provider: agentProvider,
providerID: string(providerCfg.ID),
messages: messages,
sessions: sessions,
- tools: agentTools,
titleProvider: titleProvider,
summarizeProvider: summarizeProvider,
- summarizeProviderID: string(smallModelProviderCfg.ID),
- activeRequests: sync.Map{},
- }
-
- return agent, nil
+ summarizeProviderID: string(providerCfg.ID),
+ activeRequests: csync.NewMap[string, context.CancelFunc](),
+ tools: csync.NewLazySlice(toolFn),
+ }, nil
}
-func (a *agent) Model() fur.Model {
+func (a *agent) Model() catwalk.Model {
return *config.Get().GetModelByType(a.agentCfg.Model)
}
func (a *agent) Cancel(sessionID string) {
// Cancel regular requests
- if cancelFunc, exists := a.activeRequests.LoadAndDelete(sessionID); exists {
- if cancel, ok := cancelFunc.(context.CancelFunc); ok {
- slog.Info(fmt.Sprintf("Request cancellation initiated for session: %s", sessionID))
- cancel()
- }
+ if cancel, ok := a.activeRequests.Take(sessionID); ok && cancel != nil {
+ slog.Info("Request cancellation initiated", "session_id", sessionID)
+ cancel()
}
// Also check for summarize requests
- if cancelFunc, exists := a.activeRequests.LoadAndDelete(sessionID + "-summarize"); exists {
- if cancel, ok := cancelFunc.(context.CancelFunc); ok {
- slog.Info(fmt.Sprintf("Summarize cancellation initiated for session: %s", sessionID))
- cancel()
- }
+ if cancel, ok := a.activeRequests.Take(sessionID + "-summarize"); ok && cancel != nil {
+ slog.Info("Summarize cancellation initiated", "session_id", sessionID)
+ cancel()
}
}
func (a *agent) IsBusy() bool {
- busy := false
- a.activeRequests.Range(func(key, value any) bool {
- if cancelFunc, ok := value.(context.CancelFunc); ok {
- if cancelFunc != nil {
- busy = true
- return false
- }
+ var busy bool
+ for cancelFunc := range a.activeRequests.Seq() {
+ if cancelFunc != nil {
+ busy = true
+ break
}
- return true
- })
+ }
return busy
}
func (a *agent) IsSessionBusy(sessionID string) bool {
- _, busy := a.activeRequests.Load(sessionID)
+ _, busy := a.activeRequests.Get(sessionID)
return busy
}
@@ -282,7 +289,7 @@ func (a *agent) generateTitle(ctx context.Context, sessionID string, content str
Parts: parts,
},
},
- make([]tools.BaseTool, 0),
+ nil,
)
var finalResponse *provider.ProviderResponse
@@ -325,7 +332,7 @@ func (a *agent) Run(ctx context.Context, sessionID string, content string, attac
genCtx, cancel := context.WithCancel(ctx)
- a.activeRequests.Store(sessionID, cancel)
+ a.activeRequests.Set(sessionID, cancel)
go func() {
slog.Debug("Request started", "sessionID", sessionID)
defer log.RecoverPanic("agent.Run", func() {
@@ -340,7 +347,7 @@ func (a *agent) Run(ctx context.Context, sessionID string, content string, attac
slog.Error(result.Error.Error())
}
slog.Debug("Request completed", "sessionID", sessionID)
- a.activeRequests.Delete(sessionID)
+ a.activeRequests.Del(sessionID)
cancel()
a.Publish(pubsub.CreatedEvent, result)
events <- result
@@ -363,7 +370,7 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string
})
titleErr := a.generateTitle(context.Background(), sessionID, content)
if titleErr != nil && !errors.Is(titleErr, context.Canceled) && !errors.Is(titleErr, context.DeadlineExceeded) {
- slog.Error(fmt.Sprintf("failed to generate title: %v", titleErr))
+ slog.Error("failed to generate title", "error", titleErr)
}
}()
}
@@ -403,7 +410,7 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string
agentMessage, toolResults, err := a.streamAndHandleEvents(ctx, sessionID, msgHistory)
if err != nil {
if errors.Is(err, context.Canceled) {
- agentMessage.AddFinish(message.FinishReasonCanceled)
+ agentMessage.AddFinish(message.FinishReasonCanceled, "Request cancelled", "")
a.messages.Update(context.Background(), agentMessage)
return a.err(ErrRequestCancelled)
}
@@ -417,6 +424,12 @@ func (a *agent) processGeneration(ctx context.Context, sessionID, content string
msgHistory = append(msgHistory, agentMessage, *toolResults)
continue
}
+ if agentMessage.FinishReason() == "" {
+ // Kujtim: could not track down where this is happening but this means its cancelled
+ agentMessage.AddFinish(message.FinishReasonCanceled, "Request cancelled", "")
+ _ = a.messages.Update(context.Background(), agentMessage)
+ return a.err(ErrRequestCancelled)
+ }
return AgentEvent{
Type: AgentEventTypeResponse,
Message: agentMessage,
@@ -436,7 +449,7 @@ func (a *agent) createUserMessage(ctx context.Context, sessionID, content string
func (a *agent) streamAndHandleEvents(ctx context.Context, sessionID string, msgHistory []message.Message) (message.Message, *message.Message, error) {
ctx = context.WithValue(ctx, tools.SessionIDContextKey, sessionID)
- eventChan := a.provider.StreamResponse(ctx, msgHistory, a.tools)
+ eventChan := a.provider.StreamResponse(ctx, msgHistory, slices.Collect(a.tools.Seq()))
assistantMsg, err := a.messages.Create(ctx, sessionID, message.CreateMessageParams{
Role: message.Assistant,
@@ -454,11 +467,15 @@ func (a *agent) streamAndHandleEvents(ctx context.Context, sessionID string, msg
// Process each event in the stream.
for event := range eventChan {
if processErr := a.processEvent(ctx, sessionID, &assistantMsg, event); processErr != nil {
- a.finishMessage(ctx, &assistantMsg, message.FinishReasonCanceled)
+ if errors.Is(processErr, context.Canceled) {
+ a.finishMessage(context.Background(), &assistantMsg, message.FinishReasonCanceled, "Request cancelled", "")
+ } else {
+ a.finishMessage(ctx, &assistantMsg, message.FinishReasonError, "API Error", processErr.Error())
+ }
return assistantMsg, nil, processErr
}
if ctx.Err() != nil {
- a.finishMessage(context.Background(), &assistantMsg, message.FinishReasonCanceled)
+ a.finishMessage(context.Background(), &assistantMsg, message.FinishReasonCanceled, "Request cancelled", "")
return assistantMsg, nil, ctx.Err()
}
}
@@ -468,7 +485,7 @@ func (a *agent) streamAndHandleEvents(ctx context.Context, sessionID string, msg
for i, toolCall := range toolCalls {
select {
case <-ctx.Done():
- a.finishMessage(context.Background(), &assistantMsg, message.FinishReasonCanceled)
+ a.finishMessage(context.Background(), &assistantMsg, message.FinishReasonCanceled, "Request cancelled", "")
// Make all future tool calls cancelled
for j := i; j < len(toolCalls); j++ {
toolResults[j] = message.ToolResult{
@@ -481,7 +498,7 @@ func (a *agent) streamAndHandleEvents(ctx context.Context, sessionID string, msg
default:
// Continue processing
var tool tools.BaseTool
- for _, availableTool := range a.tools {
+ for availableTool := range a.tools.Seq() {
if availableTool.Info().Name == toolCall.Name {
tool = availableTool
break
@@ -497,12 +514,45 @@ func (a *agent) streamAndHandleEvents(ctx context.Context, sessionID string, msg
}
continue
}
- toolResult, toolErr := tool.Run(ctx, tools.ToolCall{
- ID: toolCall.ID,
- Name: toolCall.Name,
- Input: toolCall.Input,
- })
+
+ // Run tool in goroutine to allow cancellation
+ type toolExecResult struct {
+ response tools.ToolResponse
+ err error
+ }
+ resultChan := make(chan toolExecResult, 1)
+
+ go func() {
+ response, err := tool.Run(ctx, tools.ToolCall{
+ ID: toolCall.ID,
+ Name: toolCall.Name,
+ Input: toolCall.Input,
+ })
+ resultChan <- toolExecResult{response: response, err: err}
+ }()
+
+ var toolResponse tools.ToolResponse
+ var toolErr error
+
+ select {
+ case <-ctx.Done():
+ a.finishMessage(context.Background(), &assistantMsg, message.FinishReasonCanceled, "Request cancelled", "")
+ // Mark remaining tool calls as cancelled
+ for j := i; j < len(toolCalls); j++ {
+ toolResults[j] = message.ToolResult{
+ ToolCallID: toolCalls[j].ID,
+ Content: "Tool execution canceled by user",
+ IsError: true,
+ }
+ }
+ goto out
+ case result := <-resultChan:
+ toolResponse = result.response
+ toolErr = result.err
+ }
+
if toolErr != nil {
+ slog.Error("Tool execution error", "toolCall", toolCall.ID, "error", toolErr)
if errors.Is(toolErr, permission.ErrorPermissionDenied) {
toolResults[i] = message.ToolResult{
ToolCallID: toolCall.ID,
@@ -516,15 +566,15 @@ func (a *agent) streamAndHandleEvents(ctx context.Context, sessionID string, msg
IsError: true,
}
}
- a.finishMessage(ctx, &assistantMsg, message.FinishReasonPermissionDenied)
+ a.finishMessage(ctx, &assistantMsg, message.FinishReasonPermissionDenied, "Permission denied", "")
break
}
}
toolResults[i] = message.ToolResult{
ToolCallID: toolCall.ID,
- Content: toolResult.Content,
- Metadata: toolResult.Metadata,
- IsError: toolResult.IsError,
+ Content: toolResponse.Content,
+ Metadata: toolResponse.Metadata,
+ IsError: toolResponse.IsError,
}
}
}
@@ -548,8 +598,8 @@ out:
return assistantMsg, &msg, err
}
-func (a *agent) finishMessage(ctx context.Context, msg *message.Message, finishReson message.FinishReason) {
- msg.AddFinish(finishReson)
+func (a *agent) finishMessage(ctx context.Context, msg *message.Message, finishReason message.FinishReason, message, details string) {
+ msg.AddFinish(finishReason, message, details)
_ = a.messages.Update(ctx, *msg)
}
@@ -563,12 +613,17 @@ func (a *agent) processEvent(ctx context.Context, sessionID string, assistantMsg
switch event.Type {
case provider.EventThinkingDelta:
- assistantMsg.AppendReasoningContent(event.Content)
+ assistantMsg.AppendReasoningContent(event.Thinking)
+ return a.messages.Update(ctx, *assistantMsg)
+ case provider.EventSignatureDelta:
+ assistantMsg.AppendReasoningSignature(event.Signature)
return a.messages.Update(ctx, *assistantMsg)
case provider.EventContentDelta:
+ assistantMsg.FinishThinking()
assistantMsg.AppendContent(event.Content)
return a.messages.Update(ctx, *assistantMsg)
case provider.EventToolUseStart:
+ assistantMsg.FinishThinking()
slog.Info("Tool call started", "toolCall", event.ToolCall)
assistantMsg.AddToolCall(*event.ToolCall)
return a.messages.Update(ctx, *assistantMsg)
@@ -580,15 +635,11 @@ func (a *agent) processEvent(ctx context.Context, sessionID string, assistantMsg
assistantMsg.FinishToolCall(event.ToolCall.ID)
return a.messages.Update(ctx, *assistantMsg)
case provider.EventError:
- if errors.Is(event.Error, context.Canceled) {
- slog.Info(fmt.Sprintf("Event processing canceled for session: %s", sessionID))
- return context.Canceled
- }
- slog.Error(event.Error.Error())
return event.Error
case provider.EventComplete:
+ assistantMsg.FinishThinking()
assistantMsg.SetToolCalls(event.Response.ToolCalls)
- assistantMsg.AddFinish(event.Response.FinishReason)
+ assistantMsg.AddFinish(event.Response.FinishReason, "", "")
if err := a.messages.Update(ctx, *assistantMsg); err != nil {
return fmt.Errorf("failed to update message: %w", err)
}
@@ -598,7 +649,7 @@ func (a *agent) processEvent(ctx context.Context, sessionID string, assistantMsg
return nil
}
-func (a *agent) TrackUsage(ctx context.Context, sessionID string, model fur.Model, usage provider.TokenUsage) error {
+func (a *agent) TrackUsage(ctx context.Context, sessionID string, model catwalk.Model, usage provider.TokenUsage) error {
sess, err := a.sessions.Get(ctx, sessionID)
if err != nil {
return fmt.Errorf("failed to get session: %w", err)
@@ -634,10 +685,10 @@ func (a *agent) Summarize(ctx context.Context, sessionID string) error {
summarizeCtx, cancel := context.WithCancel(ctx)
// Store the cancel function in activeRequests to allow cancellation
- a.activeRequests.Store(sessionID+"-summarize", cancel)
+ a.activeRequests.Set(sessionID+"-summarize", cancel)
go func() {
- defer a.activeRequests.Delete(sessionID + "-summarize")
+ defer a.activeRequests.Del(sessionID + "-summarize")
defer cancel()
event := AgentEvent{
Type: AgentEventTypeSummarize,
@@ -697,7 +748,7 @@ func (a *agent) Summarize(ctx context.Context, sessionID string) error {
response := a.summarizeProvider.StreamResponse(
summarizeCtx,
msgsWithPrompt,
- make([]tools.BaseTool, 0),
+ nil,
)
var finalResponse *provider.ProviderResponse
for r := range response {
@@ -723,6 +774,8 @@ func (a *agent) Summarize(ctx context.Context, sessionID string) error {
a.Publish(pubsub.CreatedEvent, event)
return
}
+ shell := shell.GetPersistentShell(config.Get().WorkingDir())
+ summary += "\n\n**Current working directory of the persistent shell**\n\n" + shell.GetWorkingDir()
event = AgentEvent{
Type: AgentEventTypeSummarize,
Progress: "Creating new session...",
@@ -797,10 +850,22 @@ func (a *agent) Summarize(ctx context.Context, sessionID string) error {
}
func (a *agent) CancelAll() {
- a.activeRequests.Range(func(key, value any) bool {
- a.Cancel(key.(string)) // key is sessionID
- return true
- })
+ if !a.IsBusy() {
+ return
+ }
+ for key := range a.activeRequests.Seq2() {
+ a.Cancel(key) // key is sessionID
+ }
+
+ timeout := time.After(5 * time.Second)
+ for a.IsBusy() {
+ select {
+ case <-timeout:
+ return
+ default:
+ time.Sleep(200 * time.Millisecond)
+ }
+ }
}
func (a *agent) UpdateModel() error {
@@ -808,7 +873,7 @@ func (a *agent) UpdateModel() error {
// Get current provider configuration
currentProviderCfg := cfg.GetProviderForModel(a.agentCfg.Model)
- if currentProviderCfg.ID == "" {
+ if currentProviderCfg == nil || currentProviderCfg.ID == "" {
return fmt.Errorf("provider for agent %s not found in config", a.agentCfg.Name)
}
@@ -840,54 +905,59 @@ func (a *agent) UpdateModel() error {
a.providerID = string(currentProviderCfg.ID)
}
- // Check if small model provider has changed (affects title and summarize providers)
+ // Check if providers have changed for title (small) and summarize (large)
smallModelCfg := cfg.Models[config.SelectedModelTypeSmall]
var smallModelProviderCfg config.ProviderConfig
-
- for _, p := range cfg.Providers {
+ for p := range cfg.Providers.Seq() {
if p.ID == smallModelCfg.Provider {
smallModelProviderCfg = p
break
}
}
-
if smallModelProviderCfg.ID == "" {
return fmt.Errorf("provider %s not found in config", smallModelCfg.Provider)
}
- // Check if summarize provider has changed
- if string(smallModelProviderCfg.ID) != a.summarizeProviderID {
- smallModel := cfg.GetModelByType(config.SelectedModelTypeSmall)
- if smallModel == nil {
- return fmt.Errorf("model %s not found in provider %s", smallModelCfg.Model, smallModelProviderCfg.ID)
+ largeModelCfg := cfg.Models[config.SelectedModelTypeLarge]
+ var largeModelProviderCfg config.ProviderConfig
+ for p := range cfg.Providers.Seq() {
+ if p.ID == largeModelCfg.Provider {
+ largeModelProviderCfg = p
+ break
}
+ }
+ if largeModelProviderCfg.ID == "" {
+ return fmt.Errorf("provider %s not found in config", largeModelCfg.Provider)
+ }
- // Recreate title provider
- titleOpts := []provider.ProviderClientOption{
- provider.WithModel(config.SelectedModelTypeSmall),
- provider.WithSystemMessage(prompt.GetPrompt(prompt.PromptTitle, smallModelProviderCfg.ID)),
- // We want the title to be short, so we limit the max tokens
- provider.WithMaxTokens(40),
- }
- newTitleProvider, err := provider.NewProvider(smallModelProviderCfg, titleOpts...)
- if err != nil {
- return fmt.Errorf("failed to create new title provider: %w", err)
- }
+ // Recreate title provider
+ titleOpts := []provider.ProviderClientOption{
+ provider.WithModel(config.SelectedModelTypeSmall),
+ provider.WithSystemMessage(prompt.GetPrompt(prompt.PromptTitle, smallModelProviderCfg.ID)),
+ provider.WithMaxTokens(40),
+ }
+ newTitleProvider, err := provider.NewProvider(smallModelProviderCfg, titleOpts...)
+ if err != nil {
+ return fmt.Errorf("failed to create new title provider: %w", err)
+ }
+ a.titleProvider = newTitleProvider
- // Recreate summarize provider
+ // Recreate summarize provider if provider changed (now large model)
+ if string(largeModelProviderCfg.ID) != a.summarizeProviderID {
+ largeModel := cfg.GetModelByType(config.SelectedModelTypeLarge)
+ if largeModel == nil {
+ return fmt.Errorf("model %s not found in provider %s", largeModelCfg.Model, largeModelProviderCfg.ID)
+ }
summarizeOpts := []provider.ProviderClientOption{
- provider.WithModel(config.SelectedModelTypeSmall),
- provider.WithSystemMessage(prompt.GetPrompt(prompt.PromptSummarizer, smallModelProviderCfg.ID)),
+ provider.WithModel(config.SelectedModelTypeLarge),
+ provider.WithSystemMessage(prompt.GetPrompt(prompt.PromptSummarizer, largeModelProviderCfg.ID)),
}
- newSummarizeProvider, err := provider.NewProvider(smallModelProviderCfg, summarizeOpts...)
+ newSummarizeProvider, err := provider.NewProvider(largeModelProviderCfg, summarizeOpts...)
if err != nil {
return fmt.Errorf("failed to create new summarize provider: %w", err)
}
-
- // Update the providers and provider ID
- a.titleProvider = newTitleProvider
a.summarizeProvider = newSummarizeProvider
- a.summarizeProviderID = string(smallModelProviderCfg.ID)
+ a.summarizeProviderID = string(largeModelProviderCfg.ID)
}
return nil
diff --git a/internal/llm/agent/mcp-tools.go b/internal/llm/agent/mcp-tools.go
index d8610b557896272d94c76c608b9bc00347655be4..ac4385d2725c600c01a8ac479c8364c99b0cb217 100644
--- a/internal/llm/agent/mcp-tools.go
+++ b/internal/llm/agent/mcp-tools.go
@@ -5,75 +5,119 @@ import (
"encoding/json"
"fmt"
"log/slog"
+ "slices"
+ "sync"
+ "time"
"github.com/charmbracelet/crush/internal/config"
+ "github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/llm/tools"
-
"github.com/charmbracelet/crush/internal/permission"
+ "github.com/charmbracelet/crush/internal/pubsub"
"github.com/charmbracelet/crush/internal/version"
-
"github.com/mark3labs/mcp-go/client"
"github.com/mark3labs/mcp-go/client/transport"
"github.com/mark3labs/mcp-go/mcp"
)
-type mcpTool struct {
+// MCPState represents the current state of an MCP client
+type MCPState int
+
+const (
+ MCPStateDisabled MCPState = iota
+ MCPStateStarting
+ MCPStateConnected
+ MCPStateError
+)
+
+func (s MCPState) String() string {
+ switch s {
+ case MCPStateDisabled:
+ return "disabled"
+ case MCPStateStarting:
+ return "starting"
+ case MCPStateConnected:
+ return "connected"
+ case MCPStateError:
+ return "error"
+ default:
+ return "unknown"
+ }
+}
+
+// MCPEventType represents the type of MCP event
+type MCPEventType string
+
+const (
+ MCPEventStateChanged MCPEventType = "state_changed"
+)
+
+// MCPEvent represents an event in the MCP system
+type MCPEvent struct {
+ Type MCPEventType
+ Name string
+ State MCPState
+ Error error
+ ToolCount int
+}
+
+// MCPClientInfo holds information about an MCP client's state
+type MCPClientInfo struct {
+ Name string
+ State MCPState
+ Error error
+ Client *client.Client
+ ToolCount int
+ ConnectedAt time.Time
+}
+
+var (
+ mcpToolsOnce sync.Once
+ mcpTools []tools.BaseTool
+ mcpClients = csync.NewMap[string, *client.Client]()
+ mcpStates = csync.NewMap[string, MCPClientInfo]()
+ mcpBroker = pubsub.NewBroker[MCPEvent]()
+)
+
+type McpTool struct {
mcpName string
tool mcp.Tool
- mcpConfig config.MCPConfig
permissions permission.Service
workingDir string
}
-type MCPClient interface {
- Initialize(
- ctx context.Context,
- request mcp.InitializeRequest,
- ) (*mcp.InitializeResult, error)
- ListTools(ctx context.Context, request mcp.ListToolsRequest) (*mcp.ListToolsResult, error)
- CallTool(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error)
- Close() error
+func (b *McpTool) Name() string {
+ return fmt.Sprintf("mcp_%s_%s", b.mcpName, b.tool.Name)
}
-func (b *mcpTool) Name() string {
- return fmt.Sprintf("%s_%s", b.mcpName, b.tool.Name)
-}
-
-func (b *mcpTool) Info() tools.ToolInfo {
+func (b *McpTool) Info() tools.ToolInfo {
required := b.tool.InputSchema.Required
if required == nil {
required = make([]string, 0)
}
return tools.ToolInfo{
- Name: fmt.Sprintf("%s_%s", b.mcpName, b.tool.Name),
+ Name: fmt.Sprintf("mcp_%s_%s", b.mcpName, b.tool.Name),
Description: b.tool.Description,
Parameters: b.tool.InputSchema.Properties,
Required: required,
}
}
-func runTool(ctx context.Context, c MCPClient, toolName string, input string) (tools.ToolResponse, error) {
- defer c.Close()
- initRequest := mcp.InitializeRequest{}
- initRequest.Params.ProtocolVersion = mcp.LATEST_PROTOCOL_VERSION
- initRequest.Params.ClientInfo = mcp.Implementation{
- Name: "Crush",
- Version: version.Version,
- }
-
- _, err := c.Initialize(ctx, initRequest)
- if err != nil {
- return tools.NewTextErrorResponse(err.Error()), nil
- }
-
- toolRequest := mcp.CallToolRequest{}
- toolRequest.Params.Name = toolName
+func runTool(ctx context.Context, name, toolName string, input string) (tools.ToolResponse, error) {
var args map[string]any
- if err = json.Unmarshal([]byte(input), &args); err != nil {
+ if err := json.Unmarshal([]byte(input), &args); err != nil {
return tools.NewTextErrorResponse(fmt.Sprintf("error parsing parameters: %s", err)), nil
}
- toolRequest.Params.Arguments = args
- result, err := c.CallTool(ctx, toolRequest)
+ c, ok := mcpClients.Get(name)
+ if !ok {
+ return tools.NewTextErrorResponse("mcp '" + name + "' not available"), nil
+ }
+ result, err := c.CallTool(ctx, mcp.CallToolRequest{
+ Params: mcp.CallToolParams{
+ Name: toolName,
+ Arguments: args,
+ },
+ })
if err != nil {
return tools.NewTextErrorResponse(err.Error()), nil
}
@@ -90,7 +134,7 @@ func runTool(ctx context.Context, c MCPClient, toolName string, input string) (t
return tools.NewTextResponse(output), nil
}
-func (b *mcpTool) Run(ctx context.Context, params tools.ToolCall) (tools.ToolResponse, error) {
+func (b *McpTool) Run(ctx context.Context, params tools.ToolCall) (tools.ToolResponse, error) {
sessionID, messageID := tools.GetContextValues(ctx)
if sessionID == "" || messageID == "" {
return tools.ToolResponse{}, fmt.Errorf("session ID and message ID are required for creating a new file")
@@ -99,6 +143,7 @@ func (b *mcpTool) Run(ctx context.Context, params tools.ToolCall) (tools.ToolRes
p := b.permissions.Request(
permission.CreatePermissionRequest{
SessionID: sessionID,
+ ToolCallID: params.ID,
Path: b.workingDir,
ToolName: b.Info().Name,
Action: "execute",
@@ -107,126 +152,187 @@ func (b *mcpTool) Run(ctx context.Context, params tools.ToolCall) (tools.ToolRes
},
)
if !p {
- return tools.NewTextErrorResponse("permission denied"), nil
+ return tools.ToolResponse{}, permission.ErrorPermissionDenied
}
- switch b.mcpConfig.Type {
- case config.MCPStdio:
- c, err := client.NewStdioMCPClient(
- b.mcpConfig.Command,
- b.mcpConfig.Env,
- b.mcpConfig.Args...,
- )
- if err != nil {
- return tools.NewTextErrorResponse(err.Error()), nil
- }
- return runTool(ctx, c, b.tool.Name, params.Input)
- case config.MCPHttp:
- c, err := client.NewStreamableHttpClient(
- b.mcpConfig.URL,
- transport.WithHTTPHeaders(b.mcpConfig.Headers),
- )
- if err != nil {
- return tools.NewTextErrorResponse(err.Error()), nil
- }
- return runTool(ctx, c, b.tool.Name, params.Input)
- case config.MCPSse:
- c, err := client.NewSSEMCPClient(
- b.mcpConfig.URL,
- client.WithHeaders(b.mcpConfig.Headers),
- )
- if err != nil {
- return tools.NewTextErrorResponse(err.Error()), nil
- }
- return runTool(ctx, c, b.tool.Name, params.Input)
- }
-
- return tools.NewTextErrorResponse("invalid mcp type"), nil
+ return runTool(ctx, b.mcpName, b.tool.Name, params.Input)
}
-func NewMcpTool(name string, tool mcp.Tool, permissions permission.Service, mcpConfig config.MCPConfig, workingDir string) tools.BaseTool {
- return &mcpTool{
- mcpName: name,
- tool: tool,
- mcpConfig: mcpConfig,
- permissions: permissions,
- workingDir: workingDir,
+func getTools(ctx context.Context, name string, permissions permission.Service, c *client.Client, workingDir string) []tools.BaseTool {
+ result, err := c.ListTools(ctx, mcp.ListToolsRequest{})
+ if err != nil {
+ slog.Error("error listing tools", "error", err)
+ updateMCPState(name, MCPStateError, err, nil, 0)
+ c.Close()
+ mcpClients.Del(name)
+ return nil
+ }
+ mcpTools := make([]tools.BaseTool, 0, len(result.Tools))
+ for _, tool := range result.Tools {
+ mcpTools = append(mcpTools, &McpTool{
+ mcpName: name,
+ tool: tool,
+ permissions: permissions,
+ workingDir: workingDir,
+ })
}
+ return mcpTools
}
-var mcpTools []tools.BaseTool
+// SubscribeMCPEvents returns a channel for MCP events
+func SubscribeMCPEvents(ctx context.Context) <-chan pubsub.Event[MCPEvent] {
+ return mcpBroker.Subscribe(ctx)
+}
-func getTools(ctx context.Context, name string, m config.MCPConfig, permissions permission.Service, c MCPClient, workingDir string) []tools.BaseTool {
- var stdioTools []tools.BaseTool
- initRequest := mcp.InitializeRequest{}
- initRequest.Params.ProtocolVersion = mcp.LATEST_PROTOCOL_VERSION
- initRequest.Params.ClientInfo = mcp.Implementation{
- Name: "Crush",
- Version: version.Version,
+// GetMCPStates returns the current state of all MCP clients
+func GetMCPStates() map[string]MCPClientInfo {
+ states := make(map[string]MCPClientInfo)
+ for name, info := range mcpStates.Seq2() {
+ states[name] = info
}
+ return states
+}
- _, err := c.Initialize(ctx, initRequest)
- if err != nil {
- slog.Error("error initializing mcp client", "error", err)
- return stdioTools
- }
- toolsRequest := mcp.ListToolsRequest{}
- tools, err := c.ListTools(ctx, toolsRequest)
- if err != nil {
- slog.Error("error listing tools", "error", err)
- return stdioTools
+// GetMCPState returns the state of a specific MCP client
+func GetMCPState(name string) (MCPClientInfo, bool) {
+ return mcpStates.Get(name)
+}
+
+// updateMCPState updates the state of an MCP client and publishes an event
+func updateMCPState(name string, state MCPState, err error, client *client.Client, toolCount int) {
+ info := MCPClientInfo{
+ Name: name,
+ State: state,
+ Error: err,
+ Client: client,
+ ToolCount: toolCount,
}
- for _, t := range tools.Tools {
- stdioTools = append(stdioTools, NewMcpTool(name, t, permissions, m, workingDir))
+ if state == MCPStateConnected {
+ info.ConnectedAt = time.Now()
}
- defer c.Close()
- return stdioTools
+ mcpStates.Set(name, info)
+
+ // Publish state change event
+ mcpBroker.Publish(pubsub.UpdatedEvent, MCPEvent{
+ Type: MCPEventStateChanged,
+ Name: name,
+ State: state,
+ Error: err,
+ ToolCount: toolCount,
+ })
}
-func GetMcpTools(ctx context.Context, permissions permission.Service, cfg *config.Config) []tools.BaseTool {
- if len(mcpTools) > 0 {
- return mcpTools
+// CloseMCPClients closes all MCP clients. This should be called during application shutdown.
+func CloseMCPClients() {
+ for c := range mcpClients.Seq() {
+ _ = c.Close()
}
+ mcpBroker.Shutdown()
+}
+
+var mcpInitRequest = mcp.InitializeRequest{
+ Params: mcp.InitializeParams{
+ ProtocolVersion: mcp.LATEST_PROTOCOL_VERSION,
+ ClientInfo: mcp.Implementation{
+ Name: "Crush",
+ Version: version.Version,
+ },
+ },
+}
+
+func doGetMCPTools(ctx context.Context, permissions permission.Service, cfg *config.Config) []tools.BaseTool {
+ var wg sync.WaitGroup
+ result := csync.NewSlice[tools.BaseTool]()
+
+ // Initialize states for all configured MCPs
for name, m := range cfg.MCP {
if m.Disabled {
+ updateMCPState(name, MCPStateDisabled, nil, nil, 0)
slog.Debug("skipping disabled mcp", "name", name)
continue
}
- switch m.Type {
- case config.MCPStdio:
- c, err := client.NewStdioMCPClient(
- m.Command,
- m.Env,
- m.Args...,
- )
- if err != nil {
- slog.Error("error creating mcp client", "error", err)
- continue
- }
- mcpTools = append(mcpTools, getTools(ctx, name, m, permissions, c, cfg.WorkingDir())...)
- case config.MCPHttp:
- c, err := client.NewStreamableHttpClient(
- m.URL,
- transport.WithHTTPHeaders(m.Headers),
- )
+ // Set initial starting state
+ updateMCPState(name, MCPStateStarting, nil, nil, 0)
+
+ wg.Add(1)
+ go func(name string, m config.MCPConfig) {
+ defer func() {
+ wg.Done()
+ if r := recover(); r != nil {
+ var err error
+ switch v := r.(type) {
+ case error:
+ err = v
+ case string:
+ err = fmt.Errorf("panic: %s", v)
+ default:
+ err = fmt.Errorf("panic: %v", v)
+ }
+ updateMCPState(name, MCPStateError, err, nil, 0)
+ slog.Error("panic in mcp client initialization", "error", err, "name", name)
+ }
+ }()
+
+ c, err := createMcpClient(m)
if err != nil {
- slog.Error("error creating mcp client", "error", err)
- continue
+ updateMCPState(name, MCPStateError, err, nil, 0)
+ slog.Error("error creating mcp client", "error", err, "name", name)
+ return
}
- mcpTools = append(mcpTools, getTools(ctx, name, m, permissions, c, cfg.WorkingDir())...)
- case config.MCPSse:
- c, err := client.NewSSEMCPClient(
- m.URL,
- client.WithHeaders(m.Headers),
- )
- if err != nil {
- slog.Error("error creating mcp client", "error", err)
- continue
+ if err := c.Start(ctx); err != nil {
+ updateMCPState(name, MCPStateError, err, nil, 0)
+ slog.Error("error starting mcp client", "error", err, "name", name)
+ _ = c.Close()
+ return
}
- mcpTools = append(mcpTools, getTools(ctx, name, m, permissions, c, cfg.WorkingDir())...)
- }
+ if _, err := c.Initialize(ctx, mcpInitRequest); err != nil {
+ updateMCPState(name, MCPStateError, err, nil, 0)
+ slog.Error("error initializing mcp client", "error", err, "name", name)
+ _ = c.Close()
+ return
+ }
+
+ slog.Info("Initialized mcp client", "name", name)
+ mcpClients.Set(name, c)
+
+ tools := getTools(ctx, name, permissions, c, cfg.WorkingDir())
+ updateMCPState(name, MCPStateConnected, nil, c, len(tools))
+ result.Append(tools...)
+ }(name, m)
}
+ wg.Wait()
+ return slices.Collect(result.Seq())
+}
- return mcpTools
+func createMcpClient(m config.MCPConfig) (*client.Client, error) {
+ switch m.Type {
+ case config.MCPStdio:
+ return client.NewStdioMCPClientWithOptions(
+ m.Command,
+ m.ResolvedEnv(),
+ m.Args,
+ transport.WithCommandLogger(mcpLogger{}),
+ )
+ case config.MCPHttp:
+ return client.NewStreamableHttpClient(
+ m.URL,
+ transport.WithHTTPHeaders(m.ResolvedHeaders()),
+ transport.WithHTTPLogger(mcpLogger{}),
+ )
+ case config.MCPSse:
+ return client.NewSSEMCPClient(
+ m.URL,
+ client.WithHeaders(m.ResolvedHeaders()),
+ transport.WithSSELogger(mcpLogger{}),
+ )
+ default:
+ return nil, fmt.Errorf("unsupported mcp type: %s", m.Type)
+ }
}
+
+// for MCP's clients.
+type mcpLogger struct{}
+
+func (l mcpLogger) Errorf(format string, v ...any) { slog.Error(fmt.Sprintf(format, v...)) }
+func (l mcpLogger) Infof(format string, v ...any) { slog.Info(fmt.Sprintf(format, v...)) }
diff --git a/internal/llm/prompt/anthropic.md b/internal/llm/prompt/anthropic.md
new file mode 100644
index 0000000000000000000000000000000000000000..c025e1cde544f0df596a8e855e69087e9b547746
--- /dev/null
+++ b/internal/llm/prompt/anthropic.md
@@ -0,0 +1,108 @@
+You are Crush, an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.
+
+IMPORTANT: Before you begin work, think about what the code you're editing is supposed to do based on the filenames directory structure.
+
+# Memory
+
+If the current working directory contains a file called CRUSH.md, it will be automatically added to your context. This file serves multiple purposes:
+
+1. Storing frequently used bash commands (build, test, lint, etc.) so you can use them without searching each time
+2. Recording the user's code style preferences (naming conventions, preferred libraries, etc.)
+3. Maintaining useful information about the codebase structure and organization
+
+When you spend time searching for commands to typecheck, lint, build, or test, you should ask the user if it's okay to add those commands to CRUSH.md. Similarly, when learning about code style preferences or important codebase information, ask if it's okay to add that to CRUSH.md so you can remember it for next time.
+
+# Tone and style
+
+You should be concise, direct, and to the point. When you run a non-trivial bash command, you should explain what the command does and why you are running it, to make sure the user understands what you are doing (this is especially important when you are running a command that will make changes to the user's system).
+Remember that your output will be displayed on a command line interface. Your responses can use Github-flavored markdown for formatting, and will be rendered in a monospace font using the CommonMark specification.
+Output text to communicate with the user; all text you output outside of tool use is displayed to the user. Only use tools to complete tasks. Never use tools like Bash or code comments as means to communicate with the user during the session.
+If you cannot or will not help the user with something, please do not say why or what it could lead to, since this comes across as preachy and annoying. Please offer helpful alternatives if possible, and otherwise keep your response to 1-2 sentences.
+IMPORTANT: You should minimize output tokens as much as possible while maintaining helpfulness, quality, and accuracy. Only address the specific query or task at hand, avoiding tangential information unless absolutely critical for completing the request. If you can answer in 1-3 sentences or a short paragraph, please do.
+IMPORTANT: You should NOT answer with unnecessary preamble or postamble (such as explaining your code or summarizing your action), unless the user asks you to.
+IMPORTANT: Keep your responses short, since they will be displayed on a command line interface. You MUST answer concisely with fewer than 4 lines (not including tool use or code generation), unless user asks for detail. Answer the user's question directly, without elaboration, explanation, or details. One word answers are best. Avoid introductions, conclusions, and explanations. You MUST avoid text before/after your response, such as "The answer is - [Enable logging](#enable-and-configure-logging) to get further diagnostic information.
- Consult the troubleshooting guide for underlying credential types for more information.
- [EnvironmentCredential](#troubleshoot-environmentcredential-authentication-issues)
- [ManagedIdentityCredential](#troubleshoot-managedidentitycredential-authentication-issues)
- [AzureCLICredential](#troubleshoot-azureclicredential-authentication-issues)
- [Enable logging](#enable-and-configure-logging) to determine which credential in the chain returned the authenticating token.
- If an unexpected credential is returning a token, check application configuration such as environment variables.
- Ensure the correct role is assigned to the authenticated identity. For example, a service specific role rather than the subscription Owner role.
- Ensure the VM is configured for managed identity as described in [managed identity documentation](https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/qs-configure-portal-windows-vm).
- Verify the IMDS endpoint is reachable on the VM. See [below](#verify-imds-is-available-on-the-vm) for instructions.
- Refer to the error message for more details on specific failures.
- Ensure the VM is configured for managed identity as described in [managed identity documentation](https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/qs-configure-portal-windows-vm).
- Verify the IMDS endpoint is reachable on the VM. See [below](#verify-imds-is-available-on-the-vm) for instructions.
- Ensure the App Service is configured for managed identity as described in [App Service documentation](https://learn.microsoft.com/azure/app-service/overview-managed-identity).
- Verify the App Service environment is properly configured and the managed identity endpoint is available. See [below](#verify-the-app-service-managed-identity-endpoint-is-available) for instructions.
- Ensure the Azure CLI is installed as described in [Azure CLI documentation](https://learn.microsoft.com/cli/azure/install-azure-cli).
- Validate the installation location is in the application's `PATH` environment variable.
- Run `az login` to log into the Azure CLI. More information about Azure CLI authentication is available in the [Azure CLI documentation](https://learn.microsoft.com/cli/azure/authenticate-azure-cli).
- Verify that the Azure CLI can obtain tokens. See [below](#verify-the-azure-cli-can-obtain-tokens) for instructions.
- Ensure the Azure Developer CLI is properly installed. See the installation instructions at [Install or update the Azure Developer CLI](https://learn.microsoft.com/azure/developer/azure-developer-cli/install-azd).
- Validate the installation location has been added to the `PATH` environment variable.
- Log in to the Azure Developer CLI using the `azd login` command.
- Validate that the Azure Developer CLI can obtain tokens. For instructions, see [Verify the Azure Developer CLI can obtain tokens](#verify-the-azure-developer-cli-can-obtain-tokens).
- If your application runs on Azure Kubernetes Servide (AKS) or a cluster that has deployed the Azure Workload Identity admission webhook, check pod labels and service account configuration. See the [AKS documentation](https://learn.microsoft.com/azure/aks/workload-identity-deploy-cluster#disable-workload-identity) and [Azure Workload Identity troubleshooting guide](https://azure.github.io/azure-workload-identity/docs/troubleshooting.html) for more details.
- If your application isn't running on AKS or your cluster hasn't deployed the Workload Identity admission webhook, set these values in `WorkloadIdentityCredentialOptions`
-
-
-## Troubleshoot AzurePipelinesCredential authentication issues
-
-| Error Message |Description| Mitigation |
-|---|---|---|
-| AADSTS900023: Specified tenant identifier 'some tenant ID' is neither a valid DNS name, nor a valid external domain.|The `tenantID` argument to `NewAzurePipelinesCredential` is incorrect| Verify the tenant ID. It must identify the tenant of the user-assigned managed identity or service principal configured for the service connection.|
-| No service connection found with identifier |The `serviceConnectionID` argument to `NewAzurePipelinesCredential` is incorrect| Verify the service connection ID. This parameter refers to the `resourceId` of the Azure Service Connection. It can also be found in the query string of the service connection's configuration in Azure DevOps. [Azure Pipelines documentation](https://learn.microsoft.com/azure/devops/pipelines/library/service-endpoints?view=azure-devops&tabs=yaml) has more information about service connections.|
-|302 (Found) response from OIDC endpoint|The `systemAccessToken` argument to `NewAzurePipelinesCredential` is incorrect|Check pipeline configuration. This value comes from the predefined variable `System.AccessToken` [as described in Azure Pipelines documentation](https://learn.microsoft.com/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#systemaccesstoken).|
-
-## Get additional help
-
-Additional information on ways to reach out for support can be found in [SUPPORT.md](https://github.com/Azure/azure-sdk-for-go/blob/main/SUPPORT.md).
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/assets.json b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/assets.json
deleted file mode 100644
index bff0c44dac48bde4ea6076eed7b0a5b370c2a999..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/assets.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "AssetsRepo": "Azure/azure-sdk-assets",
- "AssetsRepoPrefixPath": "go",
- "TagPrefix": "go/azidentity",
- "Tag": "go/azidentity_087379b475"
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/authentication_record.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/authentication_record.go
deleted file mode 100644
index ada4d6501d2c4387b52b76e3966b7e578f3a019f..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/authentication_record.go
+++ /dev/null
@@ -1,95 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "encoding/json"
- "errors"
- "fmt"
- "net/url"
- "strings"
-
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/public"
-)
-
-var supportedAuthRecordVersions = []string{"1.0"}
-
-// authenticationRecord is non-secret account information about an authenticated user that user credentials such as
-// [DeviceCodeCredential] and [InteractiveBrowserCredential] can use to access previously cached authentication
-// data. Call these credentials' Authenticate method to get an authenticationRecord for a user.
-type authenticationRecord struct {
- // Authority is the URL of the authority that issued the token.
- Authority string `json:"authority"`
-
- // ClientID is the ID of the application that authenticated the user.
- ClientID string `json:"clientId"`
-
- // HomeAccountID uniquely identifies the account.
- HomeAccountID string `json:"homeAccountId"`
-
- // TenantID identifies the tenant in which the user authenticated.
- TenantID string `json:"tenantId"`
-
- // Username is the user's preferred username.
- Username string `json:"username"`
-
- // Version of the AuthenticationRecord.
- Version string `json:"version"`
-}
-
-// UnmarshalJSON implements json.Unmarshaler for AuthenticationRecord
-func (a *authenticationRecord) UnmarshalJSON(b []byte) error {
- // Default unmarshaling is fine but we want to return an error if the record's version isn't supported i.e., we
- // want to inspect the unmarshalled values before deciding whether to return an error. Unmarshaling a formally
- // different type enables this by assigning all the fields without recursing into this method.
- type r authenticationRecord
- err := json.Unmarshal(b, (*r)(a))
- if err != nil {
- return err
- }
- if a.Version == "" {
- return errors.New("AuthenticationRecord must have a version")
- }
- for _, v := range supportedAuthRecordVersions {
- if a.Version == v {
- return nil
- }
- }
- return fmt.Errorf("unsupported AuthenticationRecord version %q. This module supports %v", a.Version, supportedAuthRecordVersions)
-}
-
-// account returns the AuthenticationRecord as an MSAL Account. The account is zero-valued when the AuthenticationRecord is zero-valued.
-func (a *authenticationRecord) account() public.Account {
- return public.Account{
- Environment: a.Authority,
- HomeAccountID: a.HomeAccountID,
- PreferredUsername: a.Username,
- }
-}
-
-func newAuthenticationRecord(ar public.AuthResult) (authenticationRecord, error) {
- u, err := url.Parse(ar.IDToken.Issuer)
- if err != nil {
- return authenticationRecord{}, fmt.Errorf("Authenticate expected a URL issuer but got %q", ar.IDToken.Issuer)
- }
- tenant := ar.IDToken.TenantID
- if tenant == "" {
- tenant = strings.Trim(u.Path, "/")
- }
- username := ar.IDToken.PreferredUsername
- if username == "" {
- username = ar.IDToken.UPN
- }
- return authenticationRecord{
- Authority: fmt.Sprintf("%s://%s", u.Scheme, u.Host),
- ClientID: ar.IDToken.Audience,
- HomeAccountID: ar.Account.HomeAccountID,
- TenantID: tenant,
- Username: username,
- Version: "1.0",
- }, nil
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azidentity.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azidentity.go
deleted file mode 100644
index b0965036bbf0a1ebc886af86768095f525ae8fdb..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azidentity.go
+++ /dev/null
@@ -1,190 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "bytes"
- "context"
- "errors"
- "fmt"
- "io"
- "net/http"
- "net/url"
- "os"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming"
- "github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/public"
-)
-
-const (
- azureAdditionallyAllowedTenants = "AZURE_ADDITIONALLY_ALLOWED_TENANTS"
- azureAuthorityHost = "AZURE_AUTHORITY_HOST"
- azureClientCertificatePassword = "AZURE_CLIENT_CERTIFICATE_PASSWORD"
- azureClientCertificatePath = "AZURE_CLIENT_CERTIFICATE_PATH"
- azureClientID = "AZURE_CLIENT_ID"
- azureClientSecret = "AZURE_CLIENT_SECRET"
- azureFederatedTokenFile = "AZURE_FEDERATED_TOKEN_FILE"
- azurePassword = "AZURE_PASSWORD"
- azureRegionalAuthorityName = "AZURE_REGIONAL_AUTHORITY_NAME"
- azureTenantID = "AZURE_TENANT_ID"
- azureUsername = "AZURE_USERNAME"
-
- organizationsTenantID = "organizations"
- developerSignOnClientID = "04b07795-8ddb-461a-bbee-02f9e1bf7b46"
- defaultSuffix = "/.default"
-
- traceNamespace = "Microsoft.Entra"
- traceOpGetToken = "GetToken"
- traceOpAuthenticate = "Authenticate"
-)
-
-var (
- // capability CP1 indicates the client application is capable of handling CAE claims challenges
- cp1 = []string{"CP1"}
- errInvalidTenantID = errors.New("invalid tenantID. You can locate your tenantID by following the instructions listed here: https://learn.microsoft.com/partner-center/find-ids-and-domain-names")
-)
-
-// tokenCachePersistenceOptions contains options for persistent token caching
-type tokenCachePersistenceOptions = internal.TokenCachePersistenceOptions
-
-// setAuthorityHost initializes the authority host for credentials. Precedence is:
-// 1. cloud.Configuration.ActiveDirectoryAuthorityHost value set by user
-// 2. value of AZURE_AUTHORITY_HOST
-// 3. default: Azure Public Cloud
-func setAuthorityHost(cc cloud.Configuration) (string, error) {
- host := cc.ActiveDirectoryAuthorityHost
- if host == "" {
- if len(cc.Services) > 0 {
- return "", errors.New("missing ActiveDirectoryAuthorityHost for specified cloud")
- }
- host = cloud.AzurePublic.ActiveDirectoryAuthorityHost
- if envAuthorityHost := os.Getenv(azureAuthorityHost); envAuthorityHost != "" {
- host = envAuthorityHost
- }
- }
- u, err := url.Parse(host)
- if err != nil {
- return "", err
- }
- if u.Scheme != "https" {
- return "", errors.New("cannot use an authority host without https")
- }
- return host, nil
-}
-
-// resolveAdditionalTenants returns a copy of tenants, simplified when tenants contains a wildcard
-func resolveAdditionalTenants(tenants []string) []string {
- if len(tenants) == 0 {
- return nil
- }
- for _, t := range tenants {
- // a wildcard makes all other values redundant
- if t == "*" {
- return []string{"*"}
- }
- }
- cp := make([]string, len(tenants))
- copy(cp, tenants)
- return cp
-}
-
-// resolveTenant returns the correct tenant for a token request
-func resolveTenant(defaultTenant, specified, credName string, additionalTenants []string) (string, error) {
- if specified == "" || specified == defaultTenant {
- return defaultTenant, nil
- }
- if defaultTenant == "adfs" {
- return "", errors.New("ADFS doesn't support tenants")
- }
- if !validTenantID(specified) {
- return "", errInvalidTenantID
- }
- for _, t := range additionalTenants {
- if t == "*" || t == specified {
- return specified, nil
- }
- }
- return "", fmt.Errorf(`%s isn't configured to acquire tokens for tenant %q. To enable acquiring tokens for this tenant add it to the AdditionallyAllowedTenants on the credential options, or add "*" to allow acquiring tokens for any tenant`, credName, specified)
-}
-
-func alphanumeric(r rune) bool {
- return ('0' <= r && r <= '9') || ('a' <= r && r <= 'z') || ('A' <= r && r <= 'Z')
-}
-
-func validTenantID(tenantID string) bool {
- if len(tenantID) < 1 {
- return false
- }
- for _, r := range tenantID {
- if !(alphanumeric(r) || r == '.' || r == '-') {
- return false
- }
- }
- return true
-}
-
-func doForClient(client *azcore.Client, r *http.Request) (*http.Response, error) {
- req, err := runtime.NewRequest(r.Context(), r.Method, r.URL.String())
- if err != nil {
- return nil, err
- }
- if r.Body != nil && r.Body != http.NoBody {
- // create a rewindable body from the existing body as required
- var body io.ReadSeekCloser
- if rsc, ok := r.Body.(io.ReadSeekCloser); ok {
- body = rsc
- } else {
- b, err := io.ReadAll(r.Body)
- if err != nil {
- return nil, err
- }
- body = streaming.NopCloser(bytes.NewReader(b))
- }
- err = req.SetBody(body, r.Header.Get("Content-Type"))
- if err != nil {
- return nil, err
- }
- }
-
- // copy headers to the new request, ignoring any for which the new request has a value
- h := req.Raw().Header
- for key, vals := range r.Header {
- if _, has := h[key]; !has {
- for _, val := range vals {
- h.Add(key, val)
- }
- }
- }
-
- resp, err := client.Pipeline().Do(req)
- if err != nil {
- return nil, err
- }
- return resp, err
-}
-
-// enables fakes for test scenarios
-type msalConfidentialClient interface {
- AcquireTokenSilent(ctx context.Context, scopes []string, options ...confidential.AcquireSilentOption) (confidential.AuthResult, error)
- AcquireTokenByAuthCode(ctx context.Context, code string, redirectURI string, scopes []string, options ...confidential.AcquireByAuthCodeOption) (confidential.AuthResult, error)
- AcquireTokenByCredential(ctx context.Context, scopes []string, options ...confidential.AcquireByCredentialOption) (confidential.AuthResult, error)
- AcquireTokenOnBehalfOf(ctx context.Context, userAssertion string, scopes []string, options ...confidential.AcquireOnBehalfOfOption) (confidential.AuthResult, error)
-}
-
-// enables fakes for test scenarios
-type msalPublicClient interface {
- AcquireTokenSilent(ctx context.Context, scopes []string, options ...public.AcquireSilentOption) (public.AuthResult, error)
- AcquireTokenByUsernamePassword(ctx context.Context, scopes []string, username string, password string, options ...public.AcquireByUsernamePasswordOption) (public.AuthResult, error)
- AcquireTokenByDeviceCode(ctx context.Context, scopes []string, options ...public.AcquireByDeviceCodeOption) (public.DeviceCode, error)
- AcquireTokenByAuthCode(ctx context.Context, code string, redirectURI string, scopes []string, options ...public.AcquireByAuthCodeOption) (public.AuthResult, error)
- AcquireTokenInteractive(ctx context.Context, scopes []string, options ...public.AcquireInteractiveOption) (public.AuthResult, error)
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_cli_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_cli_credential.go
deleted file mode 100644
index b9976f5fedee5ddb112a5de97eda6355375294f7..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_cli_credential.go
+++ /dev/null
@@ -1,190 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "bytes"
- "context"
- "encoding/json"
- "errors"
- "fmt"
- "os"
- "os/exec"
- "runtime"
- "strings"
- "sync"
- "time"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
-)
-
-const credNameAzureCLI = "AzureCLICredential"
-
-type azTokenProvider func(ctx context.Context, scopes []string, tenant, subscription string) ([]byte, error)
-
-// AzureCLICredentialOptions contains optional parameters for AzureCLICredential.
-type AzureCLICredentialOptions struct {
- // AdditionallyAllowedTenants specifies tenants for which the credential may acquire tokens, in addition
- // to TenantID. Add the wildcard value "*" to allow the credential to acquire tokens for any tenant the
- // logged in account can access.
- AdditionallyAllowedTenants []string
-
- // Subscription is the name or ID of a subscription. Set this to acquire tokens for an account other
- // than the Azure CLI's current account.
- Subscription string
-
- // TenantID identifies the tenant the credential should authenticate in.
- // Defaults to the CLI's default tenant, which is typically the home tenant of the logged in user.
- TenantID string
-
- // inDefaultChain is true when the credential is part of DefaultAzureCredential
- inDefaultChain bool
- // tokenProvider is used by tests to fake invoking az
- tokenProvider azTokenProvider
-}
-
-// init returns an instance of AzureCLICredentialOptions initialized with default values.
-func (o *AzureCLICredentialOptions) init() {
- if o.tokenProvider == nil {
- o.tokenProvider = defaultAzTokenProvider
- }
-}
-
-// AzureCLICredential authenticates as the identity logged in to the Azure CLI.
-type AzureCLICredential struct {
- mu *sync.Mutex
- opts AzureCLICredentialOptions
-}
-
-// NewAzureCLICredential constructs an AzureCLICredential. Pass nil to accept default options.
-func NewAzureCLICredential(options *AzureCLICredentialOptions) (*AzureCLICredential, error) {
- cp := AzureCLICredentialOptions{}
- if options != nil {
- cp = *options
- }
- for _, r := range cp.Subscription {
- if !(alphanumeric(r) || r == '-' || r == '_' || r == ' ' || r == '.') {
- return nil, fmt.Errorf("%s: invalid Subscription %q", credNameAzureCLI, cp.Subscription)
- }
- }
- if cp.TenantID != "" && !validTenantID(cp.TenantID) {
- return nil, errInvalidTenantID
- }
- cp.init()
- cp.AdditionallyAllowedTenants = resolveAdditionalTenants(cp.AdditionallyAllowedTenants)
- return &AzureCLICredential{mu: &sync.Mutex{}, opts: cp}, nil
-}
-
-// GetToken requests a token from the Azure CLI. This credential doesn't cache tokens, so every call invokes the CLI.
-// This method is called automatically by Azure SDK clients.
-func (c *AzureCLICredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- at := azcore.AccessToken{}
- if len(opts.Scopes) != 1 {
- return at, errors.New(credNameAzureCLI + ": GetToken() requires exactly one scope")
- }
- if !validScope(opts.Scopes[0]) {
- return at, fmt.Errorf("%s.GetToken(): invalid scope %q", credNameAzureCLI, opts.Scopes[0])
- }
- tenant, err := resolveTenant(c.opts.TenantID, opts.TenantID, credNameAzureCLI, c.opts.AdditionallyAllowedTenants)
- if err != nil {
- return at, err
- }
- c.mu.Lock()
- defer c.mu.Unlock()
- b, err := c.opts.tokenProvider(ctx, opts.Scopes, tenant, c.opts.Subscription)
- if err == nil {
- at, err = c.createAccessToken(b)
- }
- if err != nil {
- err = unavailableIfInChain(err, c.opts.inDefaultChain)
- return at, err
- }
- msg := fmt.Sprintf("%s.GetToken() acquired a token for scope %q", credNameAzureCLI, strings.Join(opts.Scopes, ", "))
- log.Write(EventAuthentication, msg)
- return at, nil
-}
-
-// defaultAzTokenProvider invokes the Azure CLI to acquire a token. It assumes
-// callers have verified that all string arguments are safe to pass to the CLI.
-var defaultAzTokenProvider azTokenProvider = func(ctx context.Context, scopes []string, tenantID, subscription string) ([]byte, error) {
- // pass the CLI a Microsoft Entra ID v1 resource because we don't know which CLI version is installed and older ones don't support v2 scopes
- resource := strings.TrimSuffix(scopes[0], defaultSuffix)
- // set a default timeout for this authentication iff the application hasn't done so already
- var cancel context.CancelFunc
- if _, hasDeadline := ctx.Deadline(); !hasDeadline {
- ctx, cancel = context.WithTimeout(ctx, cliTimeout)
- defer cancel()
- }
- commandLine := "az account get-access-token -o json --resource " + resource
- if tenantID != "" {
- commandLine += " --tenant " + tenantID
- }
- if subscription != "" {
- // subscription needs quotes because it may contain spaces
- commandLine += ` --subscription "` + subscription + `"`
- }
- var cliCmd *exec.Cmd
- if runtime.GOOS == "windows" {
- dir := os.Getenv("SYSTEMROOT")
- if dir == "" {
- return nil, newCredentialUnavailableError(credNameAzureCLI, "environment variable 'SYSTEMROOT' has no value")
- }
- cliCmd = exec.CommandContext(ctx, "cmd.exe", "/c", commandLine)
- cliCmd.Dir = dir
- } else {
- cliCmd = exec.CommandContext(ctx, "/bin/sh", "-c", commandLine)
- cliCmd.Dir = "/bin"
- }
- cliCmd.Env = os.Environ()
- var stderr bytes.Buffer
- cliCmd.Stderr = &stderr
-
- output, err := cliCmd.Output()
- if err != nil {
- msg := stderr.String()
- var exErr *exec.ExitError
- if errors.As(err, &exErr) && exErr.ExitCode() == 127 || strings.HasPrefix(msg, "'az' is not recognized") {
- msg = "Azure CLI not found on path"
- }
- if msg == "" {
- msg = err.Error()
- }
- return nil, newCredentialUnavailableError(credNameAzureCLI, msg)
- }
-
- return output, nil
-}
-
-func (c *AzureCLICredential) createAccessToken(tk []byte) (azcore.AccessToken, error) {
- t := struct {
- AccessToken string `json:"accessToken"`
- Expires_On int64 `json:"expires_on"`
- ExpiresOn string `json:"expiresOn"`
- }{}
- err := json.Unmarshal(tk, &t)
- if err != nil {
- return azcore.AccessToken{}, err
- }
-
- exp := time.Unix(t.Expires_On, 0)
- if t.Expires_On == 0 {
- exp, err = time.ParseInLocation("2006-01-02 15:04:05.999999", t.ExpiresOn, time.Local)
- if err != nil {
- return azcore.AccessToken{}, fmt.Errorf("%s: error parsing token expiration time %q: %v", credNameAzureCLI, t.ExpiresOn, err)
- }
- }
-
- converted := azcore.AccessToken{
- Token: t.AccessToken,
- ExpiresOn: exp.UTC(),
- }
- return converted, nil
-}
-
-var _ azcore.TokenCredential = (*AzureCLICredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_developer_cli_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_developer_cli_credential.go
deleted file mode 100644
index cbe7c4c2db1fc1d5b248a5afa74f66d4b8db2b71..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_developer_cli_credential.go
+++ /dev/null
@@ -1,169 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "bytes"
- "context"
- "encoding/json"
- "errors"
- "fmt"
- "os"
- "os/exec"
- "runtime"
- "strings"
- "sync"
- "time"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
-)
-
-const credNameAzureDeveloperCLI = "AzureDeveloperCLICredential"
-
-type azdTokenProvider func(ctx context.Context, scopes []string, tenant string) ([]byte, error)
-
-// AzureDeveloperCLICredentialOptions contains optional parameters for AzureDeveloperCLICredential.
-type AzureDeveloperCLICredentialOptions struct {
- // AdditionallyAllowedTenants specifies tenants for which the credential may acquire tokens, in addition
- // to TenantID. Add the wildcard value "*" to allow the credential to acquire tokens for any tenant the
- // logged in account can access.
- AdditionallyAllowedTenants []string
-
- // TenantID identifies the tenant the credential should authenticate in. Defaults to the azd environment,
- // which is the tenant of the selected Azure subscription.
- TenantID string
-
- // inDefaultChain is true when the credential is part of DefaultAzureCredential
- inDefaultChain bool
- // tokenProvider is used by tests to fake invoking azd
- tokenProvider azdTokenProvider
-}
-
-// AzureDeveloperCLICredential authenticates as the identity logged in to the [Azure Developer CLI].
-//
-// [Azure Developer CLI]: https://learn.microsoft.com/azure/developer/azure-developer-cli/overview
-type AzureDeveloperCLICredential struct {
- mu *sync.Mutex
- opts AzureDeveloperCLICredentialOptions
-}
-
-// NewAzureDeveloperCLICredential constructs an AzureDeveloperCLICredential. Pass nil to accept default options.
-func NewAzureDeveloperCLICredential(options *AzureDeveloperCLICredentialOptions) (*AzureDeveloperCLICredential, error) {
- cp := AzureDeveloperCLICredentialOptions{}
- if options != nil {
- cp = *options
- }
- if cp.TenantID != "" && !validTenantID(cp.TenantID) {
- return nil, errInvalidTenantID
- }
- if cp.tokenProvider == nil {
- cp.tokenProvider = defaultAzdTokenProvider
- }
- return &AzureDeveloperCLICredential{mu: &sync.Mutex{}, opts: cp}, nil
-}
-
-// GetToken requests a token from the Azure Developer CLI. This credential doesn't cache tokens, so every call invokes azd.
-// This method is called automatically by Azure SDK clients.
-func (c *AzureDeveloperCLICredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- at := azcore.AccessToken{}
- if len(opts.Scopes) == 0 {
- return at, errors.New(credNameAzureDeveloperCLI + ": GetToken() requires at least one scope")
- }
- for _, scope := range opts.Scopes {
- if !validScope(scope) {
- return at, fmt.Errorf("%s.GetToken(): invalid scope %q", credNameAzureDeveloperCLI, scope)
- }
- }
- tenant, err := resolveTenant(c.opts.TenantID, opts.TenantID, credNameAzureDeveloperCLI, c.opts.AdditionallyAllowedTenants)
- if err != nil {
- return at, err
- }
- c.mu.Lock()
- defer c.mu.Unlock()
- b, err := c.opts.tokenProvider(ctx, opts.Scopes, tenant)
- if err == nil {
- at, err = c.createAccessToken(b)
- }
- if err != nil {
- err = unavailableIfInChain(err, c.opts.inDefaultChain)
- return at, err
- }
- msg := fmt.Sprintf("%s.GetToken() acquired a token for scope %q", credNameAzureDeveloperCLI, strings.Join(opts.Scopes, ", "))
- log.Write(EventAuthentication, msg)
- return at, nil
-}
-
-// defaultAzTokenProvider invokes the Azure Developer CLI to acquire a token. It assumes
-// callers have verified that all string arguments are safe to pass to the CLI.
-var defaultAzdTokenProvider azdTokenProvider = func(ctx context.Context, scopes []string, tenant string) ([]byte, error) {
- // set a default timeout for this authentication iff the application hasn't done so already
- var cancel context.CancelFunc
- if _, hasDeadline := ctx.Deadline(); !hasDeadline {
- ctx, cancel = context.WithTimeout(ctx, cliTimeout)
- defer cancel()
- }
- commandLine := "azd auth token -o json"
- if tenant != "" {
- commandLine += " --tenant-id " + tenant
- }
- for _, scope := range scopes {
- commandLine += " --scope " + scope
- }
- var cliCmd *exec.Cmd
- if runtime.GOOS == "windows" {
- dir := os.Getenv("SYSTEMROOT")
- if dir == "" {
- return nil, newCredentialUnavailableError(credNameAzureDeveloperCLI, "environment variable 'SYSTEMROOT' has no value")
- }
- cliCmd = exec.CommandContext(ctx, "cmd.exe", "/c", commandLine)
- cliCmd.Dir = dir
- } else {
- cliCmd = exec.CommandContext(ctx, "/bin/sh", "-c", commandLine)
- cliCmd.Dir = "/bin"
- }
- cliCmd.Env = os.Environ()
- var stderr bytes.Buffer
- cliCmd.Stderr = &stderr
- output, err := cliCmd.Output()
- if err != nil {
- msg := stderr.String()
- var exErr *exec.ExitError
- if errors.As(err, &exErr) && exErr.ExitCode() == 127 || strings.HasPrefix(msg, "'azd' is not recognized") {
- msg = "Azure Developer CLI not found on path"
- } else if strings.Contains(msg, "azd auth login") {
- msg = `please run "azd auth login" from a command prompt to authenticate before using this credential`
- }
- if msg == "" {
- msg = err.Error()
- }
- return nil, newCredentialUnavailableError(credNameAzureDeveloperCLI, msg)
- }
- return output, nil
-}
-
-func (c *AzureDeveloperCLICredential) createAccessToken(tk []byte) (azcore.AccessToken, error) {
- t := struct {
- AccessToken string `json:"token"`
- ExpiresOn string `json:"expiresOn"`
- }{}
- err := json.Unmarshal(tk, &t)
- if err != nil {
- return azcore.AccessToken{}, err
- }
- exp, err := time.Parse("2006-01-02T15:04:05Z", t.ExpiresOn)
- if err != nil {
- return azcore.AccessToken{}, fmt.Errorf("error parsing token expiration time %q: %v", t.ExpiresOn, err)
- }
- return azcore.AccessToken{
- ExpiresOn: exp.UTC(),
- Token: t.AccessToken,
- }, nil
-}
-
-var _ azcore.TokenCredential = (*AzureDeveloperCLICredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_pipelines_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_pipelines_credential.go
deleted file mode 100644
index 80c1806bb1872d2662dfbde6db21f023156fe009..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_pipelines_credential.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "encoding/json"
- "errors"
- "fmt"
- "net/http"
- "os"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
-)
-
-const (
- credNameAzurePipelines = "AzurePipelinesCredential"
- oidcAPIVersion = "7.1"
- systemOIDCRequestURI = "SYSTEM_OIDCREQUESTURI"
-)
-
-// AzurePipelinesCredential authenticates with workload identity federation in an Azure Pipeline. See
-// [Azure Pipelines documentation] for more information.
-//
-// [Azure Pipelines documentation]: https://learn.microsoft.com/azure/devops/pipelines/library/connect-to-azure?view=azure-devops#create-an-azure-resource-manager-service-connection-that-uses-workload-identity-federation
-type AzurePipelinesCredential struct {
- connectionID, oidcURI, systemAccessToken string
- cred *ClientAssertionCredential
-}
-
-// AzurePipelinesCredentialOptions contains optional parameters for AzurePipelinesCredential.
-type AzurePipelinesCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens.
- // Add the wildcard value "*" to allow the credential to acquire tokens for any tenant in which the
- // application is registered.
- AdditionallyAllowedTenants []string
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-}
-
-// NewAzurePipelinesCredential is the constructor for AzurePipelinesCredential.
-//
-// - tenantID: tenant ID of the service principal federated with the service connection
-// - clientID: client ID of that service principal
-// - serviceConnectionID: ID of the service connection to authenticate
-// - systemAccessToken: security token for the running build. See [Azure Pipelines documentation] for
-// an example showing how to get this value.
-//
-// [Azure Pipelines documentation]: https://learn.microsoft.com/azure/devops/pipelines/build/variables?view=azure-devops&tabs=yaml#systemaccesstoken
-func NewAzurePipelinesCredential(tenantID, clientID, serviceConnectionID, systemAccessToken string, options *AzurePipelinesCredentialOptions) (*AzurePipelinesCredential, error) {
- if !validTenantID(tenantID) {
- return nil, errInvalidTenantID
- }
- if clientID == "" {
- return nil, errors.New("no client ID specified")
- }
- if serviceConnectionID == "" {
- return nil, errors.New("no service connection ID specified")
- }
- if systemAccessToken == "" {
- return nil, errors.New("no system access token specified")
- }
- u := os.Getenv(systemOIDCRequestURI)
- if u == "" {
- return nil, fmt.Errorf("no value for environment variable %s. This should be set by Azure Pipelines", systemOIDCRequestURI)
- }
- a := AzurePipelinesCredential{
- connectionID: serviceConnectionID,
- oidcURI: u,
- systemAccessToken: systemAccessToken,
- }
- if options == nil {
- options = &AzurePipelinesCredentialOptions{}
- }
- caco := ClientAssertionCredentialOptions{
- AdditionallyAllowedTenants: options.AdditionallyAllowedTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- }
- cred, err := NewClientAssertionCredential(tenantID, clientID, a.getAssertion, &caco)
- if err != nil {
- return nil, err
- }
- cred.client.name = credNameAzurePipelines
- a.cred = cred
- return &a, nil
-}
-
-// GetToken requests an access token from Microsoft Entra ID. Azure SDK clients call this method automatically.
-func (a *AzurePipelinesCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameAzurePipelines+"."+traceOpGetToken, a.cred.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := a.cred.GetToken(ctx, opts)
- return tk, err
-}
-
-func (a *AzurePipelinesCredential) getAssertion(ctx context.Context) (string, error) {
- url := a.oidcURI + "?api-version=" + oidcAPIVersion + "&serviceConnectionId=" + a.connectionID
- url, err := runtime.EncodeQueryParams(url)
- if err != nil {
- return "", newAuthenticationFailedError(credNameAzurePipelines, "couldn't encode OIDC URL: "+err.Error(), nil, nil)
- }
- req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, nil)
- if err != nil {
- return "", newAuthenticationFailedError(credNameAzurePipelines, "couldn't create OIDC token request: "+err.Error(), nil, nil)
- }
- req.Header.Set("Authorization", "Bearer "+a.systemAccessToken)
- res, err := doForClient(a.cred.client.azClient, req)
- if err != nil {
- return "", newAuthenticationFailedError(credNameAzurePipelines, "couldn't send OIDC token request: "+err.Error(), nil, nil)
- }
- if res.StatusCode != http.StatusOK {
- msg := res.Status + " response from the OIDC endpoint. Check service connection ID and Pipeline configuration"
- // include the response because its body, if any, probably contains an error message.
- // OK responses aren't included with errors because they probably contain secrets
- return "", newAuthenticationFailedError(credNameAzurePipelines, msg, res, nil)
- }
- b, err := runtime.Payload(res)
- if err != nil {
- return "", newAuthenticationFailedError(credNameAzurePipelines, "couldn't read OIDC response content: "+err.Error(), nil, nil)
- }
- var r struct {
- OIDCToken string `json:"oidcToken"`
- }
- err = json.Unmarshal(b, &r)
- if err != nil {
- return "", newAuthenticationFailedError(credNameAzurePipelines, "unexpected response from OIDC endpoint", nil, nil)
- }
- return r.OIDCToken, nil
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/chained_token_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/chained_token_credential.go
deleted file mode 100644
index 6c35a941b976d51cb874c4ea530cbf38d7fd9a3f..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/chained_token_credential.go
+++ /dev/null
@@ -1,138 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "errors"
- "fmt"
- "strings"
- "sync"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
-)
-
-// ChainedTokenCredentialOptions contains optional parameters for ChainedTokenCredential.
-type ChainedTokenCredentialOptions struct {
- // RetrySources configures how the credential uses its sources. When true, the credential always attempts to
- // authenticate through each source in turn, stopping when one succeeds. When false, the credential authenticates
- // only through this first successful source--it never again tries the sources which failed.
- RetrySources bool
-}
-
-// ChainedTokenCredential links together multiple credentials and tries them sequentially when authenticating. By default,
-// it tries all the credentials until one authenticates, after which it always uses that credential.
-type ChainedTokenCredential struct {
- cond *sync.Cond
- iterating bool
- name string
- retrySources bool
- sources []azcore.TokenCredential
- successfulCredential azcore.TokenCredential
-}
-
-// NewChainedTokenCredential creates a ChainedTokenCredential. Pass nil for options to accept defaults.
-func NewChainedTokenCredential(sources []azcore.TokenCredential, options *ChainedTokenCredentialOptions) (*ChainedTokenCredential, error) {
- if len(sources) == 0 {
- return nil, errors.New("sources must contain at least one TokenCredential")
- }
- for _, source := range sources {
- if source == nil { // cannot have a nil credential in the chain or else the application will panic when GetToken() is called on nil
- return nil, errors.New("sources cannot contain nil")
- }
- }
- cp := make([]azcore.TokenCredential, len(sources))
- copy(cp, sources)
- if options == nil {
- options = &ChainedTokenCredentialOptions{}
- }
- return &ChainedTokenCredential{
- cond: sync.NewCond(&sync.Mutex{}),
- name: "ChainedTokenCredential",
- retrySources: options.RetrySources,
- sources: cp,
- }, nil
-}
-
-// GetToken calls GetToken on the chained credentials in turn, stopping when one returns a token.
-// This method is called automatically by Azure SDK clients.
-func (c *ChainedTokenCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- if !c.retrySources {
- // ensure only one goroutine at a time iterates the sources and perhaps sets c.successfulCredential
- c.cond.L.Lock()
- for {
- if c.successfulCredential != nil {
- c.cond.L.Unlock()
- return c.successfulCredential.GetToken(ctx, opts)
- }
- if !c.iterating {
- c.iterating = true
- // allow other goroutines to wait while this one iterates
- c.cond.L.Unlock()
- break
- }
- c.cond.Wait()
- }
- }
-
- var (
- err error
- errs []error
- successfulCredential azcore.TokenCredential
- token azcore.AccessToken
- unavailableErr credentialUnavailable
- )
- for _, cred := range c.sources {
- token, err = cred.GetToken(ctx, opts)
- if err == nil {
- log.Writef(EventAuthentication, "%s authenticated with %s", c.name, extractCredentialName(cred))
- successfulCredential = cred
- break
- }
- errs = append(errs, err)
- // continue to the next source iff this one returned credentialUnavailableError
- if !errors.As(err, &unavailableErr) {
- break
- }
- }
- if c.iterating {
- c.cond.L.Lock()
- // this is nil when all credentials returned an error
- c.successfulCredential = successfulCredential
- c.iterating = false
- c.cond.L.Unlock()
- c.cond.Broadcast()
- }
- // err is the error returned by the last GetToken call. It will be nil when that call succeeds
- if err != nil {
- // return credentialUnavailableError iff all sources did so; return AuthenticationFailedError otherwise
- msg := createChainedErrorMessage(errs)
- if errors.As(err, &unavailableErr) {
- err = newCredentialUnavailableError(c.name, msg)
- } else {
- res := getResponseFromError(err)
- err = newAuthenticationFailedError(c.name, msg, res, err)
- }
- }
- return token, err
-}
-
-func createChainedErrorMessage(errs []error) string {
- msg := "failed to acquire a token.\nAttempted credentials:"
- for _, err := range errs {
- msg += fmt.Sprintf("\n\t%s", err.Error())
- }
- return msg
-}
-
-func extractCredentialName(credential azcore.TokenCredential) string {
- return strings.TrimPrefix(fmt.Sprintf("%T", credential), "*azidentity.")
-}
-
-var _ azcore.TokenCredential = (*ChainedTokenCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/ci.yml b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/ci.yml
deleted file mode 100644
index 4cd8c514473183f33d57f49841e20d5e5e41a36e..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/ci.yml
+++ /dev/null
@@ -1,46 +0,0 @@
-# NOTE: Please refer to https://aka.ms/azsdk/engsys/ci-yaml before editing this file.
-trigger:
- branches:
- include:
- - main
- - feature/*
- - hotfix/*
- - release/*
- paths:
- include:
- - sdk/azidentity/
-
-pr:
- branches:
- include:
- - main
- - feature/*
- - hotfix/*
- - release/*
- paths:
- include:
- - sdk/azidentity/
-
-extends:
- template: /eng/pipelines/templates/jobs/archetype-sdk-client.yml
- parameters:
- CloudConfig:
- Public:
- SubscriptionConfigurations:
- - $(sub-config-azure-cloud-test-resources)
- - $(sub-config-identity-test-resources)
- EnvVars:
- SYSTEM_ACCESSTOKEN: $(System.AccessToken)
- RunLiveTests: true
- ServiceDirectory: azidentity
- UsePipelineProxy: false
-
- ${{ if endsWith(variables['Build.DefinitionName'], 'weekly') }}:
- MatrixConfigs:
- - Name: managed_identity_matrix
- GenerateVMJobs: true
- Path: sdk/azidentity/managed-identity-matrix.json
- Selection: sparse
- MatrixReplace:
- - Pool=.*LINUXPOOL.*/azsdk-pool-mms-ubuntu-2204-identitymsi
- - OSVmImage=.*LINUXNEXTVMIMAGE.*/azsdk-pool-mms-ubuntu-2204-1espt
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_assertion_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_assertion_credential.go
deleted file mode 100644
index b588750ef33b60325885d94c4496ca38b16aa70c..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_assertion_credential.go
+++ /dev/null
@@ -1,85 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "errors"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
-)
-
-const credNameAssertion = "ClientAssertionCredential"
-
-// ClientAssertionCredential authenticates an application with assertions provided by a callback function.
-// This credential is for advanced scenarios. [ClientCertificateCredential] has a more convenient API for
-// the most common assertion scenario, authenticating a service principal with a certificate. See
-// [Microsoft Entra ID documentation] for details of the assertion format.
-//
-// [Microsoft Entra ID documentation]: https://learn.microsoft.com/entra/identity-platform/certificate-credentials#assertion-format
-type ClientAssertionCredential struct {
- client *confidentialClient
-}
-
-// ClientAssertionCredentialOptions contains optional parameters for ClientAssertionCredential.
-type ClientAssertionCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens.
- // Add the wildcard value "*" to allow the credential to acquire tokens for any tenant in which the
- // application is registered.
- AdditionallyAllowedTenants []string
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-
- // tokenCachePersistenceOptions enables persistent token caching when not nil.
- tokenCachePersistenceOptions *tokenCachePersistenceOptions
-}
-
-// NewClientAssertionCredential constructs a ClientAssertionCredential. The getAssertion function must be thread safe. Pass nil for options to accept defaults.
-func NewClientAssertionCredential(tenantID, clientID string, getAssertion func(context.Context) (string, error), options *ClientAssertionCredentialOptions) (*ClientAssertionCredential, error) {
- if getAssertion == nil {
- return nil, errors.New("getAssertion must be a function that returns assertions")
- }
- if options == nil {
- options = &ClientAssertionCredentialOptions{}
- }
- cred := confidential.NewCredFromAssertionCallback(
- func(ctx context.Context, _ confidential.AssertionRequestOptions) (string, error) {
- return getAssertion(ctx)
- },
- )
- msalOpts := confidentialClientOptions{
- AdditionallyAllowedTenants: options.AdditionallyAllowedTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- tokenCachePersistenceOptions: options.tokenCachePersistenceOptions,
- }
- c, err := newConfidentialClient(tenantID, clientID, credNameAssertion, cred, msalOpts)
- if err != nil {
- return nil, err
- }
- return &ClientAssertionCredential{client: c}, nil
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (c *ClientAssertionCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameAssertion+"."+traceOpGetToken, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.GetToken(ctx, opts)
- return tk, err
-}
-
-var _ azcore.TokenCredential = (*ClientAssertionCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_certificate_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_certificate_credential.go
deleted file mode 100644
index 80cd96b560f439ca8b0953ec909e3c45419afccc..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_certificate_credential.go
+++ /dev/null
@@ -1,174 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "crypto"
- "crypto/x509"
- "encoding/pem"
- "errors"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
- "golang.org/x/crypto/pkcs12"
-)
-
-const credNameCert = "ClientCertificateCredential"
-
-// ClientCertificateCredentialOptions contains optional parameters for ClientCertificateCredential.
-type ClientCertificateCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens.
- // Add the wildcard value "*" to allow the credential to acquire tokens for any tenant in which the
- // application is registered.
- AdditionallyAllowedTenants []string
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-
- // SendCertificateChain controls whether the credential sends the public certificate chain in the x5c
- // header of each token request's JWT. This is required for Subject Name/Issuer (SNI) authentication.
- // Defaults to False.
- SendCertificateChain bool
-
- // tokenCachePersistenceOptions enables persistent token caching when not nil.
- tokenCachePersistenceOptions *tokenCachePersistenceOptions
-}
-
-// ClientCertificateCredential authenticates a service principal with a certificate.
-type ClientCertificateCredential struct {
- client *confidentialClient
-}
-
-// NewClientCertificateCredential constructs a ClientCertificateCredential. Pass nil for options to accept defaults. See
-// [ParseCertificates] for help loading a certificate.
-func NewClientCertificateCredential(tenantID string, clientID string, certs []*x509.Certificate, key crypto.PrivateKey, options *ClientCertificateCredentialOptions) (*ClientCertificateCredential, error) {
- if len(certs) == 0 {
- return nil, errors.New("at least one certificate is required")
- }
- if options == nil {
- options = &ClientCertificateCredentialOptions{}
- }
- cred, err := confidential.NewCredFromCert(certs, key)
- if err != nil {
- return nil, err
- }
- msalOpts := confidentialClientOptions{
- AdditionallyAllowedTenants: options.AdditionallyAllowedTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- SendX5C: options.SendCertificateChain,
- tokenCachePersistenceOptions: options.tokenCachePersistenceOptions,
- }
- c, err := newConfidentialClient(tenantID, clientID, credNameCert, cred, msalOpts)
- if err != nil {
- return nil, err
- }
- return &ClientCertificateCredential{client: c}, nil
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (c *ClientCertificateCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameCert+"."+traceOpGetToken, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.GetToken(ctx, opts)
- return tk, err
-}
-
-// ParseCertificates loads certificates and a private key, in PEM or PKCS#12 format, for use with [NewClientCertificateCredential].
-// Pass nil for password if the private key isn't encrypted. This function has limitations, for example it can't decrypt keys in
-// PEM format or PKCS#12 certificates that use SHA256 for message authentication. If you encounter such limitations, consider
-// using another module to load the certificate and private key.
-func ParseCertificates(certData []byte, password []byte) ([]*x509.Certificate, crypto.PrivateKey, error) {
- var blocks []*pem.Block
- var err error
- if len(password) == 0 {
- blocks, err = loadPEMCert(certData)
- }
- if len(blocks) == 0 || err != nil {
- blocks, err = loadPKCS12Cert(certData, string(password))
- }
- if err != nil {
- return nil, nil, err
- }
- var certs []*x509.Certificate
- var pk crypto.PrivateKey
- for _, block := range blocks {
- switch block.Type {
- case "CERTIFICATE":
- c, err := x509.ParseCertificate(block.Bytes)
- if err != nil {
- return nil, nil, err
- }
- certs = append(certs, c)
- case "PRIVATE KEY":
- if pk != nil {
- return nil, nil, errors.New("certData contains multiple private keys")
- }
- pk, err = x509.ParsePKCS8PrivateKey(block.Bytes)
- if err != nil {
- pk, err = x509.ParsePKCS1PrivateKey(block.Bytes)
- }
- if err != nil {
- return nil, nil, err
- }
- case "RSA PRIVATE KEY":
- if pk != nil {
- return nil, nil, errors.New("certData contains multiple private keys")
- }
- pk, err = x509.ParsePKCS1PrivateKey(block.Bytes)
- if err != nil {
- return nil, nil, err
- }
- }
- }
- if len(certs) == 0 {
- return nil, nil, errors.New("found no certificate")
- }
- if pk == nil {
- return nil, nil, errors.New("found no private key")
- }
- return certs, pk, nil
-}
-
-func loadPEMCert(certData []byte) ([]*pem.Block, error) {
- blocks := []*pem.Block{}
- for {
- var block *pem.Block
- block, certData = pem.Decode(certData)
- if block == nil {
- break
- }
- blocks = append(blocks, block)
- }
- if len(blocks) == 0 {
- return nil, errors.New("didn't find any PEM blocks")
- }
- return blocks, nil
-}
-
-func loadPKCS12Cert(certData []byte, password string) ([]*pem.Block, error) {
- blocks, err := pkcs12.ToPEM(certData, password)
- if err != nil {
- return nil, err
- }
- if len(blocks) == 0 {
- // not mentioning PKCS12 in this message because we end up here when certData is garbage
- return nil, errors.New("didn't find any certificate content")
- }
- return blocks, err
-}
-
-var _ azcore.TokenCredential = (*ClientCertificateCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_secret_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_secret_credential.go
deleted file mode 100644
index 9e6772e9b80a1f7ad581581e1e5b36c14ffc313b..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/client_secret_credential.go
+++ /dev/null
@@ -1,75 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
-)
-
-const credNameSecret = "ClientSecretCredential"
-
-// ClientSecretCredentialOptions contains optional parameters for ClientSecretCredential.
-type ClientSecretCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens.
- // Add the wildcard value "*" to allow the credential to acquire tokens for any tenant in which the
- // application is registered.
- AdditionallyAllowedTenants []string
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-
- // tokenCachePersistenceOptions enables persistent token caching when not nil.
- tokenCachePersistenceOptions *tokenCachePersistenceOptions
-}
-
-// ClientSecretCredential authenticates an application with a client secret.
-type ClientSecretCredential struct {
- client *confidentialClient
-}
-
-// NewClientSecretCredential constructs a ClientSecretCredential. Pass nil for options to accept defaults.
-func NewClientSecretCredential(tenantID string, clientID string, clientSecret string, options *ClientSecretCredentialOptions) (*ClientSecretCredential, error) {
- if options == nil {
- options = &ClientSecretCredentialOptions{}
- }
- cred, err := confidential.NewCredFromSecret(clientSecret)
- if err != nil {
- return nil, err
- }
- msalOpts := confidentialClientOptions{
- AdditionallyAllowedTenants: options.AdditionallyAllowedTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- tokenCachePersistenceOptions: options.tokenCachePersistenceOptions,
- }
- c, err := newConfidentialClient(tenantID, clientID, credNameSecret, cred, msalOpts)
- if err != nil {
- return nil, err
- }
- return &ClientSecretCredential{client: c}, nil
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (c *ClientSecretCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameSecret+"."+traceOpGetToken, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.GetToken(ctx, opts)
- return tk, err
-}
-
-var _ azcore.TokenCredential = (*ClientSecretCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/confidential_client.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/confidential_client.go
deleted file mode 100644
index 3bd08c685fb26e37af90d874c2dd7f77b5769935..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/confidential_client.go
+++ /dev/null
@@ -1,184 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "errors"
- "fmt"
- "net/http"
- "os"
- "strings"
- "sync"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
-)
-
-type confidentialClientOptions struct {
- azcore.ClientOptions
-
- AdditionallyAllowedTenants []string
- // Assertion for on-behalf-of authentication
- Assertion string
- DisableInstanceDiscovery, SendX5C bool
- tokenCachePersistenceOptions *tokenCachePersistenceOptions
-}
-
-// confidentialClient wraps the MSAL confidential client
-type confidentialClient struct {
- cae, noCAE msalConfidentialClient
- caeMu, noCAEMu, clientMu *sync.Mutex
- clientID, tenantID string
- cred confidential.Credential
- host string
- name string
- opts confidentialClientOptions
- region string
- azClient *azcore.Client
-}
-
-func newConfidentialClient(tenantID, clientID, name string, cred confidential.Credential, opts confidentialClientOptions) (*confidentialClient, error) {
- if !validTenantID(tenantID) {
- return nil, errInvalidTenantID
- }
- host, err := setAuthorityHost(opts.Cloud)
- if err != nil {
- return nil, err
- }
- client, err := azcore.NewClient(module, version, runtime.PipelineOptions{
- Tracing: runtime.TracingOptions{
- Namespace: traceNamespace,
- },
- }, &opts.ClientOptions)
- if err != nil {
- return nil, err
- }
- opts.AdditionallyAllowedTenants = resolveAdditionalTenants(opts.AdditionallyAllowedTenants)
- return &confidentialClient{
- caeMu: &sync.Mutex{},
- clientID: clientID,
- clientMu: &sync.Mutex{},
- cred: cred,
- host: host,
- name: name,
- noCAEMu: &sync.Mutex{},
- opts: opts,
- region: os.Getenv(azureRegionalAuthorityName),
- tenantID: tenantID,
- azClient: client,
- }, nil
-}
-
-// GetToken requests an access token from MSAL, checking the cache first.
-func (c *confidentialClient) GetToken(ctx context.Context, tro policy.TokenRequestOptions) (azcore.AccessToken, error) {
- if len(tro.Scopes) < 1 {
- return azcore.AccessToken{}, fmt.Errorf("%s.GetToken() requires at least one scope", c.name)
- }
- // we don't resolve the tenant for managed identities because they acquire tokens only from their home tenants
- if c.name != credNameManagedIdentity {
- tenant, err := c.resolveTenant(tro.TenantID)
- if err != nil {
- return azcore.AccessToken{}, err
- }
- tro.TenantID = tenant
- }
- client, mu, err := c.client(tro)
- if err != nil {
- return azcore.AccessToken{}, err
- }
- mu.Lock()
- defer mu.Unlock()
- var ar confidential.AuthResult
- if c.opts.Assertion != "" {
- ar, err = client.AcquireTokenOnBehalfOf(ctx, c.opts.Assertion, tro.Scopes, confidential.WithClaims(tro.Claims), confidential.WithTenantID(tro.TenantID))
- } else {
- ar, err = client.AcquireTokenSilent(ctx, tro.Scopes, confidential.WithClaims(tro.Claims), confidential.WithTenantID(tro.TenantID))
- if err != nil {
- ar, err = client.AcquireTokenByCredential(ctx, tro.Scopes, confidential.WithClaims(tro.Claims), confidential.WithTenantID(tro.TenantID))
- }
- }
- if err != nil {
- // We could get a credentialUnavailableError from managed identity authentication because in that case the error comes from our code.
- // We return it directly because it affects the behavior of credential chains. Otherwise, we return AuthenticationFailedError.
- var unavailableErr credentialUnavailable
- if !errors.As(err, &unavailableErr) {
- res := getResponseFromError(err)
- err = newAuthenticationFailedError(c.name, err.Error(), res, err)
- }
- } else {
- msg := fmt.Sprintf("%s.GetToken() acquired a token for scope %q", c.name, strings.Join(ar.GrantedScopes, ", "))
- log.Write(EventAuthentication, msg)
- }
- return azcore.AccessToken{Token: ar.AccessToken, ExpiresOn: ar.ExpiresOn.UTC()}, err
-}
-
-func (c *confidentialClient) client(tro policy.TokenRequestOptions) (msalConfidentialClient, *sync.Mutex, error) {
- c.clientMu.Lock()
- defer c.clientMu.Unlock()
- if tro.EnableCAE {
- if c.cae == nil {
- client, err := c.newMSALClient(true)
- if err != nil {
- return nil, nil, err
- }
- c.cae = client
- }
- return c.cae, c.caeMu, nil
- }
- if c.noCAE == nil {
- client, err := c.newMSALClient(false)
- if err != nil {
- return nil, nil, err
- }
- c.noCAE = client
- }
- return c.noCAE, c.noCAEMu, nil
-}
-
-func (c *confidentialClient) newMSALClient(enableCAE bool) (msalConfidentialClient, error) {
- cache, err := internal.NewCache(c.opts.tokenCachePersistenceOptions, enableCAE)
- if err != nil {
- return nil, err
- }
- authority := runtime.JoinPaths(c.host, c.tenantID)
- o := []confidential.Option{
- confidential.WithAzureRegion(c.region),
- confidential.WithCache(cache),
- confidential.WithHTTPClient(c),
- }
- if enableCAE {
- o = append(o, confidential.WithClientCapabilities(cp1))
- }
- if c.opts.SendX5C {
- o = append(o, confidential.WithX5C())
- }
- if c.opts.DisableInstanceDiscovery || strings.ToLower(c.tenantID) == "adfs" {
- o = append(o, confidential.WithInstanceDiscovery(false))
- }
- return confidential.New(authority, c.clientID, c.cred, o...)
-}
-
-// resolveTenant returns the correct WithTenantID() argument for a token request given the client's
-// configuration, or an error when that configuration doesn't allow the specified tenant
-func (c *confidentialClient) resolveTenant(specified string) (string, error) {
- return resolveTenant(c.tenantID, specified, c.name, c.opts.AdditionallyAllowedTenants)
-}
-
-// these methods satisfy the MSAL ops.HTTPClient interface
-
-func (c *confidentialClient) CloseIdleConnections() {
- // do nothing
-}
-
-func (c *confidentialClient) Do(r *http.Request) (*http.Response, error) {
- return doForClient(c.azClient, r)
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/default_azure_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/default_azure_credential.go
deleted file mode 100644
index 551d3199462e66b9c928eb433c595e62c29386a8..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/default_azure_credential.go
+++ /dev/null
@@ -1,165 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "os"
- "strings"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
-)
-
-// DefaultAzureCredentialOptions contains optional parameters for DefaultAzureCredential.
-// These options may not apply to all credentials in the chain.
-type DefaultAzureCredentialOptions struct {
- // ClientOptions has additional options for credentials that use an Azure SDK HTTP pipeline. These options don't apply
- // to credential types that authenticate via external tools such as the Azure CLI.
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens. Add
- // the wildcard value "*" to allow the credential to acquire tokens for any tenant. This value can also be
- // set as a semicolon delimited list of tenants in the environment variable AZURE_ADDITIONALLY_ALLOWED_TENANTS.
- AdditionallyAllowedTenants []string
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
- // TenantID sets the default tenant for authentication via the Azure CLI and workload identity.
- TenantID string
-}
-
-// DefaultAzureCredential is a default credential chain for applications that will deploy to Azure.
-// It combines credentials suitable for deployment with credentials suitable for local development.
-// It attempts to authenticate with each of these credential types, in the following order, stopping
-// when one provides a token:
-//
-// - [EnvironmentCredential]
-// - [WorkloadIdentityCredential], if environment variable configuration is set by the Azure workload
-// identity webhook. Use [WorkloadIdentityCredential] directly when not using the webhook or needing
-// more control over its configuration.
-// - [ManagedIdentityCredential]
-// - [AzureCLICredential]
-// - [AzureDeveloperCLICredential]
-//
-// Consult the documentation for these credential types for more information on how they authenticate.
-// Once a credential has successfully authenticated, DefaultAzureCredential will use that credential for
-// every subsequent authentication.
-type DefaultAzureCredential struct {
- chain *ChainedTokenCredential
-}
-
-// NewDefaultAzureCredential creates a DefaultAzureCredential. Pass nil for options to accept defaults.
-func NewDefaultAzureCredential(options *DefaultAzureCredentialOptions) (*DefaultAzureCredential, error) {
- var creds []azcore.TokenCredential
- var errorMessages []string
-
- if options == nil {
- options = &DefaultAzureCredentialOptions{}
- }
- additionalTenants := options.AdditionallyAllowedTenants
- if len(additionalTenants) == 0 {
- if tenants := os.Getenv(azureAdditionallyAllowedTenants); tenants != "" {
- additionalTenants = strings.Split(tenants, ";")
- }
- }
-
- envCred, err := NewEnvironmentCredential(&EnvironmentCredentialOptions{
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- additionallyAllowedTenants: additionalTenants,
- })
- if err == nil {
- creds = append(creds, envCred)
- } else {
- errorMessages = append(errorMessages, "EnvironmentCredential: "+err.Error())
- creds = append(creds, &defaultCredentialErrorReporter{credType: "EnvironmentCredential", err: err})
- }
-
- wic, err := NewWorkloadIdentityCredential(&WorkloadIdentityCredentialOptions{
- AdditionallyAllowedTenants: additionalTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- TenantID: options.TenantID,
- })
- if err == nil {
- creds = append(creds, wic)
- } else {
- errorMessages = append(errorMessages, credNameWorkloadIdentity+": "+err.Error())
- creds = append(creds, &defaultCredentialErrorReporter{credType: credNameWorkloadIdentity, err: err})
- }
-
- o := &ManagedIdentityCredentialOptions{ClientOptions: options.ClientOptions, dac: true}
- if ID, ok := os.LookupEnv(azureClientID); ok {
- o.ID = ClientID(ID)
- }
- miCred, err := NewManagedIdentityCredential(o)
- if err == nil {
- creds = append(creds, miCred)
- } else {
- errorMessages = append(errorMessages, credNameManagedIdentity+": "+err.Error())
- creds = append(creds, &defaultCredentialErrorReporter{credType: credNameManagedIdentity, err: err})
- }
-
- cliCred, err := NewAzureCLICredential(&AzureCLICredentialOptions{AdditionallyAllowedTenants: additionalTenants, TenantID: options.TenantID})
- if err == nil {
- creds = append(creds, cliCred)
- } else {
- errorMessages = append(errorMessages, credNameAzureCLI+": "+err.Error())
- creds = append(creds, &defaultCredentialErrorReporter{credType: credNameAzureCLI, err: err})
- }
-
- azdCred, err := NewAzureDeveloperCLICredential(&AzureDeveloperCLICredentialOptions{
- AdditionallyAllowedTenants: additionalTenants,
- TenantID: options.TenantID,
- })
- if err == nil {
- creds = append(creds, azdCred)
- } else {
- errorMessages = append(errorMessages, credNameAzureDeveloperCLI+": "+err.Error())
- creds = append(creds, &defaultCredentialErrorReporter{credType: credNameAzureDeveloperCLI, err: err})
- }
-
- if len(errorMessages) > 0 {
- log.Writef(EventAuthentication, "NewDefaultAzureCredential failed to initialize some credentials:\n\t%s", strings.Join(errorMessages, "\n\t"))
- }
-
- chain, err := NewChainedTokenCredential(creds, nil)
- if err != nil {
- return nil, err
- }
- chain.name = "DefaultAzureCredential"
- return &DefaultAzureCredential{chain: chain}, nil
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (c *DefaultAzureCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- return c.chain.GetToken(ctx, opts)
-}
-
-var _ azcore.TokenCredential = (*DefaultAzureCredential)(nil)
-
-// defaultCredentialErrorReporter is a substitute for credentials that couldn't be constructed.
-// Its GetToken method always returns a credentialUnavailableError having the same message as
-// the error that prevented constructing the credential. This ensures the message is present
-// in the error returned by ChainedTokenCredential.GetToken()
-type defaultCredentialErrorReporter struct {
- credType string
- err error
-}
-
-func (d *defaultCredentialErrorReporter) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- if _, ok := d.err.(credentialUnavailable); ok {
- return azcore.AccessToken{}, d.err
- }
- return azcore.AccessToken{}, newCredentialUnavailableError(d.credType, d.err.Error())
-}
-
-var _ azcore.TokenCredential = (*defaultCredentialErrorReporter)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/developer_credential_util.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/developer_credential_util.go
deleted file mode 100644
index be963d3a2af0dbde93113e5ba2f12d8c44250fd7..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/developer_credential_util.go
+++ /dev/null
@@ -1,38 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "errors"
- "time"
-)
-
-// cliTimeout is the default timeout for authentication attempts via CLI tools
-const cliTimeout = 10 * time.Second
-
-// unavailableIfInChain returns err or, if the credential was invoked by DefaultAzureCredential, a
-// credentialUnavailableError having the same message. This ensures DefaultAzureCredential will try
-// the next credential in its chain (another developer credential).
-func unavailableIfInChain(err error, inDefaultChain bool) error {
- if err != nil && inDefaultChain {
- var unavailableErr credentialUnavailable
- if !errors.As(err, &unavailableErr) {
- err = newCredentialUnavailableError(credNameAzureDeveloperCLI, err.Error())
- }
- }
- return err
-}
-
-// validScope is for credentials authenticating via external tools. The authority validates scopes for all other credentials.
-func validScope(scope string) bool {
- for _, r := range scope {
- if !(alphanumeric(r) || r == '.' || r == '-' || r == '_' || r == '/' || r == ':') {
- return false
- }
- }
- return true
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/device_code_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/device_code_credential.go
deleted file mode 100644
index cd30bedd5e9e6886eea27eaef8ce5b205eee8ae4..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/device_code_credential.go
+++ /dev/null
@@ -1,138 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "fmt"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
-)
-
-const credNameDeviceCode = "DeviceCodeCredential"
-
-// DeviceCodeCredentialOptions contains optional parameters for DeviceCodeCredential.
-type DeviceCodeCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire
- // tokens. Add the wildcard value "*" to allow the credential to acquire tokens for any tenant.
- AdditionallyAllowedTenants []string
-
- // authenticationRecord returned by a call to a credential's Authenticate method. Set this option
- // to enable the credential to use data from a previous authentication.
- authenticationRecord authenticationRecord
-
- // ClientID is the ID of the application users will authenticate to.
- // Defaults to the ID of an Azure development application.
- ClientID string
-
- // disableAutomaticAuthentication prevents the credential from automatically prompting the user to authenticate.
- // When this option is true, GetToken will return authenticationRequiredError when user interaction is necessary
- // to acquire a token.
- disableAutomaticAuthentication bool
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-
- // TenantID is the Microsoft Entra tenant the credential authenticates in. Defaults to the
- // "organizations" tenant, which can authenticate work and school accounts. Required for single-tenant
- // applications.
- TenantID string
-
- // tokenCachePersistenceOptions enables persistent token caching when not nil.
- tokenCachePersistenceOptions *tokenCachePersistenceOptions
-
- // UserPrompt controls how the credential presents authentication instructions. The credential calls
- // this function with authentication details when it receives a device code. By default, the credential
- // prints these details to stdout.
- UserPrompt func(context.Context, DeviceCodeMessage) error
-}
-
-func (o *DeviceCodeCredentialOptions) init() {
- if o.TenantID == "" {
- o.TenantID = organizationsTenantID
- }
- if o.ClientID == "" {
- o.ClientID = developerSignOnClientID
- }
- if o.UserPrompt == nil {
- o.UserPrompt = func(ctx context.Context, dc DeviceCodeMessage) error {
- fmt.Println(dc.Message)
- return nil
- }
- }
-}
-
-// DeviceCodeMessage contains the information a user needs to complete authentication.
-type DeviceCodeMessage struct {
- // UserCode is the user code returned by the service.
- UserCode string `json:"user_code"`
- // VerificationURL is the URL at which the user must authenticate.
- VerificationURL string `json:"verification_uri"`
- // Message is user instruction from Microsoft Entra ID.
- Message string `json:"message"`
-}
-
-// DeviceCodeCredential acquires tokens for a user via the device code flow, which has the
-// user browse to a Microsoft Entra URL, enter a code, and authenticate. It's useful
-// for authenticating a user in an environment without a web browser, such as an SSH session.
-// If a web browser is available, [InteractiveBrowserCredential] is more convenient because it
-// automatically opens a browser to the login page.
-type DeviceCodeCredential struct {
- client *publicClient
-}
-
-// NewDeviceCodeCredential creates a DeviceCodeCredential. Pass nil to accept default options.
-func NewDeviceCodeCredential(options *DeviceCodeCredentialOptions) (*DeviceCodeCredential, error) {
- cp := DeviceCodeCredentialOptions{}
- if options != nil {
- cp = *options
- }
- cp.init()
- msalOpts := publicClientOptions{
- AdditionallyAllowedTenants: cp.AdditionallyAllowedTenants,
- ClientOptions: cp.ClientOptions,
- DeviceCodePrompt: cp.UserPrompt,
- DisableAutomaticAuthentication: cp.disableAutomaticAuthentication,
- DisableInstanceDiscovery: cp.DisableInstanceDiscovery,
- Record: cp.authenticationRecord,
- TokenCachePersistenceOptions: cp.tokenCachePersistenceOptions,
- }
- c, err := newPublicClient(cp.TenantID, cp.ClientID, credNameDeviceCode, msalOpts)
- if err != nil {
- return nil, err
- }
- c.name = credNameDeviceCode
- return &DeviceCodeCredential{client: c}, nil
-}
-
-// Authenticate a user via the device code flow. Subsequent calls to GetToken will automatically use the returned AuthenticationRecord.
-func (c *DeviceCodeCredential) authenticate(ctx context.Context, opts *policy.TokenRequestOptions) (authenticationRecord, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameDeviceCode+"."+traceOpAuthenticate, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.Authenticate(ctx, opts)
- return tk, err
-}
-
-// GetToken requests an access token from Microsoft Entra ID. It will begin the device code flow and poll until the user completes authentication.
-// This method is called automatically by Azure SDK clients.
-func (c *DeviceCodeCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameDeviceCode+"."+traceOpGetToken, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.GetToken(ctx, opts)
- return tk, err
-}
-
-var _ azcore.TokenCredential = (*DeviceCodeCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/environment_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/environment_credential.go
deleted file mode 100644
index b30f5474f55b58c843293e7aabbb21ec4d99830b..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/environment_credential.go
+++ /dev/null
@@ -1,167 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "errors"
- "fmt"
- "os"
- "strings"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
-)
-
-const envVarSendCertChain = "AZURE_CLIENT_SEND_CERTIFICATE_CHAIN"
-
-// EnvironmentCredentialOptions contains optional parameters for EnvironmentCredential
-type EnvironmentCredentialOptions struct {
- azcore.ClientOptions
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
- // additionallyAllowedTenants is used only by NewDefaultAzureCredential() to enable that constructor's explicit
- // option to override the value of AZURE_ADDITIONALLY_ALLOWED_TENANTS. Applications using EnvironmentCredential
- // directly should set that variable instead. This field should remain unexported to preserve this credential's
- // unambiguous "all configuration from environment variables" design.
- additionallyAllowedTenants []string
-}
-
-// EnvironmentCredential authenticates a service principal with a secret or certificate, or a user with a password, depending
-// on environment variable configuration. It reads configuration from these variables, in the following order:
-//
-// # Service principal with client secret
-//
-// AZURE_TENANT_ID: ID of the service principal's tenant. Also called its "directory" ID.
-//
-// AZURE_CLIENT_ID: the service principal's client ID
-//
-// AZURE_CLIENT_SECRET: one of the service principal's client secrets
-//
-// # Service principal with certificate
-//
-// AZURE_TENANT_ID: ID of the service principal's tenant. Also called its "directory" ID.
-//
-// AZURE_CLIENT_ID: the service principal's client ID
-//
-// AZURE_CLIENT_CERTIFICATE_PATH: path to a PEM or PKCS12 certificate file including the private key.
-//
-// AZURE_CLIENT_CERTIFICATE_PASSWORD: (optional) password for the certificate file.
-//
-// Note that this credential uses [ParseCertificates] to load the certificate and key from the file. If this
-// function isn't able to parse your certificate, use [ClientCertificateCredential] instead.
-//
-// # User with username and password
-//
-// AZURE_TENANT_ID: (optional) tenant to authenticate in. Defaults to "organizations".
-//
-// AZURE_CLIENT_ID: client ID of the application the user will authenticate to
-//
-// AZURE_USERNAME: a username (usually an email address)
-//
-// AZURE_PASSWORD: the user's password
-//
-// # Configuration for multitenant applications
-//
-// To enable multitenant authentication, set AZURE_ADDITIONALLY_ALLOWED_TENANTS with a semicolon delimited list of tenants
-// the credential may request tokens from in addition to the tenant specified by AZURE_TENANT_ID. Set
-// AZURE_ADDITIONALLY_ALLOWED_TENANTS to "*" to enable the credential to request a token from any tenant.
-type EnvironmentCredential struct {
- cred azcore.TokenCredential
-}
-
-// NewEnvironmentCredential creates an EnvironmentCredential. Pass nil to accept default options.
-func NewEnvironmentCredential(options *EnvironmentCredentialOptions) (*EnvironmentCredential, error) {
- if options == nil {
- options = &EnvironmentCredentialOptions{}
- }
- tenantID := os.Getenv(azureTenantID)
- if tenantID == "" {
- return nil, errors.New("missing environment variable AZURE_TENANT_ID")
- }
- clientID := os.Getenv(azureClientID)
- if clientID == "" {
- return nil, errors.New("missing environment variable " + azureClientID)
- }
- // tenants set by NewDefaultAzureCredential() override the value of AZURE_ADDITIONALLY_ALLOWED_TENANTS
- additionalTenants := options.additionallyAllowedTenants
- if len(additionalTenants) == 0 {
- if tenants := os.Getenv(azureAdditionallyAllowedTenants); tenants != "" {
- additionalTenants = strings.Split(tenants, ";")
- }
- }
- if clientSecret := os.Getenv(azureClientSecret); clientSecret != "" {
- log.Write(EventAuthentication, "EnvironmentCredential will authenticate with ClientSecretCredential")
- o := &ClientSecretCredentialOptions{
- AdditionallyAllowedTenants: additionalTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- }
- cred, err := NewClientSecretCredential(tenantID, clientID, clientSecret, o)
- if err != nil {
- return nil, err
- }
- return &EnvironmentCredential{cred: cred}, nil
- }
- if certPath := os.Getenv(azureClientCertificatePath); certPath != "" {
- log.Write(EventAuthentication, "EnvironmentCredential will authenticate with ClientCertificateCredential")
- certData, err := os.ReadFile(certPath)
- if err != nil {
- return nil, fmt.Errorf(`failed to read certificate file "%s": %v`, certPath, err)
- }
- var password []byte
- if v := os.Getenv(azureClientCertificatePassword); v != "" {
- password = []byte(v)
- }
- certs, key, err := ParseCertificates(certData, password)
- if err != nil {
- return nil, fmt.Errorf("failed to parse %q due to error %q. This may be due to a limitation of this module's certificate loader. Consider calling NewClientCertificateCredential instead", certPath, err.Error())
- }
- o := &ClientCertificateCredentialOptions{
- AdditionallyAllowedTenants: additionalTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- }
- if v, ok := os.LookupEnv(envVarSendCertChain); ok {
- o.SendCertificateChain = v == "1" || strings.ToLower(v) == "true"
- }
- cred, err := NewClientCertificateCredential(tenantID, clientID, certs, key, o)
- if err != nil {
- return nil, err
- }
- return &EnvironmentCredential{cred: cred}, nil
- }
- if username := os.Getenv(azureUsername); username != "" {
- if password := os.Getenv(azurePassword); password != "" {
- log.Write(EventAuthentication, "EnvironmentCredential will authenticate with UsernamePasswordCredential")
- o := &UsernamePasswordCredentialOptions{
- AdditionallyAllowedTenants: additionalTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- }
- cred, err := NewUsernamePasswordCredential(tenantID, clientID, username, password, o)
- if err != nil {
- return nil, err
- }
- return &EnvironmentCredential{cred: cred}, nil
- }
- return nil, errors.New("no value for AZURE_PASSWORD")
- }
- return nil, errors.New("incomplete environment variable configuration. Only AZURE_TENANT_ID and AZURE_CLIENT_ID are set")
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (c *EnvironmentCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- return c.cred.GetToken(ctx, opts)
-}
-
-var _ azcore.TokenCredential = (*EnvironmentCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/errors.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/errors.go
deleted file mode 100644
index 35fa01d136e7a4ef2aed3c14a16f0fe69a7c5c1f..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/errors.go
+++ /dev/null
@@ -1,170 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "bytes"
- "encoding/json"
- "errors"
- "fmt"
- "net/http"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo"
- msal "github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors"
-)
-
-// getResponseFromError retrieves the response carried by
-// an AuthenticationFailedError or MSAL CallErr, if any
-func getResponseFromError(err error) *http.Response {
- var a *AuthenticationFailedError
- var c msal.CallErr
- var res *http.Response
- if errors.As(err, &c) {
- res = c.Resp
- } else if errors.As(err, &a) {
- res = a.RawResponse
- }
- return res
-}
-
-// AuthenticationFailedError indicates an authentication request has failed.
-type AuthenticationFailedError struct {
- // RawResponse is the HTTP response motivating the error, if available.
- RawResponse *http.Response
-
- credType string
- message string
- err error
-}
-
-func newAuthenticationFailedError(credType string, message string, resp *http.Response, err error) error {
- return &AuthenticationFailedError{credType: credType, message: message, RawResponse: resp, err: err}
-}
-
-// Error implements the error interface. Note that the message contents are not contractual and can change over time.
-func (e *AuthenticationFailedError) Error() string {
- if e.RawResponse == nil {
- return e.credType + ": " + e.message
- }
- msg := &bytes.Buffer{}
- fmt.Fprintf(msg, "%s authentication failed. %s\n", e.credType, e.message)
- if e.RawResponse.Request != nil {
- fmt.Fprintf(msg, "%s %s://%s%s\n", e.RawResponse.Request.Method, e.RawResponse.Request.URL.Scheme, e.RawResponse.Request.URL.Host, e.RawResponse.Request.URL.Path)
- } else {
- // this happens when the response is created from a custom HTTP transporter,
- // which doesn't guarantee to bind the original request to the response
- fmt.Fprintln(msg, "Request information not available")
- }
- fmt.Fprintln(msg, "--------------------------------------------------------------------------------")
- fmt.Fprintf(msg, "RESPONSE %s\n", e.RawResponse.Status)
- fmt.Fprintln(msg, "--------------------------------------------------------------------------------")
- body, err := runtime.Payload(e.RawResponse)
- switch {
- case err != nil:
- fmt.Fprintf(msg, "Error reading response body: %v", err)
- case len(body) > 0:
- if err := json.Indent(msg, body, "", " "); err != nil {
- // failed to pretty-print so just dump it verbatim
- fmt.Fprint(msg, string(body))
- }
- default:
- fmt.Fprint(msg, "Response contained no body")
- }
- fmt.Fprintln(msg, "\n--------------------------------------------------------------------------------")
- var anchor string
- switch e.credType {
- case credNameAzureCLI:
- anchor = "azure-cli"
- case credNameAzureDeveloperCLI:
- anchor = "azd"
- case credNameAzurePipelines:
- anchor = "apc"
- case credNameCert:
- anchor = "client-cert"
- case credNameSecret:
- anchor = "client-secret"
- case credNameManagedIdentity:
- anchor = "managed-id"
- case credNameUserPassword:
- anchor = "username-password"
- case credNameWorkloadIdentity:
- anchor = "workload"
- }
- if anchor != "" {
- fmt.Fprintf(msg, "To troubleshoot, visit https://aka.ms/azsdk/go/identity/troubleshoot#%s", anchor)
- }
- return msg.String()
-}
-
-// NonRetriable indicates the request which provoked this error shouldn't be retried.
-func (*AuthenticationFailedError) NonRetriable() {
- // marker method
-}
-
-var _ errorinfo.NonRetriable = (*AuthenticationFailedError)(nil)
-
-// authenticationRequiredError indicates a credential's Authenticate method must be called to acquire a token
-// because the credential requires user interaction and is configured not to request it automatically.
-type authenticationRequiredError struct {
- credentialUnavailableError
-
- // TokenRequestOptions for the required token. Pass this to the credential's Authenticate method.
- TokenRequestOptions policy.TokenRequestOptions
-}
-
-func newauthenticationRequiredError(credType string, tro policy.TokenRequestOptions) error {
- return &authenticationRequiredError{
- credentialUnavailableError: credentialUnavailableError{
- credType + " can't acquire a token without user interaction. Call Authenticate to authenticate a user interactively",
- },
- TokenRequestOptions: tro,
- }
-}
-
-var (
- _ credentialUnavailable = (*authenticationRequiredError)(nil)
- _ errorinfo.NonRetriable = (*authenticationRequiredError)(nil)
-)
-
-type credentialUnavailable interface {
- error
- credentialUnavailable()
-}
-
-type credentialUnavailableError struct {
- message string
-}
-
-// newCredentialUnavailableError is an internal helper that ensures consistent error message formatting
-func newCredentialUnavailableError(credType, message string) error {
- msg := fmt.Sprintf("%s: %s", credType, message)
- return &credentialUnavailableError{msg}
-}
-
-// NewCredentialUnavailableError constructs an error indicating a credential can't attempt authentication
-// because it lacks required data or state. When [ChainedTokenCredential] receives this error it will try
-// its next credential, if any.
-func NewCredentialUnavailableError(message string) error {
- return &credentialUnavailableError{message}
-}
-
-// Error implements the error interface. Note that the message contents are not contractual and can change over time.
-func (e *credentialUnavailableError) Error() string {
- return e.message
-}
-
-// NonRetriable is a marker method indicating this error should not be retried. It has no implementation.
-func (*credentialUnavailableError) NonRetriable() {}
-
-func (*credentialUnavailableError) credentialUnavailable() {}
-
-var (
- _ credentialUnavailable = (*credentialUnavailableError)(nil)
- _ errorinfo.NonRetriable = (*credentialUnavailableError)(nil)
-)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/interactive_browser_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/interactive_browser_credential.go
deleted file mode 100644
index 056785a8a33a6f0217fe48896536ce41f11fdef7..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/interactive_browser_credential.go
+++ /dev/null
@@ -1,118 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
-)
-
-const credNameBrowser = "InteractiveBrowserCredential"
-
-// InteractiveBrowserCredentialOptions contains optional parameters for InteractiveBrowserCredential.
-type InteractiveBrowserCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire
- // tokens. Add the wildcard value "*" to allow the credential to acquire tokens for any tenant.
- AdditionallyAllowedTenants []string
-
- // authenticationRecord returned by a call to a credential's Authenticate method. Set this option
- // to enable the credential to use data from a previous authentication.
- authenticationRecord authenticationRecord
-
- // ClientID is the ID of the application users will authenticate to.
- // Defaults to the ID of an Azure development application.
- ClientID string
-
- // disableAutomaticAuthentication prevents the credential from automatically prompting the user to authenticate.
- // When this option is true, GetToken will return authenticationRequiredError when user interaction is necessary
- // to acquire a token.
- disableAutomaticAuthentication bool
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-
- // LoginHint pre-populates the account prompt with a username. Users may choose to authenticate a different account.
- LoginHint string
-
- // RedirectURL is the URL Microsoft Entra ID will redirect to with the access token. This is required
- // only when setting ClientID, and must match a redirect URI in the application's registration.
- // Applications which have registered "http://localhost" as a redirect URI need not set this option.
- RedirectURL string
-
- // TenantID is the Microsoft Entra tenant the credential authenticates in. Defaults to the
- // "organizations" tenant, which can authenticate work and school accounts.
- TenantID string
-
- // tokenCachePersistenceOptions enables persistent token caching when not nil.
- tokenCachePersistenceOptions *tokenCachePersistenceOptions
-}
-
-func (o *InteractiveBrowserCredentialOptions) init() {
- if o.TenantID == "" {
- o.TenantID = organizationsTenantID
- }
- if o.ClientID == "" {
- o.ClientID = developerSignOnClientID
- }
-}
-
-// InteractiveBrowserCredential opens a browser to interactively authenticate a user.
-type InteractiveBrowserCredential struct {
- client *publicClient
-}
-
-// NewInteractiveBrowserCredential constructs a new InteractiveBrowserCredential. Pass nil to accept default options.
-func NewInteractiveBrowserCredential(options *InteractiveBrowserCredentialOptions) (*InteractiveBrowserCredential, error) {
- cp := InteractiveBrowserCredentialOptions{}
- if options != nil {
- cp = *options
- }
- cp.init()
- msalOpts := publicClientOptions{
- AdditionallyAllowedTenants: cp.AdditionallyAllowedTenants,
- ClientOptions: cp.ClientOptions,
- DisableAutomaticAuthentication: cp.disableAutomaticAuthentication,
- DisableInstanceDiscovery: cp.DisableInstanceDiscovery,
- LoginHint: cp.LoginHint,
- Record: cp.authenticationRecord,
- RedirectURL: cp.RedirectURL,
- TokenCachePersistenceOptions: cp.tokenCachePersistenceOptions,
- }
- c, err := newPublicClient(cp.TenantID, cp.ClientID, credNameBrowser, msalOpts)
- if err != nil {
- return nil, err
- }
- return &InteractiveBrowserCredential{client: c}, nil
-}
-
-// Authenticate a user via the default browser. Subsequent calls to GetToken will automatically use the returned AuthenticationRecord.
-func (c *InteractiveBrowserCredential) authenticate(ctx context.Context, opts *policy.TokenRequestOptions) (authenticationRecord, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameBrowser+"."+traceOpAuthenticate, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.Authenticate(ctx, opts)
- return tk, err
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (c *InteractiveBrowserCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameBrowser+"."+traceOpGetToken, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.GetToken(ctx, opts)
- return tk, err
-}
-
-var _ azcore.TokenCredential = (*InteractiveBrowserCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal/exported.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal/exported.go
deleted file mode 100644
index b1b4d5c8bd35c1475a6ffaec4d483285ae2af085..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal/exported.go
+++ /dev/null
@@ -1,18 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package internal
-
-// TokenCachePersistenceOptions contains options for persistent token caching
-type TokenCachePersistenceOptions struct {
- // AllowUnencryptedStorage controls whether the cache should fall back to storing its data in plain text
- // when encryption isn't possible. Setting this true doesn't disable encryption. The cache always attempts
- // encryption before falling back to plaintext storage.
- AllowUnencryptedStorage bool
-
- // Name identifies the cache. Set this to isolate data from other applications.
- Name string
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal/internal.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal/internal.go
deleted file mode 100644
index c1498b464471b55dfbd567ae9a2287e15bf67265..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal/internal.go
+++ /dev/null
@@ -1,31 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package internal
-
-import (
- "errors"
-
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/cache"
-)
-
-var errMissingImport = errors.New("import github.com/Azure/azure-sdk-for-go/sdk/azidentity/cache to enable persistent caching")
-
-// NewCache constructs a persistent token cache when "o" isn't nil. Applications that intend to
-// use a persistent cache must first import the cache module, which will replace this function
-// with a platform-specific implementation.
-var NewCache = func(o *TokenCachePersistenceOptions, enableCAE bool) (cache.ExportReplace, error) {
- if o == nil {
- return nil, nil
- }
- return nil, errMissingImport
-}
-
-// CacheFilePath returns the path to the cache file for the given name.
-// Defining it in this package makes it available to azidentity tests.
-var CacheFilePath = func(name string) (string, error) {
- return "", errMissingImport
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/logging.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/logging.go
deleted file mode 100644
index 1aa1e0fc7c8e1610f63a437343830320b2dd0925..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/logging.go
+++ /dev/null
@@ -1,14 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
-
-// EventAuthentication entries contain information about authentication.
-// This includes information like the names of environment variables
-// used when obtaining credentials and the type of credential used.
-const EventAuthentication log.Event = "Authentication"
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed-identity-matrix.json b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed-identity-matrix.json
deleted file mode 100644
index 1c3791777a1fee41cad21a3a6434c59fbf7764e6..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed-identity-matrix.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "include": [
- {
- "Agent": {
- "msi_image": {
- "ArmTemplateParameters": "@{deployResources = $true}",
- "OSVmImage": "env:LINUXNEXTVMIMAGE",
- "Pool": "env:LINUXPOOL"
- }
- },
- "GoVersion": [
- "1.22.1"
- ],
- "IDENTITY_IMDS_AVAILABLE": "1"
- }
- ]
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed_identity_client.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed_identity_client.go
deleted file mode 100644
index 6122cc70050f42f10a61019044d9e6ad8f43e615..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed_identity_client.go
+++ /dev/null
@@ -1,501 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "encoding/json"
- "errors"
- "fmt"
- "net/http"
- "net/url"
- "os"
- "path/filepath"
- "runtime"
- "strconv"
- "strings"
- "time"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- azruntime "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/streaming"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
-)
-
-const (
- arcIMDSEndpoint = "IMDS_ENDPOINT"
- defaultIdentityClientID = "DEFAULT_IDENTITY_CLIENT_ID"
- identityEndpoint = "IDENTITY_ENDPOINT"
- identityHeader = "IDENTITY_HEADER"
- identityServerThumbprint = "IDENTITY_SERVER_THUMBPRINT"
- headerMetadata = "Metadata"
- imdsEndpoint = "http://169.254.169.254/metadata/identity/oauth2/token"
- miResID = "mi_res_id"
- msiEndpoint = "MSI_ENDPOINT"
- msiResID = "msi_res_id"
- msiSecret = "MSI_SECRET"
- imdsAPIVersion = "2018-02-01"
- azureArcAPIVersion = "2019-08-15"
- qpClientID = "client_id"
- serviceFabricAPIVersion = "2019-07-01-preview"
-)
-
-var imdsProbeTimeout = time.Second
-
-type msiType int
-
-const (
- msiTypeAppService msiType = iota
- msiTypeAzureArc
- msiTypeAzureML
- msiTypeCloudShell
- msiTypeIMDS
- msiTypeServiceFabric
-)
-
-type managedIdentityClient struct {
- azClient *azcore.Client
- endpoint string
- id ManagedIDKind
- msiType msiType
- probeIMDS bool
-}
-
-// arcKeyDirectory returns the directory expected to contain Azure Arc keys
-var arcKeyDirectory = func() (string, error) {
- switch runtime.GOOS {
- case "linux":
- return "/var/opt/azcmagent/tokens", nil
- case "windows":
- pd := os.Getenv("ProgramData")
- if pd == "" {
- return "", errors.New("environment variable ProgramData has no value")
- }
- return filepath.Join(pd, "AzureConnectedMachineAgent", "Tokens"), nil
- default:
- return "", fmt.Errorf("unsupported OS %q", runtime.GOOS)
- }
-}
-
-type wrappedNumber json.Number
-
-func (n *wrappedNumber) UnmarshalJSON(b []byte) error {
- c := string(b)
- if c == "\"\"" {
- return nil
- }
- return json.Unmarshal(b, (*json.Number)(n))
-}
-
-// setIMDSRetryOptionDefaults sets zero-valued fields to default values appropriate for IMDS
-func setIMDSRetryOptionDefaults(o *policy.RetryOptions) {
- if o.MaxRetries == 0 {
- o.MaxRetries = 5
- }
- if o.MaxRetryDelay == 0 {
- o.MaxRetryDelay = 1 * time.Minute
- }
- if o.RetryDelay == 0 {
- o.RetryDelay = 2 * time.Second
- }
- if o.StatusCodes == nil {
- o.StatusCodes = []int{
- // IMDS docs recommend retrying 404, 410, 429 and 5xx
- // https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/how-to-use-vm-token#error-handling
- http.StatusNotFound, // 404
- http.StatusGone, // 410
- http.StatusTooManyRequests, // 429
- http.StatusInternalServerError, // 500
- http.StatusNotImplemented, // 501
- http.StatusBadGateway, // 502
- http.StatusServiceUnavailable, // 503
- http.StatusGatewayTimeout, // 504
- http.StatusHTTPVersionNotSupported, // 505
- http.StatusVariantAlsoNegotiates, // 506
- http.StatusInsufficientStorage, // 507
- http.StatusLoopDetected, // 508
- http.StatusNotExtended, // 510
- http.StatusNetworkAuthenticationRequired, // 511
- }
- }
- if o.TryTimeout == 0 {
- o.TryTimeout = 1 * time.Minute
- }
-}
-
-// newManagedIdentityClient creates a new instance of the ManagedIdentityClient with the ManagedIdentityCredentialOptions
-// that are passed into it along with a default pipeline.
-// options: ManagedIdentityCredentialOptions configure policies for the pipeline and the authority host that
-// will be used to retrieve tokens and authenticate
-func newManagedIdentityClient(options *ManagedIdentityCredentialOptions) (*managedIdentityClient, error) {
- if options == nil {
- options = &ManagedIdentityCredentialOptions{}
- }
- cp := options.ClientOptions
- c := managedIdentityClient{id: options.ID, endpoint: imdsEndpoint, msiType: msiTypeIMDS}
- env := "IMDS"
- if endpoint, ok := os.LookupEnv(identityEndpoint); ok {
- if _, ok := os.LookupEnv(identityHeader); ok {
- if _, ok := os.LookupEnv(identityServerThumbprint); ok {
- env = "Service Fabric"
- c.endpoint = endpoint
- c.msiType = msiTypeServiceFabric
- } else {
- env = "App Service"
- c.endpoint = endpoint
- c.msiType = msiTypeAppService
- }
- } else if _, ok := os.LookupEnv(arcIMDSEndpoint); ok {
- env = "Azure Arc"
- c.endpoint = endpoint
- c.msiType = msiTypeAzureArc
- }
- } else if endpoint, ok := os.LookupEnv(msiEndpoint); ok {
- c.endpoint = endpoint
- if _, ok := os.LookupEnv(msiSecret); ok {
- env = "Azure ML"
- c.msiType = msiTypeAzureML
- } else {
- env = "Cloud Shell"
- c.msiType = msiTypeCloudShell
- }
- } else {
- c.probeIMDS = options.dac
- setIMDSRetryOptionDefaults(&cp.Retry)
- }
-
- client, err := azcore.NewClient(module, version, azruntime.PipelineOptions{
- Tracing: azruntime.TracingOptions{
- Namespace: traceNamespace,
- },
- }, &cp)
- if err != nil {
- return nil, err
- }
- c.azClient = client
-
- if log.Should(EventAuthentication) {
- log.Writef(EventAuthentication, "Managed Identity Credential will use %s managed identity", env)
- }
-
- return &c, nil
-}
-
-// provideToken acquires a token for MSAL's confidential.Client, which caches the token
-func (c *managedIdentityClient) provideToken(ctx context.Context, params confidential.TokenProviderParameters) (confidential.TokenProviderResult, error) {
- result := confidential.TokenProviderResult{}
- tk, err := c.authenticate(ctx, c.id, params.Scopes)
- if err == nil {
- result.AccessToken = tk.Token
- result.ExpiresInSeconds = int(time.Until(tk.ExpiresOn).Seconds())
- }
- return result, err
-}
-
-// authenticate acquires an access token
-func (c *managedIdentityClient) authenticate(ctx context.Context, id ManagedIDKind, scopes []string) (azcore.AccessToken, error) {
- // no need to synchronize around this value because it's true only when DefaultAzureCredential constructed the client,
- // and in that case ChainedTokenCredential.GetToken synchronizes goroutines that would execute this block
- if c.probeIMDS {
- cx, cancel := context.WithTimeout(ctx, imdsProbeTimeout)
- defer cancel()
- cx = policy.WithRetryOptions(cx, policy.RetryOptions{MaxRetries: -1})
- req, err := azruntime.NewRequest(cx, http.MethodGet, c.endpoint)
- if err == nil {
- _, err = c.azClient.Pipeline().Do(req)
- }
- if err != nil {
- msg := err.Error()
- if errors.Is(err, context.Canceled) || errors.Is(err, context.DeadlineExceeded) {
- msg = "managed identity timed out. See https://aka.ms/azsdk/go/identity/troubleshoot#dac for more information"
- }
- return azcore.AccessToken{}, newCredentialUnavailableError(credNameManagedIdentity, msg)
- }
- // send normal token requests from now on because something responded
- c.probeIMDS = false
- }
-
- msg, err := c.createAuthRequest(ctx, id, scopes)
- if err != nil {
- return azcore.AccessToken{}, err
- }
-
- resp, err := c.azClient.Pipeline().Do(msg)
- if err != nil {
- return azcore.AccessToken{}, newAuthenticationFailedError(credNameManagedIdentity, err.Error(), nil, err)
- }
-
- if azruntime.HasStatusCode(resp, http.StatusOK, http.StatusCreated) {
- return c.createAccessToken(resp)
- }
-
- if c.msiType == msiTypeIMDS {
- switch resp.StatusCode {
- case http.StatusBadRequest:
- if id != nil {
- return azcore.AccessToken{}, newAuthenticationFailedError(credNameManagedIdentity, "the requested identity isn't assigned to this resource", resp, nil)
- }
- msg := "failed to authenticate a system assigned identity"
- if body, err := azruntime.Payload(resp); err == nil && len(body) > 0 {
- msg += fmt.Sprintf(". The endpoint responded with %s", body)
- }
- return azcore.AccessToken{}, newCredentialUnavailableError(credNameManagedIdentity, msg)
- case http.StatusForbidden:
- // Docker Desktop runs a proxy that responds 403 to IMDS token requests. If we get that response,
- // we return credentialUnavailableError so credential chains continue to their next credential
- body, err := azruntime.Payload(resp)
- if err == nil && strings.Contains(string(body), "unreachable") {
- return azcore.AccessToken{}, newCredentialUnavailableError(credNameManagedIdentity, fmt.Sprintf("unexpected response %q", string(body)))
- }
- }
- }
-
- return azcore.AccessToken{}, newAuthenticationFailedError(credNameManagedIdentity, "authentication failed", resp, nil)
-}
-
-func (c *managedIdentityClient) createAccessToken(res *http.Response) (azcore.AccessToken, error) {
- value := struct {
- // these are the only fields that we use
- Token string `json:"access_token,omitempty"`
- RefreshToken string `json:"refresh_token,omitempty"`
- ExpiresIn wrappedNumber `json:"expires_in,omitempty"` // this field should always return the number of seconds for which a token is valid
- ExpiresOn interface{} `json:"expires_on,omitempty"` // the value returned in this field varies between a number and a date string
- }{}
- if err := azruntime.UnmarshalAsJSON(res, &value); err != nil {
- return azcore.AccessToken{}, fmt.Errorf("internal AccessToken: %v", err)
- }
- if value.ExpiresIn != "" {
- expiresIn, err := json.Number(value.ExpiresIn).Int64()
- if err != nil {
- return azcore.AccessToken{}, err
- }
- return azcore.AccessToken{Token: value.Token, ExpiresOn: time.Now().Add(time.Second * time.Duration(expiresIn)).UTC()}, nil
- }
- switch v := value.ExpiresOn.(type) {
- case float64:
- return azcore.AccessToken{Token: value.Token, ExpiresOn: time.Unix(int64(v), 0).UTC()}, nil
- case string:
- if expiresOn, err := strconv.Atoi(v); err == nil {
- return azcore.AccessToken{Token: value.Token, ExpiresOn: time.Unix(int64(expiresOn), 0).UTC()}, nil
- }
- return azcore.AccessToken{}, newAuthenticationFailedError(credNameManagedIdentity, "unexpected expires_on value: "+v, res, nil)
- default:
- msg := fmt.Sprintf("unsupported type received in expires_on: %T, %v", v, v)
- return azcore.AccessToken{}, newAuthenticationFailedError(credNameManagedIdentity, msg, res, nil)
- }
-}
-
-func (c *managedIdentityClient) createAuthRequest(ctx context.Context, id ManagedIDKind, scopes []string) (*policy.Request, error) {
- switch c.msiType {
- case msiTypeIMDS:
- return c.createIMDSAuthRequest(ctx, id, scopes)
- case msiTypeAppService:
- return c.createAppServiceAuthRequest(ctx, id, scopes)
- case msiTypeAzureArc:
- // need to perform preliminary request to retreive the secret key challenge provided by the HIMDS service
- key, err := c.getAzureArcSecretKey(ctx, scopes)
- if err != nil {
- msg := fmt.Sprintf("failed to retreive secret key from the identity endpoint: %v", err)
- return nil, newAuthenticationFailedError(credNameManagedIdentity, msg, nil, err)
- }
- return c.createAzureArcAuthRequest(ctx, id, scopes, key)
- case msiTypeAzureML:
- return c.createAzureMLAuthRequest(ctx, id, scopes)
- case msiTypeServiceFabric:
- return c.createServiceFabricAuthRequest(ctx, id, scopes)
- case msiTypeCloudShell:
- return c.createCloudShellAuthRequest(ctx, id, scopes)
- default:
- return nil, newCredentialUnavailableError(credNameManagedIdentity, "managed identity isn't supported in this environment")
- }
-}
-
-func (c *managedIdentityClient) createIMDSAuthRequest(ctx context.Context, id ManagedIDKind, scopes []string) (*policy.Request, error) {
- request, err := azruntime.NewRequest(ctx, http.MethodGet, c.endpoint)
- if err != nil {
- return nil, err
- }
- request.Raw().Header.Set(headerMetadata, "true")
- q := request.Raw().URL.Query()
- q.Add("api-version", imdsAPIVersion)
- q.Add("resource", strings.Join(scopes, " "))
- if id != nil {
- if id.idKind() == miResourceID {
- q.Add(msiResID, id.String())
- } else {
- q.Add(qpClientID, id.String())
- }
- }
- request.Raw().URL.RawQuery = q.Encode()
- return request, nil
-}
-
-func (c *managedIdentityClient) createAppServiceAuthRequest(ctx context.Context, id ManagedIDKind, scopes []string) (*policy.Request, error) {
- request, err := azruntime.NewRequest(ctx, http.MethodGet, c.endpoint)
- if err != nil {
- return nil, err
- }
- request.Raw().Header.Set("X-IDENTITY-HEADER", os.Getenv(identityHeader))
- q := request.Raw().URL.Query()
- q.Add("api-version", "2019-08-01")
- q.Add("resource", scopes[0])
- if id != nil {
- if id.idKind() == miResourceID {
- q.Add(miResID, id.String())
- } else {
- q.Add(qpClientID, id.String())
- }
- }
- request.Raw().URL.RawQuery = q.Encode()
- return request, nil
-}
-
-func (c *managedIdentityClient) createAzureMLAuthRequest(ctx context.Context, id ManagedIDKind, scopes []string) (*policy.Request, error) {
- request, err := azruntime.NewRequest(ctx, http.MethodGet, c.endpoint)
- if err != nil {
- return nil, err
- }
- request.Raw().Header.Set("secret", os.Getenv(msiSecret))
- q := request.Raw().URL.Query()
- q.Add("api-version", "2017-09-01")
- q.Add("resource", strings.Join(scopes, " "))
- q.Add("clientid", os.Getenv(defaultIdentityClientID))
- if id != nil {
- if id.idKind() == miResourceID {
- log.Write(EventAuthentication, "WARNING: Azure ML doesn't support specifying a managed identity by resource ID")
- q.Set("clientid", "")
- q.Set(miResID, id.String())
- } else {
- q.Set("clientid", id.String())
- }
- }
- request.Raw().URL.RawQuery = q.Encode()
- return request, nil
-}
-
-func (c *managedIdentityClient) createServiceFabricAuthRequest(ctx context.Context, id ManagedIDKind, scopes []string) (*policy.Request, error) {
- request, err := azruntime.NewRequest(ctx, http.MethodGet, c.endpoint)
- if err != nil {
- return nil, err
- }
- q := request.Raw().URL.Query()
- request.Raw().Header.Set("Accept", "application/json")
- request.Raw().Header.Set("Secret", os.Getenv(identityHeader))
- q.Add("api-version", serviceFabricAPIVersion)
- q.Add("resource", strings.Join(scopes, " "))
- if id != nil {
- log.Write(EventAuthentication, "WARNING: Service Fabric doesn't support selecting a user-assigned identity at runtime")
- if id.idKind() == miResourceID {
- q.Add(miResID, id.String())
- } else {
- q.Add(qpClientID, id.String())
- }
- }
- request.Raw().URL.RawQuery = q.Encode()
- return request, nil
-}
-
-func (c *managedIdentityClient) getAzureArcSecretKey(ctx context.Context, resources []string) (string, error) {
- // create the request to retreive the secret key challenge provided by the HIMDS service
- request, err := azruntime.NewRequest(ctx, http.MethodGet, c.endpoint)
- if err != nil {
- return "", err
- }
- request.Raw().Header.Set(headerMetadata, "true")
- q := request.Raw().URL.Query()
- q.Add("api-version", azureArcAPIVersion)
- q.Add("resource", strings.Join(resources, " "))
- request.Raw().URL.RawQuery = q.Encode()
- // send the initial request to get the short-lived secret key
- response, err := c.azClient.Pipeline().Do(request)
- if err != nil {
- return "", err
- }
- // the endpoint is expected to return a 401 with the WWW-Authenticate header set to the location
- // of the secret key file. Any other status code indicates an error in the request.
- if response.StatusCode != 401 {
- msg := fmt.Sprintf("expected a 401 response, received %d", response.StatusCode)
- return "", newAuthenticationFailedError(credNameManagedIdentity, msg, response, nil)
- }
- header := response.Header.Get("WWW-Authenticate")
- if len(header) == 0 {
- return "", newAuthenticationFailedError(credNameManagedIdentity, "HIMDS response has no WWW-Authenticate header", nil, nil)
- }
- // the WWW-Authenticate header is expected in the following format: Basic realm=/some/file/path.key
- _, p, found := strings.Cut(header, "=")
- if !found {
- return "", newAuthenticationFailedError(credNameManagedIdentity, "unexpected WWW-Authenticate header from HIMDS: "+header, nil, nil)
- }
- expected, err := arcKeyDirectory()
- if err != nil {
- return "", err
- }
- if filepath.Dir(p) != expected || !strings.HasSuffix(p, ".key") {
- return "", newAuthenticationFailedError(credNameManagedIdentity, "unexpected file path from HIMDS service: "+p, nil, nil)
- }
- f, err := os.Stat(p)
- if err != nil {
- return "", newAuthenticationFailedError(credNameManagedIdentity, fmt.Sprintf("could not stat %q: %v", p, err), nil, nil)
- }
- if s := f.Size(); s > 4096 {
- return "", newAuthenticationFailedError(credNameManagedIdentity, fmt.Sprintf("key is too large (%d bytes)", s), nil, nil)
- }
- key, err := os.ReadFile(p)
- if err != nil {
- return "", newAuthenticationFailedError(credNameManagedIdentity, fmt.Sprintf("could not read %q: %v", p, err), nil, nil)
- }
- return string(key), nil
-}
-
-func (c *managedIdentityClient) createAzureArcAuthRequest(ctx context.Context, id ManagedIDKind, resources []string, key string) (*policy.Request, error) {
- request, err := azruntime.NewRequest(ctx, http.MethodGet, c.endpoint)
- if err != nil {
- return nil, err
- }
- request.Raw().Header.Set(headerMetadata, "true")
- request.Raw().Header.Set("Authorization", fmt.Sprintf("Basic %s", key))
- q := request.Raw().URL.Query()
- q.Add("api-version", azureArcAPIVersion)
- q.Add("resource", strings.Join(resources, " "))
- if id != nil {
- log.Write(EventAuthentication, "WARNING: Azure Arc doesn't support user-assigned managed identities")
- if id.idKind() == miResourceID {
- q.Add(miResID, id.String())
- } else {
- q.Add(qpClientID, id.String())
- }
- }
- request.Raw().URL.RawQuery = q.Encode()
- return request, nil
-}
-
-func (c *managedIdentityClient) createCloudShellAuthRequest(ctx context.Context, id ManagedIDKind, scopes []string) (*policy.Request, error) {
- request, err := azruntime.NewRequest(ctx, http.MethodPost, c.endpoint)
- if err != nil {
- return nil, err
- }
- request.Raw().Header.Set(headerMetadata, "true")
- data := url.Values{}
- data.Set("resource", strings.Join(scopes, " "))
- dataEncoded := data.Encode()
- body := streaming.NopCloser(strings.NewReader(dataEncoded))
- if err := request.SetBody(body, "application/x-www-form-urlencoded"); err != nil {
- return nil, err
- }
- if id != nil {
- log.Write(EventAuthentication, "WARNING: Cloud Shell doesn't support user-assigned managed identities")
- q := request.Raw().URL.Query()
- if id.idKind() == miResourceID {
- q.Add(miResID, id.String())
- } else {
- q.Add(qpClientID, id.String())
- }
- }
- return request, nil
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed_identity_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed_identity_credential.go
deleted file mode 100644
index 13c043d8e0cedb731af1dad736111c4dd54881bd..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/managed_identity_credential.go
+++ /dev/null
@@ -1,128 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "fmt"
- "strings"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
-)
-
-const credNameManagedIdentity = "ManagedIdentityCredential"
-
-type managedIdentityIDKind int
-
-const (
- miClientID managedIdentityIDKind = 0
- miResourceID managedIdentityIDKind = 1
-)
-
-// ManagedIDKind identifies the ID of a managed identity as either a client or resource ID
-type ManagedIDKind interface {
- fmt.Stringer
- idKind() managedIdentityIDKind
-}
-
-// ClientID is the client ID of a user-assigned managed identity.
-type ClientID string
-
-func (ClientID) idKind() managedIdentityIDKind {
- return miClientID
-}
-
-// String returns the string value of the ID.
-func (c ClientID) String() string {
- return string(c)
-}
-
-// ResourceID is the resource ID of a user-assigned managed identity.
-type ResourceID string
-
-func (ResourceID) idKind() managedIdentityIDKind {
- return miResourceID
-}
-
-// String returns the string value of the ID.
-func (r ResourceID) String() string {
- return string(r)
-}
-
-// ManagedIdentityCredentialOptions contains optional parameters for ManagedIdentityCredential.
-type ManagedIdentityCredentialOptions struct {
- azcore.ClientOptions
-
- // ID is the ID of a managed identity the credential should authenticate. Set this field to use a specific identity
- // instead of the hosting environment's default. The value may be the identity's client ID or resource ID, but note that
- // some platforms don't accept resource IDs.
- ID ManagedIDKind
-
- // dac indicates whether the credential is part of DefaultAzureCredential. When true, and the environment doesn't have
- // configuration for a specific managed identity API, the credential tries to determine whether IMDS is available before
- // sending its first token request. It does this by sending a malformed request with a short timeout. Any response to that
- // request is taken to mean IMDS is available, in which case the credential will send ordinary token requests thereafter
- // with no special timeout. The purpose of this behavior is to prevent a very long timeout when IMDS isn't available.
- dac bool
-}
-
-// ManagedIdentityCredential authenticates an Azure managed identity in any hosting environment supporting managed identities.
-// This credential authenticates a system-assigned identity by default. Use ManagedIdentityCredentialOptions.ID to specify a
-// user-assigned identity. See Microsoft Entra ID documentation for more information about managed identities:
-// https://learn.microsoft.com/entra/identity/managed-identities-azure-resources/overview
-type ManagedIdentityCredential struct {
- client *confidentialClient
- mic *managedIdentityClient
-}
-
-// NewManagedIdentityCredential creates a ManagedIdentityCredential. Pass nil to accept default options.
-func NewManagedIdentityCredential(options *ManagedIdentityCredentialOptions) (*ManagedIdentityCredential, error) {
- if options == nil {
- options = &ManagedIdentityCredentialOptions{}
- }
- mic, err := newManagedIdentityClient(options)
- if err != nil {
- return nil, err
- }
- cred := confidential.NewCredFromTokenProvider(mic.provideToken)
-
- // It's okay to give MSAL an invalid client ID because MSAL will use it only as part of a cache key.
- // ManagedIdentityClient handles all the details of authentication and won't receive this value from MSAL.
- clientID := "SYSTEM-ASSIGNED-MANAGED-IDENTITY"
- if options.ID != nil {
- clientID = options.ID.String()
- }
- // similarly, it's okay to give MSAL an incorrect tenant because MSAL won't use the value
- c, err := newConfidentialClient("common", clientID, credNameManagedIdentity, cred, confidentialClientOptions{
- ClientOptions: options.ClientOptions,
- })
- if err != nil {
- return nil, err
- }
- return &ManagedIdentityCredential{client: c, mic: mic}, nil
-}
-
-// GetToken requests an access token from the hosting environment. This method is called automatically by Azure SDK clients.
-func (c *ManagedIdentityCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameManagedIdentity+"."+traceOpGetToken, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
-
- if len(opts.Scopes) != 1 {
- err = fmt.Errorf("%s.GetToken() requires exactly one scope", credNameManagedIdentity)
- return azcore.AccessToken{}, err
- }
- // managed identity endpoints require a Microsoft Entra ID v1 resource (i.e. token audience), not a v2 scope, so we remove "/.default" here
- opts.Scopes = []string{strings.TrimSuffix(opts.Scopes[0], defaultSuffix)}
- tk, err := c.client.GetToken(ctx, opts)
- return tk, err
-}
-
-var _ azcore.TokenCredential = (*ManagedIdentityCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/on_behalf_of_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/on_behalf_of_credential.go
deleted file mode 100644
index 9dcc82f013baf0057b5784b0b8c0f0ea3b8e67f1..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/on_behalf_of_credential.go
+++ /dev/null
@@ -1,113 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "crypto"
- "crypto/x509"
- "errors"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
-)
-
-const credNameOBO = "OnBehalfOfCredential"
-
-// OnBehalfOfCredential authenticates a service principal via the on-behalf-of flow. This is typically used by
-// middle-tier services that authorize requests to other services with a delegated user identity. Because this
-// is not an interactive authentication flow, an application using it must have admin consent for any delegated
-// permissions before requesting tokens for them. See [Microsoft Entra ID documentation] for more details.
-//
-// [Microsoft Entra ID documentation]: https://learn.microsoft.com/entra/identity-platform/v2-oauth2-on-behalf-of-flow
-type OnBehalfOfCredential struct {
- client *confidentialClient
-}
-
-// OnBehalfOfCredentialOptions contains optional parameters for OnBehalfOfCredential
-type OnBehalfOfCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens.
- // Add the wildcard value "*" to allow the credential to acquire tokens for any tenant in which the
- // application is registered.
- AdditionallyAllowedTenants []string
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-
- // SendCertificateChain applies only when the credential is configured to authenticate with a certificate.
- // This setting controls whether the credential sends the public certificate chain in the x5c header of each
- // token request's JWT. This is required for, and only used in, Subject Name/Issuer (SNI) authentication.
- SendCertificateChain bool
-}
-
-// NewOnBehalfOfCredentialWithCertificate constructs an OnBehalfOfCredential that authenticates with a certificate.
-// See [ParseCertificates] for help loading a certificate.
-func NewOnBehalfOfCredentialWithCertificate(tenantID, clientID, userAssertion string, certs []*x509.Certificate, key crypto.PrivateKey, options *OnBehalfOfCredentialOptions) (*OnBehalfOfCredential, error) {
- cred, err := confidential.NewCredFromCert(certs, key)
- if err != nil {
- return nil, err
- }
- return newOnBehalfOfCredential(tenantID, clientID, userAssertion, cred, options)
-}
-
-// NewOnBehalfOfCredentialWithClientAssertions constructs an OnBehalfOfCredential that authenticates with client assertions.
-// userAssertion is the user's access token for the application. The getAssertion function should return client assertions
-// that authenticate the application to Microsoft Entra ID, such as federated credentials.
-func NewOnBehalfOfCredentialWithClientAssertions(tenantID, clientID, userAssertion string, getAssertion func(context.Context) (string, error), options *OnBehalfOfCredentialOptions) (*OnBehalfOfCredential, error) {
- if getAssertion == nil {
- return nil, errors.New("getAssertion can't be nil. It must be a function that returns client assertions")
- }
- cred := confidential.NewCredFromAssertionCallback(func(ctx context.Context, _ confidential.AssertionRequestOptions) (string, error) {
- return getAssertion(ctx)
- })
- return newOnBehalfOfCredential(tenantID, clientID, userAssertion, cred, options)
-}
-
-// NewOnBehalfOfCredentialWithSecret constructs an OnBehalfOfCredential that authenticates with a client secret.
-func NewOnBehalfOfCredentialWithSecret(tenantID, clientID, userAssertion, clientSecret string, options *OnBehalfOfCredentialOptions) (*OnBehalfOfCredential, error) {
- cred, err := confidential.NewCredFromSecret(clientSecret)
- if err != nil {
- return nil, err
- }
- return newOnBehalfOfCredential(tenantID, clientID, userAssertion, cred, options)
-}
-
-func newOnBehalfOfCredential(tenantID, clientID, userAssertion string, cred confidential.Credential, options *OnBehalfOfCredentialOptions) (*OnBehalfOfCredential, error) {
- if options == nil {
- options = &OnBehalfOfCredentialOptions{}
- }
- opts := confidentialClientOptions{
- AdditionallyAllowedTenants: options.AdditionallyAllowedTenants,
- Assertion: userAssertion,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- SendX5C: options.SendCertificateChain,
- }
- c, err := newConfidentialClient(tenantID, clientID, credNameOBO, cred, opts)
- if err != nil {
- return nil, err
- }
- return &OnBehalfOfCredential{c}, nil
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (o *OnBehalfOfCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameOBO+"."+traceOpGetToken, o.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := o.client.GetToken(ctx, opts)
- return tk, err
-}
-
-var _ azcore.TokenCredential = (*OnBehalfOfCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/public_client.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/public_client.go
deleted file mode 100644
index b3d22dbf3ce9d0ef48d04e557790e207eb31b59d..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/public_client.go
+++ /dev/null
@@ -1,273 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "errors"
- "fmt"
- "net/http"
- "strings"
- "sync"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
- "github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal"
- "github.com/Azure/azure-sdk-for-go/sdk/internal/log"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/public"
-
- // this import ensures well-known configurations in azcore/cloud have ARM audiences for Authenticate()
- _ "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm/runtime"
-)
-
-type publicClientOptions struct {
- azcore.ClientOptions
-
- AdditionallyAllowedTenants []string
- DeviceCodePrompt func(context.Context, DeviceCodeMessage) error
- DisableAutomaticAuthentication bool
- DisableInstanceDiscovery bool
- LoginHint, RedirectURL string
- Record authenticationRecord
- TokenCachePersistenceOptions *tokenCachePersistenceOptions
- Username, Password string
-}
-
-// publicClient wraps the MSAL public client
-type publicClient struct {
- cae, noCAE msalPublicClient
- caeMu, noCAEMu, clientMu *sync.Mutex
- clientID, tenantID string
- defaultScope []string
- host string
- name string
- opts publicClientOptions
- record authenticationRecord
- azClient *azcore.Client
-}
-
-var errScopeRequired = errors.New("authenticating in this environment requires specifying a scope in TokenRequestOptions")
-
-func newPublicClient(tenantID, clientID, name string, o publicClientOptions) (*publicClient, error) {
- if !validTenantID(tenantID) {
- return nil, errInvalidTenantID
- }
- host, err := setAuthorityHost(o.Cloud)
- if err != nil {
- return nil, err
- }
- // if the application specified a cloud configuration, use its ARM audience as the default scope for Authenticate()
- audience := o.Cloud.Services[cloud.ResourceManager].Audience
- if audience == "" {
- // no cloud configuration, or no ARM audience, specified; try to map the host to a well-known one (all of which have a trailing slash)
- if !strings.HasSuffix(host, "/") {
- host += "/"
- }
- switch host {
- case cloud.AzureChina.ActiveDirectoryAuthorityHost:
- audience = cloud.AzureChina.Services[cloud.ResourceManager].Audience
- case cloud.AzureGovernment.ActiveDirectoryAuthorityHost:
- audience = cloud.AzureGovernment.Services[cloud.ResourceManager].Audience
- case cloud.AzurePublic.ActiveDirectoryAuthorityHost:
- audience = cloud.AzurePublic.Services[cloud.ResourceManager].Audience
- }
- }
- // if we didn't come up with an audience, the application will have to specify a scope for Authenticate()
- var defaultScope []string
- if audience != "" {
- defaultScope = []string{audience + defaultSuffix}
- }
- client, err := azcore.NewClient(module, version, runtime.PipelineOptions{
- Tracing: runtime.TracingOptions{
- Namespace: traceNamespace,
- },
- }, &o.ClientOptions)
- if err != nil {
- return nil, err
- }
- o.AdditionallyAllowedTenants = resolveAdditionalTenants(o.AdditionallyAllowedTenants)
- return &publicClient{
- caeMu: &sync.Mutex{},
- clientID: clientID,
- clientMu: &sync.Mutex{},
- defaultScope: defaultScope,
- host: host,
- name: name,
- noCAEMu: &sync.Mutex{},
- opts: o,
- record: o.Record,
- tenantID: tenantID,
- azClient: client,
- }, nil
-}
-
-func (p *publicClient) Authenticate(ctx context.Context, tro *policy.TokenRequestOptions) (authenticationRecord, error) {
- if tro == nil {
- tro = &policy.TokenRequestOptions{}
- }
- if len(tro.Scopes) == 0 {
- if p.defaultScope == nil {
- return authenticationRecord{}, errScopeRequired
- }
- tro.Scopes = p.defaultScope
- }
- client, mu, err := p.client(*tro)
- if err != nil {
- return authenticationRecord{}, err
- }
- mu.Lock()
- defer mu.Unlock()
- _, err = p.reqToken(ctx, client, *tro)
- if err == nil {
- scope := strings.Join(tro.Scopes, ", ")
- msg := fmt.Sprintf("%s.Authenticate() acquired a token for scope %q", p.name, scope)
- log.Write(EventAuthentication, msg)
- }
- return p.record, err
-}
-
-// GetToken requests an access token from MSAL, checking the cache first.
-func (p *publicClient) GetToken(ctx context.Context, tro policy.TokenRequestOptions) (azcore.AccessToken, error) {
- if len(tro.Scopes) < 1 {
- return azcore.AccessToken{}, fmt.Errorf("%s.GetToken() requires at least one scope", p.name)
- }
- tenant, err := p.resolveTenant(tro.TenantID)
- if err != nil {
- return azcore.AccessToken{}, err
- }
- client, mu, err := p.client(tro)
- if err != nil {
- return azcore.AccessToken{}, err
- }
- mu.Lock()
- defer mu.Unlock()
- ar, err := client.AcquireTokenSilent(ctx, tro.Scopes, public.WithSilentAccount(p.record.account()), public.WithClaims(tro.Claims), public.WithTenantID(tenant))
- if err == nil {
- return p.token(ar, err)
- }
- if p.opts.DisableAutomaticAuthentication {
- return azcore.AccessToken{}, newauthenticationRequiredError(p.name, tro)
- }
- at, err := p.reqToken(ctx, client, tro)
- if err == nil {
- msg := fmt.Sprintf("%s.GetToken() acquired a token for scope %q", p.name, strings.Join(ar.GrantedScopes, ", "))
- log.Write(EventAuthentication, msg)
- }
- return at, err
-}
-
-// reqToken requests a token from the MSAL public client. It's separate from GetToken() to enable Authenticate() to bypass the cache.
-func (p *publicClient) reqToken(ctx context.Context, c msalPublicClient, tro policy.TokenRequestOptions) (azcore.AccessToken, error) {
- tenant, err := p.resolveTenant(tro.TenantID)
- if err != nil {
- return azcore.AccessToken{}, err
- }
- var ar public.AuthResult
- switch p.name {
- case credNameBrowser:
- ar, err = c.AcquireTokenInteractive(ctx, tro.Scopes,
- public.WithClaims(tro.Claims),
- public.WithLoginHint(p.opts.LoginHint),
- public.WithRedirectURI(p.opts.RedirectURL),
- public.WithTenantID(tenant),
- )
- case credNameDeviceCode:
- dc, e := c.AcquireTokenByDeviceCode(ctx, tro.Scopes, public.WithClaims(tro.Claims), public.WithTenantID(tenant))
- if e != nil {
- return azcore.AccessToken{}, e
- }
- err = p.opts.DeviceCodePrompt(ctx, DeviceCodeMessage{
- Message: dc.Result.Message,
- UserCode: dc.Result.UserCode,
- VerificationURL: dc.Result.VerificationURL,
- })
- if err == nil {
- ar, err = dc.AuthenticationResult(ctx)
- }
- case credNameUserPassword:
- ar, err = c.AcquireTokenByUsernamePassword(ctx, tro.Scopes, p.opts.Username, p.opts.Password, public.WithClaims(tro.Claims), public.WithTenantID(tenant))
- default:
- return azcore.AccessToken{}, fmt.Errorf("unknown credential %q", p.name)
- }
- return p.token(ar, err)
-}
-
-func (p *publicClient) client(tro policy.TokenRequestOptions) (msalPublicClient, *sync.Mutex, error) {
- p.clientMu.Lock()
- defer p.clientMu.Unlock()
- if tro.EnableCAE {
- if p.cae == nil {
- client, err := p.newMSALClient(true)
- if err != nil {
- return nil, nil, err
- }
- p.cae = client
- }
- return p.cae, p.caeMu, nil
- }
- if p.noCAE == nil {
- client, err := p.newMSALClient(false)
- if err != nil {
- return nil, nil, err
- }
- p.noCAE = client
- }
- return p.noCAE, p.noCAEMu, nil
-}
-
-func (p *publicClient) newMSALClient(enableCAE bool) (msalPublicClient, error) {
- cache, err := internal.NewCache(p.opts.TokenCachePersistenceOptions, enableCAE)
- if err != nil {
- return nil, err
- }
- o := []public.Option{
- public.WithAuthority(runtime.JoinPaths(p.host, p.tenantID)),
- public.WithCache(cache),
- public.WithHTTPClient(p),
- }
- if enableCAE {
- o = append(o, public.WithClientCapabilities(cp1))
- }
- if p.opts.DisableInstanceDiscovery || strings.ToLower(p.tenantID) == "adfs" {
- o = append(o, public.WithInstanceDiscovery(false))
- }
- return public.New(p.clientID, o...)
-}
-
-func (p *publicClient) token(ar public.AuthResult, err error) (azcore.AccessToken, error) {
- if err == nil {
- p.record, err = newAuthenticationRecord(ar)
- } else {
- res := getResponseFromError(err)
- err = newAuthenticationFailedError(p.name, err.Error(), res, err)
- }
- return azcore.AccessToken{Token: ar.AccessToken, ExpiresOn: ar.ExpiresOn.UTC()}, err
-}
-
-// resolveTenant returns the correct WithTenantID() argument for a token request given the client's
-// configuration, or an error when that configuration doesn't allow the specified tenant
-func (p *publicClient) resolveTenant(specified string) (string, error) {
- t, err := resolveTenant(p.tenantID, specified, p.name, p.opts.AdditionallyAllowedTenants)
- if t == p.tenantID {
- // callers pass this value to MSAL's WithTenantID(). There's no need to redundantly specify
- // the client's default tenant and doing so is an error when that tenant is "organizations"
- t = ""
- }
- return t, err
-}
-
-// these methods satisfy the MSAL ops.HTTPClient interface
-
-func (p *publicClient) CloseIdleConnections() {
- // do nothing
-}
-
-func (p *publicClient) Do(r *http.Request) (*http.Response, error) {
- return doForClient(p.azClient, r)
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources-post.ps1 b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources-post.ps1
deleted file mode 100644
index a69bbce34c43e61c7c5748ad24c5c3c346699169..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources-post.ps1
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# IMPORTANT: Do not invoke this file directly. Please instead run eng/common/TestResources/New-TestResources.ps1 from the repository root.
-
-param (
- [hashtable] $AdditionalParameters = @{},
- [hashtable] $DeploymentOutputs
-)
-
-$ErrorActionPreference = 'Stop'
-$PSNativeCommandUseErrorActionPreference = $true
-
-if ($CI) {
- if (!$AdditionalParameters['deployResources']) {
- Write-Host "Skipping post-provisioning script because resources weren't deployed"
- return
- }
- az login --service-principal -u $DeploymentOutputs['AZIDENTITY_CLIENT_ID'] -p $DeploymentOutputs['AZIDENTITY_CLIENT_SECRET'] --tenant $DeploymentOutputs['AZIDENTITY_TENANT_ID']
- az account set --subscription $DeploymentOutputs['AZIDENTITY_SUBSCRIPTION_ID']
-}
-
-Write-Host "Building container"
-$image = "$($DeploymentOutputs['AZIDENTITY_ACR_LOGIN_SERVER'])/azidentity-managed-id-test"
-Set-Content -Path "$PSScriptRoot/Dockerfile" -Value @"
-FROM mcr.microsoft.com/oss/go/microsoft/golang:latest as builder
-ENV GOARCH=amd64 GOWORK=off
-COPY . /azidentity
-WORKDIR /azidentity/testdata/managed-id-test
-RUN go mod tidy
-RUN go build -o /build/managed-id-test .
-RUN GOOS=windows go build -o /build/managed-id-test.exe .
-
-FROM mcr.microsoft.com/mirror/docker/library/alpine:3.16
-RUN apk add gcompat
-COPY --from=builder /build/* .
-RUN chmod +x managed-id-test
-CMD ["./managed-id-test"]
-"@
-# build from sdk/azidentity because we need that dir in the context (because the test app uses local azidentity)
-docker build -t $image "$PSScriptRoot"
-az acr login -n $DeploymentOutputs['AZIDENTITY_ACR_NAME']
-docker push $image
-
-$rg = $DeploymentOutputs['AZIDENTITY_RESOURCE_GROUP']
-
-# ACI is easier to provision here than in the bicep file because the image isn't available before now
-Write-Host "Deploying Azure Container Instance"
-$aciName = "azidentity-test"
-az container create -g $rg -n $aciName --image $image `
- --acr-identity $($DeploymentOutputs['AZIDENTITY_USER_ASSIGNED_IDENTITY']) `
- --assign-identity [system] $($DeploymentOutputs['AZIDENTITY_USER_ASSIGNED_IDENTITY']) `
- --role "Storage Blob Data Reader" `
- --scope $($DeploymentOutputs['AZIDENTITY_STORAGE_ID']) `
- -e AZIDENTITY_STORAGE_NAME=$($DeploymentOutputs['AZIDENTITY_STORAGE_NAME']) `
- AZIDENTITY_STORAGE_NAME_USER_ASSIGNED=$($DeploymentOutputs['AZIDENTITY_STORAGE_NAME_USER_ASSIGNED']) `
- AZIDENTITY_USER_ASSIGNED_IDENTITY=$($DeploymentOutputs['AZIDENTITY_USER_ASSIGNED_IDENTITY']) `
- FUNCTIONS_CUSTOMHANDLER_PORT=80
-Write-Host "##vso[task.setvariable variable=AZIDENTITY_ACI_NAME;]$aciName"
-
-# Azure Functions deployment: copy the Windows binary from the Docker image, deploy it in a zip
-Write-Host "Deploying to Azure Functions"
-$container = docker create $image
-docker cp ${container}:managed-id-test.exe "$PSScriptRoot/testdata/managed-id-test/"
-docker rm -v $container
-Compress-Archive -Path "$PSScriptRoot/testdata/managed-id-test/*" -DestinationPath func.zip -Force
-az functionapp deploy -g $rg -n $DeploymentOutputs['AZIDENTITY_FUNCTION_NAME'] --src-path func.zip --type zip
-
-Write-Host "Creating federated identity"
-$aksName = $DeploymentOutputs['AZIDENTITY_AKS_NAME']
-$idName = $DeploymentOutputs['AZIDENTITY_USER_ASSIGNED_IDENTITY_NAME']
-$issuer = az aks show -g $rg -n $aksName --query "oidcIssuerProfile.issuerUrl" -otsv
-$podName = "azidentity-test"
-$serviceAccountName = "workload-identity-sa"
-az identity federated-credential create -g $rg --identity-name $idName --issuer $issuer --name $idName --subject system:serviceaccount:default:$serviceAccountName
-Write-Host "Deploying to AKS"
-az aks get-credentials -g $rg -n $aksName
-az aks update --attach-acr $DeploymentOutputs['AZIDENTITY_ACR_NAME'] -g $rg -n $aksName
-Set-Content -Path "$PSScriptRoot/k8s.yaml" -Value @"
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- annotations:
- azure.workload.identity/client-id: $($DeploymentOutputs['AZIDENTITY_USER_ASSIGNED_IDENTITY_CLIENT_ID'])
- name: $serviceAccountName
- namespace: default
----
-apiVersion: v1
-kind: Pod
-metadata:
- name: $podName
- namespace: default
- labels:
- app: $podName
- azure.workload.identity/use: "true"
-spec:
- serviceAccountName: $serviceAccountName
- containers:
- - name: $podName
- image: $image
- env:
- - name: AZIDENTITY_STORAGE_NAME
- value: $($DeploymentOutputs['AZIDENTITY_STORAGE_NAME_USER_ASSIGNED'])
- - name: AZIDENTITY_USE_WORKLOAD_IDENTITY
- value: "true"
- - name: FUNCTIONS_CUSTOMHANDLER_PORT
- value: "80"
- nodeSelector:
- kubernetes.io/os: linux
-"@
-kubectl apply -f "$PSScriptRoot/k8s.yaml"
-Write-Host "##vso[task.setvariable variable=AZIDENTITY_POD_NAME;]$podName"
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources-pre.ps1 b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources-pre.ps1
deleted file mode 100644
index 58766d0a02277a8edf733c453d08496176abe68d..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources-pre.ps1
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License.
-
-# IMPORTANT: Do not invoke this file directly. Please instead run eng/common/TestResources/New-TestResources.ps1 from the repository root.
-
-[CmdletBinding(SupportsShouldProcess = $true, ConfirmImpact = 'Medium')]
-param (
- [hashtable] $AdditionalParameters = @{},
-
- # Captures any arguments from eng/New-TestResources.ps1 not declared here (no parameter errors).
- [Parameter(ValueFromRemainingArguments = $true)]
- $RemainingArguments
-)
-
-if (-not (Test-Path "$PSScriptRoot/sshkey.pub")) {
- ssh-keygen -t rsa -b 4096 -f "$PSScriptRoot/sshkey" -N '' -C ''
-}
-$templateFileParameters['sshPubKey'] = Get-Content "$PSScriptRoot/sshkey.pub"
-
-if (!$CI) {
- # TODO: Remove this once auto-cloud config downloads are supported locally
- Write-Host "Skipping cert setup in local testing mode"
- return
-}
-
-if ($null -eq $EnvironmentVariables -or $EnvironmentVariables.Count -eq 0) {
- throw "EnvironmentVariables must be set in the calling script New-TestResources.ps1"
-}
-
-$tmp = $env:TEMP ? $env:TEMP : [System.IO.Path]::GetTempPath()
-$pfxPath = Join-Path $tmp "test.pfx"
-$pemPath = Join-Path $tmp "test.pem"
-
-Write-Host "Creating identity test files: $pfxPath $pemPath"
-
-[System.Convert]::FromBase64String($EnvironmentVariables['PFX_CONTENTS']) | Set-Content -Path $pfxPath -AsByteStream
-Set-Content -Path $pemPath -Value $EnvironmentVariables['PEM_CONTENTS']
-
-# Set for pipeline
-Write-Host "##vso[task.setvariable variable=IDENTITY_SP_CERT_PFX;]$pfxPath"
-Write-Host "##vso[task.setvariable variable=IDENTITY_SP_CERT_PEM;]$pemPath"
-# Set for local
-$env:IDENTITY_SP_CERT_PFX = $pfxPath
-$env:IDENTITY_SP_CERT_PEM = $pemPath
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources.bicep b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources.bicep
deleted file mode 100644
index 2a2165293090747ca65929dec706ebae8cf93cb0..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/test-resources.bicep
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT License.
-
-@description('Kubernetes cluster admin user name.')
-param adminUser string = 'azureuser'
-
-@minLength(6)
-@maxLength(23)
-@description('The base resource name.')
-param baseName string = resourceGroup().name
-
-@description('Whether to deploy resources. When set to false, this file deploys nothing.')
-param deployResources bool = false
-
-param sshPubKey string = ''
-
-@description('The location of the resource. By default, this is the same as the resource group.')
-param location string = resourceGroup().location
-
-// https://learn.microsoft.com/azure/role-based-access-control/built-in-roles
-var acrPull = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '7f951dda-4ed3-4680-a7ca-43fe172d538d')
-var blobReader = subscriptionResourceId('Microsoft.Authorization/roleDefinitions', '2a2b9908-6ea1-4ae2-8e65-a410df84e7d1')
-
-resource sa 'Microsoft.Storage/storageAccounts@2021-08-01' = if (deployResources) {
- kind: 'StorageV2'
- location: location
- name: 'sa${uniqueString(baseName)}'
- properties: {
- accessTier: 'Hot'
- }
- sku: {
- name: 'Standard_LRS'
- }
-}
-
-resource saUserAssigned 'Microsoft.Storage/storageAccounts@2021-08-01' = if (deployResources) {
- kind: 'StorageV2'
- location: location
- name: 'sa2${uniqueString(baseName)}'
- properties: {
- accessTier: 'Hot'
- }
- sku: {
- name: 'Standard_LRS'
- }
-}
-
-resource usermgdid 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = if (deployResources) {
- location: location
- name: baseName
-}
-
-resource acrPullContainerInstance 'Microsoft.Authorization/roleAssignments@2022-04-01' = if (deployResources) {
- name: guid(resourceGroup().id, acrPull, 'containerInstance')
- properties: {
- principalId: deployResources ? usermgdid.properties.principalId : ''
- principalType: 'ServicePrincipal'
- roleDefinitionId: acrPull
- }
- scope: containerRegistry
-}
-
-resource blobRoleUserAssigned 'Microsoft.Authorization/roleAssignments@2022-04-01' = if (deployResources) {
- scope: saUserAssigned
- name: guid(resourceGroup().id, blobReader, usermgdid.id)
- properties: {
- principalId: deployResources ? usermgdid.properties.principalId : ''
- principalType: 'ServicePrincipal'
- roleDefinitionId: blobReader
- }
-}
-
-resource blobRoleFunc 'Microsoft.Authorization/roleAssignments@2022-04-01' = if (deployResources) {
- name: guid(resourceGroup().id, blobReader, 'azfunc')
- properties: {
- principalId: deployResources ? azfunc.identity.principalId : ''
- roleDefinitionId: blobReader
- principalType: 'ServicePrincipal'
- }
- scope: sa
-}
-
-resource containerRegistry 'Microsoft.ContainerRegistry/registries@2023-01-01-preview' = if (deployResources) {
- location: location
- name: uniqueString(resourceGroup().id)
- properties: {
- adminUserEnabled: true
- }
- sku: {
- name: 'Basic'
- }
-}
-
-resource farm 'Microsoft.Web/serverfarms@2021-03-01' = if (deployResources) {
- kind: 'app'
- location: location
- name: '${baseName}_asp'
- properties: {}
- sku: {
- capacity: 1
- family: 'B'
- name: 'B1'
- size: 'B1'
- tier: 'Basic'
- }
-}
-
-resource azfunc 'Microsoft.Web/sites@2021-03-01' = if (deployResources) {
- identity: {
- type: 'SystemAssigned, UserAssigned'
- userAssignedIdentities: {
- '${deployResources ? usermgdid.id : ''}': {}
- }
- }
- kind: 'functionapp'
- location: location
- name: '${baseName}func'
- properties: {
- enabled: true
- httpsOnly: true
- keyVaultReferenceIdentity: 'SystemAssigned'
- serverFarmId: farm.id
- siteConfig: {
- alwaysOn: true
- appSettings: [
- {
- name: 'AZIDENTITY_STORAGE_NAME'
- value: deployResources ? sa.name : null
- }
- {
- name: 'AZIDENTITY_STORAGE_NAME_USER_ASSIGNED'
- value: deployResources ? saUserAssigned.name : null
- }
- {
- name: 'AZIDENTITY_USER_ASSIGNED_IDENTITY'
- value: deployResources ? usermgdid.id : null
- }
- {
- name: 'AzureWebJobsStorage'
- value: 'DefaultEndpointsProtocol=https;AccountName=${deployResources ? sa.name : ''};EndpointSuffix=${deployResources ? environment().suffixes.storage : ''};AccountKey=${deployResources ? sa.listKeys().keys[0].value : ''}'
- }
- {
- name: 'FUNCTIONS_EXTENSION_VERSION'
- value: '~4'
- }
- {
- name: 'FUNCTIONS_WORKER_RUNTIME'
- value: 'custom'
- }
- {
- name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
- value: 'DefaultEndpointsProtocol=https;AccountName=${deployResources ? sa.name : ''};EndpointSuffix=${deployResources ? environment().suffixes.storage : ''};AccountKey=${deployResources ? sa.listKeys().keys[0].value : ''}'
- }
- {
- name: 'WEBSITE_CONTENTSHARE'
- value: toLower('${baseName}-func')
- }
- ]
- http20Enabled: true
- minTlsVersion: '1.2'
- }
- }
-}
-
-resource aks 'Microsoft.ContainerService/managedClusters@2023-06-01' = if (deployResources) {
- name: baseName
- location: location
- identity: {
- type: 'SystemAssigned'
- }
- properties: {
- agentPoolProfiles: [
- {
- count: 1
- enableAutoScaling: false
- kubeletDiskType: 'OS'
- mode: 'System'
- name: 'agentpool'
- osDiskSizeGB: 128
- osDiskType: 'Managed'
- osSKU: 'Ubuntu'
- osType: 'Linux'
- type: 'VirtualMachineScaleSets'
- vmSize: 'Standard_D2s_v3'
- }
- ]
- dnsPrefix: 'identitytest'
- enableRBAC: true
- linuxProfile: {
- adminUsername: adminUser
- ssh: {
- publicKeys: [
- {
- keyData: sshPubKey
- }
- ]
- }
- }
- oidcIssuerProfile: {
- enabled: true
- }
- securityProfile: {
- workloadIdentity: {
- enabled: true
- }
- }
- }
-}
-
-output AZIDENTITY_ACR_LOGIN_SERVER string = deployResources ? containerRegistry.properties.loginServer : ''
-output AZIDENTITY_ACR_NAME string = deployResources ? containerRegistry.name : ''
-output AZIDENTITY_AKS_NAME string = deployResources ? aks.name : ''
-output AZIDENTITY_FUNCTION_NAME string = deployResources ? azfunc.name : ''
-output AZIDENTITY_STORAGE_ID string = deployResources ? sa.id : ''
-output AZIDENTITY_STORAGE_NAME string = deployResources ? sa.name : ''
-output AZIDENTITY_STORAGE_NAME_USER_ASSIGNED string = deployResources ? saUserAssigned.name : ''
-output AZIDENTITY_USER_ASSIGNED_IDENTITY string = deployResources ? usermgdid.id : ''
-output AZIDENTITY_USER_ASSIGNED_IDENTITY_CLIENT_ID string = deployResources ? usermgdid.properties.clientId : ''
-output AZIDENTITY_USER_ASSIGNED_IDENTITY_NAME string = deployResources ? usermgdid.name : ''
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/username_password_credential.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/username_password_credential.go
deleted file mode 100644
index 294ed81e951cdb1755709848a6fcd95d436c06fc..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/username_password_credential.go
+++ /dev/null
@@ -1,90 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
-)
-
-const credNameUserPassword = "UsernamePasswordCredential"
-
-// UsernamePasswordCredentialOptions contains optional parameters for UsernamePasswordCredential.
-type UsernamePasswordCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens.
- // Add the wildcard value "*" to allow the credential to acquire tokens for any tenant in which the
- // application is registered.
- AdditionallyAllowedTenants []string
-
- // authenticationRecord returned by a call to a credential's Authenticate method. Set this option
- // to enable the credential to use data from a previous authentication.
- authenticationRecord authenticationRecord
-
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
-
- // tokenCachePersistenceOptions enables persistent token caching when not nil.
- tokenCachePersistenceOptions *tokenCachePersistenceOptions
-}
-
-// UsernamePasswordCredential authenticates a user with a password. Microsoft doesn't recommend this kind of authentication,
-// because it's less secure than other authentication flows. This credential is not interactive, so it isn't compatible
-// with any form of multi-factor authentication, and the application must already have user or admin consent.
-// This credential can only authenticate work and school accounts; it can't authenticate Microsoft accounts.
-type UsernamePasswordCredential struct {
- client *publicClient
-}
-
-// NewUsernamePasswordCredential creates a UsernamePasswordCredential. clientID is the ID of the application the user
-// will authenticate to. Pass nil for options to accept defaults.
-func NewUsernamePasswordCredential(tenantID string, clientID string, username string, password string, options *UsernamePasswordCredentialOptions) (*UsernamePasswordCredential, error) {
- if options == nil {
- options = &UsernamePasswordCredentialOptions{}
- }
- opts := publicClientOptions{
- AdditionallyAllowedTenants: options.AdditionallyAllowedTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- Password: password,
- Record: options.authenticationRecord,
- TokenCachePersistenceOptions: options.tokenCachePersistenceOptions,
- Username: username,
- }
- c, err := newPublicClient(tenantID, clientID, credNameUserPassword, opts)
- if err != nil {
- return nil, err
- }
- return &UsernamePasswordCredential{client: c}, err
-}
-
-// Authenticate the user. Subsequent calls to GetToken will automatically use the returned AuthenticationRecord.
-func (c *UsernamePasswordCredential) authenticate(ctx context.Context, opts *policy.TokenRequestOptions) (authenticationRecord, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameUserPassword+"."+traceOpAuthenticate, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.Authenticate(ctx, opts)
- return tk, err
-}
-
-// GetToken requests an access token from Microsoft Entra ID. This method is called automatically by Azure SDK clients.
-func (c *UsernamePasswordCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameUserPassword+"."+traceOpGetToken, c.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := c.client.GetToken(ctx, opts)
- return tk, err
-}
-
-var _ azcore.TokenCredential = (*UsernamePasswordCredential)(nil)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/version.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/version.go
deleted file mode 100644
index 4305b5d3d80ff8a0649b557777917fe3bf7d9d3a..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/version.go
+++ /dev/null
@@ -1,18 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-const (
- // UserAgent is the string to be used in the user agent string when making requests.
- component = "azidentity"
-
- // module is the fully qualified name of the module used in telemetry and distributed tracing.
- module = "github.com/Azure/azure-sdk-for-go/sdk/" + component
-
- // Version is the semantic version (see http://semver.org) of this module.
- version = "v1.7.0"
-)
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/workload_identity.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/workload_identity.go
deleted file mode 100644
index 3e43e788e931275a6d4ac1d3592c6d9499fdbc10..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/workload_identity.go
+++ /dev/null
@@ -1,131 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package azidentity
-
-import (
- "context"
- "errors"
- "os"
- "sync"
- "time"
-
- "github.com/Azure/azure-sdk-for-go/sdk/azcore"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
- "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime"
-)
-
-const credNameWorkloadIdentity = "WorkloadIdentityCredential"
-
-// WorkloadIdentityCredential supports Azure workload identity on Kubernetes.
-// See [Azure Kubernetes Service documentation] for more information.
-//
-// [Azure Kubernetes Service documentation]: https://learn.microsoft.com/azure/aks/workload-identity-overview
-type WorkloadIdentityCredential struct {
- assertion, file string
- cred *ClientAssertionCredential
- expires time.Time
- mtx *sync.RWMutex
-}
-
-// WorkloadIdentityCredentialOptions contains optional parameters for WorkloadIdentityCredential.
-type WorkloadIdentityCredentialOptions struct {
- azcore.ClientOptions
-
- // AdditionallyAllowedTenants specifies additional tenants for which the credential may acquire tokens.
- // Add the wildcard value "*" to allow the credential to acquire tokens for any tenant in which the
- // application is registered.
- AdditionallyAllowedTenants []string
- // ClientID of the service principal. Defaults to the value of the environment variable AZURE_CLIENT_ID.
- ClientID string
- // DisableInstanceDiscovery should be set true only by applications authenticating in disconnected clouds, or
- // private clouds such as Azure Stack. It determines whether the credential requests Microsoft Entra instance metadata
- // from https://login.microsoft.com before authenticating. Setting this to true will skip this request, making
- // the application responsible for ensuring the configured authority is valid and trustworthy.
- DisableInstanceDiscovery bool
- // TenantID of the service principal. Defaults to the value of the environment variable AZURE_TENANT_ID.
- TenantID string
- // TokenFilePath is the path of a file containing a Kubernetes service account token. Defaults to the value of the
- // environment variable AZURE_FEDERATED_TOKEN_FILE.
- TokenFilePath string
-}
-
-// NewWorkloadIdentityCredential constructs a WorkloadIdentityCredential. Service principal configuration is read
-// from environment variables as set by the Azure workload identity webhook. Set options to override those values.
-func NewWorkloadIdentityCredential(options *WorkloadIdentityCredentialOptions) (*WorkloadIdentityCredential, error) {
- if options == nil {
- options = &WorkloadIdentityCredentialOptions{}
- }
- ok := false
- clientID := options.ClientID
- if clientID == "" {
- if clientID, ok = os.LookupEnv(azureClientID); !ok {
- return nil, errors.New("no client ID specified. Check pod configuration or set ClientID in the options")
- }
- }
- file := options.TokenFilePath
- if file == "" {
- if file, ok = os.LookupEnv(azureFederatedTokenFile); !ok {
- return nil, errors.New("no token file specified. Check pod configuration or set TokenFilePath in the options")
- }
- }
- tenantID := options.TenantID
- if tenantID == "" {
- if tenantID, ok = os.LookupEnv(azureTenantID); !ok {
- return nil, errors.New("no tenant ID specified. Check pod configuration or set TenantID in the options")
- }
- }
- w := WorkloadIdentityCredential{file: file, mtx: &sync.RWMutex{}}
- caco := ClientAssertionCredentialOptions{
- AdditionallyAllowedTenants: options.AdditionallyAllowedTenants,
- ClientOptions: options.ClientOptions,
- DisableInstanceDiscovery: options.DisableInstanceDiscovery,
- }
- cred, err := NewClientAssertionCredential(tenantID, clientID, w.getAssertion, &caco)
- if err != nil {
- return nil, err
- }
- // we want "WorkloadIdentityCredential" in log messages, not "ClientAssertionCredential"
- cred.client.name = credNameWorkloadIdentity
- w.cred = cred
- return &w, nil
-}
-
-// GetToken requests an access token from Microsoft Entra ID. Azure SDK clients call this method automatically.
-func (w *WorkloadIdentityCredential) GetToken(ctx context.Context, opts policy.TokenRequestOptions) (azcore.AccessToken, error) {
- var err error
- ctx, endSpan := runtime.StartSpan(ctx, credNameWorkloadIdentity+"."+traceOpGetToken, w.cred.client.azClient.Tracer(), nil)
- defer func() { endSpan(err) }()
- tk, err := w.cred.GetToken(ctx, opts)
- return tk, err
-}
-
-// getAssertion returns the specified file's content, which is expected to be a Kubernetes service account token.
-// Kubernetes is responsible for updating the file as service account tokens expire.
-func (w *WorkloadIdentityCredential) getAssertion(context.Context) (string, error) {
- w.mtx.RLock()
- if w.expires.Before(time.Now()) {
- // ensure only one goroutine at a time updates the assertion
- w.mtx.RUnlock()
- w.mtx.Lock()
- defer w.mtx.Unlock()
- // double check because another goroutine may have acquired the write lock first and done the update
- if now := time.Now(); w.expires.Before(now) {
- content, err := os.ReadFile(w.file)
- if err != nil {
- return "", err
- }
- w.assertion = string(content)
- // Kubernetes rotates service account tokens when they reach 80% of their total TTL. The shortest TTL
- // is 1 hour. That implies the token we just read is valid for at least 12 minutes (20% of 1 hour),
- // but we add some margin for safety.
- w.expires = now.Add(10 * time.Minute)
- }
- } else {
- defer w.mtx.RUnlock()
- }
- return w.assertion, nil
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/LICENSE.txt b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/LICENSE.txt
deleted file mode 100644
index 48ea6616b5b8581df3401872996cecf1f8b08a0d..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) Microsoft Corporation.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/diag.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/diag.go
deleted file mode 100644
index 245af7d2bec446e286bde10fb60dea27c2a18323..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/diag.go
+++ /dev/null
@@ -1,51 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package diag
-
-import (
- "fmt"
- "runtime"
- "strings"
-)
-
-// Caller returns the file and line number of a frame on the caller's stack.
-// If the funtion fails an empty string is returned.
-// skipFrames - the number of frames to skip when determining the caller.
-// Passing a value of 0 will return the immediate caller of this function.
-func Caller(skipFrames int) string {
- if pc, file, line, ok := runtime.Caller(skipFrames + 1); ok {
- // the skipFrames + 1 is to skip ourselves
- frame := runtime.FuncForPC(pc)
- return fmt.Sprintf("%s()\n\t%s:%d", frame.Name(), file, line)
- }
- return ""
-}
-
-// StackTrace returns a formatted stack trace string.
-// If the funtion fails an empty string is returned.
-// skipFrames - the number of stack frames to skip before composing the trace string.
-// totalFrames - the maximum number of stack frames to include in the trace string.
-func StackTrace(skipFrames, totalFrames int) string {
- pcCallers := make([]uintptr, totalFrames)
- if frames := runtime.Callers(skipFrames, pcCallers); frames == 0 {
- return ""
- }
- frames := runtime.CallersFrames(pcCallers)
- sb := strings.Builder{}
- for {
- frame, more := frames.Next()
- sb.WriteString(frame.Function)
- sb.WriteString("()\n\t")
- sb.WriteString(frame.File)
- sb.WriteRune(':')
- sb.WriteString(fmt.Sprintf("%d\n", frame.Line))
- if !more {
- break
- }
- }
- return sb.String()
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/doc.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/doc.go
deleted file mode 100644
index 66bf13e5f04b5b830938f4b9dd7a8dc23dfb67a0..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/diag/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package diag
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/doc.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/doc.go
deleted file mode 100644
index 8c6eacb618a3ef645510f180773ba97f6616ad6d..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package errorinfo
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/errorinfo.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/errorinfo.go
deleted file mode 100644
index 8ee66b52676ea553e233e5e3de2efeef51aeef29..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/errorinfo/errorinfo.go
+++ /dev/null
@@ -1,46 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package errorinfo
-
-// NonRetriable represents a non-transient error. This works in
-// conjunction with the retry policy, indicating that the error condition
-// is idempotent, so no retries will be attempted.
-// Use errors.As() to access this interface in the error chain.
-type NonRetriable interface {
- error
- NonRetriable()
-}
-
-// NonRetriableError marks the specified error as non-retriable.
-// This function takes an error as input and returns a new error that is marked as non-retriable.
-func NonRetriableError(err error) error {
- return &nonRetriableError{err}
-}
-
-// nonRetriableError is a struct that embeds the error interface.
-// It is used to represent errors that should not be retried.
-type nonRetriableError struct {
- error
-}
-
-// Error method for nonRetriableError struct.
-// It returns the error message of the embedded error.
-func (p *nonRetriableError) Error() string {
- return p.error.Error()
-}
-
-// NonRetriable is a marker method for nonRetriableError struct.
-// Non-functional and indicates that the error is non-retriable.
-func (*nonRetriableError) NonRetriable() {
- // marker method
-}
-
-// Unwrap method for nonRetriableError struct.
-// It returns the original error that was marked as non-retriable.
-func (p *nonRetriableError) Unwrap() error {
- return p.error
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/exported/exported.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/exported/exported.go
deleted file mode 100644
index 9948f604b3012673f658414e46993d148fddc550..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/exported/exported.go
+++ /dev/null
@@ -1,129 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package exported
-
-import (
- "errors"
- "io"
- "net/http"
-)
-
-// HasStatusCode returns true if the Response's status code is one of the specified values.
-// Exported as runtime.HasStatusCode().
-func HasStatusCode(resp *http.Response, statusCodes ...int) bool {
- if resp == nil {
- return false
- }
- for _, sc := range statusCodes {
- if resp.StatusCode == sc {
- return true
- }
- }
- return false
-}
-
-// PayloadOptions contains the optional values for the Payload func.
-// NOT exported but used by azcore.
-type PayloadOptions struct {
- // BytesModifier receives the downloaded byte slice and returns an updated byte slice.
- // Use this to modify the downloaded bytes in a payload (e.g. removing a BOM).
- BytesModifier func([]byte) []byte
-}
-
-// Payload reads and returns the response body or an error.
-// On a successful read, the response body is cached.
-// Subsequent reads will access the cached value.
-// Exported as runtime.Payload() WITHOUT the opts parameter.
-func Payload(resp *http.Response, opts *PayloadOptions) ([]byte, error) {
- if resp.Body == nil {
- // this shouldn't happen in real-world scenarios as a
- // response with no body should set it to http.NoBody
- return nil, nil
- }
- modifyBytes := func(b []byte) []byte { return b }
- if opts != nil && opts.BytesModifier != nil {
- modifyBytes = opts.BytesModifier
- }
-
- // r.Body won't be a nopClosingBytesReader if downloading was skipped
- if buf, ok := resp.Body.(*nopClosingBytesReader); ok {
- bytesBody := modifyBytes(buf.Bytes())
- buf.Set(bytesBody)
- return bytesBody, nil
- }
-
- bytesBody, err := io.ReadAll(resp.Body)
- resp.Body.Close()
- if err != nil {
- return nil, err
- }
-
- bytesBody = modifyBytes(bytesBody)
- resp.Body = &nopClosingBytesReader{s: bytesBody}
- return bytesBody, nil
-}
-
-// PayloadDownloaded returns true if the response body has already been downloaded.
-// This implies that the Payload() func above has been previously called.
-// NOT exported but used by azcore.
-func PayloadDownloaded(resp *http.Response) bool {
- _, ok := resp.Body.(*nopClosingBytesReader)
- return ok
-}
-
-// nopClosingBytesReader is an io.ReadSeekCloser around a byte slice.
-// It also provides direct access to the byte slice to avoid rereading.
-type nopClosingBytesReader struct {
- s []byte
- i int64
-}
-
-// Bytes returns the underlying byte slice.
-func (r *nopClosingBytesReader) Bytes() []byte {
- return r.s
-}
-
-// Close implements the io.Closer interface.
-func (*nopClosingBytesReader) Close() error {
- return nil
-}
-
-// Read implements the io.Reader interface.
-func (r *nopClosingBytesReader) Read(b []byte) (n int, err error) {
- if r.i >= int64(len(r.s)) {
- return 0, io.EOF
- }
- n = copy(b, r.s[r.i:])
- r.i += int64(n)
- return
-}
-
-// Set replaces the existing byte slice with the specified byte slice and resets the reader.
-func (r *nopClosingBytesReader) Set(b []byte) {
- r.s = b
- r.i = 0
-}
-
-// Seek implements the io.Seeker interface.
-func (r *nopClosingBytesReader) Seek(offset int64, whence int) (int64, error) {
- var i int64
- switch whence {
- case io.SeekStart:
- i = offset
- case io.SeekCurrent:
- i = r.i + offset
- case io.SeekEnd:
- i = int64(len(r.s)) + offset
- default:
- return 0, errors.New("nopClosingBytesReader: invalid whence")
- }
- if i < 0 {
- return 0, errors.New("nopClosingBytesReader: negative position")
- }
- r.i = i
- return i, nil
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/doc.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/doc.go
deleted file mode 100644
index d7876d297ae94fde49d0021c89e0e9ac1badaa57..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package log
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/log.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/log.go
deleted file mode 100644
index 4f1dcf1b78a66d656d2b8d5d8fdbb926c2df5cee..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/log/log.go
+++ /dev/null
@@ -1,104 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package log
-
-import (
- "fmt"
- "os"
- "time"
-)
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// NOTE: The following are exported as public surface area from azcore. DO NOT MODIFY
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Event is used to group entries. Each group can be toggled on or off.
-type Event string
-
-// SetEvents is used to control which events are written to
-// the log. By default all log events are writen.
-func SetEvents(cls ...Event) {
- log.cls = cls
-}
-
-// SetListener will set the Logger to write to the specified listener.
-func SetListener(lst func(Event, string)) {
- log.lst = lst
-}
-
-///////////////////////////////////////////////////////////////////////////////////////////////////
-// END PUBLIC SURFACE AREA
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-// Should returns true if the specified log event should be written to the log.
-// By default all log events will be logged. Call SetEvents() to limit
-// the log events for logging.
-// If no listener has been set this will return false.
-// Calling this method is useful when the message to log is computationally expensive
-// and you want to avoid the overhead if its log event is not enabled.
-func Should(cls Event) bool {
- if log.lst == nil {
- return false
- }
- if log.cls == nil || len(log.cls) == 0 {
- return true
- }
- for _, c := range log.cls {
- if c == cls {
- return true
- }
- }
- return false
-}
-
-// Write invokes the underlying listener with the specified event and message.
-// If the event shouldn't be logged or there is no listener then Write does nothing.
-func Write(cls Event, message string) {
- if !Should(cls) {
- return
- }
- log.lst(cls, message)
-}
-
-// Writef invokes the underlying listener with the specified event and formatted message.
-// If the event shouldn't be logged or there is no listener then Writef does nothing.
-func Writef(cls Event, format string, a ...interface{}) {
- if !Should(cls) {
- return
- }
- log.lst(cls, fmt.Sprintf(format, a...))
-}
-
-// TestResetEvents is used for TESTING PURPOSES ONLY.
-func TestResetEvents() {
- log.cls = nil
-}
-
-// logger controls which events to log and writing to the underlying log.
-type logger struct {
- cls []Event
- lst func(Event, string)
-}
-
-// the process-wide logger
-var log logger
-
-func init() {
- initLogging()
-}
-
-// split out for testing purposes
-func initLogging() {
- if cls := os.Getenv("AZURE_SDK_GO_LOGGING"); cls == "all" {
- // cls could be enhanced to support a comma-delimited list of log events
- log.lst = func(cls Event, msg string) {
- // simple console logger, it writes to stderr in the following format:
- // [time-stamp] Event: message
- fmt.Fprintf(os.Stderr, "[%s] %s: %s\n", time.Now().Format(time.StampMicro), cls, msg)
- }
- }
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/poller/util.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/poller/util.go
deleted file mode 100644
index db8269627d395788674d87964a48758cfe38fba1..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/poller/util.go
+++ /dev/null
@@ -1,155 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package poller
-
-import (
- "encoding/json"
- "errors"
- "fmt"
- "net/http"
- "net/url"
- "strings"
-
- "github.com/Azure/azure-sdk-for-go/sdk/internal/exported"
-)
-
-// the well-known set of LRO status/provisioning state values.
-const (
- StatusSucceeded = "Succeeded"
- StatusCanceled = "Canceled"
- StatusFailed = "Failed"
- StatusInProgress = "InProgress"
-)
-
-// these are non-conformant states that we've seen in the wild.
-// we support them for back-compat.
-const (
- StatusCancelled = "Cancelled"
- StatusCompleted = "Completed"
-)
-
-// IsTerminalState returns true if the LRO's state is terminal.
-func IsTerminalState(s string) bool {
- return Failed(s) || Succeeded(s)
-}
-
-// Failed returns true if the LRO's state is terminal failure.
-func Failed(s string) bool {
- return strings.EqualFold(s, StatusFailed) || strings.EqualFold(s, StatusCanceled) || strings.EqualFold(s, StatusCancelled)
-}
-
-// Succeeded returns true if the LRO's state is terminal success.
-func Succeeded(s string) bool {
- return strings.EqualFold(s, StatusSucceeded) || strings.EqualFold(s, StatusCompleted)
-}
-
-// returns true if the LRO response contains a valid HTTP status code
-func StatusCodeValid(resp *http.Response) bool {
- return exported.HasStatusCode(resp, http.StatusOK, http.StatusAccepted, http.StatusCreated, http.StatusNoContent)
-}
-
-// IsValidURL verifies that the URL is valid and absolute.
-func IsValidURL(s string) bool {
- u, err := url.Parse(s)
- return err == nil && u.IsAbs()
-}
-
-// ErrNoBody is returned if the response didn't contain a body.
-var ErrNoBody = errors.New("the response did not contain a body")
-
-// GetJSON reads the response body into a raw JSON object.
-// It returns ErrNoBody if there was no content.
-func GetJSON(resp *http.Response) (map[string]any, error) {
- body, err := exported.Payload(resp, nil)
- if err != nil {
- return nil, err
- }
- if len(body) == 0 {
- return nil, ErrNoBody
- }
- // unmarshall the body to get the value
- var jsonBody map[string]any
- if err = json.Unmarshal(body, &jsonBody); err != nil {
- return nil, err
- }
- return jsonBody, nil
-}
-
-// provisioningState returns the provisioning state from the response or the empty string.
-func provisioningState(jsonBody map[string]any) string {
- jsonProps, ok := jsonBody["properties"]
- if !ok {
- return ""
- }
- props, ok := jsonProps.(map[string]any)
- if !ok {
- return ""
- }
- rawPs, ok := props["provisioningState"]
- if !ok {
- return ""
- }
- ps, ok := rawPs.(string)
- if !ok {
- return ""
- }
- return ps
-}
-
-// status returns the status from the response or the empty string.
-func status(jsonBody map[string]any) string {
- rawStatus, ok := jsonBody["status"]
- if !ok {
- return ""
- }
- status, ok := rawStatus.(string)
- if !ok {
- return ""
- }
- return status
-}
-
-// GetStatus returns the LRO's status from the response body.
-// Typically used for Azure-AsyncOperation flows.
-// If there is no status in the response body the empty string is returned.
-func GetStatus(resp *http.Response) (string, error) {
- jsonBody, err := GetJSON(resp)
- if err != nil {
- return "", err
- }
- return status(jsonBody), nil
-}
-
-// GetProvisioningState returns the LRO's state from the response body.
-// If there is no state in the response body the empty string is returned.
-func GetProvisioningState(resp *http.Response) (string, error) {
- jsonBody, err := GetJSON(resp)
- if err != nil {
- return "", err
- }
- return provisioningState(jsonBody), nil
-}
-
-// GetResourceLocation returns the LRO's resourceLocation value from the response body.
-// Typically used for Operation-Location flows.
-// If there is no resourceLocation in the response body the empty string is returned.
-func GetResourceLocation(resp *http.Response) (string, error) {
- jsonBody, err := GetJSON(resp)
- if err != nil {
- return "", err
- }
- v, ok := jsonBody["resourceLocation"]
- if !ok {
- // it might be ok if the field doesn't exist, the caller must make that determination
- return "", nil
- }
- vv, ok := v.(string)
- if !ok {
- return "", fmt.Errorf("the resourceLocation value %v was not in string format", v)
- }
- return vv, nil
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/temporal/resource.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/temporal/resource.go
deleted file mode 100644
index 238ef42ed03a169c629c1c73169aab872aa2a9cb..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/temporal/resource.go
+++ /dev/null
@@ -1,123 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package temporal
-
-import (
- "sync"
- "time"
-)
-
-// AcquireResource abstracts a method for refreshing a temporal resource.
-type AcquireResource[TResource, TState any] func(state TState) (newResource TResource, newExpiration time.Time, err error)
-
-// Resource is a temporal resource (usually a credential) that requires periodic refreshing.
-type Resource[TResource, TState any] struct {
- // cond is used to synchronize access to the shared resource embodied by the remaining fields
- cond *sync.Cond
-
- // acquiring indicates that some thread/goroutine is in the process of acquiring/updating the resource
- acquiring bool
-
- // resource contains the value of the shared resource
- resource TResource
-
- // expiration indicates when the shared resource expires; it is 0 if the resource was never acquired
- expiration time.Time
-
- // lastAttempt indicates when a thread/goroutine last attempted to acquire/update the resource
- lastAttempt time.Time
-
- // acquireResource is the callback function that actually acquires the resource
- acquireResource AcquireResource[TResource, TState]
-}
-
-// NewResource creates a new Resource that uses the specified AcquireResource for refreshing.
-func NewResource[TResource, TState any](ar AcquireResource[TResource, TState]) *Resource[TResource, TState] {
- return &Resource[TResource, TState]{cond: sync.NewCond(&sync.Mutex{}), acquireResource: ar}
-}
-
-// Get returns the underlying resource.
-// If the resource is fresh, no refresh is performed.
-func (er *Resource[TResource, TState]) Get(state TState) (TResource, error) {
- // If the resource is expiring within this time window, update it eagerly.
- // This allows other threads/goroutines to keep running by using the not-yet-expired
- // resource value while one thread/goroutine updates the resource.
- const window = 5 * time.Minute // This example updates the resource 5 minutes prior to expiration
- const backoff = 30 * time.Second // Minimum wait time between eager update attempts
-
- now, acquire, expired := time.Now(), false, false
-
- // acquire exclusive lock
- er.cond.L.Lock()
- resource := er.resource
-
- for {
- expired = er.expiration.IsZero() || er.expiration.Before(now)
- if expired {
- // The resource was never acquired or has expired
- if !er.acquiring {
- // If another thread/goroutine is not acquiring/updating the resource, this thread/goroutine will do it
- er.acquiring, acquire = true, true
- break
- }
- // Getting here means that this thread/goroutine will wait for the updated resource
- } else if er.expiration.Add(-window).Before(now) {
- // The resource is valid but is expiring within the time window
- if !er.acquiring && er.lastAttempt.Add(backoff).Before(now) {
- // If another thread/goroutine is not acquiring/renewing the resource, and none has attempted
- // to do so within the last 30 seconds, this thread/goroutine will do it
- er.acquiring, acquire = true, true
- break
- }
- // This thread/goroutine will use the existing resource value while another updates it
- resource = er.resource
- break
- } else {
- // The resource is not close to expiring, this thread/goroutine should use its current value
- resource = er.resource
- break
- }
- // If we get here, wait for the new resource value to be acquired/updated
- er.cond.Wait()
- }
- er.cond.L.Unlock() // Release the lock so no threads/goroutines are blocked
-
- var err error
- if acquire {
- // This thread/goroutine has been selected to acquire/update the resource
- var expiration time.Time
- var newValue TResource
- er.lastAttempt = now
- newValue, expiration, err = er.acquireResource(state)
-
- // Atomically, update the shared resource's new value & expiration.
- er.cond.L.Lock()
- if err == nil {
- // Update resource & expiration, return the new value
- resource = newValue
- er.resource, er.expiration = resource, expiration
- } else if !expired {
- // An eager update failed. Discard the error and return the current--still valid--resource value
- err = nil
- }
- er.acquiring = false // Indicate that no thread/goroutine is currently acquiring the resource
-
- // Wake up any waiting threads/goroutines since there is a resource they can ALL use
- er.cond.L.Unlock()
- er.cond.Broadcast()
- }
- return resource, err // Return the resource this thread/goroutine can use
-}
-
-// Expire marks the resource as expired, ensuring it's refreshed on the next call to Get().
-func (er *Resource[TResource, TState]) Expire() {
- er.cond.L.Lock()
- defer er.cond.L.Unlock()
-
- // Reset the expiration as if we never got this resource to begin with
- er.expiration = time.Time{}
-}
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/doc.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/doc.go
deleted file mode 100644
index a3824bee8b5ba588bce2ae31a0a8af63e130517a..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package uuid
diff --git a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/uuid.go b/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/uuid.go
deleted file mode 100644
index 278ac9cd1c2c82a6a7a286a8dd5fbc3e03f720af..0000000000000000000000000000000000000000
--- a/vendor/github.com/Azure/azure-sdk-for-go/sdk/internal/uuid/uuid.go
+++ /dev/null
@@ -1,76 +0,0 @@
-//go:build go1.18
-// +build go1.18
-
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License.
-
-package uuid
-
-import (
- "crypto/rand"
- "errors"
- "fmt"
- "strconv"
-)
-
-// The UUID reserved variants.
-const (
- reservedRFC4122 byte = 0x40
-)
-
-// A UUID representation compliant with specification in RFC4122 document.
-type UUID [16]byte
-
-// New returns a new UUID using the RFC4122 algorithm.
-func New() (UUID, error) {
- u := UUID{}
- // Set all bits to pseudo-random values.
- // NOTE: this takes a process-wide lock
- _, err := rand.Read(u[:])
- if err != nil {
- return u, err
- }
- u[8] = (u[8] | reservedRFC4122) & 0x7F // u.setVariant(ReservedRFC4122)
-
- var version byte = 4
- u[6] = (u[6] & 0xF) | (version << 4) // u.setVersion(4)
- return u, nil
-}
-
-// String returns the UUID in "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" format.
-func (u UUID) String() string {
- return fmt.Sprintf("%x-%x-%x-%x-%x", u[0:4], u[4:6], u[6:8], u[8:10], u[10:])
-}
-
-// Parse parses a string formatted as "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
-// or "{xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}" into a UUID.
-func Parse(s string) (UUID, error) {
- var uuid UUID
- // ensure format
- switch len(s) {
- case 36:
- // xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
- case 38:
- // {xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx}
- s = s[1:37]
- default:
- return uuid, errors.New("invalid UUID format")
- }
- if s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-' {
- return uuid, errors.New("invalid UUID format")
- }
- // parse chunks
- for i, x := range [16]int{
- 0, 2, 4, 6,
- 9, 11,
- 14, 16,
- 19, 21,
- 24, 26, 28, 30, 32, 34} {
- b, err := strconv.ParseUint(s[x:x+2], 16, 8)
- if err != nil {
- return uuid, fmt.Errorf("invalid UUID format: %s", err)
- }
- uuid[i] = byte(b)
- }
- return uuid, nil
-}
diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/LICENSE b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/LICENSE
deleted file mode 100644
index 3d8b93bc7987d14c848448c089e2ae15311380d7..0000000000000000000000000000000000000000
--- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
- MIT License
-
- Copyright (c) Microsoft Corporation.
-
- Permission is hereby granted, free of charge, to any person obtaining a copy
- of this software and associated documentation files (the "Software"), to deal
- in the Software without restriction, including without limitation the rights
- to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
-
- The above copyright notice and this permission notice shall be included in all
- copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- SOFTWARE
diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/cache/cache.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/cache/cache.go
deleted file mode 100644
index 19210883bac25aca786b0e79be10fe55a7e38a2a..0000000000000000000000000000000000000000
--- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/cache/cache.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-/*
-Package cache allows third parties to implement external storage for caching token data
-for distributed systems or multiple local applications access.
-
-The data stored and extracted will represent the entire cache. Therefore it is recommended
-one msal instance per user. This data is considered opaque and there are no guarantees to
-implementers on the format being passed.
-*/
-package cache
-
-import "context"
-
-// Marshaler marshals data from an internal cache to bytes that can be stored.
-type Marshaler interface {
- Marshal() ([]byte, error)
-}
-
-// Unmarshaler unmarshals data from a storage medium into the internal cache, overwriting it.
-type Unmarshaler interface {
- Unmarshal([]byte) error
-}
-
-// Serializer can serialize the cache to binary or from binary into the cache.
-type Serializer interface {
- Marshaler
- Unmarshaler
-}
-
-// ExportHints are suggestions for storing data.
-type ExportHints struct {
- // PartitionKey is a suggested key for partitioning the cache
- PartitionKey string
-}
-
-// ReplaceHints are suggestions for loading data.
-type ReplaceHints struct {
- // PartitionKey is a suggested key for partitioning the cache
- PartitionKey string
-}
-
-// ExportReplace exports and replaces in-memory cache data. It doesn't support nil Context or
-// define the outcome of passing one. A Context without a timeout must receive a default timeout
-// specified by the implementor. Retries must be implemented inside the implementation.
-type ExportReplace interface {
- // Replace replaces the cache with what is in external storage. Implementors should honor
- // Context cancellations and return context.Canceled or context.DeadlineExceeded in those cases.
- Replace(ctx context.Context, cache Unmarshaler, hints ReplaceHints) error
- // Export writes the binary representation of the cache (cache.Marshal()) to external storage.
- // This is considered opaque. Context cancellations should be honored as in Replace.
- Export(ctx context.Context, cache Marshaler, hints ExportHints) error
-}
diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential/confidential.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential/confidential.go
deleted file mode 100644
index f86286051defdef2018ebf1937aeda605a72ec31..0000000000000000000000000000000000000000
--- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential/confidential.go
+++ /dev/null
@@ -1,719 +0,0 @@
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-
-/*
-Package confidential provides a client for authentication of "confidential" applications.
-A "confidential" application is defined as an app that run on servers. They are considered
-difficult to access and for that reason capable of keeping an application secret.
-Confidential clients can hold configuration-time secrets.
-*/
-package confidential
-
-import (
- "context"
- "crypto"
- "crypto/rsa"
- "crypto/x509"
- "encoding/base64"
- "encoding/pem"
- "errors"
- "fmt"
-
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/cache"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/exported"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/options"
- "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared"
-)
-
-/*
-Design note:
-
-confidential.Client uses base.Client as an embedded type. base.Client statically assigns its attributes
-during creation. As it doesn't have any pointers in it, anything borrowed from it, such as
-Base.AuthParams is a copy that is free to be manipulated here.
-
-Duplicate Calls shared between public.Client and this package:
-There is some duplicate call options provided here that are the same as in public.Client . This
-is a design choices. Go proverb(https://www.youtube.com/watch?v=PAAkCSZUG1c&t=9m28s):
-"a little copying is better than a little dependency". Yes, we could have another package with
-shared options (fail). That divides like 2 options from all others which makes the user look
-through more docs. We can have all clients in one package, but I think separate packages
-here makes for better naming (public.Client vs client.PublicClient). So I chose a little
-duplication.
-
-.Net People, Take note on X509:
-This uses x509.Certificates and private keys. x509 does not store private keys. .Net
-has a x509.Certificate2 abstraction that has private keys, but that just a strange invention.
-As such I've put a PEM decoder into here.
-*/
-
-// TODO(msal): This should have example code for each method on client using Go's example doc framework.
-// base usage details should be include in the package documentation.
-
-// AuthResult contains the results of one token acquisition operation.
-// For details see https://aka.ms/msal-net-authenticationresult
-type AuthResult = base.AuthResult
-
-type AuthenticationScheme = authority.AuthenticationScheme
-
-type Account = shared.Account
-
-// CertFromPEM converts a PEM file (.pem or .key) for use with [NewCredFromCert]. The file
-// must contain the public certificate and the private key. If a PEM block is encrypted and
-// password is not an empty string, it attempts to decrypt the PEM blocks using the password.
-// Multiple certs are due to certificate chaining for use cases like TLS that sign from root to leaf.
-func CertFromPEM(pemData []byte, password string) ([]*x509.Certificate, crypto.PrivateKey, error) {
- var certs []*x509.Certificate
- var priv crypto.PrivateKey
- for {
- block, rest := pem.Decode(pemData)
- if block == nil {
- break
- }
-
- //nolint:staticcheck // x509.IsEncryptedPEMBlock and x509.DecryptPEMBlock are deprecated. They are used here only to support a usecase.
- if x509.IsEncryptedPEMBlock(block) {
- b, err := x509.DecryptPEMBlock(block, []byte(password))
- if err != nil {
- return nil, nil, fmt.Errorf("could not decrypt encrypted PEM block: %v", err)
- }
- block, _ = pem.Decode(b)
- if block == nil {
- return nil, nil, fmt.Errorf("encounter encrypted PEM block that did not decode")
- }
- }
-
- switch block.Type {
- case "CERTIFICATE":
- cert, err := x509.ParseCertificate(block.Bytes)
- if err != nil {
- return nil, nil, fmt.Errorf("block labelled 'CERTIFICATE' could not be parsed by x509: %v", err)
- }
- certs = append(certs, cert)
- case "PRIVATE KEY":
- if priv != nil {
- return nil, nil, errors.New("found multiple private key blocks")
- }
-
- var err error
- priv, err = x509.ParsePKCS8PrivateKey(block.Bytes)
- if err != nil {
- return nil, nil, fmt.Errorf("could not decode private key: %v", err)
- }
- case "RSA PRIVATE KEY":
- if priv != nil {
- return nil, nil, errors.New("found multiple private key blocks")
- }
- var err error
- priv, err = x509.ParsePKCS1PrivateKey(block.Bytes)
- if err != nil {
- return nil, nil, fmt.Errorf("could not decode private key: %v", err)
- }
- }
- pemData = rest
- }
-
- if len(certs) == 0 {
- return nil, nil, fmt.Errorf("no certificates found")
- }
-
- if priv == nil {
- return nil, nil, fmt.Errorf("no private key found")
- }
-
- return certs, priv, nil
-}
-
-// AssertionRequestOptions has required information for client assertion claims
-type AssertionRequestOptions = exported.AssertionRequestOptions
-
-// Credential represents the credential used in confidential client flows.
-type Credential struct {
- secret string
-
- cert *x509.Certificate
- key crypto.PrivateKey
- x5c []string
-
- assertionCallback func(context.Context, AssertionRequestOptions) (string, error)
-
- tokenProvider func(context.Context, TokenProviderParameters) (TokenProviderResult, error)
-}
-
-// toInternal returns the accesstokens.Credential that is used internally. The current structure of the
-// code requires that client.go, requests.go and confidential.go share a credential type without
-// having import recursion. That requires the type used between is in a shared package. Therefore
-// we have this.
-func (c Credential) toInternal() (*accesstokens.Credential, error) {
- if c.secret != "" {
- return &accesstokens.Credential{Secret: c.secret}, nil
- }
- if c.cert != nil {
- if c.key == nil {
- return nil, errors.New("missing private key for certificate")
- }
- return &accesstokens.Credential{Cert: c.cert, Key: c.key, X5c: c.x5c}, nil
- }
- if c.key != nil {
- return nil, errors.New("missing certificate for private key")
- }
- if c.assertionCallback != nil {
- return &accesstokens.Credential{AssertionCallback: c.assertionCallback}, nil
- }
- if c.tokenProvider != nil {
- return &accesstokens.Credential{TokenProvider: c.tokenProvider}, nil
- }
- return nil, errors.New("invalid credential")
-}
-
-// NewCredFromSecret creates a Credential from a secret.
-func NewCredFromSecret(secret string) (Credential, error) {
- if secret == "" {
- return Credential{}, errors.New("secret can't be empty string")
- }
- return Credential{secret: secret}, nil
-}
-
-// NewCredFromAssertionCallback creates a Credential that invokes a callback to get assertions
-// authenticating the application. The callback must be thread safe.
-func NewCredFromAssertionCallback(callback func(context.Context, AssertionRequestOptions) (string, error)) Credential {
- return Credential{assertionCallback: callback}
-}
-
-// NewCredFromCert creates a Credential from a certificate or chain of certificates and an RSA private key
-// as returned by [CertFromPEM].
-func NewCredFromCert(certs []*x509.Certificate, key crypto.PrivateKey) (Credential, error) {
- cred := Credential{key: key}
- k, ok := key.(*rsa.PrivateKey)
- if !ok {
- return cred, errors.New("key must be an RSA key")
- }
- for _, cert := range certs {
- if cert == nil {
- // not returning an error here because certs may still contain a sufficient cert/key pair
- continue
- }
- certKey, ok := cert.PublicKey.(*rsa.PublicKey)
- if ok && k.E == certKey.E && k.N.Cmp(certKey.N) == 0 {
- // We know this is the signing cert because its public key matches the given private key.
- // This cert must be first in x5c.
- cred.cert = cert
- cred.x5c = append([]string{base64.StdEncoding.EncodeToString(cert.Raw)}, cred.x5c...)
- } else {
- cred.x5c = append(cred.x5c, base64.StdEncoding.EncodeToString(cert.Raw))
- }
- }
- if cred.cert == nil {
- return cred, errors.New("key doesn't match any certificate")
- }
- return cred, nil
-}
-
-// TokenProviderParameters is the authentication parameters passed to token providers
-type TokenProviderParameters = exported.TokenProviderParameters
-
-// TokenProviderResult is the authentication result returned by custom token providers
-type TokenProviderResult = exported.TokenProviderResult
-
-// NewCredFromTokenProvider creates a Credential from a function that provides access tokens. The function
-// must be concurrency safe. This is intended only to allow the Azure SDK to cache MSI tokens. It isn't
-// useful to applications in general because the token provider must implement all authentication logic.
-func NewCredFromTokenProvider(provider func(context.Context, TokenProviderParameters) (TokenProviderResult, error)) Credential {
- return Credential{tokenProvider: provider}
-}
-
-// AutoDetectRegion instructs MSAL Go to auto detect region for Azure regional token service.
-func AutoDetectRegion() string {
- return "TryAutoDetect"
-}
-
-// Client is a representation of authentication client for confidential applications as defined in the
-// package doc. A new Client should be created PER SERVICE USER.
-// For more information, visit https://docs.microsoft.com/azure/active-directory/develop/msal-client-applications
-type Client struct {
- base base.Client
- cred *accesstokens.Credential
-}
-
-// clientOptions are optional settings for New(). These options are set using various functions
-// returning Option calls.
-type clientOptions struct {
- accessor cache.ExportReplace
- authority, azureRegion string
- capabilities []string
- disableInstanceDiscovery, sendX5C bool
- httpClient ops.HTTPClient
-}
-
-// Option is an optional argument to New().
-type Option func(o *clientOptions)
-
-// WithCache provides an accessor that will read and write authentication data to an externally managed cache.
-func WithCache(accessor cache.ExportReplace) Option {
- return func(o *clientOptions) {
- o.accessor = accessor
- }
-}
-
-// WithClientCapabilities allows configuring one or more client capabilities such as "CP1"
-func WithClientCapabilities(capabilities []string) Option {
- return func(o *clientOptions) {
- // there's no danger of sharing the slice's underlying memory with the application because
- // this slice is simply passed to base.WithClientCapabilities, which copies its data
- o.capabilities = capabilities
- }
-}
-
-// WithHTTPClient allows for a custom HTTP client to be set.
-func WithHTTPClient(httpClient ops.HTTPClient) Option {
- return func(o *clientOptions) {
- o.httpClient = httpClient
- }
-}
-
-// WithX5C specifies if x5c claim(public key of the certificate) should be sent to STS to enable Subject Name Issuer Authentication.
-func WithX5C() Option {
- return func(o *clientOptions) {
- o.sendX5C = true
- }
-}
-
-// WithInstanceDiscovery set to false to disable authority validation (to support private cloud scenarios)
-func WithInstanceDiscovery(enabled bool) Option {
- return func(o *clientOptions) {
- o.disableInstanceDiscovery = !enabled
- }
-}
-
-// WithAzureRegion sets the region(preferred) or Confidential.AutoDetectRegion() for auto detecting region.
-// Region names as per https://azure.microsoft.com/en-ca/global-infrastructure/geographies/.
-// See https://aka.ms/region-map for more details on region names.
-// The region value should be short region name for the region where the service is deployed.
-// For example "centralus" is short name for region Central US.
-// Not all auth flows can use the regional token service.
-// Service To Service (client credential flow) tokens can be obtained from the regional service.
-// Requires configuration at the tenant level.
-// Auto-detection works on a limited number of Azure artifacts (VMs, Azure functions).
-// If auto-detection fails, the non-regional endpoint will be used.
-// If an invalid region name is provided, the non-regional endpoint MIGHT be used or the token request MIGHT fail.
-func WithAzureRegion(val string) Option {
- return func(o *clientOptions) {
- o.azureRegion = val
- }
-}
-
-// New is the constructor for Client. authority is the URL of a token authority such as "https://login.microsoftonline.com/
". -// If the Client will connect directly to AD FS, use "adfs" for the tenant. clientID is the application's client ID (also called its -// "application ID"). -func New(authority, clientID string, cred Credential, options ...Option) (Client, error) { - internalCred, err := cred.toInternal() - if err != nil { - return Client{}, err - } - - opts := clientOptions{ - authority: authority, - // if the caller specified a token provider, it will handle all details of authentication, using Client only as a token cache - disableInstanceDiscovery: cred.tokenProvider != nil, - httpClient: shared.DefaultClient, - } - for _, o := range options { - o(&opts) - } - baseOpts := []base.Option{ - base.WithCacheAccessor(opts.accessor), - base.WithClientCapabilities(opts.capabilities), - base.WithInstanceDiscovery(!opts.disableInstanceDiscovery), - base.WithRegionDetection(opts.azureRegion), - base.WithX5C(opts.sendX5C), - } - base, err := base.New(clientID, opts.authority, oauth.New(opts.httpClient), baseOpts...) - if err != nil { - return Client{}, err - } - base.AuthParams.IsConfidentialClient = true - - return Client{base: base, cred: internalCred}, nil -} - -// authCodeURLOptions contains options for AuthCodeURL -type authCodeURLOptions struct { - claims, loginHint, tenantID, domainHint string -} - -// AuthCodeURLOption is implemented by options for AuthCodeURL -type AuthCodeURLOption interface { - authCodeURLOption() -} - -// AuthCodeURL creates a URL used to acquire an authorization code. Users need to call CreateAuthorizationCodeURLParameters and pass it in. -// -// Options: [WithClaims], [WithDomainHint], [WithLoginHint], [WithTenantID] -func (cca Client) AuthCodeURL(ctx context.Context, clientID, redirectURI string, scopes []string, opts ...AuthCodeURLOption) (string, error) { - o := authCodeURLOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return "", err - } - ap, err := cca.base.AuthParams.WithTenant(o.tenantID) - if err != nil { - return "", err - } - ap.Claims = o.claims - ap.LoginHint = o.loginHint - ap.DomainHint = o.domainHint - return cca.base.AuthCodeURL(ctx, clientID, redirectURI, scopes, ap) -} - -// WithLoginHint pre-populates the login prompt with a username. -func WithLoginHint(username string) interface { - AuthCodeURLOption - options.CallOption -} { - return struct { - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *authCodeURLOptions: - t.loginHint = username - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithDomainHint adds the IdP domain as domain_hint query parameter in the auth url. -func WithDomainHint(domain string) interface { - AuthCodeURLOption - options.CallOption -} { - return struct { - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *authCodeURLOptions: - t.domainHint = domain - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithClaims sets additional claims to request for the token, such as those required by conditional access policies. -// Use this option when Azure AD returned a claims challenge for a prior request. The argument must be decoded. -// This option is valid for any token acquisition method. -func WithClaims(claims string) interface { - AcquireByAuthCodeOption - AcquireByCredentialOption - AcquireOnBehalfOfOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption -} { - return struct { - AcquireByAuthCodeOption - AcquireByCredentialOption - AcquireOnBehalfOfOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenByAuthCodeOptions: - t.claims = claims - case *acquireTokenByCredentialOptions: - t.claims = claims - case *acquireTokenOnBehalfOfOptions: - t.claims = claims - case *acquireTokenSilentOptions: - t.claims = claims - case *authCodeURLOptions: - t.claims = claims - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithAuthenticationScheme is an extensibility mechanism designed to be used only by Azure Arc for proof of possession access tokens. -func WithAuthenticationScheme(authnScheme AuthenticationScheme) interface { - AcquireSilentOption - AcquireByCredentialOption - options.CallOption -} { - return struct { - AcquireSilentOption - AcquireByCredentialOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenSilentOptions: - t.authnScheme = authnScheme - case *acquireTokenByCredentialOptions: - t.authnScheme = authnScheme - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithTenantID specifies a tenant for a single authentication. It may be different than the tenant set in [New]. -// This option is valid for any token acquisition method. -func WithTenantID(tenantID string) interface { - AcquireByAuthCodeOption - AcquireByCredentialOption - AcquireOnBehalfOfOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption -} { - return struct { - AcquireByAuthCodeOption - AcquireByCredentialOption - AcquireOnBehalfOfOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenByAuthCodeOptions: - t.tenantID = tenantID - case *acquireTokenByCredentialOptions: - t.tenantID = tenantID - case *acquireTokenOnBehalfOfOptions: - t.tenantID = tenantID - case *acquireTokenSilentOptions: - t.tenantID = tenantID - case *authCodeURLOptions: - t.tenantID = tenantID - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// acquireTokenSilentOptions are all the optional settings to an AcquireTokenSilent() call. -// These are set by using various AcquireTokenSilentOption functions. -type acquireTokenSilentOptions struct { - account Account - claims, tenantID string - authnScheme AuthenticationScheme -} - -// AcquireSilentOption is implemented by options for AcquireTokenSilent -type AcquireSilentOption interface { - acquireSilentOption() -} - -// WithSilentAccount uses the passed account during an AcquireTokenSilent() call. -func WithSilentAccount(account Account) interface { - AcquireSilentOption - options.CallOption -} { - return struct { - AcquireSilentOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenSilentOptions: - t.account = account - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// AcquireTokenSilent acquires a token from either the cache or using a refresh token. -// -// Options: [WithClaims], [WithSilentAccount], [WithTenantID] -func (cca Client) AcquireTokenSilent(ctx context.Context, scopes []string, opts ...AcquireSilentOption) (AuthResult, error) { - o := acquireTokenSilentOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return AuthResult{}, err - } - - if o.claims != "" { - return AuthResult{}, errors.New("call another AcquireToken method to request a new token having these claims") - } - - silentParameters := base.AcquireTokenSilentParameters{ - Scopes: scopes, - Account: o.account, - RequestType: accesstokens.ATConfidential, - Credential: cca.cred, - IsAppCache: o.account.IsZero(), - TenantID: o.tenantID, - AuthnScheme: o.authnScheme, - } - - return cca.base.AcquireTokenSilent(ctx, silentParameters) -} - -// acquireTokenByAuthCodeOptions contains the optional parameters used to acquire an access token using the authorization code flow. -type acquireTokenByAuthCodeOptions struct { - challenge, claims, tenantID string -} - -// AcquireByAuthCodeOption is implemented by options for AcquireTokenByAuthCode -type AcquireByAuthCodeOption interface { - acquireByAuthCodeOption() -} - -// WithChallenge allows you to provide a challenge for the .AcquireTokenByAuthCode() call. -func WithChallenge(challenge string) interface { - AcquireByAuthCodeOption - options.CallOption -} { - return struct { - AcquireByAuthCodeOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenByAuthCodeOptions: - t.challenge = challenge - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// AcquireTokenByAuthCode is a request to acquire a security token from the authority, using an authorization code. -// The specified redirect URI must be the same URI that was used when the authorization code was requested. -// -// Options: [WithChallenge], [WithClaims], [WithTenantID] -func (cca Client) AcquireTokenByAuthCode(ctx context.Context, code string, redirectURI string, scopes []string, opts ...AcquireByAuthCodeOption) (AuthResult, error) { - o := acquireTokenByAuthCodeOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return AuthResult{}, err - } - - params := base.AcquireTokenAuthCodeParameters{ - Scopes: scopes, - Code: code, - Challenge: o.challenge, - Claims: o.claims, - AppType: accesstokens.ATConfidential, - Credential: cca.cred, // This setting differs from public.Client.AcquireTokenByAuthCode - RedirectURI: redirectURI, - TenantID: o.tenantID, - } - - return cca.base.AcquireTokenByAuthCode(ctx, params) -} - -// acquireTokenByCredentialOptions contains optional configuration for AcquireTokenByCredential -type acquireTokenByCredentialOptions struct { - claims, tenantID string - authnScheme AuthenticationScheme -} - -// AcquireByCredentialOption is implemented by options for AcquireTokenByCredential -type AcquireByCredentialOption interface { - acquireByCredOption() -} - -// AcquireTokenByCredential acquires a security token from the authority, using the client credentials grant. -// -// Options: [WithClaims], [WithTenantID] -func (cca Client) AcquireTokenByCredential(ctx context.Context, scopes []string, opts ...AcquireByCredentialOption) (AuthResult, error) { - o := acquireTokenByCredentialOptions{} - err := options.ApplyOptions(&o, opts) - if err != nil { - return AuthResult{}, err - } - authParams, err := cca.base.AuthParams.WithTenant(o.tenantID) - if err != nil { - return AuthResult{}, err - } - authParams.Scopes = scopes - authParams.AuthorizationType = authority.ATClientCredentials - authParams.Claims = o.claims - if o.authnScheme != nil { - authParams.AuthnScheme = o.authnScheme - } - token, err := cca.base.Token.Credential(ctx, authParams, cca.cred) - if err != nil { - return AuthResult{}, err - } - return cca.base.AuthResultFromToken(ctx, authParams, token, true) -} - -// acquireTokenOnBehalfOfOptions contains optional configuration for AcquireTokenOnBehalfOf -type acquireTokenOnBehalfOfOptions struct { - claims, tenantID string -} - -// AcquireOnBehalfOfOption is implemented by options for AcquireTokenOnBehalfOf -type AcquireOnBehalfOfOption interface { - acquireOBOOption() -} - -// AcquireTokenOnBehalfOf acquires a security token for an app using middle tier apps access token. -// Refer https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-on-behalf-of-flow. -// -// Options: [WithClaims], [WithTenantID] -func (cca Client) AcquireTokenOnBehalfOf(ctx context.Context, userAssertion string, scopes []string, opts ...AcquireOnBehalfOfOption) (AuthResult, error) { - o := acquireTokenOnBehalfOfOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return AuthResult{}, err - } - params := base.AcquireTokenOnBehalfOfParameters{ - Scopes: scopes, - UserAssertion: userAssertion, - Claims: o.claims, - Credential: cca.cred, - TenantID: o.tenantID, - } - return cca.base.AcquireTokenOnBehalfOf(ctx, params) -} - -// Account gets the account in the token cache with the specified homeAccountID. -func (cca Client) Account(ctx context.Context, accountID string) (Account, error) { - return cca.base.Account(ctx, accountID) -} - -// RemoveAccount signs the account out and forgets account from token cache. -func (cca Client) RemoveAccount(ctx context.Context, account Account) error { - return cca.base.RemoveAccount(ctx, account) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors/error_design.md b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors/error_design.md deleted file mode 100644 index 7ef7862fe53c70f0055a0c783b93afca04b74a66..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors/error_design.md +++ /dev/null @@ -1,111 +0,0 @@ -# MSAL Error Design - -Author: Abhidnya Patil(abhidnya.patil@microsoft.com) - -Contributors: - -- John Doak(jdoak@microsoft.com) -- Keegan Caruso(Keegan.Caruso@microsoft.com) -- Joel Hendrix(jhendrix@microsoft.com) - -## Background - -Errors in MSAL are intended for app developers to troubleshoot and not for displaying to end-users. - -### Go error handling vs other MSAL languages - -Most modern languages use exception based errors. Simply put, you "throw" an exception and it must be caught at some routine in the upper stack or it will eventually crash the program. - -Go doesn't use exceptions, instead it relies on multiple return values, one of which can be the builtin error interface type. It is up to the user to decide what to do. - -### Go custom error types - -Errors can be created in Go by simply using errors.New() or fmt.Errorf() to create an "error". - -Custom errors can be created in multiple ways. One of the more robust ways is simply to satisfy the error interface: - -```go -type MyCustomErr struct { - Msg string -} -func (m MyCustomErr) Error() string { // This implements "error" - return m.Msg -} -``` - -### MSAL Error Goals - -- Provide diagnostics to the user and for tickets that can be used to track down bugs or client misconfigurations -- Detect errors that are transitory and can be retried -- Allow the user to identify certain errors that the program can respond to, such a informing the user for the need to do an enrollment - -## Implementing Client Side Errors - -Client side errors indicate a misconfiguration or passing of bad arguments that is non-recoverable. Retrying isn't possible. - -These errors can simply be standard Go errors created by errors.New() or fmt.Errorf(). If down the line we need a custom error, we can introduce it, but for now the error messages just need to be clear on what the issue was. - -## Implementing Service Side Errors - -Service side errors occur when an external RPC responds either with an HTTP error code or returns a message that includes an error. - -These errors can be transitory (please slow down) or permanent (HTTP 404). To provide our diagnostic goals, we require the ability to differentiate these errors from other errors. - -The current implementation includes a specialized type that captures any error from the server: - -```go -// CallErr represents an HTTP call error. Has a Verbose() method that allows getting the -// http.Request and Response objects. Implements error. -type CallErr struct { - Req *http.Request - Resp *http.Response - Err error -} - -// Errors implements error.Error(). -func (e CallErr) Error() string { - return e.Err.Error() -} - -// Verbose prints a versbose error message with the request or response. -func (e CallErr) Verbose() string { - e.Resp.Request = nil // This brings in a bunch of TLS stuff we don't need - e.Resp.TLS = nil // Same - return fmt.Sprintf("%s:\nRequest:\n%s\nResponse:\n%s", e.Err, prettyConf.Sprint(e.Req), prettyConf.Sprint(e.Resp)) -} -``` - -A user will always receive the most concise error we provide. They can tell if it is a server side error using Go error package: - -```go -var callErr CallErr -if errors.As(err, &callErr) { - ... -} -``` - -We provide a Verbose() function that can retrieve the most verbose message from any error we provide: - -```go -fmt.Println(errors.Verbose(err)) -``` - -If further differentiation is required, we can add custom errors that use Go error wrapping on top of CallErr to achieve our diagnostic goals (such as detecting when to retry a call due to transient errors). - -CallErr is always thrown from the comm package (which handles all http requests) and looks similar to: - -```go -return nil, errors.CallErr{ - Req: req, - Resp: reply, - Err: fmt.Errorf("http call(%s)(%s) error: reply status code was %d:\n%s", req.URL.String(), req.Method, reply.StatusCode, ErrorResponse), //ErrorResponse is the json body extracted from the http response - } -``` - -## Future Decisions - -The ability to retry calls needs to have centralized responsibility. Either the user is doing it or the client is doing it. - -If the user should be responsible, our errors package will include a CanRetry() function that will inform the user if the error provided to them is retryable. This is based on the http error code and possibly the type of error that was returned. It would also include a sleep time if the server returned an amount of time to wait. - -Otherwise we will do this internally and retries will be left to us. diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors/errors.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors/errors.go deleted file mode 100644 index c9b8dbed088dc1e47b61106309e4eb324fcc8043..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors/errors.go +++ /dev/null @@ -1,89 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package errors - -import ( - "errors" - "fmt" - "io" - "net/http" - "reflect" - "strings" - - "github.com/kylelemons/godebug/pretty" -) - -var prettyConf = &pretty.Config{ - IncludeUnexported: false, - SkipZeroFields: true, - TrackCycles: true, - Formatter: map[reflect.Type]interface{}{ - reflect.TypeOf((*io.Reader)(nil)).Elem(): func(r io.Reader) string { - b, err := io.ReadAll(r) - if err != nil { - return "could not read io.Reader content" - } - return string(b) - }, - }, -} - -type verboser interface { - Verbose() string -} - -// Verbose prints the most verbose error that the error message has. -func Verbose(err error) string { - build := strings.Builder{} - for { - if err == nil { - break - } - if v, ok := err.(verboser); ok { - build.WriteString(v.Verbose()) - } else { - build.WriteString(err.Error()) - } - err = errors.Unwrap(err) - } - return build.String() -} - -// New is equivalent to errors.New(). -func New(text string) error { - return errors.New(text) -} - -// CallErr represents an HTTP call error. Has a Verbose() method that allows getting the -// http.Request and Response objects. Implements error. -type CallErr struct { - Req *http.Request - // Resp contains response body - Resp *http.Response - Err error -} - -// Errors implements error.Error(). -func (e CallErr) Error() string { - return e.Err.Error() -} - -// Verbose prints a versbose error message with the request or response. -func (e CallErr) Verbose() string { - e.Resp.Request = nil // This brings in a bunch of TLS crap we don't need - e.Resp.TLS = nil // Same - return fmt.Sprintf("%s:\nRequest:\n%s\nResponse:\n%s", e.Err, prettyConf.Sprint(e.Req), prettyConf.Sprint(e.Resp)) -} - -// Is reports whether any error in errors chain matches target. -func Is(err, target error) bool { - return errors.Is(err, target) -} - -// As finds the first error in errors chain that matches target, -// and if so, sets target to that error value and returns true. -// Otherwise, it returns false. -func As(err error, target interface{}) bool { - return errors.As(err, target) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/base.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/base.go deleted file mode 100644 index 09a0d92f5205b4bddf93d6750f1cfd8d9fc44661..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/base.go +++ /dev/null @@ -1,477 +0,0 @@ -// Package base contains a "Base" client that is used by the external public.Client and confidential.Client. -// Base holds shared attributes that must be available to both clients and methods that act as -// shared calls. -package base - -import ( - "context" - "errors" - "fmt" - "net/url" - "reflect" - "strings" - "sync" - "time" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/cache" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared" -) - -const ( - // AuthorityPublicCloud is the default AAD authority host - AuthorityPublicCloud = "https://login.microsoftonline.com/common" - scopeSeparator = " " -) - -// manager provides an internal cache. It is defined to allow faking the cache in tests. -// In production it's a *storage.Manager or *storage.PartitionedManager. -type manager interface { - cache.Serializer - Read(context.Context, authority.AuthParams) (storage.TokenResponse, error) - Write(authority.AuthParams, accesstokens.TokenResponse) (shared.Account, error) -} - -// accountManager is a manager that also caches accounts. In production it's a *storage.Manager. -type accountManager interface { - manager - AllAccounts() []shared.Account - Account(homeAccountID string) shared.Account - RemoveAccount(account shared.Account, clientID string) -} - -// AcquireTokenSilentParameters contains the parameters to acquire a token silently (from cache). -type AcquireTokenSilentParameters struct { - Scopes []string - Account shared.Account - RequestType accesstokens.AppType - Credential *accesstokens.Credential - IsAppCache bool - TenantID string - UserAssertion string - AuthorizationType authority.AuthorizeType - Claims string - AuthnScheme authority.AuthenticationScheme -} - -// AcquireTokenAuthCodeParameters contains the parameters required to acquire an access token using the auth code flow. -// To use PKCE, set the CodeChallengeParameter. -// Code challenges are used to secure authorization code grants; for more information, visit -// https://tools.ietf.org/html/rfc7636. -type AcquireTokenAuthCodeParameters struct { - Scopes []string - Code string - Challenge string - Claims string - RedirectURI string - AppType accesstokens.AppType - Credential *accesstokens.Credential - TenantID string -} - -type AcquireTokenOnBehalfOfParameters struct { - Scopes []string - Claims string - Credential *accesstokens.Credential - TenantID string - UserAssertion string -} - -// AuthResult contains the results of one token acquisition operation in PublicClientApplication -// or ConfidentialClientApplication. For details see https://aka.ms/msal-net-authenticationresult -type AuthResult struct { - Account shared.Account - IDToken accesstokens.IDToken - AccessToken string - ExpiresOn time.Time - GrantedScopes []string - DeclinedScopes []string -} - -// AuthResultFromStorage creates an AuthResult from a storage token response (which is generated from the cache). -func AuthResultFromStorage(storageTokenResponse storage.TokenResponse) (AuthResult, error) { - if err := storageTokenResponse.AccessToken.Validate(); err != nil { - return AuthResult{}, fmt.Errorf("problem with access token in StorageTokenResponse: %w", err) - } - - account := storageTokenResponse.Account - accessToken := storageTokenResponse.AccessToken.Secret - grantedScopes := strings.Split(storageTokenResponse.AccessToken.Scopes, scopeSeparator) - - // Checking if there was an ID token in the cache; this will throw an error in the case of confidential client applications. - var idToken accesstokens.IDToken - if !storageTokenResponse.IDToken.IsZero() { - err := idToken.UnmarshalJSON([]byte(storageTokenResponse.IDToken.Secret)) - if err != nil { - return AuthResult{}, fmt.Errorf("problem decoding JWT token: %w", err) - } - } - return AuthResult{account, idToken, accessToken, storageTokenResponse.AccessToken.ExpiresOn.T, grantedScopes, nil}, nil -} - -// NewAuthResult creates an AuthResult. -func NewAuthResult(tokenResponse accesstokens.TokenResponse, account shared.Account) (AuthResult, error) { - if len(tokenResponse.DeclinedScopes) > 0 { - return AuthResult{}, fmt.Errorf("token response failed because declined scopes are present: %s", strings.Join(tokenResponse.DeclinedScopes, ",")) - } - return AuthResult{ - Account: account, - IDToken: tokenResponse.IDToken, - AccessToken: tokenResponse.AccessToken, - ExpiresOn: tokenResponse.ExpiresOn.T, - GrantedScopes: tokenResponse.GrantedScopes.Slice, - }, nil -} - -// Client is a base client that provides access to common methods and primatives that -// can be used by multiple clients. -type Client struct { - Token *oauth.Client - manager accountManager // *storage.Manager or fakeManager in tests - // pmanager is a partitioned cache for OBO authentication. *storage.PartitionedManager or fakeManager in tests - pmanager manager - - AuthParams authority.AuthParams // DO NOT EVER MAKE THIS A POINTER! See "Note" in New(). - cacheAccessor cache.ExportReplace - cacheAccessorMu *sync.RWMutex -} - -// Option is an optional argument to the New constructor. -type Option func(c *Client) error - -// WithCacheAccessor allows you to set some type of cache for storing authentication tokens. -func WithCacheAccessor(ca cache.ExportReplace) Option { - return func(c *Client) error { - if ca != nil { - c.cacheAccessor = ca - } - return nil - } -} - -// WithClientCapabilities allows configuring one or more client capabilities such as "CP1" -func WithClientCapabilities(capabilities []string) Option { - return func(c *Client) error { - var err error - if len(capabilities) > 0 { - cc, err := authority.NewClientCapabilities(capabilities) - if err == nil { - c.AuthParams.Capabilities = cc - } - } - return err - } -} - -// WithKnownAuthorityHosts specifies hosts Client shouldn't validate or request metadata for because they're known to the user -func WithKnownAuthorityHosts(hosts []string) Option { - return func(c *Client) error { - cp := make([]string, len(hosts)) - copy(cp, hosts) - c.AuthParams.KnownAuthorityHosts = cp - return nil - } -} - -// WithX5C specifies if x5c claim(public key of the certificate) should be sent to STS to enable Subject Name Issuer Authentication. -func WithX5C(sendX5C bool) Option { - return func(c *Client) error { - c.AuthParams.SendX5C = sendX5C - return nil - } -} - -func WithRegionDetection(region string) Option { - return func(c *Client) error { - c.AuthParams.AuthorityInfo.Region = region - return nil - } -} - -func WithInstanceDiscovery(instanceDiscoveryEnabled bool) Option { - return func(c *Client) error { - c.AuthParams.AuthorityInfo.ValidateAuthority = instanceDiscoveryEnabled - c.AuthParams.AuthorityInfo.InstanceDiscoveryDisabled = !instanceDiscoveryEnabled - return nil - } -} - -// New is the constructor for Base. -func New(clientID string, authorityURI string, token *oauth.Client, options ...Option) (Client, error) { - //By default, validateAuthority is set to true and instanceDiscoveryDisabled is set to false - authInfo, err := authority.NewInfoFromAuthorityURI(authorityURI, true, false) - if err != nil { - return Client{}, err - } - authParams := authority.NewAuthParams(clientID, authInfo) - client := Client{ // Note: Hey, don't even THINK about making Base into *Base. See "design notes" in public.go and confidential.go - Token: token, - AuthParams: authParams, - cacheAccessorMu: &sync.RWMutex{}, - manager: storage.New(token), - pmanager: storage.NewPartitionedManager(token), - } - for _, o := range options { - if err = o(&client); err != nil { - break - } - } - return client, err - -} - -// AuthCodeURL creates a URL used to acquire an authorization code. -func (b Client) AuthCodeURL(ctx context.Context, clientID, redirectURI string, scopes []string, authParams authority.AuthParams) (string, error) { - endpoints, err := b.Token.ResolveEndpoints(ctx, authParams.AuthorityInfo, "") - if err != nil { - return "", err - } - - baseURL, err := url.Parse(endpoints.AuthorizationEndpoint) - if err != nil { - return "", err - } - - claims, err := authParams.MergeCapabilitiesAndClaims() - if err != nil { - return "", err - } - - v := url.Values{} - v.Add("client_id", clientID) - v.Add("response_type", "code") - v.Add("redirect_uri", redirectURI) - v.Add("scope", strings.Join(scopes, scopeSeparator)) - if authParams.State != "" { - v.Add("state", authParams.State) - } - if claims != "" { - v.Add("claims", claims) - } - if authParams.CodeChallenge != "" { - v.Add("code_challenge", authParams.CodeChallenge) - } - if authParams.CodeChallengeMethod != "" { - v.Add("code_challenge_method", authParams.CodeChallengeMethod) - } - if authParams.LoginHint != "" { - v.Add("login_hint", authParams.LoginHint) - } - if authParams.Prompt != "" { - v.Add("prompt", authParams.Prompt) - } - if authParams.DomainHint != "" { - v.Add("domain_hint", authParams.DomainHint) - } - // There were left over from an implementation that didn't use any of these. We may - // need to add them later, but as of now aren't needed. - /* - if p.ResponseMode != "" { - urlParams.Add("response_mode", p.ResponseMode) - } - */ - baseURL.RawQuery = v.Encode() - return baseURL.String(), nil -} - -func (b Client) AcquireTokenSilent(ctx context.Context, silent AcquireTokenSilentParameters) (AuthResult, error) { - ar := AuthResult{} - // when tenant == "", the caller didn't specify a tenant and WithTenant will choose the client's configured tenant - tenant := silent.TenantID - authParams, err := b.AuthParams.WithTenant(tenant) - if err != nil { - return ar, err - } - authParams.Scopes = silent.Scopes - authParams.HomeAccountID = silent.Account.HomeAccountID - authParams.AuthorizationType = silent.AuthorizationType - authParams.Claims = silent.Claims - authParams.UserAssertion = silent.UserAssertion - if silent.AuthnScheme != nil { - authParams.AuthnScheme = silent.AuthnScheme - } - - m := b.pmanager - if authParams.AuthorizationType != authority.ATOnBehalfOf { - authParams.AuthorizationType = authority.ATRefreshToken - m = b.manager - } - if b.cacheAccessor != nil { - key := authParams.CacheKey(silent.IsAppCache) - b.cacheAccessorMu.RLock() - err = b.cacheAccessor.Replace(ctx, m, cache.ReplaceHints{PartitionKey: key}) - b.cacheAccessorMu.RUnlock() - } - if err != nil { - return ar, err - } - storageTokenResponse, err := m.Read(ctx, authParams) - if err != nil { - return ar, err - } - - // ignore cached access tokens when given claims - if silent.Claims == "" { - ar, err = AuthResultFromStorage(storageTokenResponse) - if err == nil { - ar.AccessToken, err = authParams.AuthnScheme.FormatAccessToken(ar.AccessToken) - return ar, err - } - } - - // redeem a cached refresh token, if available - if reflect.ValueOf(storageTokenResponse.RefreshToken).IsZero() { - return ar, errors.New("no token found") - } - var cc *accesstokens.Credential - if silent.RequestType == accesstokens.ATConfidential { - cc = silent.Credential - } - token, err := b.Token.Refresh(ctx, silent.RequestType, authParams, cc, storageTokenResponse.RefreshToken) - if err != nil { - return ar, err - } - return b.AuthResultFromToken(ctx, authParams, token, true) -} - -func (b Client) AcquireTokenByAuthCode(ctx context.Context, authCodeParams AcquireTokenAuthCodeParameters) (AuthResult, error) { - authParams, err := b.AuthParams.WithTenant(authCodeParams.TenantID) - if err != nil { - return AuthResult{}, err - } - authParams.Claims = authCodeParams.Claims - authParams.Scopes = authCodeParams.Scopes - authParams.Redirecturi = authCodeParams.RedirectURI - authParams.AuthorizationType = authority.ATAuthCode - - var cc *accesstokens.Credential - if authCodeParams.AppType == accesstokens.ATConfidential { - cc = authCodeParams.Credential - authParams.IsConfidentialClient = true - } - - req, err := accesstokens.NewCodeChallengeRequest(authParams, authCodeParams.AppType, cc, authCodeParams.Code, authCodeParams.Challenge) - if err != nil { - return AuthResult{}, err - } - - token, err := b.Token.AuthCode(ctx, req) - if err != nil { - return AuthResult{}, err - } - - return b.AuthResultFromToken(ctx, authParams, token, true) -} - -// AcquireTokenOnBehalfOf acquires a security token for an app using middle tier apps access token. -func (b Client) AcquireTokenOnBehalfOf(ctx context.Context, onBehalfOfParams AcquireTokenOnBehalfOfParameters) (AuthResult, error) { - var ar AuthResult - silentParameters := AcquireTokenSilentParameters{ - Scopes: onBehalfOfParams.Scopes, - RequestType: accesstokens.ATConfidential, - Credential: onBehalfOfParams.Credential, - UserAssertion: onBehalfOfParams.UserAssertion, - AuthorizationType: authority.ATOnBehalfOf, - TenantID: onBehalfOfParams.TenantID, - Claims: onBehalfOfParams.Claims, - } - ar, err := b.AcquireTokenSilent(ctx, silentParameters) - if err == nil { - return ar, err - } - authParams, err := b.AuthParams.WithTenant(onBehalfOfParams.TenantID) - if err != nil { - return AuthResult{}, err - } - authParams.AuthorizationType = authority.ATOnBehalfOf - authParams.Claims = onBehalfOfParams.Claims - authParams.Scopes = onBehalfOfParams.Scopes - authParams.UserAssertion = onBehalfOfParams.UserAssertion - token, err := b.Token.OnBehalfOf(ctx, authParams, onBehalfOfParams.Credential) - if err == nil { - ar, err = b.AuthResultFromToken(ctx, authParams, token, true) - } - return ar, err -} - -func (b Client) AuthResultFromToken(ctx context.Context, authParams authority.AuthParams, token accesstokens.TokenResponse, cacheWrite bool) (AuthResult, error) { - if !cacheWrite { - return NewAuthResult(token, shared.Account{}) - } - var m manager = b.manager - if authParams.AuthorizationType == authority.ATOnBehalfOf { - m = b.pmanager - } - key := token.CacheKey(authParams) - if b.cacheAccessor != nil { - b.cacheAccessorMu.Lock() - defer b.cacheAccessorMu.Unlock() - err := b.cacheAccessor.Replace(ctx, m, cache.ReplaceHints{PartitionKey: key}) - if err != nil { - return AuthResult{}, err - } - } - account, err := m.Write(authParams, token) - if err != nil { - return AuthResult{}, err - } - ar, err := NewAuthResult(token, account) - if err == nil && b.cacheAccessor != nil { - err = b.cacheAccessor.Export(ctx, b.manager, cache.ExportHints{PartitionKey: key}) - } - if err != nil { - return AuthResult{}, err - } - - ar.AccessToken, err = authParams.AuthnScheme.FormatAccessToken(ar.AccessToken) - return ar, err -} - -func (b Client) AllAccounts(ctx context.Context) ([]shared.Account, error) { - if b.cacheAccessor != nil { - b.cacheAccessorMu.RLock() - defer b.cacheAccessorMu.RUnlock() - key := b.AuthParams.CacheKey(false) - err := b.cacheAccessor.Replace(ctx, b.manager, cache.ReplaceHints{PartitionKey: key}) - if err != nil { - return nil, err - } - } - return b.manager.AllAccounts(), nil -} - -func (b Client) Account(ctx context.Context, homeAccountID string) (shared.Account, error) { - if b.cacheAccessor != nil { - b.cacheAccessorMu.RLock() - defer b.cacheAccessorMu.RUnlock() - authParams := b.AuthParams // This is a copy, as we don't have a pointer receiver and .AuthParams is not a pointer. - authParams.AuthorizationType = authority.AccountByID - authParams.HomeAccountID = homeAccountID - key := b.AuthParams.CacheKey(false) - err := b.cacheAccessor.Replace(ctx, b.manager, cache.ReplaceHints{PartitionKey: key}) - if err != nil { - return shared.Account{}, err - } - } - return b.manager.Account(homeAccountID), nil -} - -// RemoveAccount removes all the ATs, RTs and IDTs from the cache associated with this account. -func (b Client) RemoveAccount(ctx context.Context, account shared.Account) error { - if b.cacheAccessor == nil { - b.manager.RemoveAccount(account, b.AuthParams.ClientID) - return nil - } - b.cacheAccessorMu.Lock() - defer b.cacheAccessorMu.Unlock() - key := b.AuthParams.CacheKey(false) - err := b.cacheAccessor.Replace(ctx, b.manager, cache.ReplaceHints{PartitionKey: key}) - if err != nil { - return err - } - b.manager.RemoveAccount(account, b.AuthParams.ClientID) - return b.cacheAccessor.Export(ctx, b.manager, cache.ExportHints{PartitionKey: key}) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/items.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/items.go deleted file mode 100644 index f9be90276dad6d5d27d79cfe5be910f0a282c3d7..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/items.go +++ /dev/null @@ -1,213 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package storage - -import ( - "errors" - "fmt" - "reflect" - "strings" - "time" - - internalTime "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/types/time" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared" -) - -// Contract is the JSON structure that is written to any storage medium when serializing -// the internal cache. This design is shared between MSAL versions in many languages. -// This cannot be changed without design that includes other SDKs. -type Contract struct { - AccessTokens map[string]AccessToken `json:"AccessToken,omitempty"` - RefreshTokens map[string]accesstokens.RefreshToken `json:"RefreshToken,omitempty"` - IDTokens map[string]IDToken `json:"IdToken,omitempty"` - Accounts map[string]shared.Account `json:"Account,omitempty"` - AppMetaData map[string]AppMetaData `json:"AppMetadata,omitempty"` - - AdditionalFields map[string]interface{} -} - -// Contract is the JSON structure that is written to any storage medium when serializing -// the internal cache. This design is shared between MSAL versions in many languages. -// This cannot be changed without design that includes other SDKs. -type InMemoryContract struct { - AccessTokensPartition map[string]map[string]AccessToken - RefreshTokensPartition map[string]map[string]accesstokens.RefreshToken - IDTokensPartition map[string]map[string]IDToken - AccountsPartition map[string]map[string]shared.Account - AppMetaData map[string]AppMetaData -} - -// NewContract is the constructor for Contract. -func NewInMemoryContract() *InMemoryContract { - return &InMemoryContract{ - AccessTokensPartition: map[string]map[string]AccessToken{}, - RefreshTokensPartition: map[string]map[string]accesstokens.RefreshToken{}, - IDTokensPartition: map[string]map[string]IDToken{}, - AccountsPartition: map[string]map[string]shared.Account{}, - AppMetaData: map[string]AppMetaData{}, - } -} - -// NewContract is the constructor for Contract. -func NewContract() *Contract { - return &Contract{ - AccessTokens: map[string]AccessToken{}, - RefreshTokens: map[string]accesstokens.RefreshToken{}, - IDTokens: map[string]IDToken{}, - Accounts: map[string]shared.Account{}, - AppMetaData: map[string]AppMetaData{}, - AdditionalFields: map[string]interface{}{}, - } -} - -// AccessToken is the JSON representation of a MSAL access token for encoding to storage. -type AccessToken struct { - HomeAccountID string `json:"home_account_id,omitempty"` - Environment string `json:"environment,omitempty"` - Realm string `json:"realm,omitempty"` - CredentialType string `json:"credential_type,omitempty"` - ClientID string `json:"client_id,omitempty"` - Secret string `json:"secret,omitempty"` - Scopes string `json:"target,omitempty"` - ExpiresOn internalTime.Unix `json:"expires_on,omitempty"` - ExtendedExpiresOn internalTime.Unix `json:"extended_expires_on,omitempty"` - CachedAt internalTime.Unix `json:"cached_at,omitempty"` - UserAssertionHash string `json:"user_assertion_hash,omitempty"` - TokenType string `json:"token_type,omitempty"` - AuthnSchemeKeyID string `json:"keyid,omitempty"` - - AdditionalFields map[string]interface{} -} - -// NewAccessToken is the constructor for AccessToken. -func NewAccessToken(homeID, env, realm, clientID string, cachedAt, expiresOn, extendedExpiresOn time.Time, scopes, token, tokenType, authnSchemeKeyID string) AccessToken { - return AccessToken{ - HomeAccountID: homeID, - Environment: env, - Realm: realm, - CredentialType: "AccessToken", - ClientID: clientID, - Secret: token, - Scopes: scopes, - CachedAt: internalTime.Unix{T: cachedAt.UTC()}, - ExpiresOn: internalTime.Unix{T: expiresOn.UTC()}, - ExtendedExpiresOn: internalTime.Unix{T: extendedExpiresOn.UTC()}, - TokenType: tokenType, - AuthnSchemeKeyID: authnSchemeKeyID, - } -} - -// Key outputs the key that can be used to uniquely look up this entry in a map. -func (a AccessToken) Key() string { - key := strings.Join( - []string{a.HomeAccountID, a.Environment, a.CredentialType, a.ClientID, a.Realm, a.Scopes}, - shared.CacheKeySeparator, - ) - // add token type to key for new access tokens types. skip for bearer token type to - // preserve fwd and back compat between a common cache and msal clients - if !strings.EqualFold(a.TokenType, authority.AccessTokenTypeBearer) { - key = strings.Join([]string{key, a.TokenType}, shared.CacheKeySeparator) - } - return strings.ToLower(key) -} - -// FakeValidate enables tests to fake access token validation -var FakeValidate func(AccessToken) error - -// Validate validates that this AccessToken can be used. -func (a AccessToken) Validate() error { - if FakeValidate != nil { - return FakeValidate(a) - } - if a.CachedAt.T.After(time.Now()) { - return errors.New("access token isn't valid, it was cached at a future time") - } - if a.ExpiresOn.T.Before(time.Now().Add(5 * time.Minute)) { - return fmt.Errorf("access token is expired") - } - if a.CachedAt.T.IsZero() { - return fmt.Errorf("access token does not have CachedAt set") - } - return nil -} - -// IDToken is the JSON representation of an MSAL id token for encoding to storage. -type IDToken struct { - HomeAccountID string `json:"home_account_id,omitempty"` - Environment string `json:"environment,omitempty"` - Realm string `json:"realm,omitempty"` - CredentialType string `json:"credential_type,omitempty"` - ClientID string `json:"client_id,omitempty"` - Secret string `json:"secret,omitempty"` - UserAssertionHash string `json:"user_assertion_hash,omitempty"` - AdditionalFields map[string]interface{} -} - -// IsZero determines if IDToken is the zero value. -func (i IDToken) IsZero() bool { - v := reflect.ValueOf(i) - for i := 0; i < v.NumField(); i++ { - field := v.Field(i) - if !field.IsZero() { - switch field.Kind() { - case reflect.Map, reflect.Slice: - if field.Len() == 0 { - continue - } - } - return false - } - } - return true -} - -// NewIDToken is the constructor for IDToken. -func NewIDToken(homeID, env, realm, clientID, idToken string) IDToken { - return IDToken{ - HomeAccountID: homeID, - Environment: env, - Realm: realm, - CredentialType: "IDToken", - ClientID: clientID, - Secret: idToken, - } -} - -// Key outputs the key that can be used to uniquely look up this entry in a map. -func (id IDToken) Key() string { - key := strings.Join( - []string{id.HomeAccountID, id.Environment, id.CredentialType, id.ClientID, id.Realm}, - shared.CacheKeySeparator, - ) - return strings.ToLower(key) -} - -// AppMetaData is the JSON representation of application metadata for encoding to storage. -type AppMetaData struct { - FamilyID string `json:"family_id,omitempty"` - ClientID string `json:"client_id,omitempty"` - Environment string `json:"environment,omitempty"` - - AdditionalFields map[string]interface{} -} - -// NewAppMetaData is the constructor for AppMetaData. -func NewAppMetaData(familyID, clientID, environment string) AppMetaData { - return AppMetaData{ - FamilyID: familyID, - ClientID: clientID, - Environment: environment, - } -} - -// Key outputs the key that can be used to uniquely look up this entry in a map. -func (a AppMetaData) Key() string { - key := strings.Join( - []string{"AppMetaData", a.Environment, a.ClientID}, - shared.CacheKeySeparator, - ) - return strings.ToLower(key) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/partitioned_storage.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/partitioned_storage.go deleted file mode 100644 index c0931833064fc4e5cb6bef56a59fcf92b71d2d65..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/partitioned_storage.go +++ /dev/null @@ -1,442 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package storage - -import ( - "context" - "errors" - "fmt" - "strings" - "sync" - "time" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared" -) - -// PartitionedManager is a partitioned in-memory cache of access tokens, accounts and meta data. -type PartitionedManager struct { - contract *InMemoryContract - contractMu sync.RWMutex - requests aadInstanceDiscoveryer // *oauth.Token - - aadCacheMu sync.RWMutex - aadCache map[string]authority.InstanceDiscoveryMetadata -} - -// NewPartitionedManager is the constructor for PartitionedManager. -func NewPartitionedManager(requests *oauth.Client) *PartitionedManager { - m := &PartitionedManager{requests: requests, aadCache: make(map[string]authority.InstanceDiscoveryMetadata)} - m.contract = NewInMemoryContract() - return m -} - -// Read reads a storage token from the cache if it exists. -func (m *PartitionedManager) Read(ctx context.Context, authParameters authority.AuthParams) (TokenResponse, error) { - tr := TokenResponse{} - realm := authParameters.AuthorityInfo.Tenant - clientID := authParameters.ClientID - scopes := authParameters.Scopes - authnSchemeKeyID := authParameters.AuthnScheme.KeyID() - tokenType := authParameters.AuthnScheme.AccessTokenType() - - // fetch metadata if instanceDiscovery is enabled - aliases := []string{authParameters.AuthorityInfo.Host} - if !authParameters.AuthorityInfo.InstanceDiscoveryDisabled { - metadata, err := m.getMetadataEntry(ctx, authParameters.AuthorityInfo) - if err != nil { - return TokenResponse{}, err - } - aliases = metadata.Aliases - } - - userAssertionHash := authParameters.AssertionHash() - partitionKeyFromRequest := userAssertionHash - - // errors returned by read* methods indicate a cache miss and are therefore non-fatal. We continue populating - // TokenResponse fields so that e.g. lack of an ID token doesn't prevent the caller from receiving a refresh token. - accessToken, err := m.readAccessToken(aliases, realm, clientID, userAssertionHash, scopes, partitionKeyFromRequest, tokenType, authnSchemeKeyID) - if err == nil { - tr.AccessToken = accessToken - } - idToken, err := m.readIDToken(aliases, realm, clientID, userAssertionHash, getPartitionKeyIDTokenRead(accessToken)) - if err == nil { - tr.IDToken = idToken - } - - if appMetadata, err := m.readAppMetaData(aliases, clientID); err == nil { - // we need the family ID to identify the correct refresh token, if any - familyID := appMetadata.FamilyID - refreshToken, err := m.readRefreshToken(aliases, familyID, clientID, userAssertionHash, partitionKeyFromRequest) - if err == nil { - tr.RefreshToken = refreshToken - } - } - - account, err := m.readAccount(aliases, realm, userAssertionHash, idToken.HomeAccountID) - if err == nil { - tr.Account = account - } - return tr, nil -} - -// Write writes a token response to the cache and returns the account information the token is stored with. -func (m *PartitionedManager) Write(authParameters authority.AuthParams, tokenResponse accesstokens.TokenResponse) (shared.Account, error) { - authParameters.HomeAccountID = tokenResponse.HomeAccountID() - homeAccountID := authParameters.HomeAccountID - environment := authParameters.AuthorityInfo.Host - realm := authParameters.AuthorityInfo.Tenant - clientID := authParameters.ClientID - target := strings.Join(tokenResponse.GrantedScopes.Slice, scopeSeparator) - userAssertionHash := authParameters.AssertionHash() - cachedAt := time.Now() - authnSchemeKeyID := authParameters.AuthnScheme.KeyID() - var account shared.Account - - if len(tokenResponse.RefreshToken) > 0 { - refreshToken := accesstokens.NewRefreshToken(homeAccountID, environment, clientID, tokenResponse.RefreshToken, tokenResponse.FamilyID) - if authParameters.AuthorizationType == authority.ATOnBehalfOf { - refreshToken.UserAssertionHash = userAssertionHash - } - if err := m.writeRefreshToken(refreshToken, getPartitionKeyRefreshToken(refreshToken)); err != nil { - return account, err - } - } - - if len(tokenResponse.AccessToken) > 0 { - accessToken := NewAccessToken( - homeAccountID, - environment, - realm, - clientID, - cachedAt, - tokenResponse.ExpiresOn.T, - tokenResponse.ExtExpiresOn.T, - target, - tokenResponse.AccessToken, - tokenResponse.TokenType, - authnSchemeKeyID, - ) - if authParameters.AuthorizationType == authority.ATOnBehalfOf { - accessToken.UserAssertionHash = userAssertionHash // get Hash method on this - } - - // Since we have a valid access token, cache it before moving on. - if err := accessToken.Validate(); err == nil { - if err := m.writeAccessToken(accessToken, getPartitionKeyAccessToken(accessToken)); err != nil { - return account, err - } - } else { - return shared.Account{}, err - } - } - - idTokenJwt := tokenResponse.IDToken - if !idTokenJwt.IsZero() { - idToken := NewIDToken(homeAccountID, environment, realm, clientID, idTokenJwt.RawToken) - if authParameters.AuthorizationType == authority.ATOnBehalfOf { - idToken.UserAssertionHash = userAssertionHash - } - if err := m.writeIDToken(idToken, getPartitionKeyIDToken(idToken)); err != nil { - return shared.Account{}, err - } - - localAccountID := idTokenJwt.LocalAccountID() - authorityType := authParameters.AuthorityInfo.AuthorityType - - preferredUsername := idTokenJwt.UPN - if idTokenJwt.PreferredUsername != "" { - preferredUsername = idTokenJwt.PreferredUsername - } - - account = shared.NewAccount( - homeAccountID, - environment, - realm, - localAccountID, - authorityType, - preferredUsername, - ) - if authParameters.AuthorizationType == authority.ATOnBehalfOf { - account.UserAssertionHash = userAssertionHash - } - if err := m.writeAccount(account, getPartitionKeyAccount(account)); err != nil { - return shared.Account{}, err - } - } - - AppMetaData := NewAppMetaData(tokenResponse.FamilyID, clientID, environment) - - if err := m.writeAppMetaData(AppMetaData); err != nil { - return shared.Account{}, err - } - return account, nil -} - -func (m *PartitionedManager) getMetadataEntry(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryMetadata, error) { - md, err := m.aadMetadataFromCache(ctx, authorityInfo) - if err != nil { - // not in the cache, retrieve it - md, err = m.aadMetadata(ctx, authorityInfo) - } - return md, err -} - -func (m *PartitionedManager) aadMetadataFromCache(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryMetadata, error) { - m.aadCacheMu.RLock() - defer m.aadCacheMu.RUnlock() - metadata, ok := m.aadCache[authorityInfo.Host] - if ok { - return metadata, nil - } - return metadata, errors.New("not found") -} - -func (m *PartitionedManager) aadMetadata(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryMetadata, error) { - discoveryResponse, err := m.requests.AADInstanceDiscovery(ctx, authorityInfo) - if err != nil { - return authority.InstanceDiscoveryMetadata{}, err - } - - m.aadCacheMu.Lock() - defer m.aadCacheMu.Unlock() - - for _, metadataEntry := range discoveryResponse.Metadata { - for _, aliasedAuthority := range metadataEntry.Aliases { - m.aadCache[aliasedAuthority] = metadataEntry - } - } - if _, ok := m.aadCache[authorityInfo.Host]; !ok { - m.aadCache[authorityInfo.Host] = authority.InstanceDiscoveryMetadata{ - PreferredNetwork: authorityInfo.Host, - PreferredCache: authorityInfo.Host, - } - } - return m.aadCache[authorityInfo.Host], nil -} - -func (m *PartitionedManager) readAccessToken(envAliases []string, realm, clientID, userAssertionHash string, scopes []string, partitionKey, tokenType, authnSchemeKeyID string) (AccessToken, error) { - m.contractMu.RLock() - defer m.contractMu.RUnlock() - if accessTokens, ok := m.contract.AccessTokensPartition[partitionKey]; ok { - // TODO: linear search (over a map no less) is slow for a large number (thousands) of tokens. - // this shows up as the dominating node in a profile. for real-world scenarios this likely isn't - // an issue, however if it does become a problem then we know where to look. - for _, at := range accessTokens { - if at.Realm == realm && at.ClientID == clientID && at.UserAssertionHash == userAssertionHash { - if at.TokenType == tokenType && at.AuthnSchemeKeyID == authnSchemeKeyID { - if checkAlias(at.Environment, envAliases) { - if isMatchingScopes(scopes, at.Scopes) { - return at, nil - } - } - } - } - } - } - return AccessToken{}, fmt.Errorf("access token not found") -} - -func (m *PartitionedManager) writeAccessToken(accessToken AccessToken, partitionKey string) error { - m.contractMu.Lock() - defer m.contractMu.Unlock() - key := accessToken.Key() - if m.contract.AccessTokensPartition[partitionKey] == nil { - m.contract.AccessTokensPartition[partitionKey] = make(map[string]AccessToken) - } - m.contract.AccessTokensPartition[partitionKey][key] = accessToken - return nil -} - -func matchFamilyRefreshTokenObo(rt accesstokens.RefreshToken, userAssertionHash string, envAliases []string) bool { - return rt.UserAssertionHash == userAssertionHash && checkAlias(rt.Environment, envAliases) && rt.FamilyID != "" -} - -func matchClientIDRefreshTokenObo(rt accesstokens.RefreshToken, userAssertionHash string, envAliases []string, clientID string) bool { - return rt.UserAssertionHash == userAssertionHash && checkAlias(rt.Environment, envAliases) && rt.ClientID == clientID -} - -func (m *PartitionedManager) readRefreshToken(envAliases []string, familyID, clientID, userAssertionHash, partitionKey string) (accesstokens.RefreshToken, error) { - byFamily := func(rt accesstokens.RefreshToken) bool { - return matchFamilyRefreshTokenObo(rt, userAssertionHash, envAliases) - } - byClient := func(rt accesstokens.RefreshToken) bool { - return matchClientIDRefreshTokenObo(rt, userAssertionHash, envAliases, clientID) - } - - var matchers []func(rt accesstokens.RefreshToken) bool - if familyID == "" { - matchers = []func(rt accesstokens.RefreshToken) bool{ - byClient, byFamily, - } - } else { - matchers = []func(rt accesstokens.RefreshToken) bool{ - byFamily, byClient, - } - } - - // TODO(keegan): All the tests here pass, but Bogdan says this is - // more complicated. I'm opening an issue for this to have him - // review the tests and suggest tests that would break this so - // we can re-write against good tests. His comments as follow: - // The algorithm is a bit more complex than this, I assume there are some tests covering everything. I would keep the order as is. - // The algorithm is: - // If application is NOT part of the family, search by client_ID - // If app is part of the family or if we DO NOT KNOW if it's part of the family, search by family ID, then by client_id (we will know if an app is part of the family after the first token response). - // https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/311fe8b16e7c293462806f397e189a6aa1159769/src/client/Microsoft.Identity.Client/Internal/Requests/Silent/CacheSilentStrategy.cs#L95 - m.contractMu.RLock() - defer m.contractMu.RUnlock() - for _, matcher := range matchers { - for _, rt := range m.contract.RefreshTokensPartition[partitionKey] { - if matcher(rt) { - return rt, nil - } - } - } - - return accesstokens.RefreshToken{}, fmt.Errorf("refresh token not found") -} - -func (m *PartitionedManager) writeRefreshToken(refreshToken accesstokens.RefreshToken, partitionKey string) error { - m.contractMu.Lock() - defer m.contractMu.Unlock() - key := refreshToken.Key() - if m.contract.AccessTokensPartition[partitionKey] == nil { - m.contract.RefreshTokensPartition[partitionKey] = make(map[string]accesstokens.RefreshToken) - } - m.contract.RefreshTokensPartition[partitionKey][key] = refreshToken - return nil -} - -func (m *PartitionedManager) readIDToken(envAliases []string, realm, clientID, userAssertionHash, partitionKey string) (IDToken, error) { - m.contractMu.RLock() - defer m.contractMu.RUnlock() - for _, idt := range m.contract.IDTokensPartition[partitionKey] { - if idt.Realm == realm && idt.ClientID == clientID && idt.UserAssertionHash == userAssertionHash { - if checkAlias(idt.Environment, envAliases) { - return idt, nil - } - } - } - return IDToken{}, fmt.Errorf("token not found") -} - -func (m *PartitionedManager) writeIDToken(idToken IDToken, partitionKey string) error { - key := idToken.Key() - m.contractMu.Lock() - defer m.contractMu.Unlock() - if m.contract.IDTokensPartition[partitionKey] == nil { - m.contract.IDTokensPartition[partitionKey] = make(map[string]IDToken) - } - m.contract.IDTokensPartition[partitionKey][key] = idToken - return nil -} - -func (m *PartitionedManager) readAccount(envAliases []string, realm, UserAssertionHash, partitionKey string) (shared.Account, error) { - m.contractMu.RLock() - defer m.contractMu.RUnlock() - - // You might ask why, if cache.Accounts is a map, we would loop through all of these instead of using a key. - // We only use a map because the storage contract shared between all language implementations says use a map. - // We can't change that. The other is because the keys are made using a specific "env", but here we are allowing - // a match in multiple envs (envAlias). That means we either need to hash each possible keyand do the lookup - // or just statically check. Since the design is to have a storage.Manager per user, the amount of keys stored - // is really low (say 2). Each hash is more expensive than the entire iteration. - for _, acc := range m.contract.AccountsPartition[partitionKey] { - if checkAlias(acc.Environment, envAliases) && acc.UserAssertionHash == UserAssertionHash && acc.Realm == realm { - return acc, nil - } - } - return shared.Account{}, fmt.Errorf("account not found") -} - -func (m *PartitionedManager) writeAccount(account shared.Account, partitionKey string) error { - key := account.Key() - m.contractMu.Lock() - defer m.contractMu.Unlock() - if m.contract.AccountsPartition[partitionKey] == nil { - m.contract.AccountsPartition[partitionKey] = make(map[string]shared.Account) - } - m.contract.AccountsPartition[partitionKey][key] = account - return nil -} - -func (m *PartitionedManager) readAppMetaData(envAliases []string, clientID string) (AppMetaData, error) { - m.contractMu.RLock() - defer m.contractMu.RUnlock() - - for _, app := range m.contract.AppMetaData { - if checkAlias(app.Environment, envAliases) && app.ClientID == clientID { - return app, nil - } - } - return AppMetaData{}, fmt.Errorf("not found") -} - -func (m *PartitionedManager) writeAppMetaData(AppMetaData AppMetaData) error { - key := AppMetaData.Key() - m.contractMu.Lock() - defer m.contractMu.Unlock() - m.contract.AppMetaData[key] = AppMetaData - return nil -} - -// update updates the internal cache object. This is for use in tests, other uses are not -// supported. -func (m *PartitionedManager) update(cache *InMemoryContract) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - m.contract = cache -} - -// Marshal implements cache.Marshaler. -func (m *PartitionedManager) Marshal() ([]byte, error) { - return json.Marshal(m.contract) -} - -// Unmarshal implements cache.Unmarshaler. -func (m *PartitionedManager) Unmarshal(b []byte) error { - m.contractMu.Lock() - defer m.contractMu.Unlock() - - contract := NewInMemoryContract() - - err := json.Unmarshal(b, contract) - if err != nil { - return err - } - - m.contract = contract - - return nil -} - -func getPartitionKeyAccessToken(item AccessToken) string { - if item.UserAssertionHash != "" { - return item.UserAssertionHash - } - return item.HomeAccountID -} - -func getPartitionKeyRefreshToken(item accesstokens.RefreshToken) string { - if item.UserAssertionHash != "" { - return item.UserAssertionHash - } - return item.HomeAccountID -} - -func getPartitionKeyIDToken(item IDToken) string { - return item.HomeAccountID -} - -func getPartitionKeyAccount(item shared.Account) string { - return item.HomeAccountID -} - -func getPartitionKeyIDTokenRead(item AccessToken) string { - return item.HomeAccountID -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/storage.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/storage.go deleted file mode 100644 index 2221e60c437f929055e68a9fd09fb50a62fa97f7..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/internal/storage/storage.go +++ /dev/null @@ -1,583 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// Package storage holds all cached token information for MSAL. This storage can be -// augmented with third-party extensions to provide persistent storage. In that case, -// reads and writes in upper packages will call Marshal() to take the entire in-memory -// representation and write it to storage and Unmarshal() to update the entire in-memory -// storage with what was in the persistent storage. The persistent storage can only be -// accessed in this way because multiple MSAL clients written in multiple languages can -// access the same storage and must adhere to the same method that was defined -// previously. -package storage - -import ( - "context" - "errors" - "fmt" - "strings" - "sync" - "time" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared" -) - -// aadInstanceDiscoveryer allows faking in tests. -// It is implemented in production by ops/authority.Client -type aadInstanceDiscoveryer interface { - AADInstanceDiscovery(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryResponse, error) -} - -// TokenResponse mimics a token response that was pulled from the cache. -type TokenResponse struct { - RefreshToken accesstokens.RefreshToken - IDToken IDToken // *Credential - AccessToken AccessToken - Account shared.Account -} - -// Manager is an in-memory cache of access tokens, accounts and meta data. This data is -// updated on read/write calls. Unmarshal() replaces all data stored here with whatever -// was given to it on each call. -type Manager struct { - contract *Contract - contractMu sync.RWMutex - requests aadInstanceDiscoveryer // *oauth.Token - - aadCacheMu sync.RWMutex - aadCache map[string]authority.InstanceDiscoveryMetadata -} - -// New is the constructor for Manager. -func New(requests *oauth.Client) *Manager { - m := &Manager{requests: requests, aadCache: make(map[string]authority.InstanceDiscoveryMetadata)} - m.contract = NewContract() - return m -} - -func checkAlias(alias string, aliases []string) bool { - for _, v := range aliases { - if alias == v { - return true - } - } - return false -} - -func isMatchingScopes(scopesOne []string, scopesTwo string) bool { - newScopesTwo := strings.Split(scopesTwo, scopeSeparator) - scopeCounter := 0 - for _, scope := range scopesOne { - for _, otherScope := range newScopesTwo { - if strings.EqualFold(scope, otherScope) { - scopeCounter++ - continue - } - } - } - return scopeCounter == len(scopesOne) -} - -// needsUpgrade returns true if the given key follows the v1.0 schema i.e., -// it contains an uppercase character (v1.1+ keys are all lowercase) -func needsUpgrade(key string) bool { - for _, r := range key { - if 'A' <= r && r <= 'Z' { - return true - } - } - return false -} - -// upgrade a v1.0 cache item by adding a v1.1+ item having the same value and deleting -// the v1.0 item. Callers must hold an exclusive lock on m. -func upgrade[T any](m map[string]T, k string) T { - v1_1Key := strings.ToLower(k) - v, ok := m[k] - if !ok { - // another goroutine did the upgrade while this one was waiting for the write lock - return m[v1_1Key] - } - if v2, ok := m[v1_1Key]; ok { - // cache has an equivalent v1.1+ item, which we prefer because we know it was added - // by a newer version of the module and is therefore more likely to remain valid. - // The v1.0 item may have expired because only v1.0 or earlier would update it. - v = v2 - } else { - // add an equivalent item according to the v1.1 schema - m[v1_1Key] = v - } - delete(m, k) - return v -} - -// Read reads a storage token from the cache if it exists. -func (m *Manager) Read(ctx context.Context, authParameters authority.AuthParams) (TokenResponse, error) { - tr := TokenResponse{} - homeAccountID := authParameters.HomeAccountID - realm := authParameters.AuthorityInfo.Tenant - clientID := authParameters.ClientID - scopes := authParameters.Scopes - authnSchemeKeyID := authParameters.AuthnScheme.KeyID() - tokenType := authParameters.AuthnScheme.AccessTokenType() - - // fetch metadata if instanceDiscovery is enabled - aliases := []string{authParameters.AuthorityInfo.Host} - if !authParameters.AuthorityInfo.InstanceDiscoveryDisabled { - metadata, err := m.getMetadataEntry(ctx, authParameters.AuthorityInfo) - if err != nil { - return TokenResponse{}, err - } - aliases = metadata.Aliases - } - - accessToken := m.readAccessToken(homeAccountID, aliases, realm, clientID, scopes, tokenType, authnSchemeKeyID) - tr.AccessToken = accessToken - - if homeAccountID == "" { - // caller didn't specify a user, so there's no reason to search for an ID or refresh token - return tr, nil - } - // errors returned by read* methods indicate a cache miss and are therefore non-fatal. We continue populating - // TokenResponse fields so that e.g. lack of an ID token doesn't prevent the caller from receiving a refresh token. - idToken, err := m.readIDToken(homeAccountID, aliases, realm, clientID) - if err == nil { - tr.IDToken = idToken - } - - if appMetadata, err := m.readAppMetaData(aliases, clientID); err == nil { - // we need the family ID to identify the correct refresh token, if any - familyID := appMetadata.FamilyID - refreshToken, err := m.readRefreshToken(homeAccountID, aliases, familyID, clientID) - if err == nil { - tr.RefreshToken = refreshToken - } - } - - account, err := m.readAccount(homeAccountID, aliases, realm) - if err == nil { - tr.Account = account - } - return tr, nil -} - -const scopeSeparator = " " - -// Write writes a token response to the cache and returns the account information the token is stored with. -func (m *Manager) Write(authParameters authority.AuthParams, tokenResponse accesstokens.TokenResponse) (shared.Account, error) { - homeAccountID := tokenResponse.HomeAccountID() - environment := authParameters.AuthorityInfo.Host - realm := authParameters.AuthorityInfo.Tenant - clientID := authParameters.ClientID - target := strings.Join(tokenResponse.GrantedScopes.Slice, scopeSeparator) - cachedAt := time.Now() - authnSchemeKeyID := authParameters.AuthnScheme.KeyID() - - var account shared.Account - - if len(tokenResponse.RefreshToken) > 0 { - refreshToken := accesstokens.NewRefreshToken(homeAccountID, environment, clientID, tokenResponse.RefreshToken, tokenResponse.FamilyID) - if err := m.writeRefreshToken(refreshToken); err != nil { - return account, err - } - } - - if len(tokenResponse.AccessToken) > 0 { - accessToken := NewAccessToken( - homeAccountID, - environment, - realm, - clientID, - cachedAt, - tokenResponse.ExpiresOn.T, - tokenResponse.ExtExpiresOn.T, - target, - tokenResponse.AccessToken, - tokenResponse.TokenType, - authnSchemeKeyID, - ) - - // Since we have a valid access token, cache it before moving on. - if err := accessToken.Validate(); err == nil { - if err := m.writeAccessToken(accessToken); err != nil { - return account, err - } - } - } - - idTokenJwt := tokenResponse.IDToken - if !idTokenJwt.IsZero() { - idToken := NewIDToken(homeAccountID, environment, realm, clientID, idTokenJwt.RawToken) - if err := m.writeIDToken(idToken); err != nil { - return shared.Account{}, err - } - - localAccountID := idTokenJwt.LocalAccountID() - authorityType := authParameters.AuthorityInfo.AuthorityType - - preferredUsername := idTokenJwt.UPN - if idTokenJwt.PreferredUsername != "" { - preferredUsername = idTokenJwt.PreferredUsername - } - - account = shared.NewAccount( - homeAccountID, - environment, - realm, - localAccountID, - authorityType, - preferredUsername, - ) - if err := m.writeAccount(account); err != nil { - return shared.Account{}, err - } - } - - AppMetaData := NewAppMetaData(tokenResponse.FamilyID, clientID, environment) - - if err := m.writeAppMetaData(AppMetaData); err != nil { - return shared.Account{}, err - } - return account, nil -} - -func (m *Manager) getMetadataEntry(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryMetadata, error) { - md, err := m.aadMetadataFromCache(ctx, authorityInfo) - if err != nil { - // not in the cache, retrieve it - md, err = m.aadMetadata(ctx, authorityInfo) - } - return md, err -} - -func (m *Manager) aadMetadataFromCache(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryMetadata, error) { - m.aadCacheMu.RLock() - defer m.aadCacheMu.RUnlock() - metadata, ok := m.aadCache[authorityInfo.Host] - if ok { - return metadata, nil - } - return metadata, errors.New("not found") -} - -func (m *Manager) aadMetadata(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryMetadata, error) { - m.aadCacheMu.Lock() - defer m.aadCacheMu.Unlock() - discoveryResponse, err := m.requests.AADInstanceDiscovery(ctx, authorityInfo) - if err != nil { - return authority.InstanceDiscoveryMetadata{}, err - } - - for _, metadataEntry := range discoveryResponse.Metadata { - for _, aliasedAuthority := range metadataEntry.Aliases { - m.aadCache[aliasedAuthority] = metadataEntry - } - } - if _, ok := m.aadCache[authorityInfo.Host]; !ok { - m.aadCache[authorityInfo.Host] = authority.InstanceDiscoveryMetadata{ - PreferredNetwork: authorityInfo.Host, - PreferredCache: authorityInfo.Host, - } - } - return m.aadCache[authorityInfo.Host], nil -} - -func (m *Manager) readAccessToken(homeID string, envAliases []string, realm, clientID string, scopes []string, tokenType, authnSchemeKeyID string) AccessToken { - m.contractMu.RLock() - // TODO: linear search (over a map no less) is slow for a large number (thousands) of tokens. - // this shows up as the dominating node in a profile. for real-world scenarios this likely isn't - // an issue, however if it does become a problem then we know where to look. - for k, at := range m.contract.AccessTokens { - if at.HomeAccountID == homeID && at.Realm == realm && at.ClientID == clientID { - if (strings.EqualFold(at.TokenType, tokenType) && at.AuthnSchemeKeyID == authnSchemeKeyID) || (at.TokenType == "" && (tokenType == "" || tokenType == "Bearer")) { - if checkAlias(at.Environment, envAliases) && isMatchingScopes(scopes, at.Scopes) { - m.contractMu.RUnlock() - if needsUpgrade(k) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - at = upgrade(m.contract.AccessTokens, k) - } - return at - } - } - } - } - m.contractMu.RUnlock() - return AccessToken{} -} - -func (m *Manager) writeAccessToken(accessToken AccessToken) error { - m.contractMu.Lock() - defer m.contractMu.Unlock() - key := accessToken.Key() - m.contract.AccessTokens[key] = accessToken - return nil -} - -func (m *Manager) readRefreshToken(homeID string, envAliases []string, familyID, clientID string) (accesstokens.RefreshToken, error) { - byFamily := func(rt accesstokens.RefreshToken) bool { - return matchFamilyRefreshToken(rt, homeID, envAliases) - } - byClient := func(rt accesstokens.RefreshToken) bool { - return matchClientIDRefreshToken(rt, homeID, envAliases, clientID) - } - - var matchers []func(rt accesstokens.RefreshToken) bool - if familyID == "" { - matchers = []func(rt accesstokens.RefreshToken) bool{ - byClient, byFamily, - } - } else { - matchers = []func(rt accesstokens.RefreshToken) bool{ - byFamily, byClient, - } - } - - // TODO(keegan): All the tests here pass, but Bogdan says this is - // more complicated. I'm opening an issue for this to have him - // review the tests and suggest tests that would break this so - // we can re-write against good tests. His comments as follow: - // The algorithm is a bit more complex than this, I assume there are some tests covering everything. I would keep the order as is. - // The algorithm is: - // If application is NOT part of the family, search by client_ID - // If app is part of the family or if we DO NOT KNOW if it's part of the family, search by family ID, then by client_id (we will know if an app is part of the family after the first token response). - // https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/blob/311fe8b16e7c293462806f397e189a6aa1159769/src/client/Microsoft.Identity.Client/Internal/Requests/Silent/CacheSilentStrategy.cs#L95 - m.contractMu.RLock() - for _, matcher := range matchers { - for k, rt := range m.contract.RefreshTokens { - if matcher(rt) { - m.contractMu.RUnlock() - if needsUpgrade(k) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - rt = upgrade(m.contract.RefreshTokens, k) - } - return rt, nil - } - } - } - - m.contractMu.RUnlock() - return accesstokens.RefreshToken{}, fmt.Errorf("refresh token not found") -} - -func matchFamilyRefreshToken(rt accesstokens.RefreshToken, homeID string, envAliases []string) bool { - return rt.HomeAccountID == homeID && checkAlias(rt.Environment, envAliases) && rt.FamilyID != "" -} - -func matchClientIDRefreshToken(rt accesstokens.RefreshToken, homeID string, envAliases []string, clientID string) bool { - return rt.HomeAccountID == homeID && checkAlias(rt.Environment, envAliases) && rt.ClientID == clientID -} - -func (m *Manager) writeRefreshToken(refreshToken accesstokens.RefreshToken) error { - key := refreshToken.Key() - m.contractMu.Lock() - defer m.contractMu.Unlock() - m.contract.RefreshTokens[key] = refreshToken - return nil -} - -func (m *Manager) readIDToken(homeID string, envAliases []string, realm, clientID string) (IDToken, error) { - m.contractMu.RLock() - for k, idt := range m.contract.IDTokens { - if idt.HomeAccountID == homeID && idt.Realm == realm && idt.ClientID == clientID { - if checkAlias(idt.Environment, envAliases) { - m.contractMu.RUnlock() - if needsUpgrade(k) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - idt = upgrade(m.contract.IDTokens, k) - } - return idt, nil - } - } - } - m.contractMu.RUnlock() - return IDToken{}, fmt.Errorf("token not found") -} - -func (m *Manager) writeIDToken(idToken IDToken) error { - key := idToken.Key() - m.contractMu.Lock() - defer m.contractMu.Unlock() - m.contract.IDTokens[key] = idToken - return nil -} - -func (m *Manager) AllAccounts() []shared.Account { - m.contractMu.RLock() - defer m.contractMu.RUnlock() - - var accounts []shared.Account - for _, v := range m.contract.Accounts { - accounts = append(accounts, v) - } - - return accounts -} - -func (m *Manager) Account(homeAccountID string) shared.Account { - m.contractMu.RLock() - defer m.contractMu.RUnlock() - - for _, v := range m.contract.Accounts { - if v.HomeAccountID == homeAccountID { - return v - } - } - - return shared.Account{} -} - -func (m *Manager) readAccount(homeAccountID string, envAliases []string, realm string) (shared.Account, error) { - m.contractMu.RLock() - - // You might ask why, if cache.Accounts is a map, we would loop through all of these instead of using a key. - // We only use a map because the storage contract shared between all language implementations says use a map. - // We can't change that. The other is because the keys are made using a specific "env", but here we are allowing - // a match in multiple envs (envAlias). That means we either need to hash each possible keyand do the lookup - // or just statically check. Since the design is to have a storage.Manager per user, the amount of keys stored - // is really low (say 2). Each hash is more expensive than the entire iteration. - for k, acc := range m.contract.Accounts { - if acc.HomeAccountID == homeAccountID && checkAlias(acc.Environment, envAliases) && acc.Realm == realm { - m.contractMu.RUnlock() - if needsUpgrade(k) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - acc = upgrade(m.contract.Accounts, k) - } - return acc, nil - } - } - m.contractMu.RUnlock() - return shared.Account{}, fmt.Errorf("account not found") -} - -func (m *Manager) writeAccount(account shared.Account) error { - key := account.Key() - m.contractMu.Lock() - defer m.contractMu.Unlock() - m.contract.Accounts[key] = account - return nil -} - -func (m *Manager) readAppMetaData(envAliases []string, clientID string) (AppMetaData, error) { - m.contractMu.RLock() - for k, app := range m.contract.AppMetaData { - if checkAlias(app.Environment, envAliases) && app.ClientID == clientID { - m.contractMu.RUnlock() - if needsUpgrade(k) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - app = upgrade(m.contract.AppMetaData, k) - } - return app, nil - } - } - m.contractMu.RUnlock() - return AppMetaData{}, fmt.Errorf("not found") -} - -func (m *Manager) writeAppMetaData(AppMetaData AppMetaData) error { - key := AppMetaData.Key() - m.contractMu.Lock() - defer m.contractMu.Unlock() - m.contract.AppMetaData[key] = AppMetaData - return nil -} - -// RemoveAccount removes all the associated ATs, RTs and IDTs from the cache associated with this account. -func (m *Manager) RemoveAccount(account shared.Account, clientID string) { - m.removeRefreshTokens(account.HomeAccountID, account.Environment, clientID) - m.removeAccessTokens(account.HomeAccountID, account.Environment) - m.removeIDTokens(account.HomeAccountID, account.Environment) - m.removeAccounts(account.HomeAccountID, account.Environment) -} - -func (m *Manager) removeRefreshTokens(homeID string, env string, clientID string) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - for key, rt := range m.contract.RefreshTokens { - // Check for RTs associated with the account. - if rt.HomeAccountID == homeID && rt.Environment == env { - // Do RT's app ownership check as a precaution, in case family apps - // and 3rd-party apps share same token cache, although they should not. - if rt.ClientID == clientID || rt.FamilyID != "" { - delete(m.contract.RefreshTokens, key) - } - } - } -} - -func (m *Manager) removeAccessTokens(homeID string, env string) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - for key, at := range m.contract.AccessTokens { - // Remove AT's associated with the account - if at.HomeAccountID == homeID && at.Environment == env { - // # To avoid the complexity of locating sibling family app's AT, we skip AT's app ownership check. - // It means ATs for other apps will also be removed, it is OK because: - // non-family apps are not supposed to share token cache to begin with; - // Even if it happens, we keep other app's RT already, so SSO still works. - delete(m.contract.AccessTokens, key) - } - } -} - -func (m *Manager) removeIDTokens(homeID string, env string) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - for key, idt := range m.contract.IDTokens { - // Remove ID tokens associated with the account. - if idt.HomeAccountID == homeID && idt.Environment == env { - delete(m.contract.IDTokens, key) - } - } -} - -func (m *Manager) removeAccounts(homeID string, env string) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - for key, acc := range m.contract.Accounts { - // Remove the specified account. - if acc.HomeAccountID == homeID && acc.Environment == env { - delete(m.contract.Accounts, key) - } - } -} - -// update updates the internal cache object. This is for use in tests, other uses are not -// supported. -func (m *Manager) update(cache *Contract) { - m.contractMu.Lock() - defer m.contractMu.Unlock() - m.contract = cache -} - -// Marshal implements cache.Marshaler. -func (m *Manager) Marshal() ([]byte, error) { - m.contractMu.RLock() - defer m.contractMu.RUnlock() - return json.Marshal(m.contract) -} - -// Unmarshal implements cache.Unmarshaler. -func (m *Manager) Unmarshal(b []byte) error { - m.contractMu.Lock() - defer m.contractMu.Unlock() - - contract := NewContract() - - err := json.Unmarshal(b, contract) - if err != nil { - return err - } - - m.contract = contract - - return nil -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/exported/exported.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/exported/exported.go deleted file mode 100644 index 7b673e3fe126e483f48f2185574a2f17ba3fed6b..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/exported/exported.go +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// package exported contains internal types that are re-exported from a public package -package exported - -// AssertionRequestOptions has information required to generate a client assertion -type AssertionRequestOptions struct { - // ClientID identifies the application for which an assertion is requested. Used as the assertion's "iss" and "sub" claims. - ClientID string - - // TokenEndpoint is the intended token endpoint. Used as the assertion's "aud" claim. - TokenEndpoint string -} - -// TokenProviderParameters is the authentication parameters passed to token providers -type TokenProviderParameters struct { - // Claims contains any additional claims requested for the token - Claims string - // CorrelationID of the authentication request - CorrelationID string - // Scopes requested for the token - Scopes []string - // TenantID identifies the tenant in which to authenticate - TenantID string -} - -// TokenProviderResult is the authentication result returned by custom token providers -type TokenProviderResult struct { - // AccessToken is the requested token - AccessToken string - // ExpiresInSeconds is the lifetime of the token in seconds - ExpiresInSeconds int -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/design.md b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/design.md deleted file mode 100644 index 09edb01b7e437c295ad47da3e4c8bfe0e085939b..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/design.md +++ /dev/null @@ -1,140 +0,0 @@ -# JSON Package Design -Author: John Doak(jdoak@microsoft.com) - -## Why? - -This project needs a special type of marshal/unmarshal not directly supported -by the encoding/json package. - -The need revolves around a few key wants/needs: -- unmarshal and marshal structs representing JSON messages -- fields in the messgage not in the struct must be maintained when unmarshalled -- those same fields must be marshalled back when encoded again - -The initial version used map[string]interface{} to put in the keys that -were known and then any other keys were put into a field called AdditionalFields. - -This has a few negatives: -- Dual marshaling/unmarshalling is required -- Adding a struct field requires manually adding a key by name to be encoded/decoded from the map (which is a loosely coupled construct), which can lead to bugs that aren't detected or have bad side effects -- Tests can become quickly disconnected if those keys aren't put -in tests as well. So you think you have support working, but you -don't. Existing tests were found that didn't test the marshalling output. -- There is no enforcement that if AdditionalFields is required on one struct, it should be on all containers -that don't have custom marshal/unmarshal. - -This package aims to support our needs by providing custom Marshal()/Unmarshal() functions. - -This prevents all the negatives in the initial solution listed above. However, it does add its own negative: -- Custom encoding/decoding via reflection is messy (as can be seen in encoding/json itself) - -Go proverb: Reflection is never clear -Suggested reading: https://blog.golang.org/laws-of-reflection - -## Important design decisions - -- We don't want to understand all JSON decoding rules -- We don't want to deal with all the quoting, commas, etc on decode -- Need support for json.Marshaler/Unmarshaler, so we can support types like time.Time -- If struct does not implement json.Unmarshaler, it must have AdditionalFields defined -- We only support root level objects that are \*struct or struct - -To faciliate these goals, we will utilize the json.Encoder and json.Decoder. -They provide streaming processing (efficient) and return errors on bad JSON. - -Support for json.Marshaler/Unmarshaler allows for us to use non-basic types -that must be specially encoded/decoded (like time.Time objects). - -We don't support types that can't customer unmarshal or have AdditionalFields -in order to prevent future devs from forgetting that important field and -generating bad return values. - -Support for root level objects of \*struct or struct simply acknowledges the -fact that this is designed only for the purposes listed in the Introduction. -Outside that (like encoding a lone number) should be done with the -regular json package (as it will not have additional fields). - -We don't support a few things on json supported reference types and structs: -- \*map: no need for pointers to maps -- \*slice: no need for pointers to slices -- any further pointers on struct after \*struct - -There should never be a need for this in Go. - -## Design - -## State Machines - -This uses state machine designs that based upon the Rob Pike talk on -lexers and parsers: https://www.youtube.com/watch?v=HxaD_trXwRE - -This is the most common pattern for state machines in Go and -the model to follow closesly when dealing with streaming -processing of textual data. - -Our state machines are based on the type: -```go -type stateFn func() (stateFn, error) -``` - -The state machine itself is simply a struct that has methods that -satisfy stateFn. - -Our state machines have a few standard calls -- run(): runs the state machine -- start(): always the first stateFn to be called - -All state machines have the following logic: -* run() is called -* start() is called and returns the next stateFn or error -* stateFn is called - - If returned stateFn(next state) is non-nil, call it - - If error is non-nil, run() returns the error - - If stateFn == nil and err == nil, run() return err == nil - -## Supporting types - -Marshalling/Unmarshalling must support(within top level struct): -- struct -- \*struct -- []struct -- []\*struct -- []map[string]structContainer -- [][]structContainer - -**Term note:** structContainer == type that has a struct or \*struct inside it - -We specifically do not support []interface or map[string]interface -where the interface value would hold some value with a struct in it. - -Those will still marshal/unmarshal, but without support for -AdditionalFields. - -## Marshalling - -The marshalling design will be based around a statemachine design. - -The basic logic is as follows: - -* If struct has custom marshaller, call it and return -* If struct has field "AdditionalFields", it must be a map[string]interface{} -* If struct does not have "AdditionalFields", give an error -* Get struct tag detailing json names to go names, create mapping -* For each public field name - - Write field name out - - If field value is a struct, recursively call our state machine - - Otherwise, use the json.Encoder to write out the value - -## Unmarshalling - -The unmarshalling desin is also based around a statemachine design. The -basic logic is as follows: - -* If struct has custom marhaller, call it -* If struct has field "AdditionalFields", it must be a map[string]interface{} -* Get struct tag detailing json names to go names, create mapping -* For each key found - - If key exists, - - If value is basic type, extract value into struct field using Decoder - - If value is struct type, recursively call statemachine - - If key doesn't exist, add it to AdditionalFields if it exists using Decoder diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/json.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/json.go deleted file mode 100644 index 2238521f5f911defdc873ca939d40d5341d0a302..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/json.go +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// Package json provide functions for marshalling an unmarshalling types to JSON. These functions are meant to -// be utilized inside of structs that implement json.Unmarshaler and json.Marshaler interfaces. -// This package provides the additional functionality of writing fields that are not in the struct when marshalling -// to a field called AdditionalFields if that field exists and is a map[string]interface{}. -// When marshalling, if the struct has all the same prerequisites, it will uses the keys in AdditionalFields as -// extra fields. This package uses encoding/json underneath. -package json - -import ( - "bytes" - "encoding/json" - "fmt" - "reflect" - "strings" -) - -const addField = "AdditionalFields" -const ( - marshalJSON = "MarshalJSON" - unmarshalJSON = "UnmarshalJSON" -) - -var ( - leftBrace = []byte("{")[0] - rightBrace = []byte("}")[0] - comma = []byte(",")[0] - leftParen = []byte("[")[0] - rightParen = []byte("]")[0] -) - -var mapStrInterType = reflect.TypeOf(map[string]interface{}{}) - -// stateFn defines a state machine function. This will be used in all state -// machines in this package. -type stateFn func() (stateFn, error) - -// Marshal is used to marshal a type into its JSON representation. It -// wraps the stdlib calls in order to marshal a struct or *struct so -// that a field called "AdditionalFields" of type map[string]interface{} -// with "-" used inside struct tag `json:"-"` can be marshalled as if -// they were fields within the struct. -func Marshal(i interface{}) ([]byte, error) { - buff := bytes.Buffer{} - enc := json.NewEncoder(&buff) - enc.SetEscapeHTML(false) - enc.SetIndent("", "") - - v := reflect.ValueOf(i) - if v.Kind() != reflect.Ptr && v.CanAddr() { - v = v.Addr() - } - err := marshalStruct(v, &buff, enc) - if err != nil { - return nil, err - } - return buff.Bytes(), nil -} - -// Unmarshal unmarshals a []byte representing JSON into i, which must be a *struct. In addition, if the struct has -// a field called AdditionalFields of type map[string]interface{}, JSON data representing fields not in the struct -// will be written as key/value pairs to AdditionalFields. -func Unmarshal(b []byte, i interface{}) error { - if len(b) == 0 { - return nil - } - - jdec := json.NewDecoder(bytes.NewBuffer(b)) - jdec.UseNumber() - return unmarshalStruct(jdec, i) -} - -// MarshalRaw marshals i into a json.RawMessage. If I cannot be marshalled, -// this will panic. This is exposed to help test AdditionalField values -// which are stored as json.RawMessage. -func MarshalRaw(i interface{}) json.RawMessage { - b, err := json.Marshal(i) - if err != nil { - panic(err) - } - return json.RawMessage(b) -} - -// isDelim simply tests to see if a json.Token is a delimeter. -func isDelim(got json.Token) bool { - switch got.(type) { - case json.Delim: - return true - } - return false -} - -// delimIs tests got to see if it is want. -func delimIs(got json.Token, want rune) bool { - switch v := got.(type) { - case json.Delim: - if v == json.Delim(want) { - return true - } - } - return false -} - -// hasMarshalJSON will determine if the value or a pointer to this value has -// the MarshalJSON method. -func hasMarshalJSON(v reflect.Value) bool { - if method := v.MethodByName(marshalJSON); method.Kind() != reflect.Invalid { - _, ok := v.Interface().(json.Marshaler) - return ok - } - - if v.Kind() == reflect.Ptr { - v = v.Elem() - } else { - if !v.CanAddr() { - return false - } - v = v.Addr() - } - - if method := v.MethodByName(marshalJSON); method.Kind() != reflect.Invalid { - _, ok := v.Interface().(json.Marshaler) - return ok - } - return false -} - -// callMarshalJSON will call MarshalJSON() method on the value or a pointer to this value. -// This will panic if the method is not defined. -func callMarshalJSON(v reflect.Value) ([]byte, error) { - if method := v.MethodByName(marshalJSON); method.Kind() != reflect.Invalid { - marsh := v.Interface().(json.Marshaler) - return marsh.MarshalJSON() - } - - if v.Kind() == reflect.Ptr { - v = v.Elem() - } else { - if v.CanAddr() { - v = v.Addr() - } - } - - if method := v.MethodByName(unmarshalJSON); method.Kind() != reflect.Invalid { - marsh := v.Interface().(json.Marshaler) - return marsh.MarshalJSON() - } - - panic(fmt.Sprintf("callMarshalJSON called on type %T that does not have MarshalJSON defined", v.Interface())) -} - -// hasUnmarshalJSON will determine if the value or a pointer to this value has -// the UnmarshalJSON method. -func hasUnmarshalJSON(v reflect.Value) bool { - // You can't unmarshal on a non-pointer type. - if v.Kind() != reflect.Ptr { - if !v.CanAddr() { - return false - } - v = v.Addr() - } - - if method := v.MethodByName(unmarshalJSON); method.Kind() != reflect.Invalid { - _, ok := v.Interface().(json.Unmarshaler) - return ok - } - - return false -} - -// hasOmitEmpty indicates if the field has instructed us to not output -// the field if omitempty is set on the tag. tag is the string -// returned by reflect.StructField.Tag().Get(). -func hasOmitEmpty(tag string) bool { - sl := strings.Split(tag, ",") - for _, str := range sl { - if str == "omitempty" { - return true - } - } - return false -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/mapslice.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/mapslice.go deleted file mode 100644 index cef442f25c867f80e99736243a5bd4f2e87c94ca..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/mapslice.go +++ /dev/null @@ -1,333 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package json - -import ( - "encoding/json" - "fmt" - "reflect" -) - -// unmarshalMap unmarshal's a map. -func unmarshalMap(dec *json.Decoder, m reflect.Value) error { - if m.Kind() != reflect.Ptr || m.Elem().Kind() != reflect.Map { - panic("unmarshalMap called on non-*map value") - } - mapValueType := m.Elem().Type().Elem() - walk := mapWalk{dec: dec, m: m, valueType: mapValueType} - if err := walk.run(); err != nil { - return err - } - return nil -} - -type mapWalk struct { - dec *json.Decoder - key string - m reflect.Value - valueType reflect.Type -} - -// run runs our decoder state machine. -func (m *mapWalk) run() error { - var state = m.start - var err error - for { - state, err = state() - if err != nil { - return err - } - if state == nil { - return nil - } - } -} - -func (m *mapWalk) start() (stateFn, error) { - // maps can have custom unmarshaler's. - if hasUnmarshalJSON(m.m) { - err := m.dec.Decode(m.m.Interface()) - if err != nil { - return nil, err - } - return nil, nil - } - - // We only want to use this if the map value is: - // *struct/struct/map/slice - // otherwise use standard decode - t, _ := m.valueBaseType() - switch t.Kind() { - case reflect.Struct, reflect.Map, reflect.Slice: - delim, err := m.dec.Token() - if err != nil { - return nil, err - } - // This indicates the value was set to JSON null. - if delim == nil { - return nil, nil - } - if !delimIs(delim, '{') { - return nil, fmt.Errorf("Unmarshal expected opening {, received %v", delim) - } - return m.next, nil - case reflect.Ptr: - return nil, fmt.Errorf("do not support maps with values of '**type' or '*reference") - } - - // This is a basic map type, so just use Decode(). - if err := m.dec.Decode(m.m.Interface()); err != nil { - return nil, err - } - - return nil, nil -} - -func (m *mapWalk) next() (stateFn, error) { - if m.dec.More() { - key, err := m.dec.Token() - if err != nil { - return nil, err - } - m.key = key.(string) - return m.storeValue, nil - } - // No more entries, so remove final }. - _, err := m.dec.Token() - if err != nil { - return nil, err - } - return nil, nil -} - -func (m *mapWalk) storeValue() (stateFn, error) { - v := m.valueType - for { - switch v.Kind() { - case reflect.Ptr: - v = v.Elem() - continue - case reflect.Struct: - return m.storeStruct, nil - case reflect.Map: - return m.storeMap, nil - case reflect.Slice: - return m.storeSlice, nil - } - return nil, fmt.Errorf("bug: mapWalk.storeValue() called on unsupported type: %v", v.Kind()) - } -} - -func (m *mapWalk) storeStruct() (stateFn, error) { - v := newValue(m.valueType) - if err := unmarshalStruct(m.dec, v.Interface()); err != nil { - return nil, err - } - - if m.valueType.Kind() == reflect.Ptr { - m.m.Elem().SetMapIndex(reflect.ValueOf(m.key), v) - return m.next, nil - } - m.m.Elem().SetMapIndex(reflect.ValueOf(m.key), v.Elem()) - - return m.next, nil -} - -func (m *mapWalk) storeMap() (stateFn, error) { - v := reflect.MakeMap(m.valueType) - ptr := newValue(v.Type()) - ptr.Elem().Set(v) - if err := unmarshalMap(m.dec, ptr); err != nil { - return nil, err - } - - m.m.Elem().SetMapIndex(reflect.ValueOf(m.key), v) - - return m.next, nil -} - -func (m *mapWalk) storeSlice() (stateFn, error) { - v := newValue(m.valueType) - if err := unmarshalSlice(m.dec, v); err != nil { - return nil, err - } - - m.m.Elem().SetMapIndex(reflect.ValueOf(m.key), v.Elem()) - - return m.next, nil -} - -// valueType returns the underlying Type. So a *struct would yield -// struct, etc... -func (m *mapWalk) valueBaseType() (reflect.Type, bool) { - ptr := false - v := m.valueType - if v.Kind() == reflect.Ptr { - ptr = true - v = v.Elem() - } - return v, ptr -} - -// unmarshalSlice unmarshal's the next value, which must be a slice, into -// ptrSlice, which must be a pointer to a slice. newValue() can be use to -// create the slice. -func unmarshalSlice(dec *json.Decoder, ptrSlice reflect.Value) error { - if ptrSlice.Kind() != reflect.Ptr || ptrSlice.Elem().Kind() != reflect.Slice { - panic("unmarshalSlice called on non-*[]slice value") - } - sliceValueType := ptrSlice.Elem().Type().Elem() - walk := sliceWalk{ - dec: dec, - s: ptrSlice, - valueType: sliceValueType, - } - if err := walk.run(); err != nil { - return err - } - - return nil -} - -type sliceWalk struct { - dec *json.Decoder - s reflect.Value // *[]slice - valueType reflect.Type -} - -// run runs our decoder state machine. -func (s *sliceWalk) run() error { - var state = s.start - var err error - for { - state, err = state() - if err != nil { - return err - } - if state == nil { - return nil - } - } -} - -func (s *sliceWalk) start() (stateFn, error) { - // slices can have custom unmarshaler's. - if hasUnmarshalJSON(s.s) { - err := s.dec.Decode(s.s.Interface()) - if err != nil { - return nil, err - } - return nil, nil - } - - // We only want to use this if the slice value is: - // []*struct/[]struct/[]map/[]slice - // otherwise use standard decode - t := s.valueBaseType() - - switch t.Kind() { - case reflect.Ptr: - return nil, fmt.Errorf("cannot unmarshal into a ** or * ") - case reflect.Struct, reflect.Map, reflect.Slice: - delim, err := s.dec.Token() - if err != nil { - return nil, err - } - // This indicates the value was set to nil. - if delim == nil { - return nil, nil - } - if !delimIs(delim, '[') { - return nil, fmt.Errorf("Unmarshal expected opening [, received %v", delim) - } - return s.next, nil - } - - if err := s.dec.Decode(s.s.Interface()); err != nil { - return nil, err - } - return nil, nil -} - -func (s *sliceWalk) next() (stateFn, error) { - if s.dec.More() { - return s.storeValue, nil - } - // Nothing left in the slice, remove closing ] - _, err := s.dec.Token() - return nil, err -} - -func (s *sliceWalk) storeValue() (stateFn, error) { - t := s.valueBaseType() - switch t.Kind() { - case reflect.Ptr: - return nil, fmt.Errorf("do not support 'pointer to pointer' or 'pointer to reference' types") - case reflect.Struct: - return s.storeStruct, nil - case reflect.Map: - return s.storeMap, nil - case reflect.Slice: - return s.storeSlice, nil - } - return nil, fmt.Errorf("bug: sliceWalk.storeValue() called on unsupported type: %v", t.Kind()) -} - -func (s *sliceWalk) storeStruct() (stateFn, error) { - v := newValue(s.valueType) - if err := unmarshalStruct(s.dec, v.Interface()); err != nil { - return nil, err - } - - if s.valueType.Kind() == reflect.Ptr { - s.s.Elem().Set(reflect.Append(s.s.Elem(), v)) - return s.next, nil - } - - s.s.Elem().Set(reflect.Append(s.s.Elem(), v.Elem())) - return s.next, nil -} - -func (s *sliceWalk) storeMap() (stateFn, error) { - v := reflect.MakeMap(s.valueType) - ptr := newValue(v.Type()) - ptr.Elem().Set(v) - - if err := unmarshalMap(s.dec, ptr); err != nil { - return nil, err - } - - s.s.Elem().Set(reflect.Append(s.s.Elem(), v)) - - return s.next, nil -} - -func (s *sliceWalk) storeSlice() (stateFn, error) { - v := newValue(s.valueType) - if err := unmarshalSlice(s.dec, v); err != nil { - return nil, err - } - - s.s.Elem().Set(reflect.Append(s.s.Elem(), v.Elem())) - - return s.next, nil -} - -// valueType returns the underlying Type. So a *struct would yield -// struct, etc... -func (s *sliceWalk) valueBaseType() reflect.Type { - v := s.valueType - if v.Kind() == reflect.Ptr { - v = v.Elem() - } - return v -} - -// newValue() returns a new *type that represents type passed. -func newValue(valueType reflect.Type) reflect.Value { - if valueType.Kind() == reflect.Ptr { - return reflect.New(valueType.Elem()) - } - return reflect.New(valueType) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/marshal.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/marshal.go deleted file mode 100644 index df5dc6e11b501c16207f429b138069f34b34f4a0..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/marshal.go +++ /dev/null @@ -1,346 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package json - -import ( - "bytes" - "encoding/json" - "fmt" - "reflect" - "unicode" -) - -// marshalStruct takes in i, which must be a *struct or struct and marshals its content -// as JSON into buff (sometimes with writes to buff directly, sometimes via enc). -// This call is recursive for all fields of *struct or struct type. -func marshalStruct(v reflect.Value, buff *bytes.Buffer, enc *json.Encoder) error { - if v.Kind() == reflect.Ptr { - v = v.Elem() - } - // We only care about custom Marshalling a struct. - if v.Kind() != reflect.Struct { - return fmt.Errorf("bug: marshal() received a non *struct or struct, received type %T", v.Interface()) - } - - if hasMarshalJSON(v) { - b, err := callMarshalJSON(v) - if err != nil { - return err - } - buff.Write(b) - return nil - } - - t := v.Type() - - // If it has an AdditionalFields field make sure its the right type. - f := v.FieldByName(addField) - if f.Kind() != reflect.Invalid { - if f.Kind() != reflect.Map { - return fmt.Errorf("type %T has field 'AdditionalFields' that is not a map[string]interface{}", v.Interface()) - } - if !f.Type().AssignableTo(mapStrInterType) { - return fmt.Errorf("type %T has field 'AdditionalFields' that is not a map[string]interface{}", v.Interface()) - } - } - - translator, err := findFields(v) - if err != nil { - return err - } - - buff.WriteByte(leftBrace) - for x := 0; x < v.NumField(); x++ { - field := v.Field(x) - - // We don't access private fields. - if unicode.IsLower(rune(t.Field(x).Name[0])) { - continue - } - - if t.Field(x).Name == addField { - if v.Field(x).Len() > 0 { - if err := writeAddFields(field.Interface(), buff, enc); err != nil { - return err - } - buff.WriteByte(comma) - } - continue - } - - // If they have omitempty set, we don't write out the field if - // it is the zero value. - if hasOmitEmpty(t.Field(x).Tag.Get("json")) { - if v.Field(x).IsZero() { - continue - } - } - - // Write out the field name part. - jsonName := translator.jsonName(t.Field(x).Name) - buff.WriteString(fmt.Sprintf("%q:", jsonName)) - - if field.Kind() == reflect.Ptr { - field = field.Elem() - } - - if err := marshalStructField(field, buff, enc); err != nil { - return err - } - } - - buff.Truncate(buff.Len() - 1) // Remove final comma - buff.WriteByte(rightBrace) - - return nil -} - -func marshalStructField(field reflect.Value, buff *bytes.Buffer, enc *json.Encoder) error { - // Determine if we need a trailing comma. - defer buff.WriteByte(comma) - - switch field.Kind() { - // If it was a *struct or struct, we need to recursively all marshal(). - case reflect.Struct: - if field.CanAddr() { - field = field.Addr() - } - return marshalStruct(field, buff, enc) - case reflect.Map: - return marshalMap(field, buff, enc) - case reflect.Slice: - return marshalSlice(field, buff, enc) - } - - // It is just a basic type, so encode it. - if err := enc.Encode(field.Interface()); err != nil { - return err - } - buff.Truncate(buff.Len() - 1) // Remove Encode() added \n - - return nil -} - -func marshalMap(v reflect.Value, buff *bytes.Buffer, enc *json.Encoder) error { - if v.Kind() != reflect.Map { - return fmt.Errorf("bug: marshalMap() called on %T", v.Interface()) - } - if v.Len() == 0 { - buff.WriteByte(leftBrace) - buff.WriteByte(rightBrace) - return nil - } - encoder := mapEncode{m: v, buff: buff, enc: enc} - return encoder.run() -} - -type mapEncode struct { - m reflect.Value - buff *bytes.Buffer - enc *json.Encoder - - valueBaseType reflect.Type -} - -// run runs our encoder state machine. -func (m *mapEncode) run() error { - var state = m.start - var err error - for { - state, err = state() - if err != nil { - return err - } - if state == nil { - return nil - } - } -} - -func (m *mapEncode) start() (stateFn, error) { - if hasMarshalJSON(m.m) { - b, err := callMarshalJSON(m.m) - if err != nil { - return nil, err - } - m.buff.Write(b) - return nil, nil - } - - valueBaseType := m.m.Type().Elem() - if valueBaseType.Kind() == reflect.Ptr { - valueBaseType = valueBaseType.Elem() - } - m.valueBaseType = valueBaseType - - switch valueBaseType.Kind() { - case reflect.Ptr: - return nil, fmt.Errorf("Marshal does not support ** or * ") - case reflect.Struct, reflect.Map, reflect.Slice: - return m.encode, nil - } - - // If the map value doesn't have a struct/map/slice, just Encode() it. - if err := m.enc.Encode(m.m.Interface()); err != nil { - return nil, err - } - m.buff.Truncate(m.buff.Len() - 1) // Remove Encode() added \n - return nil, nil -} - -func (m *mapEncode) encode() (stateFn, error) { - m.buff.WriteByte(leftBrace) - - iter := m.m.MapRange() - for iter.Next() { - // Write the key. - k := iter.Key() - m.buff.WriteString(fmt.Sprintf("%q:", k.String())) - - v := iter.Value() - switch m.valueBaseType.Kind() { - case reflect.Struct: - if v.CanAddr() { - v = v.Addr() - } - if err := marshalStruct(v, m.buff, m.enc); err != nil { - return nil, err - } - case reflect.Map: - if err := marshalMap(v, m.buff, m.enc); err != nil { - return nil, err - } - case reflect.Slice: - if err := marshalSlice(v, m.buff, m.enc); err != nil { - return nil, err - } - default: - panic(fmt.Sprintf("critical bug: mapEncode.encode() called with value base type: %v", m.valueBaseType.Kind())) - } - m.buff.WriteByte(comma) - } - m.buff.Truncate(m.buff.Len() - 1) // Remove final comma - m.buff.WriteByte(rightBrace) - - return nil, nil -} - -func marshalSlice(v reflect.Value, buff *bytes.Buffer, enc *json.Encoder) error { - if v.Kind() != reflect.Slice { - return fmt.Errorf("bug: marshalSlice() called on %T", v.Interface()) - } - if v.Len() == 0 { - buff.WriteByte(leftParen) - buff.WriteByte(rightParen) - return nil - } - encoder := sliceEncode{s: v, buff: buff, enc: enc} - return encoder.run() -} - -type sliceEncode struct { - s reflect.Value - buff *bytes.Buffer - enc *json.Encoder - - valueBaseType reflect.Type -} - -// run runs our encoder state machine. -func (s *sliceEncode) run() error { - var state = s.start - var err error - for { - state, err = state() - if err != nil { - return err - } - if state == nil { - return nil - } - } -} - -func (s *sliceEncode) start() (stateFn, error) { - if hasMarshalJSON(s.s) { - b, err := callMarshalJSON(s.s) - if err != nil { - return nil, err - } - s.buff.Write(b) - return nil, nil - } - - valueBaseType := s.s.Type().Elem() - if valueBaseType.Kind() == reflect.Ptr { - valueBaseType = valueBaseType.Elem() - } - s.valueBaseType = valueBaseType - - switch valueBaseType.Kind() { - case reflect.Ptr: - return nil, fmt.Errorf("Marshal does not support ** or * ") - case reflect.Struct, reflect.Map, reflect.Slice: - return s.encode, nil - } - - // If the map value doesn't have a struct/map/slice, just Encode() it. - if err := s.enc.Encode(s.s.Interface()); err != nil { - return nil, err - } - s.buff.Truncate(s.buff.Len() - 1) // Remove Encode added \n - - return nil, nil -} - -func (s *sliceEncode) encode() (stateFn, error) { - s.buff.WriteByte(leftParen) - for i := 0; i < s.s.Len(); i++ { - v := s.s.Index(i) - switch s.valueBaseType.Kind() { - case reflect.Struct: - if v.CanAddr() { - v = v.Addr() - } - if err := marshalStruct(v, s.buff, s.enc); err != nil { - return nil, err - } - case reflect.Map: - if err := marshalMap(v, s.buff, s.enc); err != nil { - return nil, err - } - case reflect.Slice: - if err := marshalSlice(v, s.buff, s.enc); err != nil { - return nil, err - } - default: - panic(fmt.Sprintf("critical bug: mapEncode.encode() called with value base type: %v", s.valueBaseType.Kind())) - } - s.buff.WriteByte(comma) - } - s.buff.Truncate(s.buff.Len() - 1) // Remove final comma - s.buff.WriteByte(rightParen) - return nil, nil -} - -// writeAddFields writes the AdditionalFields struct field out to JSON as field -// values. i must be a map[string]interface{} or this will panic. -func writeAddFields(i interface{}, buff *bytes.Buffer, enc *json.Encoder) error { - m := i.(map[string]interface{}) - - x := 0 - for k, v := range m { - buff.WriteString(fmt.Sprintf("%q:", k)) - if err := enc.Encode(v); err != nil { - return err - } - buff.Truncate(buff.Len() - 1) // Remove Encode() added \n - - if x+1 != len(m) { - buff.WriteByte(comma) - } - x++ - } - return nil -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/struct.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/struct.go deleted file mode 100644 index 07751544a282cdd69a45cd6f70078e24d65ec345..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/struct.go +++ /dev/null @@ -1,290 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package json - -import ( - "encoding/json" - "fmt" - "reflect" - "strings" -) - -func unmarshalStruct(jdec *json.Decoder, i interface{}) error { - v := reflect.ValueOf(i) - if v.Kind() != reflect.Ptr { - return fmt.Errorf("Unmarshal() received type %T, which is not a *struct", i) - } - v = v.Elem() - if v.Kind() != reflect.Struct { - return fmt.Errorf("Unmarshal() received type %T, which is not a *struct", i) - } - - if hasUnmarshalJSON(v) { - // Indicates that this type has a custom Unmarshaler. - return jdec.Decode(v.Addr().Interface()) - } - - f := v.FieldByName(addField) - if f.Kind() == reflect.Invalid { - return fmt.Errorf("Unmarshal(%T) only supports structs that have the field AdditionalFields or implements json.Unmarshaler", i) - } - - if f.Kind() != reflect.Map || !f.Type().AssignableTo(mapStrInterType) { - return fmt.Errorf("type %T has field 'AdditionalFields' that is not a map[string]interface{}", i) - } - - dec := newDecoder(jdec, v) - return dec.run() -} - -type decoder struct { - dec *json.Decoder - value reflect.Value // This will be a reflect.Struct - translator translateFields - key string -} - -func newDecoder(dec *json.Decoder, value reflect.Value) *decoder { - return &decoder{value: value, dec: dec} -} - -// run runs our decoder state machine. -func (d *decoder) run() error { - var state = d.start - var err error - for { - state, err = state() - if err != nil { - return err - } - if state == nil { - return nil - } - } -} - -// start looks for our opening delimeter '{' and then transitions to looping through our fields. -func (d *decoder) start() (stateFn, error) { - var err error - d.translator, err = findFields(d.value) - if err != nil { - return nil, err - } - - delim, err := d.dec.Token() - if err != nil { - return nil, err - } - if !delimIs(delim, '{') { - return nil, fmt.Errorf("Unmarshal expected opening {, received %v", delim) - } - - return d.next, nil -} - -// next gets the next struct field name from the raw json or stops the machine if we get our closing }. -func (d *decoder) next() (stateFn, error) { - if !d.dec.More() { - // Remove the closing }. - if _, err := d.dec.Token(); err != nil { - return nil, err - } - return nil, nil - } - - key, err := d.dec.Token() - if err != nil { - return nil, err - } - - d.key = key.(string) - return d.storeValue, nil -} - -// storeValue takes the next value and stores it our struct. If the field can't be found -// in the struct, it pushes the operation to storeAdditional(). -func (d *decoder) storeValue() (stateFn, error) { - goName := d.translator.goName(d.key) - if goName == "" { - goName = d.key - } - - // We don't have the field in the struct, so it goes in AdditionalFields. - f := d.value.FieldByName(goName) - if f.Kind() == reflect.Invalid { - return d.storeAdditional, nil - } - - // Indicates that this type has a custom Unmarshaler. - if hasUnmarshalJSON(f) { - err := d.dec.Decode(f.Addr().Interface()) - if err != nil { - return nil, err - } - return d.next, nil - } - - t, isPtr, err := fieldBaseType(d.value, goName) - if err != nil { - return nil, fmt.Errorf("type(%s) had field(%s) %w", d.value.Type().Name(), goName, err) - } - - switch t.Kind() { - // We need to recursively call ourselves on any *struct or struct. - case reflect.Struct: - if isPtr { - if f.IsNil() { - f.Set(reflect.New(t)) - } - } else { - f = f.Addr() - } - if err := unmarshalStruct(d.dec, f.Interface()); err != nil { - return nil, err - } - return d.next, nil - case reflect.Map: - v := reflect.MakeMap(f.Type()) - ptr := newValue(f.Type()) - ptr.Elem().Set(v) - if err := unmarshalMap(d.dec, ptr); err != nil { - return nil, err - } - f.Set(ptr.Elem()) - return d.next, nil - case reflect.Slice: - v := reflect.MakeSlice(f.Type(), 0, 0) - ptr := newValue(f.Type()) - ptr.Elem().Set(v) - if err := unmarshalSlice(d.dec, ptr); err != nil { - return nil, err - } - f.Set(ptr.Elem()) - return d.next, nil - } - - if !isPtr { - f = f.Addr() - } - - // For values that are pointers, we need them to be non-nil in order - // to decode into them. - if f.IsNil() { - f.Set(reflect.New(t)) - } - - if err := d.dec.Decode(f.Interface()); err != nil { - return nil, err - } - - return d.next, nil -} - -// storeAdditional pushes the key/value into our .AdditionalFields map. -func (d *decoder) storeAdditional() (stateFn, error) { - rw := json.RawMessage{} - if err := d.dec.Decode(&rw); err != nil { - return nil, err - } - field := d.value.FieldByName(addField) - if field.IsNil() { - field.Set(reflect.MakeMap(field.Type())) - } - field.SetMapIndex(reflect.ValueOf(d.key), reflect.ValueOf(rw)) - return d.next, nil -} - -func fieldBaseType(v reflect.Value, fieldName string) (t reflect.Type, isPtr bool, err error) { - sf, ok := v.Type().FieldByName(fieldName) - if !ok { - return nil, false, fmt.Errorf("bug: fieldBaseType() lookup of field(%s) on type(%s): do not have field", fieldName, v.Type().Name()) - } - t = sf.Type - if t.Kind() == reflect.Ptr { - t = t.Elem() - isPtr = true - } - if t.Kind() == reflect.Ptr { - return nil, isPtr, fmt.Errorf("received pointer to pointer type, not supported") - } - return t, isPtr, nil -} - -type translateField struct { - jsonName string - goName string -} - -// translateFields is a list of translateFields with a handy lookup method. -type translateFields []translateField - -// goName loops through a list of fields looking for one contaning the jsonName and -// returning the goName. If not found, returns the empty string. -// Note: not a map because at this size slices are faster even in tight loops. -func (t translateFields) goName(jsonName string) string { - for _, entry := range t { - if entry.jsonName == jsonName { - return entry.goName - } - } - return "" -} - -// jsonName loops through a list of fields looking for one contaning the goName and -// returning the jsonName. If not found, returns the empty string. -// Note: not a map because at this size slices are faster even in tight loops. -func (t translateFields) jsonName(goName string) string { - for _, entry := range t { - if entry.goName == goName { - return entry.jsonName - } - } - return "" -} - -var umarshalerType = reflect.TypeOf((*json.Unmarshaler)(nil)).Elem() - -// findFields parses a struct and writes the field tags for lookup. It will return an error -// if any field has a type of *struct or struct that does not implement json.Marshaler. -func findFields(v reflect.Value) (translateFields, error) { - if v.Kind() == reflect.Ptr { - v = v.Elem() - } - if v.Kind() != reflect.Struct { - return nil, fmt.Errorf("findFields received a %s type, expected *struct or struct", v.Type().Name()) - } - tfs := make([]translateField, 0, v.NumField()) - for i := 0; i < v.NumField(); i++ { - tf := translateField{ - goName: v.Type().Field(i).Name, - jsonName: parseTag(v.Type().Field(i).Tag.Get("json")), - } - switch tf.jsonName { - case "", "-": - tf.jsonName = tf.goName - } - tfs = append(tfs, tf) - - f := v.Field(i) - if f.Kind() == reflect.Ptr { - f = f.Elem() - } - if f.Kind() == reflect.Struct { - if f.Type().Implements(umarshalerType) { - return nil, fmt.Errorf("struct type %q which has field %q which "+ - "doesn't implement json.Unmarshaler", v.Type().Name(), v.Type().Field(i).Name) - } - } - } - return tfs, nil -} - -// parseTag just returns the first entry in the tag. tag is the string -// returned by reflect.StructField.Tag().Get(). -func parseTag(tag string) string { - if idx := strings.Index(tag, ","); idx != -1 { - return tag[:idx] - } - return tag -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/types/time/time.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/types/time/time.go deleted file mode 100644 index a1c99621e9fc8338c35ca167a78d423cdbf988cb..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/types/time/time.go +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// Package time provides for custom types to translate time from JSON and other formats -// into time.Time objects. -package time - -import ( - "fmt" - "strconv" - "strings" - "time" -) - -// Unix provides a type that can marshal and unmarshal a string representation -// of the unix epoch into a time.Time object. -type Unix struct { - T time.Time -} - -// MarshalJSON implements encoding/json.MarshalJSON(). -func (u Unix) MarshalJSON() ([]byte, error) { - if u.T.IsZero() { - return []byte(""), nil - } - return []byte(fmt.Sprintf("%q", strconv.FormatInt(u.T.Unix(), 10))), nil -} - -// UnmarshalJSON implements encoding/json.UnmarshalJSON(). -func (u *Unix) UnmarshalJSON(b []byte) error { - i, err := strconv.Atoi(strings.Trim(string(b), `"`)) - if err != nil { - return fmt.Errorf("unix time(%s) could not be converted from string to int: %w", string(b), err) - } - u.T = time.Unix(int64(i), 0) - return nil -} - -// DurationTime provides a type that can marshal and unmarshal a string representation -// of a duration from now into a time.Time object. -// Note: I'm not sure this is the best way to do this. What happens is we get a field -// called "expires_in" that represents the seconds from now that this expires. We -// turn that into a time we call .ExpiresOn. But maybe we should be recording -// when the token was received at .TokenRecieved and .ExpiresIn should remain as a duration. -// Then we could have a method called ExpiresOn(). Honestly, the whole thing is -// bad because the server doesn't return a concrete time. I think this is -// cleaner, but its not great either. -type DurationTime struct { - T time.Time -} - -// MarshalJSON implements encoding/json.MarshalJSON(). -func (d DurationTime) MarshalJSON() ([]byte, error) { - if d.T.IsZero() { - return []byte(""), nil - } - - dt := time.Until(d.T) - return []byte(fmt.Sprintf("%d", int64(dt*time.Second))), nil -} - -// UnmarshalJSON implements encoding/json.UnmarshalJSON(). -func (d *DurationTime) UnmarshalJSON(b []byte) error { - i, err := strconv.Atoi(strings.Trim(string(b), `"`)) - if err != nil { - return fmt.Errorf("unix time(%s) could not be converted from string to int: %w", string(b), err) - } - d.T = time.Now().Add(time.Duration(i) * time.Second) - return nil -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/local/server.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/local/server.go deleted file mode 100644 index 04236ff3127acd2120dfac1dc169c92ffe639197..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/local/server.go +++ /dev/null @@ -1,177 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// Package local contains a local HTTP server used with interactive authentication. -package local - -import ( - "context" - "fmt" - "net" - "net/http" - "strconv" - "strings" - "time" -) - -var okPage = []byte(` - - - - - Authentication Complete - - -Authentication complete. You can return to the application. Feel free to close this browser tab.
- - -`) - -const failPage = ` - - - - -Authentication Failed - - -Authentication failed. You can return to the application. Feel free to close this browser tab.
-Error details: error %s error_description: %s
- - -` - -// Result is the result from the redirect. -type Result struct { - // Code is the code sent by the authority server. - Code string - // Err is set if there was an error. - Err error -} - -// Server is an HTTP server. -type Server struct { - // Addr is the address the server is listening on. - Addr string - resultCh chan Result - s *http.Server - reqState string -} - -// New creates a local HTTP server and starts it. -func New(reqState string, port int) (*Server, error) { - var l net.Listener - var err error - var portStr string - if port > 0 { - // use port provided by caller - l, err = net.Listen("tcp", fmt.Sprintf("localhost:%d", port)) - portStr = strconv.FormatInt(int64(port), 10) - } else { - // find a free port - for i := 0; i < 10; i++ { - l, err = net.Listen("tcp", "localhost:0") - if err != nil { - continue - } - addr := l.Addr().String() - portStr = addr[strings.LastIndex(addr, ":")+1:] - break - } - } - if err != nil { - return nil, err - } - - serv := &Server{ - Addr: fmt.Sprintf("http://localhost:%s", portStr), - s: &http.Server{Addr: "localhost:0", ReadHeaderTimeout: time.Second}, - reqState: reqState, - resultCh: make(chan Result, 1), - } - serv.s.Handler = http.HandlerFunc(serv.handler) - - if err := serv.start(l); err != nil { - return nil, err - } - - return serv, nil -} - -func (s *Server) start(l net.Listener) error { - go func() { - err := s.s.Serve(l) - if err != nil { - select { - case s.resultCh <- Result{Err: err}: - default: - } - } - }() - - return nil -} - -// Result gets the result of the redirect operation. Once a single result is returned, the server -// is shutdown. ctx deadline will be honored. -func (s *Server) Result(ctx context.Context) Result { - select { - case <-ctx.Done(): - return Result{Err: ctx.Err()} - case r := <-s.resultCh: - return r - } -} - -// Shutdown shuts down the server. -func (s *Server) Shutdown() { - // Note: You might get clever and think you can do this in handler() as a defer, you can't. - _ = s.s.Shutdown(context.Background()) -} - -func (s *Server) putResult(r Result) { - select { - case s.resultCh <- r: - default: - } -} - -func (s *Server) handler(w http.ResponseWriter, r *http.Request) { - q := r.URL.Query() - - headerErr := q.Get("error") - if headerErr != "" { - desc := q.Get("error_description") - // Note: It is a little weird we handle some errors by not going to the failPage. If they all should, - // change this to s.error() and make s.error() write the failPage instead of an error code. - _, _ = w.Write([]byte(fmt.Sprintf(failPage, headerErr, desc))) - s.putResult(Result{Err: fmt.Errorf(desc)}) - return - } - - respState := q.Get("state") - switch respState { - case s.reqState: - case "": - s.error(w, http.StatusInternalServerError, "server didn't send OAuth state") - return - default: - s.error(w, http.StatusInternalServerError, "mismatched OAuth state, req(%s), resp(%s)", s.reqState, respState) - return - } - - code := q.Get("code") - if code == "" { - s.error(w, http.StatusInternalServerError, "authorization code missing in query string") - return - } - - _, _ = w.Write(okPage) - s.putResult(Result{Code: code}) -} - -func (s *Server) error(w http.ResponseWriter, code int, str string, i ...interface{}) { - err := fmt.Errorf(str, i...) - http.Error(w, err.Error(), code) - s.putResult(Result{Err: err}) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/oauth.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/oauth.go deleted file mode 100644 index ef8d908a444f271d30fa3e50299bfa80bc6c1876..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/oauth.go +++ /dev/null @@ -1,354 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package oauth - -import ( - "context" - "encoding/json" - "fmt" - "io" - "time" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/exported" - internalTime "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/types/time" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs" - "github.com/google/uuid" -) - -// ResolveEndpointer contains the methods for resolving authority endpoints. -type ResolveEndpointer interface { - ResolveEndpoints(ctx context.Context, authorityInfo authority.Info, userPrincipalName string) (authority.Endpoints, error) -} - -// AccessTokens contains the methods for fetching tokens from different sources. -type AccessTokens interface { - DeviceCodeResult(ctx context.Context, authParameters authority.AuthParams) (accesstokens.DeviceCodeResult, error) - FromUsernamePassword(ctx context.Context, authParameters authority.AuthParams) (accesstokens.TokenResponse, error) - FromAuthCode(ctx context.Context, req accesstokens.AuthCodeRequest) (accesstokens.TokenResponse, error) - FromRefreshToken(ctx context.Context, appType accesstokens.AppType, authParams authority.AuthParams, cc *accesstokens.Credential, refreshToken string) (accesstokens.TokenResponse, error) - FromClientSecret(ctx context.Context, authParameters authority.AuthParams, clientSecret string) (accesstokens.TokenResponse, error) - FromAssertion(ctx context.Context, authParameters authority.AuthParams, assertion string) (accesstokens.TokenResponse, error) - FromUserAssertionClientSecret(ctx context.Context, authParameters authority.AuthParams, userAssertion string, clientSecret string) (accesstokens.TokenResponse, error) - FromUserAssertionClientCertificate(ctx context.Context, authParameters authority.AuthParams, userAssertion string, assertion string) (accesstokens.TokenResponse, error) - FromDeviceCodeResult(ctx context.Context, authParameters authority.AuthParams, deviceCodeResult accesstokens.DeviceCodeResult) (accesstokens.TokenResponse, error) - FromSamlGrant(ctx context.Context, authParameters authority.AuthParams, samlGrant wstrust.SamlTokenInfo) (accesstokens.TokenResponse, error) -} - -// FetchAuthority will be implemented by authority.Authority. -type FetchAuthority interface { - UserRealm(context.Context, authority.AuthParams) (authority.UserRealm, error) - AADInstanceDiscovery(context.Context, authority.Info) (authority.InstanceDiscoveryResponse, error) -} - -// FetchWSTrust contains the methods for interacting with WSTrust endpoints. -type FetchWSTrust interface { - Mex(ctx context.Context, federationMetadataURL string) (defs.MexDocument, error) - SAMLTokenInfo(ctx context.Context, authParameters authority.AuthParams, cloudAudienceURN string, endpoint defs.Endpoint) (wstrust.SamlTokenInfo, error) -} - -// Client provides tokens for various types of token requests. -type Client struct { - Resolver ResolveEndpointer - AccessTokens AccessTokens - Authority FetchAuthority - WSTrust FetchWSTrust -} - -// New is the constructor for Token. -func New(httpClient ops.HTTPClient) *Client { - r := ops.New(httpClient) - return &Client{ - Resolver: newAuthorityEndpoint(r), - AccessTokens: r.AccessTokens(), - Authority: r.Authority(), - WSTrust: r.WSTrust(), - } -} - -// ResolveEndpoints gets the authorization and token endpoints and creates an AuthorityEndpoints instance. -func (t *Client) ResolveEndpoints(ctx context.Context, authorityInfo authority.Info, userPrincipalName string) (authority.Endpoints, error) { - return t.Resolver.ResolveEndpoints(ctx, authorityInfo, userPrincipalName) -} - -// AADInstanceDiscovery attempts to discover a tenant endpoint (used in OIDC auth with an authorization endpoint). -// This is done by AAD which allows for aliasing of tenants (windows.sts.net is the same as login.windows.com). -func (t *Client) AADInstanceDiscovery(ctx context.Context, authorityInfo authority.Info) (authority.InstanceDiscoveryResponse, error) { - return t.Authority.AADInstanceDiscovery(ctx, authorityInfo) -} - -// AuthCode returns a token based on an authorization code. -func (t *Client) AuthCode(ctx context.Context, req accesstokens.AuthCodeRequest) (accesstokens.TokenResponse, error) { - if err := scopeError(req.AuthParams); err != nil { - return accesstokens.TokenResponse{}, err - } - if err := t.resolveEndpoint(ctx, &req.AuthParams, ""); err != nil { - return accesstokens.TokenResponse{}, err - } - - tResp, err := t.AccessTokens.FromAuthCode(ctx, req) - if err != nil { - return accesstokens.TokenResponse{}, fmt.Errorf("could not retrieve token from auth code: %w", err) - } - return tResp, nil -} - -// Credential acquires a token from the authority using a client credentials grant. -func (t *Client) Credential(ctx context.Context, authParams authority.AuthParams, cred *accesstokens.Credential) (accesstokens.TokenResponse, error) { - if cred.TokenProvider != nil { - now := time.Now() - scopes := make([]string, len(authParams.Scopes)) - copy(scopes, authParams.Scopes) - params := exported.TokenProviderParameters{ - Claims: authParams.Claims, - CorrelationID: uuid.New().String(), - Scopes: scopes, - TenantID: authParams.AuthorityInfo.Tenant, - } - tr, err := cred.TokenProvider(ctx, params) - if err != nil { - if len(scopes) == 0 { - err = fmt.Errorf("token request had an empty authority.AuthParams.Scopes, which may cause the following error: %w", err) - return accesstokens.TokenResponse{}, err - } - return accesstokens.TokenResponse{}, err - } - return accesstokens.TokenResponse{ - TokenType: authParams.AuthnScheme.AccessTokenType(), - AccessToken: tr.AccessToken, - ExpiresOn: internalTime.DurationTime{ - T: now.Add(time.Duration(tr.ExpiresInSeconds) * time.Second), - }, - GrantedScopes: accesstokens.Scopes{Slice: authParams.Scopes}, - }, nil - } - - if err := t.resolveEndpoint(ctx, &authParams, ""); err != nil { - return accesstokens.TokenResponse{}, err - } - - if cred.Secret != "" { - return t.AccessTokens.FromClientSecret(ctx, authParams, cred.Secret) - } - jwt, err := cred.JWT(ctx, authParams) - if err != nil { - return accesstokens.TokenResponse{}, err - } - return t.AccessTokens.FromAssertion(ctx, authParams, jwt) -} - -// Credential acquires a token from the authority using a client credentials grant. -func (t *Client) OnBehalfOf(ctx context.Context, authParams authority.AuthParams, cred *accesstokens.Credential) (accesstokens.TokenResponse, error) { - if err := scopeError(authParams); err != nil { - return accesstokens.TokenResponse{}, err - } - if err := t.resolveEndpoint(ctx, &authParams, ""); err != nil { - return accesstokens.TokenResponse{}, err - } - - if cred.Secret != "" { - return t.AccessTokens.FromUserAssertionClientSecret(ctx, authParams, authParams.UserAssertion, cred.Secret) - } - jwt, err := cred.JWT(ctx, authParams) - if err != nil { - return accesstokens.TokenResponse{}, err - } - tr, err := t.AccessTokens.FromUserAssertionClientCertificate(ctx, authParams, authParams.UserAssertion, jwt) - if err != nil { - return accesstokens.TokenResponse{}, err - } - return tr, nil -} - -func (t *Client) Refresh(ctx context.Context, reqType accesstokens.AppType, authParams authority.AuthParams, cc *accesstokens.Credential, refreshToken accesstokens.RefreshToken) (accesstokens.TokenResponse, error) { - if err := scopeError(authParams); err != nil { - return accesstokens.TokenResponse{}, err - } - if err := t.resolveEndpoint(ctx, &authParams, ""); err != nil { - return accesstokens.TokenResponse{}, err - } - - tr, err := t.AccessTokens.FromRefreshToken(ctx, reqType, authParams, cc, refreshToken.Secret) - if err != nil { - return accesstokens.TokenResponse{}, err - } - return tr, nil -} - -// UsernamePassword retrieves a token where a username and password is used. However, if this is -// a user realm of "Federated", this uses SAML tokens. If "Managed", uses normal username/password. -func (t *Client) UsernamePassword(ctx context.Context, authParams authority.AuthParams) (accesstokens.TokenResponse, error) { - if err := scopeError(authParams); err != nil { - return accesstokens.TokenResponse{}, err - } - - if authParams.AuthorityInfo.AuthorityType == authority.ADFS { - if err := t.resolveEndpoint(ctx, &authParams, authParams.Username); err != nil { - return accesstokens.TokenResponse{}, err - } - return t.AccessTokens.FromUsernamePassword(ctx, authParams) - } - if err := t.resolveEndpoint(ctx, &authParams, ""); err != nil { - return accesstokens.TokenResponse{}, err - } - - userRealm, err := t.Authority.UserRealm(ctx, authParams) - if err != nil { - return accesstokens.TokenResponse{}, fmt.Errorf("problem getting user realm from authority: %w", err) - } - - switch userRealm.AccountType { - case authority.Federated: - mexDoc, err := t.WSTrust.Mex(ctx, userRealm.FederationMetadataURL) - if err != nil { - err = fmt.Errorf("problem getting mex doc from federated url(%s): %w", userRealm.FederationMetadataURL, err) - return accesstokens.TokenResponse{}, err - } - - saml, err := t.WSTrust.SAMLTokenInfo(ctx, authParams, userRealm.CloudAudienceURN, mexDoc.UsernamePasswordEndpoint) - if err != nil { - err = fmt.Errorf("problem getting SAML token info: %w", err) - return accesstokens.TokenResponse{}, err - } - tr, err := t.AccessTokens.FromSamlGrant(ctx, authParams, saml) - if err != nil { - return accesstokens.TokenResponse{}, err - } - return tr, nil - case authority.Managed: - if len(authParams.Scopes) == 0 { - err = fmt.Errorf("token request had an empty authority.AuthParams.Scopes, which may cause the following error: %w", err) - return accesstokens.TokenResponse{}, err - } - return t.AccessTokens.FromUsernamePassword(ctx, authParams) - } - return accesstokens.TokenResponse{}, errors.New("unknown account type") -} - -// DeviceCode is the result of a call to Token.DeviceCode(). -type DeviceCode struct { - // Result is the device code result from the first call in the device code flow. This allows - // the caller to retrieve the displayed code that is used to authorize on the second device. - Result accesstokens.DeviceCodeResult - authParams authority.AuthParams - - accessTokens AccessTokens -} - -// Token returns a token AFTER the user uses the user code on the second device. This will block -// until either: (1) the code is input by the user and the service releases a token, (2) the token -// expires, (3) the Context passed to .DeviceCode() is cancelled or expires, (4) some other service -// error occurs. -func (d DeviceCode) Token(ctx context.Context) (accesstokens.TokenResponse, error) { - if d.accessTokens == nil { - return accesstokens.TokenResponse{}, fmt.Errorf("DeviceCode was either created outside its package or the creating method had an error. DeviceCode is not valid") - } - - var cancel context.CancelFunc - if deadline, ok := ctx.Deadline(); !ok || d.Result.ExpiresOn.Before(deadline) { - ctx, cancel = context.WithDeadline(ctx, d.Result.ExpiresOn) - } else { - ctx, cancel = context.WithCancel(ctx) - } - defer cancel() - - var interval = 50 * time.Millisecond - timer := time.NewTimer(interval) - defer timer.Stop() - - for { - timer.Reset(interval) - select { - case <-ctx.Done(): - return accesstokens.TokenResponse{}, ctx.Err() - case <-timer.C: - interval += interval * 2 - if interval > 5*time.Second { - interval = 5 * time.Second - } - } - - token, err := d.accessTokens.FromDeviceCodeResult(ctx, d.authParams, d.Result) - if err != nil && isWaitDeviceCodeErr(err) { - continue - } - return token, err // This handles if it was a non-wait error or success - } -} - -type deviceCodeError struct { - Error string `json:"error"` -} - -func isWaitDeviceCodeErr(err error) bool { - var c errors.CallErr - if !errors.As(err, &c) { - return false - } - if c.Resp.StatusCode != 400 { - return false - } - var dCErr deviceCodeError - defer c.Resp.Body.Close() - body, err := io.ReadAll(c.Resp.Body) - if err != nil { - return false - } - err = json.Unmarshal(body, &dCErr) - if err != nil { - return false - } - if dCErr.Error == "authorization_pending" || dCErr.Error == "slow_down" { - return true - } - return false -} - -// DeviceCode returns a DeviceCode object that can be used to get the code that must be entered on the second -// device and optionally the token once the code has been entered on the second device. -func (t *Client) DeviceCode(ctx context.Context, authParams authority.AuthParams) (DeviceCode, error) { - if err := scopeError(authParams); err != nil { - return DeviceCode{}, err - } - - if err := t.resolveEndpoint(ctx, &authParams, ""); err != nil { - return DeviceCode{}, err - } - - dcr, err := t.AccessTokens.DeviceCodeResult(ctx, authParams) - if err != nil { - return DeviceCode{}, err - } - - return DeviceCode{Result: dcr, authParams: authParams, accessTokens: t.AccessTokens}, nil -} - -func (t *Client) resolveEndpoint(ctx context.Context, authParams *authority.AuthParams, userPrincipalName string) error { - endpoints, err := t.Resolver.ResolveEndpoints(ctx, authParams.AuthorityInfo, userPrincipalName) - if err != nil { - return fmt.Errorf("unable to resolve an endpoint: %s", err) - } - authParams.Endpoints = endpoints - return nil -} - -// scopeError takes an authority.AuthParams and returns an error -// if len(AuthParams.Scope) == 0. -func scopeError(a authority.AuthParams) error { - // TODO(someone): we could look deeper at the message to determine if - // it's a scope error, but this is a good start. - /* - {error":"invalid_scope","error_description":"AADSTS1002012: The provided value for scope - openid offline_access profile is not valid. Client credential flows must have a scope value - with /.default suffixed to the resource identifier (application ID URI)...} - */ - if len(a.Scopes) == 0 { - return fmt.Errorf("token request had an empty authority.AuthParams.Scopes, which is invalid") - } - return nil -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/accesstokens.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/accesstokens.go deleted file mode 100644 index a7b7b0742d876d903e62e9d2f88ec5519ca0f948..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/accesstokens.go +++ /dev/null @@ -1,457 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -/* -Package accesstokens exposes a REST client for querying backend systems to get various types of -access tokens (oauth) for use in authentication. - -These calls are of type "application/x-www-form-urlencoded". This means we use url.Values to -represent arguments and then encode them into the POST body message. We receive JSON in -return for the requests. The request definition is defined in https://tools.ietf.org/html/rfc7521#section-4.2 . -*/ -package accesstokens - -import ( - "context" - "crypto" - - /* #nosec */ - "crypto/sha1" - "crypto/x509" - "encoding/base64" - "encoding/json" - "fmt" - "net/url" - "strconv" - "strings" - "time" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/exported" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/grant" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust" - "github.com/golang-jwt/jwt/v5" - "github.com/google/uuid" -) - -const ( - grantType = "grant_type" - deviceCode = "device_code" - clientID = "client_id" - clientInfo = "client_info" - clientInfoVal = "1" - username = "username" - password = "password" -) - -//go:generate stringer -type=AppType - -// AppType is whether the authorization code flow is for a public or confidential client. -type AppType int8 - -const ( - // ATUnknown is the zero value when the type hasn't been set. - ATUnknown AppType = iota - // ATPublic indicates this if for the Public.Client. - ATPublic - // ATConfidential indicates this if for the Confidential.Client. - ATConfidential -) - -type urlFormCaller interface { - URLFormCall(ctx context.Context, endpoint string, qv url.Values, resp interface{}) error -} - -// DeviceCodeResponse represents the HTTP response received from the device code endpoint -type DeviceCodeResponse struct { - authority.OAuthResponseBase - - UserCode string `json:"user_code"` - DeviceCode string `json:"device_code"` - VerificationURL string `json:"verification_url"` - ExpiresIn int `json:"expires_in"` - Interval int `json:"interval"` - Message string `json:"message"` - - AdditionalFields map[string]interface{} -} - -// Convert converts the DeviceCodeResponse to a DeviceCodeResult -func (dcr DeviceCodeResponse) Convert(clientID string, scopes []string) DeviceCodeResult { - expiresOn := time.Now().UTC().Add(time.Duration(dcr.ExpiresIn) * time.Second) - return NewDeviceCodeResult(dcr.UserCode, dcr.DeviceCode, dcr.VerificationURL, expiresOn, dcr.Interval, dcr.Message, clientID, scopes) -} - -// Credential represents the credential used in confidential client flows. This can be either -// a Secret or Cert/Key. -type Credential struct { - // Secret contains the credential secret if we are doing auth by secret. - Secret string - - // Cert is the public certificate, if we're authenticating by certificate. - Cert *x509.Certificate - // Key is the private key for signing, if we're authenticating by certificate. - Key crypto.PrivateKey - // X5c is the JWT assertion's x5c header value, required for SN/I authentication. - X5c []string - - // AssertionCallback is a function provided by the application, if we're authenticating by assertion. - AssertionCallback func(context.Context, exported.AssertionRequestOptions) (string, error) - - // TokenProvider is a function provided by the application that implements custom authentication - // logic for a confidential client - TokenProvider func(context.Context, exported.TokenProviderParameters) (exported.TokenProviderResult, error) -} - -// JWT gets the jwt assertion when the credential is not using a secret. -func (c *Credential) JWT(ctx context.Context, authParams authority.AuthParams) (string, error) { - if c.AssertionCallback != nil { - options := exported.AssertionRequestOptions{ - ClientID: authParams.ClientID, - TokenEndpoint: authParams.Endpoints.TokenEndpoint, - } - return c.AssertionCallback(ctx, options) - } - - token := jwt.NewWithClaims(jwt.SigningMethodRS256, jwt.MapClaims{ - "aud": authParams.Endpoints.TokenEndpoint, - "exp": json.Number(strconv.FormatInt(time.Now().Add(10*time.Minute).Unix(), 10)), - "iss": authParams.ClientID, - "jti": uuid.New().String(), - "nbf": json.Number(strconv.FormatInt(time.Now().Unix(), 10)), - "sub": authParams.ClientID, - }) - token.Header = map[string]interface{}{ - "alg": "RS256", - "typ": "JWT", - "x5t": base64.StdEncoding.EncodeToString(thumbprint(c.Cert)), - } - - if authParams.SendX5C { - token.Header["x5c"] = c.X5c - } - - assertion, err := token.SignedString(c.Key) - if err != nil { - return "", fmt.Errorf("unable to sign a JWT token using private key: %w", err) - } - return assertion, nil -} - -// thumbprint runs the asn1.Der bytes through sha1 for use in the x5t parameter of JWT. -// https://tools.ietf.org/html/rfc7517#section-4.8 -func thumbprint(cert *x509.Certificate) []byte { - /* #nosec */ - a := sha1.Sum(cert.Raw) - return a[:] -} - -// Client represents the REST calls to get tokens from token generator backends. -type Client struct { - // Comm provides the HTTP transport client. - Comm urlFormCaller - - testing bool -} - -// FromUsernamePassword uses a username and password to get an access token. -func (c Client) FromUsernamePassword(ctx context.Context, authParameters authority.AuthParams) (TokenResponse, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return TokenResponse{}, err - } - qv.Set(grantType, grant.Password) - qv.Set(username, authParameters.Username) - qv.Set(password, authParameters.Password) - qv.Set(clientID, authParameters.ClientID) - qv.Set(clientInfo, clientInfoVal) - addScopeQueryParam(qv, authParameters) - - return c.doTokenResp(ctx, authParameters, qv) -} - -// AuthCodeRequest stores the values required to request a token from the authority using an authorization code -type AuthCodeRequest struct { - AuthParams authority.AuthParams - Code string - CodeChallenge string - Credential *Credential - AppType AppType -} - -// NewCodeChallengeRequest returns an AuthCodeRequest that uses a code challenge.. -func NewCodeChallengeRequest(params authority.AuthParams, appType AppType, cc *Credential, code, challenge string) (AuthCodeRequest, error) { - if appType == ATUnknown { - return AuthCodeRequest{}, fmt.Errorf("bug: NewCodeChallengeRequest() called with AppType == ATUnknown") - } - return AuthCodeRequest{ - AuthParams: params, - AppType: appType, - Code: code, - CodeChallenge: challenge, - Credential: cc, - }, nil -} - -// FromAuthCode uses an authorization code to retrieve an access token. -func (c Client) FromAuthCode(ctx context.Context, req AuthCodeRequest) (TokenResponse, error) { - var qv url.Values - - switch req.AppType { - case ATUnknown: - return TokenResponse{}, fmt.Errorf("bug: Token.AuthCode() received request with AppType == ATUnknown") - case ATConfidential: - var err error - if req.Credential == nil { - return TokenResponse{}, fmt.Errorf("AuthCodeRequest had nil Credential for Confidential app") - } - qv, err = prepURLVals(ctx, req.Credential, req.AuthParams) - if err != nil { - return TokenResponse{}, err - } - case ATPublic: - qv = url.Values{} - default: - return TokenResponse{}, fmt.Errorf("bug: Token.AuthCode() received request with AppType == %v, which we do not recongnize", req.AppType) - } - - qv.Set(grantType, grant.AuthCode) - qv.Set("code", req.Code) - qv.Set("code_verifier", req.CodeChallenge) - qv.Set("redirect_uri", req.AuthParams.Redirecturi) - qv.Set(clientID, req.AuthParams.ClientID) - qv.Set(clientInfo, clientInfoVal) - addScopeQueryParam(qv, req.AuthParams) - if err := addClaims(qv, req.AuthParams); err != nil { - return TokenResponse{}, err - } - - return c.doTokenResp(ctx, req.AuthParams, qv) -} - -// FromRefreshToken uses a refresh token (for refreshing credentials) to get a new access token. -func (c Client) FromRefreshToken(ctx context.Context, appType AppType, authParams authority.AuthParams, cc *Credential, refreshToken string) (TokenResponse, error) { - qv := url.Values{} - if appType == ATConfidential { - var err error - qv, err = prepURLVals(ctx, cc, authParams) - if err != nil { - return TokenResponse{}, err - } - } - if err := addClaims(qv, authParams); err != nil { - return TokenResponse{}, err - } - qv.Set(grantType, grant.RefreshToken) - qv.Set(clientID, authParams.ClientID) - qv.Set(clientInfo, clientInfoVal) - qv.Set("refresh_token", refreshToken) - addScopeQueryParam(qv, authParams) - - return c.doTokenResp(ctx, authParams, qv) -} - -// FromClientSecret uses a client's secret (aka password) to get a new token. -func (c Client) FromClientSecret(ctx context.Context, authParameters authority.AuthParams, clientSecret string) (TokenResponse, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return TokenResponse{}, err - } - qv.Set(grantType, grant.ClientCredential) - qv.Set("client_secret", clientSecret) - qv.Set(clientID, authParameters.ClientID) - addScopeQueryParam(qv, authParameters) - - token, err := c.doTokenResp(ctx, authParameters, qv) - if err != nil { - return token, fmt.Errorf("FromClientSecret(): %w", err) - } - return token, nil -} - -func (c Client) FromAssertion(ctx context.Context, authParameters authority.AuthParams, assertion string) (TokenResponse, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return TokenResponse{}, err - } - qv.Set(grantType, grant.ClientCredential) - qv.Set("client_assertion_type", grant.ClientAssertion) - qv.Set("client_assertion", assertion) - qv.Set(clientID, authParameters.ClientID) - qv.Set(clientInfo, clientInfoVal) - addScopeQueryParam(qv, authParameters) - - token, err := c.doTokenResp(ctx, authParameters, qv) - if err != nil { - return token, fmt.Errorf("FromAssertion(): %w", err) - } - return token, nil -} - -func (c Client) FromUserAssertionClientSecret(ctx context.Context, authParameters authority.AuthParams, userAssertion string, clientSecret string) (TokenResponse, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return TokenResponse{}, err - } - qv.Set(grantType, grant.JWT) - qv.Set(clientID, authParameters.ClientID) - qv.Set("client_secret", clientSecret) - qv.Set("assertion", userAssertion) - qv.Set(clientInfo, clientInfoVal) - qv.Set("requested_token_use", "on_behalf_of") - addScopeQueryParam(qv, authParameters) - - return c.doTokenResp(ctx, authParameters, qv) -} - -func (c Client) FromUserAssertionClientCertificate(ctx context.Context, authParameters authority.AuthParams, userAssertion string, assertion string) (TokenResponse, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return TokenResponse{}, err - } - qv.Set(grantType, grant.JWT) - qv.Set("client_assertion_type", grant.ClientAssertion) - qv.Set("client_assertion", assertion) - qv.Set(clientID, authParameters.ClientID) - qv.Set("assertion", userAssertion) - qv.Set(clientInfo, clientInfoVal) - qv.Set("requested_token_use", "on_behalf_of") - addScopeQueryParam(qv, authParameters) - - return c.doTokenResp(ctx, authParameters, qv) -} - -func (c Client) DeviceCodeResult(ctx context.Context, authParameters authority.AuthParams) (DeviceCodeResult, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return DeviceCodeResult{}, err - } - qv.Set(clientID, authParameters.ClientID) - addScopeQueryParam(qv, authParameters) - - endpoint := strings.Replace(authParameters.Endpoints.TokenEndpoint, "token", "devicecode", -1) - - resp := DeviceCodeResponse{} - err := c.Comm.URLFormCall(ctx, endpoint, qv, &resp) - if err != nil { - return DeviceCodeResult{}, err - } - - return resp.Convert(authParameters.ClientID, authParameters.Scopes), nil -} - -func (c Client) FromDeviceCodeResult(ctx context.Context, authParameters authority.AuthParams, deviceCodeResult DeviceCodeResult) (TokenResponse, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return TokenResponse{}, err - } - qv.Set(grantType, grant.DeviceCode) - qv.Set(deviceCode, deviceCodeResult.DeviceCode) - qv.Set(clientID, authParameters.ClientID) - qv.Set(clientInfo, clientInfoVal) - addScopeQueryParam(qv, authParameters) - - return c.doTokenResp(ctx, authParameters, qv) -} - -func (c Client) FromSamlGrant(ctx context.Context, authParameters authority.AuthParams, samlGrant wstrust.SamlTokenInfo) (TokenResponse, error) { - qv := url.Values{} - if err := addClaims(qv, authParameters); err != nil { - return TokenResponse{}, err - } - qv.Set(username, authParameters.Username) - qv.Set(password, authParameters.Password) - qv.Set(clientID, authParameters.ClientID) - qv.Set(clientInfo, clientInfoVal) - qv.Set("assertion", base64.StdEncoding.WithPadding(base64.StdPadding).EncodeToString([]byte(samlGrant.Assertion))) - addScopeQueryParam(qv, authParameters) - - switch samlGrant.AssertionType { - case grant.SAMLV1: - qv.Set(grantType, grant.SAMLV1) - case grant.SAMLV2: - qv.Set(grantType, grant.SAMLV2) - default: - return TokenResponse{}, fmt.Errorf("GetAccessTokenFromSamlGrant returned unknown SAML assertion type: %q", samlGrant.AssertionType) - } - - return c.doTokenResp(ctx, authParameters, qv) -} - -func (c Client) doTokenResp(ctx context.Context, authParams authority.AuthParams, qv url.Values) (TokenResponse, error) { - resp := TokenResponse{} - if authParams.AuthnScheme != nil { - trParams := authParams.AuthnScheme.TokenRequestParams() - for k, v := range trParams { - qv.Set(k, v) - } - } - err := c.Comm.URLFormCall(ctx, authParams.Endpoints.TokenEndpoint, qv, &resp) - if err != nil { - return resp, err - } - resp.ComputeScope(authParams) - if c.testing { - return resp, nil - } - return resp, resp.Validate() -} - -// prepURLVals returns an url.Values that sets various key/values if we are doing secrets -// or JWT assertions. -func prepURLVals(ctx context.Context, cc *Credential, authParams authority.AuthParams) (url.Values, error) { - params := url.Values{} - if cc.Secret != "" { - params.Set("client_secret", cc.Secret) - return params, nil - } - - jwt, err := cc.JWT(ctx, authParams) - if err != nil { - return nil, err - } - params.Set("client_assertion", jwt) - params.Set("client_assertion_type", grant.ClientAssertion) - return params, nil -} - -// openid required to get an id token -// offline_access required to get a refresh token -// profile required to get the client_info field back -var detectDefaultScopes = map[string]bool{ - "openid": true, - "offline_access": true, - "profile": true, -} - -var defaultScopes = []string{"openid", "offline_access", "profile"} - -func AppendDefaultScopes(authParameters authority.AuthParams) []string { - scopes := make([]string, 0, len(authParameters.Scopes)+len(defaultScopes)) - for _, scope := range authParameters.Scopes { - s := strings.TrimSpace(scope) - if s == "" { - continue - } - if detectDefaultScopes[scope] { - continue - } - scopes = append(scopes, scope) - } - scopes = append(scopes, defaultScopes...) - return scopes -} - -// addClaims adds client capabilities and claims from AuthParams to the given url.Values -func addClaims(v url.Values, ap authority.AuthParams) error { - claims, err := ap.MergeCapabilitiesAndClaims() - if err == nil && claims != "" { - v.Set("claims", claims) - } - return err -} - -func addScopeQueryParam(queryParams url.Values, authParameters authority.AuthParams) { - scopes := AppendDefaultScopes(authParameters) - queryParams.Set("scope", strings.Join(scopes, " ")) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/apptype_string.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/apptype_string.go deleted file mode 100644 index 3bec4a67cf107db3640b789dfc95e037e7508ad4..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/apptype_string.go +++ /dev/null @@ -1,25 +0,0 @@ -// Code generated by "stringer -type=AppType"; DO NOT EDIT. - -package accesstokens - -import "strconv" - -func _() { - // An "invalid array index" compiler error signifies that the constant values have changed. - // Re-run the stringer command to generate them again. - var x [1]struct{} - _ = x[ATUnknown-0] - _ = x[ATPublic-1] - _ = x[ATConfidential-2] -} - -const _AppType_name = "ATUnknownATPublicATConfidential" - -var _AppType_index = [...]uint8{0, 9, 17, 31} - -func (i AppType) String() string { - if i < 0 || i >= AppType(len(_AppType_index)-1) { - return "AppType(" + strconv.FormatInt(int64(i), 10) + ")" - } - return _AppType_name[_AppType_index[i]:_AppType_index[i+1]] -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/tokens.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/tokens.go deleted file mode 100644 index 3107b45c113655893ee50ce522da371413726287..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens/tokens.go +++ /dev/null @@ -1,339 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package accesstokens - -import ( - "bytes" - "encoding/base64" - "encoding/json" - "errors" - "fmt" - "reflect" - "strings" - "time" - - internalTime "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json/types/time" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared" -) - -// IDToken consists of all the information used to validate a user. -// https://docs.microsoft.com/azure/active-directory/develop/id-tokens . -type IDToken struct { - PreferredUsername string `json:"preferred_username,omitempty"` - GivenName string `json:"given_name,omitempty"` - FamilyName string `json:"family_name,omitempty"` - MiddleName string `json:"middle_name,omitempty"` - Name string `json:"name,omitempty"` - Oid string `json:"oid,omitempty"` - TenantID string `json:"tid,omitempty"` - Subject string `json:"sub,omitempty"` - UPN string `json:"upn,omitempty"` - Email string `json:"email,omitempty"` - AlternativeID string `json:"alternative_id,omitempty"` - Issuer string `json:"iss,omitempty"` - Audience string `json:"aud,omitempty"` - ExpirationTime int64 `json:"exp,omitempty"` - IssuedAt int64 `json:"iat,omitempty"` - NotBefore int64 `json:"nbf,omitempty"` - RawToken string - - AdditionalFields map[string]interface{} -} - -var null = []byte("null") - -// UnmarshalJSON implements json.Unmarshaler. -func (i *IDToken) UnmarshalJSON(b []byte) error { - if bytes.Equal(null, b) { - return nil - } - - // Because we have a custom unmarshaler, you - // cannot directly call json.Unmarshal here. If you do, it will call this function - // recursively until reach our recursion limit. We have to create a new type - // that doesn't have this method in order to use json.Unmarshal. - type idToken2 IDToken - - jwt := strings.Trim(string(b), `"`) - jwtArr := strings.Split(jwt, ".") - if len(jwtArr) < 2 { - return errors.New("IDToken returned from server is invalid") - } - - jwtPart := jwtArr[1] - jwtDecoded, err := decodeJWT(jwtPart) - if err != nil { - return fmt.Errorf("unable to unmarshal IDToken, problem decoding JWT: %w", err) - } - - token := idToken2{} - err = json.Unmarshal(jwtDecoded, &token) - if err != nil { - return fmt.Errorf("unable to unmarshal IDToken: %w", err) - } - token.RawToken = jwt - - *i = IDToken(token) - return nil -} - -// IsZero indicates if the IDToken is the zero value. -func (i IDToken) IsZero() bool { - v := reflect.ValueOf(i) - for i := 0; i < v.NumField(); i++ { - field := v.Field(i) - if !field.IsZero() { - switch field.Kind() { - case reflect.Map, reflect.Slice: - if field.Len() == 0 { - continue - } - } - return false - } - } - return true -} - -// LocalAccountID extracts an account's local account ID from an ID token. -func (i IDToken) LocalAccountID() string { - if i.Oid != "" { - return i.Oid - } - return i.Subject -} - -// jwtDecoder is provided to allow tests to provide their own. -var jwtDecoder = decodeJWT - -// ClientInfo is used to create a Home Account ID for an account. -type ClientInfo struct { - UID string `json:"uid"` - UTID string `json:"utid"` - - AdditionalFields map[string]interface{} -} - -// UnmarshalJSON implements json.Unmarshaler.s -func (c *ClientInfo) UnmarshalJSON(b []byte) error { - s := strings.Trim(string(b), `"`) - // Client info may be empty in some flows, e.g. certificate exchange. - if len(s) == 0 { - return nil - } - - // Because we have a custom unmarshaler, you - // cannot directly call json.Unmarshal here. If you do, it will call this function - // recursively until reach our recursion limit. We have to create a new type - // that doesn't have this method in order to use json.Unmarshal. - type clientInfo2 ClientInfo - - raw, err := jwtDecoder(s) - if err != nil { - return fmt.Errorf("TokenResponse client_info field had JWT decode error: %w", err) - } - - var c2 clientInfo2 - - err = json.Unmarshal(raw, &c2) - if err != nil { - return fmt.Errorf("was unable to unmarshal decoded JWT in TokenRespone to ClientInfo: %w", err) - } - - *c = ClientInfo(c2) - return nil -} - -// Scopes represents scopes in a TokenResponse. -type Scopes struct { - Slice []string -} - -// UnmarshalJSON implements json.Unmarshal. -func (s *Scopes) UnmarshalJSON(b []byte) error { - str := strings.Trim(string(b), `"`) - if len(str) == 0 { - return nil - } - sl := strings.Split(str, " ") - s.Slice = sl - return nil -} - -// TokenResponse is the information that is returned from a token endpoint during a token acquisition flow. -type TokenResponse struct { - authority.OAuthResponseBase - - AccessToken string `json:"access_token"` - RefreshToken string `json:"refresh_token"` - TokenType string `json:"token_type"` - - FamilyID string `json:"foci"` - IDToken IDToken `json:"id_token"` - ClientInfo ClientInfo `json:"client_info"` - ExpiresOn internalTime.DurationTime `json:"expires_in"` - ExtExpiresOn internalTime.DurationTime `json:"ext_expires_in"` - GrantedScopes Scopes `json:"scope"` - DeclinedScopes []string // This is derived - - AdditionalFields map[string]interface{} - - scopesComputed bool -} - -// ComputeScope computes the final scopes based on what was granted by the server and -// what our AuthParams were from the authority server. Per OAuth spec, if no scopes are returned, the response should be treated as if all scopes were granted -// This behavior can be observed in client assertion flows, but can happen at any time, this check ensures we treat -// those special responses properly Link to spec: https://tools.ietf.org/html/rfc6749#section-3.3 -func (tr *TokenResponse) ComputeScope(authParams authority.AuthParams) { - if len(tr.GrantedScopes.Slice) == 0 { - tr.GrantedScopes = Scopes{Slice: authParams.Scopes} - } else { - tr.DeclinedScopes = findDeclinedScopes(authParams.Scopes, tr.GrantedScopes.Slice) - } - tr.scopesComputed = true -} - -// HomeAccountID uniquely identifies the authenticated account, if any. It's "" when the token is an app token. -func (tr *TokenResponse) HomeAccountID() string { - id := tr.IDToken.Subject - if uid := tr.ClientInfo.UID; uid != "" { - utid := tr.ClientInfo.UTID - if utid == "" { - utid = uid - } - id = fmt.Sprintf("%s.%s", uid, utid) - } - return id -} - -// Validate validates the TokenResponse has basic valid values. It must be called -// after ComputeScopes() is called. -func (tr *TokenResponse) Validate() error { - if tr.Error != "" { - return fmt.Errorf("%s: %s", tr.Error, tr.ErrorDescription) - } - - if tr.AccessToken == "" { - return errors.New("response is missing access_token") - } - - if !tr.scopesComputed { - return fmt.Errorf("TokenResponse hasn't had ScopesComputed() called") - } - return nil -} - -func (tr *TokenResponse) CacheKey(authParams authority.AuthParams) string { - if authParams.AuthorizationType == authority.ATOnBehalfOf { - return authParams.AssertionHash() - } - if authParams.AuthorizationType == authority.ATClientCredentials { - return authParams.AppKey() - } - if authParams.IsConfidentialClient || authParams.AuthorizationType == authority.ATRefreshToken { - return tr.HomeAccountID() - } - return "" -} - -func findDeclinedScopes(requestedScopes []string, grantedScopes []string) []string { - declined := []string{} - grantedMap := map[string]bool{} - for _, s := range grantedScopes { - grantedMap[strings.ToLower(s)] = true - } - // Comparing the requested scopes with the granted scopes to see if there are any scopes that have been declined. - for _, r := range requestedScopes { - if !grantedMap[strings.ToLower(r)] { - declined = append(declined, r) - } - } - return declined -} - -// decodeJWT decodes a JWT and converts it to a byte array representing a JSON object -// JWT has headers and payload base64url encoded without padding -// https://tools.ietf.org/html/rfc7519#section-3 and -// https://tools.ietf.org/html/rfc7515#section-2 -func decodeJWT(data string) ([]byte, error) { - // https://tools.ietf.org/html/rfc7515#appendix-C - return base64.RawURLEncoding.DecodeString(data) -} - -// RefreshToken is the JSON representation of a MSAL refresh token for encoding to storage. -type RefreshToken struct { - HomeAccountID string `json:"home_account_id,omitempty"` - Environment string `json:"environment,omitempty"` - CredentialType string `json:"credential_type,omitempty"` - ClientID string `json:"client_id,omitempty"` - FamilyID string `json:"family_id,omitempty"` - Secret string `json:"secret,omitempty"` - Realm string `json:"realm,omitempty"` - Target string `json:"target,omitempty"` - UserAssertionHash string `json:"user_assertion_hash,omitempty"` - - AdditionalFields map[string]interface{} -} - -// NewRefreshToken is the constructor for RefreshToken. -func NewRefreshToken(homeID, env, clientID, refreshToken, familyID string) RefreshToken { - return RefreshToken{ - HomeAccountID: homeID, - Environment: env, - CredentialType: "RefreshToken", - ClientID: clientID, - FamilyID: familyID, - Secret: refreshToken, - } -} - -// Key outputs the key that can be used to uniquely look up this entry in a map. -func (rt RefreshToken) Key() string { - var fourth = rt.FamilyID - if fourth == "" { - fourth = rt.ClientID - } - - key := strings.Join( - []string{rt.HomeAccountID, rt.Environment, rt.CredentialType, fourth}, - shared.CacheKeySeparator, - ) - return strings.ToLower(key) -} - -func (rt RefreshToken) GetSecret() string { - return rt.Secret -} - -// DeviceCodeResult stores the response from the STS device code endpoint. -type DeviceCodeResult struct { - // UserCode is the code the user needs to provide when authentication at the verification URI. - UserCode string - // DeviceCode is the code used in the access token request. - DeviceCode string - // VerificationURL is the the URL where user can authenticate. - VerificationURL string - // ExpiresOn is the expiration time of device code in seconds. - ExpiresOn time.Time - // Interval is the interval at which the STS should be polled at. - Interval int - // Message is the message which should be displayed to the user. - Message string - // ClientID is the UUID issued by the authorization server for your application. - ClientID string - // Scopes is the OpenID scopes used to request access a protected API. - Scopes []string -} - -// NewDeviceCodeResult creates a DeviceCodeResult instance. -func NewDeviceCodeResult(userCode, deviceCode, verificationURL string, expiresOn time.Time, interval int, message, clientID string, scopes []string) DeviceCodeResult { - return DeviceCodeResult{userCode, deviceCode, verificationURL, expiresOn, interval, message, clientID, scopes} -} - -func (dcr DeviceCodeResult) String() string { - return fmt.Sprintf("UserCode: (%v)\nDeviceCode: (%v)\nURL: (%v)\nMessage: (%v)\n", dcr.UserCode, dcr.DeviceCode, dcr.VerificationURL, dcr.Message) - -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority/authority.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority/authority.go deleted file mode 100644 index 9d60734f88e243b863d4ed4ed84a4eea5365c801..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority/authority.go +++ /dev/null @@ -1,589 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package authority - -import ( - "context" - "crypto/sha256" - "encoding/base64" - "encoding/json" - "errors" - "fmt" - "io" - "net/http" - "net/url" - "os" - "path" - "strings" - "time" - - "github.com/google/uuid" -) - -const ( - authorizationEndpoint = "https://%v/%v/oauth2/v2.0/authorize" - instanceDiscoveryEndpoint = "https://%v/common/discovery/instance" - tenantDiscoveryEndpointWithRegion = "https://%s.%s/%s/v2.0/.well-known/openid-configuration" - regionName = "REGION_NAME" - defaultAPIVersion = "2021-10-01" - imdsEndpoint = "http://169.254.169.254/metadata/instance/compute/location?format=text&api-version=" + defaultAPIVersion - autoDetectRegion = "TryAutoDetect" - AccessTokenTypeBearer = "Bearer" -) - -// These are various hosts that host AAD Instance discovery endpoints. -const ( - defaultHost = "login.microsoftonline.com" - loginMicrosoft = "login.microsoft.com" - loginWindows = "login.windows.net" - loginSTSWindows = "sts.windows.net" - loginMicrosoftOnline = defaultHost -) - -// jsonCaller is an interface that allows us to mock the JSONCall method. -type jsonCaller interface { - JSONCall(ctx context.Context, endpoint string, headers http.Header, qv url.Values, body, resp interface{}) error -} - -var aadTrustedHostList = map[string]bool{ - "login.windows.net": true, // Microsoft Azure Worldwide - Used in validation scenarios where host is not this list - "login.chinacloudapi.cn": true, // Microsoft Azure China - "login.microsoftonline.de": true, // Microsoft Azure Blackforest - "login-us.microsoftonline.com": true, // Microsoft Azure US Government - Legacy - "login.microsoftonline.us": true, // Microsoft Azure US Government - "login.microsoftonline.com": true, // Microsoft Azure Worldwide - "login.cloudgovapi.us": true, // Microsoft Azure US Government -} - -// TrustedHost checks if an AAD host is trusted/valid. -func TrustedHost(host string) bool { - if _, ok := aadTrustedHostList[host]; ok { - return true - } - return false -} - -// OAuthResponseBase is the base JSON return message for an OAuth call. -// This is embedded in other calls to get the base fields from every response. -type OAuthResponseBase struct { - Error string `json:"error"` - SubError string `json:"suberror"` - ErrorDescription string `json:"error_description"` - ErrorCodes []int `json:"error_codes"` - CorrelationID string `json:"correlation_id"` - Claims string `json:"claims"` -} - -// TenantDiscoveryResponse is the tenant endpoints from the OpenID configuration endpoint. -type TenantDiscoveryResponse struct { - OAuthResponseBase - - AuthorizationEndpoint string `json:"authorization_endpoint"` - TokenEndpoint string `json:"token_endpoint"` - Issuer string `json:"issuer"` - - AdditionalFields map[string]interface{} -} - -// Validate validates that the response had the correct values required. -func (r *TenantDiscoveryResponse) Validate() error { - switch "" { - case r.AuthorizationEndpoint: - return errors.New("TenantDiscoveryResponse: authorize endpoint was not found in the openid configuration") - case r.TokenEndpoint: - return errors.New("TenantDiscoveryResponse: token endpoint was not found in the openid configuration") - case r.Issuer: - return errors.New("TenantDiscoveryResponse: issuer was not found in the openid configuration") - } - return nil -} - -type InstanceDiscoveryMetadata struct { - PreferredNetwork string `json:"preferred_network"` - PreferredCache string `json:"preferred_cache"` - Aliases []string `json:"aliases"` - - AdditionalFields map[string]interface{} -} - -type InstanceDiscoveryResponse struct { - TenantDiscoveryEndpoint string `json:"tenant_discovery_endpoint"` - Metadata []InstanceDiscoveryMetadata `json:"metadata"` - - AdditionalFields map[string]interface{} -} - -//go:generate stringer -type=AuthorizeType - -// AuthorizeType represents the type of token flow. -type AuthorizeType int - -// These are all the types of token flows. -const ( - ATUnknown AuthorizeType = iota - ATUsernamePassword - ATWindowsIntegrated - ATAuthCode - ATInteractive - ATClientCredentials - ATDeviceCode - ATRefreshToken - AccountByID - ATOnBehalfOf -) - -// These are all authority types -const ( - AAD = "MSSTS" - ADFS = "ADFS" -) - -// AuthenticationScheme is an extensibility mechanism designed to be used only by Azure Arc for proof of possession access tokens. -type AuthenticationScheme interface { - // Extra parameters that are added to the request to the /token endpoint. - TokenRequestParams() map[string]string - // Key ID of the public / private key pair used by the encryption algorithm, if any. - // Tokens obtained by authentication schemes that use this are bound to the KeyId, i.e. - // if a different kid is presented, the access token cannot be used. - KeyID() string - // Creates the access token that goes into an Authorization HTTP header. - FormatAccessToken(accessToken string) (string, error) - //Expected to match the token_type parameter returned by ESTS. Used to disambiguate - // between ATs of different types (e.g. Bearer and PoP) when loading from cache etc. - AccessTokenType() string -} - -// default authn scheme realizing AuthenticationScheme for "Bearer" tokens -type BearerAuthenticationScheme struct{} - -var bearerAuthnScheme BearerAuthenticationScheme - -func (ba *BearerAuthenticationScheme) TokenRequestParams() map[string]string { - return nil -} -func (ba *BearerAuthenticationScheme) KeyID() string { - return "" -} -func (ba *BearerAuthenticationScheme) FormatAccessToken(accessToken string) (string, error) { - return accessToken, nil -} -func (ba *BearerAuthenticationScheme) AccessTokenType() string { - return AccessTokenTypeBearer -} - -// AuthParams represents the parameters used for authorization for token acquisition. -type AuthParams struct { - AuthorityInfo Info - CorrelationID string - Endpoints Endpoints - ClientID string - // Redirecturi is used for auth flows that specify a redirect URI (e.g. local server for interactive auth flow). - Redirecturi string - HomeAccountID string - // Username is the user-name portion for username/password auth flow. - Username string - // Password is the password portion for username/password auth flow. - Password string - // Scopes is the list of scopes the user consents to. - Scopes []string - // AuthorizationType specifies the auth flow being used. - AuthorizationType AuthorizeType - // State is a random value used to prevent cross-site request forgery attacks. - State string - // CodeChallenge is derived from a code verifier and is sent in the auth request. - CodeChallenge string - // CodeChallengeMethod describes the method used to create the CodeChallenge. - CodeChallengeMethod string - // Prompt specifies the user prompt type during interactive auth. - Prompt string - // IsConfidentialClient specifies if it is a confidential client. - IsConfidentialClient bool - // SendX5C specifies if x5c claim(public key of the certificate) should be sent to STS. - SendX5C bool - // UserAssertion is the access token used to acquire token on behalf of user - UserAssertion string - // Capabilities the client will include with each token request, for example "CP1". - // Call [NewClientCapabilities] to construct a value for this field. - Capabilities ClientCapabilities - // Claims required for an access token to satisfy a conditional access policy - Claims string - // KnownAuthorityHosts don't require metadata discovery because they're known to the user - KnownAuthorityHosts []string - // LoginHint is a username with which to pre-populate account selection during interactive auth - LoginHint string - // DomainHint is a directive that can be used to accelerate the user to their federated IdP sign-in page - DomainHint string - // AuthnScheme is an optional scheme for formatting access tokens - AuthnScheme AuthenticationScheme -} - -// NewAuthParams creates an authorization parameters object. -func NewAuthParams(clientID string, authorityInfo Info) AuthParams { - return AuthParams{ - ClientID: clientID, - AuthorityInfo: authorityInfo, - CorrelationID: uuid.New().String(), - AuthnScheme: &bearerAuthnScheme, - } -} - -// WithTenant returns a copy of the AuthParams having the specified tenant ID. If the given -// ID is empty, the copy is identical to the original. This function returns an error in -// several cases: -// - ID isn't specific (for example, it's "common") -// - ID is non-empty and the authority doesn't support tenants (for example, it's an ADFS authority) -// - the client is configured to authenticate only Microsoft accounts via the "consumers" endpoint -// - the resulting authority URL is invalid -func (p AuthParams) WithTenant(ID string) (AuthParams, error) { - switch ID { - case "", p.AuthorityInfo.Tenant: - // keep the default tenant because the caller didn't override it - return p, nil - case "common", "consumers", "organizations": - if p.AuthorityInfo.AuthorityType == AAD { - return p, fmt.Errorf(`tenant ID must be a specific tenant, not "%s"`, ID) - } - // else we'll return a better error below - } - if p.AuthorityInfo.AuthorityType != AAD { - return p, errors.New("the authority doesn't support tenants") - } - if p.AuthorityInfo.Tenant == "consumers" { - return p, errors.New(`client is configured to authenticate only personal Microsoft accounts, via the "consumers" endpoint`) - } - authority := "https://" + path.Join(p.AuthorityInfo.Host, ID) - info, err := NewInfoFromAuthorityURI(authority, p.AuthorityInfo.ValidateAuthority, p.AuthorityInfo.InstanceDiscoveryDisabled) - if err == nil { - info.Region = p.AuthorityInfo.Region - p.AuthorityInfo = info - } - return p, err -} - -// MergeCapabilitiesAndClaims combines client capabilities and challenge claims into a value suitable for an authentication request's "claims" parameter. -func (p AuthParams) MergeCapabilitiesAndClaims() (string, error) { - claims := p.Claims - if len(p.Capabilities.asMap) > 0 { - if claims == "" { - // without claims the result is simply the capabilities - return p.Capabilities.asJSON, nil - } - // Otherwise, merge claims and capabilties into a single JSON object. - // We handle the claims challenge as a map because we don't know its structure. - var challenge map[string]any - if err := json.Unmarshal([]byte(claims), &challenge); err != nil { - return "", fmt.Errorf(`claims must be JSON. Are they base64 encoded? json.Unmarshal returned "%v"`, err) - } - if err := merge(p.Capabilities.asMap, challenge); err != nil { - return "", err - } - b, err := json.Marshal(challenge) - if err != nil { - return "", err - } - claims = string(b) - } - return claims, nil -} - -// merges a into b without overwriting b's values. Returns an error when a and b share a key for which either has a non-object value. -func merge(a, b map[string]any) error { - for k, av := range a { - if bv, ok := b[k]; !ok { - // b doesn't contain this key => simply set it to a's value - b[k] = av - } else { - // b does contain this key => recursively merge a[k] into b[k], provided both are maps. If a[k] or b[k] isn't - // a map, return an error because merging would overwrite some value in b. Errors shouldn't occur in practice - // because the challenge will be from AAD, which knows the capabilities format. - if A, ok := av.(map[string]any); ok { - if B, ok := bv.(map[string]any); ok { - return merge(A, B) - } else { - // b[k] isn't a map - return errors.New("challenge claims conflict with client capabilities") - } - } else { - // a[k] isn't a map - return errors.New("challenge claims conflict with client capabilities") - } - } - } - return nil -} - -// ClientCapabilities stores capabilities in the formats used by AuthParams.MergeCapabilitiesAndClaims. -// [NewClientCapabilities] precomputes these representations because capabilities are static for the -// lifetime of a client and are included with every authentication request i.e., these computations -// always have the same result and would otherwise have to be repeated for every request. -type ClientCapabilities struct { - // asJSON is for the common case: adding the capabilities to an auth request with no challenge claims - asJSON string - // asMap is for merging the capabilities with challenge claims - asMap map[string]any -} - -func NewClientCapabilities(capabilities []string) (ClientCapabilities, error) { - c := ClientCapabilities{} - var err error - if len(capabilities) > 0 { - cpbs := make([]string, len(capabilities)) - for i := 0; i < len(cpbs); i++ { - cpbs[i] = fmt.Sprintf(`"%s"`, capabilities[i]) - } - c.asJSON = fmt.Sprintf(`{"access_token":{"xms_cc":{"values":[%s]}}}`, strings.Join(cpbs, ",")) - // note our JSON is valid but we can't stop users breaking it with garbage like "}" - err = json.Unmarshal([]byte(c.asJSON), &c.asMap) - } - return c, err -} - -// Info consists of information about the authority. -type Info struct { - Host string - CanonicalAuthorityURI string - AuthorityType string - UserRealmURIPrefix string - ValidateAuthority bool - Tenant string - Region string - InstanceDiscoveryDisabled bool -} - -func firstPathSegment(u *url.URL) (string, error) { - pathParts := strings.Split(u.EscapedPath(), "/") - if len(pathParts) >= 2 { - return pathParts[1], nil - } - - return "", errors.New(`authority must be an https URL such as "https://login.microsoftonline.com/"`) -} - -// NewInfoFromAuthorityURI creates an AuthorityInfo instance from the authority URL provided. -func NewInfoFromAuthorityURI(authority string, validateAuthority bool, instanceDiscoveryDisabled bool) (Info, error) { - u, err := url.Parse(strings.ToLower(authority)) - if err != nil || u.Scheme != "https" { - return Info{}, errors.New(`authority must be an https URL such as "https://login.microsoftonline.com/ "`) - } - - tenant, err := firstPathSegment(u) - if err != nil { - return Info{}, err - } - authorityType := AAD - if tenant == "adfs" { - authorityType = ADFS - } - - // u.Host includes the port, if any, which is required for private cloud deployments - return Info{ - Host: u.Host, - CanonicalAuthorityURI: fmt.Sprintf("https://%v/%v/", u.Host, tenant), - AuthorityType: authorityType, - UserRealmURIPrefix: fmt.Sprintf("https://%v/common/userrealm/", u.Hostname()), - ValidateAuthority: validateAuthority, - Tenant: tenant, - InstanceDiscoveryDisabled: instanceDiscoveryDisabled, - }, nil -} - -// Endpoints consists of the endpoints from the tenant discovery response. -type Endpoints struct { - AuthorizationEndpoint string - TokenEndpoint string - selfSignedJwtAudience string - authorityHost string -} - -// NewEndpoints creates an Endpoints object. -func NewEndpoints(authorizationEndpoint string, tokenEndpoint string, selfSignedJwtAudience string, authorityHost string) Endpoints { - return Endpoints{authorizationEndpoint, tokenEndpoint, selfSignedJwtAudience, authorityHost} -} - -// UserRealmAccountType refers to the type of user realm. -type UserRealmAccountType string - -// These are the different types of user realms. -const ( - Unknown UserRealmAccountType = "" - Federated UserRealmAccountType = "Federated" - Managed UserRealmAccountType = "Managed" -) - -// UserRealm is used for the username password request to determine user type -type UserRealm struct { - AccountType UserRealmAccountType `json:"account_type"` - DomainName string `json:"domain_name"` - CloudInstanceName string `json:"cloud_instance_name"` - CloudAudienceURN string `json:"cloud_audience_urn"` - - // required if accountType is Federated - FederationProtocol string `json:"federation_protocol"` - FederationMetadataURL string `json:"federation_metadata_url"` - - AdditionalFields map[string]interface{} -} - -func (u UserRealm) validate() error { - switch "" { - case string(u.AccountType): - return errors.New("the account type (Federated or Managed) is missing") - case u.DomainName: - return errors.New("domain name of user realm is missing") - case u.CloudInstanceName: - return errors.New("cloud instance name of user realm is missing") - case u.CloudAudienceURN: - return errors.New("cloud Instance URN is missing") - } - - if u.AccountType == Federated { - switch "" { - case u.FederationProtocol: - return errors.New("federation protocol of user realm is missing") - case u.FederationMetadataURL: - return errors.New("federation metadata URL of user realm is missing") - } - } - return nil -} - -// Client represents the REST calls to authority backends. -type Client struct { - // Comm provides the HTTP transport client. - Comm jsonCaller // *comm.Client -} - -func (c Client) UserRealm(ctx context.Context, authParams AuthParams) (UserRealm, error) { - endpoint := fmt.Sprintf("https://%s/common/UserRealm/%s", authParams.Endpoints.authorityHost, url.PathEscape(authParams.Username)) - qv := url.Values{ - "api-version": []string{"1.0"}, - } - - resp := UserRealm{} - err := c.Comm.JSONCall( - ctx, - endpoint, - http.Header{"client-request-id": []string{authParams.CorrelationID}}, - qv, - nil, - &resp, - ) - if err != nil { - return resp, err - } - - return resp, resp.validate() -} - -func (c Client) GetTenantDiscoveryResponse(ctx context.Context, openIDConfigurationEndpoint string) (TenantDiscoveryResponse, error) { - resp := TenantDiscoveryResponse{} - err := c.Comm.JSONCall( - ctx, - openIDConfigurationEndpoint, - http.Header{}, - nil, - nil, - &resp, - ) - - return resp, err -} - -// AADInstanceDiscovery attempts to discover a tenant endpoint (used in OIDC auth with an authorization endpoint). -// This is done by AAD which allows for aliasing of tenants (windows.sts.net is the same as login.windows.com). -func (c Client) AADInstanceDiscovery(ctx context.Context, authorityInfo Info) (InstanceDiscoveryResponse, error) { - region := "" - var err error - resp := InstanceDiscoveryResponse{} - if authorityInfo.Region != "" && authorityInfo.Region != autoDetectRegion { - region = authorityInfo.Region - } else if authorityInfo.Region == autoDetectRegion { - region = detectRegion(ctx) - } - if region != "" { - environment := authorityInfo.Host - switch environment { - case loginMicrosoft, loginWindows, loginSTSWindows, defaultHost: - environment = loginMicrosoft - } - - resp.TenantDiscoveryEndpoint = fmt.Sprintf(tenantDiscoveryEndpointWithRegion, region, environment, authorityInfo.Tenant) - metadata := InstanceDiscoveryMetadata{ - PreferredNetwork: fmt.Sprintf("%v.%v", region, authorityInfo.Host), - PreferredCache: authorityInfo.Host, - Aliases: []string{fmt.Sprintf("%v.%v", region, authorityInfo.Host), authorityInfo.Host}, - } - resp.Metadata = []InstanceDiscoveryMetadata{metadata} - } else { - qv := url.Values{} - qv.Set("api-version", "1.1") - qv.Set("authorization_endpoint", fmt.Sprintf(authorizationEndpoint, authorityInfo.Host, authorityInfo.Tenant)) - - discoveryHost := defaultHost - if TrustedHost(authorityInfo.Host) { - discoveryHost = authorityInfo.Host - } - - endpoint := fmt.Sprintf(instanceDiscoveryEndpoint, discoveryHost) - err = c.Comm.JSONCall(ctx, endpoint, http.Header{}, qv, nil, &resp) - } - return resp, err -} - -func detectRegion(ctx context.Context) string { - region := os.Getenv(regionName) - if region != "" { - region = strings.ReplaceAll(region, " ", "") - return strings.ToLower(region) - } - // HTTP call to IMDS endpoint to get region - // Refer : https://identitydivision.visualstudio.com/DevEx/_git/AuthLibrariesApiReview?path=%2FPinAuthToRegion%2FAAD%20SDK%20Proposal%20to%20Pin%20Auth%20to%20region.md&_a=preview&version=GBdev - // Set a 2 second timeout for this http client which only does calls to IMDS endpoint - client := http.Client{ - Timeout: time.Duration(2 * time.Second), - } - req, _ := http.NewRequest("GET", imdsEndpoint, nil) - req.Header.Set("Metadata", "true") - resp, err := client.Do(req) - // If the request times out or there is an error, it is retried once - if err != nil || resp.StatusCode != 200 { - resp, err = client.Do(req) - if err != nil || resp.StatusCode != 200 { - return "" - } - } - defer resp.Body.Close() - response, err := io.ReadAll(resp.Body) - if err != nil { - return "" - } - return string(response) -} - -func (a *AuthParams) CacheKey(isAppCache bool) string { - if a.AuthorizationType == ATOnBehalfOf { - return a.AssertionHash() - } - if a.AuthorizationType == ATClientCredentials || isAppCache { - return a.AppKey() - } - if a.AuthorizationType == ATRefreshToken || a.AuthorizationType == AccountByID { - return a.HomeAccountID - } - return "" -} -func (a *AuthParams) AssertionHash() string { - hasher := sha256.New() - // Per documentation this never returns an error : https://pkg.go.dev/hash#pkg-types - _, _ = hasher.Write([]byte(a.UserAssertion)) - sha := base64.URLEncoding.EncodeToString(hasher.Sum(nil)) - return sha -} - -func (a *AuthParams) AppKey() string { - if a.AuthorityInfo.Tenant != "" { - return fmt.Sprintf("%s_%s_AppTokenCache", a.ClientID, a.AuthorityInfo.Tenant) - } - return fmt.Sprintf("%s__AppTokenCache", a.ClientID) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority/authorizetype_string.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority/authorizetype_string.go deleted file mode 100644 index 10039773b0678e0f5baff0c87a57f1370094b8c8..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority/authorizetype_string.go +++ /dev/null @@ -1,30 +0,0 @@ -// Code generated by "stringer -type=AuthorizeType"; DO NOT EDIT. - -package authority - -import "strconv" - -func _() { - // An "invalid array index" compiler error signifies that the constant values have changed. - // Re-run the stringer command to generate them again. - var x [1]struct{} - _ = x[ATUnknown-0] - _ = x[ATUsernamePassword-1] - _ = x[ATWindowsIntegrated-2] - _ = x[ATAuthCode-3] - _ = x[ATInteractive-4] - _ = x[ATClientCredentials-5] - _ = x[ATDeviceCode-6] - _ = x[ATRefreshToken-7] -} - -const _AuthorizeType_name = "ATUnknownATUsernamePasswordATWindowsIntegratedATAuthCodeATInteractiveATClientCredentialsATDeviceCodeATRefreshToken" - -var _AuthorizeType_index = [...]uint8{0, 9, 27, 46, 56, 69, 88, 100, 114} - -func (i AuthorizeType) String() string { - if i < 0 || i >= AuthorizeType(len(_AuthorizeType_index)-1) { - return "AuthorizeType(" + strconv.FormatInt(int64(i), 10) + ")" - } - return _AuthorizeType_name[_AuthorizeType_index[i]:_AuthorizeType_index[i+1]] -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/comm.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/comm.go deleted file mode 100644 index 7d9ec7cd37428551624547599c925578eacd90ee..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/comm.go +++ /dev/null @@ -1,320 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// Package comm provides helpers for communicating with HTTP backends. -package comm - -import ( - "bytes" - "context" - "encoding/json" - "encoding/xml" - "fmt" - "io" - "net/http" - "net/url" - "reflect" - "runtime" - "strings" - "time" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/errors" - customJSON "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/json" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/version" - "github.com/google/uuid" -) - -// HTTPClient represents an HTTP client. -// It's usually an *http.Client from the standard library. -type HTTPClient interface { - // Do sends an HTTP request and returns an HTTP response. - Do(req *http.Request) (*http.Response, error) - - // CloseIdleConnections closes any idle connections in a "keep-alive" state. - CloseIdleConnections() -} - -// Client provides a wrapper to our *http.Client that handles compression and serialization needs. -type Client struct { - client HTTPClient -} - -// New returns a new Client object. -func New(httpClient HTTPClient) *Client { - if httpClient == nil { - panic("http.Client cannot == nil") - } - - return &Client{client: httpClient} -} - -// JSONCall connects to the REST endpoint passing the HTTP query values, headers and JSON conversion -// of body in the HTTP body. It automatically handles compression and decompression with gzip. The response is JSON -// unmarshalled into resp. resp must be a pointer to a struct. If the body struct contains a field called -// "AdditionalFields" we use a custom marshal/unmarshal engine. -func (c *Client) JSONCall(ctx context.Context, endpoint string, headers http.Header, qv url.Values, body, resp interface{}) error { - if qv == nil { - qv = url.Values{} - } - - v := reflect.ValueOf(resp) - if err := c.checkResp(v); err != nil { - return err - } - - // Choose a JSON marshal/unmarshal depending on if we have AdditionalFields attribute. - var marshal = json.Marshal - var unmarshal = json.Unmarshal - if _, ok := v.Elem().Type().FieldByName("AdditionalFields"); ok { - marshal = customJSON.Marshal - unmarshal = customJSON.Unmarshal - } - - u, err := url.Parse(endpoint) - if err != nil { - return fmt.Errorf("could not parse path URL(%s): %w", endpoint, err) - } - u.RawQuery = qv.Encode() - - addStdHeaders(headers) - - req := &http.Request{Method: http.MethodGet, URL: u, Header: headers} - - if body != nil { - // Note: In case your wondering why we are not gzip encoding.... - // I'm not sure if these various services support gzip on send. - headers.Add("Content-Type", "application/json; charset=utf-8") - data, err := marshal(body) - if err != nil { - return fmt.Errorf("bug: conn.Call(): could not marshal the body object: %w", err) - } - req.Body = io.NopCloser(bytes.NewBuffer(data)) - req.Method = http.MethodPost - } - - data, err := c.do(ctx, req) - if err != nil { - return err - } - - if resp != nil { - if err := unmarshal(data, resp); err != nil { - return fmt.Errorf("json decode error: %w\njson message bytes were: %s", err, string(data)) - } - } - return nil -} - -// XMLCall connects to an endpoint and decodes the XML response into resp. This is used when -// sending application/xml . If sending XML via SOAP, use SOAPCall(). -func (c *Client) XMLCall(ctx context.Context, endpoint string, headers http.Header, qv url.Values, resp interface{}) error { - if err := c.checkResp(reflect.ValueOf(resp)); err != nil { - return err - } - - if qv == nil { - qv = url.Values{} - } - - u, err := url.Parse(endpoint) - if err != nil { - return fmt.Errorf("could not parse path URL(%s): %w", endpoint, err) - } - u.RawQuery = qv.Encode() - - headers.Set("Content-Type", "application/xml; charset=utf-8") // This was not set in he original Mex(), but... - addStdHeaders(headers) - - return c.xmlCall(ctx, u, headers, "", resp) -} - -// SOAPCall returns the SOAP message given an endpoint, action, body of the request and the response object to marshal into. -func (c *Client) SOAPCall(ctx context.Context, endpoint, action string, headers http.Header, qv url.Values, body string, resp interface{}) error { - if body == "" { - return fmt.Errorf("cannot make a SOAP call with body set to empty string") - } - - if err := c.checkResp(reflect.ValueOf(resp)); err != nil { - return err - } - - if qv == nil { - qv = url.Values{} - } - - u, err := url.Parse(endpoint) - if err != nil { - return fmt.Errorf("could not parse path URL(%s): %w", endpoint, err) - } - u.RawQuery = qv.Encode() - - headers.Set("Content-Type", "application/soap+xml; charset=utf-8") - headers.Set("SOAPAction", action) - addStdHeaders(headers) - - return c.xmlCall(ctx, u, headers, body, resp) -} - -// xmlCall sends an XML in body and decodes into resp. This simply does the transport and relies on -// an upper level call to set things such as SOAP parameters and Content-Type, if required. -func (c *Client) xmlCall(ctx context.Context, u *url.URL, headers http.Header, body string, resp interface{}) error { - req := &http.Request{Method: http.MethodGet, URL: u, Header: headers} - - if len(body) > 0 { - req.Method = http.MethodPost - req.Body = io.NopCloser(strings.NewReader(body)) - } - - data, err := c.do(ctx, req) - if err != nil { - return err - } - - return xml.Unmarshal(data, resp) -} - -// URLFormCall is used to make a call where we need to send application/x-www-form-urlencoded data -// to the backend and receive JSON back. qv will be encoded into the request body. -func (c *Client) URLFormCall(ctx context.Context, endpoint string, qv url.Values, resp interface{}) error { - if len(qv) == 0 { - return fmt.Errorf("URLFormCall() requires qv to have non-zero length") - } - - if err := c.checkResp(reflect.ValueOf(resp)); err != nil { - return err - } - - u, err := url.Parse(endpoint) - if err != nil { - return fmt.Errorf("could not parse path URL(%s): %w", endpoint, err) - } - - headers := http.Header{} - headers.Set("Content-Type", "application/x-www-form-urlencoded; charset=utf-8") - addStdHeaders(headers) - - enc := qv.Encode() - - req := &http.Request{ - Method: http.MethodPost, - URL: u, - Header: headers, - ContentLength: int64(len(enc)), - Body: io.NopCloser(strings.NewReader(enc)), - GetBody: func() (io.ReadCloser, error) { - return io.NopCloser(strings.NewReader(enc)), nil - }, - } - - data, err := c.do(ctx, req) - if err != nil { - return err - } - - v := reflect.ValueOf(resp) - if err := c.checkResp(v); err != nil { - return err - } - - var unmarshal = json.Unmarshal - if _, ok := v.Elem().Type().FieldByName("AdditionalFields"); ok { - unmarshal = customJSON.Unmarshal - } - if resp != nil { - if err := unmarshal(data, resp); err != nil { - return fmt.Errorf("json decode error: %w\nraw message was: %s", err, string(data)) - } - } - return nil -} - -// do makes the HTTP call to the server and returns the contents of the body. -func (c *Client) do(ctx context.Context, req *http.Request) ([]byte, error) { - if _, ok := ctx.Deadline(); !ok { - var cancel context.CancelFunc - ctx, cancel = context.WithTimeout(ctx, 30*time.Second) - defer cancel() - } - req = req.WithContext(ctx) - - reply, err := c.client.Do(req) - if err != nil { - return nil, fmt.Errorf("server response error:\n %w", err) - } - defer reply.Body.Close() - - data, err := c.readBody(reply) - if err != nil { - return nil, fmt.Errorf("could not read the body of an HTTP Response: %w", err) - } - reply.Body = io.NopCloser(bytes.NewBuffer(data)) - - // NOTE: This doesn't happen immediately after the call so that we can get an error message - // from the server and include it in our error. - switch reply.StatusCode { - case 200, 201: - default: - sd := strings.TrimSpace(string(data)) - if sd != "" { - // We probably have the error in the body. - return nil, errors.CallErr{ - Req: req, - Resp: reply, - Err: fmt.Errorf("http call(%s)(%s) error: reply status code was %d:\n%s", req.URL.String(), req.Method, reply.StatusCode, sd), - } - } - return nil, errors.CallErr{ - Req: req, - Resp: reply, - Err: fmt.Errorf("http call(%s)(%s) error: reply status code was %d", req.URL.String(), req.Method, reply.StatusCode), - } - } - - return data, nil -} - -// checkResp checks a response object o make sure it is a pointer to a struct. -func (c *Client) checkResp(v reflect.Value) error { - if v.Kind() != reflect.Ptr { - return fmt.Errorf("bug: resp argument must a *struct, was %T", v.Interface()) - } - v = v.Elem() - if v.Kind() != reflect.Struct { - return fmt.Errorf("bug: resp argument must be a *struct, was %T", v.Interface()) - } - return nil -} - -// readBody reads the body out of an *http.Response. It supports gzip encoded responses. -func (c *Client) readBody(resp *http.Response) ([]byte, error) { - var reader io.Reader = resp.Body - switch resp.Header.Get("Content-Encoding") { - case "": - // Do nothing - case "gzip": - reader = gzipDecompress(resp.Body) - default: - return nil, fmt.Errorf("bug: comm.Client.JSONCall(): content was send with unsupported content-encoding %s", resp.Header.Get("Content-Encoding")) - } - return io.ReadAll(reader) -} - -var testID string - -// addStdHeaders adds the standard headers we use on all calls. -func addStdHeaders(headers http.Header) http.Header { - headers.Set("Accept-Encoding", "gzip") - // So that I can have a static id for tests. - if testID != "" { - headers.Set("client-request-id", testID) - headers.Set("Return-Client-Request-Id", "false") - } else { - headers.Set("client-request-id", uuid.New().String()) - headers.Set("Return-Client-Request-Id", "false") - } - headers.Set("x-client-sku", "MSAL.Go") - headers.Set("x-client-os", runtime.GOOS) - headers.Set("x-client-cpu", runtime.GOARCH) - headers.Set("x-client-ver", version.Version) - return headers -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/compress.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/compress.go deleted file mode 100644 index 4d3dbfcf0a6b97e2c11adedd3d6847225646b720..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/compress.go +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package comm - -import ( - "compress/gzip" - "io" -) - -func gzipDecompress(r io.Reader) io.Reader { - gzipReader, _ := gzip.NewReader(r) - - pipeOut, pipeIn := io.Pipe() - go func() { - // decompression bomb would have to come from Azure services. - // If we want to limit, we should do that in comm.do(). - _, err := io.Copy(pipeIn, gzipReader) //nolint - if err != nil { - // don't need the error. - pipeIn.CloseWithError(err) //nolint - gzipReader.Close() - return - } - if err := gzipReader.Close(); err != nil { - // don't need the error. - pipeIn.CloseWithError(err) //nolint - return - } - pipeIn.Close() - }() - return pipeOut -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/grant/grant.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/grant/grant.go deleted file mode 100644 index b628f61ac0810d8975689d81f788946022ebe3c9..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/grant/grant.go +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// Package grant holds types of grants issued by authorization services. -package grant - -const ( - Password = "password" - JWT = "urn:ietf:params:oauth:grant-type:jwt-bearer" - SAMLV1 = "urn:ietf:params:oauth:grant-type:saml1_1-bearer" - SAMLV2 = "urn:ietf:params:oauth:grant-type:saml2-bearer" - DeviceCode = "device_code" - AuthCode = "authorization_code" - RefreshToken = "refresh_token" - ClientCredential = "client_credentials" - ClientAssertion = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer" -) diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/ops.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/ops.go deleted file mode 100644 index 1f9c543fa3b23e744c6272a08863d365c0efbdf6..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/ops.go +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -/* -Package ops provides operations to various backend services using REST clients. - -The REST type provides several clients that can be used to communicate to backends. -Usage is simple: - - rest := ops.New() - - // Creates an authority client and calls the UserRealm() method. - userRealm, err := rest.Authority().UserRealm(ctx, authParameters) - if err != nil { - // Do something - } -*/ -package ops - -import ( - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust" -) - -// HTTPClient represents an HTTP client. -// It's usually an *http.Client from the standard library. -type HTTPClient = comm.HTTPClient - -// REST provides REST clients for communicating with various backends used by MSAL. -type REST struct { - client *comm.Client -} - -// New is the constructor for REST. -func New(httpClient HTTPClient) *REST { - return &REST{client: comm.New(httpClient)} -} - -// Authority returns a client for querying information about various authorities. -func (r *REST) Authority() authority.Client { - return authority.Client{Comm: r.client} -} - -// AccessTokens returns a client that can be used to get various access tokens for -// authorization purposes. -func (r *REST) AccessTokens() accesstokens.Client { - return accesstokens.Client{Comm: r.client} -} - -// WSTrust provides access to various metadata in a WSTrust service. This data can -// be used to gain tokens based on SAML data using the client provided by AccessTokens(). -func (r *REST) WSTrust() wstrust.Client { - return wstrust.Client{Comm: r.client} -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/endpointtype_string.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/endpointtype_string.go deleted file mode 100644 index a2bb6278ae5f7434d29d2d36c3908b7491434ca6..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/endpointtype_string.go +++ /dev/null @@ -1,25 +0,0 @@ -// Code generated by "stringer -type=endpointType"; DO NOT EDIT. - -package defs - -import "strconv" - -func _() { - // An "invalid array index" compiler error signifies that the constant values have changed. - // Re-run the stringer command to generate them again. - var x [1]struct{} - _ = x[etUnknown-0] - _ = x[etUsernamePassword-1] - _ = x[etWindowsTransport-2] -} - -const _endpointType_name = "etUnknownetUsernamePasswordetWindowsTransport" - -var _endpointType_index = [...]uint8{0, 9, 27, 45} - -func (i endpointType) String() string { - if i < 0 || i >= endpointType(len(_endpointType_index)-1) { - return "endpointType(" + strconv.FormatInt(int64(i), 10) + ")" - } - return _endpointType_name[_endpointType_index[i]:_endpointType_index[i+1]] -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/mex_document_definitions.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/mex_document_definitions.go deleted file mode 100644 index 6497270028d84edcb2774c0f34e5a3d4631f1cfd..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/mex_document_definitions.go +++ /dev/null @@ -1,394 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package defs - -import "encoding/xml" - -type Definitions struct { - XMLName xml.Name `xml:"definitions"` - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - TargetNamespace string `xml:"targetNamespace,attr"` - WSDL string `xml:"wsdl,attr"` - XSD string `xml:"xsd,attr"` - T string `xml:"t,attr"` - SOAPENC string `xml:"soapenc,attr"` - SOAP string `xml:"soap,attr"` - TNS string `xml:"tns,attr"` - MSC string `xml:"msc,attr"` - WSAM string `xml:"wsam,attr"` - SOAP12 string `xml:"soap12,attr"` - WSA10 string `xml:"wsa10,attr"` - WSA string `xml:"wsa,attr"` - WSAW string `xml:"wsaw,attr"` - WSX string `xml:"wsx,attr"` - WSAP string `xml:"wsap,attr"` - WSU string `xml:"wsu,attr"` - Trust string `xml:"trust,attr"` - WSP string `xml:"wsp,attr"` - Policy []Policy `xml:"Policy"` - Types Types `xml:"types"` - Message []Message `xml:"message"` - PortType []PortType `xml:"portType"` - Binding []Binding `xml:"binding"` - Service Service `xml:"service"` -} - -type Policy struct { - Text string `xml:",chardata"` - ID string `xml:"Id,attr"` - ExactlyOne ExactlyOne `xml:"ExactlyOne"` -} - -type ExactlyOne struct { - Text string `xml:",chardata"` - All All `xml:"All"` -} - -type All struct { - Text string `xml:",chardata"` - NegotiateAuthentication NegotiateAuthentication `xml:"NegotiateAuthentication"` - TransportBinding TransportBinding `xml:"TransportBinding"` - UsingAddressing Text `xml:"UsingAddressing"` - EndorsingSupportingTokens EndorsingSupportingTokens `xml:"EndorsingSupportingTokens"` - WSS11 WSS11 `xml:"Wss11"` - Trust10 Trust10 `xml:"Trust10"` - SignedSupportingTokens SignedSupportingTokens `xml:"SignedSupportingTokens"` - Trust13 WSTrust13 `xml:"Trust13"` - SignedEncryptedSupportingTokens SignedEncryptedSupportingTokens `xml:"SignedEncryptedSupportingTokens"` -} - -type NegotiateAuthentication struct { - Text string `xml:",chardata"` - HTTP string `xml:"http,attr"` - XMLName xml.Name -} - -type TransportBinding struct { - Text string `xml:",chardata"` - SP string `xml:"sp,attr"` - Policy TransportBindingPolicy `xml:"Policy"` -} - -type TransportBindingPolicy struct { - Text string `xml:",chardata"` - TransportToken TransportToken `xml:"TransportToken"` - AlgorithmSuite AlgorithmSuite `xml:"AlgorithmSuite"` - Layout Layout `xml:"Layout"` - IncludeTimestamp Text `xml:"IncludeTimestamp"` -} - -type TransportToken struct { - Text string `xml:",chardata"` - Policy TransportTokenPolicy `xml:"Policy"` -} - -type TransportTokenPolicy struct { - Text string `xml:",chardata"` - HTTPSToken HTTPSToken `xml:"HttpsToken"` -} - -type HTTPSToken struct { - Text string `xml:",chardata"` - RequireClientCertificate string `xml:"RequireClientCertificate,attr"` -} - -type AlgorithmSuite struct { - Text string `xml:",chardata"` - Policy AlgorithmSuitePolicy `xml:"Policy"` -} - -type AlgorithmSuitePolicy struct { - Text string `xml:",chardata"` - Basic256 Text `xml:"Basic256"` - Basic128 Text `xml:"Basic128"` -} - -type Layout struct { - Text string `xml:",chardata"` - Policy LayoutPolicy `xml:"Policy"` -} - -type LayoutPolicy struct { - Text string `xml:",chardata"` - Strict Text `xml:"Strict"` -} - -type EndorsingSupportingTokens struct { - Text string `xml:",chardata"` - SP string `xml:"sp,attr"` - Policy EndorsingSupportingTokensPolicy `xml:"Policy"` -} - -type EndorsingSupportingTokensPolicy struct { - Text string `xml:",chardata"` - X509Token X509Token `xml:"X509Token"` - RSAToken RSAToken `xml:"RsaToken"` - SignedParts SignedParts `xml:"SignedParts"` - KerberosToken KerberosToken `xml:"KerberosToken"` - IssuedToken IssuedToken `xml:"IssuedToken"` - KeyValueToken KeyValueToken `xml:"KeyValueToken"` -} - -type X509Token struct { - Text string `xml:",chardata"` - IncludeToken string `xml:"IncludeToken,attr"` - Policy X509TokenPolicy `xml:"Policy"` -} - -type X509TokenPolicy struct { - Text string `xml:",chardata"` - RequireThumbprintReference Text `xml:"RequireThumbprintReference"` - WSSX509V3Token10 Text `xml:"WssX509V3Token10"` -} - -type RSAToken struct { - Text string `xml:",chardata"` - IncludeToken string `xml:"IncludeToken,attr"` - Optional string `xml:"Optional,attr"` - MSSP string `xml:"mssp,attr"` -} - -type SignedParts struct { - Text string `xml:",chardata"` - Header SignedPartsHeader `xml:"Header"` -} - -type SignedPartsHeader struct { - Text string `xml:",chardata"` - Name string `xml:"Name,attr"` - Namespace string `xml:"Namespace,attr"` -} - -type KerberosToken struct { - Text string `xml:",chardata"` - IncludeToken string `xml:"IncludeToken,attr"` - Policy KerberosTokenPolicy `xml:"Policy"` -} - -type KerberosTokenPolicy struct { - Text string `xml:",chardata"` - WSSGSSKerberosV5ApReqToken11 Text `xml:"WssGssKerberosV5ApReqToken11"` -} - -type IssuedToken struct { - Text string `xml:",chardata"` - IncludeToken string `xml:"IncludeToken,attr"` - RequestSecurityTokenTemplate RequestSecurityTokenTemplate `xml:"RequestSecurityTokenTemplate"` - Policy IssuedTokenPolicy `xml:"Policy"` -} - -type RequestSecurityTokenTemplate struct { - Text string `xml:",chardata"` - KeyType Text `xml:"KeyType"` - EncryptWith Text `xml:"EncryptWith"` - SignatureAlgorithm Text `xml:"SignatureAlgorithm"` - CanonicalizationAlgorithm Text `xml:"CanonicalizationAlgorithm"` - EncryptionAlgorithm Text `xml:"EncryptionAlgorithm"` - KeySize Text `xml:"KeySize"` - KeyWrapAlgorithm Text `xml:"KeyWrapAlgorithm"` -} - -type IssuedTokenPolicy struct { - Text string `xml:",chardata"` - RequireInternalReference Text `xml:"RequireInternalReference"` -} - -type KeyValueToken struct { - Text string `xml:",chardata"` - IncludeToken string `xml:"IncludeToken,attr"` - Optional string `xml:"Optional,attr"` -} - -type WSS11 struct { - Text string `xml:",chardata"` - SP string `xml:"sp,attr"` - Policy Wss11Policy `xml:"Policy"` -} - -type Wss11Policy struct { - Text string `xml:",chardata"` - MustSupportRefThumbprint Text `xml:"MustSupportRefThumbprint"` -} - -type Trust10 struct { - Text string `xml:",chardata"` - SP string `xml:"sp,attr"` - Policy Trust10Policy `xml:"Policy"` -} - -type Trust10Policy struct { - Text string `xml:",chardata"` - MustSupportIssuedTokens Text `xml:"MustSupportIssuedTokens"` - RequireClientEntropy Text `xml:"RequireClientEntropy"` - RequireServerEntropy Text `xml:"RequireServerEntropy"` -} - -type SignedSupportingTokens struct { - Text string `xml:",chardata"` - SP string `xml:"sp,attr"` - Policy SupportingTokensPolicy `xml:"Policy"` -} - -type SupportingTokensPolicy struct { - Text string `xml:",chardata"` - UsernameToken UsernameToken `xml:"UsernameToken"` -} -type UsernameToken struct { - Text string `xml:",chardata"` - IncludeToken string `xml:"IncludeToken,attr"` - Policy UsernameTokenPolicy `xml:"Policy"` -} - -type UsernameTokenPolicy struct { - Text string `xml:",chardata"` - WSSUsernameToken10 WSSUsernameToken10 `xml:"WssUsernameToken10"` -} - -type WSSUsernameToken10 struct { - Text string `xml:",chardata"` - XMLName xml.Name -} - -type WSTrust13 struct { - Text string `xml:",chardata"` - SP string `xml:"sp,attr"` - Policy WSTrust13Policy `xml:"Policy"` -} - -type WSTrust13Policy struct { - Text string `xml:",chardata"` - MustSupportIssuedTokens Text `xml:"MustSupportIssuedTokens"` - RequireClientEntropy Text `xml:"RequireClientEntropy"` - RequireServerEntropy Text `xml:"RequireServerEntropy"` -} - -type SignedEncryptedSupportingTokens struct { - Text string `xml:",chardata"` - SP string `xml:"sp,attr"` - Policy SupportingTokensPolicy `xml:"Policy"` -} - -type Types struct { - Text string `xml:",chardata"` - Schema Schema `xml:"schema"` -} - -type Schema struct { - Text string `xml:",chardata"` - TargetNamespace string `xml:"targetNamespace,attr"` - Import []Import `xml:"import"` -} - -type Import struct { - Text string `xml:",chardata"` - SchemaLocation string `xml:"schemaLocation,attr"` - Namespace string `xml:"namespace,attr"` -} - -type Message struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Part Part `xml:"part"` -} - -type Part struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Element string `xml:"element,attr"` -} - -type PortType struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Operation Operation `xml:"operation"` -} - -type Operation struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Input OperationIO `xml:"input"` - Output OperationIO `xml:"output"` -} - -type OperationIO struct { - Text string `xml:",chardata"` - Action string `xml:"Action,attr"` - Message string `xml:"message,attr"` - Body OperationIOBody `xml:"body"` -} - -type OperationIOBody struct { - Text string `xml:",chardata"` - Use string `xml:"use,attr"` -} - -type Binding struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Type string `xml:"type,attr"` - PolicyReference PolicyReference `xml:"PolicyReference"` - Binding DefinitionsBinding `xml:"binding"` - Operation BindingOperation `xml:"operation"` -} - -type PolicyReference struct { - Text string `xml:",chardata"` - URI string `xml:"URI,attr"` -} - -type DefinitionsBinding struct { - Text string `xml:",chardata"` - Transport string `xml:"transport,attr"` -} - -type BindingOperation struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Operation BindingOperationOperation `xml:"operation"` - Input BindingOperationIO `xml:"input"` - Output BindingOperationIO `xml:"output"` -} - -type BindingOperationOperation struct { - Text string `xml:",chardata"` - SoapAction string `xml:"soapAction,attr"` - Style string `xml:"style,attr"` -} - -type BindingOperationIO struct { - Text string `xml:",chardata"` - Body OperationIOBody `xml:"body"` -} - -type Service struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Port []Port `xml:"port"` -} - -type Port struct { - Text string `xml:",chardata"` - Name string `xml:"name,attr"` - Binding string `xml:"binding,attr"` - Address Address `xml:"address"` - EndpointReference PortEndpointReference `xml:"EndpointReference"` -} - -type Address struct { - Text string `xml:",chardata"` - Location string `xml:"location,attr"` -} - -type PortEndpointReference struct { - Text string `xml:",chardata"` - Address Text `xml:"Address"` - Identity Identity `xml:"Identity"` -} - -type Identity struct { - Text string `xml:",chardata"` - XMLNS string `xml:"xmlns,attr"` - SPN Text `xml:"Spn"` -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/saml_assertion_definitions.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/saml_assertion_definitions.go deleted file mode 100644 index 7d07255657771fdaa9f54ce9530c39375e8acc6f..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/saml_assertion_definitions.go +++ /dev/null @@ -1,230 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package defs - -import "encoding/xml" - -// TODO(msal): Someone (and it ain't gonna be me) needs to document these attributes or -// at the least put a link to RFC. - -type SAMLDefinitions struct { - XMLName xml.Name `xml:"Envelope"` - Text string `xml:",chardata"` - S string `xml:"s,attr"` - A string `xml:"a,attr"` - U string `xml:"u,attr"` - Header Header `xml:"Header"` - Body Body `xml:"Body"` -} - -type Header struct { - Text string `xml:",chardata"` - Action Action `xml:"Action"` - Security Security `xml:"Security"` -} - -type Action struct { - Text string `xml:",chardata"` - MustUnderstand string `xml:"mustUnderstand,attr"` -} - -type Security struct { - Text string `xml:",chardata"` - MustUnderstand string `xml:"mustUnderstand,attr"` - O string `xml:"o,attr"` - Timestamp Timestamp `xml:"Timestamp"` -} - -type Timestamp struct { - Text string `xml:",chardata"` - ID string `xml:"Id,attr"` - Created Text `xml:"Created"` - Expires Text `xml:"Expires"` -} - -type Text struct { - Text string `xml:",chardata"` -} - -type Body struct { - Text string `xml:",chardata"` - RequestSecurityTokenResponseCollection RequestSecurityTokenResponseCollection `xml:"RequestSecurityTokenResponseCollection"` -} - -type RequestSecurityTokenResponseCollection struct { - Text string `xml:",chardata"` - Trust string `xml:"trust,attr"` - RequestSecurityTokenResponse []RequestSecurityTokenResponse `xml:"RequestSecurityTokenResponse"` -} - -type RequestSecurityTokenResponse struct { - Text string `xml:",chardata"` - Lifetime Lifetime `xml:"Lifetime"` - AppliesTo AppliesTo `xml:"AppliesTo"` - RequestedSecurityToken RequestedSecurityToken `xml:"RequestedSecurityToken"` - RequestedAttachedReference RequestedAttachedReference `xml:"RequestedAttachedReference"` - RequestedUnattachedReference RequestedUnattachedReference `xml:"RequestedUnattachedReference"` - TokenType Text `xml:"TokenType"` - RequestType Text `xml:"RequestType"` - KeyType Text `xml:"KeyType"` -} - -type Lifetime struct { - Text string `xml:",chardata"` - Created WSUTimestamp `xml:"Created"` - Expires WSUTimestamp `xml:"Expires"` -} - -type WSUTimestamp struct { - Text string `xml:",chardata"` - Wsu string `xml:"wsu,attr"` -} - -type AppliesTo struct { - Text string `xml:",chardata"` - Wsp string `xml:"wsp,attr"` - EndpointReference EndpointReference `xml:"EndpointReference"` -} - -type EndpointReference struct { - Text string `xml:",chardata"` - Wsa string `xml:"wsa,attr"` - Address Text `xml:"Address"` -} - -type RequestedSecurityToken struct { - Text string `xml:",chardata"` - AssertionRawXML string `xml:",innerxml"` - Assertion Assertion `xml:"Assertion"` -} - -type Assertion struct { - XMLName xml.Name // Normally its `xml:"Assertion"`, but I think they want to capture the xmlns - Text string `xml:",chardata"` - MajorVersion string `xml:"MajorVersion,attr"` - MinorVersion string `xml:"MinorVersion,attr"` - AssertionID string `xml:"AssertionID,attr"` - Issuer string `xml:"Issuer,attr"` - IssueInstant string `xml:"IssueInstant,attr"` - Saml string `xml:"saml,attr"` - Conditions Conditions `xml:"Conditions"` - AttributeStatement AttributeStatement `xml:"AttributeStatement"` - AuthenticationStatement AuthenticationStatement `xml:"AuthenticationStatement"` - Signature Signature `xml:"Signature"` -} - -type Conditions struct { - Text string `xml:",chardata"` - NotBefore string `xml:"NotBefore,attr"` - NotOnOrAfter string `xml:"NotOnOrAfter,attr"` - AudienceRestrictionCondition AudienceRestrictionCondition `xml:"AudienceRestrictionCondition"` -} - -type AudienceRestrictionCondition struct { - Text string `xml:",chardata"` - Audience Text `xml:"Audience"` -} - -type AttributeStatement struct { - Text string `xml:",chardata"` - Subject Subject `xml:"Subject"` - Attribute []Attribute `xml:"Attribute"` -} - -type Subject struct { - Text string `xml:",chardata"` - NameIdentifier NameIdentifier `xml:"NameIdentifier"` - SubjectConfirmation SubjectConfirmation `xml:"SubjectConfirmation"` -} - -type NameIdentifier struct { - Text string `xml:",chardata"` - Format string `xml:"Format,attr"` -} - -type SubjectConfirmation struct { - Text string `xml:",chardata"` - ConfirmationMethod Text `xml:"ConfirmationMethod"` -} - -type Attribute struct { - Text string `xml:",chardata"` - AttributeName string `xml:"AttributeName,attr"` - AttributeNamespace string `xml:"AttributeNamespace,attr"` - AttributeValue Text `xml:"AttributeValue"` -} - -type AuthenticationStatement struct { - Text string `xml:",chardata"` - AuthenticationMethod string `xml:"AuthenticationMethod,attr"` - AuthenticationInstant string `xml:"AuthenticationInstant,attr"` - Subject Subject `xml:"Subject"` -} - -type Signature struct { - Text string `xml:",chardata"` - Ds string `xml:"ds,attr"` - SignedInfo SignedInfo `xml:"SignedInfo"` - SignatureValue Text `xml:"SignatureValue"` - KeyInfo KeyInfo `xml:"KeyInfo"` -} - -type SignedInfo struct { - Text string `xml:",chardata"` - CanonicalizationMethod Method `xml:"CanonicalizationMethod"` - SignatureMethod Method `xml:"SignatureMethod"` - Reference Reference `xml:"Reference"` -} - -type Method struct { - Text string `xml:",chardata"` - Algorithm string `xml:"Algorithm,attr"` -} - -type Reference struct { - Text string `xml:",chardata"` - URI string `xml:"URI,attr"` - Transforms Transforms `xml:"Transforms"` - DigestMethod Method `xml:"DigestMethod"` - DigestValue Text `xml:"DigestValue"` -} - -type Transforms struct { - Text string `xml:",chardata"` - Transform []Method `xml:"Transform"` -} - -type KeyInfo struct { - Text string `xml:",chardata"` - Xmlns string `xml:"xmlns,attr"` - X509Data X509Data `xml:"X509Data"` -} - -type X509Data struct { - Text string `xml:",chardata"` - X509Certificate Text `xml:"X509Certificate"` -} - -type RequestedAttachedReference struct { - Text string `xml:",chardata"` - SecurityTokenReference SecurityTokenReference `xml:"SecurityTokenReference"` -} - -type SecurityTokenReference struct { - Text string `xml:",chardata"` - TokenType string `xml:"TokenType,attr"` - O string `xml:"o,attr"` - K string `xml:"k,attr"` - KeyIdentifier KeyIdentifier `xml:"KeyIdentifier"` -} - -type KeyIdentifier struct { - Text string `xml:",chardata"` - ValueType string `xml:"ValueType,attr"` -} - -type RequestedUnattachedReference struct { - Text string `xml:",chardata"` - SecurityTokenReference SecurityTokenReference `xml:"SecurityTokenReference"` -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/version_string.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/version_string.go deleted file mode 100644 index 6fe5efa8a9abfabda3578718b0a0cad7b2fc54e1..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/version_string.go +++ /dev/null @@ -1,25 +0,0 @@ -// Code generated by "stringer -type=Version"; DO NOT EDIT. - -package defs - -import "strconv" - -func _() { - // An "invalid array index" compiler error signifies that the constant values have changed. - // Re-run the stringer command to generate them again. - var x [1]struct{} - _ = x[TrustUnknown-0] - _ = x[Trust2005-1] - _ = x[Trust13-2] -} - -const _Version_name = "TrustUnknownTrust2005Trust13" - -var _Version_index = [...]uint8{0, 12, 21, 28} - -func (i Version) String() string { - if i < 0 || i >= Version(len(_Version_index)-1) { - return "Version(" + strconv.FormatInt(int64(i), 10) + ")" - } - return _Version_name[_Version_index[i]:_Version_index[i+1]] -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/wstrust_endpoint.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/wstrust_endpoint.go deleted file mode 100644 index 8fad5efb5de591496428c271ceabebacad1b80b0..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/wstrust_endpoint.go +++ /dev/null @@ -1,199 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package defs - -import ( - "encoding/xml" - "fmt" - "time" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - uuid "github.com/google/uuid" -) - -//go:generate stringer -type=Version - -type Version int - -const ( - TrustUnknown Version = iota - Trust2005 - Trust13 -) - -// Endpoint represents a WSTrust endpoint. -type Endpoint struct { - // Version is the version of the endpoint. - Version Version - // URL is the URL of the endpoint. - URL string -} - -type wsTrustTokenRequestEnvelope struct { - XMLName xml.Name `xml:"s:Envelope"` - Text string `xml:",chardata"` - S string `xml:"xmlns:s,attr"` - Wsa string `xml:"xmlns:wsa,attr"` - Wsu string `xml:"xmlns:wsu,attr"` - Header struct { - Text string `xml:",chardata"` - Action struct { - Text string `xml:",chardata"` - MustUnderstand string `xml:"s:mustUnderstand,attr"` - } `xml:"wsa:Action"` - MessageID struct { - Text string `xml:",chardata"` - } `xml:"wsa:messageID"` - ReplyTo struct { - Text string `xml:",chardata"` - Address struct { - Text string `xml:",chardata"` - } `xml:"wsa:Address"` - } `xml:"wsa:ReplyTo"` - To struct { - Text string `xml:",chardata"` - MustUnderstand string `xml:"s:mustUnderstand,attr"` - } `xml:"wsa:To"` - Security struct { - Text string `xml:",chardata"` - MustUnderstand string `xml:"s:mustUnderstand,attr"` - Wsse string `xml:"xmlns:wsse,attr"` - Timestamp struct { - Text string `xml:",chardata"` - ID string `xml:"wsu:Id,attr"` - Created struct { - Text string `xml:",chardata"` - } `xml:"wsu:Created"` - Expires struct { - Text string `xml:",chardata"` - } `xml:"wsu:Expires"` - } `xml:"wsu:Timestamp"` - UsernameToken struct { - Text string `xml:",chardata"` - ID string `xml:"wsu:Id,attr"` - Username struct { - Text string `xml:",chardata"` - } `xml:"wsse:Username"` - Password struct { - Text string `xml:",chardata"` - } `xml:"wsse:Password"` - } `xml:"wsse:UsernameToken"` - } `xml:"wsse:Security"` - } `xml:"s:Header"` - Body struct { - Text string `xml:",chardata"` - RequestSecurityToken struct { - Text string `xml:",chardata"` - Wst string `xml:"xmlns:wst,attr"` - AppliesTo struct { - Text string `xml:",chardata"` - Wsp string `xml:"xmlns:wsp,attr"` - EndpointReference struct { - Text string `xml:",chardata"` - Address struct { - Text string `xml:",chardata"` - } `xml:"wsa:Address"` - } `xml:"wsa:EndpointReference"` - } `xml:"wsp:AppliesTo"` - KeyType struct { - Text string `xml:",chardata"` - } `xml:"wst:KeyType"` - RequestType struct { - Text string `xml:",chardata"` - } `xml:"wst:RequestType"` - } `xml:"wst:RequestSecurityToken"` - } `xml:"s:Body"` -} - -func buildTimeString(t time.Time) string { - // Golang time formats are weird: https://stackoverflow.com/questions/20234104/how-to-format-current-time-using-a-yyyymmddhhmmss-format - return t.Format("2006-01-02T15:04:05.000Z") -} - -func (wte *Endpoint) buildTokenRequestMessage(authType authority.AuthorizeType, cloudAudienceURN string, username string, password string) (string, error) { - var soapAction string - var trustNamespace string - var keyType string - var requestType string - - createdTime := time.Now().UTC() - expiresTime := createdTime.Add(10 * time.Minute) - - switch wte.Version { - case Trust2005: - soapAction = trust2005Spec - trustNamespace = "http://schemas.xmlsoap.org/ws/2005/02/trust" - keyType = "http://schemas.xmlsoap.org/ws/2005/05/identity/NoProofKey" - requestType = "http://schemas.xmlsoap.org/ws/2005/02/trust/Issue" - case Trust13: - soapAction = trust13Spec - trustNamespace = "http://docs.oasis-open.org/ws-sx/ws-trust/200512" - keyType = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/Bearer" - requestType = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/Issue" - default: - return "", fmt.Errorf("buildTokenRequestMessage had Version == %q, which is not recognized", wte.Version) - } - - var envelope wsTrustTokenRequestEnvelope - - messageUUID := uuid.New() - - envelope.S = "http://www.w3.org/2003/05/soap-envelope" - envelope.Wsa = "http://www.w3.org/2005/08/addressing" - envelope.Wsu = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" - - envelope.Header.Action.MustUnderstand = "1" - envelope.Header.Action.Text = soapAction - envelope.Header.MessageID.Text = "urn:uuid:" + messageUUID.String() - envelope.Header.ReplyTo.Address.Text = "http://www.w3.org/2005/08/addressing/anonymous" - envelope.Header.To.MustUnderstand = "1" - envelope.Header.To.Text = wte.URL - - switch authType { - case authority.ATUnknown: - return "", fmt.Errorf("buildTokenRequestMessage had no authority type(%v)", authType) - case authority.ATUsernamePassword: - endpointUUID := uuid.New() - - var trustID string - if wte.Version == Trust2005 { - trustID = "UnPwSecTok2005-" + endpointUUID.String() - } else { - trustID = "UnPwSecTok13-" + endpointUUID.String() - } - - envelope.Header.Security.MustUnderstand = "1" - envelope.Header.Security.Wsse = "http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" - envelope.Header.Security.Timestamp.ID = "MSATimeStamp" - envelope.Header.Security.Timestamp.Created.Text = buildTimeString(createdTime) - envelope.Header.Security.Timestamp.Expires.Text = buildTimeString(expiresTime) - envelope.Header.Security.UsernameToken.ID = trustID - envelope.Header.Security.UsernameToken.Username.Text = username - envelope.Header.Security.UsernameToken.Password.Text = password - default: - // This is just to note that we don't do anything for other cases. - // We aren't missing anything I know of. - } - - envelope.Body.RequestSecurityToken.Wst = trustNamespace - envelope.Body.RequestSecurityToken.AppliesTo.Wsp = "http://schemas.xmlsoap.org/ws/2004/09/policy" - envelope.Body.RequestSecurityToken.AppliesTo.EndpointReference.Address.Text = cloudAudienceURN - envelope.Body.RequestSecurityToken.KeyType.Text = keyType - envelope.Body.RequestSecurityToken.RequestType.Text = requestType - - output, err := xml.Marshal(envelope) - if err != nil { - return "", err - } - - return string(output), nil -} - -func (wte *Endpoint) BuildTokenRequestMessageWIA(cloudAudienceURN string) (string, error) { - return wte.buildTokenRequestMessage(authority.ATWindowsIntegrated, cloudAudienceURN, "", "") -} - -func (wte *Endpoint) BuildTokenRequestMessageUsernamePassword(cloudAudienceURN string, username string, password string) (string, error) { - return wte.buildTokenRequestMessage(authority.ATUsernamePassword, cloudAudienceURN, username, password) -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/wstrust_mex_document.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/wstrust_mex_document.go deleted file mode 100644 index e3d19886ebc500fafa314766e0f052ffc52f04ed..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs/wstrust_mex_document.go +++ /dev/null @@ -1,159 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package defs - -import ( - "errors" - "fmt" - "strings" -) - -//go:generate stringer -type=endpointType - -type endpointType int - -const ( - etUnknown endpointType = iota - etUsernamePassword - etWindowsTransport -) - -type wsEndpointData struct { - Version Version - EndpointType endpointType -} - -const trust13Spec string = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" -const trust2005Spec string = "http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue" - -type MexDocument struct { - UsernamePasswordEndpoint Endpoint - WindowsTransportEndpoint Endpoint - policies map[string]endpointType - bindings map[string]wsEndpointData -} - -func updateEndpoint(cached *Endpoint, found Endpoint) { - if cached == nil || cached.Version == TrustUnknown { - *cached = found - return - } - if (*cached).Version == Trust2005 && found.Version == Trust13 { - *cached = found - return - } -} - -// TODO(msal): Someone needs to write tests for everything below. - -// NewFromDef creates a new MexDocument. -func NewFromDef(defs Definitions) (MexDocument, error) { - policies, err := policies(defs) - if err != nil { - return MexDocument{}, err - } - - bindings, err := bindings(defs, policies) - if err != nil { - return MexDocument{}, err - } - - userPass, windows, err := endpoints(defs, bindings) - if err != nil { - return MexDocument{}, err - } - - return MexDocument{ - UsernamePasswordEndpoint: userPass, - WindowsTransportEndpoint: windows, - policies: policies, - bindings: bindings, - }, nil -} - -func policies(defs Definitions) (map[string]endpointType, error) { - policies := make(map[string]endpointType, len(defs.Policy)) - - for _, policy := range defs.Policy { - if policy.ExactlyOne.All.NegotiateAuthentication.XMLName.Local != "" { - if policy.ExactlyOne.All.TransportBinding.SP != "" && policy.ID != "" { - policies["#"+policy.ID] = etWindowsTransport - } - } - - if policy.ExactlyOne.All.SignedEncryptedSupportingTokens.Policy.UsernameToken.Policy.WSSUsernameToken10.XMLName.Local != "" { - if policy.ExactlyOne.All.TransportBinding.SP != "" && policy.ID != "" { - policies["#"+policy.ID] = etUsernamePassword - } - } - if policy.ExactlyOne.All.SignedSupportingTokens.Policy.UsernameToken.Policy.WSSUsernameToken10.XMLName.Local != "" { - if policy.ExactlyOne.All.TransportBinding.SP != "" && policy.ID != "" { - policies["#"+policy.ID] = etUsernamePassword - } - } - } - - if len(policies) == 0 { - return policies, errors.New("no policies for mex document") - } - - return policies, nil -} - -func bindings(defs Definitions, policies map[string]endpointType) (map[string]wsEndpointData, error) { - bindings := make(map[string]wsEndpointData, len(defs.Binding)) - - for _, binding := range defs.Binding { - policyName := binding.PolicyReference.URI - transport := binding.Binding.Transport - - if transport == "http://schemas.xmlsoap.org/soap/http" { - if policy, ok := policies[policyName]; ok { - bindingName := binding.Name - specVersion := binding.Operation.Operation.SoapAction - - if specVersion == trust13Spec { - bindings[bindingName] = wsEndpointData{Trust13, policy} - } else if specVersion == trust2005Spec { - bindings[bindingName] = wsEndpointData{Trust2005, policy} - } else { - return nil, errors.New("found unknown spec version in mex document") - } - } - } - } - return bindings, nil -} - -func endpoints(defs Definitions, bindings map[string]wsEndpointData) (userPass, windows Endpoint, err error) { - for _, port := range defs.Service.Port { - bindingName := port.Binding - - index := strings.Index(bindingName, ":") - if index != -1 { - bindingName = bindingName[index+1:] - } - - if binding, ok := bindings[bindingName]; ok { - url := strings.TrimSpace(port.EndpointReference.Address.Text) - if url == "" { - return Endpoint{}, Endpoint{}, fmt.Errorf("MexDocument cannot have blank URL endpoint") - } - if binding.Version == TrustUnknown { - return Endpoint{}, Endpoint{}, fmt.Errorf("endpoint version unknown") - } - endpoint := Endpoint{Version: binding.Version, URL: url} - - switch binding.EndpointType { - case etUsernamePassword: - updateEndpoint(&userPass, endpoint) - case etWindowsTransport: - updateEndpoint(&windows, endpoint) - default: - return Endpoint{}, Endpoint{}, errors.New("found unknown port type in MEX document") - } - } - } - return userPass, windows, nil -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/wstrust.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/wstrust.go deleted file mode 100644 index 47cd4c692d62732a2038662c2b4c817bc1ca7002..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/wstrust.go +++ /dev/null @@ -1,136 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -/* -Package wstrust provides a client for communicating with a WSTrust (https://en.wikipedia.org/wiki/WS-Trust#:~:text=WS%2DTrust%20is%20a%20WS,in%20a%20secure%20message%20exchange.) -for the purposes of extracting metadata from the service. This data can be used to acquire -tokens using the accesstokens.Client.GetAccessTokenFromSamlGrant() call. -*/ -package wstrust - -import ( - "context" - "errors" - "fmt" - "net/http" - "net/url" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/grant" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/wstrust/defs" -) - -type xmlCaller interface { - XMLCall(ctx context.Context, endpoint string, headers http.Header, qv url.Values, resp interface{}) error - SOAPCall(ctx context.Context, endpoint, action string, headers http.Header, qv url.Values, body string, resp interface{}) error -} - -type SamlTokenInfo struct { - AssertionType string // Should be either constants SAMLV1Grant or SAMLV2Grant. - Assertion string -} - -// Client represents the REST calls to get tokens from token generator backends. -type Client struct { - // Comm provides the HTTP transport client. - Comm xmlCaller -} - -// TODO(msal): This allows me to call Mex without having a real Def file on line 45. -// This would fail because policies() would not find a policy. This is easy enough to -// fix in test data, but.... Definitions is defined with built in structs. That needs -// to be pulled apart and until then I have this hack in. -var newFromDef = defs.NewFromDef - -// Mex provides metadata about a wstrust service. -func (c Client) Mex(ctx context.Context, federationMetadataURL string) (defs.MexDocument, error) { - resp := defs.Definitions{} - err := c.Comm.XMLCall( - ctx, - federationMetadataURL, - http.Header{}, - nil, - &resp, - ) - if err != nil { - return defs.MexDocument{}, err - } - - return newFromDef(resp) -} - -const ( - SoapActionDefault = "http://docs.oasis-open.org/ws-sx/ws-trust/200512/RST/Issue" - - // Note: Commented out because this action is not supported. It was in the original code - // but only used in a switch where it errored. Since there was only one value, a default - // worked better. However, buildTokenRequestMessage() had 2005 support. I'm not actually - // sure what's going on here. It like we have half support. For now this is here just - // for documentation purposes in case we are going to add support. - // - // SoapActionWSTrust2005 = "http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue" -) - -// SAMLTokenInfo provides SAML information that is used to generate a SAML token. -func (c Client) SAMLTokenInfo(ctx context.Context, authParameters authority.AuthParams, cloudAudienceURN string, endpoint defs.Endpoint) (SamlTokenInfo, error) { - var wsTrustRequestMessage string - var err error - - switch authParameters.AuthorizationType { - case authority.ATWindowsIntegrated: - wsTrustRequestMessage, err = endpoint.BuildTokenRequestMessageWIA(cloudAudienceURN) - if err != nil { - return SamlTokenInfo{}, err - } - case authority.ATUsernamePassword: - wsTrustRequestMessage, err = endpoint.BuildTokenRequestMessageUsernamePassword( - cloudAudienceURN, authParameters.Username, authParameters.Password) - if err != nil { - return SamlTokenInfo{}, err - } - default: - return SamlTokenInfo{}, fmt.Errorf("unknown auth type %v", authParameters.AuthorizationType) - } - - var soapAction string - switch endpoint.Version { - case defs.Trust13: - soapAction = SoapActionDefault - case defs.Trust2005: - return SamlTokenInfo{}, errors.New("WS Trust 2005 support is not implemented") - default: - return SamlTokenInfo{}, fmt.Errorf("the SOAP endpoint for a wstrust call had an invalid version: %v", endpoint.Version) - } - - resp := defs.SAMLDefinitions{} - err = c.Comm.SOAPCall(ctx, endpoint.URL, soapAction, http.Header{}, nil, wsTrustRequestMessage, &resp) - if err != nil { - return SamlTokenInfo{}, err - } - - return c.samlAssertion(resp) -} - -const ( - samlv1Assertion = "urn:oasis:names:tc:SAML:1.0:assertion" - samlv2Assertion = "urn:oasis:names:tc:SAML:2.0:assertion" -) - -func (c Client) samlAssertion(def defs.SAMLDefinitions) (SamlTokenInfo, error) { - for _, tokenResponse := range def.Body.RequestSecurityTokenResponseCollection.RequestSecurityTokenResponse { - token := tokenResponse.RequestedSecurityToken - if token.Assertion.XMLName.Local != "" { - assertion := token.AssertionRawXML - - samlVersion := token.Assertion.Saml - switch samlVersion { - case samlv1Assertion: - return SamlTokenInfo{AssertionType: grant.SAMLV1, Assertion: assertion}, nil - case samlv2Assertion: - return SamlTokenInfo{AssertionType: grant.SAMLV2, Assertion: assertion}, nil - } - return SamlTokenInfo{}, fmt.Errorf("couldn't parse SAML assertion, version unknown: %q", samlVersion) - } - } - return SamlTokenInfo{}, errors.New("unknown WS-Trust version") -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/resolvers.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/resolvers.go deleted file mode 100644 index 0ade411797ac2731e0861520726b9f7ce4f01b8b..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/resolvers.go +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// TODO(msal): Write some tests. The original code this came from didn't have tests and I'm too -// tired at this point to do it. It, like many other *Manager code I found was broken because -// they didn't have mutex protection. - -package oauth - -import ( - "context" - "errors" - "fmt" - "strings" - "sync" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" -) - -// ADFS is an active directory federation service authority type. -const ADFS = "ADFS" - -type cacheEntry struct { - Endpoints authority.Endpoints - ValidForDomainsInList map[string]bool -} - -func createcacheEntry(endpoints authority.Endpoints) cacheEntry { - return cacheEntry{endpoints, map[string]bool{}} -} - -// AuthorityEndpoint retrieves endpoints from an authority for auth and token acquisition. -type authorityEndpoint struct { - rest *ops.REST - - mu sync.Mutex - cache map[string]cacheEntry -} - -// newAuthorityEndpoint is the constructor for AuthorityEndpoint. -func newAuthorityEndpoint(rest *ops.REST) *authorityEndpoint { - m := &authorityEndpoint{rest: rest, cache: map[string]cacheEntry{}} - return m -} - -// ResolveEndpoints gets the authorization and token endpoints and creates an AuthorityEndpoints instance -func (m *authorityEndpoint) ResolveEndpoints(ctx context.Context, authorityInfo authority.Info, userPrincipalName string) (authority.Endpoints, error) { - - if endpoints, found := m.cachedEndpoints(authorityInfo, userPrincipalName); found { - return endpoints, nil - } - - endpoint, err := m.openIDConfigurationEndpoint(ctx, authorityInfo, userPrincipalName) - if err != nil { - return authority.Endpoints{}, err - } - - resp, err := m.rest.Authority().GetTenantDiscoveryResponse(ctx, endpoint) - if err != nil { - return authority.Endpoints{}, err - } - if err := resp.Validate(); err != nil { - return authority.Endpoints{}, fmt.Errorf("ResolveEndpoints(): %w", err) - } - - tenant := authorityInfo.Tenant - - endpoints := authority.NewEndpoints( - strings.Replace(resp.AuthorizationEndpoint, "{tenant}", tenant, -1), - strings.Replace(resp.TokenEndpoint, "{tenant}", tenant, -1), - strings.Replace(resp.Issuer, "{tenant}", tenant, -1), - authorityInfo.Host) - - m.addCachedEndpoints(authorityInfo, userPrincipalName, endpoints) - - return endpoints, nil -} - -// cachedEndpoints returns a the cached endpoints if they exists. If not, we return false. -func (m *authorityEndpoint) cachedEndpoints(authorityInfo authority.Info, userPrincipalName string) (authority.Endpoints, bool) { - m.mu.Lock() - defer m.mu.Unlock() - - if cacheEntry, ok := m.cache[authorityInfo.CanonicalAuthorityURI]; ok { - if authorityInfo.AuthorityType == ADFS { - domain, err := adfsDomainFromUpn(userPrincipalName) - if err == nil { - if _, ok := cacheEntry.ValidForDomainsInList[domain]; ok { - return cacheEntry.Endpoints, true - } - } - } - return cacheEntry.Endpoints, true - } - return authority.Endpoints{}, false -} - -func (m *authorityEndpoint) addCachedEndpoints(authorityInfo authority.Info, userPrincipalName string, endpoints authority.Endpoints) { - m.mu.Lock() - defer m.mu.Unlock() - - updatedCacheEntry := createcacheEntry(endpoints) - - if authorityInfo.AuthorityType == ADFS { - // Since we're here, we've made a call to the backend. We want to ensure we're caching - // the latest values from the server. - if cacheEntry, ok := m.cache[authorityInfo.CanonicalAuthorityURI]; ok { - for k := range cacheEntry.ValidForDomainsInList { - updatedCacheEntry.ValidForDomainsInList[k] = true - } - } - domain, err := adfsDomainFromUpn(userPrincipalName) - if err == nil { - updatedCacheEntry.ValidForDomainsInList[domain] = true - } - } - - m.cache[authorityInfo.CanonicalAuthorityURI] = updatedCacheEntry -} - -func (m *authorityEndpoint) openIDConfigurationEndpoint(ctx context.Context, authorityInfo authority.Info, userPrincipalName string) (string, error) { - if authorityInfo.Tenant == "adfs" { - return fmt.Sprintf("https://%s/adfs/.well-known/openid-configuration", authorityInfo.Host), nil - } else if authorityInfo.ValidateAuthority && !authority.TrustedHost(authorityInfo.Host) { - resp, err := m.rest.Authority().AADInstanceDiscovery(ctx, authorityInfo) - if err != nil { - return "", err - } - return resp.TenantDiscoveryEndpoint, nil - } else if authorityInfo.Region != "" { - resp, err := m.rest.Authority().AADInstanceDiscovery(ctx, authorityInfo) - if err != nil { - return "", err - } - return resp.TenantDiscoveryEndpoint, nil - - } - - return authorityInfo.CanonicalAuthorityURI + "v2.0/.well-known/openid-configuration", nil -} - -func adfsDomainFromUpn(userPrincipalName string) (string, error) { - parts := strings.Split(userPrincipalName, "@") - if len(parts) < 2 { - return "", errors.New("no @ present in user principal name") - } - return parts[1], nil -} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/options/options.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/options/options.go deleted file mode 100644 index 4561d72db4d726ddd20e2614e000a88817930f2d..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/options/options.go +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package options - -import ( - "errors" - "fmt" -) - -// CallOption implements an optional argument to a method call. See -// https://blog.devgenius.io/go-call-option-that-can-be-used-with-multiple-methods-6c81734f3dbe -// for an explanation of the usage pattern. -type CallOption interface { - Do(any) error - callOption() -} - -// ApplyOptions applies all the callOptions to options. options must be a pointer to a struct and -// callOptions must be a list of objects that implement CallOption. -func ApplyOptions[O, C any](options O, callOptions []C) error { - for _, o := range callOptions { - if t, ok := any(o).(CallOption); !ok { - return fmt.Errorf("unexpected option type %T", o) - } else if err := t.Do(options); err != nil { - return err - } - } - return nil -} - -// NewCallOption returns a new CallOption whose Do() method calls function "f". -func NewCallOption(f func(any) error) CallOption { - if f == nil { - // This isn't a practical concern because only an MSAL maintainer can get - // us here, by implementing a do-nothing option. But if someone does that, - // the below ensures the method invoked with the option returns an error. - return callOption(func(any) error { - return errors.New("invalid option: missing implementation") - }) - } - return callOption(f) -} - -// callOption is an adapter for a function to a CallOption -type callOption func(any) error - -func (c callOption) Do(a any) error { - return c(a) -} - -func (callOption) callOption() {} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared/shared.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared/shared.go deleted file mode 100644 index d8ab713560c9fc26c87c9552bcc55464f9705437..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared/shared.go +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -package shared - -import ( - "net/http" - "reflect" - "strings" -) - -const ( - // CacheKeySeparator is used in creating the keys of the cache. - CacheKeySeparator = "-" -) - -type Account struct { - HomeAccountID string `json:"home_account_id,omitempty"` - Environment string `json:"environment,omitempty"` - Realm string `json:"realm,omitempty"` - LocalAccountID string `json:"local_account_id,omitempty"` - AuthorityType string `json:"authority_type,omitempty"` - PreferredUsername string `json:"username,omitempty"` - GivenName string `json:"given_name,omitempty"` - FamilyName string `json:"family_name,omitempty"` - MiddleName string `json:"middle_name,omitempty"` - Name string `json:"name,omitempty"` - AlternativeID string `json:"alternative_account_id,omitempty"` - RawClientInfo string `json:"client_info,omitempty"` - UserAssertionHash string `json:"user_assertion_hash,omitempty"` - - AdditionalFields map[string]interface{} -} - -// NewAccount creates an account. -func NewAccount(homeAccountID, env, realm, localAccountID, authorityType, username string) Account { - return Account{ - HomeAccountID: homeAccountID, - Environment: env, - Realm: realm, - LocalAccountID: localAccountID, - AuthorityType: authorityType, - PreferredUsername: username, - } -} - -// Key creates the key for storing accounts in the cache. -func (acc Account) Key() string { - key := strings.Join([]string{acc.HomeAccountID, acc.Environment, acc.Realm}, CacheKeySeparator) - return strings.ToLower(key) -} - -// IsZero checks the zero value of account. -func (acc Account) IsZero() bool { - v := reflect.ValueOf(acc) - for i := 0; i < v.NumField(); i++ { - field := v.Field(i) - if !field.IsZero() { - switch field.Kind() { - case reflect.Map, reflect.Slice: - if field.Len() == 0 { - continue - } - } - return false - } - } - return true -} - -// DefaultClient is our default shared HTTP client. -var DefaultClient = &http.Client{} diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/version/version.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/version/version.go deleted file mode 100644 index eb16b405c4be82cf33205c64aa2cf4d431e524d5..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/version/version.go +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -// Package version keeps the version number of the client package. -package version - -// Version is the version of this client package that is communicated to the server. -const Version = "1.2.0" diff --git a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/public/public.go b/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/public/public.go deleted file mode 100644 index 392e5e43f7dccb8f8d0d35f124b147c21cf50335..0000000000000000000000000000000000000000 --- a/vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/public/public.go +++ /dev/null @@ -1,756 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT license. - -/* -Package public provides a client for authentication of "public" applications. A "public" -application is defined as an app that runs on client devices (android, ios, windows, linux, ...). -These devices are "untrusted" and access resources via web APIs that must authenticate. -*/ -package public - -/* -Design note: - -public.Client uses client.Base as an embedded type. client.Base statically assigns its attributes -during creation. As it doesn't have any pointers in it, anything borrowed from it, such as -Base.AuthParams is a copy that is free to be manipulated here. -*/ - -// TODO(msal): This should have example code for each method on client using Go's example doc framework. -// base usage details should be includee in the package documentation. - -import ( - "context" - "crypto/rand" - "crypto/sha256" - "encoding/base64" - "errors" - "fmt" - "net/url" - "reflect" - "strconv" - - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/cache" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/local" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/accesstokens" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/authority" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/options" - "github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/shared" - "github.com/google/uuid" - "github.com/pkg/browser" -) - -// AuthResult contains the results of one token acquisition operation. -// For details see https://aka.ms/msal-net-authenticationresult -type AuthResult = base.AuthResult - -type AuthenticationScheme = authority.AuthenticationScheme - -type Account = shared.Account - -var errNoAccount = errors.New("no account was specified with public.WithSilentAccount(), or the specified account is invalid") - -// clientOptions configures the Client's behavior. -type clientOptions struct { - accessor cache.ExportReplace - authority string - capabilities []string - disableInstanceDiscovery bool - httpClient ops.HTTPClient -} - -func (p *clientOptions) validate() error { - u, err := url.Parse(p.authority) - if err != nil { - return fmt.Errorf("Authority options cannot be URL parsed: %w", err) - } - if u.Scheme != "https" { - return fmt.Errorf("Authority(%s) did not start with https://", u.String()) - } - return nil -} - -// Option is an optional argument to the New constructor. -type Option func(o *clientOptions) - -// WithAuthority allows for a custom authority to be set. This must be a valid https url. -func WithAuthority(authority string) Option { - return func(o *clientOptions) { - o.authority = authority - } -} - -// WithCache provides an accessor that will read and write authentication data to an externally managed cache. -func WithCache(accessor cache.ExportReplace) Option { - return func(o *clientOptions) { - o.accessor = accessor - } -} - -// WithClientCapabilities allows configuring one or more client capabilities such as "CP1" -func WithClientCapabilities(capabilities []string) Option { - return func(o *clientOptions) { - // there's no danger of sharing the slice's underlying memory with the application because - // this slice is simply passed to base.WithClientCapabilities, which copies its data - o.capabilities = capabilities - } -} - -// WithHTTPClient allows for a custom HTTP client to be set. -func WithHTTPClient(httpClient ops.HTTPClient) Option { - return func(o *clientOptions) { - o.httpClient = httpClient - } -} - -// WithInstanceDiscovery set to false to disable authority validation (to support private cloud scenarios) -func WithInstanceDiscovery(enabled bool) Option { - return func(o *clientOptions) { - o.disableInstanceDiscovery = !enabled - } -} - -// Client is a representation of authentication client for public applications as defined in the -// package doc. For more information, visit https://docs.microsoft.com/azure/active-directory/develop/msal-client-applications. -type Client struct { - base base.Client -} - -// New is the constructor for Client. -func New(clientID string, options ...Option) (Client, error) { - opts := clientOptions{ - authority: base.AuthorityPublicCloud, - httpClient: shared.DefaultClient, - } - - for _, o := range options { - o(&opts) - } - if err := opts.validate(); err != nil { - return Client{}, err - } - - base, err := base.New(clientID, opts.authority, oauth.New(opts.httpClient), base.WithCacheAccessor(opts.accessor), base.WithClientCapabilities(opts.capabilities), base.WithInstanceDiscovery(!opts.disableInstanceDiscovery)) - if err != nil { - return Client{}, err - } - return Client{base}, nil -} - -// authCodeURLOptions contains options for AuthCodeURL -type authCodeURLOptions struct { - claims, loginHint, tenantID, domainHint string -} - -// AuthCodeURLOption is implemented by options for AuthCodeURL -type AuthCodeURLOption interface { - authCodeURLOption() -} - -// AuthCodeURL creates a URL used to acquire an authorization code. -// -// Options: [WithClaims], [WithDomainHint], [WithLoginHint], [WithTenantID] -func (pca Client) AuthCodeURL(ctx context.Context, clientID, redirectURI string, scopes []string, opts ...AuthCodeURLOption) (string, error) { - o := authCodeURLOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return "", err - } - ap, err := pca.base.AuthParams.WithTenant(o.tenantID) - if err != nil { - return "", err - } - ap.Claims = o.claims - ap.LoginHint = o.loginHint - ap.DomainHint = o.domainHint - return pca.base.AuthCodeURL(ctx, clientID, redirectURI, scopes, ap) -} - -// WithClaims sets additional claims to request for the token, such as those required by conditional access policies. -// Use this option when Azure AD returned a claims challenge for a prior request. The argument must be decoded. -// This option is valid for any token acquisition method. -func WithClaims(claims string) interface { - AcquireByAuthCodeOption - AcquireByDeviceCodeOption - AcquireByUsernamePasswordOption - AcquireInteractiveOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption -} { - return struct { - AcquireByAuthCodeOption - AcquireByDeviceCodeOption - AcquireByUsernamePasswordOption - AcquireInteractiveOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenByAuthCodeOptions: - t.claims = claims - case *acquireTokenByDeviceCodeOptions: - t.claims = claims - case *acquireTokenByUsernamePasswordOptions: - t.claims = claims - case *acquireTokenSilentOptions: - t.claims = claims - case *authCodeURLOptions: - t.claims = claims - case *interactiveAuthOptions: - t.claims = claims - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithAuthenticationScheme is an extensibility mechanism designed to be used only by Azure Arc for proof of possession access tokens. -func WithAuthenticationScheme(authnScheme AuthenticationScheme) interface { - AcquireSilentOption - AcquireInteractiveOption - AcquireByUsernamePasswordOption - options.CallOption -} { - return struct { - AcquireSilentOption - AcquireInteractiveOption - AcquireByUsernamePasswordOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenSilentOptions: - t.authnScheme = authnScheme - case *interactiveAuthOptions: - t.authnScheme = authnScheme - case *acquireTokenByUsernamePasswordOptions: - t.authnScheme = authnScheme - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithTenantID specifies a tenant for a single authentication. It may be different than the tenant set in [New] by [WithAuthority]. -// This option is valid for any token acquisition method. -func WithTenantID(tenantID string) interface { - AcquireByAuthCodeOption - AcquireByDeviceCodeOption - AcquireByUsernamePasswordOption - AcquireInteractiveOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption -} { - return struct { - AcquireByAuthCodeOption - AcquireByDeviceCodeOption - AcquireByUsernamePasswordOption - AcquireInteractiveOption - AcquireSilentOption - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenByAuthCodeOptions: - t.tenantID = tenantID - case *acquireTokenByDeviceCodeOptions: - t.tenantID = tenantID - case *acquireTokenByUsernamePasswordOptions: - t.tenantID = tenantID - case *acquireTokenSilentOptions: - t.tenantID = tenantID - case *authCodeURLOptions: - t.tenantID = tenantID - case *interactiveAuthOptions: - t.tenantID = tenantID - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// acquireTokenSilentOptions are all the optional settings to an AcquireTokenSilent() call. -// These are set by using various AcquireTokenSilentOption functions. -type acquireTokenSilentOptions struct { - account Account - claims, tenantID string - authnScheme AuthenticationScheme -} - -// AcquireSilentOption is implemented by options for AcquireTokenSilent -type AcquireSilentOption interface { - acquireSilentOption() -} - -// WithSilentAccount uses the passed account during an AcquireTokenSilent() call. -func WithSilentAccount(account Account) interface { - AcquireSilentOption - options.CallOption -} { - return struct { - AcquireSilentOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenSilentOptions: - t.account = account - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// AcquireTokenSilent acquires a token from either the cache or using a refresh token. -// -// Options: [WithClaims], [WithSilentAccount], [WithTenantID] -func (pca Client) AcquireTokenSilent(ctx context.Context, scopes []string, opts ...AcquireSilentOption) (AuthResult, error) { - o := acquireTokenSilentOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return AuthResult{}, err - } - // an account is required to find user tokens in the cache - if reflect.ValueOf(o.account).IsZero() { - return AuthResult{}, errNoAccount - } - - silentParameters := base.AcquireTokenSilentParameters{ - Scopes: scopes, - Account: o.account, - Claims: o.claims, - RequestType: accesstokens.ATPublic, - IsAppCache: false, - TenantID: o.tenantID, - AuthnScheme: o.authnScheme, - } - - return pca.base.AcquireTokenSilent(ctx, silentParameters) -} - -// acquireTokenByUsernamePasswordOptions contains optional configuration for AcquireTokenByUsernamePassword -type acquireTokenByUsernamePasswordOptions struct { - claims, tenantID string - authnScheme AuthenticationScheme -} - -// AcquireByUsernamePasswordOption is implemented by options for AcquireTokenByUsernamePassword -type AcquireByUsernamePasswordOption interface { - acquireByUsernamePasswordOption() -} - -// AcquireTokenByUsernamePassword acquires a security token from the authority, via Username/Password Authentication. -// NOTE: this flow is NOT recommended. -// -// Options: [WithClaims], [WithTenantID] -func (pca Client) AcquireTokenByUsernamePassword(ctx context.Context, scopes []string, username, password string, opts ...AcquireByUsernamePasswordOption) (AuthResult, error) { - o := acquireTokenByUsernamePasswordOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return AuthResult{}, err - } - authParams, err := pca.base.AuthParams.WithTenant(o.tenantID) - if err != nil { - return AuthResult{}, err - } - authParams.Scopes = scopes - authParams.AuthorizationType = authority.ATUsernamePassword - authParams.Claims = o.claims - authParams.Username = username - authParams.Password = password - if o.authnScheme != nil { - authParams.AuthnScheme = o.authnScheme - } - - token, err := pca.base.Token.UsernamePassword(ctx, authParams) - if err != nil { - return AuthResult{}, err - } - return pca.base.AuthResultFromToken(ctx, authParams, token, true) -} - -type DeviceCodeResult = accesstokens.DeviceCodeResult - -// DeviceCode provides the results of the device code flows first stage (containing the code) -// that must be entered on the second device and provides a method to retrieve the AuthenticationResult -// once that code has been entered and verified. -type DeviceCode struct { - // Result holds the information about the device code (such as the code). - Result DeviceCodeResult - - authParams authority.AuthParams - client Client - dc oauth.DeviceCode -} - -// AuthenticationResult retreives the AuthenticationResult once the user enters the code -// on the second device. Until then it blocks until the .AcquireTokenByDeviceCode() context -// is cancelled or the token expires. -func (d DeviceCode) AuthenticationResult(ctx context.Context) (AuthResult, error) { - token, err := d.dc.Token(ctx) - if err != nil { - return AuthResult{}, err - } - return d.client.base.AuthResultFromToken(ctx, d.authParams, token, true) -} - -// acquireTokenByDeviceCodeOptions contains optional configuration for AcquireTokenByDeviceCode -type acquireTokenByDeviceCodeOptions struct { - claims, tenantID string -} - -// AcquireByDeviceCodeOption is implemented by options for AcquireTokenByDeviceCode -type AcquireByDeviceCodeOption interface { - acquireByDeviceCodeOptions() -} - -// AcquireTokenByDeviceCode acquires a security token from the authority, by acquiring a device code and using that to acquire the token. -// Users need to create an AcquireTokenDeviceCodeParameters instance and pass it in. -// -// Options: [WithClaims], [WithTenantID] -func (pca Client) AcquireTokenByDeviceCode(ctx context.Context, scopes []string, opts ...AcquireByDeviceCodeOption) (DeviceCode, error) { - o := acquireTokenByDeviceCodeOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return DeviceCode{}, err - } - authParams, err := pca.base.AuthParams.WithTenant(o.tenantID) - if err != nil { - return DeviceCode{}, err - } - authParams.Scopes = scopes - authParams.AuthorizationType = authority.ATDeviceCode - authParams.Claims = o.claims - - dc, err := pca.base.Token.DeviceCode(ctx, authParams) - if err != nil { - return DeviceCode{}, err - } - - return DeviceCode{Result: dc.Result, authParams: authParams, client: pca, dc: dc}, nil -} - -// acquireTokenByAuthCodeOptions contains the optional parameters used to acquire an access token using the authorization code flow. -type acquireTokenByAuthCodeOptions struct { - challenge, claims, tenantID string -} - -// AcquireByAuthCodeOption is implemented by options for AcquireTokenByAuthCode -type AcquireByAuthCodeOption interface { - acquireByAuthCodeOption() -} - -// WithChallenge allows you to provide a code for the .AcquireTokenByAuthCode() call. -func WithChallenge(challenge string) interface { - AcquireByAuthCodeOption - options.CallOption -} { - return struct { - AcquireByAuthCodeOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *acquireTokenByAuthCodeOptions: - t.challenge = challenge - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// AcquireTokenByAuthCode is a request to acquire a security token from the authority, using an authorization code. -// The specified redirect URI must be the same URI that was used when the authorization code was requested. -// -// Options: [WithChallenge], [WithClaims], [WithTenantID] -func (pca Client) AcquireTokenByAuthCode(ctx context.Context, code string, redirectURI string, scopes []string, opts ...AcquireByAuthCodeOption) (AuthResult, error) { - o := acquireTokenByAuthCodeOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return AuthResult{}, err - } - - params := base.AcquireTokenAuthCodeParameters{ - Scopes: scopes, - Code: code, - Challenge: o.challenge, - Claims: o.claims, - AppType: accesstokens.ATPublic, - RedirectURI: redirectURI, - TenantID: o.tenantID, - } - - return pca.base.AcquireTokenByAuthCode(ctx, params) -} - -// Accounts gets all the accounts in the token cache. -// If there are no accounts in the cache the returned slice is empty. -func (pca Client) Accounts(ctx context.Context) ([]Account, error) { - return pca.base.AllAccounts(ctx) -} - -// RemoveAccount signs the account out and forgets account from token cache. -func (pca Client) RemoveAccount(ctx context.Context, account Account) error { - return pca.base.RemoveAccount(ctx, account) -} - -// interactiveAuthOptions contains the optional parameters used to acquire an access token for interactive auth code flow. -type interactiveAuthOptions struct { - claims, domainHint, loginHint, redirectURI, tenantID string - openURL func(url string) error - authnScheme AuthenticationScheme -} - -// AcquireInteractiveOption is implemented by options for AcquireTokenInteractive -type AcquireInteractiveOption interface { - acquireInteractiveOption() -} - -// WithLoginHint pre-populates the login prompt with a username. -func WithLoginHint(username string) interface { - AcquireInteractiveOption - AuthCodeURLOption - options.CallOption -} { - return struct { - AcquireInteractiveOption - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *authCodeURLOptions: - t.loginHint = username - case *interactiveAuthOptions: - t.loginHint = username - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithDomainHint adds the IdP domain as domain_hint query parameter in the auth url. -func WithDomainHint(domain string) interface { - AcquireInteractiveOption - AuthCodeURLOption - options.CallOption -} { - return struct { - AcquireInteractiveOption - AuthCodeURLOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *authCodeURLOptions: - t.domainHint = domain - case *interactiveAuthOptions: - t.domainHint = domain - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithRedirectURI sets a port for the local server used in interactive authentication, for -// example http://localhost:port. All URI components other than the port are ignored. -func WithRedirectURI(redirectURI string) interface { - AcquireInteractiveOption - options.CallOption -} { - return struct { - AcquireInteractiveOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *interactiveAuthOptions: - t.redirectURI = redirectURI - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// WithOpenURL allows you to provide a function to open the browser to complete the interactive login, instead of launching the system default browser. -func WithOpenURL(openURL func(url string) error) interface { - AcquireInteractiveOption - options.CallOption -} { - return struct { - AcquireInteractiveOption - options.CallOption - }{ - CallOption: options.NewCallOption( - func(a any) error { - switch t := a.(type) { - case *interactiveAuthOptions: - t.openURL = openURL - default: - return fmt.Errorf("unexpected options type %T", a) - } - return nil - }, - ), - } -} - -// AcquireTokenInteractive acquires a security token from the authority using the default web browser to select the account. -// https://docs.microsoft.com/en-us/azure/active-directory/develop/msal-authentication-flows#interactive-and-non-interactive-authentication -// -// Options: [WithDomainHint], [WithLoginHint], [WithOpenURL], [WithRedirectURI], [WithTenantID] -func (pca Client) AcquireTokenInteractive(ctx context.Context, scopes []string, opts ...AcquireInteractiveOption) (AuthResult, error) { - o := interactiveAuthOptions{} - if err := options.ApplyOptions(&o, opts); err != nil { - return AuthResult{}, err - } - // the code verifier is a random 32-byte sequence that's been base-64 encoded without padding. - // it's used to prevent MitM attacks during auth code flow, see https://tools.ietf.org/html/rfc7636 - cv, challenge, err := codeVerifier() - if err != nil { - return AuthResult{}, err - } - var redirectURL *url.URL - if o.redirectURI != "" { - redirectURL, err = url.Parse(o.redirectURI) - if err != nil { - return AuthResult{}, err - } - } - if o.openURL == nil { - o.openURL = browser.OpenURL - } - authParams, err := pca.base.AuthParams.WithTenant(o.tenantID) - if err != nil { - return AuthResult{}, err - } - authParams.Scopes = scopes - authParams.AuthorizationType = authority.ATInteractive - authParams.Claims = o.claims - authParams.CodeChallenge = challenge - authParams.CodeChallengeMethod = "S256" - authParams.LoginHint = o.loginHint - authParams.DomainHint = o.domainHint - authParams.State = uuid.New().String() - authParams.Prompt = "select_account" - if o.authnScheme != nil { - authParams.AuthnScheme = o.authnScheme - } - res, err := pca.browserLogin(ctx, redirectURL, authParams, o.openURL) - if err != nil { - return AuthResult{}, err - } - authParams.Redirecturi = res.redirectURI - - req, err := accesstokens.NewCodeChallengeRequest(authParams, accesstokens.ATPublic, nil, res.authCode, cv) - if err != nil { - return AuthResult{}, err - } - - token, err := pca.base.Token.AuthCode(ctx, req) - if err != nil { - return AuthResult{}, err - } - - return pca.base.AuthResultFromToken(ctx, authParams, token, true) -} - -type interactiveAuthResult struct { - authCode string - redirectURI string -} - -// parses the port number from the provided URL. -// returns 0 if nil or no port is specified. -func parsePort(u *url.URL) (int, error) { - if u == nil { - return 0, nil - } - p := u.Port() - if p == "" { - return 0, nil - } - return strconv.Atoi(p) -} - -// browserLogin calls openURL and waits for a user to log in -func (pca Client) browserLogin(ctx context.Context, redirectURI *url.URL, params authority.AuthParams, openURL func(string) error) (interactiveAuthResult, error) { - // start local redirect server so login can call us back - port, err := parsePort(redirectURI) - if err != nil { - return interactiveAuthResult{}, err - } - srv, err := local.New(params.State, port) - if err != nil { - return interactiveAuthResult{}, err - } - defer srv.Shutdown() - params.Scopes = accesstokens.AppendDefaultScopes(params) - authURL, err := pca.base.AuthCodeURL(ctx, params.ClientID, srv.Addr, params.Scopes, params) - if err != nil { - return interactiveAuthResult{}, err - } - // open browser window so user can select credentials - if err := openURL(authURL); err != nil { - return interactiveAuthResult{}, err - } - // now wait until the logic calls us back - res := srv.Result(ctx) - if res.Err != nil { - return interactiveAuthResult{}, res.Err - } - return interactiveAuthResult{ - authCode: res.Code, - redirectURI: srv.Addr, - }, nil -} - -// creates a code verifier string along with its SHA256 hash which -// is used as the challenge when requesting an auth code. -// used in interactive auth flow for PKCE. -func codeVerifier() (codeVerifier string, challenge string, err error) { - cvBytes := make([]byte, 32) - if _, err = rand.Read(cvBytes); err != nil { - return - } - codeVerifier = base64.RawURLEncoding.EncodeToString(cvBytes) - // for PKCE, create a hash of the code verifier - cvh := sha256.Sum256([]byte(codeVerifier)) - challenge = base64.RawURLEncoding.EncodeToString(cvh[:]) - return -} diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/.gitignore b/vendor/github.com/JohannesKaufmann/html-to-markdown/.gitignore deleted file mode 100644 index 9193b327d73f85241e4a0e10b83a67973ec64d4d..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -# Binaries for programs and plugins -*.exe -*.exe~ -*.dll -*.so -*.dylib - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -.DS_Store diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/CONTRIBUTING.md b/vendor/github.com/JohannesKaufmann/html-to-markdown/CONTRIBUTING.md deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/LICENSE b/vendor/github.com/JohannesKaufmann/html-to-markdown/LICENSE deleted file mode 100644 index 0adaa6b5b25d2307cab822bd3533acd44d1eac78..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2018 Johannes Kaufmann - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/README.md b/vendor/github.com/JohannesKaufmann/html-to-markdown/README.md deleted file mode 100644 index 93bcbda7e9c2ef92ddc30c8bf670458d78db36b9..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/README.md +++ /dev/null @@ -1,242 +0,0 @@ -# html-to-markdown - -[](https://goreportcard.com/report/github.com/JohannesKaufmann/html-to-markdown) -[](https://codecov.io/gh/JohannesKaufmann/html-to-markdown) - -[](http://godoc.org/github.com/JohannesKaufmann/html-to-markdown) - - - -Convert HTML into Markdown with Go. It is using an [HTML Parser](https://github.com/PuerkitoBio/goquery) to avoid the use of `regexp` as much as possible. That should prevent some [weird cases](https://stackoverflow.com/a/1732454) and allows it to be used for cases where the input is totally unknown. - -## Installation - -``` -go get github.com/JohannesKaufmann/html-to-markdown -``` - -## Usage - -```go -import ( - "fmt" - "log" - - md "github.com/JohannesKaufmann/html-to-markdown" -) - -converter := md.NewConverter("", true, nil) - -html := `Important` - -markdown, err := converter.ConvertString(html) -if err != nil { - log.Fatal(err) -} -fmt.Println("md ->", markdown) -``` - -If you are already using [goquery](https://github.com/PuerkitoBio/goquery) you can pass a selection to `Convert`. - -```go -markdown, err := converter.Convert(selec) -``` - -### Using it on the command line - -If you want to make use of `html-to-markdown` on the command line without any Go coding, check out [`html2md`](https://github.com/suntong/html2md#usage), a cli wrapper for `html-to-markdown` that has all the following options and plugins builtin. - -## Options - -The third parameter to `md.NewConverter` is `*md.Options`. - -For example you can change the character that is around a bold text ("`**`") to a different one (for example "`__`") by changing the value of `StrongDelimiter`. - -```go -opt := &md.Options{ - StrongDelimiter: "__", // default: ** - // ... -} -converter := md.NewConverter("", true, opt) -``` - -For all the possible options look at [godocs](https://godoc.org/github.com/JohannesKaufmann/html-to-markdown/#Options) and for a example look at the [example](/examples/options/main.go). - -## Adding Rules - -```go -converter.AddRules( - md.Rule{ - Filter: []string{"del", "s", "strike"}, - Replacement: func(content string, selec *goquery.Selection, opt *md.Options) *string { - // You need to return a pointer to a string (md.String is just a helper function). - // If you return nil the next function for that html element - // will be picked. For example you could only convert an element - // if it has a certain class name and fallback if not. - content = strings.TrimSpace(content) - return md.String("~" + content + "~") - }, - }, - // more rules -) -``` - -For more information have a look at the example [add_rules](/examples/add_rules/main.go). - -## Using Plugins - -If you want plugins (github flavored markdown like striketrough, tables, ...) you can pass it to `Use`. - -```go -import "github.com/JohannesKaufmann/html-to-markdown/plugin" - -// Use the `GitHubFlavored` plugin from the `plugin` package. -converter.Use(plugin.GitHubFlavored()) -``` - -Or if you only want to use the `Strikethrough` plugin. You can change the character that distinguishes -the text that is crossed out by setting the first argument to a different value (for example "~~" instead of "~"). - -```go -converter.Use(plugin.Strikethrough("")) -``` - -For more information have a look at the example [github_flavored](/examples/github_flavored/main.go). - ---- - -These are the plugins located in the [plugin folder](/plugin) which you can use by importing "github.com/JohannesKaufmann/html-to-markdown/plugin". - -| Name | Description | -| --------------------- | ------------------------------------------------------------------------------------------- | -| GitHubFlavored | GitHub's Flavored Markdown contains `TaskListItems`, `Strikethrough` and `Table`. | -| TaskListItems | (Included in `GitHubFlavored`). Converts `` checkboxes into `- [x] Task`. | -| Strikethrough | (Included in `GitHubFlavored`). Converts ` `, ``, and `` to the `~~` syntax. | -| Table | (Included in `GitHubFlavored`). Convert a `` into something like this... | -| TableCompat | | -| | | -| VimeoEmbed | | -| YoutubeEmbed | | -| | | -| ConfluenceCodeBlock | Converts `
\n") - fmt.Fprint(w, "\n") - } - - if f.standalone { - fmt.Fprint(w, "\n\n") - fmt.Fprint(w, "\n") - } - - return nil -} - -func (f *Formatter) lineIDAttribute(line int) string { - if !f.linkableLineNumbers { - return "" - } - return fmt.Sprintf(" id=\"%s\"", f.lineID(line)) -} - -func (f *Formatter) lineTitleWithLinkIfNeeded(css map[chroma.TokenType]string, lineDigits, line int) string { - title := fmt.Sprintf("%*d", lineDigits, line) - if !f.linkableLineNumbers { - return title - } - return fmt.Sprintf("Paragraph 1
-Paragraph 2
-``` - -A well-placed backslash character would prevent that... - - -```md -Paragraph 1 -\- -Paragraph 2 -``` - ---- - -How to configure escaping? Depending on the `EscapeMode` option, the markdown output is going to be different. - -```go -opt = &md.Options{ - EscapeMode: "basic", // default -} -``` - -Lets try it out with this HTML input: - -| | | -| -------- | ----------------------------------------------------- | -| input | `fake **bold** and real bold
` | -| | | -| | **With EscapeMode "basic"** | -| output | `fake \*\*bold\*\* and real **bold**` | -| rendered | fake \*\*bold\*\* and real **bold** | -| | | -| | **With EscapeMode "disabled"** | -| output | `fake **bold** and real **bold**` | -| rendered | fake **bold** and real **bold** | - -With **basic** escaping, we get some escape characters (the backlash "\\") but it renders correctly. - -With escaping **disabled**, the fake and real bold can't be distinguished in the markdown. That means it is both going to render as bold. - ---- - -So now you know the purpose of escaping. However, if you encounter some content where the escaping breaks, you can manually disable it. But please also open an issue! - -## Issues - -If you find HTML snippets (or even full websites) that don't produce the expected results, please open an issue! - -## Contributing & Testing - -Please first discuss the change you wish to make, by opening an issue. I'm also happy to guide you to where a change is most likely needed. - -_Note: The outside API should not change because of backwards compatibility..._ - -You don't have to be afraid of breaking the converter, since there are many "Golden File Tests": - -Add your problematic HTML snippet to one of the `input.html` files in the `testdata` folder. Then run `go test -update` and have a look at which `.golden` files changed in GIT. - -You can now change the internal logic and inspect what impact your change has by running `go test -update` again. - -_Note: Before submitting your change as a PR, make sure that you run those tests and check the files into GIT..._ - -## Related Projects - -- [turndown (js)](https://github.com/domchristie/turndown), a very good library written in javascript. -- [lunny/html2md](https://github.com/lunny/html2md), which is using [regex instead of goquery](https://stackoverflow.com/a/1732454). I came around a few edge case when using it (leaving some html comments, ...) so I wrote my own. - -## License - -This project is licensed under the terms of the MIT license. diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/SECURITY.md b/vendor/github.com/JohannesKaufmann/html-to-markdown/SECURITY.md deleted file mode 100644 index 0a028f6ee44fde35a0dc38bb7113135a30d9fedd..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/SECURITY.md +++ /dev/null @@ -1,6 +0,0 @@ -# Security Policy - -## Reporting a Vulnerability - -Please report (suspected) security vulnerabilities to johannes@joina.de with the subject _"Security html-to-markdown"_ and you will receive a response within 48 hours. - diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/commonmark.go b/vendor/github.com/JohannesKaufmann/html-to-markdown/commonmark.go deleted file mode 100644 index 8ff47c02d21b4332c23f63371376b4d974684edb..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/commonmark.go +++ /dev/null @@ -1,393 +0,0 @@ -package md - -import ( - "fmt" - "unicode" - - "regexp" - "strconv" - "strings" - "unicode/utf8" - - "github.com/JohannesKaufmann/html-to-markdown/escape" - "github.com/PuerkitoBio/goquery" -) - -var multipleSpacesR = regexp.MustCompile(` +`) - -var commonmark = []Rule{ - { - Filter: []string{"ul", "ol"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - parent := selec.Parent() - - // we have a nested list, were the ul/ol is inside a list item - // -> based on work done by @requilence from @anytypeio - if (parent.Is("li") || parent.Is("ul") || parent.Is("ol")) && parent.Children().Last().IsSelection(selec) { - // add a line break prefix if the parent's text node doesn't have it. - // that makes sure that every list item is on its on line - lastContentTextNode := strings.TrimRight(parent.Nodes[0].FirstChild.Data, " \t") - if !strings.HasSuffix(lastContentTextNode, "\n") { - content = "\n" + content - } - - // remove empty lines between lists - trimmedSpaceContent := strings.TrimRight(content, " \t") - if strings.HasSuffix(trimmedSpaceContent, "\n") { - content = strings.TrimRightFunc(content, unicode.IsSpace) - } - } else { - content = "\n\n" + content + "\n\n" - } - return &content - }, - }, - { - Filter: []string{"li"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - if strings.TrimSpace(content) == "" { - return nil - } - - // remove leading newlines - content = leadingNewlinesR.ReplaceAllString(content, "") - // replace trailing newlines with just a single one - content = trailingNewlinesR.ReplaceAllString(content, "\n") - // remove leading spaces - content = strings.TrimLeft(content, " ") - - prefix := selec.AttrOr(attrListPrefix, "") - - // `prefixCount` is not nessesarily the length of the empty string `prefix` - // but how much space is reserved for the prefixes of the siblings. - prefixCount, previousPrefixCounts := countListParents(opt, selec) - - // if the prefix is not needed, balance it by adding the usual prefix spaces - if prefix == "" { - prefix = strings.Repeat(" ", prefixCount) - } - // indent the prefix so that the nested links are represented - indent := strings.Repeat(" ", previousPrefixCounts) - prefix = indent + prefix - - content = IndentMultiLineListItem(opt, content, prefixCount+previousPrefixCounts) - - return String(prefix + content + "\n") - }, - }, - { - Filter: []string{"#text"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - text := selec.Text() - if trimmed := strings.TrimSpace(text); trimmed == "" { - return String("") - } - text = tabR.ReplaceAllString(text, " ") - - // replace multiple spaces by one space: dont accidentally make - // normal text be indented and thus be a code block. - text = multipleSpacesR.ReplaceAllString(text, " ") - - if opt.EscapeMode == "basic" { - text = escape.MarkdownCharacters(text) - } - - // if its inside a list, trim the spaces to not mess up the indentation - parent := selec.Parent() - next := selec.Next() - if IndexWithText(selec) == 0 && - (parent.Is("li") || parent.Is("ol") || parent.Is("ul")) && - (next.Is("ul") || next.Is("ol")) { - // trim only spaces and not new lines - text = strings.Trim(text, ` `) - } - - return &text - }, - }, - { - Filter: []string{"p", "div"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - parent := goquery.NodeName(selec.Parent()) - if IsInlineElement(parent) || parent == "li" { - content = "\n" + content + "\n" - return &content - } - - // remove unnecessary spaces to have clean markdown - content = TrimpLeadingSpaces(content) - - content = "\n\n" + content + "\n\n" - return &content - }, - }, - { - Filter: []string{"h1", "h2", "h3", "h4", "h5", "h6"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - if strings.TrimSpace(content) == "" { - return nil - } - - content = strings.Replace(content, "\n", " ", -1) - content = strings.Replace(content, "\r", " ", -1) - content = strings.Replace(content, `#`, `\#`, -1) - content = strings.TrimSpace(content) - - insideLink := selec.ParentsFiltered("a").Length() > 0 - if insideLink { - text := opt.StrongDelimiter + content + opt.StrongDelimiter - text = AddSpaceIfNessesary(selec, text) - return &text - } - - node := goquery.NodeName(selec) - level, err := strconv.Atoi(node[1:]) - if err != nil { - return nil - } - - if opt.HeadingStyle == "setext" && level < 3 { - line := "-" - if level == 1 { - line = "=" - } - - underline := strings.Repeat(line, len(content)) - return String("\n\n" + content + "\n" + underline + "\n\n") - } - - prefix := strings.Repeat("#", level) - text := "\n\n" + prefix + " " + content + "\n\n" - return &text - }, - }, - { - Filter: []string{"strong", "b"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - // only use one bold tag if they are nested - parent := selec.Parent() - if parent.Is("strong") || parent.Is("b") { - return &content - } - - trimmed := strings.TrimSpace(content) - if trimmed == "" { - return &trimmed - } - - // If there is a newline character between the start and end delimiter - // the delimiters won't be recognized. Either we remove all newline characters - // OR on _every_ line we put start & end delimiters. - trimmed = delimiterForEveryLine(trimmed, opt.StrongDelimiter) - - // Always have a space to the side to recognize the delimiter - trimmed = AddSpaceIfNessesary(selec, trimmed) - - return &trimmed - }, - }, - { - Filter: []string{"i", "em"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - // only use one italic tag if they are nested - parent := selec.Parent() - if parent.Is("i") || parent.Is("em") { - return &content - } - - trimmed := strings.TrimSpace(content) - if trimmed == "" { - return &trimmed - } - - // If there is a newline character between the start and end delimiter - // the delimiters won't be recognized. Either we remove all newline characters - // OR on _every_ line we put start & end delimiters. - trimmed = delimiterForEveryLine(trimmed, opt.EmDelimiter) - - // Always have a space to the side to recognize the delimiter - trimmed = AddSpaceIfNessesary(selec, trimmed) - - return &trimmed - }, - }, - { - Filter: []string{"img"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - src := selec.AttrOr("src", "") - src = strings.TrimSpace(src) - if src == "" { - return String("") - } - - src = opt.GetAbsoluteURL(selec, src, opt.domain) - - alt := selec.AttrOr("alt", "") - alt = strings.Replace(alt, "\n", " ", -1) - - text := fmt.Sprintf("", alt, src) - return &text - }, - }, - { - Filter: []string{"a"}, - AdvancedReplacement: func(content string, selec *goquery.Selection, opt *Options) (AdvancedResult, bool) { - // if there is no href, no link is used. So just return the content inside the link - href, ok := selec.Attr("href") - if !ok || strings.TrimSpace(href) == "" || strings.TrimSpace(href) == "#" { - return AdvancedResult{ - Markdown: content, - }, false - } - - href = opt.GetAbsoluteURL(selec, href, opt.domain) - - // having multiline content inside a link is a bit tricky - content = EscapeMultiLine(content) - - var title string - if t, ok := selec.Attr("title"); ok { - t = strings.Replace(t, "\n", " ", -1) - // escape all quotes - t = strings.Replace(t, `"`, `\"`, -1) - title = fmt.Sprintf(` "%s"`, t) - } - - // if there is no link content (for example because it contains an svg) - // the 'title' or 'aria-label' attribute is used instead. - if strings.TrimSpace(content) == "" { - content = selec.AttrOr("title", selec.AttrOr("aria-label", "")) - } - - // a link without text won't de displayed anyway - if content == "" { - return AdvancedResult{}, true - } - - if opt.LinkStyle == "inlined" { - md := fmt.Sprintf("[%s](%s%s)", content, href, title) - md = AddSpaceIfNessesary(selec, md) - - return AdvancedResult{ - Markdown: md, - }, false - } - - var replacement string - var reference string - - switch opt.LinkReferenceStyle { - case "collapsed": - - replacement = "[" + content + "][]" - reference = "[" + content + "]: " + href + title - case "shortcut": - replacement = "[" + content + "]" - reference = "[" + content + "]: " + href + title - - default: - id := selec.AttrOr("data-index", "") - replacement = "[" + content + "][" + id + "]" - reference = "[" + id + "]: " + href + title - } - - replacement = AddSpaceIfNessesary(selec, replacement) - return AdvancedResult{Markdown: replacement, Footer: reference}, false - }, - }, - { - Filter: []string{"code", "kbd", "samp", "tt"}, - Replacement: func(_ string, selec *goquery.Selection, opt *Options) *string { - code := getCodeContent(selec) - - // Newlines in the text aren't great, since this is inline code and not a code block. - // Newlines will be stripped anyway in the browser, but it won't be recognized as code - // from the markdown parser when there is more than one newline. - // So limit to - code = multipleNewLinesRegex.ReplaceAllString(code, "\n") - - fenceChar := '`' - maxCount := calculateCodeFenceOccurrences(fenceChar, code) - maxCount++ - - fence := strings.Repeat(string(fenceChar), maxCount) - - // code block contains a backtick as first character - if strings.HasPrefix(code, "`") { - code = " " + code - } - // code block contains a backtick as last character - if strings.HasSuffix(code, "`") { - code = code + " " - } - - // TODO: configure delimeter in options? - text := fence + code + fence - text = AddSpaceIfNessesary(selec, text) - return &text - }, - }, - { - Filter: []string{"pre"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - codeElement := selec.Find("code") - language := codeElement.AttrOr("class", "") - language = strings.Replace(language, "language-", "", 1) - - code := getCodeContent(selec) - - fenceChar, _ := utf8.DecodeRuneInString(opt.Fence) - fence := CalculateCodeFence(fenceChar, code) - - text := "\n\n" + fence + language + "\n" + - code + - "\n" + fence + "\n\n" - return &text - }, - }, - { - Filter: []string{"hr"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - // e.g. `## --- Heading` would look weird, so don't render a divider if inside a heading - insideHeading := selec.ParentsFiltered("h1,h2,h3,h4,h5,h6").Length() > 0 - if insideHeading { - return String("") - } - - text := "\n\n" + opt.HorizontalRule + "\n\n" - return &text - }, - }, - { - Filter: []string{"br"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - return String("\n\n") - }, - }, - { - Filter: []string{"blockquote"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - content = strings.TrimSpace(content) - if content == "" { - return nil - } - - content = multipleNewLinesRegex.ReplaceAllString(content, "\n\n") - - var beginningR = regexp.MustCompile(`(?m)^`) - content = beginningR.ReplaceAllString(content, "> ") - - text := "\n\n" + content + "\n\n" - return &text - }, - }, - { - Filter: []string{"noscript"}, - Replacement: func(content string, selec *goquery.Selection, opt *Options) *string { - // for now remove the contents of noscript. But in the future we could - // tell goquery to parse the contents of the tag. - // -> https://github.com/PuerkitoBio/goquery/issues/139#issuecomment-517526070 - return nil - }, - }, -} diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/escape/escape.go b/vendor/github.com/JohannesKaufmann/html-to-markdown/escape/escape.go deleted file mode 100644 index e21ab4b7207f3c56521fc641c5637bdde20a8707..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/escape/escape.go +++ /dev/null @@ -1,65 +0,0 @@ -// Package escape escapes characters that are commonly used in -// markdown like the * for strong/italic. -package escape - -import ( - "regexp" - "strings" -) - -var backslash = regexp.MustCompile(`\\(\S)`) -var heading = regexp.MustCompile(`(?m)^(#{1,6} )`) -var orderedList = regexp.MustCompile(`(?m)^(\W* {0,3})(\d+)\. `) -var unorderedList = regexp.MustCompile(`(?m)^([^\\\w]*)[*+-] `) -var horizontalDivider = regexp.MustCompile(`(?m)^([-*_] *){3,}$`) -var blockquote = regexp.MustCompile(`(?m)^(\W* {0,3})> `) -var link = regexp.MustCompile(`([\[\]])`) - -var replacer = strings.NewReplacer( - `*`, `\*`, - `_`, `\_`, - "`", "\\`", - `|`, `\|`, -) - -// MarkdownCharacters escapes common markdown characters so that -// `**Not Bold**
ends up as correct markdown `\*\*Not Strong\*\*`. -// No worry, the escaped characters will display fine, just without the formatting. -func MarkdownCharacters(text string) string { - // Escape backslash escapes! - text = backslash.ReplaceAllString(text, `\\$1`) - - // Escape headings - text = heading.ReplaceAllString(text, `\$1`) - - // Escape hr - text = horizontalDivider.ReplaceAllStringFunc(text, func(t string) string { - if strings.Contains(t, "-") { - return strings.Replace(t, "-", `\-`, 3) - } else if strings.Contains(t, "_") { - return strings.Replace(t, "_", `\_`, 3) - } - return strings.Replace(t, "*", `\*`, 3) - }) - - // Escape ol bullet points - text = orderedList.ReplaceAllString(text, `$1$2\. `) - - // Escape ul bullet points - text = unorderedList.ReplaceAllStringFunc(text, func(t string) string { - return regexp.MustCompile(`([*+-])`).ReplaceAllString(t, `\$1`) - }) - - // Escape blockquote indents - text = blockquote.ReplaceAllString(text, `$1\> `) - - // Escape em/strong * - // Escape em/strong _ - // Escape code _ - text = replacer.Replace(text) - - // Escape link & image brackets - text = link.ReplaceAllString(text, `\$1`) - - return text -} diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/from.go b/vendor/github.com/JohannesKaufmann/html-to-markdown/from.go deleted file mode 100644 index 67f31d5e4f0503e0917b81ee753cc625d6dd3555..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/from.go +++ /dev/null @@ -1,464 +0,0 @@ -// Package md converts html to markdown. -// -// converter := md.NewConverter("", true, nil) -// -// html = `Important` -// -// markdown, err := converter.ConvertString(html) -// if err != nil { -// log.Fatal(err) -// } -// fmt.Println("md ->", markdown) -// Or if you are already using goquery: -// markdown, err := converter.Convert(selec) -package md - -import ( - "bytes" - "errors" - "fmt" - "io" - "log" - "net/http" - "net/url" - "regexp" - "strconv" - "strings" - "sync" - "time" - - "github.com/PuerkitoBio/goquery" -) - -type simpleRuleFunc func(content string, selec *goquery.Selection, options *Options) *string -type ruleFunc func(content string, selec *goquery.Selection, options *Options) (res AdvancedResult, skip bool) - -// BeforeHook runs before the converter and can be used to transform the original html -type BeforeHook func(selec *goquery.Selection) - -// Afterhook runs after the converter and can be used to transform the resulting markdown -type Afterhook func(markdown string) string - -// Converter is initialized by NewConverter. -type Converter struct { - mutex sync.RWMutex - rules map[string][]ruleFunc - keep map[string]struct{} - remove map[string]struct{} - - before []BeforeHook - after []Afterhook - - domain string - options Options -} - -func validate(val string, possible ...string) error { - for _, e := range possible { - if e == val { - return nil - } - } - return fmt.Errorf("field must be one of %v but got %s", possible, val) -} -func validateOptions(opt Options) error { - if err := validate(opt.HeadingStyle, "setext", "atx"); err != nil { - return err - } - if strings.Count(opt.HorizontalRule, "*") < 3 && - strings.Count(opt.HorizontalRule, "_") < 3 && - strings.Count(opt.HorizontalRule, "-") < 3 { - return errors.New("HorizontalRule must be at least 3 characters of '*', '_' or '-' but got " + opt.HorizontalRule) - } - - if err := validate(opt.BulletListMarker, "-", "+", "*"); err != nil { - return err - } - if err := validate(opt.CodeBlockStyle, "indented", "fenced"); err != nil { - return err - } - if err := validate(opt.Fence, "```", "~~~"); err != nil { - return err - } - if err := validate(opt.EmDelimiter, "_", "*"); err != nil { - return err - } - if err := validate(opt.StrongDelimiter, "**", "__"); err != nil { - return err - } - if err := validate(opt.LinkStyle, "inlined", "referenced"); err != nil { - return err - } - if err := validate(opt.LinkReferenceStyle, "full", "collapsed", "shortcut"); err != nil { - return err - } - - return nil -} - -var ( - attrListPrefix = "data-converter-list-prefix" -) - -// NewConverter initializes a new converter and holds all the rules. -// - `domain` is used for links and images to convert relative urls ("/image.png") to absolute urls. -// - CommonMark is the default set of rules. Set enableCommonmark to false if you want -// to customize everything using AddRules and DONT want to fallback to default rules. -func NewConverter(domain string, enableCommonmark bool, options *Options) *Converter { - conv := &Converter{ - domain: domain, - rules: make(map[string][]ruleFunc), - keep: make(map[string]struct{}), - remove: make(map[string]struct{}), - } - - conv.before = append(conv.before, func(selec *goquery.Selection) { - selec.Find("a[href]").Each(func(i int, s *goquery.Selection) { - // TODO: don't hardcode "data-index" and rename it to avoid accidental conflicts - s.SetAttr("data-index", strconv.Itoa(i+1)) - }) - }) - conv.before = append(conv.before, func(selec *goquery.Selection) { - selec.Find("li").Each(func(i int, s *goquery.Selection) { - prefix := getListPrefix(options, s) - - s.SetAttr(attrListPrefix, prefix) - }) - }) - conv.after = append(conv.after, func(markdown string) string { - markdown = strings.TrimSpace(markdown) - markdown = multipleNewLinesRegex.ReplaceAllString(markdown, "\n\n") - - // remove unnecessary trailing spaces to have clean markdown - markdown = TrimTrailingSpaces(markdown) - - return markdown - }) - - if enableCommonmark { - conv.AddRules(commonmark...) - conv.remove["script"] = struct{}{} - conv.remove["style"] = struct{}{} - conv.remove["textarea"] = struct{}{} - } - - // TODO: put domain in options? - if options == nil { - options = &Options{} - } - if options.HeadingStyle == "" { - options.HeadingStyle = "atx" - } - if options.HorizontalRule == "" { - options.HorizontalRule = "* * *" - } - if options.BulletListMarker == "" { - options.BulletListMarker = "-" - } - if options.CodeBlockStyle == "" { - options.CodeBlockStyle = "indented" - } - if options.Fence == "" { - options.Fence = "```" - } - if options.EmDelimiter == "" { - options.EmDelimiter = "_" - } - if options.StrongDelimiter == "" { - options.StrongDelimiter = "**" - } - if options.LinkStyle == "" { - options.LinkStyle = "inlined" - } - if options.LinkReferenceStyle == "" { - options.LinkReferenceStyle = "full" - } - if options.EscapeMode == "" { - options.EscapeMode = "basic" - } - - // for now, store it in the options - options.domain = domain - - if options.GetAbsoluteURL == nil { - options.GetAbsoluteURL = DefaultGetAbsoluteURL - } - - conv.options = *options - err := validateOptions(conv.options) - if err != nil { - log.Println("markdown options is not valid:", err) - } - - return conv -} -func (conv *Converter) getRuleFuncs(tag string) []ruleFunc { - conv.mutex.RLock() - defer conv.mutex.RUnlock() - - r, ok := conv.rules[tag] - if !ok || len(r) == 0 { - if _, keep := conv.keep[tag]; keep { - return []ruleFunc{wrap(ruleKeep)} - } - if _, remove := conv.remove[tag]; remove { - return nil // TODO: - } - - return []ruleFunc{wrap(ruleDefault)} - } - - return r -} - -func wrap(simple simpleRuleFunc) ruleFunc { - return func(content string, selec *goquery.Selection, opt *Options) (AdvancedResult, bool) { - res := simple(content, selec, opt) - if res == nil { - return AdvancedResult{}, true - } - return AdvancedResult{Markdown: *res}, false - } -} - -// Before registers a hook that is run before the conversion. It -// can be used to transform the original goquery html document. -// -// For example, the default before hook adds an index to every link, -// so that the `a` tag rule (for "reference" "full") can have an incremental number. -func (conv *Converter) Before(hooks ...BeforeHook) *Converter { - conv.mutex.Lock() - defer conv.mutex.Unlock() - - for _, hook := range hooks { - conv.before = append(conv.before, hook) - } - - return conv -} - -// After registers a hook that is run after the conversion. It -// can be used to transform the markdown document that is about to be returned. -// -// For example, the default after hook trims the returned markdown. -func (conv *Converter) After(hooks ...Afterhook) *Converter { - conv.mutex.Lock() - defer conv.mutex.Unlock() - - for _, hook := range hooks { - conv.after = append(conv.after, hook) - } - - return conv -} - -// ClearBefore clears the current before hooks (including the default before hooks). -func (conv *Converter) ClearBefore() *Converter { - conv.mutex.Lock() - defer conv.mutex.Unlock() - - conv.before = nil - - return conv -} - -// ClearAfter clears the current after hooks (including the default after hooks). -func (conv *Converter) ClearAfter() *Converter { - conv.mutex.Lock() - defer conv.mutex.Unlock() - - conv.after = nil - - return conv -} - -// AddRules adds the rules that are passed in to the converter. -// -// By default it overrides the rule for that html tag. You can -// fall back to the default rule by returning nil. -func (conv *Converter) AddRules(rules ...Rule) *Converter { - conv.mutex.Lock() - defer conv.mutex.Unlock() - - for _, rule := range rules { - if len(rule.Filter) == 0 { - log.Println("you need to specify at least one filter for your rule") - } - for _, filter := range rule.Filter { - r, _ := conv.rules[filter] - - if rule.AdvancedReplacement != nil { - r = append(r, rule.AdvancedReplacement) - } else { - r = append(r, wrap(rule.Replacement)) - } - conv.rules[filter] = r - } - } - - return conv -} - -// Keep certain html tags in the generated output. -func (conv *Converter) Keep(tags ...string) *Converter { - conv.mutex.Lock() - defer conv.mutex.Unlock() - - for _, tag := range tags { - conv.keep[tag] = struct{}{} - } - return conv -} - -// Remove certain html tags from the source. -func (conv *Converter) Remove(tags ...string) *Converter { - conv.mutex.Lock() - defer conv.mutex.Unlock() - for _, tag := range tags { - conv.remove[tag] = struct{}{} - } - return conv -} - -// Plugin can be used to extends functionality beyond what -// is offered by commonmark. -type Plugin func(conv *Converter) []Rule - -// Use can be used to add additional functionality to the converter. It is -// used when its not sufficient to use only rules for example in Plugins. -func (conv *Converter) Use(plugins ...Plugin) *Converter { - for _, plugin := range plugins { - rules := plugin(conv) - conv.AddRules(rules...) // TODO: for better performance only use one lock for all plugins - } - return conv -} - -// Timeout for the http client -var Timeout = time.Second * 10 -var netClient = &http.Client{ - Timeout: Timeout, -} - -// DomainFromURL returns `u.Host` from the parsed url. -func DomainFromURL(rawURL string) string { - rawURL = strings.TrimSpace(rawURL) - - u, _ := url.Parse(rawURL) - if u != nil && u.Host != "" { - return u.Host - } - - // lets try it again by adding a scheme - u, _ = url.Parse("http://" + rawURL) - if u != nil { - return u.Host - } - - return "" -} - -// Reduce many newline characters `\n` to at most 2 new line characters. -var multipleNewLinesRegex = regexp.MustCompile(`[\n]{2,}`) - -// Convert returns the content from a goquery selection. -// If you have a goquery document just pass in doc.Selection. -func (conv *Converter) Convert(selec *goquery.Selection) string { - conv.mutex.RLock() - domain := conv.domain - options := conv.options - l := len(conv.rules) - if l == 0 { - log.Println("you have added no rules. either enable commonmark or add you own.") - } - before := conv.before - after := conv.after - conv.mutex.RUnlock() - - // before hook - for _, hook := range before { - hook(selec) - } - - res := conv.selecToMD(domain, selec, &options) - markdown := res.Markdown - - if res.Header != "" { - markdown = res.Header + "\n\n" + markdown - } - if res.Footer != "" { - markdown += "\n\n" + res.Footer - } - - // after hook - for _, hook := range after { - markdown = hook(markdown) - } - - return markdown -} - -// ConvertReader returns the content from a reader and returns a buffer. -func (conv *Converter) ConvertReader(reader io.Reader) (bytes.Buffer, error) { - var buffer bytes.Buffer - doc, err := goquery.NewDocumentFromReader(reader) - if err != nil { - return buffer, err - } - buffer.WriteString( - conv.Convert(doc.Selection), - ) - - return buffer, nil -} - -// ConvertResponse returns the content from a html response. -func (conv *Converter) ConvertResponse(res *http.Response) (string, error) { - doc, err := goquery.NewDocumentFromResponse(res) - if err != nil { - return "", err - } - return conv.Convert(doc.Selection), nil -} - -// ConvertString returns the content from a html string. If you -// already have a goquery selection use `Convert`. -func (conv *Converter) ConvertString(html string) (string, error) { - doc, err := goquery.NewDocumentFromReader(strings.NewReader(html)) - if err != nil { - return "", err - } - return conv.Convert(doc.Selection), nil -} - -// ConvertBytes returns the content from a html byte array. -func (conv *Converter) ConvertBytes(bytes []byte) ([]byte, error) { - res, err := conv.ConvertString(string(bytes)) - if err != nil { - return nil, err - } - return []byte(res), nil -} - -// ConvertURL returns the content from the page with that url. -func (conv *Converter) ConvertURL(url string) (string, error) { - // not using goquery.NewDocument directly because of the timeout - resp, err := netClient.Get(url) - if err != nil { - return "", err - } - - if resp.StatusCode < 200 || resp.StatusCode > 299 { - return "", fmt.Errorf("expected a status code in the 2xx range but got %d", resp.StatusCode) - } - - doc, err := goquery.NewDocumentFromResponse(resp) - if err != nil { - return "", err - } - domain := DomainFromURL(url) - if conv.domain != domain { - log.Printf("expected '%s' as the domain but got '%s' \n", conv.domain, domain) - } - return conv.Convert(doc.Selection), nil -} diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/logo_five_years.png b/vendor/github.com/JohannesKaufmann/html-to-markdown/logo_five_years.png deleted file mode 100644 index 69cb5a4b559f49840de522c996076aa7c8970159..0000000000000000000000000000000000000000 Binary files a/vendor/github.com/JohannesKaufmann/html-to-markdown/logo_five_years.png and /dev/null differ diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/markdown.go b/vendor/github.com/JohannesKaufmann/html-to-markdown/markdown.go deleted file mode 100644 index 9101da6b9ca21c4a6614e89a0cb4c1a4413fc431..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/markdown.go +++ /dev/null @@ -1,212 +0,0 @@ -package md - -import ( - "bytes" - "log" - "net/url" - "regexp" - "strings" - - "github.com/PuerkitoBio/goquery" - "golang.org/x/net/html" -) - -var ( - ruleDefault = func(content string, selec *goquery.Selection, opt *Options) *string { - return &content - } - ruleKeep = func(content string, selec *goquery.Selection, opt *Options) *string { - element := selec.Get(0) - - var buf bytes.Buffer - err := html.Render(&buf, element) - if err != nil { - log.Println("[JohannesKaufmann/html-to-markdown] ruleKeep: error while rendering the element to html:", err) - return String("") - } - - return String(buf.String()) - } -) - -var inlineElements = []string{ // -> https://developer.mozilla.org/de/docs/Web/HTML/Inline_elemente - "b", "big", "i", "small", "tt", - "abbr", "acronym", "cite", "code", "dfn", "em", "kbd", "strong", "samp", "var", - "a", "bdo", "br", "img", "map", "object", "q", "script", "span", "sub", "sup", - "button", "input", "label", "select", "textarea", -} - -// IsInlineElement can be used to check wether a node name (goquery.Nodename) is -// an html inline element and not a block element. Used in the rule for the -// p tag to check wether the text is inside a block element. -func IsInlineElement(e string) bool { - for _, element := range inlineElements { - if element == e { - return true - } - } - return false -} - -// String is a helper function to return a pointer. -func String(text string) *string { - return &text -} - -// Options to customize the output. You can change stuff like -// the character that is used for strong text. -type Options struct { - // "setext" or "atx" - // default: "atx" - HeadingStyle string - - // Any Thematic break - // default: "* * *" - HorizontalRule string - - // "-", "+", or "*" - // default: "-" - BulletListMarker string - - // "indented" or "fenced" - // default: "indented" - CodeBlockStyle string - - // ``` or ~~~ - // default: ``` - Fence string - - // _ or * - // default: _ - EmDelimiter string - - // ** or __ - // default: ** - StrongDelimiter string - - // inlined or referenced - // default: inlined - LinkStyle string - - // full, collapsed, or shortcut - // default: full - LinkReferenceStyle string - - // basic, disabled - // default: basic - EscapeMode string - - domain string - - // GetAbsoluteURL parses the `rawURL` and adds the `domain` to convert relative (/page.html) - // urls to absolute urls (http://domain.com/page.html). - // - // The default is `DefaultGetAbsoluteURL`, unless you override it. That can also - // be useful if you want to proxy the images. - GetAbsoluteURL func(selec *goquery.Selection, rawURL string, domain string) string - - // GetCodeBlockLanguage identifies the language for syntax highlighting - // of a code block. The default is `DefaultGetCodeBlockLanguage`, which - // only gets the attribute x from the selection. - // - // You can override it if you want more results, for example by using - // lexers.Analyse(content) from github.com/alecthomas/chroma - // TODO: implement - // GetCodeBlockLanguage func(s *goquery.Selection, content string) string -} - -// DefaultGetAbsoluteURL is the default function and can be overridden through `GetAbsoluteURL` in the options. -func DefaultGetAbsoluteURL(selec *goquery.Selection, rawURL string, domain string) string { - if domain == "" { - return rawURL - } - - u, err := url.Parse(rawURL) - if err != nil { - // we can't do anything with this url because it is invalid - return rawURL - } - - if u.Scheme == "data" { - // this is a data uri (for example an inline base64 image) - return rawURL - } - - if u.Scheme == "" { - u.Scheme = "http" - } - if u.Host == "" { - u.Host = domain - } - - return u.String() -} - -// AdvancedResult is used for example for links. If you use LinkStyle:referenced -// the link href is placed at the bottom of the generated markdown (Footer). -type AdvancedResult struct { - Header string - Markdown string - Footer string -} - -// Rule to convert certain html tags to markdown. -// md.Rule{ -// Filter: []string{"del", "s", "strike"}, -// Replacement: func(content string, selec *goquery.Selection, opt *md.Options) *string { -// // You need to return a pointer to a string (md.String is just a helper function). -// // If you return nil the next function for that html element -// // will be picked. For example you could only convert an element -// // if it has a certain class name and fallback if not. -// return md.String("~" + content + "~") -// }, -// } -type Rule struct { - Filter []string - Replacement func(content string, selec *goquery.Selection, options *Options) *string - AdvancedReplacement func(content string, selec *goquery.Selection, options *Options) (res AdvancedResult, skip bool) -} - -var leadingNewlinesR = regexp.MustCompile(`^\n+`) -var trailingNewlinesR = regexp.MustCompile(`\n+$`) - -var newlinesR = regexp.MustCompile(`\n+`) -var tabR = regexp.MustCompile(`\t+`) -var indentR = regexp.MustCompile(`(?m)\n`) - -func (conv *Converter) selecToMD(domain string, selec *goquery.Selection, opt *Options) AdvancedResult { - var result AdvancedResult - - var builder strings.Builder - selec.Contents().Each(func(i int, s *goquery.Selection) { - name := goquery.NodeName(s) - rules := conv.getRuleFuncs(name) - - for i := len(rules) - 1; i >= 0; i-- { - rule := rules[i] - - content := conv.selecToMD(domain, s, opt) - if content.Header != "" { - result.Header += content.Header - } - if content.Footer != "" { - result.Footer += content.Footer - } - - res, skip := rule(content.Markdown, s, opt) - if res.Header != "" { - result.Header += res.Header + "\n" - } - if res.Footer != "" { - result.Footer += res.Footer + "\n" - } - - if !skip { - builder.WriteString(res.Markdown) - return - } - } - }) - result.Markdown = builder.String() - return result -} diff --git a/vendor/github.com/JohannesKaufmann/html-to-markdown/utils.go b/vendor/github.com/JohannesKaufmann/html-to-markdown/utils.go deleted file mode 100644 index 09bb3b31a97dabb680e1d13ba66eaf22ac22ea96..0000000000000000000000000000000000000000 --- a/vendor/github.com/JohannesKaufmann/html-to-markdown/utils.go +++ /dev/null @@ -1,533 +0,0 @@ -package md - -import ( - "bytes" - "fmt" - "regexp" - "strconv" - "strings" - "unicode" - "unicode/utf8" - - "github.com/PuerkitoBio/goquery" - "golang.org/x/net/html" -) - -/* -WARNING: The functions from this file can be used externally -but there is no garanty that they will stay exported. -*/ - -// CollectText returns the text of the node and all its children -func CollectText(n *html.Node) string { - text := &bytes.Buffer{} - collectText(n, text) - return text.String() -} -func collectText(n *html.Node, buf *bytes.Buffer) { - if n.Type == html.TextNode { - buf.WriteString(n.Data) - } - for c := n.FirstChild; c != nil; c = c.NextSibling { - collectText(c, buf) - } -} - -func getName(node *html.Node) string { - selec := &goquery.Selection{Nodes: []*html.Node{node}} - return goquery.NodeName(selec) -} - -// What elements automatically trim their content? -// Don't add another space if the other element is going to add a -// space already. -func isTrimmedElement(name string) bool { - nodes := []string{ - "a", - "strong", "b", - "i", "em", - "del", "s", "strike", - "code", - } - - for _, node := range nodes { - if name == node { - return true - } - } - return false -} - -func getPrevNodeText(node *html.Node) (string, bool) { - if node == nil { - return "", false - } - - for ; node != nil; node = node.PrevSibling { - text := CollectText(node) - - name := getName(node) - if name == "br" { - return "\n", true - } - - // if the content is empty, try our luck with the next node - if strings.TrimSpace(text) == "" { - continue - } - - if isTrimmedElement(name) { - text = strings.TrimSpace(text) - } - - return text, true - } - return "", false -} -func getNextNodeText(node *html.Node) (string, bool) { - if node == nil { - return "", false - } - - for ; node != nil; node = node.NextSibling { - text := CollectText(node) - - name := getName(node) - if name == "br" { - return "\n", true - } - - // if the content is empty, try our luck with the next node - if strings.TrimSpace(text) == "" { - continue - } - - // if you have "a a a", three elements that are trimmed, then only add - // a space to one side, since the other's are also adding a space. - if isTrimmedElement(name) { - text = " " - } - - return text, true - } - return "", false -} - -// AddSpaceIfNessesary adds spaces to the text based on the neighbors. -// That makes sure that there is always a space to the side, to recognize the delimiter. -func AddSpaceIfNessesary(selec *goquery.Selection, markdown string) string { - if len(selec.Nodes) == 0 { - return markdown - } - rootNode := selec.Nodes[0] - - prev, hasPrev := getPrevNodeText(rootNode.PrevSibling) - if hasPrev { - lastChar, size := utf8.DecodeLastRuneInString(prev) - if size > 0 && !unicode.IsSpace(lastChar) { - markdown = " " + markdown - } - } - - next, hasNext := getNextNodeText(rootNode.NextSibling) - if hasNext { - firstChar, size := utf8.DecodeRuneInString(next) - if size > 0 && !unicode.IsSpace(firstChar) && !unicode.IsPunct(firstChar) { - markdown = markdown + " " - } - } - - return markdown -} - -func isLineCodeDelimiter(chars []rune) bool { - if len(chars) < 3 { - return false - } - - // TODO: If it starts with 4 (instead of 3) fence characters, we should only end it - // if we see the same amount of ending fence characters. - return chars[0] == '`' && chars[1] == '`' && chars[2] == '`' -} - -// TrimpLeadingSpaces removes spaces from the beginning of a line -// but makes sure that list items and code blocks are not affected. -func TrimpLeadingSpaces(text string) string { - var insideCodeBlock bool - - lines := strings.Split(text, "\n") - for index := range lines { - chars := []rune(lines[index]) - - if isLineCodeDelimiter(chars) { - if !insideCodeBlock { - // start the code block - insideCodeBlock = true - } else { - // end the code block - insideCodeBlock = false - } - } - if insideCodeBlock { - // We are inside a code block and don't want to - // disturb that formatting (e.g. python indentation) - continue - } - - var spaces int - for i := 0; i < len(chars); i++ { - if unicode.IsSpace(chars[i]) { - if chars[i] == ' ' { - spaces = spaces + 4 - } else { - spaces++ - } - continue - } - - // this seems to be a list item - if chars[i] == '-' { - break - } - - // this seems to be a code block - if spaces >= 4 { - break - } - - // remove the space characters from the string - chars = chars[i:] - break - } - lines[index] = string(chars) - } - - return strings.Join(lines, "\n") -} - -// TrimTrailingSpaces removes unnecessary spaces from the end of lines. -func TrimTrailingSpaces(text string) string { - parts := strings.Split(text, "\n") - for i := range parts { - parts[i] = strings.TrimRightFunc(parts[i], func(r rune) bool { - return unicode.IsSpace(r) - }) - - } - - return strings.Join(parts, "\n") -} - -// The same as `multipleNewLinesRegex`, but applies to escaped new lines inside a link `\n\` -var multipleNewLinesInLinkRegex = regexp.MustCompile(`(\n\\){1,}`) // `([\n\r\s]\\)` - -// EscapeMultiLine deals with multiline content inside a link -func EscapeMultiLine(content string) string { - content = strings.TrimSpace(content) - content = strings.Replace(content, "\n", `\`+"\n", -1) - - content = multipleNewLinesInLinkRegex.ReplaceAllString(content, "\n\\") - - return content -} - -func calculateCodeFenceOccurrences(fenceChar rune, content string) int { - var occurrences []int - - var charsTogether int - for _, char := range content { - // we encountered a fence character, now count how many - // are directly afterwards - if char == fenceChar { - charsTogether++ - } else if charsTogether != 0 { - occurrences = append(occurrences, charsTogether) - charsTogether = 0 - } - } - - // if the last element in the content was a fenceChar - if charsTogether != 0 { - occurrences = append(occurrences, charsTogether) - } - - return findMax(occurrences) -} - -// CalculateCodeFence can be passed the content of a code block and it returns -// how many fence characters (` or ~) should be used. -// -// This is useful if the html content includes the same fence characters -// for example ``` -// -> https://stackoverflow.com/a/49268657 -func CalculateCodeFence(fenceChar rune, content string) string { - repeat := calculateCodeFenceOccurrences(fenceChar, content) - - // the outer fence block always has to have - // at least one character more than any content inside - repeat++ - - // you have to have at least three fence characters - // to be recognized as a code block - if repeat < 3 { - repeat = 3 - } - - return strings.Repeat(string(fenceChar), repeat) -} - -func findMax(a []int) (max int) { - for i, value := range a { - if i == 0 { - max = a[i] - } - - if value > max { - max = value - } - } - return max -} - -func getCodeWithoutTags(startNode *html.Node) []byte { - var buf bytes.Buffer - - var f func(*html.Node) - f = func(n *html.Node) { - if n.Type == html.ElementNode && (n.Data == "style" || n.Data == "script" || n.Data == "textarea") { - return - } - if n.Type == html.ElementNode && (n.Data == "br" || n.Data == "div") { - buf.WriteString("\n") - } - - if n.Type == html.TextNode { - buf.WriteString(n.Data) - return - } - - for c := n.FirstChild; c != nil; c = c.NextSibling { - f(c) - } - } - - f(startNode) - - return buf.Bytes() -} - -// getCodeContent gets the content of pre/code and unescapes the encoded characters. -// Returns "" if there is an error. -func getCodeContent(selec *goquery.Selection) string { - if len(selec.Nodes) == 0 { - return "" - } - - code := getCodeWithoutTags(selec.Nodes[0]) - - return string(code) -} - -// delimiterForEveryLine puts the delimiter not just at the start and end of the string -// but if the text is divided on multiple lines, puts the delimiters on every line with content. -// -// Otherwise the bold/italic delimiters won't be recognized if it contains new line characters. -func delimiterForEveryLine(text string, delimiter string) string { - lines := strings.Split(text, "\n") - - for i, line := range lines { - line = strings.TrimSpace(line) - if line == "" { - // Skip empty lines - continue - } - - lines[i] = delimiter + line + delimiter - } - return strings.Join(lines, "\n") -} - -// isWrapperListItem returns wether the list item has own -// content or is just a wrapper for another list. -// e.g. "- ..."
-func isWrapperListItem(s *goquery.Selection) bool {
- directText := s.Contents().Not("ul").Not("ol").Text()
-
- noOwnText := strings.TrimSpace(directText) == ""
- childIsList := s.ChildrenFiltered("ul").Length() > 0 || s.ChildrenFiltered("ol").Length() > 0
-
- return noOwnText && childIsList
-}
-
-// getListStart returns the integer from which the counting
-// for for the list items should start from.
-// -> https://developer.mozilla.org/en-US/docs/Web/HTML/Element/ol#start
-func getListStart(parent *goquery.Selection) int {
- val := parent.AttrOr("start", "")
- if val == "" {
- return 1
- }
-
- num, err := strconv.Atoi(val)
- if err != nil {
- return 1
- }
-
- if num < 0 {
- return 1
- }
- return num
-}
-
-// getListPrefix returns the appropriate prefix for the list item.
-// For example "- ", "* ", "1. ", "01. ", ...
-func getListPrefix(opt *Options, s *goquery.Selection) string {
- if isWrapperListItem(s) {
- return ""
- }
-
- parent := s.Parent()
- if parent.Is("ul") {
- return opt.BulletListMarker + " "
- } else if parent.Is("ol") {
- start := getListStart(parent)
- currentIndex := start + s.Index()
-
- lastIndex := parent.Children().Last().Index() + 1
- maxLength := len(strconv.Itoa(lastIndex))
-
- // pad the numbers so that all prefix numbers in the list take up the same space
- // `%02d.` -> "01. "
- format := `%0` + strconv.Itoa(maxLength) + `d. `
- return fmt.Sprintf(format, currentIndex)
- }
- // If the HTML is malformed and the list element isn't in a ul or ol, return no prefix
- return ""
-}
-
-// countListParents counts how much space is reserved for the prefixes at all the parent lists.
-// This is useful to calculate the correct level of indentation for nested lists.
-func countListParents(opt *Options, selec *goquery.Selection) (int, int) {
- var values []int
- for n := selec.Parent(); n != nil; n = n.Parent() {
- if n.Is("li") {
- continue
- }
- if !n.Is("ul") && !n.Is("ol") {
- break
- }
-
- prefix := n.Children().First().AttrOr(attrListPrefix, "")
-
- values = append(values, len(prefix))
- }
-
- // how many spaces are reserved for the prefixes of my siblings
- var prefixCount int
-
- // how many spaces are reserved in total for all of the other
- // list parents up the tree
- var previousPrefixCounts int
-
- for i, val := range values {
- if i == 0 {
- prefixCount = val
- continue
- }
-
- previousPrefixCounts += val
- }
-
- return prefixCount, previousPrefixCounts
-}
-
-// IndentMultiLineListItem makes sure that multiline list items
-// are properly indented.
-func IndentMultiLineListItem(opt *Options, text string, spaces int) string {
- parts := strings.Split(text, "\n")
- for i := range parts {
- // dont touch the first line since its indented through the prefix
- if i == 0 {
- continue
- }
-
- if isListItem(opt, parts[i]) {
- return strings.Join(parts, "\n")
- }
-
- indent := strings.Repeat(" ", spaces)
- parts[i] = indent + parts[i]
- }
-
- return strings.Join(parts, "\n")
-}
-
-// isListItem checks wether the line is a markdown list item
-func isListItem(opt *Options, line string) bool {
- b := []rune(line)
-
- bulletMarker := []rune(opt.BulletListMarker)[0]
-
- var hasNumber bool
- var hasMarker bool
- var hasSpace bool
-
- for i := 0; i < len(b); i++ {
- // A marker followed by a space qualifies as a list item
- if hasMarker && hasSpace {
- if b[i] == bulletMarker {
- // But if another BulletListMarker is found, it
- // might be a HorizontalRule
- return false
- }
-
- if !unicode.IsSpace(b[i]) {
- // Now we have some text
- return true
- }
- }
-
- if hasMarker {
- if unicode.IsSpace(b[i]) {
- hasSpace = true
- continue
- }
- // A marker like "1." that is not immediately followed by a space
- // is probably a false positive
- return false
- }
-
- if b[i] == bulletMarker {
- hasMarker = true
- continue
- }
-
- if hasNumber && b[i] == '.' {
- hasMarker = true
- continue
- }
- if unicode.IsDigit(b[i]) {
- hasNumber = true
- continue
- }
-
- if unicode.IsSpace(b[i]) {
- continue
- }
-
- // If we encouter any other character
- // before finding an indicator, its
- // not a list item
- return false
- }
- return false
-}
-
-// IndexWithText is similar to goquery's Index function but
-// returns the index of the current element while
-// NOT counting the empty elements beforehand.
-func IndexWithText(s *goquery.Selection) int {
- return s.PrevAll().FilterFunction(func(i int, s *goquery.Selection) bool {
- return strings.TrimSpace(s.Text()) != ""
- }).Length()
-}
diff --git a/vendor/github.com/MakeNowJust/heredoc/LICENSE b/vendor/github.com/MakeNowJust/heredoc/LICENSE
deleted file mode 100644
index 6d0eb9d5d687da202057e3b65a0c5da4076e7c14..0000000000000000000000000000000000000000
--- a/vendor/github.com/MakeNowJust/heredoc/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014-2019 TSUYUSATO Kitsune
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/github.com/MakeNowJust/heredoc/README.md b/vendor/github.com/MakeNowJust/heredoc/README.md
deleted file mode 100644
index e9924d2974adb2a9ce8c111c9d72b655c29a2d7d..0000000000000000000000000000000000000000
--- a/vendor/github.com/MakeNowJust/heredoc/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# heredoc
-
-[](https://circleci.com/gh/MakeNowJust/heredoc) [](https://godoc.org/github.com/MakeNowJust/heredoc)
-
-## About
-
-Package heredoc provides the here-document with keeping indent.
-
-## Install
-
-```console
-$ go get github.com/MakeNowJust/heredoc
-```
-
-## Import
-
-```go
-// usual
-import "github.com/MakeNowJust/heredoc"
-```
-
-## Example
-
-```go
-package main
-
-import (
- "fmt"
- "github.com/MakeNowJust/heredoc"
-)
-
-func main() {
- fmt.Println(heredoc.Doc(`
- Lorem ipsum dolor sit amet, consectetur adipisicing elit,
- sed do eiusmod tempor incididunt ut labore et dolore magna
- aliqua. Ut enim ad minim veniam, ...
- `))
- // Output:
- // Lorem ipsum dolor sit amet, consectetur adipisicing elit,
- // sed do eiusmod tempor incididunt ut labore et dolore magna
- // aliqua. Ut enim ad minim veniam, ...
- //
-}
-```
-
-## API Document
-
- - [heredoc - GoDoc](https://godoc.org/github.com/MakeNowJust/heredoc)
-
-## License
-
-This software is released under the MIT License, see LICENSE.
diff --git a/vendor/github.com/MakeNowJust/heredoc/heredoc.go b/vendor/github.com/MakeNowJust/heredoc/heredoc.go
deleted file mode 100644
index 1fc04695551fdc320bbd7284b951deba3ccefc3b..0000000000000000000000000000000000000000
--- a/vendor/github.com/MakeNowJust/heredoc/heredoc.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (c) 2014-2019 TSUYUSATO Kitsune
-// This software is released under the MIT License.
-// http://opensource.org/licenses/mit-license.php
-
-// Package heredoc provides creation of here-documents from raw strings.
-//
-// Golang supports raw-string syntax.
-//
-// doc := `
-// Foo
-// Bar
-// `
-//
-// But raw-string cannot recognize indentation. Thus such content is an indented string, equivalent to
-//
-// "\n\tFoo\n\tBar\n"
-//
-// I dont't want this!
-//
-// However this problem is solved by package heredoc.
-//
-// doc := heredoc.Doc(`
-// Foo
-// Bar
-// `)
-//
-// Is equivalent to
-//
-// "Foo\nBar\n"
-package heredoc
-
-import (
- "fmt"
- "strings"
- "unicode"
-)
-
-const maxInt = int(^uint(0) >> 1)
-
-// Doc returns un-indented string as here-document.
-func Doc(raw string) string {
- skipFirstLine := false
- if len(raw) > 0 && raw[0] == '\n' {
- raw = raw[1:]
- } else {
- skipFirstLine = true
- }
-
- lines := strings.Split(raw, "\n")
-
- minIndentSize := getMinIndent(lines, skipFirstLine)
- lines = removeIndentation(lines, minIndentSize, skipFirstLine)
-
- return strings.Join(lines, "\n")
-}
-
-// getMinIndent calculates the minimum indentation in lines, excluding empty lines.
-func getMinIndent(lines []string, skipFirstLine bool) int {
- minIndentSize := maxInt
-
- for i, line := range lines {
- if i == 0 && skipFirstLine {
- continue
- }
-
- indentSize := 0
- for _, r := range []rune(line) {
- if unicode.IsSpace(r) {
- indentSize += 1
- } else {
- break
- }
- }
-
- if len(line) == indentSize {
- if i == len(lines)-1 && indentSize < minIndentSize {
- lines[i] = ""
- }
- } else if indentSize < minIndentSize {
- minIndentSize = indentSize
- }
- }
- return minIndentSize
-}
-
-// removeIndentation removes n characters from the front of each line in lines.
-// Skips first line if skipFirstLine is true, skips empty lines.
-func removeIndentation(lines []string, n int, skipFirstLine bool) []string {
- for i, line := range lines {
- if i == 0 && skipFirstLine {
- continue
- }
-
- if len(lines[i]) >= n {
- lines[i] = line[n:]
- }
- }
- return lines
-}
-
-// Docf returns unindented and formatted string as here-document.
-// Formatting is done as for fmt.Printf().
-func Docf(raw string, args ...interface{}) string {
- return fmt.Sprintf(Doc(raw), args...)
-}
diff --git a/vendor/github.com/PuerkitoBio/goquery/.gitattributes b/vendor/github.com/PuerkitoBio/goquery/.gitattributes
deleted file mode 100644
index 0cc26ec01c684677c30715da9e64a75cc7cfc734..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-testdata/* linguist-vendored
diff --git a/vendor/github.com/PuerkitoBio/goquery/.gitignore b/vendor/github.com/PuerkitoBio/goquery/.gitignore
deleted file mode 100644
index 970381cd26ae7637fa84026ecc802e2cb3c063af..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# editor temporary files
-*.sublime-*
-.DS_Store
-*.swp
-#*.*#
-tags
-
-# direnv config
-.env*
-
-# test binaries
-*.test
-
-# coverage and profilte outputs
-*.out
-
diff --git a/vendor/github.com/PuerkitoBio/goquery/LICENSE b/vendor/github.com/PuerkitoBio/goquery/LICENSE
deleted file mode 100644
index 25372c2b603953e0909e59eddd9bb157cccb0ad6..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/LICENSE
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright (c) 2012-2021, Martin Angers & Contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/PuerkitoBio/goquery/README.md b/vendor/github.com/PuerkitoBio/goquery/README.md
deleted file mode 100644
index 767a0e111314f5118e9b3f5a2c1a3c7f865f9bde..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/README.md
+++ /dev/null
@@ -1,202 +0,0 @@
-# goquery - a little like that j-thing, only in Go
-
-[](https://github.com/PuerkitoBio/goquery/actions)
-[](https://pkg.go.dev/github.com/PuerkitoBio/goquery)
-[](https://sourcegraph.com/github.com/PuerkitoBio/goquery?badge)
-
-goquery brings a syntax and a set of features similar to [jQuery][] to the [Go language][go]. It is based on Go's [net/html package][html] and the CSS Selector library [cascadia][]. Since the net/html parser returns nodes, and not a full-featured DOM tree, jQuery's stateful manipulation functions (like height(), css(), detach()) have been left off.
-
-Also, because the net/html parser requires UTF-8 encoding, so does goquery: it is the caller's responsibility to ensure that the source document provides UTF-8 encoded HTML. See the [wiki][] for various options to do this.
-
-Syntax-wise, it is as close as possible to jQuery, with the same function names when possible, and that warm and fuzzy chainable interface. jQuery being the ultra-popular library that it is, I felt that writing a similar HTML-manipulating library was better to follow its API than to start anew (in the same spirit as Go's `fmt` package), even though some of its methods are less than intuitive (looking at you, [index()][index]...).
-
-## Table of Contents
-
-* [Installation](#installation)
-* [Changelog](#changelog)
-* [API](#api)
-* [Examples](#examples)
-* [Related Projects](#related-projects)
-* [Support](#support)
-* [License](#license)
-
-## Installation
-
-Please note that starting with version `v1.9.0` of goquery, Go 1.18+ is required due to the use of generics. For previous goquery versions, a Go version of 1.1+ was required because of the `net/html` dependency. Ongoing goquery development is tested on the latest 2 versions of Go.
-
- $ go get github.com/PuerkitoBio/goquery
-
-(optional) To run unit tests:
-
- $ cd $GOPATH/src/github.com/PuerkitoBio/goquery
- $ go test
-
-(optional) To run benchmarks (warning: it runs for a few minutes):
-
- $ cd $GOPATH/src/github.com/PuerkitoBio/goquery
- $ go test -bench=".*"
-
-## Changelog
-
-**Note that goquery's API is now stable, and will not break.**
-
-* **2024-04-29 (v1.9.2)** : Update `go.mod` dependencies.
-* **2024-02-29 (v1.9.1)** : Improve allocation and performance of the `Map` function and `Selection.Map` method, better document the cascadia differences (thanks [@jwilsson](https://github.com/jwilsson)).
-* **2024-02-22 (v1.9.0)** : Add a generic `Map` function, **goquery now requires Go version 1.18+** (thanks [@Fesaa](https://github.com/Fesaa)).
-* **2023-02-18 (v1.8.1)** : Update `go.mod` dependencies, update CI workflow.
-* **2021-10-25 (v1.8.0)** : Add `Render` function to render a `Selection` to an `io.Writer` (thanks [@anthonygedeon](https://github.com/anthonygedeon)).
-* **2021-07-11 (v1.7.1)** : Update go.mod dependencies and add dependabot config (thanks [@jauderho](https://github.com/jauderho)).
-* **2021-06-14 (v1.7.0)** : Add `Single` and `SingleMatcher` functions to optimize first-match selection (thanks [@gdollardollar](https://github.com/gdollardollar)).
-* **2021-01-11 (v1.6.1)** : Fix panic when calling `{Prepend,Append,Set}Html` on a `Selection` that contains non-Element nodes.
-* **2020-10-08 (v1.6.0)** : Parse html in context of the container node for all functions that deal with html strings (`AfterHtml`, `AppendHtml`, etc.). Thanks to [@thiemok][thiemok] and [@davidjwilkins][djw] for their work on this.
-* **2020-02-04 (v1.5.1)** : Update module dependencies.
-* **2018-11-15 (v1.5.0)** : Go module support (thanks @Zaba505).
-* **2018-06-07 (v1.4.1)** : Add `NewDocumentFromReader` examples.
-* **2018-03-24 (v1.4.0)** : Deprecate `NewDocument(url)` and `NewDocumentFromResponse(response)`.
-* **2018-01-28 (v1.3.0)** : Add `ToEnd` constant to `Slice` until the end of the selection (thanks to @davidjwilkins for raising the issue).
-* **2018-01-11 (v1.2.0)** : Add `AddBack*` and deprecate `AndSelf` (thanks to @davidjwilkins).
-* **2017-02-12 (v1.1.0)** : Add `SetHtml` and `SetText` (thanks to @glebtv).
-* **2016-12-29 (v1.0.2)** : Optimize allocations for `Selection.Text` (thanks to @radovskyb).
-* **2016-08-28 (v1.0.1)** : Optimize performance for large documents.
-* **2016-07-27 (v1.0.0)** : Tag version 1.0.0.
-* **2016-06-15** : Invalid selector strings internally compile to a `Matcher` implementation that never matches any node (instead of a panic). So for example, `doc.Find("~")` returns an empty `*Selection` object.
-* **2016-02-02** : Add `NodeName` utility function similar to the DOM's `nodeName` property. It returns the tag name of the first element in a selection, and other relevant values of non-element nodes (see [doc][] for details). Add `OuterHtml` utility function similar to the DOM's `outerHTML` property (named `OuterHtml` in small caps for consistency with the existing `Html` method on the `Selection`).
-* **2015-04-20** : Add `AttrOr` helper method to return the attribute's value or a default value if absent. Thanks to [piotrkowalczuk][piotr].
-* **2015-02-04** : Add more manipulation functions - Prepend* - thanks again to [Andrew Stone][thatguystone].
-* **2014-11-28** : Add more manipulation functions - ReplaceWith*, Wrap* and Unwrap - thanks again to [Andrew Stone][thatguystone].
-* **2014-11-07** : Add manipulation functions (thanks to [Andrew Stone][thatguystone]) and `*Matcher` functions, that receive compiled cascadia selectors instead of selector strings, thus avoiding potential panics thrown by goquery via `cascadia.MustCompile` calls. This results in better performance (selectors can be compiled once and reused) and more idiomatic error handling (you can handle cascadia's compilation errors, instead of recovering from panics, which had been bugging me for a long time). Note that the actual type expected is a `Matcher` interface, that `cascadia.Selector` implements. Other matcher implementations could be used.
-* **2014-11-06** : Change import paths of net/html to golang.org/x/net/html (see https://groups.google.com/forum/#!topic/golang-nuts/eD8dh3T9yyA). Make sure to update your code to use the new import path too when you call goquery with `html.Node`s.
-* **v0.3.2** : Add `NewDocumentFromReader()` (thanks jweir) which allows creating a goquery document from an io.Reader.
-* **v0.3.1** : Add `NewDocumentFromResponse()` (thanks assassingj) which allows creating a goquery document from an http response.
-* **v0.3.0** : Add `EachWithBreak()` which allows to break out of an `Each()` loop by returning false. This function was added instead of changing the existing `Each()` to avoid breaking compatibility.
-* **v0.2.1** : Make go-getable, now that [go.net/html is Go1.0-compatible][gonet] (thanks to @matrixik for pointing this out).
-* **v0.2.0** : Add support for negative indices in Slice(). **BREAKING CHANGE** `Document.Root` is removed, `Document` is now a `Selection` itself (a selection of one, the root element, just like `Document.Root` was before). Add jQuery's Closest() method.
-* **v0.1.1** : Add benchmarks to use as baseline for refactorings, refactor Next...() and Prev...() methods to use the new html package's linked list features (Next/PrevSibling, FirstChild). Good performance boost (40+% in some cases).
-* **v0.1.0** : Initial release.
-
-## API
-
-goquery exposes two structs, `Document` and `Selection`, and the `Matcher` interface. Unlike jQuery, which is loaded as part of a DOM document, and thus acts on its containing document, goquery doesn't know which HTML document to act upon. So it needs to be told, and that's what the `Document` type is for. It holds the root document node as the initial Selection value to manipulate.
-
-jQuery often has many variants for the same function (no argument, a selector string argument, a jQuery object argument, a DOM element argument, ...). Instead of exposing the same features in goquery as a single method with variadic empty interface arguments, statically-typed signatures are used following this naming convention:
-
-* When the jQuery equivalent can be called with no argument, it has the same name as jQuery for the no argument signature (e.g.: `Prev()`), and the version with a selector string argument is called `XxxFiltered()` (e.g.: `PrevFiltered()`)
-* When the jQuery equivalent **requires** one argument, the same name as jQuery is used for the selector string version (e.g.: `Is()`)
-* The signatures accepting a jQuery object as argument are defined in goquery as `XxxSelection()` and take a `*Selection` object as argument (e.g.: `FilterSelection()`)
-* The signatures accepting a DOM element as argument in jQuery are defined in goquery as `XxxNodes()` and take a variadic argument of type `*html.Node` (e.g.: `FilterNodes()`)
-* The signatures accepting a function as argument in jQuery are defined in goquery as `XxxFunction()` and take a function as argument (e.g.: `FilterFunction()`)
-* The goquery methods that can be called with a selector string have a corresponding version that take a `Matcher` interface and are defined as `XxxMatcher()` (e.g.: `IsMatcher()`)
-
-Utility functions that are not in jQuery but are useful in Go are implemented as functions (that take a `*Selection` as parameter), to avoid a potential naming clash on the `*Selection`'s methods (reserved for jQuery-equivalent behaviour).
-
-The complete [package reference documentation can be found here][doc].
-
-Please note that Cascadia's selectors do not necessarily match all supported selectors of jQuery (Sizzle). See the [cascadia project][cascadia] for details. Also, the selectors work more like the DOM's `querySelectorAll`, than jQuery's matchers - they have no concept of contextual matching (for some concrete examples of what that means, see [this ticket](https://github.com/andybalholm/cascadia/issues/61)). In practice, it doesn't matter very often but it's something worth mentioning. Invalid selector strings compile to a `Matcher` that fails to match any node. Behaviour of the various functions that take a selector string as argument follows from that fact, e.g. (where `~` is an invalid selector string):
-
-* `Find("~")` returns an empty selection because the selector string doesn't match anything.
-* `Add("~")` returns a new selection that holds the same nodes as the original selection, because it didn't add any node (selector string didn't match anything).
-* `ParentsFiltered("~")` returns an empty selection because the selector string doesn't match anything.
-* `ParentsUntil("~")` returns all parents of the selection because the selector string didn't match any element to stop before the top element.
-
-## Examples
-
-See some tips and tricks in the [wiki][].
-
-Adapted from example_test.go:
-
-```Go
-package main
-
-import (
- "fmt"
- "log"
- "net/http"
-
- "github.com/PuerkitoBio/goquery"
-)
-
-func ExampleScrape() {
- // Request the HTML page.
- res, err := http.Get("http://metalsucks.net")
- if err != nil {
- log.Fatal(err)
- }
- defer res.Body.Close()
- if res.StatusCode != 200 {
- log.Fatalf("status code error: %d %s", res.StatusCode, res.Status)
- }
-
- // Load the HTML document
- doc, err := goquery.NewDocumentFromReader(res.Body)
- if err != nil {
- log.Fatal(err)
- }
-
- // Find the review items
- doc.Find(".left-content article .post-title").Each(func(i int, s *goquery.Selection) {
- // For each item found, get the title
- title := s.Find("a").Text()
- fmt.Printf("Review %d: %s\n", i, title)
- })
-}
-
-func main() {
- ExampleScrape()
-}
-```
-
-## Related Projects
-
-- [Goq][goq], an HTML deserialization and scraping library based on goquery and struct tags.
-- [andybalholm/cascadia][cascadia], the CSS selector library used by goquery.
-- [suntong/cascadia][cascadiacli], a command-line interface to the cascadia CSS selector library, useful to test selectors.
-- [gocolly/colly](https://github.com/gocolly/colly), a lightning fast and elegant Scraping Framework
-- [gnulnx/goperf](https://github.com/gnulnx/goperf), a website performance test tool that also fetches static assets.
-- [MontFerret/ferret](https://github.com/MontFerret/ferret), declarative web scraping.
-- [tacusci/berrycms](https://github.com/tacusci/berrycms), a modern simple to use CMS with easy to write plugins
-- [Dataflow kit](https://github.com/slotix/dataflowkit), Web Scraping framework for Gophers.
-- [Geziyor](https://github.com/geziyor/geziyor), a fast web crawling & scraping framework for Go. Supports JS rendering.
-- [Pagser](https://github.com/foolin/pagser), a simple, easy, extensible, configurable HTML parser to struct based on goquery and struct tags.
-- [stitcherd](https://github.com/vhodges/stitcherd), A server for doing server side includes using css selectors and DOM updates.
-- [goskyr](https://github.com/jakopako/goskyr), an easily configurable command-line scraper written in Go.
-- [goGetJS](https://github.com/davemolk/goGetJS), a tool for extracting, searching, and saving JavaScript files (with optional headless browser).
-- [fitter](https://github.com/PxyUp/fitter), a tool for selecting values from JSON, XML, HTML and XPath formatted pages.
-
-## Support
-
-There are a number of ways you can support the project:
-
-* Use it, star it, build something with it, spread the word!
- - If you do build something open-source or otherwise publicly-visible, let me know so I can add it to the [Related Projects](#related-projects) section!
-* Raise issues to improve the project (note: doc typos and clarifications are issues too!)
- - Please search existing issues before opening a new one - it may have already been addressed.
-* Pull requests: please discuss new code in an issue first, unless the fix is really trivial.
- - Make sure new code is tested.
- - Be mindful of existing code - PRs that break existing code have a high probability of being declined, unless it fixes a serious issue.
-* Sponsor the developer
- - See the Github Sponsor button at the top of the repo on github
- - or via BuyMeACoffee.com, below
-
-
-
-## License
-
-The [BSD 3-Clause license][bsd], the same as the [Go language][golic]. Cascadia's license is [here][caslic].
-
-[jquery]: http://jquery.com/
-[go]: http://golang.org/
-[cascadia]: https://github.com/andybalholm/cascadia
-[cascadiacli]: https://github.com/suntong/cascadia
-[bsd]: http://opensource.org/licenses/BSD-3-Clause
-[golic]: http://golang.org/LICENSE
-[caslic]: https://github.com/andybalholm/cascadia/blob/master/LICENSE
-[doc]: https://pkg.go.dev/github.com/PuerkitoBio/goquery
-[index]: http://api.jquery.com/index/
-[gonet]: https://github.com/golang/net/
-[html]: https://pkg.go.dev/golang.org/x/net/html
-[wiki]: https://github.com/PuerkitoBio/goquery/wiki/Tips-and-tricks
-[thatguystone]: https://github.com/thatguystone
-[piotr]: https://github.com/piotrkowalczuk
-[goq]: https://github.com/andrewstuart/goq
-[thiemok]: https://github.com/thiemok
-[djw]: https://github.com/davidjwilkins
diff --git a/vendor/github.com/PuerkitoBio/goquery/array.go b/vendor/github.com/PuerkitoBio/goquery/array.go
deleted file mode 100644
index 1b1f6cbe66983a4bb9d1f483e11a901af18c9016..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/array.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package goquery
-
-import (
- "golang.org/x/net/html"
-)
-
-const (
- maxUint = ^uint(0)
- maxInt = int(maxUint >> 1)
-
- // ToEnd is a special index value that can be used as end index in a call
- // to Slice so that all elements are selected until the end of the Selection.
- // It is equivalent to passing (*Selection).Length().
- ToEnd = maxInt
-)
-
-// First reduces the set of matched elements to the first in the set.
-// It returns a new Selection object, and an empty Selection object if the
-// the selection is empty.
-func (s *Selection) First() *Selection {
- return s.Eq(0)
-}
-
-// Last reduces the set of matched elements to the last in the set.
-// It returns a new Selection object, and an empty Selection object if
-// the selection is empty.
-func (s *Selection) Last() *Selection {
- return s.Eq(-1)
-}
-
-// Eq reduces the set of matched elements to the one at the specified index.
-// If a negative index is given, it counts backwards starting at the end of the
-// set. It returns a new Selection object, and an empty Selection object if the
-// index is invalid.
-func (s *Selection) Eq(index int) *Selection {
- if index < 0 {
- index += len(s.Nodes)
- }
-
- if index >= len(s.Nodes) || index < 0 {
- return newEmptySelection(s.document)
- }
-
- return s.Slice(index, index+1)
-}
-
-// Slice reduces the set of matched elements to a subset specified by a range
-// of indices. The start index is 0-based and indicates the index of the first
-// element to select. The end index is 0-based and indicates the index at which
-// the elements stop being selected (the end index is not selected).
-//
-// The indices may be negative, in which case they represent an offset from the
-// end of the selection.
-//
-// The special value ToEnd may be specified as end index, in which case all elements
-// until the end are selected. This works both for a positive and negative start
-// index.
-func (s *Selection) Slice(start, end int) *Selection {
- if start < 0 {
- start += len(s.Nodes)
- }
- if end == ToEnd {
- end = len(s.Nodes)
- } else if end < 0 {
- end += len(s.Nodes)
- }
- return pushStack(s, s.Nodes[start:end])
-}
-
-// Get retrieves the underlying node at the specified index.
-// Get without parameter is not implemented, since the node array is available
-// on the Selection object.
-func (s *Selection) Get(index int) *html.Node {
- if index < 0 {
- index += len(s.Nodes) // Negative index gets from the end
- }
- return s.Nodes[index]
-}
-
-// Index returns the position of the first element within the Selection object
-// relative to its sibling elements.
-func (s *Selection) Index() int {
- if len(s.Nodes) > 0 {
- return newSingleSelection(s.Nodes[0], s.document).PrevAll().Length()
- }
- return -1
-}
-
-// IndexSelector returns the position of the first element within the
-// Selection object relative to the elements matched by the selector, or -1 if
-// not found.
-func (s *Selection) IndexSelector(selector string) int {
- if len(s.Nodes) > 0 {
- sel := s.document.Find(selector)
- return indexInSlice(sel.Nodes, s.Nodes[0])
- }
- return -1
-}
-
-// IndexMatcher returns the position of the first element within the
-// Selection object relative to the elements matched by the matcher, or -1 if
-// not found.
-func (s *Selection) IndexMatcher(m Matcher) int {
- if len(s.Nodes) > 0 {
- sel := s.document.FindMatcher(m)
- return indexInSlice(sel.Nodes, s.Nodes[0])
- }
- return -1
-}
-
-// IndexOfNode returns the position of the specified node within the Selection
-// object, or -1 if not found.
-func (s *Selection) IndexOfNode(node *html.Node) int {
- return indexInSlice(s.Nodes, node)
-}
-
-// IndexOfSelection returns the position of the first node in the specified
-// Selection object within this Selection object, or -1 if not found.
-func (s *Selection) IndexOfSelection(sel *Selection) int {
- if sel != nil && len(sel.Nodes) > 0 {
- return indexInSlice(s.Nodes, sel.Nodes[0])
- }
- return -1
-}
diff --git a/vendor/github.com/PuerkitoBio/goquery/doc.go b/vendor/github.com/PuerkitoBio/goquery/doc.go
deleted file mode 100644
index 71146a7802bc90cb30ad3e3d91ce40c0ef3a25ab..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/doc.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright (c) 2012-2016, Martin Angers & Contributors
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// * Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimer in the documentation and/or
-// other materials provided with the distribution.
-// * Neither the name of the author nor the names of its contributors may be used to
-// endorse or promote products derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-// OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY
-// WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package goquery implements features similar to jQuery, including the chainable
-syntax, to manipulate and query an HTML document.
-
-It brings a syntax and a set of features similar to jQuery to the Go language.
-It is based on Go's net/html package and the CSS Selector library cascadia.
-Since the net/html parser returns nodes, and not a full-featured DOM
-tree, jQuery's stateful manipulation functions (like height(), css(), detach())
-have been left off.
-
-Also, because the net/html parser requires UTF-8 encoding, so does goquery: it is
-the caller's responsibility to ensure that the source document provides UTF-8 encoded HTML.
-See the repository's wiki for various options on how to do this.
-
-Syntax-wise, it is as close as possible to jQuery, with the same method names when
-possible, and that warm and fuzzy chainable interface. jQuery being the
-ultra-popular library that it is, writing a similar HTML-manipulating
-library was better to follow its API than to start anew (in the same spirit as
-Go's fmt package), even though some of its methods are less than intuitive (looking
-at you, index()...).
-
-It is hosted on GitHub, along with additional documentation in the README.md
-file: https://github.com/puerkitobio/goquery
-
-Please note that because of the net/html dependency, goquery requires Go1.1+.
-
-The various methods are split into files based on the category of behavior.
-The three dots (...) indicate that various "overloads" are available.
-
-* array.go : array-like positional manipulation of the selection.
- - Eq()
- - First()
- - Get()
- - Index...()
- - Last()
- - Slice()
-
-* expand.go : methods that expand or augment the selection's set.
- - Add...()
- - AndSelf()
- - Union(), which is an alias for AddSelection()
-
-* filter.go : filtering methods, that reduce the selection's set.
- - End()
- - Filter...()
- - Has...()
- - Intersection(), which is an alias of FilterSelection()
- - Not...()
-
-* iteration.go : methods to loop over the selection's nodes.
- - Each()
- - EachWithBreak()
- - Map()
-
-* manipulation.go : methods for modifying the document
- - After...()
- - Append...()
- - Before...()
- - Clone()
- - Empty()
- - Prepend...()
- - Remove...()
- - ReplaceWith...()
- - Unwrap()
- - Wrap...()
- - WrapAll...()
- - WrapInner...()
-
-* property.go : methods that inspect and get the node's properties values.
- - Attr*(), RemoveAttr(), SetAttr()
- - AddClass(), HasClass(), RemoveClass(), ToggleClass()
- - Html()
- - Length()
- - Size(), which is an alias for Length()
- - Text()
-
-* query.go : methods that query, or reflect, a node's identity.
- - Contains()
- - Is...()
-
-* traversal.go : methods to traverse the HTML document tree.
- - Children...()
- - Contents()
- - Find...()
- - Next...()
- - Parent[s]...()
- - Prev...()
- - Siblings...()
-
-* type.go : definition of the types exposed by goquery.
- - Document
- - Selection
- - Matcher
-
-* utilities.go : definition of helper functions (and not methods on a *Selection)
-that are not part of jQuery, but are useful to goquery.
- - NodeName
- - OuterHtml
-*/
-package goquery
diff --git a/vendor/github.com/PuerkitoBio/goquery/expand.go b/vendor/github.com/PuerkitoBio/goquery/expand.go
deleted file mode 100644
index 7caade531e0e20f8f817f0c4778ae5f40860ecb3..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/expand.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package goquery
-
-import "golang.org/x/net/html"
-
-// Add adds the selector string's matching nodes to those in the current
-// selection and returns a new Selection object.
-// The selector string is run in the context of the document of the current
-// Selection object.
-func (s *Selection) Add(selector string) *Selection {
- return s.AddNodes(findWithMatcher([]*html.Node{s.document.rootNode}, compileMatcher(selector))...)
-}
-
-// AddMatcher adds the matcher's matching nodes to those in the current
-// selection and returns a new Selection object.
-// The matcher is run in the context of the document of the current
-// Selection object.
-func (s *Selection) AddMatcher(m Matcher) *Selection {
- return s.AddNodes(findWithMatcher([]*html.Node{s.document.rootNode}, m)...)
-}
-
-// AddSelection adds the specified Selection object's nodes to those in the
-// current selection and returns a new Selection object.
-func (s *Selection) AddSelection(sel *Selection) *Selection {
- if sel == nil {
- return s.AddNodes()
- }
- return s.AddNodes(sel.Nodes...)
-}
-
-// Union is an alias for AddSelection.
-func (s *Selection) Union(sel *Selection) *Selection {
- return s.AddSelection(sel)
-}
-
-// AddNodes adds the specified nodes to those in the
-// current selection and returns a new Selection object.
-func (s *Selection) AddNodes(nodes ...*html.Node) *Selection {
- return pushStack(s, appendWithoutDuplicates(s.Nodes, nodes, nil))
-}
-
-// AndSelf adds the previous set of elements on the stack to the current set.
-// It returns a new Selection object containing the current Selection combined
-// with the previous one.
-// Deprecated: This function has been deprecated and is now an alias for AddBack().
-func (s *Selection) AndSelf() *Selection {
- return s.AddBack()
-}
-
-// AddBack adds the previous set of elements on the stack to the current set.
-// It returns a new Selection object containing the current Selection combined
-// with the previous one.
-func (s *Selection) AddBack() *Selection {
- return s.AddSelection(s.prevSel)
-}
-
-// AddBackFiltered reduces the previous set of elements on the stack to those that
-// match the selector string, and adds them to the current set.
-// It returns a new Selection object containing the current Selection combined
-// with the filtered previous one
-func (s *Selection) AddBackFiltered(selector string) *Selection {
- return s.AddSelection(s.prevSel.Filter(selector))
-}
-
-// AddBackMatcher reduces the previous set of elements on the stack to those that match
-// the mateher, and adds them to the curernt set.
-// It returns a new Selection object containing the current Selection combined
-// with the filtered previous one
-func (s *Selection) AddBackMatcher(m Matcher) *Selection {
- return s.AddSelection(s.prevSel.FilterMatcher(m))
-}
diff --git a/vendor/github.com/PuerkitoBio/goquery/filter.go b/vendor/github.com/PuerkitoBio/goquery/filter.go
deleted file mode 100644
index 9138ffb33ed7ce02f94758ecb9e0bd0405f1d625..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/filter.go
+++ /dev/null
@@ -1,163 +0,0 @@
-package goquery
-
-import "golang.org/x/net/html"
-
-// Filter reduces the set of matched elements to those that match the selector string.
-// It returns a new Selection object for this subset of matching elements.
-func (s *Selection) Filter(selector string) *Selection {
- return s.FilterMatcher(compileMatcher(selector))
-}
-
-// FilterMatcher reduces the set of matched elements to those that match
-// the given matcher. It returns a new Selection object for this subset
-// of matching elements.
-func (s *Selection) FilterMatcher(m Matcher) *Selection {
- return pushStack(s, winnow(s, m, true))
-}
-
-// Not removes elements from the Selection that match the selector string.
-// It returns a new Selection object with the matching elements removed.
-func (s *Selection) Not(selector string) *Selection {
- return s.NotMatcher(compileMatcher(selector))
-}
-
-// NotMatcher removes elements from the Selection that match the given matcher.
-// It returns a new Selection object with the matching elements removed.
-func (s *Selection) NotMatcher(m Matcher) *Selection {
- return pushStack(s, winnow(s, m, false))
-}
-
-// FilterFunction reduces the set of matched elements to those that pass the function's test.
-// It returns a new Selection object for this subset of elements.
-func (s *Selection) FilterFunction(f func(int, *Selection) bool) *Selection {
- return pushStack(s, winnowFunction(s, f, true))
-}
-
-// NotFunction removes elements from the Selection that pass the function's test.
-// It returns a new Selection object with the matching elements removed.
-func (s *Selection) NotFunction(f func(int, *Selection) bool) *Selection {
- return pushStack(s, winnowFunction(s, f, false))
-}
-
-// FilterNodes reduces the set of matched elements to those that match the specified nodes.
-// It returns a new Selection object for this subset of elements.
-func (s *Selection) FilterNodes(nodes ...*html.Node) *Selection {
- return pushStack(s, winnowNodes(s, nodes, true))
-}
-
-// NotNodes removes elements from the Selection that match the specified nodes.
-// It returns a new Selection object with the matching elements removed.
-func (s *Selection) NotNodes(nodes ...*html.Node) *Selection {
- return pushStack(s, winnowNodes(s, nodes, false))
-}
-
-// FilterSelection reduces the set of matched elements to those that match a
-// node in the specified Selection object.
-// It returns a new Selection object for this subset of elements.
-func (s *Selection) FilterSelection(sel *Selection) *Selection {
- if sel == nil {
- return pushStack(s, winnowNodes(s, nil, true))
- }
- return pushStack(s, winnowNodes(s, sel.Nodes, true))
-}
-
-// NotSelection removes elements from the Selection that match a node in the specified
-// Selection object. It returns a new Selection object with the matching elements removed.
-func (s *Selection) NotSelection(sel *Selection) *Selection {
- if sel == nil {
- return pushStack(s, winnowNodes(s, nil, false))
- }
- return pushStack(s, winnowNodes(s, sel.Nodes, false))
-}
-
-// Intersection is an alias for FilterSelection.
-func (s *Selection) Intersection(sel *Selection) *Selection {
- return s.FilterSelection(sel)
-}
-
-// Has reduces the set of matched elements to those that have a descendant
-// that matches the selector.
-// It returns a new Selection object with the matching elements.
-func (s *Selection) Has(selector string) *Selection {
- return s.HasSelection(s.document.Find(selector))
-}
-
-// HasMatcher reduces the set of matched elements to those that have a descendant
-// that matches the matcher.
-// It returns a new Selection object with the matching elements.
-func (s *Selection) HasMatcher(m Matcher) *Selection {
- return s.HasSelection(s.document.FindMatcher(m))
-}
-
-// HasNodes reduces the set of matched elements to those that have a
-// descendant that matches one of the nodes.
-// It returns a new Selection object with the matching elements.
-func (s *Selection) HasNodes(nodes ...*html.Node) *Selection {
- return s.FilterFunction(func(_ int, sel *Selection) bool {
- // Add all nodes that contain one of the specified nodes
- for _, n := range nodes {
- if sel.Contains(n) {
- return true
- }
- }
- return false
- })
-}
-
-// HasSelection reduces the set of matched elements to those that have a
-// descendant that matches one of the nodes of the specified Selection object.
-// It returns a new Selection object with the matching elements.
-func (s *Selection) HasSelection(sel *Selection) *Selection {
- if sel == nil {
- return s.HasNodes()
- }
- return s.HasNodes(sel.Nodes...)
-}
-
-// End ends the most recent filtering operation in the current chain and
-// returns the set of matched elements to its previous state.
-func (s *Selection) End() *Selection {
- if s.prevSel != nil {
- return s.prevSel
- }
- return newEmptySelection(s.document)
-}
-
-// Filter based on the matcher, and the indicator to keep (Filter) or
-// to get rid of (Not) the matching elements.
-func winnow(sel *Selection, m Matcher, keep bool) []*html.Node {
- // Optimize if keep is requested
- if keep {
- return m.Filter(sel.Nodes)
- }
- // Use grep
- return grep(sel, func(i int, s *Selection) bool {
- return !m.Match(s.Get(0))
- })
-}
-
-// Filter based on an array of nodes, and the indicator to keep (Filter) or
-// to get rid of (Not) the matching elements.
-func winnowNodes(sel *Selection, nodes []*html.Node, keep bool) []*html.Node {
- if len(nodes)+len(sel.Nodes) < minNodesForSet {
- return grep(sel, func(i int, s *Selection) bool {
- return isInSlice(nodes, s.Get(0)) == keep
- })
- }
-
- set := make(map[*html.Node]bool)
- for _, n := range nodes {
- set[n] = true
- }
- return grep(sel, func(i int, s *Selection) bool {
- return set[s.Get(0)] == keep
- })
-}
-
-// Filter based on a function test, and the indicator to keep (Filter) or
-// to get rid of (Not) the matching elements.
-func winnowFunction(sel *Selection, f func(int, *Selection) bool, keep bool) []*html.Node {
- return grep(sel, func(i int, s *Selection) bool {
- return f(i, s) == keep
- })
-}
diff --git a/vendor/github.com/PuerkitoBio/goquery/iteration.go b/vendor/github.com/PuerkitoBio/goquery/iteration.go
deleted file mode 100644
index 1c98158bffcdbee04504ce754b144842e221b496..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/iteration.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package goquery
-
-// Each iterates over a Selection object, executing a function for each
-// matched element. It returns the current Selection object. The function
-// f is called for each element in the selection with the index of the
-// element in that selection starting at 0, and a *Selection that contains
-// only that element.
-func (s *Selection) Each(f func(int, *Selection)) *Selection {
- for i, n := range s.Nodes {
- f(i, newSingleSelection(n, s.document))
- }
- return s
-}
-
-// EachWithBreak iterates over a Selection object, executing a function for each
-// matched element. It is identical to Each except that it is possible to break
-// out of the loop by returning false in the callback function. It returns the
-// current Selection object.
-func (s *Selection) EachWithBreak(f func(int, *Selection) bool) *Selection {
- for i, n := range s.Nodes {
- if !f(i, newSingleSelection(n, s.document)) {
- return s
- }
- }
- return s
-}
-
-// Map passes each element in the current matched set through a function,
-// producing a slice of string holding the returned values. The function
-// f is called for each element in the selection with the index of the
-// element in that selection starting at 0, and a *Selection that contains
-// only that element.
-func (s *Selection) Map(f func(int, *Selection) string) (result []string) {
- return Map(s, f)
-}
-
-// Map is the generic version of Selection.Map, allowing any type to be
-// returned.
-func Map[E any](s *Selection, f func(int, *Selection) E) (result []E) {
- result = make([]E, len(s.Nodes))
-
- for i, n := range s.Nodes {
- result[i] = f(i, newSingleSelection(n, s.document))
- }
-
- return result
-}
diff --git a/vendor/github.com/PuerkitoBio/goquery/manipulation.go b/vendor/github.com/PuerkitoBio/goquery/manipulation.go
deleted file mode 100644
index 35febf1189596afda6f6071f5c3c3f01b30a6910..0000000000000000000000000000000000000000
--- a/vendor/github.com/PuerkitoBio/goquery/manipulation.go
+++ /dev/null
@@ -1,679 +0,0 @@
-package goquery
-
-import (
- "strings"
-
- "golang.org/x/net/html"
-)
-
-// After applies the selector from the root document and inserts the matched elements
-// after the elements in the set of matched elements.
-//
-// If one of the matched elements in the selection is not currently in the
-// document, it's impossible to insert nodes after it, so it will be ignored.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) After(selector string) *Selection {
- return s.AfterMatcher(compileMatcher(selector))
-}
-
-// AfterMatcher applies the matcher from the root document and inserts the matched elements
-// after the elements in the set of matched elements.
-//
-// If one of the matched elements in the selection is not currently in the
-// document, it's impossible to insert nodes after it, so it will be ignored.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) AfterMatcher(m Matcher) *Selection {
- return s.AfterNodes(m.MatchAll(s.document.rootNode)...)
-}
-
-// AfterSelection inserts the elements in the selection after each element in the set of matched
-// elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) AfterSelection(sel *Selection) *Selection {
- return s.AfterNodes(sel.Nodes...)
-}
-
-// AfterHtml parses the html and inserts it after the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) AfterHtml(htmlStr string) *Selection {
- return s.eachNodeHtml(htmlStr, true, func(node *html.Node, nodes []*html.Node) {
- nextSibling := node.NextSibling
- for _, n := range nodes {
- if node.Parent != nil {
- node.Parent.InsertBefore(n, nextSibling)
- }
- }
- })
-}
-
-// AfterNodes inserts the nodes after each element in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) AfterNodes(ns ...*html.Node) *Selection {
- return s.manipulateNodes(ns, true, func(sn *html.Node, n *html.Node) {
- if sn.Parent != nil {
- sn.Parent.InsertBefore(n, sn.NextSibling)
- }
- })
-}
-
-// Append appends the elements specified by the selector to the end of each element
-// in the set of matched elements, following those rules:
-//
-// 1) The selector is applied to the root document.
-//
-// 2) Elements that are part of the document will be moved to the new location.
-//
-// 3) If there are multiple locations to append to, cloned nodes will be
-// appended to all target locations except the last one, which will be moved
-// as noted in (2).
-func (s *Selection) Append(selector string) *Selection {
- return s.AppendMatcher(compileMatcher(selector))
-}
-
-// AppendMatcher appends the elements specified by the matcher to the end of each element
-// in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) AppendMatcher(m Matcher) *Selection {
- return s.AppendNodes(m.MatchAll(s.document.rootNode)...)
-}
-
-// AppendSelection appends the elements in the selection to the end of each element
-// in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) AppendSelection(sel *Selection) *Selection {
- return s.AppendNodes(sel.Nodes...)
-}
-
-// AppendHtml parses the html and appends it to the set of matched elements.
-func (s *Selection) AppendHtml(htmlStr string) *Selection {
- return s.eachNodeHtml(htmlStr, false, func(node *html.Node, nodes []*html.Node) {
- for _, n := range nodes {
- node.AppendChild(n)
- }
- })
-}
-
-// AppendNodes appends the specified nodes to each node in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) AppendNodes(ns ...*html.Node) *Selection {
- return s.manipulateNodes(ns, false, func(sn *html.Node, n *html.Node) {
- sn.AppendChild(n)
- })
-}
-
-// Before inserts the matched elements before each element in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) Before(selector string) *Selection {
- return s.BeforeMatcher(compileMatcher(selector))
-}
-
-// BeforeMatcher inserts the matched elements before each element in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) BeforeMatcher(m Matcher) *Selection {
- return s.BeforeNodes(m.MatchAll(s.document.rootNode)...)
-}
-
-// BeforeSelection inserts the elements in the selection before each element in the set of matched
-// elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) BeforeSelection(sel *Selection) *Selection {
- return s.BeforeNodes(sel.Nodes...)
-}
-
-// BeforeHtml parses the html and inserts it before the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) BeforeHtml(htmlStr string) *Selection {
- return s.eachNodeHtml(htmlStr, true, func(node *html.Node, nodes []*html.Node) {
- for _, n := range nodes {
- if node.Parent != nil {
- node.Parent.InsertBefore(n, node)
- }
- }
- })
-}
-
-// BeforeNodes inserts the nodes before each element in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) BeforeNodes(ns ...*html.Node) *Selection {
- return s.manipulateNodes(ns, false, func(sn *html.Node, n *html.Node) {
- if sn.Parent != nil {
- sn.Parent.InsertBefore(n, sn)
- }
- })
-}
-
-// Clone creates a deep copy of the set of matched nodes. The new nodes will not be
-// attached to the document.
-func (s *Selection) Clone() *Selection {
- ns := newEmptySelection(s.document)
- ns.Nodes = cloneNodes(s.Nodes)
- return ns
-}
-
-// Empty removes all children nodes from the set of matched elements.
-// It returns the children nodes in a new Selection.
-func (s *Selection) Empty() *Selection {
- var nodes []*html.Node
-
- for _, n := range s.Nodes {
- for c := n.FirstChild; c != nil; c = n.FirstChild {
- n.RemoveChild(c)
- nodes = append(nodes, c)
- }
- }
-
- return pushStack(s, nodes)
-}
-
-// Prepend prepends the elements specified by the selector to each element in
-// the set of matched elements, following the same rules as Append.
-func (s *Selection) Prepend(selector string) *Selection {
- return s.PrependMatcher(compileMatcher(selector))
-}
-
-// PrependMatcher prepends the elements specified by the matcher to each
-// element in the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) PrependMatcher(m Matcher) *Selection {
- return s.PrependNodes(m.MatchAll(s.document.rootNode)...)
-}
-
-// PrependSelection prepends the elements in the selection to each element in
-// the set of matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) PrependSelection(sel *Selection) *Selection {
- return s.PrependNodes(sel.Nodes...)
-}
-
-// PrependHtml parses the html and prepends it to the set of matched elements.
-func (s *Selection) PrependHtml(htmlStr string) *Selection {
- return s.eachNodeHtml(htmlStr, false, func(node *html.Node, nodes []*html.Node) {
- firstChild := node.FirstChild
- for _, n := range nodes {
- node.InsertBefore(n, firstChild)
- }
- })
-}
-
-// PrependNodes prepends the specified nodes to each node in the set of
-// matched elements.
-//
-// This follows the same rules as Selection.Append.
-func (s *Selection) PrependNodes(ns ...*html.Node) *Selection {
- return s.manipulateNodes(ns, true, func(sn *html.Node, n *html.Node) {
- // sn.FirstChild may be nil, in which case this functions like
- // sn.AppendChild()
- sn.InsertBefore(n, sn.FirstChild)
- })
-}
-
-// Remove removes the set of matched elements from the document.
-// It returns the same selection, now consisting of nodes not in the document.
-func (s *Selection) Remove() *Selection {
- for _, n := range s.Nodes {
- if n.Parent != nil {
- n.Parent.RemoveChild(n)
- }
- }
-
- return s
-}
-
-// RemoveFiltered removes from the current set of matched elements those that
-// match the selector filter. It returns the Selection of removed nodes.
-//
-// For example if the selection s contains "", "
" and "
" -// and s.RemoveFiltered("h2") is called, only the "
" node is removed -// (and returned), while "
" and "
" are kept in the document. -func (s *Selection) RemoveFiltered(selector string) *Selection { - return s.RemoveMatcher(compileMatcher(selector)) -} - -// RemoveMatcher removes from the current set of matched elements those that -// match the Matcher filter. It returns the Selection of removed nodes. -// See RemoveFiltered for additional information. -func (s *Selection) RemoveMatcher(m Matcher) *Selection { - return s.FilterMatcher(m).Remove() -} - -// ReplaceWith replaces each element in the set of matched elements with the -// nodes matched by the given selector. -// It returns the removed elements. -// -// This follows the same rules as Selection.Append. -func (s *Selection) ReplaceWith(selector string) *Selection { - return s.ReplaceWithMatcher(compileMatcher(selector)) -} - -// ReplaceWithMatcher replaces each element in the set of matched elements with -// the nodes matched by the given Matcher. -// It returns the removed elements. -// -// This follows the same rules as Selection.Append. -func (s *Selection) ReplaceWithMatcher(m Matcher) *Selection { - return s.ReplaceWithNodes(m.MatchAll(s.document.rootNode)...) -} - -// ReplaceWithSelection replaces each element in the set of matched elements with -// the nodes from the given Selection. -// It returns the removed elements. -// -// This follows the same rules as Selection.Append. -func (s *Selection) ReplaceWithSelection(sel *Selection) *Selection { - return s.ReplaceWithNodes(sel.Nodes...) -} - -// ReplaceWithHtml replaces each element in the set of matched elements with -// the parsed HTML. -// It returns the removed elements. -// -// This follows the same rules as Selection.Append. -func (s *Selection) ReplaceWithHtml(htmlStr string) *Selection { - s.eachNodeHtml(htmlStr, true, func(node *html.Node, nodes []*html.Node) { - nextSibling := node.NextSibling - for _, n := range nodes { - if node.Parent != nil { - node.Parent.InsertBefore(n, nextSibling) - } - } - }) - return s.Remove() -} - -// ReplaceWithNodes replaces each element in the set of matched elements with -// the given nodes. -// It returns the removed elements. -// -// This follows the same rules as Selection.Append. -func (s *Selection) ReplaceWithNodes(ns ...*html.Node) *Selection { - s.AfterNodes(ns...) - return s.Remove() -} - -// SetHtml sets the html content of each element in the selection to -// specified html string. -func (s *Selection) SetHtml(htmlStr string) *Selection { - for _, context := range s.Nodes { - for c := context.FirstChild; c != nil; c = context.FirstChild { - context.RemoveChild(c) - } - } - return s.eachNodeHtml(htmlStr, false, func(node *html.Node, nodes []*html.Node) { - for _, n := range nodes { - node.AppendChild(n) - } - }) -} - -// SetText sets the content of each element in the selection to specified content. -// The provided text string is escaped. -func (s *Selection) SetText(text string) *Selection { - return s.SetHtml(html.EscapeString(text)) -} - -// Unwrap removes the parents of the set of matched elements, leaving the matched -// elements (and their siblings, if any) in their place. -// It returns the original selection. -func (s *Selection) Unwrap() *Selection { - s.Parent().Each(func(i int, ss *Selection) { - // For some reason, jquery allows unwrap to remove the element, so - // allowing it here too. Same for . Why it allows those elements to - // be unwrapped while not allowing body is a mystery to me. - if ss.Nodes[0].Data != "body" { - ss.ReplaceWithSelection(ss.Contents()) - } - }) - - return s -} - -// Wrap wraps each element in the set of matched elements inside the first -// element matched by the given selector. The matched child is cloned before -// being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) Wrap(selector string) *Selection { - return s.WrapMatcher(compileMatcher(selector)) -} - -// WrapMatcher wraps each element in the set of matched elements inside the -// first element matched by the given matcher. The matched child is cloned -// before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapMatcher(m Matcher) *Selection { - return s.wrapNodes(m.MatchAll(s.document.rootNode)...) -} - -// WrapSelection wraps each element in the set of matched elements inside the -// first element in the given Selection. The element is cloned before being -// inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapSelection(sel *Selection) *Selection { - return s.wrapNodes(sel.Nodes...) -} - -// WrapHtml wraps each element in the set of matched elements inside the inner- -// most child of the given HTML. -// -// It returns the original set of elements. -func (s *Selection) WrapHtml(htmlStr string) *Selection { - nodesMap := make(map[string][]*html.Node) - for _, context := range s.Nodes { - var parent *html.Node - if context.Parent != nil { - parent = context.Parent - } else { - parent = &html.Node{Type: html.ElementNode} - } - nodes, found := nodesMap[nodeName(parent)] - if !found { - nodes = parseHtmlWithContext(htmlStr, parent) - nodesMap[nodeName(parent)] = nodes - } - newSingleSelection(context, s.document).wrapAllNodes(cloneNodes(nodes)...) - } - return s -} - -// WrapNode wraps each element in the set of matched elements inside the inner- -// most child of the given node. The given node is copied before being inserted -// into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapNode(n *html.Node) *Selection { - return s.wrapNodes(n) -} - -func (s *Selection) wrapNodes(ns ...*html.Node) *Selection { - s.Each(func(i int, ss *Selection) { - ss.wrapAllNodes(ns...) - }) - - return s -} - -// WrapAll wraps a single HTML structure, matched by the given selector, around -// all elements in the set of matched elements. The matched child is cloned -// before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapAll(selector string) *Selection { - return s.WrapAllMatcher(compileMatcher(selector)) -} - -// WrapAllMatcher wraps a single HTML structure, matched by the given Matcher, -// around all elements in the set of matched elements. The matched child is -// cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapAllMatcher(m Matcher) *Selection { - return s.wrapAllNodes(m.MatchAll(s.document.rootNode)...) -} - -// WrapAllSelection wraps a single HTML structure, the first node of the given -// Selection, around all elements in the set of matched elements. The matched -// child is cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapAllSelection(sel *Selection) *Selection { - return s.wrapAllNodes(sel.Nodes...) -} - -// WrapAllHtml wraps the given HTML structure around all elements in the set of -// matched elements. The matched child is cloned before being inserted into the -// document. -// -// It returns the original set of elements. -func (s *Selection) WrapAllHtml(htmlStr string) *Selection { - var context *html.Node - var nodes []*html.Node - if len(s.Nodes) > 0 { - context = s.Nodes[0] - if context.Parent != nil { - nodes = parseHtmlWithContext(htmlStr, context) - } else { - nodes = parseHtml(htmlStr) - } - } - return s.wrapAllNodes(nodes...) -} - -func (s *Selection) wrapAllNodes(ns ...*html.Node) *Selection { - if len(ns) > 0 { - return s.WrapAllNode(ns[0]) - } - return s -} - -// WrapAllNode wraps the given node around the first element in the Selection, -// making all other nodes in the Selection children of the given node. The node -// is cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapAllNode(n *html.Node) *Selection { - if s.Size() == 0 { - return s - } - - wrap := cloneNode(n) - - first := s.Nodes[0] - if first.Parent != nil { - first.Parent.InsertBefore(wrap, first) - first.Parent.RemoveChild(first) - } - - for c := getFirstChildEl(wrap); c != nil; c = getFirstChildEl(wrap) { - wrap = c - } - - newSingleSelection(wrap, s.document).AppendSelection(s) - - return s -} - -// WrapInner wraps an HTML structure, matched by the given selector, around the -// content of element in the set of matched elements. The matched child is -// cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapInner(selector string) *Selection { - return s.WrapInnerMatcher(compileMatcher(selector)) -} - -// WrapInnerMatcher wraps an HTML structure, matched by the given selector, -// around the content of element in the set of matched elements. The matched -// child is cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapInnerMatcher(m Matcher) *Selection { - return s.wrapInnerNodes(m.MatchAll(s.document.rootNode)...) -} - -// WrapInnerSelection wraps an HTML structure, matched by the given selector, -// around the content of element in the set of matched elements. The matched -// child is cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapInnerSelection(sel *Selection) *Selection { - return s.wrapInnerNodes(sel.Nodes...) -} - -// WrapInnerHtml wraps an HTML structure, matched by the given selector, around -// the content of element in the set of matched elements. The matched child is -// cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapInnerHtml(htmlStr string) *Selection { - nodesMap := make(map[string][]*html.Node) - for _, context := range s.Nodes { - nodes, found := nodesMap[nodeName(context)] - if !found { - nodes = parseHtmlWithContext(htmlStr, context) - nodesMap[nodeName(context)] = nodes - } - newSingleSelection(context, s.document).wrapInnerNodes(cloneNodes(nodes)...) - } - return s -} - -// WrapInnerNode wraps an HTML structure, matched by the given selector, around -// the content of element in the set of matched elements. The matched child is -// cloned before being inserted into the document. -// -// It returns the original set of elements. -func (s *Selection) WrapInnerNode(n *html.Node) *Selection { - return s.wrapInnerNodes(n) -} - -func (s *Selection) wrapInnerNodes(ns ...*html.Node) *Selection { - if len(ns) == 0 { - return s - } - - s.Each(func(i int, s *Selection) { - contents := s.Contents() - - if contents.Size() > 0 { - contents.wrapAllNodes(ns...) - } else { - s.AppendNodes(cloneNode(ns[0])) - } - }) - - return s -} - -func parseHtml(h string) []*html.Node { - // Errors are only returned when the io.Reader returns any error besides - // EOF, but strings.Reader never will - nodes, err := html.ParseFragment(strings.NewReader(h), &html.Node{Type: html.ElementNode}) - if err != nil { - panic("goquery: failed to parse HTML: " + err.Error()) - } - return nodes -} - -func parseHtmlWithContext(h string, context *html.Node) []*html.Node { - // Errors are only returned when the io.Reader returns any error besides - // EOF, but strings.Reader never will - nodes, err := html.ParseFragment(strings.NewReader(h), context) - if err != nil { - panic("goquery: failed to parse HTML: " + err.Error()) - } - return nodes -} - -// Get the first child that is an ElementNode -func getFirstChildEl(n *html.Node) *html.Node { - c := n.FirstChild - for c != nil && c.Type != html.ElementNode { - c = c.NextSibling - } - return c -} - -// Deep copy a slice of nodes. -func cloneNodes(ns []*html.Node) []*html.Node { - cns := make([]*html.Node, 0, len(ns)) - - for _, n := range ns { - cns = append(cns, cloneNode(n)) - } - - return cns -} - -// Deep copy a node. The new node has clones of all the original node's -// children but none of its parents or siblings. -func cloneNode(n *html.Node) *html.Node { - nn := &html.Node{ - Type: n.Type, - DataAtom: n.DataAtom, - Data: n.Data, - Attr: make([]html.Attribute, len(n.Attr)), - } - - copy(nn.Attr, n.Attr) - for c := n.FirstChild; c != nil; c = c.NextSibling { - nn.AppendChild(cloneNode(c)) - } - - return nn -} - -func (s *Selection) manipulateNodes(ns []*html.Node, reverse bool, - f func(sn *html.Node, n *html.Node)) *Selection { - - lasti := s.Size() - 1 - - // net.Html doesn't provide document fragments for insertion, so to get - // things in the correct order with After() and Prepend(), the callback - // needs to be called on the reverse of the nodes. - if reverse { - for i, j := 0, len(ns)-1; i < j; i, j = i+1, j-1 { - ns[i], ns[j] = ns[j], ns[i] - } - } - - for i, sn := range s.Nodes { - for _, n := range ns { - if i != lasti { - f(sn, cloneNode(n)) - } else { - if n.Parent != nil { - n.Parent.RemoveChild(n) - } - f(sn, n) - } - } - } - - return s -} - -// eachNodeHtml parses the given html string and inserts the resulting nodes in the dom with the mergeFn. -// The parsed nodes are inserted for each element of the selection. -// isParent can be used to indicate that the elements of the selection should be treated as the parent for the parsed html. -// A cache is used to avoid parsing the html multiple times should the elements of the selection result in the same context. -func (s *Selection) eachNodeHtml(htmlStr string, isParent bool, mergeFn func(n *html.Node, nodes []*html.Node)) *Selection { - // cache to avoid parsing the html for the same context multiple times - nodeCache := make(map[string][]*html.Node) - var context *html.Node - for _, n := range s.Nodes { - if isParent { - context = n.Parent - } else { - if n.Type != html.ElementNode { - continue - } - context = n - } - if context != nil { - nodes, found := nodeCache[nodeName(context)] - if !found { - nodes = parseHtmlWithContext(htmlStr, context) - nodeCache[nodeName(context)] = nodes - } - mergeFn(n, cloneNodes(nodes)) - } - } - return s -} diff --git a/vendor/github.com/PuerkitoBio/goquery/property.go b/vendor/github.com/PuerkitoBio/goquery/property.go deleted file mode 100644 index 411126db2cd093d0cf41bf0800e2dba003355135..0000000000000000000000000000000000000000 --- a/vendor/github.com/PuerkitoBio/goquery/property.go +++ /dev/null @@ -1,275 +0,0 @@ -package goquery - -import ( - "bytes" - "regexp" - "strings" - - "golang.org/x/net/html" -) - -var rxClassTrim = regexp.MustCompile("[\t\r\n]") - -// Attr gets the specified attribute's value for the first element in the -// Selection. To get the value for each element individually, use a looping -// construct such as Each or Map method. -func (s *Selection) Attr(attrName string) (val string, exists bool) { - if len(s.Nodes) == 0 { - return - } - return getAttributeValue(attrName, s.Nodes[0]) -} - -// AttrOr works like Attr but returns default value if attribute is not present. -func (s *Selection) AttrOr(attrName, defaultValue string) string { - if len(s.Nodes) == 0 { - return defaultValue - } - - val, exists := getAttributeValue(attrName, s.Nodes[0]) - if !exists { - return defaultValue - } - - return val -} - -// RemoveAttr removes the named attribute from each element in the set of matched elements. -func (s *Selection) RemoveAttr(attrName string) *Selection { - for _, n := range s.Nodes { - removeAttr(n, attrName) - } - - return s -} - -// SetAttr sets the given attribute on each element in the set of matched elements. -func (s *Selection) SetAttr(attrName, val string) *Selection { - for _, n := range s.Nodes { - attr := getAttributePtr(attrName, n) - if attr == nil { - n.Attr = append(n.Attr, html.Attribute{Key: attrName, Val: val}) - } else { - attr.Val = val - } - } - - return s -} - -// Text gets the combined text contents of each element in the set of matched -// elements, including their descendants. -func (s *Selection) Text() string { - var buf bytes.Buffer - - // Slightly optimized vs calling Each: no single selection object created - var f func(*html.Node) - f = func(n *html.Node) { - if n.Type == html.TextNode { - // Keep newlines and spaces, like jQuery - buf.WriteString(n.Data) - } - if n.FirstChild != nil { - for c := n.FirstChild; c != nil; c = c.NextSibling { - f(c) - } - } - } - for _, n := range s.Nodes { - f(n) - } - - return buf.String() -} - -// Size is an alias for Length. -func (s *Selection) Size() int { - return s.Length() -} - -// Length returns the number of elements in the Selection object. -func (s *Selection) Length() int { - return len(s.Nodes) -} - -// Html gets the HTML contents of the first element in the set of matched -// elements. It includes text and comment nodes. -func (s *Selection) Html() (ret string, e error) { - // Since there is no .innerHtml, the HTML content must be re-created from - // the nodes using html.Render. - var buf bytes.Buffer - - if len(s.Nodes) > 0 { - for c := s.Nodes[0].FirstChild; c != nil; c = c.NextSibling { - e = html.Render(&buf, c) - if e != nil { - return - } - } - ret = buf.String() - } - - return -} - -// AddClass adds the given class(es) to each element in the set of matched elements. -// Multiple class names can be specified, separated by a space or via multiple arguments. -func (s *Selection) AddClass(class ...string) *Selection { - classStr := strings.TrimSpace(strings.Join(class, " ")) - - if classStr == "" { - return s - } - - tcls := getClassesSlice(classStr) - for _, n := range s.Nodes { - curClasses, attr := getClassesAndAttr(n, true) - for _, newClass := range tcls { - if !strings.Contains(curClasses, " "+newClass+" ") { - curClasses += newClass + " " - } - } - - setClasses(n, attr, curClasses) - } - - return s -} - -// HasClass determines whether any of the matched elements are assigned the -// given class. -func (s *Selection) HasClass(class string) bool { - class = " " + class + " " - for _, n := range s.Nodes { - classes, _ := getClassesAndAttr(n, false) - if strings.Contains(classes, class) { - return true - } - } - return false -} - -// RemoveClass removes the given class(es) from each element in the set of matched elements. -// Multiple class names can be specified, separated by a space or via multiple arguments. -// If no class name is provided, all classes are removed. -func (s *Selection) RemoveClass(class ...string) *Selection { - var rclasses []string - - classStr := strings.TrimSpace(strings.Join(class, " ")) - remove := classStr == "" - - if !remove { - rclasses = getClassesSlice(classStr) - } - - for _, n := range s.Nodes { - if remove { - removeAttr(n, "class") - } else { - classes, attr := getClassesAndAttr(n, true) - for _, rcl := range rclasses { - classes = strings.Replace(classes, " "+rcl+" ", " ", -1) - } - - setClasses(n, attr, classes) - } - } - - return s -} - -// ToggleClass adds or removes the given class(es) for each element in the set of matched elements. -// Multiple class names can be specified, separated by a space or via multiple arguments. -func (s *Selection) ToggleClass(class ...string) *Selection { - classStr := strings.TrimSpace(strings.Join(class, " ")) - - if classStr == "" { - return s - } - - tcls := getClassesSlice(classStr) - - for _, n := range s.Nodes { - classes, attr := getClassesAndAttr(n, true) - for _, tcl := range tcls { - if strings.Contains(classes, " "+tcl+" ") { - classes = strings.Replace(classes, " "+tcl+" ", " ", -1) - } else { - classes += tcl + " " - } - } - - setClasses(n, attr, classes) - } - - return s -} - -func getAttributePtr(attrName string, n *html.Node) *html.Attribute { - if n == nil { - return nil - } - - for i, a := range n.Attr { - if a.Key == attrName { - return &n.Attr[i] - } - } - return nil -} - -// Private function to get the specified attribute's value from a node. -func getAttributeValue(attrName string, n *html.Node) (val string, exists bool) { - if a := getAttributePtr(attrName, n); a != nil { - val = a.Val - exists = true - } - return -} - -// Get and normalize the "class" attribute from the node. -func getClassesAndAttr(n *html.Node, create bool) (classes string, attr *html.Attribute) { - // Applies only to element nodes - if n.Type == html.ElementNode { - attr = getAttributePtr("class", n) - if attr == nil && create { - n.Attr = append(n.Attr, html.Attribute{ - Key: "class", - Val: "", - }) - attr = &n.Attr[len(n.Attr)-1] - } - } - - if attr == nil { - classes = " " - } else { - classes = rxClassTrim.ReplaceAllString(" "+attr.Val+" ", " ") - } - - return -} - -func getClassesSlice(classes string) []string { - return strings.Split(rxClassTrim.ReplaceAllString(" "+classes+" ", " "), " ") -} - -func removeAttr(n *html.Node, attrName string) { - for i, a := range n.Attr { - if a.Key == attrName { - n.Attr[i], n.Attr[len(n.Attr)-1], n.Attr = - n.Attr[len(n.Attr)-1], html.Attribute{}, n.Attr[:len(n.Attr)-1] - return - } - } -} - -func setClasses(n *html.Node, attr *html.Attribute, classes string) { - classes = strings.TrimSpace(classes) - if classes == "" { - removeAttr(n, "class") - return - } - - attr.Val = classes -} diff --git a/vendor/github.com/PuerkitoBio/goquery/query.go b/vendor/github.com/PuerkitoBio/goquery/query.go deleted file mode 100644 index fe86bf0bf07e43310764e727d93b565dd637ae0b..0000000000000000000000000000000000000000 --- a/vendor/github.com/PuerkitoBio/goquery/query.go +++ /dev/null @@ -1,49 +0,0 @@ -package goquery - -import "golang.org/x/net/html" - -// Is checks the current matched set of elements against a selector and -// returns true if at least one of these elements matches. -func (s *Selection) Is(selector string) bool { - return s.IsMatcher(compileMatcher(selector)) -} - -// IsMatcher checks the current matched set of elements against a matcher and -// returns true if at least one of these elements matches. -func (s *Selection) IsMatcher(m Matcher) bool { - if len(s.Nodes) > 0 { - if len(s.Nodes) == 1 { - return m.Match(s.Nodes[0]) - } - return len(m.Filter(s.Nodes)) > 0 - } - - return false -} - -// IsFunction checks the current matched set of elements against a predicate and -// returns true if at least one of these elements matches. -func (s *Selection) IsFunction(f func(int, *Selection) bool) bool { - return s.FilterFunction(f).Length() > 0 -} - -// IsSelection checks the current matched set of elements against a Selection object -// and returns true if at least one of these elements matches. -func (s *Selection) IsSelection(sel *Selection) bool { - return s.FilterSelection(sel).Length() > 0 -} - -// IsNodes checks the current matched set of elements against the specified nodes -// and returns true if at least one of these elements matches. -func (s *Selection) IsNodes(nodes ...*html.Node) bool { - return s.FilterNodes(nodes...).Length() > 0 -} - -// Contains returns true if the specified Node is within, -// at any depth, one of the nodes in the Selection object. -// It is NOT inclusive, to behave like jQuery's implementation, and -// unlike Javascript's .contains, so if the contained -// node is itself in the selection, it returns false. -func (s *Selection) Contains(n *html.Node) bool { - return sliceContains(s.Nodes, n) -} diff --git a/vendor/github.com/PuerkitoBio/goquery/traversal.go b/vendor/github.com/PuerkitoBio/goquery/traversal.go deleted file mode 100644 index c45fa5db788f382d5f996651eaab03c7db576abc..0000000000000000000000000000000000000000 --- a/vendor/github.com/PuerkitoBio/goquery/traversal.go +++ /dev/null @@ -1,704 +0,0 @@ -package goquery - -import "golang.org/x/net/html" - -type siblingType int - -// Sibling type, used internally when iterating over children at the same -// level (siblings) to specify which nodes are requested. -const ( - siblingPrevUntil siblingType = iota - 3 - siblingPrevAll - siblingPrev - siblingAll - siblingNext - siblingNextAll - siblingNextUntil - siblingAllIncludingNonElements -) - -// Find gets the descendants of each element in the current set of matched -// elements, filtered by a selector. It returns a new Selection object -// containing these matched elements. -// -// Note that as for all methods accepting a selector string, the selector is -// compiled and applied by the cascadia package and inherits its behavior and -// constraints regarding supported selectors. See the note on cascadia in -// the goquery documentation here: -// https://github.com/PuerkitoBio/goquery?tab=readme-ov-file#api -func (s *Selection) Find(selector string) *Selection { - return pushStack(s, findWithMatcher(s.Nodes, compileMatcher(selector))) -} - -// FindMatcher gets the descendants of each element in the current set of matched -// elements, filtered by the matcher. It returns a new Selection object -// containing these matched elements. -func (s *Selection) FindMatcher(m Matcher) *Selection { - return pushStack(s, findWithMatcher(s.Nodes, m)) -} - -// FindSelection gets the descendants of each element in the current -// Selection, filtered by a Selection. It returns a new Selection object -// containing these matched elements. -func (s *Selection) FindSelection(sel *Selection) *Selection { - if sel == nil { - return pushStack(s, nil) - } - return s.FindNodes(sel.Nodes...) -} - -// FindNodes gets the descendants of each element in the current -// Selection, filtered by some nodes. It returns a new Selection object -// containing these matched elements. -func (s *Selection) FindNodes(nodes ...*html.Node) *Selection { - return pushStack(s, mapNodes(nodes, func(i int, n *html.Node) []*html.Node { - if sliceContains(s.Nodes, n) { - return []*html.Node{n} - } - return nil - })) -} - -// Contents gets the children of each element in the Selection, -// including text and comment nodes. It returns a new Selection object -// containing these elements. -func (s *Selection) Contents() *Selection { - return pushStack(s, getChildrenNodes(s.Nodes, siblingAllIncludingNonElements)) -} - -// ContentsFiltered gets the children of each element in the Selection, -// filtered by the specified selector. It returns a new Selection -// object containing these elements. Since selectors only act on Element nodes, -// this function is an alias to ChildrenFiltered unless the selector is empty, -// in which case it is an alias to Contents. -func (s *Selection) ContentsFiltered(selector string) *Selection { - if selector != "" { - return s.ChildrenFiltered(selector) - } - return s.Contents() -} - -// ContentsMatcher gets the children of each element in the Selection, -// filtered by the specified matcher. It returns a new Selection -// object containing these elements. Since matchers only act on Element nodes, -// this function is an alias to ChildrenMatcher. -func (s *Selection) ContentsMatcher(m Matcher) *Selection { - return s.ChildrenMatcher(m) -} - -// Children gets the child elements of each element in the Selection. -// It returns a new Selection object containing these elements. -func (s *Selection) Children() *Selection { - return pushStack(s, getChildrenNodes(s.Nodes, siblingAll)) -} - -// ChildrenFiltered gets the child elements of each element in the Selection, -// filtered by the specified selector. It returns a new -// Selection object containing these elements. -func (s *Selection) ChildrenFiltered(selector string) *Selection { - return filterAndPush(s, getChildrenNodes(s.Nodes, siblingAll), compileMatcher(selector)) -} - -// ChildrenMatcher gets the child elements of each element in the Selection, -// filtered by the specified matcher. It returns a new -// Selection object containing these elements. -func (s *Selection) ChildrenMatcher(m Matcher) *Selection { - return filterAndPush(s, getChildrenNodes(s.Nodes, siblingAll), m) -} - -// Parent gets the parent of each element in the Selection. It returns a -// new Selection object containing the matched elements. -func (s *Selection) Parent() *Selection { - return pushStack(s, getParentNodes(s.Nodes)) -} - -// ParentFiltered gets the parent of each element in the Selection filtered by a -// selector. It returns a new Selection object containing the matched elements. -func (s *Selection) ParentFiltered(selector string) *Selection { - return filterAndPush(s, getParentNodes(s.Nodes), compileMatcher(selector)) -} - -// ParentMatcher gets the parent of each element in the Selection filtered by a -// matcher. It returns a new Selection object containing the matched elements. -func (s *Selection) ParentMatcher(m Matcher) *Selection { - return filterAndPush(s, getParentNodes(s.Nodes), m) -} - -// Closest gets the first element that matches the selector by testing the -// element itself and traversing up through its ancestors in the DOM tree. -func (s *Selection) Closest(selector string) *Selection { - cs := compileMatcher(selector) - return s.ClosestMatcher(cs) -} - -// ClosestMatcher gets the first element that matches the matcher by testing the -// element itself and traversing up through its ancestors in the DOM tree. -func (s *Selection) ClosestMatcher(m Matcher) *Selection { - return pushStack(s, mapNodes(s.Nodes, func(i int, n *html.Node) []*html.Node { - // For each node in the selection, test the node itself, then each parent - // until a match is found. - for ; n != nil; n = n.Parent { - if m.Match(n) { - return []*html.Node{n} - } - } - return nil - })) -} - -// ClosestNodes gets the first element that matches one of the nodes by testing the -// element itself and traversing up through its ancestors in the DOM tree. -func (s *Selection) ClosestNodes(nodes ...*html.Node) *Selection { - set := make(map[*html.Node]bool) - for _, n := range nodes { - set[n] = true - } - return pushStack(s, mapNodes(s.Nodes, func(i int, n *html.Node) []*html.Node { - // For each node in the selection, test the node itself, then each parent - // until a match is found. - for ; n != nil; n = n.Parent { - if set[n] { - return []*html.Node{n} - } - } - return nil - })) -} - -// ClosestSelection gets the first element that matches one of the nodes in the -// Selection by testing the element itself and traversing up through its ancestors -// in the DOM tree. -func (s *Selection) ClosestSelection(sel *Selection) *Selection { - if sel == nil { - return pushStack(s, nil) - } - return s.ClosestNodes(sel.Nodes...) -} - -// Parents gets the ancestors of each element in the current Selection. It -// returns a new Selection object with the matched elements. -func (s *Selection) Parents() *Selection { - return pushStack(s, getParentsNodes(s.Nodes, nil, nil)) -} - -// ParentsFiltered gets the ancestors of each element in the current -// Selection. It returns a new Selection object with the matched elements. -func (s *Selection) ParentsFiltered(selector string) *Selection { - return filterAndPush(s, getParentsNodes(s.Nodes, nil, nil), compileMatcher(selector)) -} - -// ParentsMatcher gets the ancestors of each element in the current -// Selection. It returns a new Selection object with the matched elements. -func (s *Selection) ParentsMatcher(m Matcher) *Selection { - return filterAndPush(s, getParentsNodes(s.Nodes, nil, nil), m) -} - -// ParentsUntil gets the ancestors of each element in the Selection, up to but -// not including the element matched by the selector. It returns a new Selection -// object containing the matched elements. -func (s *Selection) ParentsUntil(selector string) *Selection { - return pushStack(s, getParentsNodes(s.Nodes, compileMatcher(selector), nil)) -} - -// ParentsUntilMatcher gets the ancestors of each element in the Selection, up to but -// not including the element matched by the matcher. It returns a new Selection -// object containing the matched elements. -func (s *Selection) ParentsUntilMatcher(m Matcher) *Selection { - return pushStack(s, getParentsNodes(s.Nodes, m, nil)) -} - -// ParentsUntilSelection gets the ancestors of each element in the Selection, -// up to but not including the elements in the specified Selection. It returns a -// new Selection object containing the matched elements. -func (s *Selection) ParentsUntilSelection(sel *Selection) *Selection { - if sel == nil { - return s.Parents() - } - return s.ParentsUntilNodes(sel.Nodes...) -} - -// ParentsUntilNodes gets the ancestors of each element in the Selection, -// up to but not including the specified nodes. It returns a -// new Selection object containing the matched elements. -func (s *Selection) ParentsUntilNodes(nodes ...*html.Node) *Selection { - return pushStack(s, getParentsNodes(s.Nodes, nil, nodes)) -} - -// ParentsFilteredUntil is like ParentsUntil, with the option to filter the -// results based on a selector string. It returns a new Selection -// object containing the matched elements. -func (s *Selection) ParentsFilteredUntil(filterSelector, untilSelector string) *Selection { - return filterAndPush(s, getParentsNodes(s.Nodes, compileMatcher(untilSelector), nil), compileMatcher(filterSelector)) -} - -// ParentsFilteredUntilMatcher is like ParentsUntilMatcher, with the option to filter the -// results based on a matcher. It returns a new Selection object containing the matched elements. -func (s *Selection) ParentsFilteredUntilMatcher(filter, until Matcher) *Selection { - return filterAndPush(s, getParentsNodes(s.Nodes, until, nil), filter) -} - -// ParentsFilteredUntilSelection is like ParentsUntilSelection, with the -// option to filter the results based on a selector string. It returns a new -// Selection object containing the matched elements. -func (s *Selection) ParentsFilteredUntilSelection(filterSelector string, sel *Selection) *Selection { - return s.ParentsMatcherUntilSelection(compileMatcher(filterSelector), sel) -} - -// ParentsMatcherUntilSelection is like ParentsUntilSelection, with the -// option to filter the results based on a matcher. It returns a new -// Selection object containing the matched elements. -func (s *Selection) ParentsMatcherUntilSelection(filter Matcher, sel *Selection) *Selection { - if sel == nil { - return s.ParentsMatcher(filter) - } - return s.ParentsMatcherUntilNodes(filter, sel.Nodes...) -} - -// ParentsFilteredUntilNodes is like ParentsUntilNodes, with the -// option to filter the results based on a selector string. It returns a new -// Selection object containing the matched elements. -func (s *Selection) ParentsFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection { - return filterAndPush(s, getParentsNodes(s.Nodes, nil, nodes), compileMatcher(filterSelector)) -} - -// ParentsMatcherUntilNodes is like ParentsUntilNodes, with the -// option to filter the results based on a matcher. It returns a new -// Selection object containing the matched elements. -func (s *Selection) ParentsMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection { - return filterAndPush(s, getParentsNodes(s.Nodes, nil, nodes), filter) -} - -// Siblings gets the siblings of each element in the Selection. It returns -// a new Selection object containing the matched elements. -func (s *Selection) Siblings() *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil)) -} - -// SiblingsFiltered gets the siblings of each element in the Selection -// filtered by a selector. It returns a new Selection object containing the -// matched elements. -func (s *Selection) SiblingsFiltered(selector string) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil), compileMatcher(selector)) -} - -// SiblingsMatcher gets the siblings of each element in the Selection -// filtered by a matcher. It returns a new Selection object containing the -// matched elements. -func (s *Selection) SiblingsMatcher(m Matcher) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingAll, nil, nil), m) -} - -// Next gets the immediately following sibling of each element in the -// Selection. It returns a new Selection object containing the matched elements. -func (s *Selection) Next() *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil)) -} - -// NextFiltered gets the immediately following sibling of each element in the -// Selection filtered by a selector. It returns a new Selection object -// containing the matched elements. -func (s *Selection) NextFiltered(selector string) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil), compileMatcher(selector)) -} - -// NextMatcher gets the immediately following sibling of each element in the -// Selection filtered by a matcher. It returns a new Selection object -// containing the matched elements. -func (s *Selection) NextMatcher(m Matcher) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNext, nil, nil), m) -} - -// NextAll gets all the following siblings of each element in the -// Selection. It returns a new Selection object containing the matched elements. -func (s *Selection) NextAll() *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil)) -} - -// NextAllFiltered gets all the following siblings of each element in the -// Selection filtered by a selector. It returns a new Selection object -// containing the matched elements. -func (s *Selection) NextAllFiltered(selector string) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil), compileMatcher(selector)) -} - -// NextAllMatcher gets all the following siblings of each element in the -// Selection filtered by a matcher. It returns a new Selection object -// containing the matched elements. -func (s *Selection) NextAllMatcher(m Matcher) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextAll, nil, nil), m) -} - -// Prev gets the immediately preceding sibling of each element in the -// Selection. It returns a new Selection object containing the matched elements. -func (s *Selection) Prev() *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil)) -} - -// PrevFiltered gets the immediately preceding sibling of each element in the -// Selection filtered by a selector. It returns a new Selection object -// containing the matched elements. -func (s *Selection) PrevFiltered(selector string) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil), compileMatcher(selector)) -} - -// PrevMatcher gets the immediately preceding sibling of each element in the -// Selection filtered by a matcher. It returns a new Selection object -// containing the matched elements. -func (s *Selection) PrevMatcher(m Matcher) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrev, nil, nil), m) -} - -// PrevAll gets all the preceding siblings of each element in the -// Selection. It returns a new Selection object containing the matched elements. -func (s *Selection) PrevAll() *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil)) -} - -// PrevAllFiltered gets all the preceding siblings of each element in the -// Selection filtered by a selector. It returns a new Selection object -// containing the matched elements. -func (s *Selection) PrevAllFiltered(selector string) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil), compileMatcher(selector)) -} - -// PrevAllMatcher gets all the preceding siblings of each element in the -// Selection filtered by a matcher. It returns a new Selection object -// containing the matched elements. -func (s *Selection) PrevAllMatcher(m Matcher) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevAll, nil, nil), m) -} - -// NextUntil gets all following siblings of each element up to but not -// including the element matched by the selector. It returns a new Selection -// object containing the matched elements. -func (s *Selection) NextUntil(selector string) *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil, - compileMatcher(selector), nil)) -} - -// NextUntilMatcher gets all following siblings of each element up to but not -// including the element matched by the matcher. It returns a new Selection -// object containing the matched elements. -func (s *Selection) NextUntilMatcher(m Matcher) *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil, - m, nil)) -} - -// NextUntilSelection gets all following siblings of each element up to but not -// including the element matched by the Selection. It returns a new Selection -// object containing the matched elements. -func (s *Selection) NextUntilSelection(sel *Selection) *Selection { - if sel == nil { - return s.NextAll() - } - return s.NextUntilNodes(sel.Nodes...) -} - -// NextUntilNodes gets all following siblings of each element up to but not -// including the element matched by the nodes. It returns a new Selection -// object containing the matched elements. -func (s *Selection) NextUntilNodes(nodes ...*html.Node) *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingNextUntil, - nil, nodes)) -} - -// PrevUntil gets all preceding siblings of each element up to but not -// including the element matched by the selector. It returns a new Selection -// object containing the matched elements. -func (s *Selection) PrevUntil(selector string) *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil, - compileMatcher(selector), nil)) -} - -// PrevUntilMatcher gets all preceding siblings of each element up to but not -// including the element matched by the matcher. It returns a new Selection -// object containing the matched elements. -func (s *Selection) PrevUntilMatcher(m Matcher) *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil, - m, nil)) -} - -// PrevUntilSelection gets all preceding siblings of each element up to but not -// including the element matched by the Selection. It returns a new Selection -// object containing the matched elements. -func (s *Selection) PrevUntilSelection(sel *Selection) *Selection { - if sel == nil { - return s.PrevAll() - } - return s.PrevUntilNodes(sel.Nodes...) -} - -// PrevUntilNodes gets all preceding siblings of each element up to but not -// including the element matched by the nodes. It returns a new Selection -// object containing the matched elements. -func (s *Selection) PrevUntilNodes(nodes ...*html.Node) *Selection { - return pushStack(s, getSiblingNodes(s.Nodes, siblingPrevUntil, - nil, nodes)) -} - -// NextFilteredUntil is like NextUntil, with the option to filter -// the results based on a selector string. -// It returns a new Selection object containing the matched elements. -func (s *Selection) NextFilteredUntil(filterSelector, untilSelector string) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil, - compileMatcher(untilSelector), nil), compileMatcher(filterSelector)) -} - -// NextFilteredUntilMatcher is like NextUntilMatcher, with the option to filter -// the results based on a matcher. -// It returns a new Selection object containing the matched elements. -func (s *Selection) NextFilteredUntilMatcher(filter, until Matcher) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil, - until, nil), filter) -} - -// NextFilteredUntilSelection is like NextUntilSelection, with the -// option to filter the results based on a selector string. It returns a new -// Selection object containing the matched elements. -func (s *Selection) NextFilteredUntilSelection(filterSelector string, sel *Selection) *Selection { - return s.NextMatcherUntilSelection(compileMatcher(filterSelector), sel) -} - -// NextMatcherUntilSelection is like NextUntilSelection, with the -// option to filter the results based on a matcher. It returns a new -// Selection object containing the matched elements. -func (s *Selection) NextMatcherUntilSelection(filter Matcher, sel *Selection) *Selection { - if sel == nil { - return s.NextMatcher(filter) - } - return s.NextMatcherUntilNodes(filter, sel.Nodes...) -} - -// NextFilteredUntilNodes is like NextUntilNodes, with the -// option to filter the results based on a selector string. It returns a new -// Selection object containing the matched elements. -func (s *Selection) NextFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil, - nil, nodes), compileMatcher(filterSelector)) -} - -// NextMatcherUntilNodes is like NextUntilNodes, with the -// option to filter the results based on a matcher. It returns a new -// Selection object containing the matched elements. -func (s *Selection) NextMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingNextUntil, - nil, nodes), filter) -} - -// PrevFilteredUntil is like PrevUntil, with the option to filter -// the results based on a selector string. -// It returns a new Selection object containing the matched elements. -func (s *Selection) PrevFilteredUntil(filterSelector, untilSelector string) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil, - compileMatcher(untilSelector), nil), compileMatcher(filterSelector)) -} - -// PrevFilteredUntilMatcher is like PrevUntilMatcher, with the option to filter -// the results based on a matcher. -// It returns a new Selection object containing the matched elements. -func (s *Selection) PrevFilteredUntilMatcher(filter, until Matcher) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil, - until, nil), filter) -} - -// PrevFilteredUntilSelection is like PrevUntilSelection, with the -// option to filter the results based on a selector string. It returns a new -// Selection object containing the matched elements. -func (s *Selection) PrevFilteredUntilSelection(filterSelector string, sel *Selection) *Selection { - return s.PrevMatcherUntilSelection(compileMatcher(filterSelector), sel) -} - -// PrevMatcherUntilSelection is like PrevUntilSelection, with the -// option to filter the results based on a matcher. It returns a new -// Selection object containing the matched elements. -func (s *Selection) PrevMatcherUntilSelection(filter Matcher, sel *Selection) *Selection { - if sel == nil { - return s.PrevMatcher(filter) - } - return s.PrevMatcherUntilNodes(filter, sel.Nodes...) -} - -// PrevFilteredUntilNodes is like PrevUntilNodes, with the -// option to filter the results based on a selector string. It returns a new -// Selection object containing the matched elements. -func (s *Selection) PrevFilteredUntilNodes(filterSelector string, nodes ...*html.Node) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil, - nil, nodes), compileMatcher(filterSelector)) -} - -// PrevMatcherUntilNodes is like PrevUntilNodes, with the -// option to filter the results based on a matcher. It returns a new -// Selection object containing the matched elements. -func (s *Selection) PrevMatcherUntilNodes(filter Matcher, nodes ...*html.Node) *Selection { - return filterAndPush(s, getSiblingNodes(s.Nodes, siblingPrevUntil, - nil, nodes), filter) -} - -// Filter and push filters the nodes based on a matcher, and pushes the results -// on the stack, with the srcSel as previous selection. -func filterAndPush(srcSel *Selection, nodes []*html.Node, m Matcher) *Selection { - // Create a temporary Selection with the specified nodes to filter using winnow - sel := &Selection{nodes, srcSel.document, nil} - // Filter based on matcher and push on stack - return pushStack(srcSel, winnow(sel, m, true)) -} - -// Internal implementation of Find that return raw nodes. -func findWithMatcher(nodes []*html.Node, m Matcher) []*html.Node { - // Map nodes to find the matches within the children of each node - return mapNodes(nodes, func(i int, n *html.Node) (result []*html.Node) { - // Go down one level, becausejQuery's Find selects only within descendants - for c := n.FirstChild; c != nil; c = c.NextSibling { - if c.Type == html.ElementNode { - result = append(result, m.MatchAll(c)...) - } - } - return - }) -} - -// Internal implementation to get all parent nodes, stopping at the specified -// node (or nil if no stop). -func getParentsNodes(nodes []*html.Node, stopm Matcher, stopNodes []*html.Node) []*html.Node { - return mapNodes(nodes, func(i int, n *html.Node) (result []*html.Node) { - for p := n.Parent; p != nil; p = p.Parent { - sel := newSingleSelection(p, nil) - if stopm != nil { - if sel.IsMatcher(stopm) { - break - } - } else if len(stopNodes) > 0 { - if sel.IsNodes(stopNodes...) { - break - } - } - if p.Type == html.ElementNode { - result = append(result, p) - } - } - return - }) -} - -// Internal implementation of sibling nodes that return a raw slice of matches. -func getSiblingNodes(nodes []*html.Node, st siblingType, untilm Matcher, untilNodes []*html.Node) []*html.Node { - var f func(*html.Node) bool - - // If the requested siblings are ...Until, create the test function to - // determine if the until condition is reached (returns true if it is) - if st == siblingNextUntil || st == siblingPrevUntil { - f = func(n *html.Node) bool { - if untilm != nil { - // Matcher-based condition - sel := newSingleSelection(n, nil) - return sel.IsMatcher(untilm) - } else if len(untilNodes) > 0 { - // Nodes-based condition - sel := newSingleSelection(n, nil) - return sel.IsNodes(untilNodes...) - } - return false - } - } - - return mapNodes(nodes, func(i int, n *html.Node) []*html.Node { - return getChildrenWithSiblingType(n.Parent, st, n, f) - }) -} - -// Gets the children nodes of each node in the specified slice of nodes, -// based on the sibling type request. -func getChildrenNodes(nodes []*html.Node, st siblingType) []*html.Node { - return mapNodes(nodes, func(i int, n *html.Node) []*html.Node { - return getChildrenWithSiblingType(n, st, nil, nil) - }) -} - -// Gets the children of the specified parent, based on the requested sibling -// type, skipping a specified node if required. -func getChildrenWithSiblingType(parent *html.Node, st siblingType, skipNode *html.Node, - untilFunc func(*html.Node) bool) (result []*html.Node) { - - // Create the iterator function - var iter = func(cur *html.Node) (ret *html.Node) { - // Based on the sibling type requested, iterate the right way - for { - switch st { - case siblingAll, siblingAllIncludingNonElements: - if cur == nil { - // First iteration, start with first child of parent - // Skip node if required - if ret = parent.FirstChild; ret == skipNode && skipNode != nil { - ret = skipNode.NextSibling - } - } else { - // Skip node if required - if ret = cur.NextSibling; ret == skipNode && skipNode != nil { - ret = skipNode.NextSibling - } - } - case siblingPrev, siblingPrevAll, siblingPrevUntil: - if cur == nil { - // Start with previous sibling of the skip node - ret = skipNode.PrevSibling - } else { - ret = cur.PrevSibling - } - case siblingNext, siblingNextAll, siblingNextUntil: - if cur == nil { - // Start with next sibling of the skip node - ret = skipNode.NextSibling - } else { - ret = cur.NextSibling - } - default: - panic("Invalid sibling type.") - } - if ret == nil || ret.Type == html.ElementNode || st == siblingAllIncludingNonElements { - return - } - // Not a valid node, try again from this one - cur = ret - } - } - - for c := iter(nil); c != nil; c = iter(c) { - // If this is an ...Until case, test before append (returns true - // if the until condition is reached) - if st == siblingNextUntil || st == siblingPrevUntil { - if untilFunc(c) { - return - } - } - result = append(result, c) - if st == siblingNext || st == siblingPrev { - // Only one node was requested (immediate next or previous), so exit - return - } - } - return -} - -// Internal implementation of parent nodes that return a raw slice of Nodes. -func getParentNodes(nodes []*html.Node) []*html.Node { - return mapNodes(nodes, func(i int, n *html.Node) []*html.Node { - if n.Parent != nil && n.Parent.Type == html.ElementNode { - return []*html.Node{n.Parent} - } - return nil - }) -} - -// Internal map function used by many traversing methods. Takes the source nodes -// to iterate on and the mapping function that returns an array of nodes. -// Returns an array of nodes mapped by calling the callback function once for -// each node in the source nodes. -func mapNodes(nodes []*html.Node, f func(int, *html.Node) []*html.Node) (result []*html.Node) { - set := make(map[*html.Node]bool) - for i, n := range nodes { - if vals := f(i, n); len(vals) > 0 { - result = appendWithoutDuplicates(result, vals, set) - } - } - return result -} diff --git a/vendor/github.com/PuerkitoBio/goquery/type.go b/vendor/github.com/PuerkitoBio/goquery/type.go deleted file mode 100644 index 6646c143b02192c27b8c6b8b65b7e4a5c3cdee13..0000000000000000000000000000000000000000 --- a/vendor/github.com/PuerkitoBio/goquery/type.go +++ /dev/null @@ -1,203 +0,0 @@ -package goquery - -import ( - "errors" - "io" - "net/http" - "net/url" - - "github.com/andybalholm/cascadia" - "golang.org/x/net/html" -) - -// Document represents an HTML document to be manipulated. Unlike jQuery, which -// is loaded as part of a DOM document, and thus acts upon its containing -// document, GoQuery doesn't know which HTML document to act upon. So it needs -// to be told, and that's what the Document class is for. It holds the root -// document node to manipulate, and can make selections on this document. -type Document struct { - *Selection - Url *url.URL - rootNode *html.Node -} - -// NewDocumentFromNode is a Document constructor that takes a root html Node -// as argument. -func NewDocumentFromNode(root *html.Node) *Document { - return newDocument(root, nil) -} - -// NewDocument is a Document constructor that takes a string URL as argument. -// It loads the specified document, parses it, and stores the root Document -// node, ready to be manipulated. -// -// Deprecated: Use the net/http standard library package to make the request -// and validate the response before calling goquery.NewDocumentFromReader -// with the response's body. -func NewDocument(url string) (*Document, error) { - // Load the URL - res, e := http.Get(url) - if e != nil { - return nil, e - } - return NewDocumentFromResponse(res) -} - -// NewDocumentFromReader returns a Document from an io.Reader. -// It returns an error as second value if the reader's data cannot be parsed -// as html. It does not check if the reader is also an io.Closer, the -// provided reader is never closed by this call. It is the responsibility -// of the caller to close it if required. -func NewDocumentFromReader(r io.Reader) (*Document, error) { - root, e := html.Parse(r) - if e != nil { - return nil, e - } - return newDocument(root, nil), nil -} - -// NewDocumentFromResponse is another Document constructor that takes an http response as argument. -// It loads the specified response's document, parses it, and stores the root Document -// node, ready to be manipulated. The response's body is closed on return. -// -// Deprecated: Use goquery.NewDocumentFromReader with the response's body. -func NewDocumentFromResponse(res *http.Response) (*Document, error) { - if res == nil { - return nil, errors.New("Response is nil") - } - defer res.Body.Close() - if res.Request == nil { - return nil, errors.New("Response.Request is nil") - } - - // Parse the HTML into nodes - root, e := html.Parse(res.Body) - if e != nil { - return nil, e - } - - // Create and fill the document - return newDocument(root, res.Request.URL), nil -} - -// CloneDocument creates a deep-clone of a document. -func CloneDocument(doc *Document) *Document { - return newDocument(cloneNode(doc.rootNode), doc.Url) -} - -// Private constructor, make sure all fields are correctly filled. -func newDocument(root *html.Node, url *url.URL) *Document { - // Create and fill the document - d := &Document{nil, url, root} - d.Selection = newSingleSelection(root, d) - return d -} - -// Selection represents a collection of nodes matching some criteria. The -// initial Selection can be created by using Document.Find, and then -// manipulated using the jQuery-like chainable syntax and methods. -type Selection struct { - Nodes []*html.Node - document *Document - prevSel *Selection -} - -// Helper constructor to create an empty selection -func newEmptySelection(doc *Document) *Selection { - return &Selection{nil, doc, nil} -} - -// Helper constructor to create a selection of only one node -func newSingleSelection(node *html.Node, doc *Document) *Selection { - return &Selection{[]*html.Node{node}, doc, nil} -} - -// Matcher is an interface that defines the methods to match -// HTML nodes against a compiled selector string. Cascadia's -// Selector implements this interface. -type Matcher interface { - Match(*html.Node) bool - MatchAll(*html.Node) []*html.Node - Filter([]*html.Node) []*html.Node -} - -// Single compiles a selector string to a Matcher that stops after the first -// match is found. -// -// By default, Selection.Find and other functions that accept a selector string -// to select nodes will use all matches corresponding to that selector. By -// using the Matcher returned by Single, at most the first match will be -// selected. -// -// For example, those two statements are semantically equivalent: -// -// sel1 := doc.Find("a").First() -// sel2 := doc.FindMatcher(goquery.Single("a")) -// -// The one using Single is optimized to be potentially much faster on large -// documents. -// -// Only the behaviour of the MatchAll method of the Matcher interface is -// altered compared to standard Matchers. This means that the single-selection -// property of the Matcher only applies for Selection methods where the Matcher -// is used to select nodes, not to filter or check if a node matches the -// Matcher - in those cases, the behaviour of the Matcher is unchanged (e.g. -// FilterMatcher(Single("div")) will still result in a Selection with multiple -// "div"s if there were many "div"s in the Selection to begin with). -func Single(selector string) Matcher { - return singleMatcher{compileMatcher(selector)} -} - -// SingleMatcher returns a Matcher matches the same nodes as m, but that stops -// after the first match is found. -// -// See the documentation of function Single for more details. -func SingleMatcher(m Matcher) Matcher { - if _, ok := m.(singleMatcher); ok { - // m is already a singleMatcher - return m - } - return singleMatcher{m} -} - -// compileMatcher compiles the selector string s and returns -// the corresponding Matcher. If s is an invalid selector string, -// it returns a Matcher that fails all matches. -func compileMatcher(s string) Matcher { - cs, err := cascadia.Compile(s) - if err != nil { - return invalidMatcher{} - } - return cs -} - -type singleMatcher struct { - Matcher -} - -func (m singleMatcher) MatchAll(n *html.Node) []*html.Node { - // Optimized version - stops finding at the first match (cascadia-compiled - // matchers all use this code path). - if mm, ok := m.Matcher.(interface{ MatchFirst(*html.Node) *html.Node }); ok { - node := mm.MatchFirst(n) - if node == nil { - return nil - } - return []*html.Node{node} - } - - // Fallback version, for e.g. test mocks that don't provide the MatchFirst - // method. - nodes := m.Matcher.MatchAll(n) - if len(nodes) > 0 { - return nodes[:1:1] - } - return nil -} - -// invalidMatcher is a Matcher that always fails to match. -type invalidMatcher struct{} - -func (invalidMatcher) Match(n *html.Node) bool { return false } -func (invalidMatcher) MatchAll(n *html.Node) []*html.Node { return nil } -func (invalidMatcher) Filter(ns []*html.Node) []*html.Node { return nil } diff --git a/vendor/github.com/PuerkitoBio/goquery/utilities.go b/vendor/github.com/PuerkitoBio/goquery/utilities.go deleted file mode 100644 index ecd3453f7c8b0589f10a6a0a0282dddfb46a981f..0000000000000000000000000000000000000000 --- a/vendor/github.com/PuerkitoBio/goquery/utilities.go +++ /dev/null @@ -1,178 +0,0 @@ -package goquery - -import ( - "bytes" - "io" - - "golang.org/x/net/html" -) - -// used to determine if a set (map[*html.Node]bool) should be used -// instead of iterating over a slice. The set uses more memory and -// is slower than slice iteration for small N. -const minNodesForSet = 1000 - -var nodeNames = []string{ - html.ErrorNode: "#error", - html.TextNode: "#text", - html.DocumentNode: "#document", - html.CommentNode: "#comment", -} - -// NodeName returns the node name of the first element in the selection. -// It tries to behave in a similar way as the DOM's nodeName property -// (https://developer.mozilla.org/en-US/docs/Web/API/Node/nodeName). -// -// Go's net/html package defines the following node types, listed with -// the corresponding returned value from this function: -// -// ErrorNode : #error -// TextNode : #text -// DocumentNode : #document -// ElementNode : the element's tag name -// CommentNode : #comment -// DoctypeNode : the name of the document type -// -func NodeName(s *Selection) string { - if s.Length() == 0 { - return "" - } - return nodeName(s.Get(0)) -} - -// nodeName returns the node name of the given html node. -// See NodeName for additional details on behaviour. -func nodeName(node *html.Node) string { - if node == nil { - return "" - } - - switch node.Type { - case html.ElementNode, html.DoctypeNode: - return node.Data - default: - if int(node.Type) < len(nodeNames) { - return nodeNames[node.Type] - } - return "" - } -} - -// Render renders the HTML of the first item in the selection and writes it to -// the writer. It behaves the same as OuterHtml but writes to w instead of -// returning the string. -func Render(w io.Writer, s *Selection) error { - if s.Length() == 0 { - return nil - } - n := s.Get(0) - return html.Render(w, n) -} - -// OuterHtml returns the outer HTML rendering of the first item in -// the selection - that is, the HTML including the first element's -// tag and attributes. -// -// Unlike Html, this is a function and not a method on the Selection, -// because this is not a jQuery method (in javascript-land, this is -// a property provided by the DOM). -func OuterHtml(s *Selection) (string, error) { - var buf bytes.Buffer - if err := Render(&buf, s); err != nil { - return "", err - } - return buf.String(), nil -} - -// Loop through all container nodes to search for the target node. -func sliceContains(container []*html.Node, contained *html.Node) bool { - for _, n := range container { - if nodeContains(n, contained) { - return true - } - } - - return false -} - -// Checks if the contained node is within the container node. -func nodeContains(container *html.Node, contained *html.Node) bool { - // Check if the parent of the contained node is the container node, traversing - // upward until the top is reached, or the container is found. - for contained = contained.Parent; contained != nil; contained = contained.Parent { - if container == contained { - return true - } - } - return false -} - -// Checks if the target node is in the slice of nodes. -func isInSlice(slice []*html.Node, node *html.Node) bool { - return indexInSlice(slice, node) > -1 -} - -// Returns the index of the target node in the slice, or -1. -func indexInSlice(slice []*html.Node, node *html.Node) int { - if node != nil { - for i, n := range slice { - if n == node { - return i - } - } - } - return -1 -} - -// Appends the new nodes to the target slice, making sure no duplicate is added. -// There is no check to the original state of the target slice, so it may still -// contain duplicates. The target slice is returned because append() may create -// a new underlying array. If targetSet is nil, a local set is created with the -// target if len(target) + len(nodes) is greater than minNodesForSet. -func appendWithoutDuplicates(target []*html.Node, nodes []*html.Node, targetSet map[*html.Node]bool) []*html.Node { - // if there are not that many nodes, don't use the map, faster to just use nested loops - // (unless a non-nil targetSet is passed, in which case the caller knows better). - if targetSet == nil && len(target)+len(nodes) < minNodesForSet { - for _, n := range nodes { - if !isInSlice(target, n) { - target = append(target, n) - } - } - return target - } - - // if a targetSet is passed, then assume it is reliable, otherwise create one - // and initialize it with the current target contents. - if targetSet == nil { - targetSet = make(map[*html.Node]bool, len(target)) - for _, n := range target { - targetSet[n] = true - } - } - for _, n := range nodes { - if !targetSet[n] { - target = append(target, n) - targetSet[n] = true - } - } - - return target -} - -// Loop through a selection, returning only those nodes that pass the predicate -// function. -func grep(sel *Selection, predicate func(i int, s *Selection) bool) (result []*html.Node) { - for i, n := range sel.Nodes { - if predicate(i, newSingleSelection(n, sel.document)) { - result = append(result, n) - } - } - return result -} - -// Creates a new Selection object based on the specified nodes, and keeps the -// source Selection object on the stack (linked list). -func pushStack(fromSel *Selection, nodes []*html.Node) *Selection { - result := &Selection{nodes, fromSel.document, fromSel} - return result -} diff --git a/vendor/github.com/alecthomas/chroma/v2/.editorconfig b/vendor/github.com/alecthomas/chroma/v2/.editorconfig deleted file mode 100644 index cfb2c669e7c460f1cbf1c2bee6ac88224f829aff..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/.editorconfig +++ /dev/null @@ -1,17 +0,0 @@ -root = true - -[*] -indent_style = tab -end_of_line = lf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true - -[*.xml] -indent_style = space -indent_size = 2 -insert_final_newline = false - -[*.yml] -indent_style = space -indent_size = 2 diff --git a/vendor/github.com/alecthomas/chroma/v2/.gitignore b/vendor/github.com/alecthomas/chroma/v2/.gitignore deleted file mode 100644 index 8cbdd75ea0323b91f78187d039fc9afd0c2684c3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/.gitignore +++ /dev/null @@ -1,25 +0,0 @@ -# Binaries for programs and plugins -.git -.idea -.vscode -.hermit -*.exe -*.dll -*.so -*.dylib -/cmd/chroma/chroma - -# Test binary, build with `go test -c` -*.test - -# Output of the go coverage tool, specifically when used with LiteIDE -*.out - -# Project-local glide cache, RE: https://github.com/Masterminds/glide/issues/736 -.glide/ - -_models/ - -_examples/ -*.min.* -build/ diff --git a/vendor/github.com/alecthomas/chroma/v2/.golangci.yml b/vendor/github.com/alecthomas/chroma/v2/.golangci.yml deleted file mode 100644 index 7e98a22376f2c5c77172b2de60ffb27a82071b94..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/.golangci.yml +++ /dev/null @@ -1,95 +0,0 @@ -run: - tests: true - skip-dirs: - - _examples - -output: - print-issued-lines: false - -linters: - enable-all: true - disable: - - maligned - - megacheck - - lll - - gocyclo - - dupl - - gochecknoglobals - - funlen - - godox - - wsl - - gomnd - - gocognit - - goerr113 - - nolintlint - - testpackage - - godot - - nestif - - paralleltest - - nlreturn - - cyclop - - exhaustivestruct - - gci - - gofumpt - - errorlint - - exhaustive - - ifshort - - wrapcheck - - stylecheck - - thelper - - nonamedreturns - - revive - - dupword - - exhaustruct - - varnamelen - - forcetypeassert - - ireturn - - maintidx - - govet - - nosnakecase - - testableexamples - - musttag - - depguard - - goconst - - perfsprint - - mnd - - predeclared - -linters-settings: - govet: - check-shadowing: true - gocyclo: - min-complexity: 10 - dupl: - threshold: 100 - goconst: - min-len: 8 - min-occurrences: 3 - forbidigo: - #forbid: - # - (Must)?NewLexer$ - exclude_godoc_examples: false - - -issues: - max-per-linter: 0 - max-same: 0 - exclude-use-default: false - exclude: - # Captured by errcheck. - - '^(G104|G204):' - # Very commonly not checked. - - 'Error return value of .(.*\.Help|.*\.MarkFlagRequired|(os\.)?std(out|err)\..*|.*Close|.*Flush|os\.Remove(All)?|.*printf?|os\.(Un)?Setenv). is not checked' - - 'exported method (.*\.MarshalJSON|.*\.UnmarshalJSON|.*\.EntityURN|.*\.GoString|.*\.Pos) should have comment or be unexported' - - 'composite literal uses unkeyed fields' - - 'declaration of "err" shadows declaration' - - 'should not use dot imports' - - 'Potential file inclusion via variable' - - 'should have comment or be unexported' - - 'comment on exported var .* should be of the form' - - 'at least one file in a package should have a package comment' - - 'string literal contains the Unicode' - - 'methods on the same type should have the same receiver name' - - '_TokenType_name should be _TokenTypeName' - - '`_TokenType_map` should be `_TokenTypeMap`' - - 'rewrite if-else to switch statement' diff --git a/vendor/github.com/alecthomas/chroma/v2/.goreleaser.yml b/vendor/github.com/alecthomas/chroma/v2/.goreleaser.yml deleted file mode 100644 index 8cd7592d3fb73c2c30c6267c809cde66480b7717..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/.goreleaser.yml +++ /dev/null @@ -1,37 +0,0 @@ -project_name: chroma -release: - github: - owner: alecthomas - name: chroma -brews: - - - install: bin.install "chroma" -env: - - CGO_ENABLED=0 -builds: -- goos: - - linux - - darwin - - windows - goarch: - - arm64 - - amd64 - - "386" - goarm: - - "6" - dir: ./cmd/chroma - main: . - ldflags: -s -w -X main.version={{.Version}} -X main.commit={{.Commit}} -X main.date={{.Date}} - binary: chroma -archives: - - - format: tar.gz - name_template: '{{ .Binary }}-{{ .Version }}-{{ .Os }}-{{ .Arch }}{{ if .Arm }}v{{ - .Arm }}{{ end }}' - files: - - COPYING - - README* -snapshot: - name_template: SNAPSHOT-{{ .Commit }} -checksum: - name_template: '{{ .ProjectName }}-{{ .Version }}-checksums.txt' diff --git a/vendor/github.com/alecthomas/chroma/v2/Bitfile b/vendor/github.com/alecthomas/chroma/v2/Bitfile deleted file mode 100644 index bf158633a1c77d28d2d064e94bb2223f8f3f5a61..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/Bitfile +++ /dev/null @@ -1,24 +0,0 @@ -VERSION = %(git describe --tags --dirty --always)% -export CGOENABLED = 0 - -tokentype_enumer.go: types.go - build: go generate - -# Regenerate the list of lexers in the README -README.md: lexers/*.go lexers/*/*.xml table.py - build: ./table.py - -clean - -implicit %{1}%{2}.min.%{3}: **/*.{css,js} - build: esbuild --bundle %{IN} --minify --outfile=%{OUT} - -implicit build/%{1}: cmd/* - cd cmd/%{1} - inputs: cmd/%{1}/**/* **/*.go - build: go build -ldflags="-X 'main.version=%{VERSION}'" -o ../../build/%{1} . - -#upload: chromad -# build: -# scp chromad root@swapoff.org: -# ssh root@swapoff.org 'install -m755 ./chromad /srv/http/swapoff.org/bin && service chromad restart' -# touch upload diff --git a/vendor/github.com/alecthomas/chroma/v2/COPYING b/vendor/github.com/alecthomas/chroma/v2/COPYING deleted file mode 100644 index 92dc39f709123ccec3123d152f2e8e6126eabd7f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/COPYING +++ /dev/null @@ -1,19 +0,0 @@ -Copyright (C) 2017 Alec Thomas - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies -of the Software, and to permit persons to whom the Software is furnished to do -so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/vendor/github.com/alecthomas/chroma/v2/Makefile b/vendor/github.com/alecthomas/chroma/v2/Makefile deleted file mode 100644 index e2ff762e67d5984f09eb1dc21ba863d9a05629ce..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -.PHONY: chromad upload all - -VERSION ?= $(shell git describe --tags --dirty --always) -export GOOS ?= linux -export GOARCH ?= amd64 - -all: README.md tokentype_string.go - -README.md: lexers/*/*.go - ./table.py - -tokentype_string.go: types.go - go generate - -chromad: - rm -rf build - esbuild --bundle cmd/chromad/static/index.js --minify --outfile=cmd/chromad/static/index.min.js - esbuild --bundle cmd/chromad/static/index.css --minify --outfile=cmd/chromad/static/index.min.css - (export CGOENABLED=0 ; cd ./cmd/chromad && go build -ldflags="-X 'main.version=$(VERSION)'" -o ../../build/chromad .) - -upload: build/chromad - scp build/chromad root@swapoff.org: && \ - ssh root@swapoff.org 'install -m755 ./chromad /srv/http/swapoff.org/bin && service chromad restart' diff --git a/vendor/github.com/alecthomas/chroma/v2/README.md b/vendor/github.com/alecthomas/chroma/v2/README.md deleted file mode 100644 index 735b556714bffba2ec8cc11696e8a6ba051e59db..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/README.md +++ /dev/null @@ -1,297 +0,0 @@ -# Chroma — A general purpose syntax highlighter in pure Go - -[](https://godoc.org/github.com/alecthomas/chroma) [](https://github.com/alecthomas/chroma/actions/workflows/ci.yml) [](https://invite.slack.golangbridge.org/) - -Chroma takes source code and other structured text and converts it into syntax -highlighted HTML, ANSI-coloured text, etc. - -Chroma is based heavily on [Pygments](http://pygments.org/), and includes -translators for Pygments lexers and styles. - -## Table of Contents - - - -1. [Supported languages](#supported-languages) -2. [Try it](#try-it) -3. [Using the library](#using-the-library) - 1. [Quick start](#quick-start) - 2. [Identifying the language](#identifying-the-language) - 3. [Formatting the output](#formatting-the-output) - 4. [The HTML formatter](#the-html-formatter) -4. [More detail](#more-detail) - 1. [Lexers](#lexers) - 2. [Formatters](#formatters) - 3. [Styles](#styles) -5. [Command-line interface](#command-line-interface) -6. [Testing lexers](#testing-lexers) -7. [What's missing compared to Pygments?](#whats-missing-compared-to-pygments) - - - -## Supported languages - -| Prefix | Language | -| :----: | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| A | ABAP, ABNF, ActionScript, ActionScript 3, Ada, Agda, AL, Alloy, Angular2, ANTLR, ApacheConf, APL, AppleScript, ArangoDB AQL, Arduino, ArmAsm, AutoHotkey, AutoIt, Awk | -| B | Ballerina, Bash, Bash Session, Batchfile, BibTeX, Bicep, BlitzBasic, BNF, BQN, Brainfuck | -| C | C, C#, C++, Caddyfile, Caddyfile Directives, Cap'n Proto, Cassandra CQL, Ceylon, CFEngine3, cfstatement, ChaiScript, Chapel, Cheetah, Clojure, CMake, COBOL, CoffeeScript, Common Lisp, Coq, Crystal, CSS, Cython | -| D | D, Dart, Dax, Desktop Entry, Diff, Django/Jinja, dns, Docker, DTD, Dylan | -| E | EBNF, Elixir, Elm, EmacsLisp, Erlang | -| F | Factor, Fennel, Fish, Forth, Fortran, FortranFixed, FSharp | -| G | GAS, GDScript, Genshi, Genshi HTML, Genshi Text, Gherkin, Gleam, GLSL, Gnuplot, Go, Go HTML Template, Go Text Template, GraphQL, Groff, Groovy | -| H | Handlebars, Hare, Haskell, Haxe, HCL, Hexdump, HLB, HLSL, HolyC, HTML, HTTP, Hy | -| I | Idris, Igor, INI, Io, ISCdhcpd | -| J | J, Java, JavaScript, JSON, Jsonnet, Julia, Jungle | -| K | Kotlin | -| L | Lighttpd configuration file, LLVM, Lua | -| M | Makefile, Mako, markdown, Mason, Materialize SQL dialect, Mathematica, Matlab, MCFunction, Meson, Metal, MiniZinc, MLIR, Modula-2, MonkeyC, MorrowindScript, Myghty, MySQL | -| N | NASM, Natural, Newspeak, Nginx configuration file, Nim, Nix, NSIS | -| O | Objective-C, OCaml, Octave, Odin, OnesEnterprise, OpenEdge ABL, OpenSCAD, Org Mode | -| P | PacmanConf, Perl, PHP, PHTML, Pig, PkgConfig, PL/pgSQL, plaintext, Plutus Core, Pony, PostgreSQL SQL dialect, PostScript, POVRay, PowerQuery, PowerShell, Prolog, PromQL, Promela, properties, Protocol Buffer, PRQL, PSL, Puppet, Python, Python 2 | -| Q | QBasic, QML | -| R | R, Racket, Ragel, Raku, react, ReasonML, reg, Rego, reStructuredText, Rexx, RPMSpec, Ruby, Rust | -| S | SAS, Sass, Scala, Scheme, Scilab, SCSS, Sed, Sieve, Smali, Smalltalk, Smarty, SNBT, Snobol, Solidity, SourcePawn, SPARQL, SQL, SquidConf, Standard ML, stas, Stylus, Svelte, Swift, SYSTEMD, systemverilog | -| T | TableGen, Tal, TASM, Tcl, Tcsh, Termcap, Terminfo, Terraform, TeX, Thrift, TOML, TradingView, Transact-SQL, Turing, Turtle, Twig, TypeScript, TypoScript, TypoScriptCssData, TypoScriptHtmlData, Typst | -| V | V, V shell, Vala, VB.net, verilog, VHDL, VHS, VimL, vue | -| W | WDTE, WebGPU Shading Language, Whiley | -| X | XML, Xorg | -| Y | YAML, YANG | -| Z | Z80 Assembly, Zed, Zig | - -_I will attempt to keep this section up to date, but an authoritative list can be -displayed with `chroma --list`._ - -## Try it - -Try out various languages and styles on the [Chroma Playground](https://swapoff.org/chroma/playground/). - -## Using the library - -This is version 2 of Chroma, use the import path: - -```go -import "github.com/alecthomas/chroma/v2" -``` - -Chroma, like Pygments, has the concepts of -[lexers](https://github.com/alecthomas/chroma/tree/master/lexers), -[formatters](https://github.com/alecthomas/chroma/tree/master/formatters) and -[styles](https://github.com/alecthomas/chroma/tree/master/styles). - -Lexers convert source text into a stream of tokens, styles specify how token -types are mapped to colours, and formatters convert tokens and styles into -formatted output. - -A package exists for each of these, containing a global `Registry` variable -with all of the registered implementations. There are also helper functions -for using the registry in each package, such as looking up lexers by name or -matching filenames, etc. - -In all cases, if a lexer, formatter or style can not be determined, `nil` will -be returned. In this situation you may want to default to the `Fallback` -value in each respective package, which provides sane defaults. - -### Quick start - -A convenience function exists that can be used to simply format some source -text, without any effort: - -```go -err := quick.Highlight(os.Stdout, someSourceCode, "go", "html", "monokai") -``` - -### Identifying the language - -To highlight code, you'll first have to identify what language the code is -written in. There are three primary ways to do that: - -1. Detect the language from its filename. - - ```go - lexer := lexers.Match("foo.go") - ``` - -2. Explicitly specify the language by its Chroma syntax ID (a full list is available from `lexers.Names()`). - - ```go - lexer := lexers.Get("go") - ``` - -3. Detect the language from its content. - - ```go - lexer := lexers.Analyse("package main\n\nfunc main()\n{\n}\n") - ``` - -In all cases, `nil` will be returned if the language can not be identified. - -```go -if lexer == nil { - lexer = lexers.Fallback -} -``` - -At this point, it should be noted that some lexers can be extremely chatty. To -mitigate this, you can use the coalescing lexer to coalesce runs of identical -token types into a single token: - -```go -lexer = chroma.Coalesce(lexer) -``` - -### Formatting the output - -Once a language is identified you will need to pick a formatter and a style (theme). - -```go -style := styles.Get("swapoff") -if style == nil { - style = styles.Fallback -} -formatter := formatters.Get("html") -if formatter == nil { - formatter = formatters.Fallback -} -``` - -Then obtain an iterator over the tokens: - -```go -contents, err := ioutil.ReadAll(r) -iterator, err := lexer.Tokenise(nil, string(contents)) -``` - -And finally, format the tokens from the iterator: - -```go -err := formatter.Format(w, style, iterator) -``` - -### The HTML formatter - -By default the `html` registered formatter generates standalone HTML with -embedded CSS. More flexibility is available through the `formatters/html` package. - -Firstly, the output generated by the formatter can be customised with the -following constructor options: - -- `Standalone()` - generate standalone HTML with embedded CSS. -- `WithClasses()` - use classes rather than inlined style attributes. -- `ClassPrefix(prefix)` - prefix each generated CSS class. -- `TabWidth(width)` - Set the rendered tab width, in characters. -- `WithLineNumbers()` - Render line numbers (style with `LineNumbers`). -- `WithLinkableLineNumbers()` - Make the line numbers linkable and be a link to themselves. -- `HighlightLines(ranges)` - Highlight lines in these ranges (style with `LineHighlight`). -- `LineNumbersInTable()` - Use a table for formatting line numbers and code, rather than spans. - -If `WithClasses()` is used, the corresponding CSS can be obtained from the formatter with: - -```go -formatter := html.New(html.WithClasses(true)) -err := formatter.WriteCSS(w, style) -``` - -## More detail - -### Lexers - -See the [Pygments documentation](http://pygments.org/docs/lexerdevelopment/) -for details on implementing lexers. Most concepts apply directly to Chroma, -but see existing lexer implementations for real examples. - -In many cases lexers can be automatically converted directly from Pygments by -using the included Python 3 script `pygments2chroma_xml.py`. I use something like -the following: - -```sh -python3 _tools/pygments2chroma_xml.py \ - pygments.lexers.jvm.KotlinLexer \ - > lexers/embedded/kotlin.xml -``` - -See notes in [pygments-lexers.txt](https://github.com/alecthomas/chroma/blob/master/pygments-lexers.txt) -for a list of lexers, and notes on some of the issues importing them. - -### Formatters - -Chroma supports HTML output, as well as terminal output in 8 colour, 256 colour, and true-colour. - -A `noop` formatter is included that outputs the token text only, and a `tokens` -formatter outputs raw tokens. The latter is useful for debugging lexers. - -### Styles - -Chroma styles are defined in XML. The style entries use the -[same syntax](http://pygments.org/docs/styles/) as Pygments. - -All Pygments styles have been converted to Chroma using the `_tools/style.py` -script. - -When you work with one of [Chroma's styles](https://github.com/alecthomas/chroma/tree/master/styles), -know that the `Background` token type provides the default style for tokens. It does so -by defining a foreground color and background color. - -For example, this gives each token name not defined in the style a default color -of `#f8f8f8` and uses `#000000` for the highlighted code block's background: - -```xml -
-``` - -Also, token types in a style file are hierarchical. For instance, when `CommentSpecial` is not defined, Chroma uses the token style from `Comment`. So when several comment tokens use the same color, you'll only need to define `Comment` and override the one that has a different color. - -For a quick overview of the available styles and how they look, check out the [Chroma Style Gallery](https://xyproto.github.io/splash/docs/). - -## Command-line interface - -A command-line interface to Chroma is included. - -Binaries are available to install from [the releases page](https://github.com/alecthomas/chroma/releases). - -The CLI can be used as a preprocessor to colorise output of `less(1)`, -see documentation for the `LESSOPEN` environment variable. - -The `--fail` flag can be used to suppress output and return with exit status -1 to facilitate falling back to some other preprocessor in case chroma -does not resolve a specific lexer to use for the given file. For example: - -```shell -export LESSOPEN='| p() { chroma --fail "$1" || cat "$1"; }; p "%s"' -``` - -Replace `cat` with your favourite fallback preprocessor. - -When invoked as `.lessfilter`, the `--fail` flag is automatically turned -on under the hood for easy integration with [lesspipe shipping with -Debian and derivatives](https://manpages.debian.org/lesspipe#USER_DEFINED_FILTERS); -for that setup the `chroma` executable can be just symlinked to `~/.lessfilter`. - -## Testing lexers - -If you edit some lexers and want to try it, open a shell in `cmd/chromad` and run: - -```shell -go run . --csrf-key=securekey -``` - -A Link will be printed. Open it in your Browser. Now you can test on the Playground with your local changes. - -If you want to run the tests and the lexers, open a shell in the root directory and run: - -```shell -go test ./lexers -``` - -When updating or adding a lexer, please add tests. See [lexers/README.md](lexers/README.md) for more. - -## What's missing compared to Pygments? - -- Quite a few lexers, for various reasons (pull-requests welcome): - - Pygments lexers for complex languages often include custom code to - handle certain aspects, such as Raku's ability to nest code inside - regular expressions. These require time and effort to convert. - - I mostly only converted languages I had heard of, to reduce the porting cost. -- Some more esoteric features of Pygments are omitted for simplicity. -- Though the Chroma API supports content detection, very few languages support them. - I have plans to implement a statistical analyser at some point, but not enough time. diff --git a/vendor/github.com/alecthomas/chroma/v2/coalesce.go b/vendor/github.com/alecthomas/chroma/v2/coalesce.go deleted file mode 100644 index f5048951a290beeb85ac54abec83ac0f218d2060..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/coalesce.go +++ /dev/null @@ -1,35 +0,0 @@ -package chroma - -// Coalesce is a Lexer interceptor that collapses runs of common types into a single token. -func Coalesce(lexer Lexer) Lexer { return &coalescer{lexer} } - -type coalescer struct{ Lexer } - -func (d *coalescer) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { - var prev Token - it, err := d.Lexer.Tokenise(options, text) - if err != nil { - return nil, err - } - return func() Token { - for token := it(); token != (EOF); token = it() { - if len(token.Value) == 0 { - continue - } - if prev == EOF { - prev = token - } else { - if prev.Type == token.Type && len(prev.Value) < 8192 { - prev.Value += token.Value - } else { - out := prev - prev = token - return out - } - } - } - out := prev - prev = EOF - return out - }, nil -} diff --git a/vendor/github.com/alecthomas/chroma/v2/colour.go b/vendor/github.com/alecthomas/chroma/v2/colour.go deleted file mode 100644 index e33d01060997844e9c2566f10849d4d57ac7d1ae..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/colour.go +++ /dev/null @@ -1,192 +0,0 @@ -package chroma - -import ( - "fmt" - "math" - "strconv" - "strings" -) - -// ANSI2RGB maps ANSI colour names, as supported by Chroma, to hex RGB values. -var ANSI2RGB = map[string]string{ - "#ansiblack": "000000", - "#ansidarkred": "7f0000", - "#ansidarkgreen": "007f00", - "#ansibrown": "7f7fe0", - "#ansidarkblue": "00007f", - "#ansipurple": "7f007f", - "#ansiteal": "007f7f", - "#ansilightgray": "e5e5e5", - // Normal - "#ansidarkgray": "555555", - "#ansired": "ff0000", - "#ansigreen": "00ff00", - "#ansiyellow": "ffff00", - "#ansiblue": "0000ff", - "#ansifuchsia": "ff00ff", - "#ansiturquoise": "00ffff", - "#ansiwhite": "ffffff", - - // Aliases without the "ansi" prefix, because...why? - "#black": "000000", - "#darkred": "7f0000", - "#darkgreen": "007f00", - "#brown": "7f7fe0", - "#darkblue": "00007f", - "#purple": "7f007f", - "#teal": "007f7f", - "#lightgray": "e5e5e5", - // Normal - "#darkgray": "555555", - "#red": "ff0000", - "#green": "00ff00", - "#yellow": "ffff00", - "#blue": "0000ff", - "#fuchsia": "ff00ff", - "#turquoise": "00ffff", - "#white": "ffffff", -} - -// Colour represents an RGB colour. -type Colour int32 - -// NewColour creates a Colour directly from RGB values. -func NewColour(r, g, b uint8) Colour { - return ParseColour(fmt.Sprintf("%02x%02x%02x", r, g, b)) -} - -// Distance between this colour and another. -// -// This uses the approach described here (https://www.compuphase.com/cmetric.htm). -// This is not as accurate as LAB, et. al. but is *vastly* simpler and sufficient for our needs. -func (c Colour) Distance(e2 Colour) float64 { - ar, ag, ab := int64(c.Red()), int64(c.Green()), int64(c.Blue()) - br, bg, bb := int64(e2.Red()), int64(e2.Green()), int64(e2.Blue()) - rmean := (ar + br) / 2 - r := ar - br - g := ag - bg - b := ab - bb - return math.Sqrt(float64((((512 + rmean) * r * r) >> 8) + 4*g*g + (((767 - rmean) * b * b) >> 8))) -} - -// Brighten returns a copy of this colour with its brightness adjusted. -// -// If factor is negative, the colour is darkened. -// -// Uses approach described here (http://www.pvladov.com/2012/09/make-color-lighter-or-darker.html). -func (c Colour) Brighten(factor float64) Colour { - r := float64(c.Red()) - g := float64(c.Green()) - b := float64(c.Blue()) - - if factor < 0 { - factor++ - r *= factor - g *= factor - b *= factor - } else { - r = (255-r)*factor + r - g = (255-g)*factor + g - b = (255-b)*factor + b - } - return NewColour(uint8(r), uint8(g), uint8(b)) -} - -// BrightenOrDarken brightens a colour if it is < 0.5 brightness or darkens if > 0.5 brightness. -func (c Colour) BrightenOrDarken(factor float64) Colour { - if c.Brightness() < 0.5 { - return c.Brighten(factor) - } - return c.Brighten(-factor) -} - -// ClampBrightness returns a copy of this colour with its brightness adjusted such that -// it falls within the range [min, max] (or very close to it due to rounding errors). -// The supplied values use the same [0.0, 1.0] range as Brightness. -func (c Colour) ClampBrightness(min, max float64) Colour { - if !c.IsSet() { - return c - } - - min = math.Max(min, 0) - max = math.Min(max, 1) - current := c.Brightness() - target := math.Min(math.Max(current, min), max) - if current == target { - return c - } - - r := float64(c.Red()) - g := float64(c.Green()) - b := float64(c.Blue()) - rgb := r + g + b - if target > current { - // Solve for x: target == ((255-r)*x + r + (255-g)*x + g + (255-b)*x + b) / 255 / 3 - return c.Brighten((target*255*3 - rgb) / (255*3 - rgb)) - } - // Solve for x: target == (r*(x+1) + g*(x+1) + b*(x+1)) / 255 / 3 - return c.Brighten((target*255*3)/rgb - 1) -} - -// Brightness of the colour (roughly) in the range 0.0 to 1.0. -func (c Colour) Brightness() float64 { - return (float64(c.Red()) + float64(c.Green()) + float64(c.Blue())) / 255.0 / 3.0 -} - -// ParseColour in the forms #rgb, #rrggbb, #ansi , or # . -// Will return an "unset" colour if invalid. -func ParseColour(colour string) Colour { - colour = normaliseColour(colour) - n, err := strconv.ParseUint(colour, 16, 32) - if err != nil { - return 0 - } - return Colour(n + 1) //nolint:gosec -} - -// MustParseColour is like ParseColour except it panics if the colour is invalid. -// -// Will panic if colour is in an invalid format. -func MustParseColour(colour string) Colour { - parsed := ParseColour(colour) - if !parsed.IsSet() { - panic(fmt.Errorf("invalid colour %q", colour)) - } - return parsed -} - -// IsSet returns true if the colour is set. -func (c Colour) IsSet() bool { return c != 0 } - -func (c Colour) String() string { return fmt.Sprintf("#%06x", int(c-1)) } -func (c Colour) GoString() string { return fmt.Sprintf("Colour(0x%06x)", int(c-1)) } - -// Red component of colour. -func (c Colour) Red() uint8 { return uint8(((c - 1) >> 16) & 0xff) } //nolint:gosec - -// Green component of colour. -func (c Colour) Green() uint8 { return uint8(((c - 1) >> 8) & 0xff) } //nolint:gosec - -// Blue component of colour. -func (c Colour) Blue() uint8 { return uint8((c - 1) & 0xff) } //nolint:gosec - -// Colours is an orderable set of colours. -type Colours []Colour - -func (c Colours) Len() int { return len(c) } -func (c Colours) Swap(i, j int) { c[i], c[j] = c[j], c[i] } -func (c Colours) Less(i, j int) bool { return c[i] < c[j] } - -// Convert colours to #rrggbb. -func normaliseColour(colour string) string { - if ansi, ok := ANSI2RGB[colour]; ok { - return ansi - } - if strings.HasPrefix(colour, "#") { - colour = colour[1:] - if len(colour) == 3 { - return colour[0:1] + colour[0:1] + colour[1:2] + colour[1:2] + colour[2:3] + colour[2:3] - } - } - return colour -} diff --git a/vendor/github.com/alecthomas/chroma/v2/delegate.go b/vendor/github.com/alecthomas/chroma/v2/delegate.go deleted file mode 100644 index f848194f682fa5a86d15e2b538d4335a7cbc5c0c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/delegate.go +++ /dev/null @@ -1,152 +0,0 @@ -package chroma - -import ( - "bytes" -) - -type delegatingLexer struct { - root Lexer - language Lexer -} - -// DelegatingLexer combines two lexers to handle the common case of a language embedded inside another, such as PHP -// inside HTML or PHP inside plain text. -// -// It takes two lexer as arguments: a root lexer and a language lexer. First everything is scanned using the language -// lexer, which must return "Other" for unrecognised tokens. Then all "Other" tokens are lexed using the root lexer. -// Finally, these two sets of tokens are merged. -// -// The lexers from the template lexer package use this base lexer. -func DelegatingLexer(root Lexer, language Lexer) Lexer { - return &delegatingLexer{ - root: root, - language: language, - } -} - -func (d *delegatingLexer) AnalyseText(text string) float32 { - return d.root.AnalyseText(text) -} - -func (d *delegatingLexer) SetAnalyser(analyser func(text string) float32) Lexer { - d.root.SetAnalyser(analyser) - return d -} - -func (d *delegatingLexer) SetRegistry(r *LexerRegistry) Lexer { - d.root.SetRegistry(r) - d.language.SetRegistry(r) - return d -} - -func (d *delegatingLexer) Config() *Config { - return d.language.Config() -} - -// An insertion is the character range where language tokens should be inserted. -type insertion struct { - start, end int - tokens []Token -} - -func (d *delegatingLexer) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { // nolint: gocognit - tokens, err := Tokenise(Coalesce(d.language), options, text) - if err != nil { - return nil, err - } - // Compute insertions and gather "Other" tokens. - others := &bytes.Buffer{} - insertions := []*insertion{} - var insert *insertion - offset := 0 - var last Token - for _, t := range tokens { - if t.Type == Other { - if last != EOF && insert != nil && last.Type != Other { - insert.end = offset - } - others.WriteString(t.Value) - } else { - if last == EOF || last.Type == Other { - insert = &insertion{start: offset} - insertions = append(insertions, insert) - } - insert.tokens = append(insert.tokens, t) - } - last = t - offset += len(t.Value) - } - - if len(insertions) == 0 { - return d.root.Tokenise(options, text) - } - - // Lex the other tokens. - rootTokens, err := Tokenise(Coalesce(d.root), options, others.String()) - if err != nil { - return nil, err - } - - // Interleave the two sets of tokens. - var out []Token - offset = 0 // Offset into text. - tokenIndex := 0 - nextToken := func() Token { - if tokenIndex >= len(rootTokens) { - return EOF - } - t := rootTokens[tokenIndex] - tokenIndex++ - return t - } - insertionIndex := 0 - nextInsertion := func() *insertion { - if insertionIndex >= len(insertions) { - return nil - } - i := insertions[insertionIndex] - insertionIndex++ - return i - } - t := nextToken() - i := nextInsertion() - for t != EOF || i != nil { - // fmt.Printf("%d->%d:%q %d->%d:%q\n", offset, offset+len(t.Value), t.Value, i.start, i.end, Stringify(i.tokens...)) - if t == EOF || (i != nil && i.start < offset+len(t.Value)) { - var l Token - l, t = splitToken(t, i.start-offset) - if l != EOF { - out = append(out, l) - offset += len(l.Value) - } - out = append(out, i.tokens...) - offset += i.end - i.start - if t == EOF { - t = nextToken() - } - i = nextInsertion() - } else { - out = append(out, t) - offset += len(t.Value) - t = nextToken() - } - } - return Literator(out...), nil -} - -func splitToken(t Token, offset int) (l Token, r Token) { - if t == EOF { - return EOF, EOF - } - if offset == 0 { - return EOF, t - } - if offset == len(t.Value) { - return t, EOF - } - l = t.Clone() - r = t.Clone() - l.Value = l.Value[:offset] - r.Value = r.Value[offset:] - return -} diff --git a/vendor/github.com/alecthomas/chroma/v2/doc.go b/vendor/github.com/alecthomas/chroma/v2/doc.go deleted file mode 100644 index 4dde77c8188432966eeb564857af926c8de07aa1..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/doc.go +++ /dev/null @@ -1,7 +0,0 @@ -// Package chroma takes source code and other structured text and converts it into syntax highlighted HTML, ANSI- -// coloured text, etc. -// -// Chroma is based heavily on Pygments, and includes translators for Pygments lexers and styles. -// -// For more information, go here: https://github.com/alecthomas/chroma -package chroma diff --git a/vendor/github.com/alecthomas/chroma/v2/emitters.go b/vendor/github.com/alecthomas/chroma/v2/emitters.go deleted file mode 100644 index 0788b5b21f55d3113f35e47c26c20085fc4c115d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/emitters.go +++ /dev/null @@ -1,218 +0,0 @@ -package chroma - -import ( - "fmt" -) - -// An Emitter takes group matches and returns tokens. -type Emitter interface { - // Emit tokens for the given regex groups. - Emit(groups []string, state *LexerState) Iterator -} - -// SerialisableEmitter is an Emitter that can be serialised and deserialised to/from JSON. -type SerialisableEmitter interface { - Emitter - EmitterKind() string -} - -// EmitterFunc is a function that is an Emitter. -type EmitterFunc func(groups []string, state *LexerState) Iterator - -// Emit tokens for groups. -func (e EmitterFunc) Emit(groups []string, state *LexerState) Iterator { - return e(groups, state) -} - -type Emitters []Emitter - -type byGroupsEmitter struct { - Emitters -} - -// ByGroups emits a token for each matching group in the rule's regex. -func ByGroups(emitters ...Emitter) Emitter { - return &byGroupsEmitter{Emitters: emitters} -} - -func (b *byGroupsEmitter) EmitterKind() string { return "bygroups" } - -func (b *byGroupsEmitter) Emit(groups []string, state *LexerState) Iterator { - iterators := make([]Iterator, 0, len(groups)-1) - if len(b.Emitters) != len(groups)-1 { - iterators = append(iterators, Error.Emit(groups, state)) - // panic(errors.Errorf("number of groups %q does not match number of emitters %v", groups, emitters)) - } else { - for i, group := range groups[1:] { - if b.Emitters[i] != nil { - iterators = append(iterators, b.Emitters[i].Emit([]string{group}, state)) - } - } - } - return Concaterator(iterators...) -} - -// ByGroupNames emits a token for each named matching group in the rule's regex. -func ByGroupNames(emitters map[string]Emitter) Emitter { - return EmitterFunc(func(groups []string, state *LexerState) Iterator { - iterators := make([]Iterator, 0, len(state.NamedGroups)-1) - if len(state.NamedGroups)-1 == 0 { - if emitter, ok := emitters[`0`]; ok { - iterators = append(iterators, emitter.Emit(groups, state)) - } else { - iterators = append(iterators, Error.Emit(groups, state)) - } - } else { - ruleRegex := state.Rules[state.State][state.Rule].Regexp - for i := 1; i < len(state.NamedGroups); i++ { - groupName := ruleRegex.GroupNameFromNumber(i) - group := state.NamedGroups[groupName] - if emitter, ok := emitters[groupName]; ok { - if emitter != nil { - iterators = append(iterators, emitter.Emit([]string{group}, state)) - } - } else { - iterators = append(iterators, Error.Emit([]string{group}, state)) - } - } - } - return Concaterator(iterators...) - }) -} - -// UsingByGroup emits tokens for the matched groups in the regex using a -// sublexer. Used when lexing code blocks where the name of a sublexer is -// contained within the block, for example on a Markdown text block or SQL -// language block. -// -// An attempt to load the sublexer will be made using the captured value from -// the text of the matched sublexerNameGroup. If a sublexer matching the -// sublexerNameGroup is available, then tokens for the matched codeGroup will -// be emitted using the sublexer. Otherwise, if no sublexer is available, then -// tokens will be emitted from the passed emitter. -// -// Example: -// -// var Markdown = internal.Register(MustNewLexer( -// &Config{ -// Name: "markdown", -// Aliases: []string{"md", "mkd"}, -// Filenames: []string{"*.md", "*.mkd", "*.markdown"}, -// MimeTypes: []string{"text/x-markdown"}, -// }, -// Rules{ -// "root": { -// {"^(```)(\\w+)(\\n)([\\w\\W]*?)(^```$)", -// UsingByGroup( -// 2, 4, -// String, String, String, Text, String, -// ), -// nil, -// }, -// }, -// }, -// )) -// -// See the lexers/markdown.go for the complete example. -// -// Note: panic's if the number of emitters does not equal the number of matched -// groups in the regex. -func UsingByGroup(sublexerNameGroup, codeGroup int, emitters ...Emitter) Emitter { - return &usingByGroup{ - SublexerNameGroup: sublexerNameGroup, - CodeGroup: codeGroup, - Emitters: emitters, - } -} - -type usingByGroup struct { - SublexerNameGroup int `xml:"sublexer_name_group"` - CodeGroup int `xml:"code_group"` - Emitters Emitters `xml:"emitters"` -} - -func (u *usingByGroup) EmitterKind() string { return "usingbygroup" } -func (u *usingByGroup) Emit(groups []string, state *LexerState) Iterator { - // bounds check - if len(u.Emitters) != len(groups)-1 { - panic("UsingByGroup expects number of emitters to be the same as len(groups)-1") - } - - // grab sublexer - sublexer := state.Registry.Get(groups[u.SublexerNameGroup]) - - // build iterators - iterators := make([]Iterator, len(groups)-1) - for i, group := range groups[1:] { - if i == u.CodeGroup-1 && sublexer != nil { - var err error - iterators[i], err = sublexer.Tokenise(nil, groups[u.CodeGroup]) - if err != nil { - panic(err) - } - } else if u.Emitters[i] != nil { - iterators[i] = u.Emitters[i].Emit([]string{group}, state) - } - } - return Concaterator(iterators...) -} - -// UsingLexer returns an Emitter that uses a given Lexer for parsing and emitting. -// -// This Emitter is not serialisable. -func UsingLexer(lexer Lexer) Emitter { - return EmitterFunc(func(groups []string, _ *LexerState) Iterator { - it, err := lexer.Tokenise(&TokeniseOptions{State: "root", Nested: true}, groups[0]) - if err != nil { - panic(err) - } - return it - }) -} - -type usingEmitter struct { - Lexer string `xml:"lexer,attr"` -} - -func (u *usingEmitter) EmitterKind() string { return "using" } - -func (u *usingEmitter) Emit(groups []string, state *LexerState) Iterator { - if state.Registry == nil { - panic(fmt.Sprintf("no LexerRegistry available for Using(%q)", u.Lexer)) - } - lexer := state.Registry.Get(u.Lexer) - if lexer == nil { - panic(fmt.Sprintf("no such lexer %q", u.Lexer)) - } - it, err := lexer.Tokenise(&TokeniseOptions{State: "root", Nested: true}, groups[0]) - if err != nil { - panic(err) - } - return it -} - -// Using returns an Emitter that uses a given Lexer reference for parsing and emitting. -// -// The referenced lexer must be stored in the same LexerRegistry. -func Using(lexer string) Emitter { - return &usingEmitter{Lexer: lexer} -} - -type usingSelfEmitter struct { - State string `xml:"state,attr"` -} - -func (u *usingSelfEmitter) EmitterKind() string { return "usingself" } - -func (u *usingSelfEmitter) Emit(groups []string, state *LexerState) Iterator { - it, err := state.Lexer.Tokenise(&TokeniseOptions{State: u.State, Nested: true}, groups[0]) - if err != nil { - panic(err) - } - return it -} - -// UsingSelf is like Using, but uses the current Lexer. -func UsingSelf(stateName string) Emitter { - return &usingSelfEmitter{stateName} -} diff --git a/vendor/github.com/alecthomas/chroma/v2/formatter.go b/vendor/github.com/alecthomas/chroma/v2/formatter.go deleted file mode 100644 index 00dd5d8df8af9d2678fe4bdf78f9d4fd922cd29b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/formatter.go +++ /dev/null @@ -1,43 +0,0 @@ -package chroma - -import ( - "io" -) - -// A Formatter for Chroma lexers. -type Formatter interface { - // Format returns a formatting function for tokens. - // - // If the iterator panics, the Formatter should recover. - Format(w io.Writer, style *Style, iterator Iterator) error -} - -// A FormatterFunc is a Formatter implemented as a function. -// -// Guards against iterator panics. -type FormatterFunc func(w io.Writer, style *Style, iterator Iterator) error - -func (f FormatterFunc) Format(w io.Writer, s *Style, it Iterator) (err error) { // nolint - defer func() { - if perr := recover(); perr != nil { - err = perr.(error) - } - }() - return f(w, s, it) -} - -type recoveringFormatter struct { - Formatter -} - -func (r recoveringFormatter) Format(w io.Writer, s *Style, it Iterator) (err error) { - defer func() { - if perr := recover(); perr != nil { - err = perr.(error) - } - }() - return r.Formatter.Format(w, s, it) -} - -// RecoveringFormatter wraps a formatter with panic recovery. -func RecoveringFormatter(formatter Formatter) Formatter { return recoveringFormatter{formatter} } diff --git a/vendor/github.com/alecthomas/chroma/v2/formatters/api.go b/vendor/github.com/alecthomas/chroma/v2/formatters/api.go deleted file mode 100644 index 9ca0d01ddc10166607959745c91c4cc3f5e9383d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/formatters/api.go +++ /dev/null @@ -1,57 +0,0 @@ -package formatters - -import ( - "io" - "sort" - - "github.com/alecthomas/chroma/v2" - "github.com/alecthomas/chroma/v2/formatters/html" - "github.com/alecthomas/chroma/v2/formatters/svg" -) - -var ( - // NoOp formatter. - NoOp = Register("noop", chroma.FormatterFunc(func(w io.Writer, s *chroma.Style, iterator chroma.Iterator) error { - for t := iterator(); t != chroma.EOF; t = iterator() { - if _, err := io.WriteString(w, t.Value); err != nil { - return err - } - } - return nil - })) - // Default HTML formatter outputs self-contained HTML. - htmlFull = Register("html", html.New(html.Standalone(true), html.WithClasses(true))) // nolint - SVG = Register("svg", svg.New(svg.EmbedFont("Liberation Mono", svg.FontLiberationMono, svg.WOFF))) -) - -// Fallback formatter. -var Fallback = NoOp - -// Registry of Formatters. -var Registry = map[string]chroma.Formatter{} - -// Names of registered formatters. -func Names() []string { - out := []string{} - for name := range Registry { - out = append(out, name) - } - sort.Strings(out) - return out -} - -// Get formatter by name. -// -// If the given formatter is not found, the Fallback formatter will be returned. -func Get(name string) chroma.Formatter { - if f, ok := Registry[name]; ok { - return f - } - return Fallback -} - -// Register a named formatter. -func Register(name string, formatter chroma.Formatter) chroma.Formatter { - Registry[name] = formatter - return formatter -} diff --git a/vendor/github.com/alecthomas/chroma/v2/formatters/html/html.go b/vendor/github.com/alecthomas/chroma/v2/formatters/html/html.go deleted file mode 100644 index 92d784c2454bd51f066c70f3339cfd113661abcd..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/formatters/html/html.go +++ /dev/null @@ -1,623 +0,0 @@ -package html - -import ( - "fmt" - "html" - "io" - "sort" - "strconv" - "strings" - "sync" - - "github.com/alecthomas/chroma/v2" -) - -// Option sets an option of the HTML formatter. -type Option func(f *Formatter) - -// Standalone configures the HTML formatter for generating a standalone HTML document. -func Standalone(b bool) Option { return func(f *Formatter) { f.standalone = b } } - -// ClassPrefix sets the CSS class prefix. -func ClassPrefix(prefix string) Option { return func(f *Formatter) { f.prefix = prefix } } - -// WithClasses emits HTML using CSS classes, rather than inline styles. -func WithClasses(b bool) Option { return func(f *Formatter) { f.Classes = b } } - -// WithAllClasses disables an optimisation that omits redundant CSS classes. -func WithAllClasses(b bool) Option { return func(f *Formatter) { f.allClasses = b } } - -// WithCustomCSS sets user's custom CSS styles. -func WithCustomCSS(css map[chroma.TokenType]string) Option { - return func(f *Formatter) { - f.customCSS = css - } -} - -// TabWidth sets the number of characters for a tab. Defaults to 8. -func TabWidth(width int) Option { return func(f *Formatter) { f.tabWidth = width } } - -// PreventSurroundingPre prevents the surrounding pre tags around the generated code. -func PreventSurroundingPre(b bool) Option { - return func(f *Formatter) { - f.preventSurroundingPre = b - - if b { - f.preWrapper = nopPreWrapper - } else { - f.preWrapper = defaultPreWrapper - } - } -} - -// InlineCode creates inline code wrapped in a code tag. -func InlineCode(b bool) Option { - return func(f *Formatter) { - f.inlineCode = b - f.preWrapper = preWrapper{ - start: func(code bool, styleAttr string) string { - if code { - return fmt.Sprintf(` element. - // The code flag tells whether this block surrounds - // highlighted code. This will be false when surrounding - // line numbers. - Start(code bool, styleAttr string) string - - // End is called to write the end
element. - End(code bool) string -} - -type preWrapper struct { - start func(code bool, styleAttr string) string - end func(code bool) string -} - -func (p preWrapper) Start(code bool, styleAttr string) string { - return p.start(code, styleAttr) -} - -func (p preWrapper) End(code bool) string { - return p.end(code) -} - -var ( - nopPreWrapper = preWrapper{ - start: func(code bool, styleAttr string) string { return "" }, - end: func(code bool) string { return "" }, - } - defaultPreWrapper = preWrapper{ - start: func(code bool, styleAttr string) string { - if code { - return fmt.Sprintf(``, styleAttr) - } - - return fmt.Sprintf(`` - } - - return `` - }, - } -) - -// Formatter that generates HTML. -type Formatter struct { - styleCache *styleCache - standalone bool - prefix string - Classes bool // Exported field to detect when classes are being used - allClasses bool - customCSS map[chroma.TokenType]string - preWrapper PreWrapper - inlineCode bool - preventSurroundingPre bool - tabWidth int - wrapLongLines bool - lineNumbers bool - lineNumbersInTable bool - linkableLineNumbers bool - lineNumbersIDPrefix string - highlightRanges highlightRanges - baseLineNumber int -} - -type highlightRanges [][2]int - -func (h highlightRanges) Len() int { return len(h) } -func (h highlightRanges) Swap(i, j int) { h[i], h[j] = h[j], h[i] } -func (h highlightRanges) Less(i, j int) bool { return h[i][0] < h[j][0] } - -func (f *Formatter) Format(w io.Writer, style *chroma.Style, iterator chroma.Iterator) (err error) { - return f.writeHTML(w, style, iterator.Tokens()) -} - -// We deliberately don't use html/template here because it is two orders of magnitude slower (benchmarked). -// -// OTOH we need to be super careful about correct escaping... -func (f *Formatter) writeHTML(w io.Writer, style *chroma.Style, tokens []chroma.Token) (err error) { // nolint: gocyclo - css := f.styleCache.get(style, true) - if f.standalone { - fmt.Fprint(w, "\n") - if f.Classes { - fmt.Fprint(w, "") - } - fmt.Fprintf(w, "- fmt.Fprintf(w, " ", f.styleAttr(css, chroma.LineTable)) - fmt.Fprintf(w, " \n", escapeString(token.String()), lineLength, 1.2*float64(index)+0.25, length, style.Get(token.Type).Background.String()) - } - lineLength += length - } - } -} - -type FontFormat int - -// https://transfonter.org/formats -const ( - WOFF FontFormat = iota - WOFF2 - TRUETYPE -) - -var fontFormats = [...]string{ - "woff", - "woff2", - "truetype", -} - -func (f *Formatter) writeFontStyle(w io.Writer) { - fmt.Fprintf(w, ``, f.fontFamily, fontFormats[f.fontFormat], f.embeddedFont, fontFormats[f.fontFormat]) -} - -func (f *Formatter) styleAttr(styles map[chroma.TokenType]string, tt chroma.TokenType) string { - if _, ok := styles[tt]; !ok { - tt = tt.SubCategory() - if _, ok := styles[tt]; !ok { - tt = tt.Category() - if _, ok := styles[tt]; !ok { - return "" - } - } - } - return styles[tt] -} - -func (f *Formatter) styleToSVG(style *chroma.Style) map[chroma.TokenType]string { - converted := map[chroma.TokenType]string{} - bg := style.Get(chroma.Background) - // Convert the style. - for t := range chroma.StandardTypes { - entry := style.Get(t) - if t != chroma.Background { - entry = entry.Sub(bg) - } - if entry.IsZero() { - continue - } - converted[t] = StyleEntryToSVG(entry) - } - return converted -} - -// StyleEntryToSVG converts a chroma.StyleEntry to SVG attributes. -func StyleEntryToSVG(e chroma.StyleEntry) string { - var styles []string - - if e.Colour.IsSet() { - styles = append(styles, "fill=\""+e.Colour.String()+"\"") - } - if e.Bold == chroma.Yes { - styles = append(styles, "font-weight=\"bold\"") - } - if e.Italic == chroma.Yes { - styles = append(styles, "font-style=\"italic\"") - } - if e.Underline == chroma.Yes { - styles = append(styles, "text-decoration=\"underline\"") - } - return strings.Join(styles, " ") -} diff --git a/vendor/github.com/alecthomas/chroma/v2/formatters/tokens.go b/vendor/github.com/alecthomas/chroma/v2/formatters/tokens.go deleted file mode 100644 index 3bdd57ccfcba82aece493571ee327f1405774807..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/formatters/tokens.go +++ /dev/null @@ -1,18 +0,0 @@ -package formatters - -import ( - "fmt" - "io" - - "github.com/alecthomas/chroma/v2" -) - -// Tokens formatter outputs the raw token structures. -var Tokens = Register("tokens", chroma.FormatterFunc(func(w io.Writer, s *chroma.Style, it chroma.Iterator) error { - for t := it(); t != chroma.EOF; t = it() { - if _, err := fmt.Fprintln(w, t.GoString()); err != nil { - return err - } - } - return nil -})) diff --git a/vendor/github.com/alecthomas/chroma/v2/formatters/tty_indexed.go b/vendor/github.com/alecthomas/chroma/v2/formatters/tty_indexed.go deleted file mode 100644 index d48fb993cc72052f73ace4c04c66fac11f60bdeb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/formatters/tty_indexed.go +++ /dev/null @@ -1,284 +0,0 @@ -package formatters - -import ( - "io" - "math" - - "github.com/alecthomas/chroma/v2" -) - -type ttyTable struct { - foreground map[chroma.Colour]string - background map[chroma.Colour]string -} - -var c = chroma.MustParseColour - -var ttyTables = map[int]*ttyTable{ - 8: { - foreground: map[chroma.Colour]string{ - c("#000000"): "\033[30m", c("#7f0000"): "\033[31m", c("#007f00"): "\033[32m", c("#7f7fe0"): "\033[33m", - c("#00007f"): "\033[34m", c("#7f007f"): "\033[35m", c("#007f7f"): "\033[36m", c("#e5e5e5"): "\033[37m", - c("#555555"): "\033[1m\033[30m", c("#ff0000"): "\033[1m\033[31m", c("#00ff00"): "\033[1m\033[32m", c("#ffff00"): "\033[1m\033[33m", - c("#0000ff"): "\033[1m\033[34m", c("#ff00ff"): "\033[1m\033[35m", c("#00ffff"): "\033[1m\033[36m", c("#ffffff"): "\033[1m\033[37m", - }, - background: map[chroma.Colour]string{ - c("#000000"): "\033[40m", c("#7f0000"): "\033[41m", c("#007f00"): "\033[42m", c("#7f7fe0"): "\033[43m", - c("#00007f"): "\033[44m", c("#7f007f"): "\033[45m", c("#007f7f"): "\033[46m", c("#e5e5e5"): "\033[47m", - c("#555555"): "\033[1m\033[40m", c("#ff0000"): "\033[1m\033[41m", c("#00ff00"): "\033[1m\033[42m", c("#ffff00"): "\033[1m\033[43m", - c("#0000ff"): "\033[1m\033[44m", c("#ff00ff"): "\033[1m\033[45m", c("#00ffff"): "\033[1m\033[46m", c("#ffffff"): "\033[1m\033[47m", - }, - }, - 16: { - foreground: map[chroma.Colour]string{ - c("#000000"): "\033[30m", c("#7f0000"): "\033[31m", c("#007f00"): "\033[32m", c("#7f7fe0"): "\033[33m", - c("#00007f"): "\033[34m", c("#7f007f"): "\033[35m", c("#007f7f"): "\033[36m", c("#e5e5e5"): "\033[37m", - c("#555555"): "\033[90m", c("#ff0000"): "\033[91m", c("#00ff00"): "\033[92m", c("#ffff00"): "\033[93m", - c("#0000ff"): "\033[94m", c("#ff00ff"): "\033[95m", c("#00ffff"): "\033[96m", c("#ffffff"): "\033[97m", - }, - background: map[chroma.Colour]string{ - c("#000000"): "\033[40m", c("#7f0000"): "\033[41m", c("#007f00"): "\033[42m", c("#7f7fe0"): "\033[43m", - c("#00007f"): "\033[44m", c("#7f007f"): "\033[45m", c("#007f7f"): "\033[46m", c("#e5e5e5"): "\033[47m", - c("#555555"): "\033[100m", c("#ff0000"): "\033[101m", c("#00ff00"): "\033[102m", c("#ffff00"): "\033[103m", - c("#0000ff"): "\033[104m", c("#ff00ff"): "\033[105m", c("#00ffff"): "\033[106m", c("#ffffff"): "\033[107m", - }, - }, - 256: { - foreground: map[chroma.Colour]string{ - c("#000000"): "\033[38;5;0m", c("#800000"): "\033[38;5;1m", c("#008000"): "\033[38;5;2m", c("#808000"): "\033[38;5;3m", - c("#000080"): "\033[38;5;4m", c("#800080"): "\033[38;5;5m", c("#008080"): "\033[38;5;6m", c("#c0c0c0"): "\033[38;5;7m", - c("#808080"): "\033[38;5;8m", c("#ff0000"): "\033[38;5;9m", c("#00ff00"): "\033[38;5;10m", c("#ffff00"): "\033[38;5;11m", - c("#0000ff"): "\033[38;5;12m", c("#ff00ff"): "\033[38;5;13m", c("#00ffff"): "\033[38;5;14m", c("#ffffff"): "\033[38;5;15m", - c("#000000"): "\033[38;5;16m", c("#00005f"): "\033[38;5;17m", c("#000087"): "\033[38;5;18m", c("#0000af"): "\033[38;5;19m", - c("#0000d7"): "\033[38;5;20m", c("#0000ff"): "\033[38;5;21m", c("#005f00"): "\033[38;5;22m", c("#005f5f"): "\033[38;5;23m", - c("#005f87"): "\033[38;5;24m", c("#005faf"): "\033[38;5;25m", c("#005fd7"): "\033[38;5;26m", c("#005fff"): "\033[38;5;27m", - c("#008700"): "\033[38;5;28m", c("#00875f"): "\033[38;5;29m", c("#008787"): "\033[38;5;30m", c("#0087af"): "\033[38;5;31m", - c("#0087d7"): "\033[38;5;32m", c("#0087ff"): "\033[38;5;33m", c("#00af00"): "\033[38;5;34m", c("#00af5f"): "\033[38;5;35m", - c("#00af87"): "\033[38;5;36m", c("#00afaf"): "\033[38;5;37m", c("#00afd7"): "\033[38;5;38m", c("#00afff"): "\033[38;5;39m", - c("#00d700"): "\033[38;5;40m", c("#00d75f"): "\033[38;5;41m", c("#00d787"): "\033[38;5;42m", c("#00d7af"): "\033[38;5;43m", - c("#00d7d7"): "\033[38;5;44m", c("#00d7ff"): "\033[38;5;45m", c("#00ff00"): "\033[38;5;46m", c("#00ff5f"): "\033[38;5;47m", - c("#00ff87"): "\033[38;5;48m", c("#00ffaf"): "\033[38;5;49m", c("#00ffd7"): "\033[38;5;50m", c("#00ffff"): "\033[38;5;51m", - c("#5f0000"): "\033[38;5;52m", c("#5f005f"): "\033[38;5;53m", c("#5f0087"): "\033[38;5;54m", c("#5f00af"): "\033[38;5;55m", - c("#5f00d7"): "\033[38;5;56m", c("#5f00ff"): "\033[38;5;57m", c("#5f5f00"): "\033[38;5;58m", c("#5f5f5f"): "\033[38;5;59m", - c("#5f5f87"): "\033[38;5;60m", c("#5f5faf"): "\033[38;5;61m", c("#5f5fd7"): "\033[38;5;62m", c("#5f5fff"): "\033[38;5;63m", - c("#5f8700"): "\033[38;5;64m", c("#5f875f"): "\033[38;5;65m", c("#5f8787"): "\033[38;5;66m", c("#5f87af"): "\033[38;5;67m", - c("#5f87d7"): "\033[38;5;68m", c("#5f87ff"): "\033[38;5;69m", c("#5faf00"): "\033[38;5;70m", c("#5faf5f"): "\033[38;5;71m", - c("#5faf87"): "\033[38;5;72m", c("#5fafaf"): "\033[38;5;73m", c("#5fafd7"): "\033[38;5;74m", c("#5fafff"): "\033[38;5;75m", - c("#5fd700"): "\033[38;5;76m", c("#5fd75f"): "\033[38;5;77m", c("#5fd787"): "\033[38;5;78m", c("#5fd7af"): "\033[38;5;79m", - c("#5fd7d7"): "\033[38;5;80m", c("#5fd7ff"): "\033[38;5;81m", c("#5fff00"): "\033[38;5;82m", c("#5fff5f"): "\033[38;5;83m", - c("#5fff87"): "\033[38;5;84m", c("#5fffaf"): "\033[38;5;85m", c("#5fffd7"): "\033[38;5;86m", c("#5fffff"): "\033[38;5;87m", - c("#870000"): "\033[38;5;88m", c("#87005f"): "\033[38;5;89m", c("#870087"): "\033[38;5;90m", c("#8700af"): "\033[38;5;91m", - c("#8700d7"): "\033[38;5;92m", c("#8700ff"): "\033[38;5;93m", c("#875f00"): "\033[38;5;94m", c("#875f5f"): "\033[38;5;95m", - c("#875f87"): "\033[38;5;96m", c("#875faf"): "\033[38;5;97m", c("#875fd7"): "\033[38;5;98m", c("#875fff"): "\033[38;5;99m", - c("#878700"): "\033[38;5;100m", c("#87875f"): "\033[38;5;101m", c("#878787"): "\033[38;5;102m", c("#8787af"): "\033[38;5;103m", - c("#8787d7"): "\033[38;5;104m", c("#8787ff"): "\033[38;5;105m", c("#87af00"): "\033[38;5;106m", c("#87af5f"): "\033[38;5;107m", - c("#87af87"): "\033[38;5;108m", c("#87afaf"): "\033[38;5;109m", c("#87afd7"): "\033[38;5;110m", c("#87afff"): "\033[38;5;111m", - c("#87d700"): "\033[38;5;112m", c("#87d75f"): "\033[38;5;113m", c("#87d787"): "\033[38;5;114m", c("#87d7af"): "\033[38;5;115m", - c("#87d7d7"): "\033[38;5;116m", c("#87d7ff"): "\033[38;5;117m", c("#87ff00"): "\033[38;5;118m", c("#87ff5f"): "\033[38;5;119m", - c("#87ff87"): "\033[38;5;120m", c("#87ffaf"): "\033[38;5;121m", c("#87ffd7"): "\033[38;5;122m", c("#87ffff"): "\033[38;5;123m", - c("#af0000"): "\033[38;5;124m", c("#af005f"): "\033[38;5;125m", c("#af0087"): "\033[38;5;126m", c("#af00af"): "\033[38;5;127m", - c("#af00d7"): "\033[38;5;128m", c("#af00ff"): "\033[38;5;129m", c("#af5f00"): "\033[38;5;130m", c("#af5f5f"): "\033[38;5;131m", - c("#af5f87"): "\033[38;5;132m", c("#af5faf"): "\033[38;5;133m", c("#af5fd7"): "\033[38;5;134m", c("#af5fff"): "\033[38;5;135m", - c("#af8700"): "\033[38;5;136m", c("#af875f"): "\033[38;5;137m", c("#af8787"): "\033[38;5;138m", c("#af87af"): "\033[38;5;139m", - c("#af87d7"): "\033[38;5;140m", c("#af87ff"): "\033[38;5;141m", c("#afaf00"): "\033[38;5;142m", c("#afaf5f"): "\033[38;5;143m", - c("#afaf87"): "\033[38;5;144m", c("#afafaf"): "\033[38;5;145m", c("#afafd7"): "\033[38;5;146m", c("#afafff"): "\033[38;5;147m", - c("#afd700"): "\033[38;5;148m", c("#afd75f"): "\033[38;5;149m", c("#afd787"): "\033[38;5;150m", c("#afd7af"): "\033[38;5;151m", - c("#afd7d7"): "\033[38;5;152m", c("#afd7ff"): "\033[38;5;153m", c("#afff00"): "\033[38;5;154m", c("#afff5f"): "\033[38;5;155m", - c("#afff87"): "\033[38;5;156m", c("#afffaf"): "\033[38;5;157m", c("#afffd7"): "\033[38;5;158m", c("#afffff"): "\033[38;5;159m", - c("#d70000"): "\033[38;5;160m", c("#d7005f"): "\033[38;5;161m", c("#d70087"): "\033[38;5;162m", c("#d700af"): "\033[38;5;163m", - c("#d700d7"): "\033[38;5;164m", c("#d700ff"): "\033[38;5;165m", c("#d75f00"): "\033[38;5;166m", c("#d75f5f"): "\033[38;5;167m", - c("#d75f87"): "\033[38;5;168m", c("#d75faf"): "\033[38;5;169m", c("#d75fd7"): "\033[38;5;170m", c("#d75fff"): "\033[38;5;171m", - c("#d78700"): "\033[38;5;172m", c("#d7875f"): "\033[38;5;173m", c("#d78787"): "\033[38;5;174m", c("#d787af"): "\033[38;5;175m", - c("#d787d7"): "\033[38;5;176m", c("#d787ff"): "\033[38;5;177m", c("#d7af00"): "\033[38;5;178m", c("#d7af5f"): "\033[38;5;179m", - c("#d7af87"): "\033[38;5;180m", c("#d7afaf"): "\033[38;5;181m", c("#d7afd7"): "\033[38;5;182m", c("#d7afff"): "\033[38;5;183m", - c("#d7d700"): "\033[38;5;184m", c("#d7d75f"): "\033[38;5;185m", c("#d7d787"): "\033[38;5;186m", c("#d7d7af"): "\033[38;5;187m", - c("#d7d7d7"): "\033[38;5;188m", c("#d7d7ff"): "\033[38;5;189m", c("#d7ff00"): "\033[38;5;190m", c("#d7ff5f"): "\033[38;5;191m", - c("#d7ff87"): "\033[38;5;192m", c("#d7ffaf"): "\033[38;5;193m", c("#d7ffd7"): "\033[38;5;194m", c("#d7ffff"): "\033[38;5;195m", - c("#ff0000"): "\033[38;5;196m", c("#ff005f"): "\033[38;5;197m", c("#ff0087"): "\033[38;5;198m", c("#ff00af"): "\033[38;5;199m", - c("#ff00d7"): "\033[38;5;200m", c("#ff00ff"): "\033[38;5;201m", c("#ff5f00"): "\033[38;5;202m", c("#ff5f5f"): "\033[38;5;203m", - c("#ff5f87"): "\033[38;5;204m", c("#ff5faf"): "\033[38;5;205m", c("#ff5fd7"): "\033[38;5;206m", c("#ff5fff"): "\033[38;5;207m", - c("#ff8700"): "\033[38;5;208m", c("#ff875f"): "\033[38;5;209m", c("#ff8787"): "\033[38;5;210m", c("#ff87af"): "\033[38;5;211m", - c("#ff87d7"): "\033[38;5;212m", c("#ff87ff"): "\033[38;5;213m", c("#ffaf00"): "\033[38;5;214m", c("#ffaf5f"): "\033[38;5;215m", - c("#ffaf87"): "\033[38;5;216m", c("#ffafaf"): "\033[38;5;217m", c("#ffafd7"): "\033[38;5;218m", c("#ffafff"): "\033[38;5;219m", - c("#ffd700"): "\033[38;5;220m", c("#ffd75f"): "\033[38;5;221m", c("#ffd787"): "\033[38;5;222m", c("#ffd7af"): "\033[38;5;223m", - c("#ffd7d7"): "\033[38;5;224m", c("#ffd7ff"): "\033[38;5;225m", c("#ffff00"): "\033[38;5;226m", c("#ffff5f"): "\033[38;5;227m", - c("#ffff87"): "\033[38;5;228m", c("#ffffaf"): "\033[38;5;229m", c("#ffffd7"): "\033[38;5;230m", c("#ffffff"): "\033[38;5;231m", - c("#080808"): "\033[38;5;232m", c("#121212"): "\033[38;5;233m", c("#1c1c1c"): "\033[38;5;234m", c("#262626"): "\033[38;5;235m", - c("#303030"): "\033[38;5;236m", c("#3a3a3a"): "\033[38;5;237m", c("#444444"): "\033[38;5;238m", c("#4e4e4e"): "\033[38;5;239m", - c("#585858"): "\033[38;5;240m", c("#626262"): "\033[38;5;241m", c("#6c6c6c"): "\033[38;5;242m", c("#767676"): "\033[38;5;243m", - c("#808080"): "\033[38;5;244m", c("#8a8a8a"): "\033[38;5;245m", c("#949494"): "\033[38;5;246m", c("#9e9e9e"): "\033[38;5;247m", - c("#a8a8a8"): "\033[38;5;248m", c("#b2b2b2"): "\033[38;5;249m", c("#bcbcbc"): "\033[38;5;250m", c("#c6c6c6"): "\033[38;5;251m", - c("#d0d0d0"): "\033[38;5;252m", c("#dadada"): "\033[38;5;253m", c("#e4e4e4"): "\033[38;5;254m", c("#eeeeee"): "\033[38;5;255m", - }, - background: map[chroma.Colour]string{ - c("#000000"): "\033[48;5;0m", c("#800000"): "\033[48;5;1m", c("#008000"): "\033[48;5;2m", c("#808000"): "\033[48;5;3m", - c("#000080"): "\033[48;5;4m", c("#800080"): "\033[48;5;5m", c("#008080"): "\033[48;5;6m", c("#c0c0c0"): "\033[48;5;7m", - c("#808080"): "\033[48;5;8m", c("#ff0000"): "\033[48;5;9m", c("#00ff00"): "\033[48;5;10m", c("#ffff00"): "\033[48;5;11m", - c("#0000ff"): "\033[48;5;12m", c("#ff00ff"): "\033[48;5;13m", c("#00ffff"): "\033[48;5;14m", c("#ffffff"): "\033[48;5;15m", - c("#000000"): "\033[48;5;16m", c("#00005f"): "\033[48;5;17m", c("#000087"): "\033[48;5;18m", c("#0000af"): "\033[48;5;19m", - c("#0000d7"): "\033[48;5;20m", c("#0000ff"): "\033[48;5;21m", c("#005f00"): "\033[48;5;22m", c("#005f5f"): "\033[48;5;23m", - c("#005f87"): "\033[48;5;24m", c("#005faf"): "\033[48;5;25m", c("#005fd7"): "\033[48;5;26m", c("#005fff"): "\033[48;5;27m", - c("#008700"): "\033[48;5;28m", c("#00875f"): "\033[48;5;29m", c("#008787"): "\033[48;5;30m", c("#0087af"): "\033[48;5;31m", - c("#0087d7"): "\033[48;5;32m", c("#0087ff"): "\033[48;5;33m", c("#00af00"): "\033[48;5;34m", c("#00af5f"): "\033[48;5;35m", - c("#00af87"): "\033[48;5;36m", c("#00afaf"): "\033[48;5;37m", c("#00afd7"): "\033[48;5;38m", c("#00afff"): "\033[48;5;39m", - c("#00d700"): "\033[48;5;40m", c("#00d75f"): "\033[48;5;41m", c("#00d787"): "\033[48;5;42m", c("#00d7af"): "\033[48;5;43m", - c("#00d7d7"): "\033[48;5;44m", c("#00d7ff"): "\033[48;5;45m", c("#00ff00"): "\033[48;5;46m", c("#00ff5f"): "\033[48;5;47m", - c("#00ff87"): "\033[48;5;48m", c("#00ffaf"): "\033[48;5;49m", c("#00ffd7"): "\033[48;5;50m", c("#00ffff"): "\033[48;5;51m", - c("#5f0000"): "\033[48;5;52m", c("#5f005f"): "\033[48;5;53m", c("#5f0087"): "\033[48;5;54m", c("#5f00af"): "\033[48;5;55m", - c("#5f00d7"): "\033[48;5;56m", c("#5f00ff"): "\033[48;5;57m", c("#5f5f00"): "\033[48;5;58m", c("#5f5f5f"): "\033[48;5;59m", - c("#5f5f87"): "\033[48;5;60m", c("#5f5faf"): "\033[48;5;61m", c("#5f5fd7"): "\033[48;5;62m", c("#5f5fff"): "\033[48;5;63m", - c("#5f8700"): "\033[48;5;64m", c("#5f875f"): "\033[48;5;65m", c("#5f8787"): "\033[48;5;66m", c("#5f87af"): "\033[48;5;67m", - c("#5f87d7"): "\033[48;5;68m", c("#5f87ff"): "\033[48;5;69m", c("#5faf00"): "\033[48;5;70m", c("#5faf5f"): "\033[48;5;71m", - c("#5faf87"): "\033[48;5;72m", c("#5fafaf"): "\033[48;5;73m", c("#5fafd7"): "\033[48;5;74m", c("#5fafff"): "\033[48;5;75m", - c("#5fd700"): "\033[48;5;76m", c("#5fd75f"): "\033[48;5;77m", c("#5fd787"): "\033[48;5;78m", c("#5fd7af"): "\033[48;5;79m", - c("#5fd7d7"): "\033[48;5;80m", c("#5fd7ff"): "\033[48;5;81m", c("#5fff00"): "\033[48;5;82m", c("#5fff5f"): "\033[48;5;83m", - c("#5fff87"): "\033[48;5;84m", c("#5fffaf"): "\033[48;5;85m", c("#5fffd7"): "\033[48;5;86m", c("#5fffff"): "\033[48;5;87m", - c("#870000"): "\033[48;5;88m", c("#87005f"): "\033[48;5;89m", c("#870087"): "\033[48;5;90m", c("#8700af"): "\033[48;5;91m", - c("#8700d7"): "\033[48;5;92m", c("#8700ff"): "\033[48;5;93m", c("#875f00"): "\033[48;5;94m", c("#875f5f"): "\033[48;5;95m", - c("#875f87"): "\033[48;5;96m", c("#875faf"): "\033[48;5;97m", c("#875fd7"): "\033[48;5;98m", c("#875fff"): "\033[48;5;99m", - c("#878700"): "\033[48;5;100m", c("#87875f"): "\033[48;5;101m", c("#878787"): "\033[48;5;102m", c("#8787af"): "\033[48;5;103m", - c("#8787d7"): "\033[48;5;104m", c("#8787ff"): "\033[48;5;105m", c("#87af00"): "\033[48;5;106m", c("#87af5f"): "\033[48;5;107m", - c("#87af87"): "\033[48;5;108m", c("#87afaf"): "\033[48;5;109m", c("#87afd7"): "\033[48;5;110m", c("#87afff"): "\033[48;5;111m", - c("#87d700"): "\033[48;5;112m", c("#87d75f"): "\033[48;5;113m", c("#87d787"): "\033[48;5;114m", c("#87d7af"): "\033[48;5;115m", - c("#87d7d7"): "\033[48;5;116m", c("#87d7ff"): "\033[48;5;117m", c("#87ff00"): "\033[48;5;118m", c("#87ff5f"): "\033[48;5;119m", - c("#87ff87"): "\033[48;5;120m", c("#87ffaf"): "\033[48;5;121m", c("#87ffd7"): "\033[48;5;122m", c("#87ffff"): "\033[48;5;123m", - c("#af0000"): "\033[48;5;124m", c("#af005f"): "\033[48;5;125m", c("#af0087"): "\033[48;5;126m", c("#af00af"): "\033[48;5;127m", - c("#af00d7"): "\033[48;5;128m", c("#af00ff"): "\033[48;5;129m", c("#af5f00"): "\033[48;5;130m", c("#af5f5f"): "\033[48;5;131m", - c("#af5f87"): "\033[48;5;132m", c("#af5faf"): "\033[48;5;133m", c("#af5fd7"): "\033[48;5;134m", c("#af5fff"): "\033[48;5;135m", - c("#af8700"): "\033[48;5;136m", c("#af875f"): "\033[48;5;137m", c("#af8787"): "\033[48;5;138m", c("#af87af"): "\033[48;5;139m", - c("#af87d7"): "\033[48;5;140m", c("#af87ff"): "\033[48;5;141m", c("#afaf00"): "\033[48;5;142m", c("#afaf5f"): "\033[48;5;143m", - c("#afaf87"): "\033[48;5;144m", c("#afafaf"): "\033[48;5;145m", c("#afafd7"): "\033[48;5;146m", c("#afafff"): "\033[48;5;147m", - c("#afd700"): "\033[48;5;148m", c("#afd75f"): "\033[48;5;149m", c("#afd787"): "\033[48;5;150m", c("#afd7af"): "\033[48;5;151m", - c("#afd7d7"): "\033[48;5;152m", c("#afd7ff"): "\033[48;5;153m", c("#afff00"): "\033[48;5;154m", c("#afff5f"): "\033[48;5;155m", - c("#afff87"): "\033[48;5;156m", c("#afffaf"): "\033[48;5;157m", c("#afffd7"): "\033[48;5;158m", c("#afffff"): "\033[48;5;159m", - c("#d70000"): "\033[48;5;160m", c("#d7005f"): "\033[48;5;161m", c("#d70087"): "\033[48;5;162m", c("#d700af"): "\033[48;5;163m", - c("#d700d7"): "\033[48;5;164m", c("#d700ff"): "\033[48;5;165m", c("#d75f00"): "\033[48;5;166m", c("#d75f5f"): "\033[48;5;167m", - c("#d75f87"): "\033[48;5;168m", c("#d75faf"): "\033[48;5;169m", c("#d75fd7"): "\033[48;5;170m", c("#d75fff"): "\033[48;5;171m", - c("#d78700"): "\033[48;5;172m", c("#d7875f"): "\033[48;5;173m", c("#d78787"): "\033[48;5;174m", c("#d787af"): "\033[48;5;175m", - c("#d787d7"): "\033[48;5;176m", c("#d787ff"): "\033[48;5;177m", c("#d7af00"): "\033[48;5;178m", c("#d7af5f"): "\033[48;5;179m", - c("#d7af87"): "\033[48;5;180m", c("#d7afaf"): "\033[48;5;181m", c("#d7afd7"): "\033[48;5;182m", c("#d7afff"): "\033[48;5;183m", - c("#d7d700"): "\033[48;5;184m", c("#d7d75f"): "\033[48;5;185m", c("#d7d787"): "\033[48;5;186m", c("#d7d7af"): "\033[48;5;187m", - c("#d7d7d7"): "\033[48;5;188m", c("#d7d7ff"): "\033[48;5;189m", c("#d7ff00"): "\033[48;5;190m", c("#d7ff5f"): "\033[48;5;191m", - c("#d7ff87"): "\033[48;5;192m", c("#d7ffaf"): "\033[48;5;193m", c("#d7ffd7"): "\033[48;5;194m", c("#d7ffff"): "\033[48;5;195m", - c("#ff0000"): "\033[48;5;196m", c("#ff005f"): "\033[48;5;197m", c("#ff0087"): "\033[48;5;198m", c("#ff00af"): "\033[48;5;199m", - c("#ff00d7"): "\033[48;5;200m", c("#ff00ff"): "\033[48;5;201m", c("#ff5f00"): "\033[48;5;202m", c("#ff5f5f"): "\033[48;5;203m", - c("#ff5f87"): "\033[48;5;204m", c("#ff5faf"): "\033[48;5;205m", c("#ff5fd7"): "\033[48;5;206m", c("#ff5fff"): "\033[48;5;207m", - c("#ff8700"): "\033[48;5;208m", c("#ff875f"): "\033[48;5;209m", c("#ff8787"): "\033[48;5;210m", c("#ff87af"): "\033[48;5;211m", - c("#ff87d7"): "\033[48;5;212m", c("#ff87ff"): "\033[48;5;213m", c("#ffaf00"): "\033[48;5;214m", c("#ffaf5f"): "\033[48;5;215m", - c("#ffaf87"): "\033[48;5;216m", c("#ffafaf"): "\033[48;5;217m", c("#ffafd7"): "\033[48;5;218m", c("#ffafff"): "\033[48;5;219m", - c("#ffd700"): "\033[48;5;220m", c("#ffd75f"): "\033[48;5;221m", c("#ffd787"): "\033[48;5;222m", c("#ffd7af"): "\033[48;5;223m", - c("#ffd7d7"): "\033[48;5;224m", c("#ffd7ff"): "\033[48;5;225m", c("#ffff00"): "\033[48;5;226m", c("#ffff5f"): "\033[48;5;227m", - c("#ffff87"): "\033[48;5;228m", c("#ffffaf"): "\033[48;5;229m", c("#ffffd7"): "\033[48;5;230m", c("#ffffff"): "\033[48;5;231m", - c("#080808"): "\033[48;5;232m", c("#121212"): "\033[48;5;233m", c("#1c1c1c"): "\033[48;5;234m", c("#262626"): "\033[48;5;235m", - c("#303030"): "\033[48;5;236m", c("#3a3a3a"): "\033[48;5;237m", c("#444444"): "\033[48;5;238m", c("#4e4e4e"): "\033[48;5;239m", - c("#585858"): "\033[48;5;240m", c("#626262"): "\033[48;5;241m", c("#6c6c6c"): "\033[48;5;242m", c("#767676"): "\033[48;5;243m", - c("#808080"): "\033[48;5;244m", c("#8a8a8a"): "\033[48;5;245m", c("#949494"): "\033[48;5;246m", c("#9e9e9e"): "\033[48;5;247m", - c("#a8a8a8"): "\033[48;5;248m", c("#b2b2b2"): "\033[48;5;249m", c("#bcbcbc"): "\033[48;5;250m", c("#c6c6c6"): "\033[48;5;251m", - c("#d0d0d0"): "\033[48;5;252m", c("#dadada"): "\033[48;5;253m", c("#e4e4e4"): "\033[48;5;254m", c("#eeeeee"): "\033[48;5;255m", - }, - }, -} - -func entryToEscapeSequence(table *ttyTable, entry chroma.StyleEntry) string { - out := "" - if entry.Bold == chroma.Yes { - out += "\033[1m" - } - if entry.Underline == chroma.Yes { - out += "\033[4m" - } - if entry.Italic == chroma.Yes { - out += "\033[3m" - } - if entry.Colour.IsSet() { - out += table.foreground[findClosest(table, entry.Colour)] - } - if entry.Background.IsSet() { - out += table.background[findClosest(table, entry.Background)] - } - return out -} - -func findClosest(table *ttyTable, seeking chroma.Colour) chroma.Colour { - closestColour := chroma.Colour(0) - closest := float64(math.MaxFloat64) - for colour := range table.foreground { - distance := colour.Distance(seeking) - if distance < closest { - closest = distance - closestColour = colour - } - } - return closestColour -} - -func styleToEscapeSequence(table *ttyTable, style *chroma.Style) map[chroma.TokenType]string { - style = clearBackground(style) - out := map[chroma.TokenType]string{} - for _, ttype := range style.Types() { - entry := style.Get(ttype) - out[ttype] = entryToEscapeSequence(table, entry) - } - return out -} - -// Clear the background colour. -func clearBackground(style *chroma.Style) *chroma.Style { - builder := style.Builder() - bg := builder.Get(chroma.Background) - bg.Background = 0 - bg.NoInherit = true - builder.AddEntry(chroma.Background, bg) - style, _ = builder.Build() - return style -} - -type indexedTTYFormatter struct { - table *ttyTable -} - -func (c *indexedTTYFormatter) Format(w io.Writer, style *chroma.Style, it chroma.Iterator) (err error) { - theme := styleToEscapeSequence(c.table, style) - for token := it(); token != chroma.EOF; token = it() { - clr, ok := theme[token.Type] - - // This search mimics how styles.Get() is used in tty_truecolour.go. - if !ok { - clr, ok = theme[token.Type.SubCategory()] - if !ok { - clr, ok = theme[token.Type.Category()] - if !ok { - clr, ok = theme[chroma.Text] - if !ok { - clr = theme[chroma.Background] - } - } - } - } - - writeToken(w, clr, token.Value) - } - return nil -} - -// TTY is an 8-colour terminal formatter. -// -// The Lab colour space is used to map RGB values to the most appropriate index colour. -var TTY = Register("terminal", &indexedTTYFormatter{ttyTables[8]}) - -// TTY8 is an 8-colour terminal formatter. -// -// The Lab colour space is used to map RGB values to the most appropriate index colour. -var TTY8 = Register("terminal8", &indexedTTYFormatter{ttyTables[8]}) - -// TTY16 is a 16-colour terminal formatter. -// -// It uses \033[3xm for normal colours and \033[90Xm for bright colours. -// -// The Lab colour space is used to map RGB values to the most appropriate index colour. -var TTY16 = Register("terminal16", &indexedTTYFormatter{ttyTables[16]}) - -// TTY256 is a 256-colour terminal formatter. -// -// The Lab colour space is used to map RGB values to the most appropriate index colour. -var TTY256 = Register("terminal256", &indexedTTYFormatter{ttyTables[256]}) diff --git a/vendor/github.com/alecthomas/chroma/v2/formatters/tty_truecolour.go b/vendor/github.com/alecthomas/chroma/v2/formatters/tty_truecolour.go deleted file mode 100644 index 43b0964769d8a2fd73764fea1d496040137db642..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/formatters/tty_truecolour.go +++ /dev/null @@ -1,76 +0,0 @@ -package formatters - -import ( - "fmt" - "io" - "regexp" - - "github.com/alecthomas/chroma/v2" -) - -// TTY16m is a true-colour terminal formatter. -var TTY16m = Register("terminal16m", chroma.FormatterFunc(trueColourFormatter)) - -var crOrCrLf = regexp.MustCompile(`\r?\n`) - -// Print the text with the given formatting, resetting the formatting at the end -// of each line and resuming it on the next line. -// -// This way, a pager (like https://github.com/walles/moar for example) can show -// any line in the output by itself, and it will get the right formatting. -func writeToken(w io.Writer, formatting string, text string) { - if formatting == "" { - fmt.Fprint(w, text) - return - } - - newlineIndices := crOrCrLf.FindAllStringIndex(text, -1) - - afterLastNewline := 0 - for _, indices := range newlineIndices { - newlineStart, afterNewline := indices[0], indices[1] - fmt.Fprint(w, formatting) - fmt.Fprint(w, text[afterLastNewline:newlineStart]) - fmt.Fprint(w, "\033[0m") - fmt.Fprint(w, text[newlineStart:afterNewline]) - afterLastNewline = afterNewline - } - - if afterLastNewline < len(text) { - // Print whatever is left after the last newline - fmt.Fprint(w, formatting) - fmt.Fprint(w, text[afterLastNewline:]) - fmt.Fprint(w, "\033[0m") - } -} - -func trueColourFormatter(w io.Writer, style *chroma.Style, it chroma.Iterator) error { - style = clearBackground(style) - for token := it(); token != chroma.EOF; token = it() { - entry := style.Get(token.Type) - if entry.IsZero() { - fmt.Fprint(w, token.Value) - continue - } - - formatting := "" - if entry.Bold == chroma.Yes { - formatting += "\033[1m" - } - if entry.Underline == chroma.Yes { - formatting += "\033[4m" - } - if entry.Italic == chroma.Yes { - formatting += "\033[3m" - } - if entry.Colour.IsSet() { - formatting += fmt.Sprintf("\033[38;2;%d;%d;%dm", entry.Colour.Red(), entry.Colour.Green(), entry.Colour.Blue()) - } - if entry.Background.IsSet() { - formatting += fmt.Sprintf("\033[48;2;%d;%d;%dm", entry.Background.Red(), entry.Background.Green(), entry.Background.Blue()) - } - - writeToken(w, formatting, token.Value) - } - return nil -} diff --git a/vendor/github.com/alecthomas/chroma/v2/iterator.go b/vendor/github.com/alecthomas/chroma/v2/iterator.go deleted file mode 100644 index d5175de89b6128e9ee1aa41aa90ba2cf561b6200..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/iterator.go +++ /dev/null @@ -1,76 +0,0 @@ -package chroma - -import "strings" - -// An Iterator across tokens. -// -// EOF will be returned at the end of the Token stream. -// -// If an error occurs within an Iterator, it may propagate this in a panic. Formatters should recover. -type Iterator func() Token - -// Tokens consumes all tokens from the iterator and returns them as a slice. -func (i Iterator) Tokens() []Token { - var out []Token - for t := i(); t != EOF; t = i() { - out = append(out, t) - } - return out -} - -// Concaterator concatenates tokens from a series of iterators. -func Concaterator(iterators ...Iterator) Iterator { - return func() Token { - for len(iterators) > 0 { - t := iterators[0]() - if t != EOF { - return t - } - iterators = iterators[1:] - } - return EOF - } -} - -// Literator converts a sequence of literal Tokens into an Iterator. -func Literator(tokens ...Token) Iterator { - return func() Token { - if len(tokens) == 0 { - return EOF - } - token := tokens[0] - tokens = tokens[1:] - return token - } -} - -// SplitTokensIntoLines splits tokens containing newlines in two. -func SplitTokensIntoLines(tokens []Token) (out [][]Token) { - var line []Token // nolint: prealloc - for _, token := range tokens { - for strings.Contains(token.Value, "\n") { - parts := strings.SplitAfterN(token.Value, "\n", 2) - // Token becomes the tail. - token.Value = parts[1] - - // Append the head to the line and flush the line. - clone := token.Clone() - clone.Value = parts[0] - line = append(line, clone) - out = append(out, line) - line = nil - } - line = append(line, token) - } - if len(line) > 0 { - out = append(out, line) - } - // Strip empty trailing token line. - if len(out) > 0 { - last := out[len(out)-1] - if len(last) == 1 && last[0].Value == "" { - out = out[:len(out)-1] - } - } - return -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexer.go b/vendor/github.com/alecthomas/chroma/v2/lexer.go deleted file mode 100644 index eb027bf698776081a94f53f5a435187768613395..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexer.go +++ /dev/null @@ -1,162 +0,0 @@ -package chroma - -import ( - "fmt" - "strings" -) - -var ( - defaultOptions = &TokeniseOptions{ - State: "root", - EnsureLF: true, - } -) - -// Config for a lexer. -type Config struct { - // Name of the lexer. - Name string `xml:"name,omitempty"` - - // Shortcuts for the lexer - Aliases []string `xml:"alias,omitempty"` - - // File name globs - Filenames []string `xml:"filename,omitempty"` - - // Secondary file name globs - AliasFilenames []string `xml:"alias_filename,omitempty"` - - // MIME types - MimeTypes []string `xml:"mime_type,omitempty"` - - // Regex matching is case-insensitive. - CaseInsensitive bool `xml:"case_insensitive,omitempty"` - - // Regex matches all characters. - DotAll bool `xml:"dot_all,omitempty"` - - // Regex does not match across lines ($ matches EOL). - // - // Defaults to multiline. - NotMultiline bool `xml:"not_multiline,omitempty"` - - // Don't strip leading and trailing newlines from the input. - // DontStripNL bool - - // Strip all leading and trailing whitespace from the input - // StripAll bool - - // Make sure that the input ends with a newline. This - // is required for some lexers that consume input linewise. - EnsureNL bool `xml:"ensure_nl,omitempty"` - - // If given and greater than 0, expand tabs in the input. - // TabSize int - - // Priority of lexer. - // - // If this is 0 it will be treated as a default of 1. - Priority float32 `xml:"priority,omitempty"` - - // Analyse is a list of regexes to match against the input. - // - // If a match is found, the score is returned if single attribute is set to true, - // otherwise the sum of all the score of matching patterns will be - // used as the final score. - Analyse *AnalyseConfig `xml:"analyse,omitempty"` -} - -// AnalyseConfig defines the list of regexes analysers. -type AnalyseConfig struct { - Regexes []RegexConfig `xml:"regex,omitempty"` - // If true, the first matching score is returned. - First bool `xml:"first,attr"` -} - -// RegexConfig defines a single regex pattern and its score in case of match. -type RegexConfig struct { - Pattern string `xml:"pattern,attr"` - Score float32 `xml:"score,attr"` -} - -// Token output to formatter. -type Token struct { - Type TokenType `json:"type"` - Value string `json:"value"` -} - -func (t *Token) String() string { return t.Value } -func (t *Token) GoString() string { return fmt.Sprintf("&Token{%s, %q}", t.Type, t.Value) } - -// Clone returns a clone of the Token. -func (t *Token) Clone() Token { - return *t -} - -// EOF is returned by lexers at the end of input. -var EOF Token - -// TokeniseOptions contains options for tokenisers. -type TokeniseOptions struct { - // State to start tokenisation in. Defaults to "root". - State string - // Nested tokenisation. - Nested bool - - // If true, all EOLs are converted into LF - // by replacing CRLF and CR - EnsureLF bool -} - -// A Lexer for tokenising source code. -type Lexer interface { - // Config describing the features of the Lexer. - Config() *Config - // Tokenise returns an Iterator over tokens in text. - Tokenise(options *TokeniseOptions, text string) (Iterator, error) - // SetRegistry sets the registry this Lexer is associated with. - // - // The registry should be used by the Lexer if it needs to look up other - // lexers. - SetRegistry(registry *LexerRegistry) Lexer - // SetAnalyser sets a function the Lexer should use for scoring how - // likely a fragment of text is to match this lexer, between 0.0 and 1.0. - // A value of 1 indicates high confidence. - // - // Lexers may ignore this if they implement their own analysers. - SetAnalyser(analyser func(text string) float32) Lexer - // AnalyseText scores how likely a fragment of text is to match - // this lexer, between 0.0 and 1.0. A value of 1 indicates high confidence. - AnalyseText(text string) float32 -} - -// Lexers is a slice of lexers sortable by name. -type Lexers []Lexer - -func (l Lexers) Len() int { return len(l) } -func (l Lexers) Swap(i, j int) { l[i], l[j] = l[j], l[i] } -func (l Lexers) Less(i, j int) bool { - return strings.ToLower(l[i].Config().Name) < strings.ToLower(l[j].Config().Name) -} - -// PrioritisedLexers is a slice of lexers sortable by priority. -type PrioritisedLexers []Lexer - -func (l PrioritisedLexers) Len() int { return len(l) } -func (l PrioritisedLexers) Swap(i, j int) { l[i], l[j] = l[j], l[i] } -func (l PrioritisedLexers) Less(i, j int) bool { - ip := l[i].Config().Priority - if ip == 0 { - ip = 1 - } - jp := l[j].Config().Priority - if jp == 0 { - jp = 1 - } - return ip > jp -} - -// Analyser determines how appropriate this lexer is for the given text. -type Analyser interface { - AnalyseText(text string) float32 -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/README.md b/vendor/github.com/alecthomas/chroma/v2/lexers/README.md deleted file mode 100644 index 60a0055ad83217ccd74aa9f69d7108cbb08df630..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Chroma lexers - -All lexers in Chroma should now be defined in XML unless they require custom code. - -## Lexer tests - -The tests in this directory feed a known input `testdata/ .actual` into the parser for ` ` and check -that its output matches ` .expected`. - -It is also possible to perform several tests on a same parser ` `, by placing know inputs `*.actual` into a -directory `testdata/ /`. - -### Running the tests - -Run the tests as normal: -```go -go test ./lexers -``` - -### Update existing tests - -When you add a new test data file (`*.actual`), you need to regenerate all tests. That's how Chroma creates the `*.expected` test file based on the corresponding lexer. - -To regenerate all tests, type in your terminal: - -```go -RECORD=true go test ./lexers -``` - -This first sets the `RECORD` environment variable to `true`. Then it runs `go test` on the `./lexers` directory of the Chroma project. - -(That environment variable tells Chroma it needs to output test data. After running `go test ./lexers` you can remove or reset that variable.) - -#### Windows users - -Windows users will find that the `RECORD=true go test ./lexers` command fails in both the standard command prompt terminal and in PowerShell. - -Instead we have to perform both steps separately: - -- Set the `RECORD` environment variable to `true`. - + In the regular command prompt window, the `set` command sets an environment variable for the current session: `set RECORD=true`. See [this page](https://superuser.com/questions/212150/how-to-set-env-variable-in-windows-cmd-line) for more. - + In PowerShell, you can use the `$env:RECORD = 'true'` command for that. See [this article](https://mcpmag.com/articles/2019/03/28/environment-variables-in-powershell.aspx) for more. - + You can also make a persistent environment variable by hand in the Windows computer settings. See [this article](https://www.computerhope.com/issues/ch000549.htm) for how. -- When the environment variable is set, run `go test ./lexers`. - -Chroma will now regenerate the test files and print its results to the console window. diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/caddyfile.go b/vendor/github.com/alecthomas/chroma/v2/lexers/caddyfile.go deleted file mode 100644 index 82a7efa487872ea36bd4a1f81e88ff108ba4d42b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/caddyfile.go +++ /dev/null @@ -1,275 +0,0 @@ -package lexers - -import ( - . "github.com/alecthomas/chroma/v2" // nolint -) - -// Matcher token stub for docs, or -// Named matcher: @name, or -// Path matcher: /foo, or -// Wildcard path matcher: * -// nolint: gosec -var caddyfileMatcherTokenRegexp = `(\[\ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/abnf.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/abnf.xml deleted file mode 100644 index 3ffd51c6c6b5d0ab9b31af8c3e37d37734198352..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/abnf.xml +++ /dev/null @@ -1,66 +0,0 @@ -- -ABAP -abap -*.abap -*.ABAP -text/x-abap -true -- -- -- -- - -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- -- - - - -- -- - - - - - -- -- - - - - - -- -- - - - -- -- - - - - -- - -- -- - - - -- -- - - - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/actionscript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/actionscript.xml deleted file mode 100644 index d6727a103baf08ec6d114e201624185f34829e84..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/actionscript.xml +++ /dev/null @@ -1,68 +0,0 @@ -- -ABNF -abnf -*.abnf -text/x-abnf -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/actionscript_3.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/actionscript_3.xml deleted file mode 100644 index e5f653848aa8d2cab0e09be209f8660fbe85d0be..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/actionscript_3.xml +++ /dev/null @@ -1,163 +0,0 @@ -- -ActionScript -as -actionscript -*.as -application/x-actionscript -text/x-actionscript -text/actionscript -true -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ada.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ada.xml deleted file mode 100644 index 5854a20e9cb7a7288e5925ad999e95bcbe3ecf8c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ada.xml +++ /dev/null @@ -1,321 +0,0 @@ -- -ActionScript 3 -as3 -actionscript3 -*.as -application/x-actionscript3 -text/x-actionscript3 -text/actionscript3 -true -- -- -- -- - -- -- - - - - - - - - - -- - - -- -- -- - - - - - -- - - -- - -- -- -- - - - - - - -- - - -- - -- -- - -- -- - - - - - -- -- - - - - - - - -- -- - - - - -- -- - - - - - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/agda.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/agda.xml deleted file mode 100644 index 6f2b2d50882c58b80cad77bcbb59091665df5864..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/agda.xml +++ /dev/null @@ -1,66 +0,0 @@ -- -Ada -ada -ada95 -ada2005 -*.adb -*.ads -*.ada -text/x-ada -true -- -- -- -- - -- - -- - -- - - -- -- - - -- -- - - - -- - -- -- -- - - - -- - -- - - -- - -- -- - - -- - - -- - - -- - -- - -- -- - - -- - - -- - -- - - -- - - -- -- - - - -- - -- -- - - -- - -- -- - - -- - -- - -- - -- - -- -- - -- - -- - - -- - - -- - - -- - -- - -- -- -- - - -- -- - - -- - -- -- - -- - -- - -- - - -- -- - - - - -- - -- -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - - -- - - -- -- - - - -- -- - - - - - -- - -- -- - - - - - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- -- - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/al.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/al.xml deleted file mode 100644 index 30bad5ae9962370ab31f52777f12a124c0ac67b2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/al.xml +++ /dev/null @@ -1,75 +0,0 @@ -- -Agda -agda -*.agda -text/x-agda -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/alloy.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/alloy.xml deleted file mode 100644 index 1de9ea6cc3912c0787da4267bfdc1d0e1faaf9d0..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/alloy.xml +++ /dev/null @@ -1,58 +0,0 @@ - -- -AL -al -*.al -*.dal -text/x-al -true -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/angular2.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/angular2.xml deleted file mode 100644 index 84fe20b344d0e5a2c49d84f4f204c3feda64b096..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/angular2.xml +++ /dev/null @@ -1,108 +0,0 @@ -- -Alloy -alloy -*.als -text/x-alloy -true -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/antlr.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/antlr.xml deleted file mode 100644 index e57edd4047d0b38af6ce0a5aa30e05b48c550732..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/antlr.xml +++ /dev/null @@ -1,317 +0,0 @@ -- -Angular2 -ng2 -- -- -- -- - - -- - - -- - - -- -- - -- -- - - - -- -- - - - - - - - -- -- - - - - -- -- - - - - - -- -- - - - -- -- - -- - - -- - -- - -- - -- - -- - -- - -- -- - - - - - - - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/apacheconf.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/apacheconf.xml deleted file mode 100644 index 7643541c1bcb02d30c577c41b7a9aaf9ac92abbe..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/apacheconf.xml +++ /dev/null @@ -1,74 +0,0 @@ -- -ANTLR -antlr -- -- -- -- - -- - - -- - - -- -- - - - -- - -- -- - - -- - -- - -- - - -- - - -- -- - -- -- - -- - -- -- - - - - - - -- - - -- - - -- -- - - - - - - -- - - -- -- - - - - - - - - -- -- - - - - - -- -- - -- - -- - -- -- - - - - - - - -- - - -- -- - -- - -- - -- -- - - - - - - - -- - - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- -- - -- - -- - -- - - -- - - -- -- - - - -- -- - - - -- - - -- -- - - - - -- -- - - - - - -- -- - - - - -- - - -- -- - -- -- - - -- -- - - - -- - - -- - - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/apl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/apl.xml deleted file mode 100644 index 959448ca40385ec967138cffdf66f602226a0fa7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/apl.xml +++ /dev/null @@ -1,59 +0,0 @@ -- -ApacheConf -apacheconf -aconf -apache -.htaccess -apache.conf -apache2.conf -text/x-apacheconf -true -- -- -- -- - -- - -- -- - - - - -- -- - - - -- - -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/applescript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/applescript.xml deleted file mode 100644 index 1de6c67ee102b5b23ff90652f0de9e8340ab8fc8..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/applescript.xml +++ /dev/null @@ -1,130 +0,0 @@ -- -APL -apl -*.apl -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arangodb_aql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arangodb_aql.xml deleted file mode 100644 index 434b395a11736e60765228b383028e7634dc8cb0..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arangodb_aql.xml +++ /dev/null @@ -1,174 +0,0 @@ -- -AppleScript -applescript -*.applescript -true -- -- -- -- - -- - -- - -- - -- - - -- - -- -- - - - -- -- - - -- - -- - -- -- - - -- -- - - - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arduino.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arduino.xml deleted file mode 100644 index 00399c2c8ed81d748eb94c66789ea80b1f3bfea8..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/arduino.xml +++ /dev/null @@ -1,309 +0,0 @@ -- -ArangoDB AQL -aql -*.aql -text/x-aql -true -true -true -- -- -- -- - -- - -- - - -- -- - -- - - -- - -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/armasm.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/armasm.xml deleted file mode 100644 index e5966cf62d2711666bfaf74b19da0faac506d1f2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/armasm.xml +++ /dev/null @@ -1,126 +0,0 @@ -- -Arduino -arduino -*.ino -text/x-arduino -true -- -- -- -- - - -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- -- -- - - - -- - -- - -- - - -- - -- - -- - - -- -- - -- - -- -- - - - -- -- - - - - - - - -- -- - - - -- -- - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - -- - -- - -- - - -- - - -- -- - - -- - - -- - - -- - -- -- - - -- - - -- -- - -- - -- - -- - - -- -- - -- -- - - - - - - -- -- - - - - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/atl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/atl.xml deleted file mode 100644 index 623dc205e7a50f7ec336d267f911bf02974ff65c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/atl.xml +++ /dev/null @@ -1,165 +0,0 @@ -- -ArmAsm -armasm -*.s -*.S -text/x-armasm -text/x-asm -true -- -- -- -- - -- -- - - -- -- - - - - -- -- - - -- - -- - - -- -- - -- - -- - -- -- - - -- - - -- - - -- - - -- - - -- -- - - - - -- -- - - - - -- -- - - -- - - -- - -- - -- -- - - -- -- - - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/autohotkey.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/autohotkey.xml deleted file mode 100644 index 6ec94edeb8ffb0abd4ac818aabe8ddb146cbebab..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/autohotkey.xml +++ /dev/null @@ -1,78 +0,0 @@ - -- -ATL -atl -*.atl -text/x-atl -true -- -- -- -- -- - - -- - -- - -- - -- -- - - - -- -- - - -- -- - - -- -- - - -- -- - - -- -- - - - - -- - -- -- - - - -- - - -- - - -- - -- - - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - - -- -- - -- - -- - -- - -- - - -- -- - -- - -- - -- - -- - - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/autoit.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/autoit.xml deleted file mode 100644 index 1f7e15df387925891e67516ad50edb9380f9dc31..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/autoit.xml +++ /dev/null @@ -1,70 +0,0 @@ - -- -AutoHotkey -autohotkey -ahk -*.ahk -*.ahkl -text/x-autohotkey -- -- -- -- -- -- -- -- -- -- -- -- -- -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/awk.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/awk.xml deleted file mode 100644 index 07476ff745ada7c75d6360db579b2b324a9cbfc6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/awk.xml +++ /dev/null @@ -1,95 +0,0 @@ -- -AutoIt -autoit -*.au3 -text/x-autoit -- -- -- -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ballerina.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ballerina.xml deleted file mode 100644 index d13c123191810b8850e8b7e38ca16858c27807a7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ballerina.xml +++ /dev/null @@ -1,97 +0,0 @@ -- -Awk -awk -gawk -mawk -nawk -*.awk -application/x-awk -- -- -- -- - - -- - -- - - -- - - -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- - - -- - - -- - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bash.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bash.xml deleted file mode 100644 index d704a8ffaa405c959f5124afee8f4d0bc740801f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bash.xml +++ /dev/null @@ -1,220 +0,0 @@ -- -Ballerina -ballerina -*.bal -text/x-ballerina -true -- -- -- -- - -- - -- - -- - -- -- - - - - -- - -- - -- - -- - -- -- - - - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bash_session.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bash_session.xml deleted file mode 100644 index 82c5fd6d0ff425ee7fd099f7779a6306d67deb45..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bash_session.xml +++ /dev/null @@ -1,25 +0,0 @@ -- -Bash -bash -sh -ksh -zsh -shell -*.sh -*.ksh -*.bash -*.ebuild -*.eclass -.env -*.env -*.exheres-0 -*.exlib -*.zsh -*.zshrc -.bashrc -bashrc -.bash_* -bash_* -zshrc -.zshrc -PKGBUILD -application/x-sh -application/x-shellscript -- -- - -- -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- -- - - -- - - -- - - -- - -- - -- - -- -- - - -- - -- -- - - -- - -- - -- - -- - -- - -- -- - - -- - -- -- - -- - - -- - -- - -- -- -- - - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/batchfile.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/batchfile.xml deleted file mode 100644 index d3e0627280e9c49e797d2f108db6ee3b0934c72e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/batchfile.xml +++ /dev/null @@ -1,660 +0,0 @@ -- -Bash Session -bash-session -console -shell-session -*.sh-session -text/x-sh -true -- -- -- -- -- - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/beef.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/beef.xml deleted file mode 100644 index 031a220f29fd0f350e37b3484553678e6aef3072..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/beef.xml +++ /dev/null @@ -1,120 +0,0 @@ -- -Batchfile -bat -batch -dosbatch -winbatch -*.bat -*.cmd -application/x-dos-batch -true -- -- -- -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - -- - - -- - -- -- - -- - -- -- - -- - - -- - -- - -- - -- - - -- - -- -- - - - -- -- - - - -- - - -- -- - - - - -- - -- -- - - - - -- -- - - - - -- - - -- -- - - - - -- -- - - - - - - - -- - - -- -- - - - - -- -- - - - - - - - -- - -- -- -- - - - - - -- - -- - - -- - - -- - -- -- - -- - -- -- - -- -- - - - -- - -- - -- -- - - -- -- - - - -- -- -- - - - - - -- - -- -- -- - - - - -- -- - - - -- -- -- - - - - -- -- - - - - -- -- - - - -- -- - - - - -- - - -- -- - - -- - - -- - -- - -- - -- - - -- - -- -- - - - -- -- - - - -- - - -- -- - - - - -- - -- -- - - - - -- -- - - - - -- - - -- -- - - - - -- -- - - - - - - - -- - - -- -- - - - - -- -- - - - - - - - -- - -- -- - - -- -- - - - - - -- - -- - - -- - - -- - -- -- - - -- - -- - -- -- -- - - - - -- -- - - - -- -- -- - - - -- -- - - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - - -- - -- - -- - -- - -- -- - - -- - -- - -- -- - - -- -- - - - -- -- -- - - - - -- - - -- -- - - - -- -- - - - -- - -- -- - -- - -- -- -- - - - - -- -- - - - - -- -- - -- - - -- - -- -- -- - - - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bibtex.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bibtex.xml deleted file mode 100644 index 8fde161b36ced2828d6072636bb16e34bbea7e85..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bibtex.xml +++ /dev/null @@ -1,152 +0,0 @@ -- -Beef -beef -*.bf -text/x-beef -true -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - - -- - -- - -- - -- -- - - - -- -- - - - -- - -- -- - - -- - -- -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bicep.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bicep.xml deleted file mode 100644 index db90f31b30a9e5088f82f1ac02f00b343ada07af..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bicep.xml +++ /dev/null @@ -1,84 +0,0 @@ -- -BibTeX -bib -bibtex -*.bib -text/x-bibtex -true -true -- -- -- -- - -- - - -- -- - - -- - - -- - -- -- - -- -- - -- - -- - - -- - - -- - -- - -- - -- -- - - -- - - -- - -- -- - -- - -- - - -- - - -- - - -- - -- -- - -- - - -- -- - -- - - -- - -- -- - -- - - -- -- - -- - - -- - -- -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/blitzbasic.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/blitzbasic.xml deleted file mode 100644 index 591b1ad0f4a201ec43799cd656993e21eef2add7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/blitzbasic.xml +++ /dev/null @@ -1,141 +0,0 @@ -- -Bicep -bicep -*.bicep -- -- -- -- - - -- - -- - - -- - -- - -- -- - - -- - -- -- - -- - -- - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bnf.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bnf.xml deleted file mode 100644 index 5c9842477b279dcede642fdb591711d86e99fc2c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bnf.xml +++ /dev/null @@ -1,28 +0,0 @@ -- -BlitzBasic -blitzbasic -b3d -bplus -*.bb -*.decls -text/x-bb -true -- -- -- -- - -- - - -- - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - - - -- -- - - - - - - - - - -- -- - - - - - - - - - -- -- - - - -- - -- - -- - -- -- - - - - - - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bqn.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bqn.xml deleted file mode 100644 index c1090ea5a3ef13106e5c40a6de129636382ba6cd..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/bqn.xml +++ /dev/null @@ -1,83 +0,0 @@ -- -BNF -bnf -*.bnf -text/x-bnf -- -- -- -- -- - - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/brainfuck.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/brainfuck.xml deleted file mode 100644 index 4c84c33082f1e14359d7baa3042cf6b2c2a36e3e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/brainfuck.xml +++ /dev/null @@ -1,51 +0,0 @@ -- -BQN -bqn -*.bqn -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c#.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c#.xml deleted file mode 100644 index f1e21db03f05a76010a10e0e25342854f7f6ae57..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c#.xml +++ /dev/null @@ -1,121 +0,0 @@ -- -Brainfuck -brainfuck -bf -*.bf -*.b -application/x-brainfuck -- -- -- -- - -- - -- - -- - -- -- - - -- - -- - -- -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c++.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c++.xml deleted file mode 100644 index 680a19afba529d7ee1e0b7149c21b23d902a9ed2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c++.xml +++ /dev/null @@ -1,331 +0,0 @@ -- -C# -csharp -c# -*.cs -text/x-csharp -true -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - - -- - -- - -- - -- -- - - - -- -- - - - -- - -- -- - - -- - -- -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c.xml deleted file mode 100644 index 35ee32dce68aadd5926ee1b026d4c3a714162f00..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/c.xml +++ /dev/null @@ -1,260 +0,0 @@ -- -C++ -cpp -c++ -*.cpp -*.hpp -*.c++ -*.h++ -*.cc -*.hh -*.cxx -*.hxx -*.C -*.H -*.cp -*.CPP -*.tpp -text/x-c++hdr -text/x-c++src -true -- -- - - -- -- -- -- - - -- - - -- - - -- -- - - -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- -- - - - -- - -- - -- - - -- - -- - -- - - -- -- - -- -- - - - - - -- -- - - - -- - -- -- - - - - - - - -- -- - - - -- -- - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - -- - -- - -- - - -- - - -- -- - - -- - -- - -- - -- - -- -- - - -- - - -- - - -- - -- -- - -- -- - - - - - - -- -- - - - - - -- - -- - -- - -- -- - -- - -- - - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cap_n_proto.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cap_n_proto.xml deleted file mode 100644 index 3e7d1470bf75f0cabea0cfcacfe8f3584dd527df..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cap_n_proto.xml +++ /dev/null @@ -1,122 +0,0 @@ -- -C -c -*.c -*.h -*.idc -*.x[bp]m -text/x-chdr -text/x-csrc -image/x-xbitmap -image/x-xpixmap -true -- -- - - -- -- -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- - - -- -- - - -- - -- - -- - -- - -- -- -- - - - -- - -- - -- - - -- - -- - -- - - -- -- - - -- - - -- - - -- - -- -- - - -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- -- - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- -- - -- -- - - - - - - -- -- - - - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cassandra_cql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cassandra_cql.xml deleted file mode 100644 index 1a78f99a143dc0649c1a9cdf064e8fed77c36eaf..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cassandra_cql.xml +++ /dev/null @@ -1,137 +0,0 @@ -- -Cap'n Proto -capnp -*.capnp -- -- -- -- - -- - -- - - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- - -- -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ceylon.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ceylon.xml deleted file mode 100644 index 4c4121835b204f8e19c9aea81d0896b1740e04ba..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ceylon.xml +++ /dev/null @@ -1,151 +0,0 @@ -- -Cassandra CQL -cassandra -cql -*.cql -text/x-cql -true -true -- -- -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - - -- -- - -- - -- - - -- - -- - -- - -- -1 -6 -- -- - - - - - - - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - -- - -- - -- -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cfengine3.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cfengine3.xml deleted file mode 100644 index 49503050506e65db73d0c0272ffa461c340b983f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cfengine3.xml +++ /dev/null @@ -1,197 +0,0 @@ -- -Ceylon -ceylon -*.ceylon -text/x-ceylon -true -- -- -- -- - - -- -- - - -- -- - -- - - -- - - -- - -- -- -- - - - - -- - -- - -- - - -- - -- - -- - -- - -- -- - - -- - -- -- - - - -- -- - - - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cfstatement.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cfstatement.xml deleted file mode 100644 index 46a84cf6ab73bf468937a67622dd1fd756b18635..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cfstatement.xml +++ /dev/null @@ -1,92 +0,0 @@ -- -CFEngine3 -cfengine3 -cf3 -*.cf -- -- -- -- - - -- - - -- - -- -- - - -- - -- - -- - -- -- - -- - -- -- - - - - - -- -- - - - - - - - -- -- - - - - - -- -- - - - - -- -- - - -- - - -- - - -- - - -- -- - - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - - -- - -- - -- -- - - -- - -- - - -- - -- - -- -- - - -- - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/chaiscript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/chaiscript.xml deleted file mode 100644 index 860439aa8a91e34c9c471db1f8e7241ec0b4b159..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/chaiscript.xml +++ /dev/null @@ -1,134 +0,0 @@ -- -cfstatement -cfs -true -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - -- - -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/chapel.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/chapel.xml deleted file mode 100644 index c89cafc6abfdae26be08c789206a67424f4a76a1..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/chapel.xml +++ /dev/null @@ -1,143 +0,0 @@ -- -ChaiScript -chai -chaiscript -*.chai -text/x-chaiscript -application/x-chaiscript -true -- -- -- -- - -- - -- - -- - -- - -- - - -- -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - - -- -- - -- - -- - -- - - -- - - -- - -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cheetah.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cheetah.xml deleted file mode 100644 index 284457c6c668349dbb850acd12309546f2ddca3d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cheetah.xml +++ /dev/null @@ -1,55 +0,0 @@ -- -Chapel -chapel -chpl -*.chpl -- -- -- -- - - -- - - -- - -- -- - -- - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/clojure.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/clojure.xml deleted file mode 100644 index 967ba399cb62d5257ce4c5cebcf289d8282a0cf5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/clojure.xml +++ /dev/null @@ -1,71 +0,0 @@ -- -Cheetah -cheetah -spitfire -*.tmpl -*.spt -application/x-cheetah -application/x-spitfire -- -- -- -- -- - -- - -- - -- - -- -- - - - -- -- - - -- -- - - - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cmake.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cmake.xml deleted file mode 100644 index b041cfd016e23e9e6ba1d71085ed4ba310a8f0c0..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cmake.xml +++ /dev/null @@ -1,90 +0,0 @@ -- -Clojure -clojure -clj -edn -*.clj -*.edn -text/x-clojure -application/x-clojure -application/edn -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cobol.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cobol.xml deleted file mode 100644 index a8a80291d43b5591558f632a7ddaee73769d3514..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cobol.xml +++ /dev/null @@ -1,90 +0,0 @@ -- -CMake -cmake -*.cmake -CMakeLists.txt -text/x-cmake -- -- -- -- -- - - - - -- - -- - -- -- - - -- - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - - -- -- - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/coffeescript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/coffeescript.xml deleted file mode 100644 index e29722fb83c6bf6d56bbe3bcaf0bfaa44acf34bd..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/coffeescript.xml +++ /dev/null @@ -1,210 +0,0 @@ -- -COBOL -cobol -*.cob -*.COB -*.cpy -*.CPY -text/x-cobol -true -- -- -- -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/common_lisp.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/common_lisp.xml deleted file mode 100644 index 0fb9a7a4b337d8d3de1eef0fdccae920f0b49af3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/common_lisp.xml +++ /dev/null @@ -1,184 +0,0 @@ -- -CoffeeScript -coffee-script -coffeescript -coffee -*.coffee -text/coffeescript -true -true -- -- -- -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- - - -- - -- - -- -- - - -- - -- - -- -- - - -- - -- - - -- - -- - -- -- - - -- - -- - -- -- - - -- - -- - - -- - -- - -- -- - -- - - -- - - -- - - -- - - -- - -- - - -- - -- - -- - - -- - - -- - - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- -- - - -- - -- -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/coq.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/coq.xml deleted file mode 100644 index 62f64ff9925e573691f58e10c0eb5cf7fcb8d89b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/coq.xml +++ /dev/null @@ -1,136 +0,0 @@ -- -Common Lisp -common-lisp -cl -lisp -*.cl -*.lisp -text/x-common-lisp -true -- -- -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - - -- - - -- -- - -- -- - - -- - - -- - -- - -- -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/crystal.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/crystal.xml deleted file mode 100644 index 94853db33ff772f26a5d0065120e2187fe0ce71c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/crystal.xml +++ /dev/null @@ -1,762 +0,0 @@ -- -Coq -coq -*.v -text/x-coq -- -- -- -- - -- - -- - - -- -- - -- - -- - -- - - -- - - -- - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/css.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/css.xml deleted file mode 100644 index 6e370c763ed94addf9085029a1a8b6a878ea86ae..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/css.xml +++ /dev/null @@ -1,323 +0,0 @@ -- -Crystal -cr -crystal -*.cr -text/x-crystal -true -- -- -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - -- - -- - - -- -- - - -- -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- -- - - -- - - -- - -- - -- -- - -- - -- - -- -- - - -- - - -- - -- -- - -- - -- - -- - - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- -- - - - - - -- - -- -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - - -- - - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - - -- - - -- - -- -- - - -- -- - -- - -- - -- -- - - - -- -- - - - - -- - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - - -- -- - - - -- - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- -- - - - - -- -- - - -- -- - - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - - -- -- - -- - - -- - - -- - -- - -- -- - -- - - -- - - -- - -- - -- -- - -- - -- - -- - -- - - -- -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- - -- -- - - - -- -- - - - -- - -- -- - -- - - -- - - -- - -- - -- -- -- - - - - -- - -- -- - -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/csv.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/csv.xml deleted file mode 100644 index b70c2f8b1d7159a8c349b606d440c82680f1d969..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/csv.xml +++ /dev/null @@ -1,53 +0,0 @@ - - -- -CSS -css -*.css -text/css -- -- -- -- - -- - -- - -- -- - - -- - - -- - -- -- - -- - - -- -- - -- - -- - -- -- - - - -- -- - - - -- - -- - -- - -- -- - -- -- - -- - - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- -- - -- - -- - - -- -- - - -- -- - - -- -- - - -- -- - - - -- - -- - -- - -- - -- -- - -- - - -- - -- - -- - -- -- - - - - -- -- - - - - -- -- - - - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- -- -- - - - - -- -- - - - - -- -- - - - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cue.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cue.xml deleted file mode 100644 index 2a12f395397786d523c1de20d5cc277e09de3b12..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cue.xml +++ /dev/null @@ -1,85 +0,0 @@ -- -CSV -csv -*.csv -text/csv -- -- -- -- - -- - -- - - -- - -- -- - -- - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cython.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cython.xml deleted file mode 100644 index 15dfe4d4f2d80d9388b8c59dbfb24fccea0bd507..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/cython.xml +++ /dev/null @@ -1,372 +0,0 @@ -- -CUE -cue -*.cue -text/x-cue -true -true -- -- -- -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - -- - -- - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/d.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/d.xml deleted file mode 100644 index 3c030e2272c5e937dba44470b7fe2c27ce19743f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/d.xml +++ /dev/null @@ -1,133 +0,0 @@ -- -Cython -cython -pyx -pyrex -*.pyx -*.pxd -*.pxi -text/x-cython -application/x-cython -- -- -- -- - - -- -- - -- -- - - -- -- - - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - - - - - - - -- - -- -- - - - -- -- - - - -- -- - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- - -- -- - -- -- - -- - -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- -- - -- - -- -- -- - - - -- - -- - -- -- - -- -- - - -- - -- - -- -- - - -- - -- - -- -- -- - - - -- - -- -- - - - -- - -- -- - -- - -- -- - -- - -- -- - - - -- -- - - - -- - - -- - -- - - -- - - -- - -- - -- -- - - -- -- - - -- - -- - -- -- - - -- - -- - -- -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dart.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dart.xml deleted file mode 100644 index f1b454fafc94560650438071c6fa00a42bca6f14..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dart.xml +++ /dev/null @@ -1,213 +0,0 @@ -- -D -d -*.d -*.di -text/x-d -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- -- - - - - -- - -- - -- - -- - -- -- - - - -- - -- -- - - - -- -- - - - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dax.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dax.xml deleted file mode 100644 index 2bb3a1aa7f5b1e71631b2aca1b96c23a6abd9733..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dax.xml +++ /dev/null @@ -1,39 +0,0 @@ -- -Dart -dart -*.dart -text/x-dart -true -- -- -- -- - - -- - -- - -- - -- -- - - -- -- - -- - -- - -- - -- - -- - - -- -- - - -- - -- - -- - -- -- - -- - -- - - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- -- - -- -- - - -- -- - - - -- -- - - -- - -- - -- - -- -- - - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/desktop_entry.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/desktop_entry.xml deleted file mode 100644 index ad71ad471513900931fddecf287efcf68267b5fd..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/desktop_entry.xml +++ /dev/null @@ -1,17 +0,0 @@ -- -Dax -dax -*.dax -- -- -- -- - -- - -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/diff.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/diff.xml deleted file mode 100644 index dc0beb7fdfd219746bacfcc66d98af3e41ed8f07..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/diff.xml +++ /dev/null @@ -1,52 +0,0 @@ -- -Desktop file -desktop -desktop_entry -*.desktop -application/x-desktop -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/django_jinja.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/django_jinja.xml deleted file mode 100644 index 3c97c222ea7d1f6f6607b5d9efc76f67160ba1a0..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/django_jinja.xml +++ /dev/null @@ -1,153 +0,0 @@ -- -Diff -diff -udiff -*.diff -*.patch -text/x-diff -text/x-patch -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dns.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dns.xml deleted file mode 100644 index ef8f663f968c99cdb5a23f84a88523d50cf162c6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dns.xml +++ /dev/null @@ -1,44 +0,0 @@ - -- -Django/Jinja -django -jinja -application/x-django-templating -application/x-jinja -true -- -- -- -- - -- -- - - - -- - -- -- - -- -- - - - -- - -- - -- -- - -- - - -- - -- -- - - - - - - - - - - - -- -- - - - - - - - - - - - -- -- - - - - - - -- -- - - - - -- - -- -- -- - - - -- -- - - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/docker.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/docker.xml deleted file mode 100644 index a73c52cd972e1cdd7de348f271fb34b0fca95b42..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/docker.xml +++ /dev/null @@ -1,57 +0,0 @@ -- -dns -zone -bind -*.zone -text/dns -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dtd.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dtd.xml deleted file mode 100644 index 0edbbdeacebb9e8c091c9210965f639c11aa6ac6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dtd.xml +++ /dev/null @@ -1,168 +0,0 @@ -- -Docker -docker -dockerfile -Dockerfile -Dockerfile.* -*.Dockerfile -*.docker -text/x-dockerfile-config -true -- -- -- -- - -- -- - - -- -- - - -- -- - - - -- -- - - -- -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dylan.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dylan.xml deleted file mode 100644 index 3660d144042816b87b7b1d3936e3d372d6f53537..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/dylan.xml +++ /dev/null @@ -1,176 +0,0 @@ -- -DTD -dtd -*.dtd -application/xml-dtd -true -- -- -- -- - -- - -- - - -- - -- - -- - -- -- - -- - - -- - -- -- - -- - -- - -- - - -- -- - -- - -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- -- - -- -- - - - - -- -- - - - - -- -- - - - - -- -- - - - - -- -- - - - - -- -- - - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ebnf.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ebnf.xml deleted file mode 100644 index df5d62ffa6d2078ad27d2233c79dd06a4148ace5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ebnf.xml +++ /dev/null @@ -1,90 +0,0 @@ -- -Dylan -dylan -*.dylan -*.dyl -*.intr -text/x-dylan -true -- -- -- -- - - -- - -- - -- - -- - -- -- - -- - -- -- - - - -- - -- -- - -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- -- - - - - -- -- - - - -- -- - - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - - -- -- - -- - - -- - - -- - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/elixir.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/elixir.xml deleted file mode 100644 index 286f53a24150c53599ca773f3acee272481eb685..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/elixir.xml +++ /dev/null @@ -1,744 +0,0 @@ -- -EBNF -ebnf -*.ebnf -text/x-ebnf -- -- -- -- - -- - -- - - -- - -- -- - -- -- - -- - -- - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- -- - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/elm.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/elm.xml deleted file mode 100644 index ed65efc638d80d41b82871f7389c186a810b7808..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/elm.xml +++ /dev/null @@ -1,119 +0,0 @@ -- -Elixir -elixir -ex -exs -*.ex -*.eex -*.exs -text/x-elixir -- -- -- -- - -- - -- - -- - - -- - -- -- - - -- - -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - -- - -- - - -- - -- -- - -- - -- - - -- -- - - -- - -- -- - - -- - -- -- - - -- - -- -- - - -- - -- -- - - -- -- - -- - -- - - -- -- - -- - - -- - - -- - - -- -- - -- - -- - -- - - -- - -- -- - -- - - -- -- - -- - -- -- - - - - -- -- - - -- -- - - -- - -- - -- - -- - -- - -- - - -- - - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - -- - - -- - - -- -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- -- - - -- - -- -- - -- - -- - -- -- - - -- - -- -- - -- - -- - -- - - -- - -- -- - -- - -- - - -- -- - -- - -- - -- - - -- - -- -- - -- - -- - -- - - -- - -- -- - -- - -- - -- -- - -- - -- - -- - - -- - -- -- - -- - - -- - - -- -- - - -- - -- -- - -- - -- - -- - -- - -- -- - -- - -- - -- -- - - -- - -- -- - -- - -- - -- -- - - -- - -- -- - -- - -- - - -- -- - -- - -- - -- - - -- - -- -- - -- - -- - - -- -- - - -- - -- -- - -- - -- - -- -- - - -- - -- -- -- - - - -- - -- - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/emacslisp.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/emacslisp.xml deleted file mode 100644 index 668bc621eae647becb542dbffc3a96404ea085b9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/emacslisp.xml +++ /dev/null @@ -1,132 +0,0 @@ -- -Elm -elm -*.elm -text/x-elm -- -- -- -- - -- - - -- - -- -- - - -- - -- - -- - - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - -- - - -- -- - -- - -- - -- - - -- -- - - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/erlang.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/erlang.xml deleted file mode 100644 index b18658868248486b68df62b4afe1423131b59953..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/erlang.xml +++ /dev/null @@ -1,166 +0,0 @@ -- -EmacsLisp -emacs -elisp -emacs-lisp -*.el -text/x-elisp -application/x-elisp -- -- -- -- - -- - -- - -- - -- - -- - - -- -- - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/factor.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/factor.xml deleted file mode 100644 index 4743b9a2e8d0f678827d317b214d86db6b401348..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/factor.xml +++ /dev/null @@ -1,412 +0,0 @@ -- -Erlang -erlang -*.erl -*.hrl -*.es -*.escript -text/x-erlang -- -- -- -- - -- - -- - -- - -- - -- - - -- - -- - - -- - -- - -- -- - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- -- - -- - - -- - -- - -- - -- -- -- - - - - - -- -- - - - - - -- - - -- -- - -- - - -- - - -- - - -- -- - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fennel.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fennel.xml deleted file mode 100644 index b9b6d59506e97cf7a775814888ebc158db8e9e1c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fennel.xml +++ /dev/null @@ -1,68 +0,0 @@ -- -Factor -factor -*.factor -text/x-factor -- -- -- -- - -- -- - - - -- -- - - - - - -- -- - - - - - -- -- - - - -- -- - - - - - -- - - -- - -- -- - - - -- -- - - - -- -- - - - - - -- -- - - - - - -- -- - - - - - - - -- -- - - - - - -- -- - - - -- -- - - - - - - -- -- - - - - -- -- - - - -- -- - - - - - -- -- - - - - - -- -- - - - - - -- -- - - - -- -- - - - -- - - -- -- - - - -- - - -- - -- - -- -- - - - -- -- - - - - -- -- - - - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- -- - -- - - -- -- - - - -- - -- -- - -- - - -- - -- -- - -- - - -- - -- -- - -- - - -- - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fish.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fish.xml deleted file mode 100644 index deb78145e32ae258918f2ed47d0322eb14505de9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fish.xml +++ /dev/null @@ -1,159 +0,0 @@ -- -Fennel -fennel -fnl -*.fennel -text/x-fennel -application/x-fennel -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/forth.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/forth.xml deleted file mode 100644 index 31096a225d157a038cee9365c64ac6b084cb9e07..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/forth.xml +++ /dev/null @@ -1,78 +0,0 @@ -- -Fish -fish -fishshell -*.fish -*.load -application/x-fish -- -- -- -- - - -- - -- -- - - -- - -- - -- - -- - -- - -- -- - -- - -- - -- -- - - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fortran.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fortran.xml deleted file mode 100644 index 6140e704146dbc255035caef5bde5b5420f41bc1..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fortran.xml +++ /dev/null @@ -1,102 +0,0 @@ -- -Forth -forth -*.frt -*.fth -*.fs -application/x-forth -true -- -- -- -- - -- - -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - - -- -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fortranfixed.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fortranfixed.xml deleted file mode 100644 index 11343c0e73820814df65fd1b110fd382382cb941..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fortranfixed.xml +++ /dev/null @@ -1,71 +0,0 @@ -- -Fortran -fortran -f90 -*.f03 -*.f90 -*.f95 -*.F03 -*.F90 -*.F95 -text/x-fortran -true -- -- -- -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fsharp.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fsharp.xml deleted file mode 100644 index e1c19ffb45804efc794c83937234008b533e9379..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/fsharp.xml +++ /dev/null @@ -1,245 +0,0 @@ -- -FortranFixed -fortranfixed -*.f -*.F -text/x-fortran -true -true -- -- -- -- - - -- - - -- -- -- - - - - -- -- - - - - -- -- - - - -- -- - -- -- - -- - -- - -- - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gas.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gas.xml deleted file mode 100644 index 7557bce0f22f0c38a976d681431fc6a648ff2cca..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gas.xml +++ /dev/null @@ -1,150 +0,0 @@ -- -FSharp -fsharp -*.fs -*.fsi -text/x-fsharp -- -- -- -- - -- - - -- - - -- - - -- - - -- - - -- - -- -- - -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- -- - -- - -- - - -- - -- -- - -- - -- - -- - -- -- - -- - -- - - -- - -- - -- - -- - - -- - - -- - - -- - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - -- - -- - -- - - -- - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gdscript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gdscript.xml deleted file mode 100644 index 811f38d0283652c34aa0e17da3bec4668ac55324..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gdscript.xml +++ /dev/null @@ -1,259 +0,0 @@ -- -GAS -gas -asm -*.s -*.S -text/x-gas -0.1 -- -- -- -- - -- -- - -- - -- - - -- - -- - - -- - -- -- - -- - -- - -- - -- - -- - - -- - - -- - -- - - -- - -- - -- -- -- - - - - - -- -- - - - - - - - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - - -- - -- - -- -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gdscript3.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gdscript3.xml deleted file mode 100644 index b50c9dd7b6c55b089a68835c6583a43db1d29d48..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gdscript3.xml +++ /dev/null @@ -1,270 +0,0 @@ -- -GDScript -gdscript -gd -*.gd -text/x-gdscript -application/x-gdscript -0.1 -- -- - -- -- -- - - -- - -- -- - - -- - -- -- - -- - -- - -- - -- - -- -- - -- - -- -- - - -- - -- -- - -- - -- - -- - -- - -- -- - - -- -- - -- - -- - -- - -- - -- -- - - -- - -- -- - - -- -- - -- - -- -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - - -- - - -- - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gherkin.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gherkin.xml deleted file mode 100644 index c53a2cbb5b84aa53182725e30020f2a49031b5e3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gherkin.xml +++ /dev/null @@ -1,263 +0,0 @@ -- -GDScript3 -gdscript3 -gd3 -*.gd -text/x-gdscript -application/x-gdscript -- -- - - - -- -- -- - -- - -- - -- -- - - -- - -- - -- -- - -- -- - - -- -- - -- - -- - -- - -- -- - - -- - -- -- - -- - -- - -- - -- -- - - -- - -- - -- -- - -- -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- -- - -- -- - - -- - -- - -- -- - - -- - -- - -- -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gleam.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gleam.xml deleted file mode 100644 index 6205aa15ce2540e373d71e9b3605d4b1e02cb712..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gleam.xml +++ /dev/null @@ -1,117 +0,0 @@ -- -Gherkin -cucumber -Cucumber -gherkin -Gherkin -*.feature -*.FEATURE -text/x-gherkin -- -- -- -- - -- -- - - -- - -- - -- -- - - -- - -- - -- - -- - - -- - -- -- - -- -- - -- -- - - -- - -- -- - - -- - -- - -- -- - - -- - -- - -- - -- - -- -- - - -- - -- -- - - -- - -- -- - - -- - -- - -- -- - - -- - -- -- - - -- - -- -- - -- - -- -- - - -- - -- - -- - -- - -- -- -- - - - - - -- -- - -- - -- -- - -- - -- - - -- - - -- - - -- - -- - -- -- - - -- -- - - - -- -- - - - - -- -- - - - - - -- -- - - - - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/glsl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/glsl.xml deleted file mode 100644 index ca0b696de61555933e9713711c4c0944d4d8bf9d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/glsl.xml +++ /dev/null @@ -1,65 +0,0 @@ -- -Gleam -gleam -*.gleam -text/x-gleam -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - - -- -- - - -- -- - - -- - -- -- - -- - - -- - -- -- - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gnuplot.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gnuplot.xml deleted file mode 100644 index ee6a245f38ae7a18aa419f91b26d236a613c1e86..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/gnuplot.xml +++ /dev/null @@ -1,289 +0,0 @@ -- -GLSL -glsl -*.vert -*.frag -*.geo -text/x-glslsrc -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/go_template.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/go_template.xml deleted file mode 100644 index 36f737b93f92c6766fa6717c66448df7089c8265..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/go_template.xml +++ /dev/null @@ -1,114 +0,0 @@ -- -Gnuplot -gnuplot -*.plot -*.plt -text/x-gnuplot -- -- -- -- - - -- - -- -- - -- - -- -- - -- - -- - -- -- - -- - -- -- - - -- - -- -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - -- - -- - -- - -- -- - -- - - -- - - -- - - -- -- - - - - -- - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- -- - - - - -- -- - - - - -- - -- - -- -- - - -- - -- - -- - -- - -- - - -- -- - -- - - -- -- - - -- - -- - -- -- - -- - -- -- - -- - - -- - - -- -- - -- - - -- - -- - -- - -- - - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/graphql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/graphql.xml deleted file mode 100644 index b06227357df8c0e279ba71c224659a817b938eeb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/graphql.xml +++ /dev/null @@ -1,88 +0,0 @@ -- -Go Template -go-template -*.gotmpl -*.go.tmpl -- -- -- -- - - -- - - -- - - -- - -- - -- -- - - -- - -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/groff.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/groff.xml deleted file mode 100644 index 3af0a43e7af798ecf31867887a8b61fcb7341e1f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/groff.xml +++ /dev/null @@ -1,90 +0,0 @@ -- -GraphQL -graphql -graphqls -gql -*.graphql -*.graphqls -- -- -- -- - - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/groovy.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/groovy.xml deleted file mode 100644 index 3cca2e9a5bc9fc67baa6f6b97127eecfe7e21ccd..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/groovy.xml +++ /dev/null @@ -1,135 +0,0 @@ -- -Groff -groff -nroff -man -*.[1-9] -*.1p -*.3pm -*.man -application/x-troff -text/troff -- -- -- -- - - -- - -- - -- - -- - -- - -- -- -- - - - -- - - -- - - -- - -- -- - -- - -- - - -- -- - -- - -- - -- - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/handlebars.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/handlebars.xml deleted file mode 100644 index 7cf2a648a9badbdf97d0c6f1c7ef1ce580836a7d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/handlebars.xml +++ /dev/null @@ -1,147 +0,0 @@ -- -Groovy -groovy -*.groovy -*.gradle -text/x-groovy -true -- -- -- -- - - -- - -- -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hare.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hare.xml deleted file mode 100644 index c1f7e9433c54511d21aa8c71dfffe6352db0f093..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hare.xml +++ /dev/null @@ -1,98 +0,0 @@ -- -Handlebars -handlebars -hbs -*.handlebars -*.hbs -- -- -- -- - -- - -- -- - - - -- -- - - - -- -- - -- - - -- - - -- -- - - -- - -- -- - - -- -- - - -- -- - - - -- -- - - - -- -- - - - - -- - -- -- - -- - - -- -- - - - - -- -- - - - -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/haskell.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/haskell.xml deleted file mode 100644 index 1fad082316173fa824c074bde7dd428fc71cbfa3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/haskell.xml +++ /dev/null @@ -1,275 +0,0 @@ -- -Hare -hare -*.ha -text/x-hare -- -- -- -- - - -- - -- - -- - -- -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hcl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hcl.xml deleted file mode 100644 index d3ed208af9650d04b6594289829c31eb8018d801..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hcl.xml +++ /dev/null @@ -1,143 +0,0 @@ -- -Haskell -haskell -hs -*.hs -text/x-haskell -- -- -- -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- -- - -- - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - - - - - - -- -- - - - - - - -- -- - - - - -- - - -- -- - -- -- - - - - -- - - -- -- - -- - -- - -- - -- - - -- - -- - -- - - -- - - -- -- - -- - - -- - - -- - -- -- - - -- - - -- - - -- -- - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hexdump.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hexdump.xml deleted file mode 100644 index a6f28eab1ae2d4977782a99781452f826b6bd6ab..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hexdump.xml +++ /dev/null @@ -1,189 +0,0 @@ -- -HCL -hcl -*.hcl -application/x-hcl -- -- -- -- - -- -- -- - -- -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - -- -- - - - -- - -- - -- - - -- -- - -- - -- -- -- - - - -- - -- - -- -- - - -- - -- - -- - -- - -- - - -- -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hlb.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hlb.xml deleted file mode 100644 index 64e667dd7c250223243f9a75eafb49ee64a0b952..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hlb.xml +++ /dev/null @@ -1,149 +0,0 @@ -- -Hexdump -hexdump -- -- -- -- -- - - - -- - -- -- - - -- - -- - -- -- - -- - -- - -- -- - - - - -- - -- - -- -- - -- - -- - -- -- - - - - -- - -- - -- -- - -- - -- -- - - - -- - -- -- - - -- -- - - -- - -- - -- -- - -- - -- -- - - - -- - -- -- - - - - - -- -- - - - - - -- -- - - - - -- -- - - - - -- -- - - -- -- - - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hlsl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hlsl.xml deleted file mode 100644 index 41ab32395bc0deb13bf2dda34c4040389186dbfb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hlsl.xml +++ /dev/null @@ -1,110 +0,0 @@ -- -HLB -hlb -*.hlb -- -- -- -- -- - -- -- - -- -- - -- -- - -- -- - - - -- -- - - -- - -- - -- -- - - -- - -- - -- -- -- - - -- -- - -- -- - -- -- - -- - - -- -- - -- -- - - - -- -- - - - - -- -- - -- - -- - -- -- -- - - -- -- - -- -- - -- -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/holyc.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/holyc.xml deleted file mode 100644 index cd2d9d16b2affd739767e492ceccdcfe4e7799fa..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/holyc.xml +++ /dev/null @@ -1,252 +0,0 @@ -- -HLSL -hlsl -*.hlsl -*.hlsli -*.cginc -*.fx -*.fxh -text/x-hlsl -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/html.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/html.xml deleted file mode 100644 index 2f1a8a9790fea1c60b64b77c1ad113eaf425249b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/html.xml +++ /dev/null @@ -1,159 +0,0 @@ -- -HolyC -holyc -*.HC -*.hc -*.HH -*.hh -*.hc.z -*.HC.Z -text/x-chdr -text/x-csrc -image/x-xbitmap -image/x-xpixmap -true -- -- -- -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- - - -- -- - - -- - -- - -- - -- - -- -- -- - - - -- - -- - -- - - -- - -- - -- - - -- -- - - -- - - -- - - -- - -- -- - - -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- -- - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- -- - -- -- - - - - - - -- -- - - - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hy.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hy.xml deleted file mode 100644 index a0dae46aec1fba4d92756a4e18b6bd388ee60319..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/hy.xml +++ /dev/null @@ -1,104 +0,0 @@ -- -HTML -html -*.html -*.htm -*.xhtml -*.xslt -text/html -application/xhtml+xml -true -true -true -- -- -- -- -- - - - - - - - - -- - -- -- -- - - - - - - - - -- - -- -- - - -- - - -- - - -- -- - -- - -- - -- - - -- - -- - -- -- - - - - - -- -- - - - - - -- -- - - - - -- -- - - - - - - - -- -- - -- - - -- - -- -- - -- -- - - - - -- - -- -- - - - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/idris.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/idris.xml deleted file mode 100644 index 9592d88228f2ffd798b28bd0f4457101fb2de4a4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/idris.xml +++ /dev/null @@ -1,216 +0,0 @@ -- -Hy -hylang -*.hy -text/x-hy -application/x-hy -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/igor.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/igor.xml deleted file mode 100644 index 1cc020570583c256a6674383864654a41cba9e6e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/igor.xml +++ /dev/null @@ -1,47 +0,0 @@ -- -Idris -idris -idr -*.idr -text/x-idris -- -- -- -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- -- -- - - -- -- - - -- -- - - -- -- - - - -- -- - - - - - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - -- -- - -- -- - - - - -- - - -- -- - -- - -- - -- - -- - - -- - -- - -- - - -- - - -- -- - -- - - -- - - -- - -- -- - -- - - -- - - -- -- - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ini.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ini.xml deleted file mode 100644 index 08f3870be284ce658dcac09ca1b8c49b8b483e73..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ini.xml +++ /dev/null @@ -1,45 +0,0 @@ -- -Igor -igor -igorpro -*.ipf -text/ipf -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/io.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/io.xml deleted file mode 100644 index 9ad94fa52a2548f2332a78ddee1bef113b934714..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/io.xml +++ /dev/null @@ -1,71 +0,0 @@ -- -INI -ini -cfg -dosini -*.ini -*.cfg -*.inf -*.service -*.socket -.gitconfig -.editorconfig -pylintrc -.pylintrc -text/x-ini -text/inf -0.1 -- -- -- -- - -- - -- - -- -- - - - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/iscdhcpd.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/iscdhcpd.xml deleted file mode 100644 index 645cb05d5098b9c7567d433463f61ac8f2f170e2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/iscdhcpd.xml +++ /dev/null @@ -1,96 +0,0 @@ -- -Io -io -*.io -text/x-iosrc -- -- -- -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/j.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/j.xml deleted file mode 100644 index 872d08122bbc6d14567e453c299d27446407f76e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/j.xml +++ /dev/null @@ -1,157 +0,0 @@ -- -ISCdhcpd -iscdhcpd -dhcpd.conf -- -- -- -- - - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- -- - - - -- - -- - -- -- - - -- - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/java.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/java.xml deleted file mode 100644 index 3ce33ff6dc616c53571458d968b991e5babf862f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/java.xml +++ /dev/null @@ -1,193 +0,0 @@ -- -J -j -*.ijs -text/x-j -- -- -- -- - -- - -- - - -- -- - -- - -- - - -- - -- - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - -- - - -- - -- -- - -- - -- - -- - - -- - -- -- - -- - -- - -- - -- - -- -- - -- - - -- - -- -- - - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/javascript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/javascript.xml deleted file mode 100644 index efe80ed3758302c85abd24747982cd7e2bcabab9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/javascript.xml +++ /dev/null @@ -1,160 +0,0 @@ -- -Java -java -*.java -text/x-java -true -- -- -- -- -- - - - - -- - -- -- - - -- - -- - -- -- - - - - -- - -- - -- - -- -- - - - -- - -- - - -- -- - - - -- -- - - - -- - - -- - - -- - -- -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- -- - - -- -- - - -- -- - - -- - -- - -- -- - -- - -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/json.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/json.xml deleted file mode 100644 index a34abfa49805ac6d7220182a34e10d98e55a7031..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/json.xml +++ /dev/null @@ -1,112 +0,0 @@ -- -JavaScript -js -javascript -*.js -*.jsm -*.mjs -*.cjs -application/javascript -application/x-javascript -text/x-javascript -text/javascript -true -true -- -- -- -- - - -- - -- - -- - -- - - -- - -- - -- -- - - -- - -- -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - - -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jsonata.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jsonata.xml deleted file mode 100644 index c0eafabe34942ba7ff3f5282d8c35b820e4faf7c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jsonata.xml +++ /dev/null @@ -1,83 +0,0 @@ -- -JSON -json -*.json -*.jsonc -*.avsc -application/json -true -true -- -- -- -- - -- -- - -- -- - -- -- - -- - -- - -- - -- -- - -- - -- - - -- - - -- -- - -- - -- - - -- - - -- -- - -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jsonnet.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jsonnet.xml deleted file mode 100644 index 1633a5e4031dc23b4d636ef35a046cfedf170038..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jsonnet.xml +++ /dev/null @@ -1,138 +0,0 @@ - -- -JSONata -jsonata -*.jsonata -true -- -- -- -- - -- // Spread operator - -- // Sort operator - -- // Descendant | Wildcard | Multiplication - -- // Division - -- // Comparison operators - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/julia.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/julia.xml deleted file mode 100644 index 776dcdbcbb27442bdeddc57cd4ba5d0defef546b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/julia.xml +++ /dev/null @@ -1,400 +0,0 @@ -- -Jsonnet -jsonnet -*.jsonnet -*.libsonnet -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jungle.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jungle.xml deleted file mode 100644 index 92c785d0c31e6451a4613f52096e48fad85e42a9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/jungle.xml +++ /dev/null @@ -1,98 +0,0 @@ -- -Julia -julia -jl -*.jl -text/x-julia -application/x-julia -- -- -- -- -- - - - -- - -- - -- - -- - -- - -- -- - - -- - - -- - -- - -- -- - - -- - -- - -- -- -- - - - -- - -- - -- - -- - -- -- - - -- - - -- - -- -- -- - - - -- - -- - -- - -- - -- -- - -- -- - - - -- -- -- - - - -- - -- -- - -- - -- - - -- - -- - -- -- - - - - -- - -- -- - - -- -- - - - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- -- - - - -- - -- - -- - -- - -- -- - - -- - -- -- -- - - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/kotlin.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/kotlin.xml deleted file mode 100644 index 09c638a94292761c9e1359b3a43555cd473b31d0..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/kotlin.xml +++ /dev/null @@ -1,223 +0,0 @@ -- -Jungle -jungle -*.jungle -text/x-jungle -- -- -- -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - -- - -- - -- - - -- - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lighttpd_configuration_file.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lighttpd_configuration_file.xml deleted file mode 100644 index 1319e5c838c2cfeb280b02f9bca4562c1f83b716..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lighttpd_configuration_file.xml +++ /dev/null @@ -1,42 +0,0 @@ -- -Kotlin -kotlin -*.kt -text/x-kotlin -true -- -- -- -- - -- - -- - - -- - -- - -- - -- -- - - -- -- - - -- - - -- -- - - -- - - -- -- - -- - -- -- - - -- - - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- -- - - - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- -- - - -- - - -- - - -- - -- -- - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/llvm.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/llvm.xml deleted file mode 100644 index f24f1522b2a8fe103194e867dbd325503be17988..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/llvm.xml +++ /dev/null @@ -1,73 +0,0 @@ -- -Lighttpd configuration file -lighty -lighttpd -text/x-lighttpd-conf -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lua.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lua.xml deleted file mode 100644 index 903d4581feb862b5c5216219cf3de615fb71ef60..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/lua.xml +++ /dev/null @@ -1,158 +0,0 @@ -- -LLVM -llvm -*.ll -text/x-llvm -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/makefile.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/makefile.xml deleted file mode 100644 index a82a7f8d5656a48fcff6eac6adfe0cb3ad7e5ebb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/makefile.xml +++ /dev/null @@ -1,131 +0,0 @@ -- -Lua -lua -*.lua -*.wlua -text/x-lua -application/x-lua -- -- -- -- - -- - -- - -- - - -- - - -- -- - -- - - -- - -- -- - - -- - -- -- - -- - -- -- - -- - -- - -- -- - -- - - -- -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - - -- - -- - -- - - -- - -- - - -- - - -- -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mako.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mako.xml deleted file mode 100644 index 782414087b2460438854fcefc1c374e19d0486cd..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mako.xml +++ /dev/null @@ -1,120 +0,0 @@ -- -Makefile -make -makefile -mf -bsdmake -*.mak -*.mk -Makefile -makefile -Makefile.* -GNUmakefile -BSDmakefile -Justfile -justfile -.justfile -text/x-makefile -true -- -- -- -- - -- - -- - -- - -- -- - - - -- - -- -- - - - - - -- - -- - -- -- - - - - -- - - -- -- - -- - -- - -- - - -- - - -- -- - -- - - -- - -- -- - -- - - -- - -- - - -- - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mason.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mason.xml deleted file mode 100644 index 5873f2afc53f0552f8204c35efb82c94d93f5b4f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mason.xml +++ /dev/null @@ -1,89 +0,0 @@ -- -Mako -mako -*.mao -application/x-mako -- -- -- -- -- - - - - -- -- - - - - -- -- - - - -- - -- -- - - - -- -- - - - -- - - -- -- - - - -- -- - - - -- -- - - -- - -- -- - -- - -- - -- -- -- - - - -- - - -- - -- -- - - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/materialize_sql_dialect.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/materialize_sql_dialect.xml deleted file mode 100644 index 7094ddc3eeba7c73d84d78a54288ce21558deed5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/materialize_sql_dialect.xml +++ /dev/null @@ -1,155 +0,0 @@ -- -Mason -mason -*.m -*.mhtml -*.mc -*.mi -autohandler -dhandler -application/x-mason -0.1 -- -- -- -- - -- -- - - - -- -- - - - - - - -- -- - - - - - -- -- - - - - -- -- - - - - -- - -- -- - - - -- - -- -- - - - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mathematica.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mathematica.xml deleted file mode 100644 index 0b8dfb617ff3275afabd920ef205bb8e47e7a2dc..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mathematica.xml +++ /dev/null @@ -1,60 +0,0 @@ -- -Materialize SQL dialect -text/x-materializesql -true -true -materialize -mzsql -- -- -- -- - -- - -- - - -- - -- -6 -12 -- -- - - - - - - - - - - - - - - - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -12 -4 -- -- - - - - - - - - - - - - - -- - -- - -- - -- - -- -- - - -- - - -- - -- - -- -- - -- - -- - - -- -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/matlab.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/matlab.xml deleted file mode 100644 index ebb4e2c331880e85ef0bd55f1739e8dacf462e0d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/matlab.xml +++ /dev/null @@ -1,114 +0,0 @@ -- -Mathematica -mathematica -mma -nb -*.cdf -*.m -*.ma -*.mt -*.mx -*.nb -*.nbp -*.wl -application/mathematica -application/vnd.wolfram.mathematica -application/vnd.wolfram.mathematica.package -application/vnd.wolfram.cdf -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mcfunction.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mcfunction.xml deleted file mode 100644 index a6aa6dbe8cfb0d9bc671fe43fb10d9f9f16b27c6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mcfunction.xml +++ /dev/null @@ -1,138 +0,0 @@ - -- -Matlab -matlab -*.m -text/matlab -- -- -- -- - - -- - -- - -- -- -- - - - - - - - - - - - -- -- - - - -- -- - -- - -- - - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/meson.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/meson.xml deleted file mode 100644 index 130047df6ade4dafa3aa5863cd03da6b14c14f4c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/meson.xml +++ /dev/null @@ -1,85 +0,0 @@ -- -MCFunction -mcfunction -mcf -*.mcfunction -text/mcfunction -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/metal.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/metal.xml deleted file mode 100644 index 62d04ba842d3fcee420778c3f5b3d65f04c55820..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/metal.xml +++ /dev/null @@ -1,270 +0,0 @@ -- -Meson -meson -meson.build -meson.build -meson_options.txt -text/x-meson -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/minizinc.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/minizinc.xml deleted file mode 100644 index 1ad6860f4dfc35dd003882eab346cd67d9a7ec62..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/minizinc.xml +++ /dev/null @@ -1,82 +0,0 @@ -- -Metal -metal -*.metal -text/x-metal -true -- -- -- -- - -- - -- - -- - - -- - - -- -- -- - - - -- - -- - -- - - -- - -- - -- - - -- -- - - -- - - -- - - -- - -- -- - -- -- - - - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - -- -- - - - - - - - -- -- - - - - - - -- - -- -- -- - - -- - - -- - - -- -- - - -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mlir.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mlir.xml deleted file mode 100644 index 025c3dc56b4ce0bdcca90ac5dbab7e46da2c675e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mlir.xml +++ /dev/null @@ -1,73 +0,0 @@ -- -MiniZinc -minizinc -MZN -mzn -*.mzn -*.dzn -*.fzn -text/minizinc -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/modula-2.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/modula-2.xml deleted file mode 100644 index 0bf37bcc3c4a222e60d9409855496b4517484a81..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/modula-2.xml +++ /dev/null @@ -1,245 +0,0 @@ -- -MLIR -mlir -*.mlir -text/x-mlir -- -- -- -- - -- - -- -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/monkeyc.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/monkeyc.xml deleted file mode 100644 index 7445a639d3cf9ddd22b5ef7355f436e5626c7aaa..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/monkeyc.xml +++ /dev/null @@ -1,153 +0,0 @@ -- -Modula-2 -modula2 -m2 -*.def -*.mod -text/x-modula2 -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- -- - -- - -- -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/morrowindscript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/morrowindscript.xml deleted file mode 100644 index 724a19fc62e4d93e7dc2678ae975a30eed1319b0..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/morrowindscript.xml +++ /dev/null @@ -1,90 +0,0 @@ -- -MonkeyC -monkeyc -*.mc -text/x-monkeyc -- -- -- -- -- - - - - - -- - -- -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- -- - - - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/myghty.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/myghty.xml deleted file mode 100644 index 6d03917e52872a113d5b5a981a178d2f859ecec4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/myghty.xml +++ /dev/null @@ -1,77 +0,0 @@ -- -MorrowindScript -morrowind -mwscript -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- -- - -- - -- -- - -- -- - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mysql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mysql.xml deleted file mode 100644 index b6c2046d5e645067c57a2f434f2b9c951d0df7c6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/mysql.xml +++ /dev/null @@ -1,121 +0,0 @@ -- -Myghty -myghty -*.myt -autodelegate -application/x-myghty -- -- -- -- - -- -- - - - - - - -- -- - - - - - -- -- - - - - -- -- - - - - -- - -- -- - - - -- - -- -- - - - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nasm.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nasm.xml deleted file mode 100644 index defe65b3c4155a01d063c587ef9b3b826d9418e2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nasm.xml +++ /dev/null @@ -1,126 +0,0 @@ -- -MySQL -mysql -mariadb -*.sql -text/x-mysql -text/x-mariadb -true -true -- -- -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - -- - - -- - -- - -- -- - - - -- -- - - - -- - -- -- - - - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/natural.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/natural.xml deleted file mode 100644 index 707252b4c188cd1d00fc4c31511b93605e5b0243..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/natural.xml +++ /dev/null @@ -1,143 +0,0 @@ -- -NASM -nasm -*.asm -*.ASM -*.nasm -text/x-nasm -true -1.0 -- -- -- -- - -- - -- - -- - -- - -- -- - - -- - -- - -- -- - - - - -- - - -- - - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - -- - - -- - - -- -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ndisasm.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ndisasm.xml deleted file mode 100644 index 74d443b649780b0b67a8ff9ec4a32c26076b817a..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ndisasm.xml +++ /dev/null @@ -1,123 +0,0 @@ -- -Natural -natural -*.NSN -*.NSP -*.NSS -*.NSH -*.NSG -*.NSL -*.NSA -*.NSM -*.NSC -*.NS7 -text/x-natural -true -- -- -- -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- -- - - - -- -- - - - - - -- -- - - - -- -- - - - -- -- - - - - -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- -- - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/newspeak.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/newspeak.xml deleted file mode 100644 index b93265706b7f04e5db844fa17e4464fa1f6300a7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/newspeak.xml +++ /dev/null @@ -1,121 +0,0 @@ -- -NDISASM -ndisasm -text/x-disasm -true -0.5 -- -- -- -- - - -- -- - - -- - -- -- - -- - -- - -- - -- - -- -- - -- - -- -- - - - - -- - - -- - - -- - - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nginx_configuration_file.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nginx_configuration_file.xml deleted file mode 100644 index 46bdf573dbf19056f94197f7e53d72e1b0ac8c76..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nginx_configuration_file.xml +++ /dev/null @@ -1,98 +0,0 @@ -- -Newspeak -newspeak -*.ns2 -text/x-newspeak -- -- -- -- - -- - -- -- - - - - -- - -- -- - - - -- -- - - - -- - -- - -- - -- -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nim.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nim.xml deleted file mode 100644 index bfdd6156ab84684e471145bf3e32a40256cfe869..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nim.xml +++ /dev/null @@ -1,211 +0,0 @@ -- -Nginx configuration file -nginx -nginx.conf -text/x-nginx-conf -- -- -- -- -- - - - -- - - -- - -- -- - - -- - - -- - -- -- - - -- - - -- - -- -- - -- - -- - -- -- - - - -- - -- - -- -- - - - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nix.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nix.xml deleted file mode 100644 index dd54d36fd5a8c3bdcc117098f5b2ccf750ac0d36..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nix.xml +++ /dev/null @@ -1,258 +0,0 @@ -- -Nim -nim -nimrod -*.nim -*.nimrod -text/x-nim -true -- -- -- -- - -- - - -- - -- -- - - -- - -- - -- -- - - -- - - -- -- - -- - -- - -- -- - -- - -- -- - -- - -- - -- - -- -- - -- -- - -- - - -- - -- -- - - -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nsis.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nsis.xml deleted file mode 100644 index 6c3a7be96677d45b648f2af2f7f4baa31e3097f7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/nsis.xml +++ /dev/null @@ -1,59 +0,0 @@ -- -Nix -nixos -nix -*.nix -text/x-nix -- -- -- -- - -- -- - - -- - -- -- - - -- - - -- - - -- - - -- - -- - -- -- - -- - -- -- - -- - -- - -- - -- - -- -- - -- - -- -- - - -- - -- -- - -- -- - - - -- -- - - - - -- - -- - -- -- - - -- - -- -- - - -- - -- -- - -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- - -- -- - -- -- - -- -- - - -- - - -- - -- - -- -- - -- - -- - -- - - -- - - -- - -- - -- -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/objective-c.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/objective-c.xml deleted file mode 100644 index 0dc932857c937a845d5bd5c15b93a7d8dec82ac6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/objective-c.xml +++ /dev/null @@ -1,510 +0,0 @@ -- -NSIS -nsis -nsi -nsh -*.nsi -*.nsh -text/x-nsis -true -true -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/objectpascal.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/objectpascal.xml deleted file mode 100644 index 12af64b9df70dc0d45462b5f8d2837df86d21ddb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/objectpascal.xml +++ /dev/null @@ -1,145 +0,0 @@ -- -Objective-C -objective-c -objectivec -obj-c -objc -*.m -*.h -text/x-objective-c -- -- -- -- -- - - - -- - -- - -- - - -- - -- - -- - - -- -- - - -- - - -- - -- -- - - -- - - -- - - -- - -- -- -- - - - - - - -- - -- -- - - - - - - -- -- - - - - - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- - -- -- - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - -- - -- - -- -- - - - -- - -- - - -- - - -- - -- -- - - -- - - -- - -- -- -- - - - - - - -- -- - - - - -- -- - - - - - - -- -- - - - - -- -- - - - - -- - - -- -- - -- - -- - -- - - -- - - -- -- - - -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - -- -- - -- - -- - -- - - -- -- -- - - - -- -- - - - -- -- - - -- - - -- - -- -- - - -- - -- -- - -- - -- - -- - - -- - - -- -- - - -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ocaml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ocaml.xml deleted file mode 100644 index 77f67ac9c990326dc1dba38b02c4ce929668cea2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ocaml.xml +++ /dev/null @@ -1,145 +0,0 @@ -- -ObjectPascal -objectpascal -*.pas -*.pp -*.inc -*.dpr -*.dpk -*.lpr -*.lpk -text/x-pascal -- -- - -- -- - -- - - -- - - -- - - -- - - -- -- - - - -- - - -- - - -- - - -- - -- - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/octave.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/octave.xml deleted file mode 100644 index 0515d28986694a94a3ee0081a6de6c043a1d4c8e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/octave.xml +++ /dev/null @@ -1,101 +0,0 @@ -- -OCaml -ocaml -*.ml -*.mli -*.mll -*.mly -text/x-ocaml -- -- -- -- - -- - -- - -- -- - -- - -- - - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - -- - - -- - - -- - -- -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/odin.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/odin.xml deleted file mode 100644 index b9842638535ebf998f8ca795949a9458dd656737..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/odin.xml +++ /dev/null @@ -1,113 +0,0 @@ -- -Octave -octave -*.m -text/octave -- -- -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - - -- -- -- - - - - - - - - - - - -- -- - - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/onesenterprise.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/onesenterprise.xml deleted file mode 100644 index 530bad70e75cc6a29cbde6c39779e9a558f8f4fc..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/onesenterprise.xml +++ /dev/null @@ -1,92 +0,0 @@ -- -Odin -odin -*.odin -text/odin -- -- -- -- - - -- - - -- - -- -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/openedge_abl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/openedge_abl.xml deleted file mode 100644 index 04a80f3ce2759ef68281df7d2e0581713574ad16..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/openedge_abl.xml +++ /dev/null @@ -1,101 +0,0 @@ -- -OnesEnterprise -ones -onesenterprise -1S -1S:Enterprise -*.EPF -*.epf -*.ERF -*.erf -application/octet-stream -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/openscad.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/openscad.xml deleted file mode 100644 index 84d0fe135ff6301add375f3b938e151e29fc161f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/openscad.xml +++ /dev/null @@ -1,96 +0,0 @@ -- -OpenEdge ABL -openedge -abl -progress -openedgeabl -*.p -*.cls -*.w -*.i -text/x-openedge -application/x-openedge -- -- -- -- - - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- -- - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/org_mode.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/org_mode.xml deleted file mode 100644 index 259e54ef59e7ff3ee85a49894c851284141dd9d9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/org_mode.xml +++ /dev/null @@ -1,329 +0,0 @@ -- -OpenSCAD -openscad -*.scad -text/x-scad -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- -- -- - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pacmanconf.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pacmanconf.xml deleted file mode 100644 index caf7236757e627daa366912d67b4f46c2b23dc0f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pacmanconf.xml +++ /dev/null @@ -1,37 +0,0 @@ -- -Org Mode -org -orgmode -*.org -text/org -- -- -- -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - -- -- - - - -- -- - - -- -- - - - - -- -- - - - - -- -- - - - - -- -- - - - - -- -- - - - -- -- - - - -- -- - - - - -- -- - - - -- -- - - - - - -- -- - - - -- -2 -4 -- -- - - - - - -- -2 -4 -- -- - - - - - -- -- - - - - - - -- -- - - -- -- - - - -- -- - - -- -- - - -- -- - - -- - -- -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- -- - - - - - -- -- - - - - - -- -- - - - -- -- - - - -- -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/perl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/perl.xml deleted file mode 100644 index 8ac02ab40e68543df4bf5f47161a41c96347fcfa..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/perl.xml +++ /dev/null @@ -1,400 +0,0 @@ -- -PacmanConf -pacmanconf -pacman.conf -- -- -- -- - -- - -- -- - - - -- -- - - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/php.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/php.xml deleted file mode 100644 index c9e22ea5778a4f7019de9404aab29c1f49109183..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/php.xml +++ /dev/null @@ -1,212 +0,0 @@ -- -Perl -perl -pl -*.pl -*.pm -*.t -text/x-perl -application/x-perl -true -- -- -- -- - -- - -- - -- - -- -- - - - - - - - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - -- - - -- - -- - -- - -- - -- -- - - - - - - -- - - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - - -- -- - -- - -- - - -- - - -- - -- -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- -- - -- - -- - - -- - - -- - -- -- - - -- - -- -- - -- - -- -- - - -- - - -- - - -- -- - - -- -- - -- - - -- - - -- - -- - - -- -- - - -- - - -- - - -- - - -- - - -- -- - -- - -- - - -- - - -- - -- -- - -- - -- - - -- - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pig.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pig.xml deleted file mode 100644 index 5acd773991d17a8f97c3c97b574af2c5ee2e887a..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pig.xml +++ /dev/null @@ -1,105 +0,0 @@ -- -PHP -php -php3 -php4 -php5 -*.php -*.php[345] -*.inc -text/x-php -true -true -true -3 -- -- -- -- - -- -- - -- -- - - -- -- - -- - - -- - -- -- - - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- - -- -- - - -- -- - - - - - - - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - - - -- -- - - -- -- - - - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pkgconfig.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pkgconfig.xml deleted file mode 100644 index 875dcba6ae2e9e748088fb5592f1c262bfe604d4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pkgconfig.xml +++ /dev/null @@ -1,73 +0,0 @@ -- -Pig -pig -*.pig -text/x-pig -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - -- -- - -- -- - -- -- - -- -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pl_pgsql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pl_pgsql.xml deleted file mode 100644 index e3e813ad5b95710b65a800fa43b700db318c3753..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pl_pgsql.xml +++ /dev/null @@ -1,119 +0,0 @@ -- -PkgConfig -pkgconfig -*.pc -- -- -- -- - - -- - -- -- - -- - - -- - - -- - -- - -- -- - -- -- - - -- -- - - - -- - -- - -- - -- -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/plaintext.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/plaintext.xml deleted file mode 100644 index d5e3243ee99b167f0ce7a9084348f9094e915687..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/plaintext.xml +++ /dev/null @@ -1,21 +0,0 @@ -- -PL/pgSQL -plpgsql -text/x-plpgsql -true -true -- -- -- -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- - -- - -- - -- -- - - -- - - -- - -- - -- -- - -- - -- - - -- -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/plutus_core.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/plutus_core.xml deleted file mode 100644 index 4ff5a970393b95ee675fe12963f9df6ea1024dda..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/plutus_core.xml +++ /dev/null @@ -1,105 +0,0 @@ -- -plaintext -text -plain -no-highlight -*.txt -text/plain --1 -- -- -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pony.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pony.xml deleted file mode 100644 index 4efa9db508360d36fb9b064740a1a69c5bd0815d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/pony.xml +++ /dev/null @@ -1,135 +0,0 @@ -- -Plutus Core -plutus-core -plc -*.plc -text/x-plutus-core -application/x-plutus-core -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/postgresql_sql_dialect.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/postgresql_sql_dialect.xml deleted file mode 100644 index e901c1855a5dcb47ef074fa0c3dd0b32944dc161..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/postgresql_sql_dialect.xml +++ /dev/null @@ -1,155 +0,0 @@ -- -Pony -pony -*.pony -- -- -- -- - - -- - -- - -- -- - -- - -- - -- - - -- - -- - - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- -- - - - - -- -- -- - - - - -- -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/postscript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/postscript.xml deleted file mode 100644 index 15a3422d0e9474decba99838d83e7f2ffc7ba90a..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/postscript.xml +++ /dev/null @@ -1,89 +0,0 @@ -- -PostgreSQL SQL dialect -postgresql -postgres -text/x-postgresql -true -true -- -- -- -- - -- - -- - - -- - -- -6 -12 -- -- - - - - - - - - - - - - - - - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -12 -4 -- -- - - - - - - - - - - - - - -- - -- - -- - -- - -- -- - - -- - - -- - -- - -- -- - -- - -- - - -- -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/povray.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/povray.xml deleted file mode 100644 index f37dab908892cbce1d589a234692c5cb6ebf292f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/povray.xml +++ /dev/null @@ -1,58 +0,0 @@ -- -PostScript -postscript -postscr -*.ps -*.eps -application/postscript -- -- -- -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - - -- - - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/powerquery.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/powerquery.xml deleted file mode 100644 index 0ff1e35574ae9f51b3ea939f8e6142224bfd7b98..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/powerquery.xml +++ /dev/null @@ -1,51 +0,0 @@ -- -POVRay -pov -*.pov -*.inc -text/x-povray -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/powershell.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/powershell.xml deleted file mode 100644 index b63a15081df00a24cc94357c6dc6142145567b60..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/powershell.xml +++ /dev/null @@ -1,230 +0,0 @@ -- -PowerQuery -powerquery -pq -*.pq -text/x-powerquery -true -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/prolog.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/prolog.xml deleted file mode 100644 index 391bae36b21bde9ba5ac0652ad7294367f04ffe4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/prolog.xml +++ /dev/null @@ -1,115 +0,0 @@ -- -PowerShell -powershell -posh -ps1 -psm1 -psd1 -pwsh -*.ps1 -*.psm1 -*.psd1 -text/x-powershell -true -true -- -- -- -- - - -- - -- -- - - - - - -- -- - - - -- - -- - - -- - -- - - -- - -- - -- - -- - - -- - -- -- - - - - -- -- - - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - - -- - -- - -- - -- -- - - -- - -- - -- - -- -- - - -- - -- -- - -- - - -- -- - - - -- - -- -- - -- - -- - - -- - -- - -- - -- - - -- -- - - -- - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/promela.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/promela.xml deleted file mode 100644 index 84558c3b65d5d87d2b8ea23b804de780302b560a..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/promela.xml +++ /dev/null @@ -1,119 +0,0 @@ - -- -Prolog -prolog -*.ecl -*.prolog -*.pro -*.pl -text/x-prolog -- -- -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/promql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/promql.xml deleted file mode 100644 index e95e333d526fcabe52ad3cc7622e69582489faa5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/promql.xml +++ /dev/null @@ -1,123 +0,0 @@ -- -Promela -promela -*.pml -*.prom -*.prm -*.promela -*.pr -*.pm -text/x-promela -- -- -- -- -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/properties.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/properties.xml deleted file mode 100644 index d5ae0a283e18f68b115c133a72896c58da169dce..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/properties.xml +++ /dev/null @@ -1,45 +0,0 @@ -- -PromQL -promql -*.promql -- -- -- -- - - -- - -- -- - - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - - -- - -- - - -- - - -- -- - - -- - -- - -- - -- -- - - - - - - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/protocol_buffer.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/protocol_buffer.xml deleted file mode 100644 index 157d321f8b224370cd0efd74675f24274a6515b1..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/protocol_buffer.xml +++ /dev/null @@ -1,118 +0,0 @@ -- -properties -java-properties -*.properties -text/x-java-properties -- -- -- -- -- - - -- -- - - - - - - -- -- - - - - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/prql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/prql.xml deleted file mode 100644 index 21f21c65c17c9e459e904cc9196e314f5aa8f573..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/prql.xml +++ /dev/null @@ -1,161 +0,0 @@ -- -Protocol Buffer -protobuf -proto -*.proto -- -- -- -- - - -- - -- -- - - -- - -- -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/psl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/psl.xml deleted file mode 100644 index ab375dae4755d44a1cbd246df1e9cd14e102e0b8..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/psl.xml +++ /dev/null @@ -1,213 +0,0 @@ -- -PRQL -prql -*.prql -application/prql -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/puppet.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/puppet.xml deleted file mode 100644 index fbb587cf5ae8909f2c7d06bf9943cb802a9e706d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/puppet.xml +++ /dev/null @@ -1,100 +0,0 @@ -- -PSL -psl -*.psl -*.BATCH -*.TRIG -*.PROC -text/x-psl -- - -- -- -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - - -- - -- - -- - - -- - -- - -- -- - - -- -- - - - -- -- - - -- - -- -- - - -- - -- - -- - -- - -- -- - -- - -- -- - - - - -- - -- -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- -- - -- -- - -- -- - -- - -- - -- - -- - -- -- - -- -- - -- - - -- - -- -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/python.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/python.xml deleted file mode 100644 index a58686ff10912860a9d370292ee205047ee2c725..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/python.xml +++ /dev/null @@ -1,593 +0,0 @@ -- -Puppet -puppet -*.pp -- -- -- -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - -- - -- -- - -- -- - - - - -- - -- -- - -- - -- - -- - -- - -- - -- -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/python_2.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/python_2.xml deleted file mode 100644 index 3297a2260e2e6d393171d223a38ea5d3f1f7c4c7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/python_2.xml +++ /dev/null @@ -1,356 +0,0 @@ -- -Python -python -py -sage -python3 -py3 -*.py -*.pyi -*.pyw -*.jy -*.sage -*.sc -SConstruct -SConscript -*.bzl -BUCK -BUILD -BUILD.bazel -WORKSPACE -WORKSPACE.bzlmod -WORKSPACE.bazel -MODULE.bazel -REPO.bazel -*.tac -text/x-python -application/x-python -text/x-python3 -application/x-python3 -- -- -- -- - -- - -- - -- - -- - -- - -- -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - -- - -- -- - -- - -- -- - - -- - -- - -- -- -- - - - -- - -- - - -- - -- - -- -- - -- - -- - -- -- - - -- -- -- - - - -- - -- - -- -- - - - -- - -- -- - - -- - -- - -- -- - -- - -- - -- - -- - -- -- - - -- - -- - -- -- - - -- - - -- - -- - -- -- - - -- - -- - -- -- - -- - - -- - -- -- - -- - -- -- - -- - -- - -- -- - -- -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- -- - -- - - -- - -- - -- -- - -- -- - - -- - -- - -- -- - -- - -- - -- - -- - -- -- - -- - -- -- - - -- - -- - -- -- - - -- - -- - -- -- - - -- - - -- - - -- - -- - -- -- - - -- - -- - -- -- - -- - -- -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/qbasic.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/qbasic.xml deleted file mode 100644 index 193fe18074e62946c9f8f365c529621ca8a4255b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/qbasic.xml +++ /dev/null @@ -1,173 +0,0 @@ -- -Python 2 -python2 -py2 -text/x-python2 -application/x-python2 -- -- -- -- - - -- - -- - -- -- - -- - -- -- - -- -- - -- -- - - -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- -- - -- -- - -- - - -- - - -- - -- - -- -- - -- - -- - -- - -- -- - -- - - -- - -- -- - - -- -- - -- -- - -- - -- - -- - -- -- - - -- - -- - -- -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- -- - - -- - -- - -- -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/qml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/qml.xml deleted file mode 100644 index 43eb3eb3db5d661e3133bd46182b8bf357a72263..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/qml.xml +++ /dev/null @@ -1,113 +0,0 @@ -- -QBasic -qbasic -basic -*.BAS -*.bas -text/basic -- -- -- -- - -- - -- -- - - - - -- -- - - - -- - -- - -- - -- -- - - - -- -- - - - - - -- -- - - - - - -- -- - - - -- -- - - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- -- - -- -- - -- -- - -- -- - -- -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/r.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/r.xml deleted file mode 100644 index c1fba4e5ef9a0ec89971fe702ac0466386b966b5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/r.xml +++ /dev/null @@ -1,128 +0,0 @@ -- -QML -qml -qbs -*.qml -*.qbs -application/x-qml -application/x-qt.qbs+qml -true -- -- -- -- - - -- - -- - - -- - - -- - -- - - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/racket.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/racket.xml deleted file mode 100644 index 6cdd3031292f21317b6cb8afb175fdb0936b79fe..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/racket.xml +++ /dev/null @@ -1,260 +0,0 @@ -- -R -splus -s -r -*.S -*.R -*.r -.Rhistory -.Rprofile -.Renviron -text/S-plus -text/S -text/x-r-source -text/x-r -text/x-R -text/x-r-history -text/x-r-profile -0.1 -- -- -- -- - -- - -- -- - -- - -- -- - -- - -- - -- - -- - -- -- - -- -- - -- -- - -- - -- -- - - -- -- - -- -- - -- -- - -- - -- - - -- - - -- - -- - -- - -- - -- - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ragel.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ragel.xml deleted file mode 100644 index 69638d2ecd3cfbecc6ee56235435fa2909bc8a9a..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ragel.xml +++ /dev/null @@ -1,149 +0,0 @@ -- -Racket -racket -rkt -*.rkt -*.rktd -*.rktl -text/x-racket -application/x-racket -- -- -- -- - -- - - -- - -- - -- -- - -- - - -- -- - -- - - -- -- - -- - - -- - -- -- - - -- - - -- - -- -- - -- - -- - - -- - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- -- - - -- - - -- - -- - - -- -- - - -- - -- - -- -- - -- - - -- -- - - -- -- - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- -- - -- - - -- -- - -- - - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/react.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/react.xml deleted file mode 100644 index a4109b0941dadecdf82e1de173a1345f58648117..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/react.xml +++ /dev/null @@ -1,236 +0,0 @@ -- -Ragel -ragel -- -- -- -- - -- - - -- - - -- -- - -- -- - -- - -- -- - -- - -- - -- - -- -- - -- - -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/reasonml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/reasonml.xml deleted file mode 100644 index 8b7bcc50640d3c8326dceccbd8d9cd9077a2e5de..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/reasonml.xml +++ /dev/null @@ -1,147 +0,0 @@ -- -react -jsx -react -*.jsx -*.react -text/jsx -text/typescript-jsx -true -- -- -- -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - -- -- - - - - -- - -- - -- -- - - - - -- -- - - -- - - -- - -- -- - - -- - - -- - - -- - -- -- - - -- - -- -- - - -- -- -- - - - -- -- - - - -- -- - - - - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - - -- -- - - -- - -- - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/reg.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/reg.xml deleted file mode 100644 index 501d38033824f23a007d53069539b92a04d346e6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/reg.xml +++ /dev/null @@ -1,68 +0,0 @@ -- -ReasonML -reason -reasonml -*.re -*.rei -text/x-reasonml -- -- -- -- - -- - -- - -- -- - -- - -- - - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - -- - - -- - - -- - -- -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rego.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rego.xml deleted file mode 100644 index 517b7133b06b484502885d9e6d285da894523ae5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rego.xml +++ /dev/null @@ -1,94 +0,0 @@ -- -reg -registry -*.reg -text/x-windows-registry -- -- -- -- - -- - -- - -- -- - - - - -- -- - - - - - -- -- - - - - - -- -- - - -- -- - - - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rexx.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rexx.xml deleted file mode 100644 index e682500cbfa1db1aa65dbdf25860a4570348c393..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rexx.xml +++ /dev/null @@ -1,127 +0,0 @@ -- -Rego -rego -*.rego -- -- -- - -- - -- -- - - - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rpm_spec.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rpm_spec.xml deleted file mode 100644 index 8362772a6fbe9037bc1a13205aae3ebbd485da7a..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rpm_spec.xml +++ /dev/null @@ -1,58 +0,0 @@ - -- -Rexx -rexx -arexx -*.rexx -*.rex -*.rx -*.arexx -text/x-rexx -true -true -- -- -- -- - -- -- - -- -- - -- - -- - - -- - - -- -- - -- - -- - - -- - - -- -- - -- - - -- - -- -- - -- - - -- - - -- - - -- - -- -- - - - - - -- -- - - - -- - -- - -- - -- - -- -- -- - - - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ruby.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ruby.xml deleted file mode 100644 index baa7e435946a8388ff77c7318987be26203962e2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ruby.xml +++ /dev/null @@ -1,724 +0,0 @@ -- -RPMSpec -spec -*.spec -text/x-rpm-spec -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rust.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rust.xml deleted file mode 100644 index 083b96ffe0b7df7a9e661283f6f08bf78039c6c6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/rust.xml +++ /dev/null @@ -1,375 +0,0 @@ -- -Ruby -rb -ruby -duby -*.rb -*.rbw -Rakefile -*.rake -*.gemspec -*.rbx -*.duby -Gemfile -Vagrantfile -text/x-ruby -application/x-ruby -true -- -- -- -- - -- - -- - -- - - -- -- - -- - -- - -- -- - -- - -- - -- - -- - - -- -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - - -- - -- - -- - -- -- - - - -- -- - - - -- - -- -- - -- - -- - -- - - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - - -- -- - - -- - -- - -- -- - -- - -- - -- -- - - -- - - -- - - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - -- - -- - -- -- - - - -- -- - - - -- - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- -- - - - -- - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- -- - - -- - -- - -- - -- - -- - -- -- -- - - - -- - - -- - -- -- - - -- - - -- - -- -- - -- - -- - -- - -- - -- - - -- -- - -- - - -- - - -- - -- - -- -- - - -- -- - - - - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- -- - -- - -- -- - -- - -- - -- - - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- - -- -- - -- - - -- - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sas.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sas.xml deleted file mode 100644 index af1107bf9b30fc18e1345eef6d351379d0fb938b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sas.xml +++ /dev/null @@ -1,191 +0,0 @@ -- -Rust -rust -rs -*.rs -*.rs.in -text/rust -text/x-rust -true -- -- -- -- - -- - - -- - -- -- - -- - -- -- - - -- - - -- - -- -- - - -- - - -- -- - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- - -- -- - - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- -- - -- - -- -- - -- - - -- - -- -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - - -- - -- - - -- - - -- -- - - - -- - -- - -- - -- - -- - - -- -- - - - -- - -- -- - - -- - - -- - - -- - - -- - - -- - - -- -- - - - -- -- - - - -- - -- - - -- - -- - -- - -- - -- -- - - - - - - -- -- - - - -- - -- - -- - - -- - -- -- - -- - -- - -- - - -- - -- - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sass.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sass.xml deleted file mode 100644 index f80159491f38dda2dda2f3d502f24608bd37ce1e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sass.xml +++ /dev/null @@ -1,362 +0,0 @@ -- -SAS -sas -*.SAS -*.sas -text/x-sas -text/sas -application/x-sas -true -- -- -- -- - - -- -- - - -- -- - -- -- - - -- - -- - - -- - -- - -- -- - -- - -- - -- - -- -- - -- - -- - - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- -- - - -- -- - -- - -- - -- - -- - -- -- - -- -- - -- -- - - -- - - -- - - -- - -- -- - -- - -- - -- - -- -- - - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scala.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scala.xml deleted file mode 100644 index 2f8ddd49ecacc843347f5dfaea4563210e4be124..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scala.xml +++ /dev/null @@ -1,274 +0,0 @@ -- -Sass -sass -*.sass -text/x-sass -true -- -- -- -- - -- - -- - - -- -- - -- - - -- - - -- -- - -- - - -- - - -- -- - -- - - -- - -- -- - -- - -- -- - -- - - -- - - -- - - -- - -- - - -- - -- - -- - - -- - - -- - - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - - -- -- - - -- - - -- - -- - -- - - -- - - -- - -- - - -- -- - -- - - -- - -- -- - -- - - -- -- - - -- - -- -- - -- - - -- - - -- -- - -- - - -- - - -- -- - -- - - -- - - -- - - -- -- - - - -- -- - - - -- - - -- - - -- - - -- - - -- -- - - - -- - - -- - - -- - -- -- - -- - - -- -- - -- - - -- - - -- -- - -- - - -- - -- -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scheme.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scheme.xml deleted file mode 100644 index 0198bd7226fe6ace88e48549416ef96fffb5d703..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scheme.xml +++ /dev/null @@ -1,106 +0,0 @@ -- -Scala -scala -*.scala -text/x-scala -true -- -- -- -- - - -- -- - -- - -- - -- - - -- - -- -- - - -- - -- - -- -- -- - - - -- - -- - -- - - -- - -- - -- - - -- - -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - - -- - - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- -- - -- - -- -- - - - -- - - -- -- - - - - -- -- - - - -- - - -- - -- -- - -- - - -- - - -- - -- -- - - -- - -- -- - - -- - - -- - -- -- -- - - - - -- - -- - - -- - - -- - - -- - - -- -- - -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scilab.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scilab.xml deleted file mode 100644 index 9e109495fd171c746fbe0db5d193fcdbb43852ff..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scilab.xml +++ /dev/null @@ -1,98 +0,0 @@ -- -Scheme -scheme -scm -*.scm -*.ss -text/x-scheme -application/x-scheme -- -- -- -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - -- - -- -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scss.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scss.xml deleted file mode 100644 index ee060fc2b65bd54f5cdd4db05de15fe9e2377c47..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/scss.xml +++ /dev/null @@ -1,373 +0,0 @@ -- -Scilab -scilab -*.sci -*.sce -*.tst -text/scilab -- -- -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- -- - - -- - - -- -- -- - - - - - - - - - - - -- -- - - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sed.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sed.xml deleted file mode 100644 index 2209aa77f51dde88b5fd5a9d29ad395d5324070b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sed.xml +++ /dev/null @@ -1,28 +0,0 @@ -- -SCSS -scss -*.scss -text/x-scss -true -true -true -- -- -- -- - -- - - -- - - -- -- - -- - - -- - -- -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - - - -- -- - - - -- - - -- - -- - -- - - -- - - -- - -- - -- - - -- -- - -- - - -- - - -- -- - -- - - -- - - -- -- - - -- - -- -- - -- - -- -- - - -- - - -- - -- -- - -- - -- - -- - -- - - -- -- - - - - - - - - - - -- - - -- - - -- - - -- -- - - - -- -- - - - -- - - -- -- - - - -- - - -- -- - - - -- - - -- - - -- - - -- - -- -- - -- - -- -- - -- - - -- - -- -- - -- - - -- - - -- - - -- - - -- - -- - -- -- - - -- - - -- - - -- - -- - - -- - -- -- - -- - - -- - - -- -- - -- - - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sieve.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sieve.xml deleted file mode 100644 index fc605638a60532172e5bfa70046979295c568284..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sieve.xml +++ /dev/null @@ -1,61 +0,0 @@ -- -Sed -sed -gsed -ssed -*.sed -*.[gs]sed -text/x-sed -- -- -None - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smali.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smali.xml deleted file mode 100644 index e468766d1e6d69b77555b21643f2964f1cc247c7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smali.xml +++ /dev/null @@ -1,73 +0,0 @@ - -- -Sieve -sieve -*.siv -*.sieve -- -- -- -- - -- - -- - -- -- - - -- - -- - -- -- - - -- - -- - -- - -- - - -- -- - -- - - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smalltalk.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smalltalk.xml deleted file mode 100644 index 00271118f9382e3ffa78402f2960101ecced06ab..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smalltalk.xml +++ /dev/null @@ -1,294 +0,0 @@ -- -Smali -smali -*.smali -text/smali -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smarty.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smarty.xml deleted file mode 100644 index dd7752c586bcff30be53d5aa580c700e6a339397..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/smarty.xml +++ /dev/null @@ -1,79 +0,0 @@ -- -Smalltalk -smalltalk -squeak -st -*.st -text/x-smalltalk -- -- -- -- - - -- - -- -- - - -- - - -- - - -- - - -- - - -- - - -- - -- -- - - -- - -- - - -- - -- - - -- - - -- - -- - - -- - - -- - -- - -- - - -- -- - - -- - - -- - - -- - - -- - - -- -- -- - - - - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - - -- -- - - -- - -- -- - -- - -- -- - -- - -- -- - - - - - - - -- -- - - - - - -- -- - - - - - - - - - - - - -- -- - - - - -- -- - - - -- - -- -- -- - - - -- -- - - -- -- - - - - -- -- - -- -- - - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/snbt.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/snbt.xml deleted file mode 100644 index fdb12d0fe840c8af245c3cd0d3980745fd4dc397..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/snbt.xml +++ /dev/null @@ -1,58 +0,0 @@ - -- -Smarty -smarty -*.tpl -application/x-smarty -true -- -- -- -- - -- -- - - - -- -- - - - -- -- - - - - -- - - -- -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/snobol.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/snobol.xml deleted file mode 100644 index f53dbcba124aa19f0bb9b7463b8f3a6fdc4ebfd7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/snobol.xml +++ /dev/null @@ -1,95 +0,0 @@ -- -SNBT -snbt -*.snbt -text/snbt -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/solidity.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/solidity.xml deleted file mode 100644 index 04403c84053ba48252dde962eac0e7ae71bf8525..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/solidity.xml +++ /dev/null @@ -1,279 +0,0 @@ -- -Snobol -snobol -*.snobol -text/x-snobol -- -- -- -- - -- -- - -- - - -- - -- - - -- - - -- - - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- -- - - -- - -- - -- -- - - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sourcepawn.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sourcepawn.xml deleted file mode 100644 index caca401e3e3ff2e8f6ec8efc69bc546fd5c5aaa2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sourcepawn.xml +++ /dev/null @@ -1,59 +0,0 @@ -- -Solidity -sol -solidity -*.sol -true -- -- -- -- - -- - -- - - -- - - -- -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- -- - - -- - -- -- - - -- - -- -- - -- -- - -- - - -- -- - - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- - -- - - -- - - -- - -- - -- -- - - - -- -- - - -- - -- - -- -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sparql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sparql.xml deleted file mode 100644 index 7dc65af71f59da12476bd6ab06dc9aa38c2ff0c5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sparql.xml +++ /dev/null @@ -1,160 +0,0 @@ -- -SourcePawn -sp -*.sp -*.inc -text/x-sourcepawn -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sql.xml deleted file mode 100644 index b542b65fe9cda567f53491dcb990b9fba983c61d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/sql.xml +++ /dev/null @@ -1,90 +0,0 @@ -- -SPARQL -sparql -*.rq -*.sparql -application/sparql-query -- -- -- -- - - -- - - -- - - -- -- -- - - - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- -- - - -- - -- - - -- -- - - -- - -- - - -- -- - - -- - -- - - -- -- - - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/squidconf.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/squidconf.xml deleted file mode 100644 index cbd8dbce3d9fa9888ef26a3d13fa5dd9b3cfda0f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/squidconf.xml +++ /dev/null @@ -1,63 +0,0 @@ -- -SQL -sql -*.sql -text/x-sql -true -true -- -- -- -- - -- - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - -- - -- -- - -- - -- - - -- -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/standard_ml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/standard_ml.xml deleted file mode 100644 index 39cf4f2af2b9e1738c577c64dc4b1e03ad145951..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/standard_ml.xml +++ /dev/null @@ -1,548 +0,0 @@ -- -SquidConf -squidconf -squid.conf -squid -squid.conf -text/x-squidconf -true -true -- -- -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/stas.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/stas.xml deleted file mode 100644 index 56b4f923827922f568a2bd3254edb84d7ab5987a..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/stas.xml +++ /dev/null @@ -1,85 +0,0 @@ -- -Standard ML -sml -*.sml -*.sig -*.fun -text/x-standardml -application/x-standardml -- -- -- -- - - -- - - -- - - -- - - -- - - -- -- - -- -- - - -- -- - -- - - -- - -- - -- - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - - -- -- - -- - - -- - - -- - -- -- - - - -- -- - - - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - - -- -- - -- - -- - -- - - -- - - -- - -- - -- - - -- -- - -- - -- - -- - - -- -- - - - - -- - - -- - -- - -- - - -- -- - -- - - -- - -- - -- - - -- -- - -- -- - - - -- -- - - - -- - -- - -- - -- - -- -- - -- - -- - - -- -- - - - - -- -- - - - - -- - - -- - - -- - -- -- - -- - -- - -- - -- -- - -- - -- - - -- - - -- - - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - - -- -- - -- - - -- - - -- - -- - -- -- - -- - - -- - - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - -- - -- - - -- - -- - -- - -- - -- -- - -- - -- - - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/stylus.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/stylus.xml deleted file mode 100644 index c2d88073acfa20252038edbadbe406a5996567cf..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/stylus.xml +++ /dev/null @@ -1,132 +0,0 @@ -- -stas -*.stas -- -- -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/swift.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/swift.xml deleted file mode 100644 index 416bf90c54a5326eec20ccd8556d87da2bd430b5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/swift.xml +++ /dev/null @@ -1,207 +0,0 @@ -- -Stylus -stylus -*.styl -text/x-styl -true -- -- -- -- - -- - -- - -- - - -- -- - -- - -- - - -- -- - - -- - -- -- - - - -- -- - - - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- -- - - -- - - -- - -- -- - -- - - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/systemd.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/systemd.xml deleted file mode 100644 index e31bfc29f93f62e487c3f9b33e5598049669b53e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/systemd.xml +++ /dev/null @@ -1,63 +0,0 @@ -- -Swift -swift -*.swift -text/x-swift -- -- -- -- - -- -- - - -- - -- - -- - -- -- - - -- - -- - -- -- - - -- - -- - -- -- - - -- - - -- - -- - -- - -- -- - - -- - - -- - -- -- - -- - -- - - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- -- - -- - -- - - -- - - -- - -- -- - -- - -- - -- - -- - - -- -- - - - -- -- - - - -- -- - - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/systemverilog.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/systemverilog.xml deleted file mode 100644 index fac3da2356af821d09f71b04ee88f13fa338052b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/systemverilog.xml +++ /dev/null @@ -1,181 +0,0 @@ -- -SYSTEMD -systemd -*.automount -*.device -*.dnssd -*.link -*.mount -*.netdev -*.network -*.path -*.scope -*.service -*.slice -*.socket -*.swap -*.target -*.timer -text/plain -- -- -- -- - -- - -- - -- -- - - - - - -- -- - - - -- -- -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tablegen.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tablegen.xml deleted file mode 100644 index a020ce804b2b7fba468aa84efe70989bd6c08e5e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tablegen.xml +++ /dev/null @@ -1,69 +0,0 @@ -- -systemverilog -systemverilog -sv -*.sv -*.svh -text/x-systemverilog -true -- -- -- -- - -- - -- - - -- - -- - -- - - -- -- - - -- -- - - -- -- - - - -- -- - - - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - - -- -- - - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tal.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tal.xml deleted file mode 100644 index a071d4c1a98896aa28bf168268e18f9324342154..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tal.xml +++ /dev/null @@ -1,43 +0,0 @@ - -- -TableGen -tablegen -*.td -text/x-tablegen -- -- -- -- - -- - -- -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- -- - - -- - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tasm.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tasm.xml deleted file mode 100644 index 1347f53968fe8c21cf24f688be9b41753e9629b3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tasm.xml +++ /dev/null @@ -1,135 +0,0 @@ -- -Tal -tal -uxntal -*.tal -text/x-uxntal -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tcl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tcl.xml deleted file mode 100644 index 7ed69bc26ffbbcd893c0ad54bd30556edeed2ecd..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tcl.xml +++ /dev/null @@ -1,272 +0,0 @@ -- -TASM -tasm -*.asm -*.ASM -*.tasm -text/x-tasm -true -- -- -- -- - -- - - -- - - -- -- - -- - -- - -- - -- -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - - -- -- - - - - -- - - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tcsh.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tcsh.xml deleted file mode 100644 index 9895643c4b75143c8c866fe566ff2133566d4243..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tcsh.xml +++ /dev/null @@ -1,121 +0,0 @@ -- -Tcl -tcl -*.tcl -*.rvt -text/x-tcl -text/x-script.tcl -application/x-tcl -- -- -- -- - - -- - - -- - - -- - - -- -- - - -- - - -- - - -- - - -- -- - - -- - - -- - - -- - - -- -- - - -- - - -- - - -- - - -- - -- - -- -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - - -- - - -- - - -- -- - - -- - -- -- - - -- - -- - - -- -- - - -- - -- - -- - -- -- - - -- - -- -- - - -- - -- - -- - -- -- - - -- - -- -- - -- - -- - -- - -- -- - - -- - -- - -- - -- -- - - -- - - -- - -- - -- - -- -- - - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/termcap.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/termcap.xml deleted file mode 100644 index e863bbd058a082991c625a8e7730bc246a0d90f4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/termcap.xml +++ /dev/null @@ -1,75 +0,0 @@ -- -Tcsh -tcsh -csh -*.tcsh -*.csh -application/x-csh -- -- -- -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- -- - - -- - -- -- - - -- - -- -- - -- - - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/terminfo.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/terminfo.xml deleted file mode 100644 index 9e8f56ec422b66d5608b2d78ff5380997c26c7d6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/terminfo.xml +++ /dev/null @@ -1,84 +0,0 @@ -- -Termcap -termcap -termcap -termcap.src -- -- -- -- - -- - - -- -- - - -- - - -- - -- - -- -- - -- - - -- - -- - -- -- - -- - - -- -- - - -- - - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/terraform.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/terraform.xml deleted file mode 100644 index 452f211db3ef3b850c03ee52da13d6ff6886dad7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/terraform.xml +++ /dev/null @@ -1,140 +0,0 @@ -- -Terminfo -terminfo -terminfo -terminfo.src -- -- -- -- - - -- -- - - - -- - -- - -- -- - -- - - -- -- - - -- - - -- -- - - -- - -- -- - -- -- - - - -- - -- - -- -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tex.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tex.xml deleted file mode 100644 index 809bb9a2974fbccd1ea88b6927d78672378d9269..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tex.xml +++ /dev/null @@ -1,113 +0,0 @@ -- -Terraform -terraform -tf -*.tf -application/x-tf -application/x-terraform -- -- -- -- - - -- - -- - -- - - -- - -- - -- -- - - -- - -- -- - -- - -- - -- - -- - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- -- - - - - -- -- -- - - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/thrift.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/thrift.xml deleted file mode 100644 index f14257d4fb833dffa83dbe0f210ea97e2316f5f3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/thrift.xml +++ /dev/null @@ -1,154 +0,0 @@ -- -TeX -tex -latex -*.tex -*.aux -*.toc -text/x-tex -text/x-latex -- -- -- -- - - -- - - -- - -- - -- -- - -- - -- - -- -- - -- - -- - -- -- - - -- - - -- - - -- - - -- - - -- - -- - -- - -- -- - -- - -- - -- - -- - -- -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/toml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/toml.xml deleted file mode 100644 index 9c98ba534c768513d29ac41a9786f32665f12ffb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/toml.xml +++ /dev/null @@ -1,44 +0,0 @@ -- -Thrift -thrift -*.thrift -application/x-thrift -- -- -- -- - - -- - -- -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- -- - -- - -- - - -- - - -- -- - - - -- -- - - - -- -- - - - - -- - -- - -- - -- - -- - -- -- - - -- - -- -- - - -- - -- -- - -- - -- -- - -- - -- - -- -- - -- -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tradingview.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tradingview.xml deleted file mode 100644 index 3671f61edc1025a2d816aaf2c5c34d99be92b4c2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/tradingview.xml +++ /dev/null @@ -1,81 +0,0 @@ -- -TOML -toml -*.toml -Pipfile -poetry.lock -text/x-toml -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/transact-sql.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/transact-sql.xml deleted file mode 100644 index b0490aa7c75ceecdfb42eb300ba030f2e2a59987..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/transact-sql.xml +++ /dev/null @@ -1,137 +0,0 @@ -- -TradingView -tradingview -tv -*.tv -text/x-tradingview -true -true -- -- -- -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- -- - - -- -- - - -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/turing.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/turing.xml deleted file mode 100644 index 4eab69b731e7d1aa449160d5b4e41420be0ad1df..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/turing.xml +++ /dev/null @@ -1,82 +0,0 @@ -- -Transact-SQL -tsql -t-sql -text/x-tsql -true -true -- -- -- -- - -- - -- - - -- - - -- - - -- - -- - -- - -- - -- -- - - - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- -- - - -- - - -- - -- - -- -- - -- - -- - - -- -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/turtle.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/turtle.xml deleted file mode 100644 index 7c572f9ca1b60a31cfb8ad6b616ca6492838aaba..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/turtle.xml +++ /dev/null @@ -1,170 +0,0 @@ -- -Turing -turing -*.turing -*.tu -text/x-turing -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/twig.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/twig.xml deleted file mode 100644 index de95c5f9131dfd8e1dc8b944bd595ef94f236f31..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/twig.xml +++ /dev/null @@ -1,155 +0,0 @@ -- -Turtle -turtle -*.ttl -text/turtle -application/x-turtle -true -true -- -- -- -- - - -- - -- - - -- -- - - -- - -- - - -- -- - - -- - -- - - -- -- - - -- - -- - - -- -- - - -- -- -- - - - - -- -- - - - -- -- - - - - -- - -- -- - -- -- - - - - - -- -- - - - - - - - -- - -- - -- -- - - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typescript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typescript.xml deleted file mode 100644 index 7d541cb6ced1adf4ac6ffe5f2521f164e92a5829..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typescript.xml +++ /dev/null @@ -1,295 +0,0 @@ -- -Twig -twig -*.twig -application/x-twig -true -- -- -- -- - -- -- - - - -- - -- -- - -- -- - - - -- - -- - -- -- - -- - - -- - -- -- - - - - - - - - - - - -- -- - - - - - - - - - - - -- -- - - - - - - -- -- - - - - -- - -- -- -- - - - -- -- - - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscript.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscript.xml deleted file mode 100644 index bc416d4726d150a0eb85c3349e14a753348933fb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscript.xml +++ /dev/null @@ -1,178 +0,0 @@ -- -TypeScript -ts -tsx -typescript -*.ts -*.tsx -*.mts -*.cts -text/x-typescript -true -true -- -- -- -- - - -- - - -- - -- -- -- - - - -- -- - - - -- -- - - - - -- -- - -- - -- - -- - -- - - -- - -- - -- -- - - - - -- - -- - -- -- - - - - -- -- - -- - - -- - -- -- - -- - - -- - -- - -- -- - - -- -- - - -- - -- - -- - - -- - -- - -- -- - - -- - - -- - - -- - -- -- - - -- - -- -- - -- - - -- - - -- - -- -- - -- - - -- - -- - - -- - - -- - -- - - -- - - -- - -- - -- - -- -- - - - - - -- - -- - -- -- - - - -- - - -- -- - - - -- - -- - -- - -- - -- - -- - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscriptcssdata.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscriptcssdata.xml deleted file mode 100644 index 62c42c1537b8b53e82b216b0eee4b186465f3e75..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscriptcssdata.xml +++ /dev/null @@ -1,52 +0,0 @@ -- -TypoScript -typoscript -*.ts -text/x-typoscript -true -0.1 -- -- -- -- - -- -- - -- - -- -- - - - - -- -- - -- -- - -- -- -- - - - - - -- -- - - - - - -- - -- -- - -- - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - -- - -- -- - -- -- - - -- -- - -- -- - -- -- -- - - - - -- - -- -- - - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscripthtmldata.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscripthtmldata.xml deleted file mode 100644 index 1b0af3a4e4869e4a4ee106340bb41d1e0c5faa62..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typoscripthtmldata.xml +++ /dev/null @@ -1,52 +0,0 @@ -- -TypoScriptCssData -typoscriptcssdata -- -- -- -- -- - - - -- -- - - - - - -- -- - - - - - - - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typst.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typst.xml deleted file mode 100644 index 330dc40fa229766a7a5e32b7c84c7ef430f78084..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/typst.xml +++ /dev/null @@ -1,108 +0,0 @@ - -- -TypoScriptHtmlData -typoscripthtmldata -- -- -- -- - -- - -- -- - - - -- -- - - - - - -- -- - - - - - - - -- - -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ucode.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ucode.xml deleted file mode 100644 index 054fa8913c8b63f1202840f94c8016f1940b78b7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/ucode.xml +++ /dev/null @@ -1,147 +0,0 @@ -- -Typst -typst -*.typ -text/x-typst -- -- -- -- -- -- -- -- -- diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/v.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/v.xml deleted file mode 100644 index e1af3d1cd10e5f5067dbec559702ab5745d58b8e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/v.xml +++ /dev/null @@ -1,355 +0,0 @@ -- -ucode -*.uc -application/x.ucode -text/x.ucode -true -true -- -- -- -- - - -- - -- - -- - -- - - -- - -- - -- -- - - -- - -- -- - -- - -- - -- - -- -- - -- - - -- - - -- - -- -- - - -- -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - - -- - - -- - -- - -- - -- - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/v_shell.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/v_shell.xml deleted file mode 100644 index 34ce6106505128d6ad96139120d853a252430770..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/v_shell.xml +++ /dev/null @@ -1,365 +0,0 @@ -- -V -v -vlang -*.v -*.vv -v.mod -text/x-v -true -- -- -- -- - -- - -- - -- - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - - - - - -- - -- - -- -- - - - - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- -- -- - - - -- - -- - -- -- - -- -- - - -- - -- -- - - - - - - -- - -- -- - - -- - - -- - - -- - -- - -- - -- - -- - -- -- -- - - - -- -- - - - -- -- - - -- -- - - -- -- - - -- - -- -- - - - -- - - -- - -- -- - - -- - -- -- - - - -- - - -- - -- -- - -- -- -- - - - - - - - -- -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vala.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vala.xml deleted file mode 100644 index 17c1acf487f3e199e1044700cde0e0c15edb23a4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vala.xml +++ /dev/null @@ -1,72 +0,0 @@ - -- -V shell -vsh -vshell -*.vsh -text/x-vsh -true -- -- -- -- - - -- - - -- - - -- - -- - -- - -- - -- - -- -- - - -- - -- -- - - - -- - - -- - -- -- - - -- - -- - -- -- -- - - - -- - -- - -- -- - -- -- -- - - - - - - - -- -- - -- -- - - -- - -- -- - - - - - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - - - - - -- - -- - -- -- - - - - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- -- -- - - - -- -- - - - -- -- - - -- -- - - -- -- - - -- - -- -- - - - -- - - -- - -- -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vb_net.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vb_net.xml deleted file mode 100644 index 9f85afd0e51c401232a1c99396d60ed3f29706d3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vb_net.xml +++ /dev/null @@ -1,162 +0,0 @@ -- -Vala -vala -vapi -*.vala -*.vapi -text/x-vala -- -- -- -- -- -- -- -- -- -- \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/verilog.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/verilog.xml deleted file mode 100644 index cd4b9ff09f2ea33c9a3ad56b75461a04056d3df3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/verilog.xml +++ /dev/null @@ -1,158 +0,0 @@ -- -VB.net -vb.net -vbnet -*.vb -*.bas -text/x-vbnet -text/x-vba -true -- -- -- -- - - -- - -- -- - - -- -- - - -- -- - -- - -- - -- -- - -- - - -- - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- -- - - - -- -- - - - -- -- - - - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vhdl.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vhdl.xml deleted file mode 100644 index aa420448680db26d310d9e93010bc0d714cef4c9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vhdl.xml +++ /dev/null @@ -1,171 +0,0 @@ -- -verilog -verilog -v -*.v -text/x-verilog -true -- -- -- -- - - -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- -- - - -- - -- - -- - -- - -- -- - -- - -- - - -- - -- - -- - - -- -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vhs.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vhs.xml deleted file mode 100644 index ee84d12924eaa07290733dc327364a8199b87f33..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vhs.xml +++ /dev/null @@ -1,48 +0,0 @@ -- -VHDL -vhdl -*.vhdl -*.vhd -text/x-vhdl -true -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - - - -- -- - - - -- -- - - - - -- -- - - - -- -- - - -- - -- -- - - - -- -- - - - - - - - - - -- -- - - - - -- -- - - - -- - -- - -- - -- - -- -- - -- - -- - -- - - -- -- - -- -- - -- -- - -- - -- - -- - -- - -- - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/viml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/viml.xml deleted file mode 100644 index 43e6bfa7443cc5fc94358cd761747e3aa975f2e4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/viml.xml +++ /dev/null @@ -1,85 +0,0 @@ -- -VHS -vhs -tape -cassette -*.tape -- -- -- -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vue.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vue.xml deleted file mode 100644 index ec3508359cc6916a7daaaeda7718e63606e4c1a5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/vue.xml +++ /dev/null @@ -1,307 +0,0 @@ -- -VimL -vim -*.vim -.vimrc -.exrc -.gvimrc -_vimrc -_exrc -_gvimrc -vimrc -gvimrc -text/x-vim -- -- -- -- -- - - - - - - - - -- -- - - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/wdte.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/wdte.xml deleted file mode 100644 index c663ee2fe795d0da19bc4cd5510ec1aced307058..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/wdte.xml +++ /dev/null @@ -1,43 +0,0 @@ -- -vue -vue -vuejs -*.vue -text/x-vue -application/x-vue -true -- -- -- -- - - -- - -- -- - - -- - - -- - - -- - -- -- - - -- - -- - -- - - -- - -- - -- -- - -- - -- -- - - - -- -- - - -- -- - - -- -- - - - -- - -- - -- -- - - - - - -- -- - - - - -- -- - - -- -- - - - -- -- - - -- -- - - - - -- -- - - - - -- - -- - -- -- - - - - -- -- - -- - - -- - - -- - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - - -- - - -- - -- - - -- - - -- - -- - -- - -- - -- - -- - -- - - -- -- - - -- -- -- - - - -- -- - - - - -- -- - - -- - - -- - -- -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/webgpu_shading_language.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/webgpu_shading_language.xml deleted file mode 100644 index ea2b6e1ef35e7c1137715e937bb56653d65a7522..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/webgpu_shading_language.xml +++ /dev/null @@ -1,142 +0,0 @@ -- -WDTE -*.wdte -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/webvtt.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/webvtt.xml deleted file mode 100644 index 08a7efc3aeb873798fbb704374de3ab447912871..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/webvtt.xml +++ /dev/null @@ -1,283 +0,0 @@ -- -WebGPU Shading Language -wgsl -*.wgsl -text/wgsl -- -- -- -- - -- -- - -- - -- - - -- -- - -- - -- - - -- - -- -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/whiley.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/whiley.xml deleted file mode 100644 index 1762c966efb1783297c7f43834b1336a469efa0c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/whiley.xml +++ /dev/null @@ -1,57 +0,0 @@ -- - -WebVTT -vtt -*.vtt -text/vtt -- - -- - - -- -- -- - - -- -- - - - -- -- - - - - -- - -- - - - -- -- - -- - - -- -- - - - -- -- - - - - -- -- - - - -- -- - - - - - - - -- -- - - - - - -- -- - - - -- -- -- - - - - - - - - - -- - - - -- -- - -- -- - - - -- -- - - - - - - - -- -- - - - - - - - -- -- - - - - -- -- - - - -- -- - - - -- - -- -- - - -- - -- - -- - - -- -- - - -- -- - - -- - - -- -- -- - - - -- - - -- -- - -- - -- -- - -- - -- -- -- - - -- -- - -- - - diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/xml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/xml.xml deleted file mode 100644 index 2c6a4d990411830af15240c21914cb6eb0c1e9ef..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/xml.xml +++ /dev/null @@ -1,95 +0,0 @@ -- -Whiley -whiley -*.whiley -text/x-whiley -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/xorg.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/xorg.xml deleted file mode 100644 index 53bf432866856944e80003d6bd04309fb5c42099..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/xorg.xml +++ /dev/null @@ -1,35 +0,0 @@ -- -XML -xml -*.xml -*.xsl -*.rss -*.xslt -*.xsd -*.wsdl -*.wsf -*.svg -*.csproj -*.vcxproj -*.fsproj -text/xml -application/xml -image/svg+xml -application/rss+xml -application/atom+xml -true -- -- -- -- - -- - -- - -- - - -- - -- - -- - - -- - -- -- - -- - - -- - -- -- - -- - - -- - - -- -- - -- - - -- - - -- - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/yaml.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/yaml.xml deleted file mode 100644 index 0707554164fe7eed4a466a966b5d24e3d7d207c1..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/yaml.xml +++ /dev/null @@ -1,122 +0,0 @@ -- -Xorg -xorg.conf -xorg.conf -- -- -- -- - -- - -- -- - - - - -- - -- -- - - - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/yang.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/yang.xml deleted file mode 100644 index f3da7ceb3778de1a1dfd705d87fa3ea1b0bb9183..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/yang.xml +++ /dev/null @@ -1,99 +0,0 @@ -- -YAML -yaml -*.yaml -*.yml -text/x-yaml -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- -- - - - -- - -- - -- - -- - -- - -- -- - - - -- - -- -- - -- -- - - - - - -- -- - - - -- -- - - - -- -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/z80_assembly.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/z80_assembly.xml deleted file mode 100644 index 5bb77a9adc4497ebce6685dde351a323fa26f9ac..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/z80_assembly.xml +++ /dev/null @@ -1,74 +0,0 @@ -- -YANG -yang -*.yang -application/yang -- -- -- -- - -- - -- - -- - -- - -- - - -- - -- -- - - - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- -- - -- - - -- - - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/zed.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/zed.xml deleted file mode 100644 index 929f4953206d3c74a9585943d04094e9cc809c33..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/zed.xml +++ /dev/null @@ -1,51 +0,0 @@ -- -Z80 Assembly -z80 -*.z80 -*.asm -true -- -- -- -- - -- - -- - - -- -- - -- - -- - -- - -- - -- - -- - - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/zig.xml b/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/zig.xml deleted file mode 100644 index fb51cc1abf77e2baa2b4e2a7cad829b1afb984d3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/embedded/zig.xml +++ /dev/null @@ -1,112 +0,0 @@ -- -Zed -zed -*.zed -text/zed -- -- -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/genshi.go b/vendor/github.com/alecthomas/chroma/v2/lexers/genshi.go deleted file mode 100644 index 7f396f4b861564bc31f053b924d326ffa4a5838d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/genshi.go +++ /dev/null @@ -1,118 +0,0 @@ -package lexers - -import ( - . "github.com/alecthomas/chroma/v2" // nolint -) - -// Genshi Text lexer. -var GenshiText = Register(MustNewLexer( - &Config{ - Name: "Genshi Text", - Aliases: []string{"genshitext"}, - Filenames: []string{}, - MimeTypes: []string{"application/x-genshi-text", "text/x-genshi"}, - }, - genshiTextRules, -)) - -func genshiTextRules() Rules { - return Rules{ - "root": { - {`[^#$\s]+`, Other, nil}, - {`^(\s*)(##.*)$`, ByGroups(Text, Comment), nil}, - {`^(\s*)(#)`, ByGroups(Text, CommentPreproc), Push("directive")}, - Include("variable"), - {`[#$\s]`, Other, nil}, - }, - "directive": { - {`\n`, Text, Pop(1)}, - {`(?:def|for|if)\s+.*`, Using("Python"), Pop(1)}, - {`(choose|when|with)([^\S\n]+)(.*)`, ByGroups(Keyword, Text, Using("Python")), Pop(1)}, - {`(choose|otherwise)\b`, Keyword, Pop(1)}, - {`(end\w*)([^\S\n]*)(.*)`, ByGroups(Keyword, Text, Comment), Pop(1)}, - }, - "variable": { - {`(?)`, ByGroups(CommentPreproc, Using("Python"), CommentPreproc), nil}, - {`<\s*(script|style)\s*.*?>.*?<\s*/\1\s*>`, Other, nil}, - {`<\s*py:[a-zA-Z0-9]+`, NameTag, Push("pytag")}, - {`<\s*[a-zA-Z0-9:.]+`, NameTag, Push("tag")}, - Include("variable"), - {`[<$]`, Other, nil}, - }, - "pytag": { - {`\s+`, Text, nil}, - {`[\w:-]+\s*=`, NameAttribute, Push("pyattr")}, - {`/?\s*>`, NameTag, Pop(1)}, - }, - "pyattr": { - {`(")(.*?)(")`, ByGroups(LiteralString, Using("Python"), LiteralString), Pop(1)}, - {`(')(.*?)(')`, ByGroups(LiteralString, Using("Python"), LiteralString), Pop(1)}, - {`[^\s>]+`, LiteralString, Pop(1)}, - }, - "tag": { - {`\s+`, Text, nil}, - {`py:[\w-]+\s*=`, NameAttribute, Push("pyattr")}, - {`[\w:-]+\s*=`, NameAttribute, Push("attr")}, - {`/?\s*>`, NameTag, Pop(1)}, - }, - "attr": { - {`"`, LiteralString, Push("attr-dstring")}, - {`'`, LiteralString, Push("attr-sstring")}, - {`[^\s>]*`, LiteralString, Pop(1)}, - }, - "attr-dstring": { - {`"`, LiteralString, Pop(1)}, - Include("strings"), - {`'`, LiteralString, nil}, - }, - "attr-sstring": { - {`'`, LiteralString, Pop(1)}, - Include("strings"), - {`'`, LiteralString, nil}, - }, - "strings": { - {`[^"'$]+`, LiteralString, nil}, - Include("variable"), - }, - "variable": { - {`(?>=|<<|>>|<=|>=|&\^=|&\^|\+=|-=|\*=|/=|%=|&=|\|=|&&|\|\||<-|\+\+|--|==|!=|:=|\.\.\.|[+\-*/%&])`, Operator, nil}, - {`([a-zA-Z_]\w*)(\s*)(\()`, ByGroups(NameFunction, UsingSelf("root"), Punctuation), nil}, - {`[|^<>=!()\[\]{}.,;:~]`, Punctuation, nil}, - {`[^\W\d]\w*`, NameOther, nil}, - }, - } -} - -var GoHTMLTemplate = Register(DelegatingLexer(HTML, MustNewXMLLexer( - embedded, - "embedded/go_template.xml", -).SetConfig( - &Config{ - Name: "Go HTML Template", - Aliases: []string{"go-html-template"}, - }, -))) - -var GoTextTemplate = Register(MustNewXMLLexer( - embedded, - "embedded/go_template.xml", -).SetConfig( - &Config{ - Name: "Go Text Template", - Aliases: []string{"go-text-template"}, - }, -)) diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/haxe.go b/vendor/github.com/alecthomas/chroma/v2/lexers/haxe.go deleted file mode 100644 index 9a72de865bf7d6b4c518d148358b85b105bae8c7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/haxe.go +++ /dev/null @@ -1,647 +0,0 @@ -package lexers - -import ( - . "github.com/alecthomas/chroma/v2" // nolint -) - -// Haxe lexer. -var Haxe = Register(MustNewLexer( - &Config{ - Name: "Haxe", - Aliases: []string{"hx", "haxe", "hxsl"}, - Filenames: []string{"*.hx", "*.hxsl"}, - MimeTypes: []string{"text/haxe", "text/x-haxe", "text/x-hx"}, - DotAll: true, - }, - haxeRules, -)) - -func haxeRules() Rules { - return Rules{ - "root": { - Include("spaces"), - Include("meta"), - {`(?:package)\b`, KeywordNamespace, Push("semicolon", "package")}, - {`(?:import)\b`, KeywordNamespace, Push("semicolon", "import")}, - {`(?:using)\b`, KeywordNamespace, Push("semicolon", "using")}, - {`(?:extern|private)\b`, KeywordDeclaration, nil}, - {`(?:abstract)\b`, KeywordDeclaration, Push("abstract")}, - {`(?:class|interface)\b`, KeywordDeclaration, Push("class")}, - {`(?:enum)\b`, KeywordDeclaration, Push("enum")}, - {`(?:typedef)\b`, KeywordDeclaration, Push("typedef")}, - {`(?=.)`, Text, Push("expr-statement")}, - }, - "spaces": { - {`\s+`, Text, nil}, - {`//[^\n\r]*`, CommentSingle, nil}, - {`/\*.*?\*/`, CommentMultiline, nil}, - {`(#)(if|elseif|else|end|error)\b`, CommentPreproc, MutatorFunc(haxePreProcMutator)}, - }, - "string-single-interpol": { - {`\$\{`, LiteralStringInterpol, Push("string-interpol-close", "expr")}, - {`\$\$`, LiteralStringEscape, nil}, - {`\$(?=(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+))`, LiteralStringInterpol, Push("ident")}, - Include("string-single"), - }, - "string-single": { - {`'`, LiteralStringSingle, Pop(1)}, - {`\\.`, LiteralStringEscape, nil}, - {`.`, LiteralStringSingle, nil}, - }, - "string-double": { - {`"`, LiteralStringDouble, Pop(1)}, - {`\\.`, LiteralStringEscape, nil}, - {`.`, LiteralStringDouble, nil}, - }, - "string-interpol-close": { - {`\$(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, LiteralStringInterpol, nil}, - {`\}`, LiteralStringInterpol, Pop(1)}, - }, - "package": { - Include("spaces"), - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, NameNamespace, nil}, - {`\.`, Punctuation, Push("import-ident")}, - Default(Pop(1)), - }, - "import": { - Include("spaces"), - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, NameNamespace, nil}, - {`\*`, Keyword, nil}, - {`\.`, Punctuation, Push("import-ident")}, - {`in`, KeywordNamespace, Push("ident")}, - Default(Pop(1)), - }, - "import-ident": { - Include("spaces"), - {`\*`, Keyword, Pop(1)}, - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, NameNamespace, Pop(1)}, - }, - "using": { - Include("spaces"), - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, NameNamespace, nil}, - {`\.`, Punctuation, Push("import-ident")}, - Default(Pop(1)), - }, - "preproc-error": { - {`\s+`, CommentPreproc, nil}, - {`'`, LiteralStringSingle, Push("#pop", "string-single")}, - {`"`, LiteralStringDouble, Push("#pop", "string-double")}, - Default(Pop(1)), - }, - "preproc-expr": { - {`\s+`, CommentPreproc, nil}, - {`\!`, CommentPreproc, nil}, - {`\(`, CommentPreproc, Push("#pop", "preproc-parenthesis")}, - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, CommentPreproc, Pop(1)}, - {`\.[0-9]+`, LiteralNumberFloat, nil}, - {`[0-9]+[eE][+\-]?[0-9]+`, LiteralNumberFloat, nil}, - {`[0-9]+\.[0-9]*[eE][+\-]?[0-9]+`, LiteralNumberFloat, nil}, - {`[0-9]+\.[0-9]+`, LiteralNumberFloat, nil}, - {`[0-9]+\.(?!(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)|\.\.)`, LiteralNumberFloat, nil}, - {`0x[0-9a-fA-F]+`, LiteralNumberHex, nil}, - {`[0-9]+`, LiteralNumberInteger, nil}, - {`'`, LiteralStringSingle, Push("#pop", "string-single")}, - {`"`, LiteralStringDouble, Push("#pop", "string-double")}, - }, - "preproc-parenthesis": { - {`\s+`, CommentPreproc, nil}, - {`\)`, CommentPreproc, Pop(1)}, - Default(Push("preproc-expr-in-parenthesis")), - }, - "preproc-expr-chain": { - {`\s+`, CommentPreproc, nil}, - {`(?:%=|&=|\|=|\^=|\+=|\-=|\*=|/=|<<=|>\s*>\s*=|>\s*>\s*>\s*=|==|!=|<=|>\s*=|&&|\|\||<<|>>>|>\s*>|\.\.\.|<|>|%|&|\||\^|\+|\*|/|\-|=>|=)`, CommentPreproc, Push("#pop", "preproc-expr-in-parenthesis")}, - Default(Pop(1)), - }, - "preproc-expr-in-parenthesis": { - {`\s+`, CommentPreproc, nil}, - {`\!`, CommentPreproc, nil}, - {`\(`, CommentPreproc, Push("#pop", "preproc-expr-chain", "preproc-parenthesis")}, - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, CommentPreproc, Push("#pop", "preproc-expr-chain")}, - {`\.[0-9]+`, LiteralNumberFloat, Push("#pop", "preproc-expr-chain")}, - {`[0-9]+[eE][+\-]?[0-9]+`, LiteralNumberFloat, Push("#pop", "preproc-expr-chain")}, - {`[0-9]+\.[0-9]*[eE][+\-]?[0-9]+`, LiteralNumberFloat, Push("#pop", "preproc-expr-chain")}, - {`[0-9]+\.[0-9]+`, LiteralNumberFloat, Push("#pop", "preproc-expr-chain")}, - {`[0-9]+\.(?!(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)|\.\.)`, LiteralNumberFloat, Push("#pop", "preproc-expr-chain")}, - {`0x[0-9a-fA-F]+`, LiteralNumberHex, Push("#pop", "preproc-expr-chain")}, - {`[0-9]+`, LiteralNumberInteger, Push("#pop", "preproc-expr-chain")}, - {`'`, LiteralStringSingle, Push("#pop", "preproc-expr-chain", "string-single")}, - {`"`, LiteralStringDouble, Push("#pop", "preproc-expr-chain", "string-double")}, - }, - "abstract": { - Include("spaces"), - Default(Pop(1), Push("abstract-body"), Push("abstract-relation"), Push("abstract-opaque"), Push("type-param-constraint"), Push("type-name")), - }, - "abstract-body": { - Include("spaces"), - {`\{`, Punctuation, Push("#pop", "class-body")}, - }, - "abstract-opaque": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "parenthesis-close", "type")}, - Default(Pop(1)), - }, - "abstract-relation": { - Include("spaces"), - {`(?:to|from)`, KeywordDeclaration, Push("type")}, - {`,`, Punctuation, nil}, - Default(Pop(1)), - }, - "meta": { - Include("spaces"), - {`@`, NameDecorator, Push("meta-body", "meta-ident", "meta-colon")}, - }, - "meta-colon": { - Include("spaces"), - {`:`, NameDecorator, Pop(1)}, - Default(Pop(1)), - }, - "meta-ident": { - Include("spaces"), - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, NameDecorator, Pop(1)}, - }, - "meta-body": { - Include("spaces"), - {`\(`, NameDecorator, Push("#pop", "meta-call")}, - Default(Pop(1)), - }, - "meta-call": { - Include("spaces"), - {`\)`, NameDecorator, Pop(1)}, - Default(Pop(1), Push("meta-call-sep"), Push("expr")), - }, - "meta-call-sep": { - Include("spaces"), - {`\)`, NameDecorator, Pop(1)}, - {`,`, Punctuation, Push("#pop", "meta-call")}, - }, - "typedef": { - Include("spaces"), - Default(Pop(1), Push("typedef-body"), Push("type-param-constraint"), Push("type-name")), - }, - "typedef-body": { - Include("spaces"), - {`=`, Operator, Push("#pop", "optional-semicolon", "type")}, - }, - "enum": { - Include("spaces"), - Default(Pop(1), Push("enum-body"), Push("bracket-open"), Push("type-param-constraint"), Push("type-name")), - }, - "enum-body": { - Include("spaces"), - Include("meta"), - {`\}`, Punctuation, Pop(1)}, - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Push("enum-member", "type-param-constraint")}, - }, - "enum-member": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "semicolon", "flag", "function-param")}, - Default(Pop(1), Push("semicolon"), Push("flag")), - }, - "class": { - Include("spaces"), - Default(Pop(1), Push("class-body"), Push("bracket-open"), Push("extends"), Push("type-param-constraint"), Push("type-name")), - }, - "extends": { - Include("spaces"), - {`(?:extends|implements)\b`, KeywordDeclaration, Push("type")}, - {`,`, Punctuation, nil}, - Default(Pop(1)), - }, - "bracket-open": { - Include("spaces"), - {`\{`, Punctuation, Pop(1)}, - }, - "bracket-close": { - Include("spaces"), - {`\}`, Punctuation, Pop(1)}, - }, - "class-body": { - Include("spaces"), - Include("meta"), - {`\}`, Punctuation, Pop(1)}, - {`(?:static|public|private|override|dynamic|inline|macro)\b`, KeywordDeclaration, nil}, - Default(Push("class-member")), - }, - "class-member": { - Include("spaces"), - {`(var)\b`, KeywordDeclaration, Push("#pop", "optional-semicolon", "var")}, - {`(function)\b`, KeywordDeclaration, Push("#pop", "optional-semicolon", "class-method")}, - }, - "function-local": { - Include("spaces"), - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, NameFunction, Push("#pop", "optional-expr", "flag", "function-param", "parenthesis-open", "type-param-constraint")}, - Default(Pop(1), Push("optional-expr"), Push("flag"), Push("function-param"), Push("parenthesis-open"), Push("type-param-constraint")), - }, - "optional-expr": { - Include("spaces"), - Include("expr"), - Default(Pop(1)), - }, - "class-method": { - Include("spaces"), - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, NameFunction, Push("#pop", "optional-expr", "flag", "function-param", "parenthesis-open", "type-param-constraint")}, - }, - "function-param": { - Include("spaces"), - {`\)`, Punctuation, Pop(1)}, - {`\?`, Punctuation, nil}, - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Push("#pop", "function-param-sep", "assign", "flag")}, - }, - "function-param-sep": { - Include("spaces"), - {`\)`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "function-param")}, - }, - "prop-get-set": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "parenthesis-close", "prop-get-set-opt", "comma", "prop-get-set-opt")}, - Default(Pop(1)), - }, - "prop-get-set-opt": { - Include("spaces"), - {`(?:default|null|never|dynamic|get|set)\b`, Keyword, Pop(1)}, - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Text, Pop(1)}, - }, - "expr-statement": { - Include("spaces"), - Default(Pop(1), Push("optional-semicolon"), Push("expr")), - }, - "expr": { - Include("spaces"), - {`@`, NameDecorator, Push("#pop", "optional-expr", "meta-body", "meta-ident", "meta-colon")}, - {`(?:\+\+|\-\-|~(?!/)|!|\-)`, Operator, nil}, - {`\(`, Punctuation, Push("#pop", "expr-chain", "parenthesis")}, - {`(?:static|public|private|override|dynamic|inline)\b`, KeywordDeclaration, nil}, - {`(?:function)\b`, KeywordDeclaration, Push("#pop", "expr-chain", "function-local")}, - {`\{`, Punctuation, Push("#pop", "expr-chain", "bracket")}, - {`(?:true|false|null)\b`, KeywordConstant, Push("#pop", "expr-chain")}, - {`(?:this)\b`, Keyword, Push("#pop", "expr-chain")}, - {`(?:cast)\b`, Keyword, Push("#pop", "expr-chain", "cast")}, - {`(?:try)\b`, Keyword, Push("#pop", "catch", "expr")}, - {`(?:var)\b`, KeywordDeclaration, Push("#pop", "var")}, - {`(?:new)\b`, Keyword, Push("#pop", "expr-chain", "new")}, - {`(?:switch)\b`, Keyword, Push("#pop", "switch")}, - {`(?:if)\b`, Keyword, Push("#pop", "if")}, - {`(?:do)\b`, Keyword, Push("#pop", "do")}, - {`(?:while)\b`, Keyword, Push("#pop", "while")}, - {`(?:for)\b`, Keyword, Push("#pop", "for")}, - {`(?:untyped|throw)\b`, Keyword, nil}, - {`(?:return)\b`, Keyword, Push("#pop", "optional-expr")}, - {`(?:macro)\b`, Keyword, Push("#pop", "macro")}, - {`(?:continue|break)\b`, Keyword, Pop(1)}, - {`(?:\$\s*[a-z]\b|\$(?!(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)))`, Name, Push("#pop", "dollar")}, - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Push("#pop", "expr-chain")}, - {`\.[0-9]+`, LiteralNumberFloat, Push("#pop", "expr-chain")}, - {`[0-9]+[eE][+\-]?[0-9]+`, LiteralNumberFloat, Push("#pop", "expr-chain")}, - {`[0-9]+\.[0-9]*[eE][+\-]?[0-9]+`, LiteralNumberFloat, Push("#pop", "expr-chain")}, - {`[0-9]+\.[0-9]+`, LiteralNumberFloat, Push("#pop", "expr-chain")}, - {`[0-9]+\.(?!(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)|\.\.)`, LiteralNumberFloat, Push("#pop", "expr-chain")}, - {`0x[0-9a-fA-F]+`, LiteralNumberHex, Push("#pop", "expr-chain")}, - {`[0-9]+`, LiteralNumberInteger, Push("#pop", "expr-chain")}, - {`'`, LiteralStringSingle, Push("#pop", "expr-chain", "string-single-interpol")}, - {`"`, LiteralStringDouble, Push("#pop", "expr-chain", "string-double")}, - {`~/(\\\\|\\/|[^/\n])*/[gimsu]*`, LiteralStringRegex, Push("#pop", "expr-chain")}, - {`\[`, Punctuation, Push("#pop", "expr-chain", "array-decl")}, - }, - "expr-chain": { - Include("spaces"), - {`(?:\+\+|\-\-)`, Operator, nil}, - {`(?:%=|&=|\|=|\^=|\+=|\-=|\*=|/=|<<=|>\s*>\s*=|>\s*>\s*>\s*=|==|!=|<=|>\s*=|&&|\|\||<<|>>>|>\s*>|\.\.\.|<|>|%|&|\||\^|\+|\*|/|\-|=>|=)`, Operator, Push("#pop", "expr")}, - {`(?:in)\b`, Keyword, Push("#pop", "expr")}, - {`\?`, Operator, Push("#pop", "expr", "ternary", "expr")}, - {`(\.)((?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+))`, ByGroups(Punctuation, Name), nil}, - {`\[`, Punctuation, Push("array-access")}, - {`\(`, Punctuation, Push("call")}, - Default(Pop(1)), - }, - "macro": { - Include("spaces"), - Include("meta"), - {`:`, Punctuation, Push("#pop", "type")}, - {`(?:extern|private)\b`, KeywordDeclaration, nil}, - {`(?:abstract)\b`, KeywordDeclaration, Push("#pop", "optional-semicolon", "abstract")}, - {`(?:class|interface)\b`, KeywordDeclaration, Push("#pop", "optional-semicolon", "macro-class")}, - {`(?:enum)\b`, KeywordDeclaration, Push("#pop", "optional-semicolon", "enum")}, - {`(?:typedef)\b`, KeywordDeclaration, Push("#pop", "optional-semicolon", "typedef")}, - Default(Pop(1), Push("expr")), - }, - "macro-class": { - {`\{`, Punctuation, Push("#pop", "class-body")}, - Include("class"), - }, - "cast": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "parenthesis-close", "cast-type", "expr")}, - Default(Pop(1), Push("expr")), - }, - "cast-type": { - Include("spaces"), - {`,`, Punctuation, Push("#pop", "type")}, - Default(Pop(1)), - }, - "catch": { - Include("spaces"), - {`(?:catch)\b`, Keyword, Push("expr", "function-param", "parenthesis-open")}, - Default(Pop(1)), - }, - "do": { - Include("spaces"), - Default(Pop(1), Push("do-while"), Push("expr")), - }, - "do-while": { - Include("spaces"), - {`(?:while)\b`, Keyword, Push("#pop", "parenthesis", "parenthesis-open")}, - }, - "while": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "expr", "parenthesis")}, - }, - "for": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "expr", "parenthesis")}, - }, - "if": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "else", "optional-semicolon", "expr", "parenthesis")}, - }, - "else": { - Include("spaces"), - {`(?:else)\b`, Keyword, Push("#pop", "expr")}, - Default(Pop(1)), - }, - "switch": { - Include("spaces"), - Default(Pop(1), Push("switch-body"), Push("bracket-open"), Push("expr")), - }, - "switch-body": { - Include("spaces"), - {`(?:case|default)\b`, Keyword, Push("case-block", "case")}, - {`\}`, Punctuation, Pop(1)}, - }, - "case": { - Include("spaces"), - {`:`, Punctuation, Pop(1)}, - Default(Pop(1), Push("case-sep"), Push("case-guard"), Push("expr")), - }, - "case-sep": { - Include("spaces"), - {`:`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "case")}, - }, - "case-guard": { - Include("spaces"), - {`(?:if)\b`, Keyword, Push("#pop", "parenthesis", "parenthesis-open")}, - Default(Pop(1)), - }, - "case-block": { - Include("spaces"), - {`(?!(?:case|default)\b|\})`, Keyword, Push("expr-statement")}, - Default(Pop(1)), - }, - "new": { - Include("spaces"), - Default(Pop(1), Push("call"), Push("parenthesis-open"), Push("type")), - }, - "array-decl": { - Include("spaces"), - {`\]`, Punctuation, Pop(1)}, - Default(Pop(1), Push("array-decl-sep"), Push("expr")), - }, - "array-decl-sep": { - Include("spaces"), - {`\]`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "array-decl")}, - }, - "array-access": { - Include("spaces"), - Default(Pop(1), Push("array-access-close"), Push("expr")), - }, - "array-access-close": { - Include("spaces"), - {`\]`, Punctuation, Pop(1)}, - }, - "comma": { - Include("spaces"), - {`,`, Punctuation, Pop(1)}, - }, - "colon": { - Include("spaces"), - {`:`, Punctuation, Pop(1)}, - }, - "semicolon": { - Include("spaces"), - {`;`, Punctuation, Pop(1)}, - }, - "optional-semicolon": { - Include("spaces"), - {`;`, Punctuation, Pop(1)}, - Default(Pop(1)), - }, - "ident": { - Include("spaces"), - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Pop(1)}, - }, - "dollar": { - Include("spaces"), - {`\{`, Punctuation, Push("#pop", "expr-chain", "bracket-close", "expr")}, - Default(Pop(1), Push("expr-chain")), - }, - "type-name": { - Include("spaces"), - {`_*[A-Z]\w*`, Name, Pop(1)}, - }, - "type-full-name": { - Include("spaces"), - {`\.`, Punctuation, Push("ident")}, - Default(Pop(1)), - }, - "type": { - Include("spaces"), - {`\?`, Punctuation, nil}, - {`(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Push("#pop", "type-check", "type-full-name")}, - {`\{`, Punctuation, Push("#pop", "type-check", "type-struct")}, - {`\(`, Punctuation, Push("#pop", "type-check", "type-parenthesis")}, - }, - "type-parenthesis": { - Include("spaces"), - Default(Pop(1), Push("parenthesis-close"), Push("type")), - }, - "type-check": { - Include("spaces"), - {`->`, Punctuation, Push("#pop", "type")}, - {`<(?!=)`, Punctuation, Push("type-param")}, - Default(Pop(1)), - }, - "type-struct": { - Include("spaces"), - {`\}`, Punctuation, Pop(1)}, - {`\?`, Punctuation, nil}, - {`>`, Punctuation, Push("comma", "type")}, - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Push("#pop", "type-struct-sep", "type", "colon")}, - Include("class-body"), - }, - "type-struct-sep": { - Include("spaces"), - {`\}`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "type-struct")}, - }, - "type-param-type": { - {`\.[0-9]+`, LiteralNumberFloat, Pop(1)}, - {`[0-9]+[eE][+\-]?[0-9]+`, LiteralNumberFloat, Pop(1)}, - {`[0-9]+\.[0-9]*[eE][+\-]?[0-9]+`, LiteralNumberFloat, Pop(1)}, - {`[0-9]+\.[0-9]+`, LiteralNumberFloat, Pop(1)}, - {`[0-9]+\.(?!(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)|\.\.)`, LiteralNumberFloat, Pop(1)}, - {`0x[0-9a-fA-F]+`, LiteralNumberHex, Pop(1)}, - {`[0-9]+`, LiteralNumberInteger, Pop(1)}, - {`'`, LiteralStringSingle, Push("#pop", "string-single")}, - {`"`, LiteralStringDouble, Push("#pop", "string-double")}, - {`~/(\\\\|\\/|[^/\n])*/[gim]*`, LiteralStringRegex, Pop(1)}, - {`\[`, Operator, Push("#pop", "array-decl")}, - Include("type"), - }, - "type-param": { - Include("spaces"), - Default(Pop(1), Push("type-param-sep"), Push("type-param-type")), - }, - "type-param-sep": { - Include("spaces"), - {`>`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "type-param")}, - }, - "type-param-constraint": { - Include("spaces"), - {`<(?!=)`, Punctuation, Push("#pop", "type-param-constraint-sep", "type-param-constraint-flag", "type-name")}, - Default(Pop(1)), - }, - "type-param-constraint-sep": { - Include("spaces"), - {`>`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "type-param-constraint-sep", "type-param-constraint-flag", "type-name")}, - }, - "type-param-constraint-flag": { - Include("spaces"), - {`:`, Punctuation, Push("#pop", "type-param-constraint-flag-type")}, - Default(Pop(1)), - }, - "type-param-constraint-flag-type": { - Include("spaces"), - {`\(`, Punctuation, Push("#pop", "type-param-constraint-flag-type-sep", "type")}, - Default(Pop(1), Push("type")), - }, - "type-param-constraint-flag-type-sep": { - Include("spaces"), - {`\)`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("type")}, - }, - "parenthesis": { - Include("spaces"), - Default(Pop(1), Push("parenthesis-close"), Push("flag"), Push("expr")), - }, - "parenthesis-open": { - Include("spaces"), - {`\(`, Punctuation, Pop(1)}, - }, - "parenthesis-close": { - Include("spaces"), - {`\)`, Punctuation, Pop(1)}, - }, - "var": { - Include("spaces"), - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Text, Push("#pop", "var-sep", "assign", "flag", "prop-get-set")}, - }, - "var-sep": { - Include("spaces"), - {`,`, Punctuation, Push("#pop", "var")}, - Default(Pop(1)), - }, - "assign": { - Include("spaces"), - {`=`, Operator, Push("#pop", "expr")}, - Default(Pop(1)), - }, - "flag": { - Include("spaces"), - {`:`, Punctuation, Push("#pop", "type")}, - Default(Pop(1)), - }, - "ternary": { - Include("spaces"), - {`:`, Operator, Pop(1)}, - }, - "call": { - Include("spaces"), - {`\)`, Punctuation, Pop(1)}, - Default(Pop(1), Push("call-sep"), Push("expr")), - }, - "call-sep": { - Include("spaces"), - {`\)`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "call")}, - }, - "bracket": { - Include("spaces"), - {`(?!(?:\$\s*[a-z]\b|\$(?!(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+))))(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Push("#pop", "bracket-check")}, - {`'`, LiteralStringSingle, Push("#pop", "bracket-check", "string-single")}, - {`"`, LiteralStringDouble, Push("#pop", "bracket-check", "string-double")}, - Default(Pop(1), Push("block")), - }, - "bracket-check": { - Include("spaces"), - {`:`, Punctuation, Push("#pop", "object-sep", "expr")}, - Default(Pop(1), Push("block"), Push("optional-semicolon"), Push("expr-chain")), - }, - "block": { - Include("spaces"), - {`\}`, Punctuation, Pop(1)}, - Default(Push("expr-statement")), - }, - "object": { - Include("spaces"), - {`\}`, Punctuation, Pop(1)}, - Default(Pop(1), Push("object-sep"), Push("expr"), Push("colon"), Push("ident-or-string")), - }, - "ident-or-string": { - Include("spaces"), - {`(?!(?:function|class|static|var|if|else|while|do|for|break|return|continue|extends|implements|import|switch|case|default|public|private|try|untyped|catch|new|this|throw|extern|enum|in|interface|cast|override|dynamic|typedef|package|inline|using|null|true|false|abstract)\b)(?:_*[a-z]\w*|_+[0-9]\w*|_*[A-Z]\w*|_+|\$\w+)`, Name, Pop(1)}, - {`'`, LiteralStringSingle, Push("#pop", "string-single")}, - {`"`, LiteralStringDouble, Push("#pop", "string-double")}, - }, - "object-sep": { - Include("spaces"), - {`\}`, Punctuation, Pop(1)}, - {`,`, Punctuation, Push("#pop", "object")}, - }, - } -} - -func haxePreProcMutator(state *LexerState) error { - stack, ok := state.Get("haxe-pre-proc").([][]string) - if !ok { - stack = [][]string{} - } - - proc := state.Groups[2] - switch proc { - case "if": - stack = append(stack, state.Stack) - case "else", "elseif": - if len(stack) > 0 { - state.Stack = stack[len(stack)-1] - } - case "end": - if len(stack) > 0 { - stack = stack[:len(stack)-1] - } - } - - if proc == "if" || proc == "elseif" { - state.Stack = append(state.Stack, "preproc-expr") - } - - if proc == "error" { - state.Stack = append(state.Stack, "preproc-error") - } - state.Set("haxe-pre-proc", stack) - return nil -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/html.go b/vendor/github.com/alecthomas/chroma/v2/lexers/html.go deleted file mode 100644 index c858042bf9d2de9f99fff9de6dd2103e5610104b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/html.go +++ /dev/null @@ -1,8 +0,0 @@ -package lexers - -import ( - "github.com/alecthomas/chroma/v2" -) - -// HTML lexer. -var HTML = chroma.MustNewXMLLexer(embedded, "embedded/html.xml") diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/http.go b/vendor/github.com/alecthomas/chroma/v2/lexers/http.go deleted file mode 100644 index b57cb1b84e29a80fd3f92059e9889683e12c37ff..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/http.go +++ /dev/null @@ -1,131 +0,0 @@ -package lexers - -import ( - "strings" - - . "github.com/alecthomas/chroma/v2" // nolint -) - -// HTTP lexer. -var HTTP = Register(httpBodyContentTypeLexer(MustNewLexer( - &Config{ - Name: "HTTP", - Aliases: []string{"http"}, - Filenames: []string{}, - MimeTypes: []string{}, - NotMultiline: true, - DotAll: true, - }, - httpRules, -))) - -func httpRules() Rules { - return Rules{ - "root": { - {`(GET|POST|PUT|DELETE|HEAD|OPTIONS|TRACE|PATCH|CONNECT)( +)([^ ]+)( +)(HTTP)(/)([123](?:\.[01])?)(\r?\n|\Z)`, ByGroups(NameFunction, Text, NameNamespace, Text, KeywordReserved, Operator, LiteralNumber, Text), Push("headers")}, - {`(HTTP)(/)([123](?:\.[01])?)( +)(\d{3})( *)([^\r\n]*)(\r?\n|\Z)`, ByGroups(KeywordReserved, Operator, LiteralNumber, Text, LiteralNumber, Text, NameException, Text), Push("headers")}, - }, - "headers": { - {`([^\s:]+)( *)(:)( *)([^\r\n]+)(\r?\n|\Z)`, EmitterFunc(httpHeaderBlock), nil}, - {`([\t ]+)([^\r\n]+)(\r?\n|\Z)`, EmitterFunc(httpContinuousHeaderBlock), nil}, - {`\r?\n`, Text, Push("content")}, - }, - "content": { - {`.+`, EmitterFunc(httpContentBlock), nil}, - }, - } -} - -func httpContentBlock(groups []string, state *LexerState) Iterator { - tokens := []Token{ - {Generic, groups[0]}, - } - return Literator(tokens...) -} - -func httpHeaderBlock(groups []string, state *LexerState) Iterator { - tokens := []Token{ - {Name, groups[1]}, - {Text, groups[2]}, - {Operator, groups[3]}, - {Text, groups[4]}, - {Literal, groups[5]}, - {Text, groups[6]}, - } - return Literator(tokens...) -} - -func httpContinuousHeaderBlock(groups []string, state *LexerState) Iterator { - tokens := []Token{ - {Text, groups[1]}, - {Literal, groups[2]}, - {Text, groups[3]}, - } - return Literator(tokens...) -} - -func httpBodyContentTypeLexer(lexer Lexer) Lexer { return &httpBodyContentTyper{lexer} } - -type httpBodyContentTyper struct{ Lexer } - -func (d *httpBodyContentTyper) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { // nolint: gocognit - var contentType string - var isContentType bool - var subIterator Iterator - - it, err := d.Lexer.Tokenise(options, text) - if err != nil { - return nil, err - } - - return func() Token { - token := it() - - if token == EOF { - if subIterator != nil { - return subIterator() - } - return EOF - } - - switch { - case token.Type == Name && strings.ToLower(token.Value) == "content-type": - { - isContentType = true - } - case token.Type == Literal && isContentType: - { - isContentType = false - contentType = strings.TrimSpace(token.Value) - pos := strings.Index(contentType, ";") - if pos > 0 { - contentType = strings.TrimSpace(contentType[:pos]) - } - } - case token.Type == Generic && contentType != "": - { - lexer := MatchMimeType(contentType) - - // application/calendar+xml can be treated as application/xml - // if there's not a better match. - if lexer == nil && strings.Contains(contentType, "+") { - slashPos := strings.Index(contentType, "/") - plusPos := strings.LastIndex(contentType, "+") - contentType = contentType[:slashPos+1] + contentType[plusPos+1:] - lexer = MatchMimeType(contentType) - } - - if lexer == nil { - token.Type = Text - } else { - subIterator, err = lexer.Tokenise(nil, token.Value) - if err != nil { - panic(err) - } - return EOF - } - } - } - return token - }, nil -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/lexers.go b/vendor/github.com/alecthomas/chroma/v2/lexers/lexers.go deleted file mode 100644 index 4fa35ad2222311d5d4310f16b48a2f746636d0ba..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/lexers.go +++ /dev/null @@ -1,79 +0,0 @@ -package lexers - -import ( - "embed" - "io/fs" - - "github.com/alecthomas/chroma/v2" -) - -//go:embed embedded -var embedded embed.FS - -// GlobalLexerRegistry is the global LexerRegistry of Lexers. -var GlobalLexerRegistry = func() *chroma.LexerRegistry { - reg := chroma.NewLexerRegistry() - // index(reg) - paths, err := fs.Glob(embedded, "embedded/*.xml") - if err != nil { - panic(err) - } - for _, path := range paths { - reg.Register(chroma.MustNewXMLLexer(embedded, path)) - } - return reg -}() - -// Names of all lexers, optionally including aliases. -func Names(withAliases bool) []string { - return GlobalLexerRegistry.Names(withAliases) -} - -// Get a Lexer by name, alias or file extension. -// -// Note that this if there isn't an exact match on name or alias, this will -// call Match(), so it is not efficient. -func Get(name string) chroma.Lexer { - return GlobalLexerRegistry.Get(name) -} - -// MatchMimeType attempts to find a lexer for the given MIME type. -func MatchMimeType(mimeType string) chroma.Lexer { - return GlobalLexerRegistry.MatchMimeType(mimeType) -} - -// Match returns the first lexer matching filename. -// -// Note that this iterates over all file patterns in all lexers, so it's not -// particularly efficient. -func Match(filename string) chroma.Lexer { - return GlobalLexerRegistry.Match(filename) -} - -// Register a Lexer with the global registry. -func Register(lexer chroma.Lexer) chroma.Lexer { - return GlobalLexerRegistry.Register(lexer) -} - -// Analyse text content and return the "best" lexer.. -func Analyse(text string) chroma.Lexer { - return GlobalLexerRegistry.Analyse(text) -} - -// PlaintextRules is used for the fallback lexer as well as the explicit -// plaintext lexer. -func PlaintextRules() chroma.Rules { - return chroma.Rules{ - "root": []chroma.Rule{ - {`.+`, chroma.Text, nil}, - {`\n`, chroma.Text, nil}, - }, - } -} - -// Fallback lexer if no other is found. -var Fallback chroma.Lexer = chroma.MustNewLexer(&chroma.Config{ - Name: "fallback", - Filenames: []string{"*"}, - Priority: -1, -}, PlaintextRules) diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/markdown.go b/vendor/github.com/alecthomas/chroma/v2/lexers/markdown.go deleted file mode 100644 index db5a89484f90beef8705dad583ca7d2677c0ea6b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/markdown.go +++ /dev/null @@ -1,46 +0,0 @@ -package lexers - -import ( - . "github.com/alecthomas/chroma/v2" // nolint -) - -// Markdown lexer. -var Markdown = Register(DelegatingLexer(HTML, MustNewLexer( - &Config{ - Name: "markdown", - Aliases: []string{"md", "mkd"}, - Filenames: []string{"*.md", "*.mkd", "*.markdown"}, - MimeTypes: []string{"text/x-markdown"}, - }, - markdownRules, -))) - -func markdownRules() Rules { - return Rules{ - "root": { - {`^(#[^#].+\n)`, ByGroups(GenericHeading), nil}, - {`^(#{2,6}.+\n)`, ByGroups(GenericSubheading), nil}, - {`^(\s*)([*-] )(\[[ xX]\])( .+\n)`, ByGroups(Text, Keyword, Keyword, UsingSelf("inline")), nil}, - {`^(\s*)([*-])(\s)(.+\n)`, ByGroups(Text, Keyword, Text, UsingSelf("inline")), nil}, - {`^(\s*)([0-9]+\.)( .+\n)`, ByGroups(Text, Keyword, UsingSelf("inline")), nil}, - {`^(\s*>\s)(.+\n)`, ByGroups(Keyword, GenericEmph), nil}, - {"^(```\\n)([\\w\\W]*?)(^```$)", ByGroups(String, Text, String), nil}, - { - "^(```)(\\w+)(\\n)([\\w\\W]*?)(^```$)", - UsingByGroup(2, 4, String, String, String, Text, String), - nil, - }, - Include("inline"), - }, - "inline": { - {`\\.`, Text, nil}, - {`(\s)(\*|_)((?:(?!\2).)*)(\2)((?=\W|\n))`, ByGroups(Text, GenericEmph, GenericEmph, GenericEmph, Text), nil}, - {`(\s)((\*\*|__).*?)\3((?=\W|\n))`, ByGroups(Text, GenericStrong, GenericStrong, Text), nil}, - {`(\s)(~~[^~]+~~)((?=\W|\n))`, ByGroups(Text, GenericDeleted, Text), nil}, - {"`[^`]+`", LiteralStringBacktick, nil}, - {`[@#][\w/:]+`, NameEntity, nil}, - {`(!?\[)([^]]+)(\])(\()([^)]+)(\))`, ByGroups(Text, NameTag, Text, Text, NameAttribute, Text), nil}, - {`.|\n`, Other, nil}, - }, - } -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/mysql.go b/vendor/github.com/alecthomas/chroma/v2/lexers/mysql.go deleted file mode 100644 index 32e94c2f2ef2200e9284d04714a4977418ef345f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/mysql.go +++ /dev/null @@ -1,33 +0,0 @@ -package lexers - -import ( - "regexp" -) - -var ( - mysqlAnalyserNameBetweenBacktickRe = regexp.MustCompile("`[a-zA-Z_]\\w*`") - mysqlAnalyserNameBetweenBracketRe = regexp.MustCompile(`\[[a-zA-Z_]\w*\]`) -) - -func init() { // nolint: gochecknoinits - Get("mysql"). - SetAnalyser(func(text string) float32 { - nameBetweenBacktickCount := len(mysqlAnalyserNameBetweenBacktickRe.FindAllString(text, -1)) - nameBetweenBracketCount := len(mysqlAnalyserNameBetweenBracketRe.FindAllString(text, -1)) - - var result float32 - - // Same logic as above in the TSQL analysis. - dialectNameCount := nameBetweenBacktickCount + nameBetweenBracketCount - if dialectNameCount >= 1 && nameBetweenBacktickCount >= (2*nameBetweenBracketCount) { - // Found at least twice as many `name` as [name]. - result += 0.5 - } else if nameBetweenBacktickCount > nameBetweenBracketCount { - result += 0.2 - } else if nameBetweenBacktickCount > 0 { - result += 0.1 - } - - return result - }) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/php.go b/vendor/github.com/alecthomas/chroma/v2/lexers/php.go deleted file mode 100644 index ff82f6eafa96a0e20a69ce707308e056769267f1..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/php.go +++ /dev/null @@ -1,37 +0,0 @@ -package lexers - -import ( - "strings" - - . "github.com/alecthomas/chroma/v2" // nolint -) - -// phtml lexer is PHP in HTML. -var _ = Register(DelegatingLexer(HTML, MustNewLexer( - &Config{ - Name: "PHTML", - Aliases: []string{"phtml"}, - Filenames: []string{"*.phtml", "*.php", "*.php[345]", "*.inc"}, - MimeTypes: []string{"application/x-php", "application/x-httpd-php", "application/x-httpd-php3", "application/x-httpd-php4", "application/x-httpd-php5", "text/x-php"}, - DotAll: true, - CaseInsensitive: true, - EnsureNL: true, - Priority: 2, - }, - func() Rules { - return Get("PHP").(*RegexLexer).MustRules(). - Rename("root", "php"). - Merge(Rules{ - "root": { - {`<\?(php)?`, CommentPreproc, Push("php")}, - {`[^<]+`, Other, nil}, - {`<`, Other, nil}, - }, - }) - }, -).SetAnalyser(func(text string) float32 { - if strings.Contains(text, ">|>|»|\)|\]|\})` - colonPairPattern = `(?:)(?- -Zig -zig -*.zig -text/zig -- -- -- -- - -- - -- - - -- -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - -- - - -- - -- \w[\w'-]*)(? ` + colonPairOpeningBrackets + `)` - colonPairLookahead = `(?=(:['\w-]+` + - colonPairOpeningBrackets + `.+?` + colonPairClosingBrackets + `)?` - namePattern = `(?:(?!` + colonPairPattern + `)(?:::|[\w':-]))+` - variablePattern = `[$@%&]+[.^:?=!~]?` + namePattern - globalVariablePattern = `[$@%&]+\*` + namePattern - ) - - keywords := []string{ - `BEGIN`, `CATCH`, `CHECK`, `CLOSE`, `CONTROL`, `DOC`, `END`, `ENTER`, `FIRST`, `INIT`, - `KEEP`, `LAST`, `LEAVE`, `NEXT`, `POST`, `PRE`, `QUIT`, `UNDO`, `anon`, `augment`, `but`, - `class`, `constant`, `default`, `does`, `else`, `elsif`, `enum`, `for`, `gather`, `given`, - `grammar`, `has`, `if`, `import`, `is`, `of`, `let`, `loop`, `made`, `make`, `method`, - `module`, `multi`, `my`, `need`, `orwith`, `our`, `proceed`, `proto`, `repeat`, `require`, - `where`, `return`, `return-rw`, `returns`, `->`, `-->`, `role`, `state`, `sub`, `no`, - `submethod`, `subset`, `succeed`, `supersede`, `try`, `unit`, `unless`, `until`, - `use`, `when`, `while`, `with`, `without`, `export`, `native`, `repr`, `required`, `rw`, - `symbol`, `default`, `cached`, `DEPRECATED`, `dynamic`, `hidden-from-backtrace`, `nodal`, - `pure`, `raw`, `start`, `react`, `supply`, `whenever`, `also`, `rule`, `token`, `regex`, - `dynamic-scope`, `built`, `temp`, - } - - keywordsPattern := Words(`(?)`, `(>=)`, `minmax`, `notandthen`, `S`, - } - - wordOperatorsPattern := Words(`(?<=^|\b|\s)`, `(?=$|\b|\s)`, wordOperators...) - - operators := []string{ - `++`, `--`, `-`, `**`, `!`, `+`, `~`, `?`, `+^`, `~^`, `?^`, `^`, `*`, `/`, `%`, `%%`, `+&`, - `+<`, `+>`, `~&`, `~<`, `~>`, `?&`, `+|`, `+^`, `~|`, `~^`, `?`, `?|`, `?^`, `&`, `^`, - `<=>`, `^…^`, `^…`, `…^`, `…`, `...`, `...^`, `^...`, `^...^`, `..`, `..^`, `^..`, `^..^`, - `::=`, `:=`, `!=`, `==`, `<=`, `<`, `>=`, `>`, `~~`, `===`, `&&`, `||`, `|`, `^^`, `//`, - `??`, `!!`, `^fff^`, `^ff^`, `<==`, `==>`, `<<==`, `==>>`, `=>`, `=`, `<<`, `«`, `>>`, `»`, - `,`, `>>.`, `».`, `.&`, `.=`, `.^`, `.?`, `.+`, `.*`, `.`, `∘`, `∩`, `⊍`, `∪`, `⊎`, `∖`, - `⊖`, `≠`, `≤`, `≥`, `=:=`, `=~=`, `≅`, `∈`, `∉`, `≡`, `≢`, `∋`, `∌`, `⊂`, `⊄`, `⊆`, `⊈`, - `⊃`, `⊅`, `⊇`, `⊉`, `:`, `!!!`, `???`, `¯`, `×`, `÷`, `−`, `⁺`, `⁻`, - } - - operatorsPattern := Words(``, ``, operators...) - - builtinTypes := []string{ - `False`, `True`, `Order`, `More`, `Less`, `Same`, `Any`, `Array`, `Associative`, `AST`, - `atomicint`, `Attribute`, `Backtrace`, `Backtrace::Frame`, `Bag`, `Baggy`, `BagHash`, - `Blob`, `Block`, `Bool`, `Buf`, `Callable`, `CallFrame`, `Cancellation`, `Capture`, - `CArray`, `Channel`, `Code`, `compiler`, `Complex`, `ComplexStr`, `CompUnit`, - `CompUnit::PrecompilationRepository`, `CompUnit::Repository`, `Empty`, - `CompUnit::Repository::FileSystem`, `CompUnit::Repository::Installation`, `Cool`, - `CurrentThreadScheduler`, `CX::Warn`, `CX::Take`, `CX::Succeed`, `CX::Return`, `CX::Redo`, - `CX::Proceed`, `CX::Next`, `CX::Last`, `CX::Emit`, `CX::Done`, `Cursor`, `Date`, `Dateish`, - `DateTime`, `Distribution`, `Distribution::Hash`, `Distribution::Locally`, - `Distribution::Path`, `Distribution::Resource`, `Distro`, `Duration`, `Encoding`, - `Encoding::GlobalLexerRegistry`, `Endian`, `Enumeration`, `Exception`, `Failure`, `FatRat`, `Grammar`, - `Hash`, `HyperWhatever`, `Instant`, `Int`, `int`, `int16`, `int32`, `int64`, `int8`, `str`, - `IntStr`, `IO`, `IO::ArgFiles`, `IO::CatHandle`, `IO::Handle`, `IO::Notification`, - `IO::Notification::Change`, `IO::Path`, `IO::Path::Cygwin`, `IO::Path::Parts`, - `IO::Path::QNX`, `IO::Path::Unix`, `IO::Path::Win32`, `IO::Pipe`, `IO::Socket`, - `IO::Socket::Async`, `IO::Socket::Async::ListenSocket`, `IO::Socket::INET`, `IO::Spec`, - `IO::Spec::Cygwin`, `IO::Spec::QNX`, `IO::Spec::Unix`, `IO::Spec::Win32`, `IO::Special`, - `Iterable`, `Iterator`, `Junction`, `Kernel`, `Label`, `List`, `Lock`, `Lock::Async`, - `Lock::ConditionVariable`, `long`, `longlong`, `Macro`, `Map`, `Match`, - `Metamodel::AttributeContainer`, `Metamodel::C3MRO`, `Metamodel::ClassHOW`, - `Metamodel::ConcreteRoleHOW`, `Metamodel::CurriedRoleHOW`, `Metamodel::DefiniteHOW`, - `Metamodel::Documenting`, `Metamodel::EnumHOW`, `Metamodel::Finalization`, - `Metamodel::MethodContainer`, `Metamodel::Mixins`, `Metamodel::MROBasedMethodDispatch`, - `Metamodel::MultipleInheritance`, `Metamodel::Naming`, `Metamodel::Primitives`, - `Metamodel::PrivateMethodContainer`, `Metamodel::RoleContainer`, `Metamodel::RolePunning`, - `Metamodel::Stashing`, `Metamodel::Trusting`, `Metamodel::Versioning`, `Method`, `Mix`, - `MixHash`, `Mixy`, `Mu`, `NFC`, `NFD`, `NFKC`, `NFKD`, `Nil`, `Num`, `num32`, `num64`, - `Numeric`, `NumStr`, `ObjAt`, `Order`, `Pair`, `Parameter`, `Perl`, `Pod::Block`, - `Pod::Block::Code`, `Pod::Block::Comment`, `Pod::Block::Declarator`, `Pod::Block::Named`, - `Pod::Block::Para`, `Pod::Block::Table`, `Pod::Heading`, `Pod::Item`, `Pointer`, - `Positional`, `PositionalBindFailover`, `Proc`, `Proc::Async`, `Promise`, `Proxy`, - `PseudoStash`, `QuantHash`, `RaceSeq`, `Raku`, `Range`, `Rat`, `Rational`, `RatStr`, - `Real`, `Regex`, `Routine`, `Routine::WrapHandle`, `Scalar`, `Scheduler`, `Semaphore`, - `Seq`, `Sequence`, `Set`, `SetHash`, `Setty`, `Signature`, `size_t`, `Slip`, `Stash`, - `Str`, `StrDistance`, `Stringy`, `Sub`, `Submethod`, `Supplier`, `Supplier::Preserving`, - `Supply`, `Systemic`, `Tap`, `Telemetry`, `Telemetry::Instrument::Thread`, - `Telemetry::Instrument::ThreadPool`, `Telemetry::Instrument::Usage`, `Telemetry::Period`, - `Telemetry::Sampler`, `Thread`, `Test`, `ThreadPoolScheduler`, `UInt`, `uint16`, `uint32`, - `uint64`, `uint8`, `Uni`, `utf8`, `ValueObjAt`, `Variable`, `Version`, `VM`, `Whatever`, - `WhateverCode`, `WrapHandle`, `NativeCall`, - // Pragmas - `precompilation`, `experimental`, `worries`, `MONKEY-TYPING`, `MONKEY-SEE-NO-EVAL`, - `MONKEY-GUTS`, `fatal`, `lib`, `isms`, `newline`, `nqp`, `soft`, - `strict`, `trace`, `variables`, - } - - builtinTypesPattern := Words(`(? 0 { - if tokenClass == rakuPod { - match, err := podRegex.FindRunesMatchStartingAt(text, searchPos+nChars) - if err == nil { - closingChars = match.Runes() - nextClosePos = match.Index - } else { - nextClosePos = -1 - } - } else { - nextClosePos = indexAt(text, closingChars, searchPos+nChars) - } - - nextOpenPos := indexAt(text, openingChars, searchPos+nChars) - - switch { - case nextClosePos == -1: - nextClosePos = len(text) - nestingLevel = 0 - case nextOpenPos != -1 && nextOpenPos < nextClosePos: - nestingLevel++ - nChars = len(openingChars) - searchPos = nextOpenPos - default: // next_close_pos < next_open_pos - nestingLevel-- - nChars = len(closingChars) - searchPos = nextClosePos - } - } - - endPos = nextClosePos - } - - if endPos < 0 { - // if we didn't find a closer, just highlight the - // rest of the text in this class - endPos = len(text) - } - - adverbre := regexp.MustCompile(`:to\b|:heredoc\b`) - var heredocTerminator []rune - var endHeredocPos int - if adverbre.MatchString(string(adverbs)) { - if endPos != len(text) { - heredocTerminator = text[state.Pos:endPos] - nChars = len(heredocTerminator) - } else { - endPos = state.Pos + 1 - heredocTerminator = []rune{} - nChars = 0 - } - - if nChars > 0 { - endHeredocPos = indexAt(text[endPos:], heredocTerminator, 0) - if endHeredocPos > -1 { - endPos += endHeredocPos - } else { - endPos = len(text) - } - } - } - - textBetweenBrackets := string(text[state.Pos:endPos]) - switch tokenClass { - case rakuPod, rakuPodDeclaration, rakuNameAttribute: - state.NamedGroups[`value`] = textBetweenBrackets - state.NamedGroups[`closing_delimiters`] = string(closingChars) - case rakuQuote: - if len(heredocTerminator) > 0 { - // Length of heredoc terminator + closing chars + `;` - heredocFristPunctuationLen := nChars + len(openingChars) + 1 - - state.NamedGroups[`opening_delimiters`] = string(openingChars) + - string(text[state.Pos:state.Pos+heredocFristPunctuationLen]) - - state.NamedGroups[`value`] = - string(text[state.Pos+heredocFristPunctuationLen : endPos]) - - if endHeredocPos > -1 { - state.NamedGroups[`closing_delimiters`] = string(heredocTerminator) - } - } else { - state.NamedGroups[`value`] = textBetweenBrackets - if nChars > 0 { - state.NamedGroups[`closing_delimiters`] = string(closingChars) - } - } - default: - state.Groups = []string{state.Groups[0] + string(text[state.Pos:endPos+nChars])} - } - - state.Pos = endPos + nChars - - return nil - } - } - - // Raku rules - // Empty capture groups are placeholders and will be replaced by mutators - // DO NOT REMOVE THEM! - return Rules{ - "root": { - // Placeholder, will be overwritten by mutators, DO NOT REMOVE! - {`\A\z`, nil, nil}, - Include("common"), - {`{`, Punctuation, Push(`root`)}, - {`\(`, Punctuation, Push(`root`)}, - {`[)}]`, Punctuation, Pop(1)}, - {`;`, Punctuation, nil}, - {`\[|\]`, Operator, nil}, - {`.+?`, Text, nil}, - }, - "common": { - {`^#![^\n]*$`, CommentHashbang, nil}, - Include("pod"), - // Multi-line, Embedded comment - { - "#`(? (? " + bracketsPattern + `)\k *)`, - CommentMultiline, - findBrackets(rakuMultilineComment), - }, - {`#[^\n]*$`, CommentSingle, nil}, - // /regex/ - { - `(?<=(?:^|\(|=|:|~~|\[|{|,|=>)\s*)(/)(?!\]|\))((?:\\\\|\\/|.)*?)((?>)(\S+?)(<<)`, ByGroups(Operator, UsingSelf("root"), Operator), nil}, - {`(»)(\S+?)(«)`, ByGroups(Operator, UsingSelf("root"), Operator), nil}, - // Hyperoperator | «*« - {`(<<)(\S+?)(<<)`, ByGroups(Operator, UsingSelf("root"), Operator), nil}, - {`(«)(\S+?)(«)`, ByGroups(Operator, UsingSelf("root"), Operator), nil}, - // Hyperoperator | »*» - {`(>>)(\S+?)(>>)`, ByGroups(Operator, UsingSelf("root"), Operator), nil}, - {`(»)(\S+?)(»)`, ByGroups(Operator, UsingSelf("root"), Operator), nil}, - // < > - {`(?>)[^\n])+?[},;] *\n)(?!(?:(?!>>).)+?>>\S+?>>)`, Punctuation, Push("<<")}, - // «quoted words» - {`(? operators | something < onething > something - { - `(?<=[$@%&]?\w[\w':-]* +)(<=?)( *[^ ]+? *)(>=?)(?= *[$@%&]?\w[\w':-]*)`, - ByGroups(Operator, UsingSelf("root"), Operator), - nil, - }, - // - { - `(?])+?)(>)(?!\s*(?:\d+|\.(?:Int|Numeric)|[$@%]\*?\w[\w':-]*[^(]|\s+\[))`, - ByGroups(Punctuation, String, Punctuation), - nil, - }, - {`C?X::['\w:-]+`, NameException, nil}, - Include("metaoperator"), - // Pair | key => value - { - `(\w[\w'-]*)(\s*)(=>)`, - ByGroups(String, Text, Operator), - nil, - }, - Include("colon-pair"), - // Token - { - `(?<=(?:^|\s)(?:regex|token|rule)(\s+))` + namePattern + colonPairLookahead + `\s*[({])`, - NameFunction, - Push("token", "name-adverb"), - }, - // Substitution - {`(?<=^|\b|\s)(?(?:qq|q|Q))(? (?::?(?:heredoc|to|qq|ww|q|w|s|a|h|f|c|b|to|v|x))*)(? \s*)(? (? [^0-9a-zA-Z:\s])\k *)`, - EmitterFunc(quote), - findBrackets(rakuQuote), - }, - // Function - { - `\b` + namePattern + colonPairLookahead + `\()`, - NameFunction, - Push("name-adverb"), - }, - // Method - { - `(?(? [^\w:\s])\k *)`, - ByGroupNames( - map[string]Emitter{ - `opening_delimiters`: Punctuation, - `delimiter`: nil, - }, - ), - findBrackets(rakuMatchRegex), - }, - }, - "substitution": { - Include("colon-pair-attribute"), - // Substitution | s{regex} = value - { - `(? (? ` + bracketsPattern + `)\k *)`, - ByGroupNames(map[string]Emitter{ - `opening_delimiters`: Punctuation, - `delimiter`: nil, - }), - findBrackets(rakuMatchRegex), - }, - // Substitution | s/regex/string/ - { - `(? [^\w:\s])`, - Punctuation, - findBrackets(rakuSubstitutionRegex), - }, - }, - "number": { - {`0_?[0-7]+(_[0-7]+)*`, LiteralNumberOct, nil}, - {`0x[0-9A-Fa-f]+(_[0-9A-Fa-f]+)*`, LiteralNumberHex, nil}, - {`0b[01]+(_[01]+)*`, LiteralNumberBin, nil}, - { - `(?i)(\d*(_\d*)*\.\d+(_\d*)*|\d+(_\d*)*\.\d+(_\d*)*)(e[+-]?\d+)?`, - LiteralNumberFloat, - nil, - }, - {`(?i)\d+(_\d*)*e[+-]?\d+(_\d*)*`, LiteralNumberFloat, nil}, - {`(?<=\d+)i`, NameConstant, nil}, - {`\d+(_\d+)*`, LiteralNumberInteger, nil}, - }, - "name-adverb": { - Include("colon-pair-attribute-keyvalue"), - Default(Pop(1)), - }, - "colon-pair": { - // :key(value) - {colonPairPattern, colonPair(String), findBrackets(rakuNameAttribute)}, - // :123abc - { - `(:)(\d+)(\w[\w'-]*)`, - ByGroups(Punctuation, UsingSelf("number"), String), - nil, - }, - // :key - {`(:)(!?)(\w[\w'-]*)`, ByGroups(Punctuation, Operator, String), nil}, - {`\s+`, Text, nil}, - }, - "colon-pair-attribute": { - // :key(value) - {colonPairPattern, colonPair(NameAttribute), findBrackets(rakuNameAttribute)}, - // :123abc - { - `(:)(\d+)(\w[\w'-]*)`, - ByGroups(Punctuation, UsingSelf("number"), NameAttribute), - nil, - }, - // :key - {`(:)(!?)(\w[\w'-]*)`, ByGroups(Punctuation, Operator, NameAttribute), nil}, - {`\s+`, Text, nil}, - }, - "colon-pair-attribute-keyvalue": { - // :key(value) - {colonPairPattern, colonPair(NameAttribute), findBrackets(rakuNameAttribute)}, - }, - "escape-qq": { - { - `(? - { - `(?`), - tokenType: Punctuation, - stateName: `root`, - pushState: true, - }), - }, - // {code} - Include(`closure`), - // Properties - {`(:)(\w+)`, ByGroups(Punctuation, NameAttribute), nil}, - // Operator - {`\|\||\||&&|&|\.\.|\*\*|%%|%|:|!|<<|«|>>|»|\+|\*\*|\*|\?|=|~|<~~>`, Operator, nil}, - // Anchors - {`\^\^|\^|\$\$|\$`, NameEntity, nil}, - {`\.`, NameEntity, nil}, - {`#[^\n]*\n`, CommentSingle, nil}, - // Lookaround - { - `(?`), - tokenType: Punctuation, - stateName: `regex`, - pushState: true, - }), - }, - { - `(?)`, - ByGroups(Punctuation, Operator, OperatorWord, Punctuation), - nil, - }, - // <$variable> - { - `(?)`, - ByGroups(Punctuation, Operator, NameVariable, Punctuation), - nil, - }, - // Capture markers - {`(?`, Operator, nil}, - { - `(? - {`(?`, Punctuation, Pop(1)}, - // - { - `\s+`, - StringRegex, - replaceRule(ruleReplacingConfig{ - delimiter: []rune(`>`), - tokenType: Punctuation, - stateName: `regex`, - popState: true, - pushState: true, - }), - }, - // #[|=])(? (? " + bracketsPattern + `)\k *)(? )(? )`, - ByGroupNames( - map[string]Emitter{ - `keyword`: Keyword, - `opening_delimiters`: Punctuation, - `delimiter`: nil, - `value`: UsingSelf("pod-declaration"), - `closing_delimiters`: Punctuation, - }), - findBrackets(rakuPodDeclaration), - }, - Include("pod-blocks"), - }, - "pod-blocks": { - // =begin code - { - `(?<=^ *)(? *)(? =begin)(? +)(? code)(? [^\n]*)(? .*?)(? ^\k )(? =end)(? +)\k `, - EmitterFunc(podCode), - nil, - }, - // =begin - { - `(?<=^ *)(? *)(? =begin)(? +)(?!code)(? \w[\w'-]*)(? [^\n]*)(? )(? )`, - ByGroupNames( - map[string]Emitter{ - `ws`: Comment, - `keyword`: Keyword, - `ws2`: StringDoc, - `name`: Keyword, - `config`: EmitterFunc(podConfig), - `value`: UsingSelf("pod-begin"), - `closing_delimiters`: Keyword, - }), - findBrackets(rakuPod), - }, - // =for ... - { - `(?<=^ *)(? *)(? =(?:for|defn))(? +)(? \w[\w'-]*)(? [^\n]*\n)`, - ByGroups(Comment, Keyword, StringDoc, Keyword, EmitterFunc(podConfig)), - Push("pod-paragraph"), - }, - // =config - { - `(?<=^ *)(? *)(? =config)(? +)(? \w[\w'-]*)(? [^\n]*\n)`, - ByGroups(Comment, Keyword, StringDoc, Keyword, EmitterFunc(podConfig)), - nil, - }, - // =alias - { - `(?<=^ *)(? *)(? =alias)(? +)(? \w[\w'-]*)(? [^\n]*\n)`, - ByGroups(Comment, Keyword, StringDoc, Keyword, StringDoc), - nil, - }, - // =encoding - { - `(?<=^ *)(? *)(? =encoding)(? +)(? [^\n]+)`, - ByGroups(Comment, Keyword, StringDoc, Name), - nil, - }, - // =para ... - { - `(?<=^ *)(? *)(? =(?:para|table|pod))(? (? *)(? =head\d+)(? *)(? #?)`, - ByGroups(Comment, Keyword, GenericHeading, Keyword), - Push("pod-heading"), - }, - // =item ... - { - `(?<=^ *)(? *)(? =(?:item\d*|comment|data|[A-Z]+))(? *)(? #?)`, - ByGroups(Comment, Keyword, StringDoc, Keyword), - Push("pod-paragraph"), - }, - { - `(?<=^ *)(? *)(? =finish)(? [^\n]*)`, - ByGroups(Comment, Keyword, EmitterFunc(podConfig)), - Push("pod-finish"), - }, - // ={custom} ... - { - `(?<=^ *)(? *)(? =\w[\w'-]*)(? *)(? #?)`, - ByGroups(Comment, Name, StringDoc, Keyword), - Push("pod-paragraph"), - }, - // = podconfig - { - `(?<=^ *)(? *=)(? *)(? (?::\w[\w'-]*(?:` + colonPairOpeningBrackets + `.+?` + - colonPairClosingBrackets + `) *)*\n)`, - ByGroups(Keyword, StringDoc, EmitterFunc(podConfig)), - nil, - }, - }, - "pod-begin": { - Include("pod-blocks"), - Include("pre-pod-formatter"), - {`.+?`, StringDoc, nil}, - }, - "pod-declaration": { - Include("pre-pod-formatter"), - {`.+?`, StringDoc, nil}, - }, - "pod-paragraph": { - {`\n *\n|\n(?=^ *=)`, StringDoc, Pop(1)}, - Include("pre-pod-formatter"), - {`.+?`, StringDoc, nil}, - }, - "pod-single": { - {`\n`, StringDoc, Pop(1)}, - Include("pre-pod-formatter"), - {`.+?`, StringDoc, nil}, - }, - "pod-heading": { - {`\n *\n|\n(?=^ *=)`, GenericHeading, Pop(1)}, - Include("pre-pod-formatter"), - {`.+?`, GenericHeading, nil}, - }, - "pod-finish": { - {`\z`, nil, Pop(1)}, - Include("pre-pod-formatter"), - {`.+?`, StringDoc, nil}, - }, - "pre-pod-formatter": { - // C , B, ... - { - `(? [CBIUDTKRPAELZVMSXN])(? <+|«)`, - ByGroups(Keyword, Punctuation), - findBrackets(rakuPodFormatter), - }, - }, - "pod-formatter": { - // Placeholder rule, will be replaced by mutators. DO NOT REMOVE! - {`>`, Punctuation, Pop(1)}, - Include("pre-pod-formatter"), - // Placeholder rule, will be replaced by mutators. DO NOT REMOVE! - {`.+?`, StringOther, nil}, - }, - "variable": { - {variablePattern, NameVariable, Push("name-adverb")}, - {globalVariablePattern, NameVariableGlobal, Push("name-adverb")}, - {`[$@]<[^>]+>`, NameVariable, nil}, - {`\$[/!¢]`, NameVariable, nil}, - {`[$@%]`, NameVariable, nil}, - }, - "single-quote": { - {`(?>(?!\s*(?:\d+|\.(?:Int|Numeric)|[$@%]\*?[\w':-]+|\s+\[))`, Punctuation, Pop(1)}, - Include("ww"), - }, - "«": { - {`»(?!\s*(?:\d+|\.(?:Int|Numeric)|[$@%]\*?[\w':-]+|\s+\[))`, Punctuation, Pop(1)}, - Include("ww"), - }, - "ww": { - Include("single-quote"), - Include("qq"), - }, - "qq": { - Include("qq-variable"), - Include("closure"), - Include(`escape-char`), - Include("escape-hexadecimal"), - Include("escape-c-name"), - Include("escape-qq"), - {`.+?`, StringDouble, nil}, - }, - "qq-variable": { - { - `(?\.)(? ` + namePattern + `)` + colonPairLookahead + `\()`, - ByGroupNames(map[string]Emitter{ - `operator`: Operator, - `method_name`: NameFunction, - }), - Push(`name-adverb`), - }, - // Function/Signature - { - `\(`, Punctuation, replaceRule( - ruleReplacingConfig{ - delimiter: []rune(`)`), - tokenType: Punctuation, - stateName: `root`, - pushState: true, - }), - }, - Default(Pop(1)), - }, - "Q": { - Include("escape-qq"), - {`.+?`, String, nil}, - }, - "Q-closure": { - Include("escape-qq"), - Include("closure"), - {`.+?`, String, nil}, - }, - "Q-variable": { - Include("escape-qq"), - Include("qq-variable"), - {`.+?`, String, nil}, - }, - "closure": { - {`(? -1 { - idx = utf8.RuneCountInString(text[:idx]) - - // Search again if the substr is escaped with backslash - if (idx > 1 && strFromPos[idx-1] == '\\' && strFromPos[idx-2] != '\\') || - (idx == 1 && strFromPos[idx-1] == '\\') { - idx = indexAt(str[pos:], substr, idx+1) - - idx = utf8.RuneCountInString(text[:idx]) - - if idx < 0 { - return idx - } - } - idx += pos - } - - return idx -} - -// Tells if an array of string contains a string -func contains(s []string, e string) bool { - for _, value := range s { - if value == e { - return true - } - } - return false -} - -type rulePosition int - -const ( - topRule rulePosition = 0 - bottomRule = -1 -) - -type ruleMakingConfig struct { - delimiter []rune - pattern string - tokenType Emitter - mutator Mutator - numberOfDelimiterChars int -} - -type ruleReplacingConfig struct { - delimiter []rune - pattern string - tokenType Emitter - numberOfDelimiterChars int - mutator Mutator - appendMutator Mutator - rulePosition rulePosition - stateName string - pop bool - popState bool - pushState bool -} - -// Pops rule from state-stack and replaces the rule with the previous rule -func popRule(rule ruleReplacingConfig) MutatorFunc { - return func(state *LexerState) error { - stackName := genStackName(rule.stateName, rule.rulePosition) - - stack, ok := state.Get(stackName).([]ruleReplacingConfig) - - if ok && len(stack) > 0 { - // Pop from stack - stack = stack[:len(stack)-1] - lastRule := stack[len(stack)-1] - lastRule.pushState = false - lastRule.popState = false - lastRule.pop = true - state.Set(stackName, stack) - - // Call replaceRule to use the last rule - err := replaceRule(lastRule)(state) - if err != nil { - panic(err) - } - } - - return nil - } -} - -// Replaces a state's rule based on the rule config and position -func replaceRule(rule ruleReplacingConfig) MutatorFunc { - return func(state *LexerState) error { - stateName := rule.stateName - stackName := genStackName(rule.stateName, rule.rulePosition) - - stack, ok := state.Get(stackName).([]ruleReplacingConfig) - if !ok { - stack = []ruleReplacingConfig{} - } - - // If state-stack is empty fill it with the placeholder rule - if len(stack) == 0 { - stack = []ruleReplacingConfig{ - { - // Placeholder, will be overwritten by mutators, DO NOT REMOVE! - pattern: `\A\z`, - tokenType: nil, - mutator: nil, - stateName: stateName, - rulePosition: rule.rulePosition, - }, - } - state.Set(stackName, stack) - } - - var mutator Mutator - mutators := []Mutator{} - - switch { - case rule.rulePosition == topRule && rule.mutator == nil: - // Default mutator for top rule - mutators = []Mutator{Pop(1), popRule(rule)} - case rule.rulePosition == topRule && rule.mutator != nil: - // Default mutator for top rule, when rule.mutator is set - mutators = []Mutator{rule.mutator, popRule(rule)} - case rule.mutator != nil: - mutators = []Mutator{rule.mutator} - } - - if rule.appendMutator != nil { - mutators = append(mutators, rule.appendMutator) - } - - if len(mutators) > 0 { - mutator = Mutators(mutators...) - } else { - mutator = nil - } - - ruleConfig := ruleMakingConfig{ - pattern: rule.pattern, - delimiter: rule.delimiter, - numberOfDelimiterChars: rule.numberOfDelimiterChars, - tokenType: rule.tokenType, - mutator: mutator, - } - - cRule := makeRule(ruleConfig) - - switch rule.rulePosition { - case topRule: - state.Rules[stateName][0] = cRule - case bottomRule: - state.Rules[stateName][len(state.Rules[stateName])-1] = cRule - } - - // Pop state name from stack if asked. State should be popped first before Pushing - if rule.popState { - err := Pop(1).Mutate(state) - if err != nil { - panic(err) - } - } - - // Push state name to stack if asked - if rule.pushState { - err := Push(stateName).Mutate(state) - if err != nil { - panic(err) - } - } - - if !rule.pop { - state.Set(stackName, append(stack, rule)) - } - - return nil - } -} - -// Generates rule replacing stack using state name and rule position -func genStackName(stateName string, rulePosition rulePosition) (stackName string) { - switch rulePosition { - case topRule: - stackName = stateName + `-top-stack` - case bottomRule: - stackName = stateName + `-bottom-stack` - } - return -} - -// Makes a compiled rule and returns it -func makeRule(config ruleMakingConfig) *CompiledRule { - var rePattern string - - if len(config.delimiter) > 0 { - delimiter := string(config.delimiter) - - if config.numberOfDelimiterChars > 1 { - delimiter = strings.Repeat(delimiter, config.numberOfDelimiterChars) - } - - rePattern = `(? 1 { - lang = langMatch[1] - } - - // Tokenise code based on lang property - sublexer := Get(lang) - if sublexer != nil { - iterator, err := sublexer.Tokenise(nil, state.NamedGroups[`value`]) - - if err != nil { - panic(err) - } else { - iterators = append(iterators, iterator) - } - } else { - iterators = append(iterators, Literator(tokens[4])) - } - - // Append the rest of the tokens - iterators = append(iterators, Literator(tokens[5:]...)) - - return Concaterator(iterators...) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/rst.go b/vendor/github.com/alecthomas/chroma/v2/lexers/rst.go deleted file mode 100644 index 66ec03cdfb36017a621d9acc587111306da9d332..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/rst.go +++ /dev/null @@ -1,89 +0,0 @@ -package lexers - -import ( - "strings" - - . "github.com/alecthomas/chroma/v2" // nolint -) - -// Restructuredtext lexer. -var Restructuredtext = Register(MustNewLexer( - &Config{ - Name: "reStructuredText", - Aliases: []string{"rst", "rest", "restructuredtext"}, - Filenames: []string{"*.rst", "*.rest"}, - MimeTypes: []string{"text/x-rst", "text/prs.fallenstein.rst"}, - }, - restructuredtextRules, -)) - -func restructuredtextRules() Rules { - return Rules{ - "root": { - {"^(=+|-+|`+|:+|\\.+|\\'+|\"+|~+|\\^+|_+|\\*+|\\++|#+)([ \\t]*\\n)(.+)(\\n)(\\1)(\\n)", ByGroups(GenericHeading, Text, GenericHeading, Text, GenericHeading, Text), nil}, - {"^(\\S.*)(\\n)(={3,}|-{3,}|`{3,}|:{3,}|\\.{3,}|\\'{3,}|\"{3,}|~{3,}|\\^{3,}|_{3,}|\\*{3,}|\\+{3,}|#{3,})(\\n)", ByGroups(GenericHeading, Text, GenericHeading, Text), nil}, - {`^(\s*)([-*+])( .+\n(?:\1 .+\n)*)`, ByGroups(Text, LiteralNumber, UsingSelf("inline")), nil}, - {`^(\s*)([0-9#ivxlcmIVXLCM]+\.)( .+\n(?:\1 .+\n)*)`, ByGroups(Text, LiteralNumber, UsingSelf("inline")), nil}, - {`^(\s*)(\(?[0-9#ivxlcmIVXLCM]+\))( .+\n(?:\1 .+\n)*)`, ByGroups(Text, LiteralNumber, UsingSelf("inline")), nil}, - {`^(\s*)([A-Z]+\.)( .+\n(?:\1 .+\n)+)`, ByGroups(Text, LiteralNumber, UsingSelf("inline")), nil}, - {`^(\s*)(\(?[A-Za-z]+\))( .+\n(?:\1 .+\n)+)`, ByGroups(Text, LiteralNumber, UsingSelf("inline")), nil}, - {`^(\s*)(\|)( .+\n(?:\| .+\n)*)`, ByGroups(Text, Operator, UsingSelf("inline")), nil}, - {`^( *\.\.)(\s*)((?:source)?code(?:-block)?)(::)([ \t]*)([^\n]+)(\n[ \t]*\n)([ \t]+)(.*)(\n)((?:(?:\8.*|)\n)+)`, EmitterFunc(rstCodeBlock), nil}, - {`^( *\.\.)(\s*)([\w:-]+?)(::)(?:([ \t]*)(.*))`, ByGroups(Punctuation, Text, OperatorWord, Punctuation, Text, UsingSelf("inline")), nil}, - {`^( *\.\.)(\s*)(_(?:[^:\\]|\\.)+:)(.*?)$`, ByGroups(Punctuation, Text, NameTag, UsingSelf("inline")), nil}, - {`^( *\.\.)(\s*)(\[.+\])(.*?)$`, ByGroups(Punctuation, Text, NameTag, UsingSelf("inline")), nil}, - {`^( *\.\.)(\s*)(\|.+\|)(\s*)([\w:-]+?)(::)(?:([ \t]*)(.*))`, ByGroups(Punctuation, Text, NameTag, Text, OperatorWord, Punctuation, Text, UsingSelf("inline")), nil}, - {`^ *\.\..*(\n( +.*\n|\n)+)?`, CommentPreproc, nil}, - {`^( *)(:[a-zA-Z-]+:)(\s*)$`, ByGroups(Text, NameClass, Text), nil}, - {`^( *)(:.*?:)([ \t]+)(.*?)$`, ByGroups(Text, NameClass, Text, NameFunction), nil}, - {`^(\S.*(?)(`__?)", ByGroups(LiteralString, LiteralStringInterpol, LiteralString), nil}, - {"`.+?`__?", LiteralString, nil}, - {"(`.+?`)(:[a-zA-Z0-9:-]+?:)?", ByGroups(NameVariable, NameAttribute), nil}, - {"(:[a-zA-Z0-9:-]+?:)(`.+?`)", ByGroups(NameAttribute, NameVariable), nil}, - {`\*\*.+?\*\*`, GenericStrong, nil}, - {`\*.+?\*`, GenericEmph, nil}, - {`\[.*?\]_`, LiteralString, nil}, - {`<.+?>`, NameTag, nil}, - {"[^\\\\\\n\\[*`:]+", Text, nil}, - {`.`, Text, nil}, - }, - "literal": { - {"[^`]+", LiteralString, nil}, - {"``((?=$)|(?=[-/:.,; \\n\\x00\\\u2010\\\u2011\\\u2012\\\u2013\\\u2014\\\u00a0\\'\\\"\\)\\]\\}\\>\\\u2019\\\u201d\\\u00bb\\!\\?]))", LiteralString, Pop(1)}, - {"`", LiteralString, nil}, - }, - } -} - -func rstCodeBlock(groups []string, state *LexerState) Iterator { - iterators := []Iterator{} - tokens := []Token{ - {Punctuation, groups[1]}, - {Text, groups[2]}, - {OperatorWord, groups[3]}, - {Punctuation, groups[4]}, - {Text, groups[5]}, - {Keyword, groups[6]}, - {Text, groups[7]}, - } - code := strings.Join(groups[8:], "") - lexer := Get(groups[6]) - if lexer == nil { - tokens = append(tokens, Token{String, code}) - iterators = append(iterators, Literator(tokens...)) - } else { - sub, err := lexer.Tokenise(nil, code) - if err != nil { - panic(err) - } - iterators = append(iterators, Literator(tokens...), sub) - } - return Concaterator(iterators...) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/lexers/svelte.go b/vendor/github.com/alecthomas/chroma/v2/lexers/svelte.go deleted file mode 100644 index 39211c4fc503c599653b1cdfd6b3b8a75a2da266..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/lexers/svelte.go +++ /dev/null @@ -1,70 +0,0 @@ -package lexers - -import ( - . "github.com/alecthomas/chroma/v2" // nolint -) - -// Svelte lexer. -var Svelte = Register(DelegatingLexer(HTML, MustNewLexer( - &Config{ - Name: "Svelte", - Aliases: []string{"svelte"}, - Filenames: []string{"*.svelte"}, - MimeTypes: []string{"application/x-svelte"}, - DotAll: true, - }, - svelteRules, -))) - -func svelteRules() Rules { - return Rules{ - "root": { - // Let HTML handle the comments, including comments containing script and style tags - {``, Other, Pop(1)}, - {`.+?`, Other, nil}, - }, - "templates": { - {`}`, Punctuation, Pop(1)}, - // Let TypeScript handle strings and the curly braces inside them - {`(?]*>`, Using("TypoScriptHTMLData"), nil}, - {`&[^;\n]*;`, LiteralString, nil}, - {`(_CSS_DEFAULT_STYLE)(\s*)(\()(?s)(.*(?=\n\)))`, ByGroups(NameClass, Text, LiteralStringSymbol, Using("TypoScriptCSSData")), nil}, - }, - "literal": { - {`0x[0-9A-Fa-f]+t?`, LiteralNumberHex, nil}, - {`[0-9]+`, LiteralNumberInteger, nil}, - {`(###\w+###)`, NameConstant, nil}, - }, - "label": { - {`(EXT|FILE|LLL):[^}\n"]*`, LiteralString, nil}, - {`(?![^\w\-])([\w\-]+(?:/[\w\-]+)+/?)(\S*\n)`, ByGroups(LiteralString, LiteralString), nil}, - }, - "punctuation": { - {`[,.]`, Punctuation, nil}, - }, - "operator": { - {`[<>,:=.*%+|]`, Operator, nil}, - }, - "structure": { - {`[{}()\[\]\\]`, LiteralStringSymbol, nil}, - }, - "constant": { - {`(\{)(\$)((?:[\w\-]+\.)*)([\w\-]+)(\})`, ByGroups(LiteralStringSymbol, Operator, NameConstant, NameConstant, LiteralStringSymbol), nil}, - {`(\{)([\w\-]+)(\s*:\s*)([\w\-]+)(\})`, ByGroups(LiteralStringSymbol, NameConstant, Operator, NameConstant, LiteralStringSymbol), nil}, - {`(#[a-fA-F0-9]{6}\b|#[a-fA-F0-9]{3}\b)`, LiteralStringChar, nil}, - }, - "comment": { - {`(? lexers.txt - -kotlin: - invalid unicode escape sequences - FIXED: Have to disable wide Unicode characters in unistring.py - -pygments.lexers.ambient.AmbientTalkLexer -pygments.lexers.ampl.AmplLexer -pygments.lexers.actionscript.ActionScriptLexer -pygments.lexers.actionscript.ActionScript3Lexer -pygments.lexers.actionscript.MxmlLexer -pygments.lexers.algebra.GAPLexer -pygments.lexers.algebra.MathematicaLexer -pygments.lexers.algebra.MuPADLexer -pygments.lexers.algebra.BCLexer -pygments.lexers.apl.APLLexer -pygments.lexers.bibtex.BibTeXLexer -pygments.lexers.bibtex.BSTLexer -pygments.lexers.basic.BlitzMaxLexer -pygments.lexers.basic.BlitzBasicLexer -pygments.lexers.basic.MonkeyLexer -pygments.lexers.basic.CbmBasicV2Lexer -pygments.lexers.basic.QBasicLexer -pygments.lexers.automation.AutohotkeyLexer -pygments.lexers.automation.AutoItLexer -pygments.lexers.archetype.AtomsLexer -pygments.lexers.c_like.ClayLexer -pygments.lexers.c_like.ValaLexer -pygments.lexers.asm.GasLexer -pygments.lexers.asm.ObjdumpLexer -pygments.lexers.asm.HsailLexer -pygments.lexers.asm.LlvmLexer -pygments.lexers.asm.NasmLexer -pygments.lexers.asm.TasmLexer -pygments.lexers.asm.Ca65Lexer -pygments.lexers.business.CobolLexer -pygments.lexers.business.ABAPLexer -pygments.lexers.business.OpenEdgeLexer -pygments.lexers.business.GoodDataCLLexer -pygments.lexers.business.MaqlLexer -pygments.lexers.capnproto.CapnProtoLexer -pygments.lexers.chapel.ChapelLexer -pygments.lexers.clean.CleanLexer -pygments.lexers.c_cpp.CFamilyLexer -pygments.lexers.console.VCTreeStatusLexer -pygments.lexers.console.PyPyLogLexer -pygments.lexers.csound.CsoundLexer -pygments.lexers.csound.CsoundDocumentLexer -pygments.lexers.csound.CsoundDocumentLexer -pygments.lexers.crystal.CrystalLexer -pygments.lexers.dalvik.SmaliLexer -pygments.lexers.css.CssLexer -pygments.lexers.css.SassLexer -pygments.lexers.css.ScssLexer -pygments.lexers.configs.IniLexer -pygments.lexers.configs.RegeditLexer -pygments.lexers.configs.PropertiesLexer -pygments.lexers.configs.KconfigLexer -pygments.lexers.configs.Cfengine3Lexer -pygments.lexers.configs.ApacheConfLexer -pygments.lexers.configs.SquidConfLexer -pygments.lexers.configs.NginxConfLexer -pygments.lexers.configs.LighttpdConfLexer -pygments.lexers.configs.DockerLexer -pygments.lexers.configs.TerraformLexer -pygments.lexers.configs.TermcapLexer -pygments.lexers.configs.TerminfoLexer -pygments.lexers.configs.PkgConfigLexer -pygments.lexers.configs.PacmanConfLexer -pygments.lexers.data.YamlLexer -pygments.lexers.data.JsonLexer -pygments.lexers.diff.DiffLexer -pygments.lexers.diff.DarcsPatchLexer -pygments.lexers.diff.WDiffLexer -pygments.lexers.dotnet.CSharpLexer -pygments.lexers.dotnet.NemerleLexer -pygments.lexers.dotnet.BooLexer -pygments.lexers.dotnet.VbNetLexer -pygments.lexers.dotnet.GenericAspxLexer -pygments.lexers.dotnet.FSharpLexer -pygments.lexers.dylan.DylanLexer -pygments.lexers.dylan.DylanLidLexer -pygments.lexers.ecl.ECLLexer -pygments.lexers.eiffel.EiffelLexer -pygments.lexers.dsls.ProtoBufLexer -pygments.lexers.dsls.ThriftLexer -pygments.lexers.dsls.BroLexer -pygments.lexers.dsls.PuppetLexer -pygments.lexers.dsls.RslLexer -pygments.lexers.dsls.MscgenLexer -pygments.lexers.dsls.VGLLexer -pygments.lexers.dsls.AlloyLexer -pygments.lexers.dsls.PanLexer -pygments.lexers.dsls.CrmshLexer -pygments.lexers.dsls.FlatlineLexer -pygments.lexers.dsls.SnowballLexer -pygments.lexers.elm.ElmLexer -pygments.lexers.erlang.ErlangLexer -pygments.lexers.erlang.ElixirLexer -pygments.lexers.ezhil.EzhilLexer -pygments.lexers.esoteric.BrainfuckLexer -pygments.lexers.esoteric.BefungeLexer -pygments.lexers.esoteric.CAmkESLexer -pygments.lexers.esoteric.CapDLLexer -pygments.lexers.esoteric.RedcodeLexer -pygments.lexers.esoteric.AheuiLexer -pygments.lexers.factor.FactorLexer -pygments.lexers.fantom.FantomLexer -pygments.lexers.felix.FelixLexer -pygments.lexers.forth.ForthLexer -pygments.lexers.fortran.FortranLexer -pygments.lexers.fortran.FortranFixedLexer -pygments.lexers.go.GoLexer -pygments.lexers.foxpro.FoxProLexer -pygments.lexers.graph.CypherLexer -pygments.lexers.grammar_notation.BnfLexer -pygments.lexers.grammar_notation.AbnfLexer -pygments.lexers.grammar_notation.JsgfLexer -pygments.lexers.graphics.GLShaderLexer -pygments.lexers.graphics.PostScriptLexer -pygments.lexers.graphics.AsymptoteLexer -pygments.lexers.graphics.GnuplotLexer -pygments.lexers.graphics.PovrayLexer -pygments.lexers.hexdump.HexdumpLexer -pygments.lexers.haskell.HaskellLexer -pygments.lexers.haskell.IdrisLexer -pygments.lexers.haskell.AgdaLexer -pygments.lexers.haskell.CryptolLexer -pygments.lexers.haskell.KokaLexer -pygments.lexers.haxe.HaxeLexer -pygments.lexers.haxe.HxmlLexer -pygments.lexers.hdl.VerilogLexer -pygments.lexers.hdl.SystemVerilogLexer -pygments.lexers.hdl.VhdlLexer -pygments.lexers.idl.IDLLexer -pygments.lexers.inferno.LimboLexer -pygments.lexers.igor.IgorLexer -pygments.lexers.html.HtmlLexer -pygments.lexers.html.DtdLexer -pygments.lexers.html.XmlLexer -pygments.lexers.html.HamlLexer -pygments.lexers.html.ScamlLexer -pygments.lexers.html.PugLexer -pygments.lexers.installers.NSISLexer -pygments.lexers.installers.RPMSpecLexer -pygments.lexers.installers.SourcesListLexer -pygments.lexers.installers.DebianControlLexer -pygments.lexers.iolang.IoLexer -pygments.lexers.julia.JuliaLexer -pygments.lexers.int_fiction.Inform6Lexer -pygments.lexers.int_fiction.Inform7Lexer -pygments.lexers.int_fiction.Tads3Lexer -pygments.lexers.make.BaseMakefileLexer -pygments.lexers.make.CMakeLexer -pygments.lexers.javascript.JavascriptLexer -pygments.lexers.javascript.KalLexer -pygments.lexers.javascript.LiveScriptLexer -pygments.lexers.javascript.DartLexer -pygments.lexers.javascript.TypeScriptLexer -pygments.lexers.javascript.LassoLexer -pygments.lexers.javascript.ObjectiveJLexer -pygments.lexers.javascript.CoffeeScriptLexer -pygments.lexers.javascript.MaskLexer -pygments.lexers.javascript.EarlGreyLexer -pygments.lexers.javascript.JuttleLexer -pygments.lexers.jvm.JavaLexer -pygments.lexers.jvm.ScalaLexer -pygments.lexers.jvm.GosuLexer -pygments.lexers.jvm.GroovyLexer -pygments.lexers.jvm.IokeLexer -pygments.lexers.jvm.ClojureLexer -pygments.lexers.jvm.TeaLangLexer -pygments.lexers.jvm.CeylonLexer -pygments.lexers.jvm.KotlinLexer -pygments.lexers.jvm.XtendLexer -pygments.lexers.jvm.PigLexer -pygments.lexers.jvm.GoloLexer -pygments.lexers.jvm.JasminLexer -pygments.lexers.markup.BBCodeLexer -pygments.lexers.markup.MoinWikiLexer -pygments.lexers.markup.RstLexer -pygments.lexers.markup.TexLexer -pygments.lexers.markup.GroffLexer -pygments.lexers.markup.MozPreprocHashLexer -pygments.lexers.markup.MarkdownLexer -pygments.lexers.ml.SMLLexer -pygments.lexers.ml.OcamlLexer -pygments.lexers.ml.OpaLexer -pygments.lexers.modeling.ModelicaLexer -pygments.lexers.modeling.BugsLexer -pygments.lexers.modeling.JagsLexer -pygments.lexers.modeling.StanLexer -pygments.lexers.matlab.MatlabLexer -pygments.lexers.matlab.OctaveLexer -pygments.lexers.matlab.ScilabLexer -pygments.lexers.monte.MonteLexer -pygments.lexers.lisp.SchemeLexer -pygments.lexers.lisp.CommonLispLexer -pygments.lexers.lisp.HyLexer -pygments.lexers.lisp.RacketLexer -pygments.lexers.lisp.NewLispLexer -pygments.lexers.lisp.EmacsLispLexer -pygments.lexers.lisp.ShenLexer -pygments.lexers.lisp.XtlangLexer -pygments.lexers.modula2.Modula2Lexer -pygments.lexers.ncl.NCLLexer -pygments.lexers.nim.NimLexer -pygments.lexers.nit.NitLexer -pygments.lexers.nix.NixLexer -pygments.lexers.oberon.ComponentPascalLexer -pygments.lexers.ooc.OocLexer -pygments.lexers.objective.SwiftLexer -pygments.lexers.parasail.ParaSailLexer -pygments.lexers.pawn.SourcePawnLexer -pygments.lexers.pawn.PawnLexer -pygments.lexers.pascal.AdaLexer -pygments.lexers.parsers.RagelLexer -pygments.lexers.parsers.RagelEmbeddedLexer -pygments.lexers.parsers.AntlrLexer -pygments.lexers.parsers.TreetopBaseLexer -pygments.lexers.parsers.EbnfLexer -pygments.lexers.php.ZephirLexer -pygments.lexers.php.PhpLexer -pygments.lexers.perl.PerlLexer -pygments.lexers.perl.Perl6Lexer -pygments.lexers.praat.PraatLexer -pygments.lexers.prolog.PrologLexer -pygments.lexers.prolog.LogtalkLexer -pygments.lexers.qvt.QVToLexer -pygments.lexers.rdf.SparqlLexer -pygments.lexers.rdf.TurtleLexer -pygments.lexers.python.PythonLexer -pygments.lexers.python.Python3Lexer -pygments.lexers.python.PythonTracebackLexer -pygments.lexers.python.Python3TracebackLexer -pygments.lexers.python.CythonLexer -pygments.lexers.python.DgLexer -pygments.lexers.rebol.RebolLexer -pygments.lexers.rebol.RedLexer -pygments.lexers.resource.ResourceLexer -pygments.lexers.rnc.RNCCompactLexer -pygments.lexers.roboconf.RoboconfGraphLexer -pygments.lexers.roboconf.RoboconfInstancesLexer -pygments.lexers.rust.RustLexer -pygments.lexers.ruby.RubyLexer -pygments.lexers.ruby.FancyLexer -pygments.lexers.sas.SASLexer -pygments.lexers.smalltalk.SmalltalkLexer -pygments.lexers.smalltalk.NewspeakLexer -pygments.lexers.smv.NuSMVLexer -pygments.lexers.shell.BashLexer -pygments.lexers.shell.BatchLexer -pygments.lexers.shell.TcshLexer -pygments.lexers.shell.PowerShellLexer -pygments.lexers.shell.FishShellLexer -pygments.lexers.snobol.SnobolLexer -pygments.lexers.scripting.LuaLexer -pygments.lexers.scripting.ChaiscriptLexer -pygments.lexers.scripting.LSLLexer -pygments.lexers.scripting.AppleScriptLexer -pygments.lexers.scripting.RexxLexer -pygments.lexers.scripting.MOOCodeLexer -pygments.lexers.scripting.HybrisLexer -pygments.lexers.scripting.EasytrieveLexer -pygments.lexers.scripting.JclLexer -pygments.lexers.supercollider.SuperColliderLexer -pygments.lexers.stata.StataLexer -pygments.lexers.tcl.TclLexer -pygments.lexers.sql.PostgresLexer -pygments.lexers.sql.PlPgsqlLexer -pygments.lexers.sql.PsqlRegexLexer -pygments.lexers.sql.SqlLexer -pygments.lexers.sql.TransactSqlLexer -pygments.lexers.sql.MySqlLexer -pygments.lexers.sql.RqlLexer -pygments.lexers.testing.GherkinLexer -pygments.lexers.testing.TAPLexer -pygments.lexers.textedit.AwkLexer -pygments.lexers.textedit.VimLexer -pygments.lexers.textfmts.IrcLogsLexer -pygments.lexers.textfmts.GettextLexer -pygments.lexers.textfmts.HttpLexer -pygments.lexers.textfmts.TodotxtLexer -pygments.lexers.trafficscript.RtsLexer -pygments.lexers.theorem.CoqLexer -pygments.lexers.theorem.IsabelleLexer -pygments.lexers.theorem.LeanLexer -pygments.lexers.templates.SmartyLexer -pygments.lexers.templates.VelocityLexer -pygments.lexers.templates.DjangoLexer -pygments.lexers.templates.MyghtyLexer -pygments.lexers.templates.MasonLexer -pygments.lexers.templates.MakoLexer -pygments.lexers.templates.CheetahLexer -pygments.lexers.templates.GenshiTextLexer -pygments.lexers.templates.GenshiMarkupLexer -pygments.lexers.templates.JspRootLexer -pygments.lexers.templates.EvoqueLexer -pygments.lexers.templates.ColdfusionLexer -pygments.lexers.templates.ColdfusionMarkupLexer -pygments.lexers.templates.TeaTemplateRootLexer -pygments.lexers.templates.HandlebarsLexer -pygments.lexers.templates.LiquidLexer -pygments.lexers.templates.TwigLexer -pygments.lexers.templates.Angular2Lexer -pygments.lexers.urbi.UrbiscriptLexer -pygments.lexers.typoscript.TypoScriptCssDataLexer -pygments.lexers.typoscript.TypoScriptHtmlDataLexer -pygments.lexers.typoscript.TypoScriptLexer -pygments.lexers.varnish.VCLLexer -pygments.lexers.verification.BoogieLexer -pygments.lexers.verification.SilverLexer -pygments.lexers.x10.X10Lexer -pygments.lexers.whiley.WhileyLexer -pygments.lexers.xorg.XorgLexer -pygments.lexers.webmisc.DuelLexer -pygments.lexers.webmisc.XQueryLexer -pygments.lexers.webmisc.QmlLexer -pygments.lexers.webmisc.CirruLexer -pygments.lexers.webmisc.SlimLexer diff --git a/vendor/github.com/alecthomas/chroma/v2/quick/quick.go b/vendor/github.com/alecthomas/chroma/v2/quick/quick.go deleted file mode 100644 index af701d9cc3534c43b64e748a0966c31bebba2a39..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/quick/quick.go +++ /dev/null @@ -1,44 +0,0 @@ -// Package quick provides simple, no-configuration source code highlighting. -package quick - -import ( - "io" - - "github.com/alecthomas/chroma/v2" - "github.com/alecthomas/chroma/v2/formatters" - "github.com/alecthomas/chroma/v2/lexers" - "github.com/alecthomas/chroma/v2/styles" -) - -// Highlight some text. -// -// Lexer, formatter and style may be empty, in which case a best-effort is made. -func Highlight(w io.Writer, source, lexer, formatter, style string) error { - // Determine lexer. - l := lexers.Get(lexer) - if l == nil { - l = lexers.Analyse(source) - } - if l == nil { - l = lexers.Fallback - } - l = chroma.Coalesce(l) - - // Determine formatter. - f := formatters.Get(formatter) - if f == nil { - f = formatters.Fallback - } - - // Determine style. - s := styles.Get(style) - if s == nil { - s = styles.Fallback - } - - it, err := l.Tokenise(nil, source) - if err != nil { - return err - } - return f.Format(w, s, it) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/regexp.go b/vendor/github.com/alecthomas/chroma/v2/regexp.go deleted file mode 100644 index 57967268623f25f18e558841d4f0a336111c14f9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/regexp.go +++ /dev/null @@ -1,489 +0,0 @@ -package chroma - -import ( - "fmt" - "os" - "path/filepath" - "regexp" - "sort" - "strings" - "sync" - "time" - "unicode/utf8" - - "github.com/dlclark/regexp2" -) - -// A Rule is the fundamental matching unit of the Regex lexer state machine. -type Rule struct { - Pattern string - Type Emitter - Mutator Mutator -} - -// Words creates a regex that matches any of the given literal words. -func Words(prefix, suffix string, words ...string) string { - sort.Slice(words, func(i, j int) bool { - return len(words[j]) < len(words[i]) - }) - for i, word := range words { - words[i] = regexp.QuoteMeta(word) - } - return prefix + `(` + strings.Join(words, `|`) + `)` + suffix -} - -// Tokenise text using lexer, returning tokens as a slice. -func Tokenise(lexer Lexer, options *TokeniseOptions, text string) ([]Token, error) { - var out []Token - it, err := lexer.Tokenise(options, text) - if err != nil { - return nil, err - } - for t := it(); t != EOF; t = it() { - out = append(out, t) - } - return out, nil -} - -// Rules maps from state to a sequence of Rules. -type Rules map[string][]Rule - -// Rename clones rules then a rule. -func (r Rules) Rename(oldRule, newRule string) Rules { - r = r.Clone() - r[newRule] = r[oldRule] - delete(r, oldRule) - return r -} - -// Clone returns a clone of the Rules. -func (r Rules) Clone() Rules { - out := map[string][]Rule{} - for key, rules := range r { - out[key] = make([]Rule, len(rules)) - copy(out[key], rules) - } - return out -} - -// Merge creates a clone of "r" then merges "rules" into the clone. -func (r Rules) Merge(rules Rules) Rules { - out := r.Clone() - for k, v := range rules.Clone() { - out[k] = v - } - return out -} - -// MustNewLexer creates a new Lexer with deferred rules generation or panics. -func MustNewLexer(config *Config, rules func() Rules) *RegexLexer { - lexer, err := NewLexer(config, rules) - if err != nil { - panic(err) - } - return lexer -} - -// NewLexer creates a new regex-based Lexer. -// -// "rules" is a state machine transition map. Each key is a state. Values are sets of rules -// that match input, optionally modify lexer state, and output tokens. -func NewLexer(config *Config, rulesFunc func() Rules) (*RegexLexer, error) { - if config == nil { - config = &Config{} - } - for _, glob := range append(config.Filenames, config.AliasFilenames...) { - _, err := filepath.Match(glob, "") - if err != nil { - return nil, fmt.Errorf("%s: %q is not a valid glob: %w", config.Name, glob, err) - } - } - r := &RegexLexer{ - config: config, - fetchRulesFunc: func() (Rules, error) { return rulesFunc(), nil }, - } - // One-off code to generate XML lexers in the Chroma source tree. - // var nameCleanRe = regexp.MustCompile(`[^-+A-Za-z0-9_]`) - // name := strings.ToLower(nameCleanRe.ReplaceAllString(config.Name, "_")) - // data, err := Marshal(r) - // if err != nil { - // if errors.Is(err, ErrNotSerialisable) { - // fmt.Fprintf(os.Stderr, "warning: %q: %s\n", name, err) - // return r, nil - // } - // return nil, err - // } - // _, file, _, ok := runtime.Caller(2) - // if !ok { - // panic("??") - // } - // fmt.Println(file) - // if strings.Contains(file, "/lexers/") { - // dir := filepath.Join(filepath.Dir(file), "embedded") - // err = os.MkdirAll(dir, 0700) - // if err != nil { - // return nil, err - // } - // filename := filepath.Join(dir, name) + ".xml" - // fmt.Println(filename) - // err = ioutil.WriteFile(filename, data, 0600) - // if err != nil { - // return nil, err - // } - // } - return r, nil -} - -// Trace enables debug tracing. -func (r *RegexLexer) Trace(trace bool) *RegexLexer { - r.trace = trace - return r -} - -// A CompiledRule is a Rule with a pre-compiled regex. -// -// Note that regular expressions are lazily compiled on first use of the lexer. -type CompiledRule struct { - Rule - Regexp *regexp2.Regexp - flags string -} - -// CompiledRules is a map of rule name to sequence of compiled rules in that rule. -type CompiledRules map[string][]*CompiledRule - -// LexerState contains the state for a single lex. -type LexerState struct { - Lexer *RegexLexer - Registry *LexerRegistry - Text []rune - Pos int - Rules CompiledRules - Stack []string - State string - Rule int - // Group matches. - Groups []string - // Named Group matches. - NamedGroups map[string]string - // Custum context for mutators. - MutatorContext map[interface{}]interface{} - iteratorStack []Iterator - options *TokeniseOptions - newlineAdded bool -} - -// Set mutator context. -func (l *LexerState) Set(key interface{}, value interface{}) { - l.MutatorContext[key] = value -} - -// Get mutator context. -func (l *LexerState) Get(key interface{}) interface{} { - return l.MutatorContext[key] -} - -// Iterator returns the next Token from the lexer. -func (l *LexerState) Iterator() Token { // nolint: gocognit - end := len(l.Text) - if l.newlineAdded { - end-- - } - for l.Pos < end && len(l.Stack) > 0 { - // Exhaust the iterator stack, if any. - for len(l.iteratorStack) > 0 { - n := len(l.iteratorStack) - 1 - t := l.iteratorStack[n]() - if t.Type == Ignore { - continue - } - if t == EOF { - l.iteratorStack = l.iteratorStack[:n] - continue - } - return t - } - - l.State = l.Stack[len(l.Stack)-1] - if l.Lexer.trace { - fmt.Fprintf(os.Stderr, "%s: pos=%d, text=%q\n", l.State, l.Pos, string(l.Text[l.Pos:])) - } - selectedRule, ok := l.Rules[l.State] - if !ok { - panic("unknown state " + l.State) - } - ruleIndex, rule, groups, namedGroups := matchRules(l.Text, l.Pos, selectedRule) - // No match. - if groups == nil { - // From Pygments :\ - // - // If the RegexLexer encounters a newline that is flagged as an error token, the stack is - // emptied and the lexer continues scanning in the 'root' state. This can help producing - // error-tolerant highlighting for erroneous input, e.g. when a single-line string is not - // closed. - if l.Text[l.Pos] == '\n' && l.State != l.options.State { - l.Stack = []string{l.options.State} - continue - } - l.Pos++ - return Token{Error, string(l.Text[l.Pos-1 : l.Pos])} - } - l.Rule = ruleIndex - l.Groups = groups - l.NamedGroups = namedGroups - l.Pos += utf8.RuneCountInString(groups[0]) - if rule.Mutator != nil { - if err := rule.Mutator.Mutate(l); err != nil { - panic(err) - } - } - if rule.Type != nil { - l.iteratorStack = append(l.iteratorStack, rule.Type.Emit(l.Groups, l)) - } - } - // Exhaust the IteratorStack, if any. - // Duplicate code, but eh. - for len(l.iteratorStack) > 0 { - n := len(l.iteratorStack) - 1 - t := l.iteratorStack[n]() - if t.Type == Ignore { - continue - } - if t == EOF { - l.iteratorStack = l.iteratorStack[:n] - continue - } - return t - } - - // If we get to here and we still have text, return it as an error. - if l.Pos != len(l.Text) && len(l.Stack) == 0 { - value := string(l.Text[l.Pos:]) - l.Pos = len(l.Text) - return Token{Type: Error, Value: value} - } - return EOF -} - -// RegexLexer is the default lexer implementation used in Chroma. -type RegexLexer struct { - registry *LexerRegistry // The LexerRegistry this Lexer is associated with, if any. - config *Config - analyser func(text string) float32 - trace bool - - mu sync.Mutex - compiled bool - rawRules Rules - rules map[string][]*CompiledRule - fetchRulesFunc func() (Rules, error) - compileOnce sync.Once -} - -func (r *RegexLexer) String() string { - return r.config.Name -} - -// Rules in the Lexer. -func (r *RegexLexer) Rules() (Rules, error) { - if err := r.needRules(); err != nil { - return nil, err - } - return r.rawRules, nil -} - -// SetRegistry the lexer will use to lookup other lexers if necessary. -func (r *RegexLexer) SetRegistry(registry *LexerRegistry) Lexer { - r.registry = registry - return r -} - -// SetAnalyser sets the analyser function used to perform content inspection. -func (r *RegexLexer) SetAnalyser(analyser func(text string) float32) Lexer { - r.analyser = analyser - return r -} - -// AnalyseText scores how likely a fragment of text is to match this lexer, between 0.0 and 1.0. -func (r *RegexLexer) AnalyseText(text string) float32 { - if r.analyser != nil { - return r.analyser(text) - } - return 0 -} - -// SetConfig replaces the Config for this Lexer. -func (r *RegexLexer) SetConfig(config *Config) *RegexLexer { - r.config = config - return r -} - -// Config returns the Config for this Lexer. -func (r *RegexLexer) Config() *Config { - return r.config -} - -// Regex compilation is deferred until the lexer is used. This is to avoid significant init() time costs. -func (r *RegexLexer) maybeCompile() (err error) { - r.mu.Lock() - defer r.mu.Unlock() - if r.compiled { - return nil - } - for state, rules := range r.rules { - for i, rule := range rules { - if rule.Regexp == nil { - pattern := "(?:" + rule.Pattern + ")" - if rule.flags != "" { - pattern = "(?" + rule.flags + ")" + pattern - } - pattern = `\G` + pattern - rule.Regexp, err = regexp2.Compile(pattern, 0) - if err != nil { - return fmt.Errorf("failed to compile rule %s.%d: %s", state, i, err) - } - rule.Regexp.MatchTimeout = time.Millisecond * 250 - } - } - } -restart: - seen := map[LexerMutator]bool{} - for state := range r.rules { - for i := 0; i < len(r.rules[state]); i++ { - rule := r.rules[state][i] - if compile, ok := rule.Mutator.(LexerMutator); ok { - if seen[compile] { - return fmt.Errorf("saw mutator %T twice; this should not happen", compile) - } - seen[compile] = true - if err := compile.MutateLexer(r.rules, state, i); err != nil { - return err - } - // Process the rules again in case the mutator added/removed rules. - // - // This sounds bad, but shouldn't be significant in practice. - goto restart - } - } - } - r.compiled = true - return nil -} - -func (r *RegexLexer) fetchRules() error { - rules, err := r.fetchRulesFunc() - if err != nil { - return fmt.Errorf("%s: failed to compile rules: %w", r.config.Name, err) - } - if _, ok := rules["root"]; !ok { - return fmt.Errorf("no \"root\" state") - } - compiledRules := map[string][]*CompiledRule{} - for state, rules := range rules { - compiledRules[state] = nil - for _, rule := range rules { - flags := "" - if !r.config.NotMultiline { - flags += "m" - } - if r.config.CaseInsensitive { - flags += "i" - } - if r.config.DotAll { - flags += "s" - } - compiledRules[state] = append(compiledRules[state], &CompiledRule{Rule: rule, flags: flags}) - } - } - - r.rawRules = rules - r.rules = compiledRules - return nil -} - -func (r *RegexLexer) needRules() error { - var err error - if r.fetchRulesFunc != nil { - r.compileOnce.Do(func() { - err = r.fetchRules() - }) - } - if err := r.maybeCompile(); err != nil { - return err - } - return err -} - -// Tokenise text using lexer, returning an iterator. -func (r *RegexLexer) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { - err := r.needRules() - if err != nil { - return nil, err - } - if options == nil { - options = defaultOptions - } - if options.EnsureLF { - text = ensureLF(text) - } - newlineAdded := false - if !options.Nested && r.config.EnsureNL && !strings.HasSuffix(text, "\n") { - text += "\n" - newlineAdded = true - } - state := &LexerState{ - Registry: r.registry, - newlineAdded: newlineAdded, - options: options, - Lexer: r, - Text: []rune(text), - Stack: []string{options.State}, - Rules: r.rules, - MutatorContext: map[interface{}]interface{}{}, - } - return state.Iterator, nil -} - -// MustRules is like Rules() but will panic on error. -func (r *RegexLexer) MustRules() Rules { - rules, err := r.Rules() - if err != nil { - panic(err) - } - return rules -} - -func matchRules(text []rune, pos int, rules []*CompiledRule) (int, *CompiledRule, []string, map[string]string) { - for i, rule := range rules { - match, err := rule.Regexp.FindRunesMatchStartingAt(text, pos) - if match != nil && err == nil && match.Index == pos { - groups := []string{} - namedGroups := make(map[string]string) - for _, g := range match.Groups() { - namedGroups[g.Name] = g.String() - groups = append(groups, g.String()) - } - return i, rule, groups, namedGroups - } - } - return 0, &CompiledRule{}, nil, nil -} - -// replace \r and \r\n with \n -// same as strings.ReplaceAll but more efficient -func ensureLF(text string) string { - buf := make([]byte, len(text)) - var j int - for i := 0; i < len(text); i++ { - c := text[i] - if c == '\r' { - if i < len(text)-1 && text[i+1] == '\n' { - continue - } - c = '\n' - } - buf[j] = c - j++ - } - return string(buf[:j]) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/registry.go b/vendor/github.com/alecthomas/chroma/v2/registry.go deleted file mode 100644 index 4742e8c5abca893fd082b508424b444478822f22..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/registry.go +++ /dev/null @@ -1,210 +0,0 @@ -package chroma - -import ( - "path/filepath" - "sort" - "strings" -) - -var ( - ignoredSuffixes = [...]string{ - // Editor backups - "~", ".bak", ".old", ".orig", - // Debian and derivatives apt/dpkg/ucf backups - ".dpkg-dist", ".dpkg-old", ".ucf-dist", ".ucf-new", ".ucf-old", - // Red Hat and derivatives rpm backups - ".rpmnew", ".rpmorig", ".rpmsave", - // Build system input/template files - ".in", - } -) - -// LexerRegistry is a registry of Lexers. -type LexerRegistry struct { - Lexers Lexers - byName map[string]Lexer - byAlias map[string]Lexer -} - -// NewLexerRegistry creates a new LexerRegistry of Lexers. -func NewLexerRegistry() *LexerRegistry { - return &LexerRegistry{ - byName: map[string]Lexer{}, - byAlias: map[string]Lexer{}, - } -} - -// Names of all lexers, optionally including aliases. -func (l *LexerRegistry) Names(withAliases bool) []string { - out := []string{} - for _, lexer := range l.Lexers { - config := lexer.Config() - out = append(out, config.Name) - if withAliases { - out = append(out, config.Aliases...) - } - } - sort.Strings(out) - return out -} - -// Get a Lexer by name, alias or file extension. -func (l *LexerRegistry) Get(name string) Lexer { - if lexer := l.byName[name]; lexer != nil { - return lexer - } - if lexer := l.byAlias[name]; lexer != nil { - return lexer - } - if lexer := l.byName[strings.ToLower(name)]; lexer != nil { - return lexer - } - if lexer := l.byAlias[strings.ToLower(name)]; lexer != nil { - return lexer - } - - candidates := PrioritisedLexers{} - // Try file extension. - if lexer := l.Match("filename." + name); lexer != nil { - candidates = append(candidates, lexer) - } - // Try exact filename. - if lexer := l.Match(name); lexer != nil { - candidates = append(candidates, lexer) - } - if len(candidates) == 0 { - return nil - } - sort.Sort(candidates) - return candidates[0] -} - -// MatchMimeType attempts to find a lexer for the given MIME type. -func (l *LexerRegistry) MatchMimeType(mimeType string) Lexer { - matched := PrioritisedLexers{} - for _, l := range l.Lexers { - for _, lmt := range l.Config().MimeTypes { - if mimeType == lmt { - matched = append(matched, l) - } - } - } - if len(matched) != 0 { - sort.Sort(matched) - return matched[0] - } - return nil -} - -// Match returns the first lexer matching filename. -// -// Note that this iterates over all file patterns in all lexers, so is not fast. -func (l *LexerRegistry) Match(filename string) Lexer { - filename = filepath.Base(filename) - matched := PrioritisedLexers{} - // First, try primary filename matches. - for _, lexer := range l.Lexers { - config := lexer.Config() - for _, glob := range config.Filenames { - ok, err := filepath.Match(glob, filename) - if err != nil { // nolint - panic(err) - } else if ok { - matched = append(matched, lexer) - } else { - for _, suf := range &ignoredSuffixes { - ok, err := filepath.Match(glob+suf, filename) - if err != nil { - panic(err) - } else if ok { - matched = append(matched, lexer) - break - } - } - } - } - } - if len(matched) > 0 { - sort.Sort(matched) - return matched[0] - } - matched = nil - // Next, try filename aliases. - for _, lexer := range l.Lexers { - config := lexer.Config() - for _, glob := range config.AliasFilenames { - ok, err := filepath.Match(glob, filename) - if err != nil { // nolint - panic(err) - } else if ok { - matched = append(matched, lexer) - } else { - for _, suf := range &ignoredSuffixes { - ok, err := filepath.Match(glob+suf, filename) - if err != nil { - panic(err) - } else if ok { - matched = append(matched, lexer) - break - } - } - } - } - } - if len(matched) > 0 { - sort.Sort(matched) - return matched[0] - } - return nil -} - -// Analyse text content and return the "best" lexer.. -func (l *LexerRegistry) Analyse(text string) Lexer { - var picked Lexer - highest := float32(0.0) - for _, lexer := range l.Lexers { - if analyser, ok := lexer.(Analyser); ok { - weight := analyser.AnalyseText(text) - if weight > highest { - picked = lexer - highest = weight - } - } - } - return picked -} - -// Register a Lexer with the LexerRegistry. If the lexer is already registered -// it will be replaced. -func (l *LexerRegistry) Register(lexer Lexer) Lexer { - lexer.SetRegistry(l) - config := lexer.Config() - - l.byName[config.Name] = lexer - l.byName[strings.ToLower(config.Name)] = lexer - - for _, alias := range config.Aliases { - l.byAlias[alias] = lexer - l.byAlias[strings.ToLower(alias)] = lexer - } - - l.Lexers = add(l.Lexers, lexer) - - return lexer -} - -// add adds a lexer to a slice of lexers if it doesn't already exist, or if found will replace it. -func add(lexers Lexers, lexer Lexer) Lexers { - for i, val := range lexers { - if val == nil { - continue - } - - if val.Config().Name == lexer.Config().Name { - lexers[i] = lexer - return lexers - } - } - - return append(lexers, lexer) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/remap.go b/vendor/github.com/alecthomas/chroma/v2/remap.go deleted file mode 100644 index bcf5e66d1752ddf48c736287b2e16f1d15f1e68e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/remap.go +++ /dev/null @@ -1,94 +0,0 @@ -package chroma - -type remappingLexer struct { - lexer Lexer - mapper func(Token) []Token -} - -// RemappingLexer remaps a token to a set of, potentially empty, tokens. -func RemappingLexer(lexer Lexer, mapper func(Token) []Token) Lexer { - return &remappingLexer{lexer, mapper} -} - -func (r *remappingLexer) AnalyseText(text string) float32 { - return r.lexer.AnalyseText(text) -} - -func (r *remappingLexer) SetAnalyser(analyser func(text string) float32) Lexer { - r.lexer.SetAnalyser(analyser) - return r -} - -func (r *remappingLexer) SetRegistry(registry *LexerRegistry) Lexer { - r.lexer.SetRegistry(registry) - return r -} - -func (r *remappingLexer) Config() *Config { - return r.lexer.Config() -} - -func (r *remappingLexer) Tokenise(options *TokeniseOptions, text string) (Iterator, error) { - it, err := r.lexer.Tokenise(options, text) - if err != nil { - return nil, err - } - var buffer []Token - return func() Token { - for { - if len(buffer) > 0 { - t := buffer[0] - buffer = buffer[1:] - return t - } - t := it() - if t == EOF { - return t - } - buffer = r.mapper(t) - } - }, nil -} - -// TypeMapping defines type maps for the TypeRemappingLexer. -type TypeMapping []struct { - From, To TokenType - Words []string -} - -// TypeRemappingLexer remaps types of tokens coming from a parent Lexer. -// -// eg. Map "defvaralias" tokens of type NameVariable to NameFunction: -// -// mapping := TypeMapping{ -// {NameVariable, NameFunction, []string{"defvaralias"}, -// } -// lexer = TypeRemappingLexer(lexer, mapping) -func TypeRemappingLexer(lexer Lexer, mapping TypeMapping) Lexer { - // Lookup table for fast remapping. - lut := map[TokenType]map[string]TokenType{} - for _, rt := range mapping { - km, ok := lut[rt.From] - if !ok { - km = map[string]TokenType{} - lut[rt.From] = km - } - if len(rt.Words) == 0 { - km[""] = rt.To - } else { - for _, k := range rt.Words { - km[k] = rt.To - } - } - } - return RemappingLexer(lexer, func(t Token) []Token { - if k, ok := lut[t.Type]; ok { - if tt, ok := k[t.Value]; ok { - t.Type = tt - } else if tt, ok := k[""]; ok { - t.Type = tt - } - } - return []Token{t} - }) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/renovate.json5 b/vendor/github.com/alecthomas/chroma/v2/renovate.json5 deleted file mode 100644 index 77c7b016ccd486a2584ae3031b58e56d5a53f7ff..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/renovate.json5 +++ /dev/null @@ -1,18 +0,0 @@ -{ - $schema: "https://docs.renovatebot.com/renovate-schema.json", - extends: [ - "config:recommended", - ":semanticCommits", - ":semanticCommitTypeAll(chore)", - ":semanticCommitScope(deps)", - "group:allNonMajor", - "schedule:earlyMondays", // Run once a week. - ], - packageRules: [ - { - matchPackageNames: ["golangci-lint"], - matchManagers: ["hermit"], - enabled: false, - }, - ], -} diff --git a/vendor/github.com/alecthomas/chroma/v2/serialise.go b/vendor/github.com/alecthomas/chroma/v2/serialise.go deleted file mode 100644 index 645a5faabcc911b9162be574490d2ce6e0249a15..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/serialise.go +++ /dev/null @@ -1,479 +0,0 @@ -package chroma - -import ( - "compress/gzip" - "encoding/xml" - "errors" - "fmt" - "io" - "io/fs" - "math" - "path/filepath" - "reflect" - "regexp" - "strings" - - "github.com/dlclark/regexp2" -) - -// Serialisation of Chroma rules to XML. The format is: -// -// -// -// -// eg. Include("String") would become: -// -//-// -//-// [<$EMITTER ...>] -// [<$MUTATOR ...>] -// -//-// -// -// [null, null, {"kind": "include", "state": "String"}] -// -// eg. Rule{`\d+`, Text, nil} would become: -// -//-// -// -// -// eg. Rule{`"`, String, Push("String")} -// -//-// -// -// -// eg. Rule{`(\w+)(\n)`, ByGroups(Keyword, Whitespace), nil}, -// -//-// -// -// -var ( - // ErrNotSerialisable is returned if a lexer contains Rules that cannot be serialised. - ErrNotSerialisable = fmt.Errorf("not serialisable") - emitterTemplates = func() map[string]SerialisableEmitter { - out := map[string]SerialisableEmitter{} - for _, emitter := range []SerialisableEmitter{ - &byGroupsEmitter{}, - &usingSelfEmitter{}, - TokenType(0), - &usingEmitter{}, - &usingByGroup{}, - } { - out[emitter.EmitterKind()] = emitter - } - return out - }() - mutatorTemplates = func() map[string]SerialisableMutator { - out := map[string]SerialisableMutator{} - for _, mutator := range []SerialisableMutator{ - &includeMutator{}, - &combinedMutator{}, - &multiMutator{}, - &pushMutator{}, - &popMutator{}, - } { - out[mutator.MutatorKind()] = mutator - } - return out - }() -) - -// fastUnmarshalConfig unmarshals only the Config from a serialised lexer. -func fastUnmarshalConfig(from fs.FS, path string) (*Config, error) { - r, err := from.Open(path) - if err != nil { - return nil, err - } - defer r.Close() - dec := xml.NewDecoder(r) - for { - token, err := dec.Token() - if err != nil { - if errors.Is(err, io.EOF) { - return nil, fmt.Errorf("could not find-// -// element") - } - return nil, err - } - switch se := token.(type) { - case xml.StartElement: - if se.Name.Local != "config" { - break - } - - var config Config - err = dec.DecodeElement(&config, &se) - if err != nil { - return nil, fmt.Errorf("%s: %w", path, err) - } - return &config, nil - } - } -} - -// MustNewXMLLexer constructs a new RegexLexer from an XML file or panics. -func MustNewXMLLexer(from fs.FS, path string) *RegexLexer { - lex, err := NewXMLLexer(from, path) - if err != nil { - panic(err) - } - return lex -} - -// NewXMLLexer creates a new RegexLexer from a serialised RegexLexer. -func NewXMLLexer(from fs.FS, path string) (*RegexLexer, error) { - config, err := fastUnmarshalConfig(from, path) - if err != nil { - return nil, err - } - - for _, glob := range append(config.Filenames, config.AliasFilenames...) { - _, err := filepath.Match(glob, "") - if err != nil { - return nil, fmt.Errorf("%s: %q is not a valid glob: %w", config.Name, glob, err) - } - } - - var analyserFn func(string) float32 - - if config.Analyse != nil { - type regexAnalyse struct { - re *regexp2.Regexp - score float32 - } - - regexAnalysers := make([]regexAnalyse, 0, len(config.Analyse.Regexes)) - - for _, ra := range config.Analyse.Regexes { - re, err := regexp2.Compile(ra.Pattern, regexp2.None) - if err != nil { - return nil, fmt.Errorf("%s: %q is not a valid analyser regex: %w", config.Name, ra.Pattern, err) - } - - regexAnalysers = append(regexAnalysers, regexAnalyse{re, ra.Score}) - } - - analyserFn = func(text string) float32 { - var score float32 - - for _, ra := range regexAnalysers { - ok, err := ra.re.MatchString(text) - if err != nil { - return 0 - } - - if ok && config.Analyse.First { - return float32(math.Min(float64(ra.score), 1.0)) - } - - if ok { - score += ra.score - } - } - - return float32(math.Min(float64(score), 1.0)) - } - } - - return &RegexLexer{ - config: config, - analyser: analyserFn, - fetchRulesFunc: func() (Rules, error) { - var lexer struct { - Config - Rules Rules `xml:"rules"` - } - // Try to open .xml fallback to .xml.gz - fr, err := from.Open(path) - if err != nil { - if errors.Is(err, fs.ErrNotExist) { - path += ".gz" - fr, err = from.Open(path) - if err != nil { - return nil, err - } - } else { - return nil, err - } - } - defer fr.Close() - var r io.Reader = fr - if strings.HasSuffix(path, ".gz") { - r, err = gzip.NewReader(r) - if err != nil { - return nil, fmt.Errorf("%s: %w", path, err) - } - } - err = xml.NewDecoder(r).Decode(&lexer) - if err != nil { - return nil, fmt.Errorf("%s: %w", path, err) - } - return lexer.Rules, nil - }, - }, nil -} - -// Marshal a RegexLexer to XML. -func Marshal(l *RegexLexer) ([]byte, error) { - type lexer struct { - Config Config `xml:"config"` - Rules Rules `xml:"rules"` - } - - rules, err := l.Rules() - if err != nil { - return nil, err - } - root := &lexer{ - Config: *l.Config(), - Rules: rules, - } - data, err := xml.MarshalIndent(root, "", " ") - if err != nil { - return nil, err - } - re := regexp.MustCompile(`>`) - data = re.ReplaceAll(data, []byte(`/>`)) - return data, nil -} - -// Unmarshal a RegexLexer from XML. -func Unmarshal(data []byte) (*RegexLexer, error) { - type lexer struct { - Config Config `xml:"config"` - Rules Rules `xml:"rules"` - } - root := &lexer{} - err := xml.Unmarshal(data, root) - if err != nil { - return nil, fmt.Errorf("invalid Lexer XML: %w", err) - } - lex, err := NewLexer(&root.Config, func() Rules { return root.Rules }) - if err != nil { - return nil, err - } - return lex, nil -} - -func marshalMutator(e *xml.Encoder, mutator Mutator) error { - if mutator == nil { - return nil - } - smutator, ok := mutator.(SerialisableMutator) - if !ok { - return fmt.Errorf("unsupported mutator: %w", ErrNotSerialisable) - } - return e.EncodeElement(mutator, xml.StartElement{Name: xml.Name{Local: smutator.MutatorKind()}}) -} - -func unmarshalMutator(d *xml.Decoder, start xml.StartElement) (Mutator, error) { - kind := start.Name.Local - mutator, ok := mutatorTemplates[kind] - if !ok { - return nil, fmt.Errorf("unknown mutator %q: %w", kind, ErrNotSerialisable) - } - value, target := newFromTemplate(mutator) - if err := d.DecodeElement(target, &start); err != nil { - return nil, err - } - return value().(SerialisableMutator), nil -} - -func marshalEmitter(e *xml.Encoder, emitter Emitter) error { - if emitter == nil { - return nil - } - semitter, ok := emitter.(SerialisableEmitter) - if !ok { - return fmt.Errorf("unsupported emitter %T: %w", emitter, ErrNotSerialisable) - } - return e.EncodeElement(emitter, xml.StartElement{ - Name: xml.Name{Local: semitter.EmitterKind()}, - }) -} - -func unmarshalEmitter(d *xml.Decoder, start xml.StartElement) (Emitter, error) { - kind := start.Name.Local - mutator, ok := emitterTemplates[kind] - if !ok { - return nil, fmt.Errorf("unknown emitter %q: %w", kind, ErrNotSerialisable) - } - value, target := newFromTemplate(mutator) - if err := d.DecodeElement(target, &start); err != nil { - return nil, err - } - return value().(SerialisableEmitter), nil -} - -func (r Rule) MarshalXML(e *xml.Encoder, _ xml.StartElement) error { - start := xml.StartElement{ - Name: xml.Name{Local: "rule"}, - } - if r.Pattern != "" { - start.Attr = append(start.Attr, xml.Attr{ - Name: xml.Name{Local: "pattern"}, - Value: r.Pattern, - }) - } - if err := e.EncodeToken(start); err != nil { - return err - } - if err := marshalEmitter(e, r.Type); err != nil { - return err - } - if err := marshalMutator(e, r.Mutator); err != nil { - return err - } - return e.EncodeToken(xml.EndElement{Name: start.Name}) -} - -func (r *Rule) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { - for _, attr := range start.Attr { - if attr.Name.Local == "pattern" { - r.Pattern = attr.Value - break - } - } - for { - token, err := d.Token() - if err != nil { - return err - } - switch token := token.(type) { - case xml.StartElement: - mutator, err := unmarshalMutator(d, token) - if err != nil && !errors.Is(err, ErrNotSerialisable) { - return err - } else if err == nil { - if r.Mutator != nil { - return fmt.Errorf("duplicate mutator") - } - r.Mutator = mutator - continue - } - emitter, err := unmarshalEmitter(d, token) - if err != nil && !errors.Is(err, ErrNotSerialisable) { // nolint: gocritic - return err - } else if err == nil { - if r.Type != nil { - return fmt.Errorf("duplicate emitter") - } - r.Type = emitter - continue - } else { - return err - } - - case xml.EndElement: - return nil - } - } -} - -type xmlRuleState struct { - Name string `xml:"name,attr"` - Rules []Rule `xml:"rule"` -} - -type xmlRules struct { - States []xmlRuleState `xml:"state"` -} - -func (r Rules) MarshalXML(e *xml.Encoder, _ xml.StartElement) error { - xr := xmlRules{} - for state, rules := range r { - xr.States = append(xr.States, xmlRuleState{ - Name: state, - Rules: rules, - }) - } - return e.EncodeElement(xr, xml.StartElement{Name: xml.Name{Local: "rules"}}) -} - -func (r *Rules) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { - xr := xmlRules{} - if err := d.DecodeElement(&xr, &start); err != nil { - return err - } - if *r == nil { - *r = Rules{} - } - for _, state := range xr.States { - (*r)[state.Name] = state.Rules - } - return nil -} - -type xmlTokenType struct { - Type string `xml:"type,attr"` -} - -func (t *TokenType) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { - el := xmlTokenType{} - if err := d.DecodeElement(&el, &start); err != nil { - return err - } - tt, err := TokenTypeString(el.Type) - if err != nil { - return err - } - *t = tt - return nil -} - -func (t TokenType) MarshalXML(e *xml.Encoder, start xml.StartElement) error { - start.Attr = append(start.Attr, xml.Attr{Name: xml.Name{Local: "type"}, Value: t.String()}) - if err := e.EncodeToken(start); err != nil { - return err - } - return e.EncodeToken(xml.EndElement{Name: start.Name}) -} - -// This hijinks is a bit unfortunate but without it we can't deserialise into TokenType. -func newFromTemplate(template interface{}) (value func() interface{}, target interface{}) { - t := reflect.TypeOf(template) - if t.Kind() == reflect.Ptr { - v := reflect.New(t.Elem()) - return v.Interface, v.Interface() - } - v := reflect.New(t) - return func() interface{} { return v.Elem().Interface() }, v.Interface() -} - -func (b *Emitters) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { - for { - token, err := d.Token() - if err != nil { - return err - } - switch token := token.(type) { - case xml.StartElement: - emitter, err := unmarshalEmitter(d, token) - if err != nil { - return err - } - *b = append(*b, emitter) - - case xml.EndElement: - return nil - } - } -} - -func (b Emitters) MarshalXML(e *xml.Encoder, start xml.StartElement) error { - if err := e.EncodeToken(start); err != nil { - return err - } - for _, m := range b { - if err := marshalEmitter(e, m); err != nil { - return err - } - } - return e.EncodeToken(xml.EndElement{Name: start.Name}) -} diff --git a/vendor/github.com/alecthomas/chroma/v2/style.go b/vendor/github.com/alecthomas/chroma/v2/style.go deleted file mode 100644 index cc8d9a602f1805765e7eea3756ec49bb00234e6f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/style.go +++ /dev/null @@ -1,481 +0,0 @@ -package chroma - -import ( - "encoding/xml" - "fmt" - "io" - "sort" - "strings" -) - -// Trilean value for StyleEntry value inheritance. -type Trilean uint8 - -// Trilean states. -const ( - Pass Trilean = iota - Yes - No -) - -func (t Trilean) String() string { - switch t { - case Yes: - return "Yes" - case No: - return "No" - default: - return "Pass" - } -} - -// Prefix returns s with "no" as a prefix if Trilean is no. -func (t Trilean) Prefix(s string) string { - if t == Yes { - return s - } else if t == No { - return "no" + s - } - return "" -} - -// A StyleEntry in the Style map. -type StyleEntry struct { - // Hex colours. - Colour Colour - Background Colour - Border Colour - - Bold Trilean - Italic Trilean - Underline Trilean - NoInherit bool -} - -func (s StyleEntry) MarshalText() ([]byte, error) { - return []byte(s.String()), nil -} - -func (s StyleEntry) String() string { - out := []string{} - if s.Bold != Pass { - out = append(out, s.Bold.Prefix("bold")) - } - if s.Italic != Pass { - out = append(out, s.Italic.Prefix("italic")) - } - if s.Underline != Pass { - out = append(out, s.Underline.Prefix("underline")) - } - if s.NoInherit { - out = append(out, "noinherit") - } - if s.Colour.IsSet() { - out = append(out, s.Colour.String()) - } - if s.Background.IsSet() { - out = append(out, "bg:"+s.Background.String()) - } - if s.Border.IsSet() { - out = append(out, "border:"+s.Border.String()) - } - return strings.Join(out, " ") -} - -// Sub subtracts e from s where elements match. -func (s StyleEntry) Sub(e StyleEntry) StyleEntry { - out := StyleEntry{} - if e.Colour != s.Colour { - out.Colour = s.Colour - } - if e.Background != s.Background { - out.Background = s.Background - } - if e.Bold != s.Bold { - out.Bold = s.Bold - } - if e.Italic != s.Italic { - out.Italic = s.Italic - } - if e.Underline != s.Underline { - out.Underline = s.Underline - } - if e.Border != s.Border { - out.Border = s.Border - } - return out -} - -// Inherit styles from ancestors. -// -// Ancestors should be provided from oldest to newest. -func (s StyleEntry) Inherit(ancestors ...StyleEntry) StyleEntry { - out := s - for i := len(ancestors) - 1; i >= 0; i-- { - if out.NoInherit { - return out - } - ancestor := ancestors[i] - if !out.Colour.IsSet() { - out.Colour = ancestor.Colour - } - if !out.Background.IsSet() { - out.Background = ancestor.Background - } - if !out.Border.IsSet() { - out.Border = ancestor.Border - } - if out.Bold == Pass { - out.Bold = ancestor.Bold - } - if out.Italic == Pass { - out.Italic = ancestor.Italic - } - if out.Underline == Pass { - out.Underline = ancestor.Underline - } - } - return out -} - -func (s StyleEntry) IsZero() bool { - return s.Colour == 0 && s.Background == 0 && s.Border == 0 && s.Bold == Pass && s.Italic == Pass && - s.Underline == Pass && !s.NoInherit -} - -// A StyleBuilder is a mutable structure for building styles. -// -// Once built, a Style is immutable. -type StyleBuilder struct { - entries map[TokenType]string - name string - parent *Style -} - -func NewStyleBuilder(name string) *StyleBuilder { - return &StyleBuilder{name: name, entries: map[TokenType]string{}} -} - -func (s *StyleBuilder) AddAll(entries StyleEntries) *StyleBuilder { - for ttype, entry := range entries { - s.entries[ttype] = entry - } - return s -} - -func (s *StyleBuilder) Get(ttype TokenType) StyleEntry { - // This is less than ideal, but it's the price for not having to check errors on each Add(). - entry, _ := ParseStyleEntry(s.entries[ttype]) - if s.parent != nil { - entry = entry.Inherit(s.parent.Get(ttype)) - } - return entry -} - -// Add an entry to the Style map. -// -// See http://pygments.org/docs/styles/#style-rules for details. -func (s *StyleBuilder) Add(ttype TokenType, entry string) *StyleBuilder { // nolint: gocyclo - s.entries[ttype] = entry - return s -} - -func (s *StyleBuilder) AddEntry(ttype TokenType, entry StyleEntry) *StyleBuilder { - s.entries[ttype] = entry.String() - return s -} - -// Transform passes each style entry currently defined in the builder to the supplied -// function and saves the returned value. This can be used to adjust a style's colours; -// see Colour's ClampBrightness function, for example. -func (s *StyleBuilder) Transform(transform func(StyleEntry) StyleEntry) *StyleBuilder { - types := make(map[TokenType]struct{}) - for tt := range s.entries { - types[tt] = struct{}{} - } - if s.parent != nil { - for _, tt := range s.parent.Types() { - types[tt] = struct{}{} - } - } - for tt := range types { - s.AddEntry(tt, transform(s.Get(tt))) - } - return s -} - -func (s *StyleBuilder) Build() (*Style, error) { - style := &Style{ - Name: s.name, - entries: map[TokenType]StyleEntry{}, - parent: s.parent, - } - for ttype, descriptor := range s.entries { - entry, err := ParseStyleEntry(descriptor) - if err != nil { - return nil, fmt.Errorf("invalid entry for %s: %s", ttype, err) - } - style.entries[ttype] = entry - } - return style, nil -} - -// StyleEntries mapping TokenType to colour definition. -type StyleEntries map[TokenType]string - -// NewXMLStyle parses an XML style definition. -func NewXMLStyle(r io.Reader) (*Style, error) { - dec := xml.NewDecoder(r) - style := &Style{} - return style, dec.Decode(style) -} - -// MustNewXMLStyle is like NewXMLStyle but panics on error. -func MustNewXMLStyle(r io.Reader) *Style { - style, err := NewXMLStyle(r) - if err != nil { - panic(err) - } - return style -} - -// NewStyle creates a new style definition. -func NewStyle(name string, entries StyleEntries) (*Style, error) { - return NewStyleBuilder(name).AddAll(entries).Build() -} - -// MustNewStyle creates a new style or panics. -func MustNewStyle(name string, entries StyleEntries) *Style { - style, err := NewStyle(name, entries) - if err != nil { - panic(err) - } - return style -} - -// A Style definition. -// -// See http://pygments.org/docs/styles/ for details. Semantics are intended to be identical. -type Style struct { - Name string - entries map[TokenType]StyleEntry - parent *Style -} - -func (s *Style) MarshalXML(e *xml.Encoder, start xml.StartElement) error { - if s.parent != nil { - return fmt.Errorf("cannot marshal style with parent") - } - start.Name = xml.Name{Local: "style"} - start.Attr = []xml.Attr{{Name: xml.Name{Local: "name"}, Value: s.Name}} - if err := e.EncodeToken(start); err != nil { - return err - } - sorted := make([]TokenType, 0, len(s.entries)) - for ttype := range s.entries { - sorted = append(sorted, ttype) - } - sort.Slice(sorted, func(i, j int) bool { return sorted[i] < sorted[j] }) - for _, ttype := range sorted { - entry := s.entries[ttype] - el := xml.StartElement{Name: xml.Name{Local: "entry"}} - el.Attr = []xml.Attr{ - {Name: xml.Name{Local: "type"}, Value: ttype.String()}, - {Name: xml.Name{Local: "style"}, Value: entry.String()}, - } - if err := e.EncodeToken(el); err != nil { - return err - } - if err := e.EncodeToken(xml.EndElement{Name: el.Name}); err != nil { - return err - } - } - return e.EncodeToken(xml.EndElement{Name: start.Name}) -} - -func (s *Style) UnmarshalXML(d *xml.Decoder, start xml.StartElement) error { - for _, attr := range start.Attr { - if attr.Name.Local == "name" { - s.Name = attr.Value - } else { - return fmt.Errorf("unexpected attribute %s", attr.Name.Local) - } - } - if s.Name == "" { - return fmt.Errorf("missing style name attribute") - } - s.entries = map[TokenType]StyleEntry{} - for { - tok, err := d.Token() - if err != nil { - return err - } - switch el := tok.(type) { - case xml.StartElement: - if el.Name.Local != "entry" { - return fmt.Errorf("unexpected element %s", el.Name.Local) - } - var ttype TokenType - var entry StyleEntry - for _, attr := range el.Attr { - switch attr.Name.Local { - case "type": - ttype, err = TokenTypeString(attr.Value) - if err != nil { - return err - } - - case "style": - entry, err = ParseStyleEntry(attr.Value) - if err != nil { - return err - } - - default: - return fmt.Errorf("unexpected attribute %s", attr.Name.Local) - } - } - s.entries[ttype] = entry - - case xml.EndElement: - if el.Name.Local == start.Name.Local { - return nil - } - } - } -} - -// Types that are styled. -func (s *Style) Types() []TokenType { - dedupe := map[TokenType]bool{} - for tt := range s.entries { - dedupe[tt] = true - } - if s.parent != nil { - for _, tt := range s.parent.Types() { - dedupe[tt] = true - } - } - out := make([]TokenType, 0, len(dedupe)) - for tt := range dedupe { - out = append(out, tt) - } - return out -} - -// Builder creates a mutable builder from this Style. -// -// The builder can then be safely modified. This is a cheap operation. -func (s *Style) Builder() *StyleBuilder { - return &StyleBuilder{ - name: s.Name, - entries: map[TokenType]string{}, - parent: s, - } -} - -// Has checks if an exact style entry match exists for a token type. -// -// This is distinct from Get() which will merge parent tokens. -func (s *Style) Has(ttype TokenType) bool { - return !s.get(ttype).IsZero() || s.synthesisable(ttype) -} - -// Get a style entry. Will try sub-category or category if an exact match is not found, and -// finally return the Background. -func (s *Style) Get(ttype TokenType) StyleEntry { - return s.get(ttype).Inherit( - s.get(Background), - s.get(Text), - s.get(ttype.Category()), - s.get(ttype.SubCategory())) -} - -func (s *Style) get(ttype TokenType) StyleEntry { - out := s.entries[ttype] - if out.IsZero() && s.parent != nil { - return s.parent.get(ttype) - } - if out.IsZero() && s.synthesisable(ttype) { - out = s.synthesise(ttype) - } - return out -} - -func (s *Style) synthesise(ttype TokenType) StyleEntry { - bg := s.get(Background) - text := StyleEntry{Colour: bg.Colour} - text.Colour = text.Colour.BrightenOrDarken(0.5) - - switch ttype { - // If we don't have a line highlight colour, make one that is 10% brighter/darker than the background. - case LineHighlight: - return StyleEntry{Background: bg.Background.BrightenOrDarken(0.1)} - - // If we don't have line numbers, use the text colour but 20% brighter/darker - case LineNumbers, LineNumbersTable: - return text - - default: - return StyleEntry{} - } -} - -func (s *Style) synthesisable(ttype TokenType) bool { - return ttype == LineHighlight || ttype == LineNumbers || ttype == LineNumbersTable -} - -// MustParseStyleEntry parses a Pygments style entry or panics. -func MustParseStyleEntry(entry string) StyleEntry { - out, err := ParseStyleEntry(entry) - if err != nil { - panic(err) - } - return out -} - -// ParseStyleEntry parses a Pygments style entry. -func ParseStyleEntry(entry string) (StyleEntry, error) { // nolint: gocyclo - out := StyleEntry{} - parts := strings.Fields(entry) - for _, part := range parts { - switch { - case part == "italic": - out.Italic = Yes - case part == "noitalic": - out.Italic = No - case part == "bold": - out.Bold = Yes - case part == "nobold": - out.Bold = No - case part == "underline": - out.Underline = Yes - case part == "nounderline": - out.Underline = No - case part == "inherit": - out.NoInherit = false - case part == "noinherit": - out.NoInherit = true - case part == "bg:": - out.Background = 0 - case strings.HasPrefix(part, "bg:#"): - out.Background = ParseColour(part[3:]) - if !out.Background.IsSet() { - return StyleEntry{}, fmt.Errorf("invalid background colour %q", part) - } - case strings.HasPrefix(part, "border:#"): - out.Border = ParseColour(part[7:]) - if !out.Border.IsSet() { - return StyleEntry{}, fmt.Errorf("invalid border colour %q", part) - } - case strings.HasPrefix(part, "#"): - out.Colour = ParseColour(part) - if !out.Colour.IsSet() { - return StyleEntry{}, fmt.Errorf("invalid colour %q", part) - } - default: - return StyleEntry{}, fmt.Errorf("unknown style element %q", part) - } - } - return out, nil -} diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/abap.xml b/vendor/github.com/alecthomas/chroma/v2/styles/abap.xml deleted file mode 100644 index 36ea2f1d08417ca66633adff02d8053c48b2b611..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/abap.xml +++ /dev/null @@ -1,11 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/algol.xml b/vendor/github.com/alecthomas/chroma/v2/styles/algol.xml deleted file mode 100644 index e8a6dc1b82992d7bf4f9c1fab7f1776a5d491c7d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/algol.xml +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/algol_nu.xml b/vendor/github.com/alecthomas/chroma/v2/styles/algol_nu.xml deleted file mode 100644 index 7fa340f32b38a59c8acd961dcf6a8175c1dc7fa7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/algol_nu.xml +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/api.go b/vendor/github.com/alecthomas/chroma/v2/styles/api.go deleted file mode 100644 index e26d6f0a56a0f737314853241db339fee29aa3c6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/api.go +++ /dev/null @@ -1,65 +0,0 @@ -package styles - -import ( - "embed" - "io/fs" - "sort" - - "github.com/alecthomas/chroma/v2" -) - -//go:embed *.xml -var embedded embed.FS - -// Registry of Styles. -var Registry = func() map[string]*chroma.Style { - registry := map[string]*chroma.Style{} - // Register all embedded styles. - files, err := fs.ReadDir(embedded, ".") - if err != nil { - panic(err) - } - for _, file := range files { - if file.IsDir() { - continue - } - r, err := embedded.Open(file.Name()) - if err != nil { - panic(err) - } - style, err := chroma.NewXMLStyle(r) - if err != nil { - panic(err) - } - registry[style.Name] = style - _ = r.Close() - } - return registry -}() - -// Fallback style. Reassign to change the default fallback style. -var Fallback = Registry["swapoff"] - -// Register a chroma.Style. -func Register(style *chroma.Style) *chroma.Style { - Registry[style.Name] = style - return style -} - -// Names of all available styles. -func Names() []string { - out := []string{} - for name := range Registry { - out = append(out, name) - } - sort.Strings(out) - return out -} - -// Get named style, or Fallback. -func Get(name string) *chroma.Style { - if style, ok := Registry[name]; ok { - return style - } - return Fallback -} diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/arduino.xml b/vendor/github.com/alecthomas/chroma/v2/styles/arduino.xml deleted file mode 100644 index d9891dc53819096b748d310b7be2404edb2ce74e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/arduino.xml +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/autumn.xml b/vendor/github.com/alecthomas/chroma/v2/styles/autumn.xml deleted file mode 100644 index 74d2eae988272357ed58bcf643f61a00b7a68ee0..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/autumn.xml +++ /dev/null @@ -1,36 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/average.xml b/vendor/github.com/alecthomas/chroma/v2/styles/average.xml deleted file mode 100644 index 79bdb95f340a7242f5c8b3c04aa9baee34f646c2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/average.xml +++ /dev/null @@ -1,74 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/base16-snazzy.xml b/vendor/github.com/alecthomas/chroma/v2/styles/base16-snazzy.xml deleted file mode 100644 index a05ba24e5299d4019bb4bd54c91bd2da87779569..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/base16-snazzy.xml +++ /dev/null @@ -1,74 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/borland.xml b/vendor/github.com/alecthomas/chroma/v2/styles/borland.xml deleted file mode 100644 index 0d8f574c646bc092f2e46a86e6779fdfcf8e4bd2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/borland.xml +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/bw.xml b/vendor/github.com/alecthomas/chroma/v2/styles/bw.xml deleted file mode 100644 index fb0e868d15978fcc7b299bf9aa0dbe1904da43c2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/bw.xml +++ /dev/null @@ -1,23 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-frappe.xml b/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-frappe.xml deleted file mode 100644 index 0adf1ba9e34e9348c20fd5b5ea07dc29ba3fc3af..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-frappe.xml +++ /dev/null @@ -1,83 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-latte.xml b/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-latte.xml deleted file mode 100644 index 3ea767fd4a32b93429ea65f7f5b29ea75378fd2c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-latte.xml +++ /dev/null @@ -1,83 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-macchiato.xml b/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-macchiato.xml deleted file mode 100644 index 6b5002848708d3db7bf7fd80fd90f7277958d680..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-macchiato.xml +++ /dev/null @@ -1,83 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-mocha.xml b/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-mocha.xml deleted file mode 100644 index 9a401912f36b53c14adca9163d378c7409addb71..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/catppuccin-mocha.xml +++ /dev/null @@ -1,83 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/colorful.xml b/vendor/github.com/alecthomas/chroma/v2/styles/colorful.xml deleted file mode 100644 index 32442d716dabf2e2d92feb33202bc8099b299b79..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/colorful.xml +++ /dev/null @@ -1,52 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/compat.go b/vendor/github.com/alecthomas/chroma/v2/styles/compat.go deleted file mode 100644 index 4a6aaa6652dd2a57ee6dcb923ea2e2fda9091f6c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/compat.go +++ /dev/null @@ -1,66 +0,0 @@ -package styles - -// Present for backwards compatibility. -// -// Deprecated: use styles.Get(name) instead. -var ( - Abap = Registry["abap"] - Algol = Registry["algol"] - AlgolNu = Registry["algol_nu"] - Arduino = Registry["arduino"] - Autumn = Registry["autumn"] - Average = Registry["average"] - Base16Snazzy = Registry["base16-snazzy"] - Borland = Registry["borland"] - BlackWhite = Registry["bw"] - CatppuccinFrappe = Registry["catppuccin-frappe"] - CatppuccinLatte = Registry["catppuccin-latte"] - CatppuccinMacchiato = Registry["catppuccin-macchiato"] - CatppuccinMocha = Registry["catppuccin-mocha"] - Colorful = Registry["colorful"] - DoomOne = Registry["doom-one"] - DoomOne2 = Registry["doom-one2"] - Dracula = Registry["dracula"] - Emacs = Registry["emacs"] - Friendly = Registry["friendly"] - Fruity = Registry["fruity"] - GitHubDark = Registry["github-dark"] - GitHub = Registry["github"] - GruvboxLight = Registry["gruvbox-light"] - Gruvbox = Registry["gruvbox"] - HrDark = Registry["hrdark"] - HrHighContrast = Registry["hr_high_contrast"] - Igor = Registry["igor"] - Lovelace = Registry["lovelace"] - Manni = Registry["manni"] - ModusOperandi = Registry["modus-operandi"] - ModusVivendi = Registry["modus-vivendi"] - Monokai = Registry["monokai"] - MonokaiLight = Registry["monokailight"] - Murphy = Registry["murphy"] - Native = Registry["native"] - Nord = Registry["nord"] - OnesEnterprise = Registry["onesenterprise"] - ParaisoDark = Registry["paraiso-dark"] - ParaisoLight = Registry["paraiso-light"] - Pastie = Registry["pastie"] - Perldoc = Registry["perldoc"] - Pygments = Registry["pygments"] - RainbowDash = Registry["rainbow_dash"] - RosePineDawn = Registry["rose-pine-dawn"] - RosePineMoon = Registry["rose-pine-moon"] - RosePine = Registry["rose-pine"] - Rrt = Registry["rrt"] - SolarizedDark = Registry["solarized-dark"] - SolarizedDark256 = Registry["solarized-dark256"] - SolarizedLight = Registry["solarized-light"] - SwapOff = Registry["swapoff"] - Tango = Registry["tango"] - Trac = Registry["trac"] - Vim = Registry["vim"] - VisualStudio = Registry["vs"] - Vulcan = Registry["vulcan"] - WitchHazel = Registry["witchhazel"] - XcodeDark = Registry["xcode-dark"] - Xcode = Registry["xcode"] -) diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/doom-one.xml b/vendor/github.com/alecthomas/chroma/v2/styles/doom-one.xml deleted file mode 100644 index 1f5127ef90d9eca0406ae3506dbf4e56f9e3ef23..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/doom-one.xml +++ /dev/null @@ -1,51 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/doom-one2.xml b/vendor/github.com/alecthomas/chroma/v2/styles/doom-one2.xml deleted file mode 100644 index f47debaf0919d7fec57720a7ca346cfaf6271961..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/doom-one2.xml +++ /dev/null @@ -1,64 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/dracula.xml b/vendor/github.com/alecthomas/chroma/v2/styles/dracula.xml deleted file mode 100644 index 9df7da11c23c3fd06edafcc086b668dd7e588be2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/dracula.xml +++ /dev/null @@ -1,74 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/emacs.xml b/vendor/github.com/alecthomas/chroma/v2/styles/emacs.xml deleted file mode 100644 index 981ce8e40fb3e82254a744719ce694b71f5d7134..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/emacs.xml +++ /dev/null @@ -1,44 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/evergarden.xml b/vendor/github.com/alecthomas/chroma/v2/styles/evergarden.xml deleted file mode 100644 index da1d9b843bee2970f7126560d98e1eb2ecec787f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/evergarden.xml +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/friendly.xml b/vendor/github.com/alecthomas/chroma/v2/styles/friendly.xml deleted file mode 100644 index f49801040eb531f59eea12a98ea5115f327fb8bf..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/friendly.xml +++ /dev/null @@ -1,44 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/fruity.xml b/vendor/github.com/alecthomas/chroma/v2/styles/fruity.xml deleted file mode 100644 index bcc06aa7bcfcce42b077b2a3e8f505dee59f6188..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/fruity.xml +++ /dev/null @@ -1,19 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/github-dark.xml b/vendor/github.com/alecthomas/chroma/v2/styles/github-dark.xml deleted file mode 100644 index 711aeafc4ab5fbb1e5f823285f4e551dff82f770..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/github-dark.xml +++ /dev/null @@ -1,45 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/github.xml b/vendor/github.com/alecthomas/chroma/v2/styles/github.xml deleted file mode 100644 index d747f6538318c961539416b33a14811d80a4b9af..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/github.xml +++ /dev/null @@ -1,39 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/gruvbox-light.xml b/vendor/github.com/alecthomas/chroma/v2/styles/gruvbox-light.xml deleted file mode 100644 index 8c4f0642c6489a2e6d2b7fcb8449791f5547e677..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/gruvbox-light.xml +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/gruvbox.xml b/vendor/github.com/alecthomas/chroma/v2/styles/gruvbox.xml deleted file mode 100644 index 2f6a0a2a050c96b7f1f44f80b49471e605652402..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/gruvbox.xml +++ /dev/null @@ -1,33 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/hr_high_contrast.xml b/vendor/github.com/alecthomas/chroma/v2/styles/hr_high_contrast.xml deleted file mode 100644 index 61cde204a4b32d06f63046a593622d99191faccc..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/hr_high_contrast.xml +++ /dev/null @@ -1,12 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/hrdark.xml b/vendor/github.com/alecthomas/chroma/v2/styles/hrdark.xml deleted file mode 100644 index bc7a6f315ec65606b9673a1b0e1d387098d5784f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/hrdark.xml +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/igor.xml b/vendor/github.com/alecthomas/chroma/v2/styles/igor.xml deleted file mode 100644 index 773c83b6034c2bd8521ee094c894f6be2c737879..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/igor.xml +++ /dev/null @@ -1,9 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/lovelace.xml b/vendor/github.com/alecthomas/chroma/v2/styles/lovelace.xml deleted file mode 100644 index e336c930a495610aa6a9d6b4131172d38c7caa6b..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/lovelace.xml +++ /dev/null @@ -1,53 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/manni.xml b/vendor/github.com/alecthomas/chroma/v2/styles/manni.xml deleted file mode 100644 index 99324bd3b12ca95dd8a3798b3cfb52457a1a6b19..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/manni.xml +++ /dev/null @@ -1,44 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/modus-operandi.xml b/vendor/github.com/alecthomas/chroma/v2/styles/modus-operandi.xml deleted file mode 100644 index 023137aae550d9ed44b4e608410d8f0a1a641fff..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/modus-operandi.xml +++ /dev/null @@ -1,13 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/modus-vivendi.xml b/vendor/github.com/alecthomas/chroma/v2/styles/modus-vivendi.xml deleted file mode 100644 index 8da663dcc0c763a9d975ebf7b8ffba6380d51b42..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/modus-vivendi.xml +++ /dev/null @@ -1,13 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/monokai.xml b/vendor/github.com/alecthomas/chroma/v2/styles/monokai.xml deleted file mode 100644 index 1a789ddec58fdac179c69160b7b56709a93d4555..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/monokai.xml +++ /dev/null @@ -1,29 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/monokailight.xml b/vendor/github.com/alecthomas/chroma/v2/styles/monokailight.xml deleted file mode 100644 index 85cd23e008687fa1ad33d47542501ee180f95976..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/monokailight.xml +++ /dev/null @@ -1,26 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/murphy.xml b/vendor/github.com/alecthomas/chroma/v2/styles/murphy.xml deleted file mode 100644 index 112d6205c5b71d227331d34288ff1c42c9ef9ede..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/murphy.xml +++ /dev/null @@ -1,52 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/native.xml b/vendor/github.com/alecthomas/chroma/v2/styles/native.xml deleted file mode 100644 index 43eea7fd53724e0f316f7a2f48f76e1c04eb305d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/native.xml +++ /dev/null @@ -1,35 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/nord.xml b/vendor/github.com/alecthomas/chroma/v2/styles/nord.xml deleted file mode 100644 index 1c1d1ffb260e9ffab21ece00f5b4633201a673e2..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/nord.xml +++ /dev/null @@ -1,46 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/nordic.xml b/vendor/github.com/alecthomas/chroma/v2/styles/nordic.xml deleted file mode 100644 index 4c36b8e4ae08fa3ab981ac4f16570396543bdab4..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/nordic.xml +++ /dev/null @@ -1,46 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/onedark.xml b/vendor/github.com/alecthomas/chroma/v2/styles/onedark.xml deleted file mode 100644 index 6921eb5eebd51bccbce67815a7baef9a5e47fafb..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/onedark.xml +++ /dev/null @@ -1,25 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/onesenterprise.xml b/vendor/github.com/alecthomas/chroma/v2/styles/onesenterprise.xml deleted file mode 100644 index ce86db3fbc3a3c99e314f8f0b0af4dca746fb998..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/onesenterprise.xml +++ /dev/null @@ -1,10 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/paraiso-dark.xml b/vendor/github.com/alecthomas/chroma/v2/styles/paraiso-dark.xml deleted file mode 100644 index 788db3f7cb607633cf1227640126bd4f2798417e..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/paraiso-dark.xml +++ /dev/null @@ -1,37 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/paraiso-light.xml b/vendor/github.com/alecthomas/chroma/v2/styles/paraiso-light.xml deleted file mode 100644 index 06a63bae176bdcd74f624a0675b091d34dd2d985..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/paraiso-light.xml +++ /dev/null @@ -1,37 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/pastie.xml b/vendor/github.com/alecthomas/chroma/v2/styles/pastie.xml deleted file mode 100644 index a3b0abde5ce6e64e7b6bb56045aa140fb22303ba..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/pastie.xml +++ /dev/null @@ -1,45 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/perldoc.xml b/vendor/github.com/alecthomas/chroma/v2/styles/perldoc.xml deleted file mode 100644 index 9e5564c3fbd36d9169799f12cd10d5882fcf7da5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/perldoc.xml +++ /dev/null @@ -1,37 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/pygments.xml b/vendor/github.com/alecthomas/chroma/v2/styles/pygments.xml deleted file mode 100644 index a3d0d8bab537d0878dab62805c6709393b048fc7..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/pygments.xml +++ /dev/null @@ -1,42 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/rainbow_dash.xml b/vendor/github.com/alecthomas/chroma/v2/styles/rainbow_dash.xml deleted file mode 100644 index 5b0fe49d633a7af769fa1445abe27c2605818f35..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/rainbow_dash.xml +++ /dev/null @@ -1,40 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine-dawn.xml b/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine-dawn.xml deleted file mode 100644 index 788bd6f65c2b945157e7f0abb014a0a2db585815..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine-dawn.xml +++ /dev/null @@ -1,29 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine-moon.xml b/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine-moon.xml deleted file mode 100644 index f67b804324e6e051541a4c53d252e99038ec3980..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine-moon.xml +++ /dev/null @@ -1,29 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine.xml b/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine.xml deleted file mode 100644 index 3fb70a5ac79c47a527b42c697d10449a74cefb2f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/rose-pine.xml +++ /dev/null @@ -1,29 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/rrt.xml b/vendor/github.com/alecthomas/chroma/v2/styles/rrt.xml deleted file mode 100644 index 5f1daaa2c70f0124d71d65735cb3121ce5eb9489..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/rrt.xml +++ /dev/null @@ -1,13 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/solarized-dark.xml b/vendor/github.com/alecthomas/chroma/v2/styles/solarized-dark.xml deleted file mode 100644 index a3cf46fddbb2fa97fa8bbc606ca557ebfcacf4e9..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/solarized-dark.xml +++ /dev/null @@ -1,39 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/solarized-dark256.xml b/vendor/github.com/alecthomas/chroma/v2/styles/solarized-dark256.xml deleted file mode 100644 index 977cfbe3f3f0e58bc0055f16be2404caa0c7a16c..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/solarized-dark256.xml +++ /dev/null @@ -1,41 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/solarized-light.xml b/vendor/github.com/alecthomas/chroma/v2/styles/solarized-light.xml deleted file mode 100644 index 4fbc1d4a6754780fcebf6d41fdc706824c3b8066..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/solarized-light.xml +++ /dev/null @@ -1,17 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/swapoff.xml b/vendor/github.com/alecthomas/chroma/v2/styles/swapoff.xml deleted file mode 100644 index 8a398df8d9d6d21d0958ca5c9a30ba001f7c1cad..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/swapoff.xml +++ /dev/null @@ -1,18 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/tango.xml b/vendor/github.com/alecthomas/chroma/v2/styles/tango.xml deleted file mode 100644 index 5ca46bb75e15561fca3f49f6f800caf88e5ec302..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/tango.xml +++ /dev/null @@ -1,72 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-day.xml b/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-day.xml deleted file mode 100644 index c20d9a41e6683be9504fed79af3f5000e97d22cf..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-day.xml +++ /dev/null @@ -1,83 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-moon.xml b/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-moon.xml deleted file mode 100644 index 3312f029d1e99e968ffc48baf128374494afa3a5..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-moon.xml +++ /dev/null @@ -1,83 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-night.xml b/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-night.xml deleted file mode 100644 index c798bad4dc8c3f643a8d0d849f237bb9706709b3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-night.xml +++ /dev/null @@ -1,83 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-storm.xml b/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-storm.xml deleted file mode 100644 index c0811524791b8096abd55636aef6285a0bab6696..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/tokyonight-storm.xml +++ /dev/null @@ -1,83 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/trac.xml b/vendor/github.com/alecthomas/chroma/v2/styles/trac.xml deleted file mode 100644 index 9f1d266780c3c67347515f49226f7b38dddc8683..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/trac.xml +++ /dev/null @@ -1,35 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/vim.xml b/vendor/github.com/alecthomas/chroma/v2/styles/vim.xml deleted file mode 100644 index fec6934347eaef7fc6ecadbf3fde521fe576ffe3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/vim.xml +++ /dev/null @@ -1,29 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/vs.xml b/vendor/github.com/alecthomas/chroma/v2/styles/vs.xml deleted file mode 100644 index 56435015497920bca11624070fd63d2a0eb7f6e1..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/vs.xml +++ /dev/null @@ -1,16 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/vulcan.xml b/vendor/github.com/alecthomas/chroma/v2/styles/vulcan.xml deleted file mode 100644 index 4e690945e2e8e37c5692eda6128841579e4644b3..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/vulcan.xml +++ /dev/null @@ -1,74 +0,0 @@ - diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/witchhazel.xml b/vendor/github.com/alecthomas/chroma/v2/styles/witchhazel.xml deleted file mode 100644 index 52f2299133ec44f21cb448b9d0f4579deb2bf98d..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/witchhazel.xml +++ /dev/null @@ -1,31 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/xcode-dark.xml b/vendor/github.com/alecthomas/chroma/v2/styles/xcode-dark.xml deleted file mode 100644 index 93439791fd84fcf1a720ce80049bb72511f680e8..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/xcode-dark.xml +++ /dev/null @@ -1,31 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/styles/xcode.xml b/vendor/github.com/alecthomas/chroma/v2/styles/xcode.xml deleted file mode 100644 index 523d746cf6d9cfff7a07077f8cbdc67c629997dc..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/styles/xcode.xml +++ /dev/null @@ -1,22 +0,0 @@ - \ No newline at end of file diff --git a/vendor/github.com/alecthomas/chroma/v2/table.py b/vendor/github.com/alecthomas/chroma/v2/table.py deleted file mode 100644 index ea4b7556a7b0d6c3f39f1dc416656c3c227e987f..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/table.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 -import re -from collections import defaultdict -from subprocess import check_output - -README_FILE = "README.md" - -lines = check_output(["chroma", "--list"]).decode("utf-8").splitlines() -lines = [line.strip() for line in lines if line.startswith(" ") and not line.startswith(" ")] -lines = sorted(lines, key=lambda l: l.lower()) - -table = defaultdict(list) - -for line in lines: - table[line[0].upper()].append(line) - -rows = [] -for key, value in table.items(): - rows.append("{} | {}".format(key, ", ".join(value))) -tbody = "\n".join(rows) - -with open(README_FILE, "r") as f: - content = f.read() - -with open(README_FILE, "w") as f: - marker = re.compile(r"(?P :----: \\| --------\n).*?(?P \n\n)", re.DOTALL) - replacement = r"\g %s\g " % tbody - updated_content = marker.sub(replacement, content) - f.write(updated_content) - -print(tbody) diff --git a/vendor/github.com/alecthomas/chroma/v2/tokentype_enumer.go b/vendor/github.com/alecthomas/chroma/v2/tokentype_enumer.go deleted file mode 100644 index 3024264a9e4da4bb3b3bbd0765cc64cc80d2f2f8..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/tokentype_enumer.go +++ /dev/null @@ -1,583 +0,0 @@ -// Code generated by "enumer -text -type TokenType"; DO NOT EDIT. - -package chroma - -import ( - "fmt" - "strings" -) - -const _TokenTypeName = "IgnoreNoneOtherErrorCodeLineLineLinkLineTableTDLineTableLineHighlightLineNumbersTableLineNumbersLinePreWrapperBackgroundEOFTypeKeywordKeywordConstantKeywordDeclarationKeywordNamespaceKeywordPseudoKeywordReservedKeywordTypeNameNameAttributeNameBuiltinNameBuiltinPseudoNameClassNameConstantNameDecoratorNameEntityNameExceptionNameFunctionNameFunctionMagicNameKeywordNameLabelNameNamespaceNameOperatorNameOtherNamePseudoNamePropertyNameTagNameVariableNameVariableAnonymousNameVariableClassNameVariableGlobalNameVariableInstanceNameVariableMagicLiteralLiteralDateLiteralOtherLiteralStringLiteralStringAffixLiteralStringAtomLiteralStringBacktickLiteralStringBooleanLiteralStringCharLiteralStringDelimiterLiteralStringDocLiteralStringDoubleLiteralStringEscapeLiteralStringHeredocLiteralStringInterpolLiteralStringNameLiteralStringOtherLiteralStringRegexLiteralStringSingleLiteralStringSymbolLiteralNumberLiteralNumberBinLiteralNumberFloatLiteralNumberHexLiteralNumberIntegerLiteralNumberIntegerLongLiteralNumberOctLiteralNumberByteOperatorOperatorWordPunctuationCommentCommentHashbangCommentMultilineCommentSingleCommentSpecialCommentPreprocCommentPreprocFileGenericGenericDeletedGenericEmphGenericErrorGenericHeadingGenericInsertedGenericOutputGenericPromptGenericStrongGenericSubheadingGenericTracebackGenericUnderlineTextTextWhitespaceTextSymbolTextPunctuation" -const _TokenTypeLowerName = "ignorenoneothererrorcodelinelinelinklinetabletdlinetablelinehighlightlinenumberstablelinenumberslineprewrapperbackgroundeoftypekeywordkeywordconstantkeyworddeclarationkeywordnamespacekeywordpseudokeywordreservedkeywordtypenamenameattributenamebuiltinnamebuiltinpseudonameclassnameconstantnamedecoratornameentitynameexceptionnamefunctionnamefunctionmagicnamekeywordnamelabelnamenamespacenameoperatornameothernamepseudonamepropertynametagnamevariablenamevariableanonymousnamevariableclassnamevariableglobalnamevariableinstancenamevariablemagicliteralliteraldateliteralotherliteralstringliteralstringaffixliteralstringatomliteralstringbacktickliteralstringbooleanliteralstringcharliteralstringdelimiterliteralstringdocliteralstringdoubleliteralstringescapeliteralstringheredocliteralstringinterpolliteralstringnameliteralstringotherliteralstringregexliteralstringsingleliteralstringsymbolliteralnumberliteralnumberbinliteralnumberfloatliteralnumberhexliteralnumberintegerliteralnumberintegerlongliteralnumberoctliteralnumberbyteoperatoroperatorwordpunctuationcommentcommenthashbangcommentmultilinecommentsinglecommentspecialcommentpreproccommentpreprocfilegenericgenericdeletedgenericemphgenericerrorgenericheadinggenericinsertedgenericoutputgenericpromptgenericstronggenericsubheadinggenerictracebackgenericunderlinetexttextwhitespacetextsymboltextpunctuation" - -var _TokenTypeMap = map[TokenType]string{ - -14: _TokenTypeName[0:6], - -13: _TokenTypeName[6:10], - -12: _TokenTypeName[10:15], - -11: _TokenTypeName[15:20], - -10: _TokenTypeName[20:28], - -9: _TokenTypeName[28:36], - -8: _TokenTypeName[36:47], - -7: _TokenTypeName[47:56], - -6: _TokenTypeName[56:69], - -5: _TokenTypeName[69:85], - -4: _TokenTypeName[85:96], - -3: _TokenTypeName[96:100], - -2: _TokenTypeName[100:110], - -1: _TokenTypeName[110:120], - 0: _TokenTypeName[120:127], - 1000: _TokenTypeName[127:134], - 1001: _TokenTypeName[134:149], - 1002: _TokenTypeName[149:167], - 1003: _TokenTypeName[167:183], - 1004: _TokenTypeName[183:196], - 1005: _TokenTypeName[196:211], - 1006: _TokenTypeName[211:222], - 2000: _TokenTypeName[222:226], - 2001: _TokenTypeName[226:239], - 2002: _TokenTypeName[239:250], - 2003: _TokenTypeName[250:267], - 2004: _TokenTypeName[267:276], - 2005: _TokenTypeName[276:288], - 2006: _TokenTypeName[288:301], - 2007: _TokenTypeName[301:311], - 2008: _TokenTypeName[311:324], - 2009: _TokenTypeName[324:336], - 2010: _TokenTypeName[336:353], - 2011: _TokenTypeName[353:364], - 2012: _TokenTypeName[364:373], - 2013: _TokenTypeName[373:386], - 2014: _TokenTypeName[386:398], - 2015: _TokenTypeName[398:407], - 2016: _TokenTypeName[407:417], - 2017: _TokenTypeName[417:429], - 2018: _TokenTypeName[429:436], - 2019: _TokenTypeName[436:448], - 2020: _TokenTypeName[448:469], - 2021: _TokenTypeName[469:486], - 2022: _TokenTypeName[486:504], - 2023: _TokenTypeName[504:524], - 2024: _TokenTypeName[524:541], - 3000: _TokenTypeName[541:548], - 3001: _TokenTypeName[548:559], - 3002: _TokenTypeName[559:571], - 3100: _TokenTypeName[571:584], - 3101: _TokenTypeName[584:602], - 3102: _TokenTypeName[602:619], - 3103: _TokenTypeName[619:640], - 3104: _TokenTypeName[640:660], - 3105: _TokenTypeName[660:677], - 3106: _TokenTypeName[677:699], - 3107: _TokenTypeName[699:715], - 3108: _TokenTypeName[715:734], - 3109: _TokenTypeName[734:753], - 3110: _TokenTypeName[753:773], - 3111: _TokenTypeName[773:794], - 3112: _TokenTypeName[794:811], - 3113: _TokenTypeName[811:829], - 3114: _TokenTypeName[829:847], - 3115: _TokenTypeName[847:866], - 3116: _TokenTypeName[866:885], - 3200: _TokenTypeName[885:898], - 3201: _TokenTypeName[898:914], - 3202: _TokenTypeName[914:932], - 3203: _TokenTypeName[932:948], - 3204: _TokenTypeName[948:968], - 3205: _TokenTypeName[968:992], - 3206: _TokenTypeName[992:1008], - 3207: _TokenTypeName[1008:1025], - 4000: _TokenTypeName[1025:1033], - 4001: _TokenTypeName[1033:1045], - 5000: _TokenTypeName[1045:1056], - 6000: _TokenTypeName[1056:1063], - 6001: _TokenTypeName[1063:1078], - 6002: _TokenTypeName[1078:1094], - 6003: _TokenTypeName[1094:1107], - 6004: _TokenTypeName[1107:1121], - 6100: _TokenTypeName[1121:1135], - 6101: _TokenTypeName[1135:1153], - 7000: _TokenTypeName[1153:1160], - 7001: _TokenTypeName[1160:1174], - 7002: _TokenTypeName[1174:1185], - 7003: _TokenTypeName[1185:1197], - 7004: _TokenTypeName[1197:1211], - 7005: _TokenTypeName[1211:1226], - 7006: _TokenTypeName[1226:1239], - 7007: _TokenTypeName[1239:1252], - 7008: _TokenTypeName[1252:1265], - 7009: _TokenTypeName[1265:1282], - 7010: _TokenTypeName[1282:1298], - 7011: _TokenTypeName[1298:1314], - 8000: _TokenTypeName[1314:1318], - 8001: _TokenTypeName[1318:1332], - 8002: _TokenTypeName[1332:1342], - 8003: _TokenTypeName[1342:1357], -} - -func (i TokenType) String() string { - if str, ok := _TokenTypeMap[i]; ok { - return str - } - return fmt.Sprintf("TokenType(%d)", i) -} - -// An "invalid array index" compiler error signifies that the constant values have changed. -// Re-run the stringer command to generate them again. -func _TokenTypeNoOp() { - var x [1]struct{} - _ = x[Ignore-(-14)] - _ = x[None-(-13)] - _ = x[Other-(-12)] - _ = x[Error-(-11)] - _ = x[CodeLine-(-10)] - _ = x[LineLink-(-9)] - _ = x[LineTableTD-(-8)] - _ = x[LineTable-(-7)] - _ = x[LineHighlight-(-6)] - _ = x[LineNumbersTable-(-5)] - _ = x[LineNumbers-(-4)] - _ = x[Line-(-3)] - _ = x[PreWrapper-(-2)] - _ = x[Background-(-1)] - _ = x[EOFType-(0)] - _ = x[Keyword-(1000)] - _ = x[KeywordConstant-(1001)] - _ = x[KeywordDeclaration-(1002)] - _ = x[KeywordNamespace-(1003)] - _ = x[KeywordPseudo-(1004)] - _ = x[KeywordReserved-(1005)] - _ = x[KeywordType-(1006)] - _ = x[Name-(2000)] - _ = x[NameAttribute-(2001)] - _ = x[NameBuiltin-(2002)] - _ = x[NameBuiltinPseudo-(2003)] - _ = x[NameClass-(2004)] - _ = x[NameConstant-(2005)] - _ = x[NameDecorator-(2006)] - _ = x[NameEntity-(2007)] - _ = x[NameException-(2008)] - _ = x[NameFunction-(2009)] - _ = x[NameFunctionMagic-(2010)] - _ = x[NameKeyword-(2011)] - _ = x[NameLabel-(2012)] - _ = x[NameNamespace-(2013)] - _ = x[NameOperator-(2014)] - _ = x[NameOther-(2015)] - _ = x[NamePseudo-(2016)] - _ = x[NameProperty-(2017)] - _ = x[NameTag-(2018)] - _ = x[NameVariable-(2019)] - _ = x[NameVariableAnonymous-(2020)] - _ = x[NameVariableClass-(2021)] - _ = x[NameVariableGlobal-(2022)] - _ = x[NameVariableInstance-(2023)] - _ = x[NameVariableMagic-(2024)] - _ = x[Literal-(3000)] - _ = x[LiteralDate-(3001)] - _ = x[LiteralOther-(3002)] - _ = x[LiteralString-(3100)] - _ = x[LiteralStringAffix-(3101)] - _ = x[LiteralStringAtom-(3102)] - _ = x[LiteralStringBacktick-(3103)] - _ = x[LiteralStringBoolean-(3104)] - _ = x[LiteralStringChar-(3105)] - _ = x[LiteralStringDelimiter-(3106)] - _ = x[LiteralStringDoc-(3107)] - _ = x[LiteralStringDouble-(3108)] - _ = x[LiteralStringEscape-(3109)] - _ = x[LiteralStringHeredoc-(3110)] - _ = x[LiteralStringInterpol-(3111)] - _ = x[LiteralStringName-(3112)] - _ = x[LiteralStringOther-(3113)] - _ = x[LiteralStringRegex-(3114)] - _ = x[LiteralStringSingle-(3115)] - _ = x[LiteralStringSymbol-(3116)] - _ = x[LiteralNumber-(3200)] - _ = x[LiteralNumberBin-(3201)] - _ = x[LiteralNumberFloat-(3202)] - _ = x[LiteralNumberHex-(3203)] - _ = x[LiteralNumberInteger-(3204)] - _ = x[LiteralNumberIntegerLong-(3205)] - _ = x[LiteralNumberOct-(3206)] - _ = x[LiteralNumberByte-(3207)] - _ = x[Operator-(4000)] - _ = x[OperatorWord-(4001)] - _ = x[Punctuation-(5000)] - _ = x[Comment-(6000)] - _ = x[CommentHashbang-(6001)] - _ = x[CommentMultiline-(6002)] - _ = x[CommentSingle-(6003)] - _ = x[CommentSpecial-(6004)] - _ = x[CommentPreproc-(6100)] - _ = x[CommentPreprocFile-(6101)] - _ = x[Generic-(7000)] - _ = x[GenericDeleted-(7001)] - _ = x[GenericEmph-(7002)] - _ = x[GenericError-(7003)] - _ = x[GenericHeading-(7004)] - _ = x[GenericInserted-(7005)] - _ = x[GenericOutput-(7006)] - _ = x[GenericPrompt-(7007)] - _ = x[GenericStrong-(7008)] - _ = x[GenericSubheading-(7009)] - _ = x[GenericTraceback-(7010)] - _ = x[GenericUnderline-(7011)] - _ = x[Text-(8000)] - _ = x[TextWhitespace-(8001)] - _ = x[TextSymbol-(8002)] - _ = x[TextPunctuation-(8003)] -} - -var _TokenTypeValues = []TokenType{Ignore, None, Other, Error, CodeLine, LineLink, LineTableTD, LineTable, LineHighlight, LineNumbersTable, LineNumbers, Line, PreWrapper, Background, EOFType, Keyword, KeywordConstant, KeywordDeclaration, KeywordNamespace, KeywordPseudo, KeywordReserved, KeywordType, Name, NameAttribute, NameBuiltin, NameBuiltinPseudo, NameClass, NameConstant, NameDecorator, NameEntity, NameException, NameFunction, NameFunctionMagic, NameKeyword, NameLabel, NameNamespace, NameOperator, NameOther, NamePseudo, NameProperty, NameTag, NameVariable, NameVariableAnonymous, NameVariableClass, NameVariableGlobal, NameVariableInstance, NameVariableMagic, Literal, LiteralDate, LiteralOther, LiteralString, LiteralStringAffix, LiteralStringAtom, LiteralStringBacktick, LiteralStringBoolean, LiteralStringChar, LiteralStringDelimiter, LiteralStringDoc, LiteralStringDouble, LiteralStringEscape, LiteralStringHeredoc, LiteralStringInterpol, LiteralStringName, LiteralStringOther, LiteralStringRegex, LiteralStringSingle, LiteralStringSymbol, LiteralNumber, LiteralNumberBin, LiteralNumberFloat, LiteralNumberHex, LiteralNumberInteger, LiteralNumberIntegerLong, LiteralNumberOct, LiteralNumberByte, Operator, OperatorWord, Punctuation, Comment, CommentHashbang, CommentMultiline, CommentSingle, CommentSpecial, CommentPreproc, CommentPreprocFile, Generic, GenericDeleted, GenericEmph, GenericError, GenericHeading, GenericInserted, GenericOutput, GenericPrompt, GenericStrong, GenericSubheading, GenericTraceback, GenericUnderline, Text, TextWhitespace, TextSymbol, TextPunctuation} - -var _TokenTypeNameToValueMap = map[string]TokenType{ - _TokenTypeName[0:6]: Ignore, - _TokenTypeLowerName[0:6]: Ignore, - _TokenTypeName[6:10]: None, - _TokenTypeLowerName[6:10]: None, - _TokenTypeName[10:15]: Other, - _TokenTypeLowerName[10:15]: Other, - _TokenTypeName[15:20]: Error, - _TokenTypeLowerName[15:20]: Error, - _TokenTypeName[20:28]: CodeLine, - _TokenTypeLowerName[20:28]: CodeLine, - _TokenTypeName[28:36]: LineLink, - _TokenTypeLowerName[28:36]: LineLink, - _TokenTypeName[36:47]: LineTableTD, - _TokenTypeLowerName[36:47]: LineTableTD, - _TokenTypeName[47:56]: LineTable, - _TokenTypeLowerName[47:56]: LineTable, - _TokenTypeName[56:69]: LineHighlight, - _TokenTypeLowerName[56:69]: LineHighlight, - _TokenTypeName[69:85]: LineNumbersTable, - _TokenTypeLowerName[69:85]: LineNumbersTable, - _TokenTypeName[85:96]: LineNumbers, - _TokenTypeLowerName[85:96]: LineNumbers, - _TokenTypeName[96:100]: Line, - _TokenTypeLowerName[96:100]: Line, - _TokenTypeName[100:110]: PreWrapper, - _TokenTypeLowerName[100:110]: PreWrapper, - _TokenTypeName[110:120]: Background, - _TokenTypeLowerName[110:120]: Background, - _TokenTypeName[120:127]: EOFType, - _TokenTypeLowerName[120:127]: EOFType, - _TokenTypeName[127:134]: Keyword, - _TokenTypeLowerName[127:134]: Keyword, - _TokenTypeName[134:149]: KeywordConstant, - _TokenTypeLowerName[134:149]: KeywordConstant, - _TokenTypeName[149:167]: KeywordDeclaration, - _TokenTypeLowerName[149:167]: KeywordDeclaration, - _TokenTypeName[167:183]: KeywordNamespace, - _TokenTypeLowerName[167:183]: KeywordNamespace, - _TokenTypeName[183:196]: KeywordPseudo, - _TokenTypeLowerName[183:196]: KeywordPseudo, - _TokenTypeName[196:211]: KeywordReserved, - _TokenTypeLowerName[196:211]: KeywordReserved, - _TokenTypeName[211:222]: KeywordType, - _TokenTypeLowerName[211:222]: KeywordType, - _TokenTypeName[222:226]: Name, - _TokenTypeLowerName[222:226]: Name, - _TokenTypeName[226:239]: NameAttribute, - _TokenTypeLowerName[226:239]: NameAttribute, - _TokenTypeName[239:250]: NameBuiltin, - _TokenTypeLowerName[239:250]: NameBuiltin, - _TokenTypeName[250:267]: NameBuiltinPseudo, - _TokenTypeLowerName[250:267]: NameBuiltinPseudo, - _TokenTypeName[267:276]: NameClass, - _TokenTypeLowerName[267:276]: NameClass, - _TokenTypeName[276:288]: NameConstant, - _TokenTypeLowerName[276:288]: NameConstant, - _TokenTypeName[288:301]: NameDecorator, - _TokenTypeLowerName[288:301]: NameDecorator, - _TokenTypeName[301:311]: NameEntity, - _TokenTypeLowerName[301:311]: NameEntity, - _TokenTypeName[311:324]: NameException, - _TokenTypeLowerName[311:324]: NameException, - _TokenTypeName[324:336]: NameFunction, - _TokenTypeLowerName[324:336]: NameFunction, - _TokenTypeName[336:353]: NameFunctionMagic, - _TokenTypeLowerName[336:353]: NameFunctionMagic, - _TokenTypeName[353:364]: NameKeyword, - _TokenTypeLowerName[353:364]: NameKeyword, - _TokenTypeName[364:373]: NameLabel, - _TokenTypeLowerName[364:373]: NameLabel, - _TokenTypeName[373:386]: NameNamespace, - _TokenTypeLowerName[373:386]: NameNamespace, - _TokenTypeName[386:398]: NameOperator, - _TokenTypeLowerName[386:398]: NameOperator, - _TokenTypeName[398:407]: NameOther, - _TokenTypeLowerName[398:407]: NameOther, - _TokenTypeName[407:417]: NamePseudo, - _TokenTypeLowerName[407:417]: NamePseudo, - _TokenTypeName[417:429]: NameProperty, - _TokenTypeLowerName[417:429]: NameProperty, - _TokenTypeName[429:436]: NameTag, - _TokenTypeLowerName[429:436]: NameTag, - _TokenTypeName[436:448]: NameVariable, - _TokenTypeLowerName[436:448]: NameVariable, - _TokenTypeName[448:469]: NameVariableAnonymous, - _TokenTypeLowerName[448:469]: NameVariableAnonymous, - _TokenTypeName[469:486]: NameVariableClass, - _TokenTypeLowerName[469:486]: NameVariableClass, - _TokenTypeName[486:504]: NameVariableGlobal, - _TokenTypeLowerName[486:504]: NameVariableGlobal, - _TokenTypeName[504:524]: NameVariableInstance, - _TokenTypeLowerName[504:524]: NameVariableInstance, - _TokenTypeName[524:541]: NameVariableMagic, - _TokenTypeLowerName[524:541]: NameVariableMagic, - _TokenTypeName[541:548]: Literal, - _TokenTypeLowerName[541:548]: Literal, - _TokenTypeName[548:559]: LiteralDate, - _TokenTypeLowerName[548:559]: LiteralDate, - _TokenTypeName[559:571]: LiteralOther, - _TokenTypeLowerName[559:571]: LiteralOther, - _TokenTypeName[571:584]: LiteralString, - _TokenTypeLowerName[571:584]: LiteralString, - _TokenTypeName[584:602]: LiteralStringAffix, - _TokenTypeLowerName[584:602]: LiteralStringAffix, - _TokenTypeName[602:619]: LiteralStringAtom, - _TokenTypeLowerName[602:619]: LiteralStringAtom, - _TokenTypeName[619:640]: LiteralStringBacktick, - _TokenTypeLowerName[619:640]: LiteralStringBacktick, - _TokenTypeName[640:660]: LiteralStringBoolean, - _TokenTypeLowerName[640:660]: LiteralStringBoolean, - _TokenTypeName[660:677]: LiteralStringChar, - _TokenTypeLowerName[660:677]: LiteralStringChar, - _TokenTypeName[677:699]: LiteralStringDelimiter, - _TokenTypeLowerName[677:699]: LiteralStringDelimiter, - _TokenTypeName[699:715]: LiteralStringDoc, - _TokenTypeLowerName[699:715]: LiteralStringDoc, - _TokenTypeName[715:734]: LiteralStringDouble, - _TokenTypeLowerName[715:734]: LiteralStringDouble, - _TokenTypeName[734:753]: LiteralStringEscape, - _TokenTypeLowerName[734:753]: LiteralStringEscape, - _TokenTypeName[753:773]: LiteralStringHeredoc, - _TokenTypeLowerName[753:773]: LiteralStringHeredoc, - _TokenTypeName[773:794]: LiteralStringInterpol, - _TokenTypeLowerName[773:794]: LiteralStringInterpol, - _TokenTypeName[794:811]: LiteralStringName, - _TokenTypeLowerName[794:811]: LiteralStringName, - _TokenTypeName[811:829]: LiteralStringOther, - _TokenTypeLowerName[811:829]: LiteralStringOther, - _TokenTypeName[829:847]: LiteralStringRegex, - _TokenTypeLowerName[829:847]: LiteralStringRegex, - _TokenTypeName[847:866]: LiteralStringSingle, - _TokenTypeLowerName[847:866]: LiteralStringSingle, - _TokenTypeName[866:885]: LiteralStringSymbol, - _TokenTypeLowerName[866:885]: LiteralStringSymbol, - _TokenTypeName[885:898]: LiteralNumber, - _TokenTypeLowerName[885:898]: LiteralNumber, - _TokenTypeName[898:914]: LiteralNumberBin, - _TokenTypeLowerName[898:914]: LiteralNumberBin, - _TokenTypeName[914:932]: LiteralNumberFloat, - _TokenTypeLowerName[914:932]: LiteralNumberFloat, - _TokenTypeName[932:948]: LiteralNumberHex, - _TokenTypeLowerName[932:948]: LiteralNumberHex, - _TokenTypeName[948:968]: LiteralNumberInteger, - _TokenTypeLowerName[948:968]: LiteralNumberInteger, - _TokenTypeName[968:992]: LiteralNumberIntegerLong, - _TokenTypeLowerName[968:992]: LiteralNumberIntegerLong, - _TokenTypeName[992:1008]: LiteralNumberOct, - _TokenTypeLowerName[992:1008]: LiteralNumberOct, - _TokenTypeName[1008:1025]: LiteralNumberByte, - _TokenTypeLowerName[1008:1025]: LiteralNumberByte, - _TokenTypeName[1025:1033]: Operator, - _TokenTypeLowerName[1025:1033]: Operator, - _TokenTypeName[1033:1045]: OperatorWord, - _TokenTypeLowerName[1033:1045]: OperatorWord, - _TokenTypeName[1045:1056]: Punctuation, - _TokenTypeLowerName[1045:1056]: Punctuation, - _TokenTypeName[1056:1063]: Comment, - _TokenTypeLowerName[1056:1063]: Comment, - _TokenTypeName[1063:1078]: CommentHashbang, - _TokenTypeLowerName[1063:1078]: CommentHashbang, - _TokenTypeName[1078:1094]: CommentMultiline, - _TokenTypeLowerName[1078:1094]: CommentMultiline, - _TokenTypeName[1094:1107]: CommentSingle, - _TokenTypeLowerName[1094:1107]: CommentSingle, - _TokenTypeName[1107:1121]: CommentSpecial, - _TokenTypeLowerName[1107:1121]: CommentSpecial, - _TokenTypeName[1121:1135]: CommentPreproc, - _TokenTypeLowerName[1121:1135]: CommentPreproc, - _TokenTypeName[1135:1153]: CommentPreprocFile, - _TokenTypeLowerName[1135:1153]: CommentPreprocFile, - _TokenTypeName[1153:1160]: Generic, - _TokenTypeLowerName[1153:1160]: Generic, - _TokenTypeName[1160:1174]: GenericDeleted, - _TokenTypeLowerName[1160:1174]: GenericDeleted, - _TokenTypeName[1174:1185]: GenericEmph, - _TokenTypeLowerName[1174:1185]: GenericEmph, - _TokenTypeName[1185:1197]: GenericError, - _TokenTypeLowerName[1185:1197]: GenericError, - _TokenTypeName[1197:1211]: GenericHeading, - _TokenTypeLowerName[1197:1211]: GenericHeading, - _TokenTypeName[1211:1226]: GenericInserted, - _TokenTypeLowerName[1211:1226]: GenericInserted, - _TokenTypeName[1226:1239]: GenericOutput, - _TokenTypeLowerName[1226:1239]: GenericOutput, - _TokenTypeName[1239:1252]: GenericPrompt, - _TokenTypeLowerName[1239:1252]: GenericPrompt, - _TokenTypeName[1252:1265]: GenericStrong, - _TokenTypeLowerName[1252:1265]: GenericStrong, - _TokenTypeName[1265:1282]: GenericSubheading, - _TokenTypeLowerName[1265:1282]: GenericSubheading, - _TokenTypeName[1282:1298]: GenericTraceback, - _TokenTypeLowerName[1282:1298]: GenericTraceback, - _TokenTypeName[1298:1314]: GenericUnderline, - _TokenTypeLowerName[1298:1314]: GenericUnderline, - _TokenTypeName[1314:1318]: Text, - _TokenTypeLowerName[1314:1318]: Text, - _TokenTypeName[1318:1332]: TextWhitespace, - _TokenTypeLowerName[1318:1332]: TextWhitespace, - _TokenTypeName[1332:1342]: TextSymbol, - _TokenTypeLowerName[1332:1342]: TextSymbol, - _TokenTypeName[1342:1357]: TextPunctuation, - _TokenTypeLowerName[1342:1357]: TextPunctuation, -} - -var _TokenTypeNames = []string{ - _TokenTypeName[0:6], - _TokenTypeName[6:10], - _TokenTypeName[10:15], - _TokenTypeName[15:20], - _TokenTypeName[20:28], - _TokenTypeName[28:36], - _TokenTypeName[36:47], - _TokenTypeName[47:56], - _TokenTypeName[56:69], - _TokenTypeName[69:85], - _TokenTypeName[85:96], - _TokenTypeName[96:100], - _TokenTypeName[100:110], - _TokenTypeName[110:120], - _TokenTypeName[120:127], - _TokenTypeName[127:134], - _TokenTypeName[134:149], - _TokenTypeName[149:167], - _TokenTypeName[167:183], - _TokenTypeName[183:196], - _TokenTypeName[196:211], - _TokenTypeName[211:222], - _TokenTypeName[222:226], - _TokenTypeName[226:239], - _TokenTypeName[239:250], - _TokenTypeName[250:267], - _TokenTypeName[267:276], - _TokenTypeName[276:288], - _TokenTypeName[288:301], - _TokenTypeName[301:311], - _TokenTypeName[311:324], - _TokenTypeName[324:336], - _TokenTypeName[336:353], - _TokenTypeName[353:364], - _TokenTypeName[364:373], - _TokenTypeName[373:386], - _TokenTypeName[386:398], - _TokenTypeName[398:407], - _TokenTypeName[407:417], - _TokenTypeName[417:429], - _TokenTypeName[429:436], - _TokenTypeName[436:448], - _TokenTypeName[448:469], - _TokenTypeName[469:486], - _TokenTypeName[486:504], - _TokenTypeName[504:524], - _TokenTypeName[524:541], - _TokenTypeName[541:548], - _TokenTypeName[548:559], - _TokenTypeName[559:571], - _TokenTypeName[571:584], - _TokenTypeName[584:602], - _TokenTypeName[602:619], - _TokenTypeName[619:640], - _TokenTypeName[640:660], - _TokenTypeName[660:677], - _TokenTypeName[677:699], - _TokenTypeName[699:715], - _TokenTypeName[715:734], - _TokenTypeName[734:753], - _TokenTypeName[753:773], - _TokenTypeName[773:794], - _TokenTypeName[794:811], - _TokenTypeName[811:829], - _TokenTypeName[829:847], - _TokenTypeName[847:866], - _TokenTypeName[866:885], - _TokenTypeName[885:898], - _TokenTypeName[898:914], - _TokenTypeName[914:932], - _TokenTypeName[932:948], - _TokenTypeName[948:968], - _TokenTypeName[968:992], - _TokenTypeName[992:1008], - _TokenTypeName[1008:1025], - _TokenTypeName[1025:1033], - _TokenTypeName[1033:1045], - _TokenTypeName[1045:1056], - _TokenTypeName[1056:1063], - _TokenTypeName[1063:1078], - _TokenTypeName[1078:1094], - _TokenTypeName[1094:1107], - _TokenTypeName[1107:1121], - _TokenTypeName[1121:1135], - _TokenTypeName[1135:1153], - _TokenTypeName[1153:1160], - _TokenTypeName[1160:1174], - _TokenTypeName[1174:1185], - _TokenTypeName[1185:1197], - _TokenTypeName[1197:1211], - _TokenTypeName[1211:1226], - _TokenTypeName[1226:1239], - _TokenTypeName[1239:1252], - _TokenTypeName[1252:1265], - _TokenTypeName[1265:1282], - _TokenTypeName[1282:1298], - _TokenTypeName[1298:1314], - _TokenTypeName[1314:1318], - _TokenTypeName[1318:1332], - _TokenTypeName[1332:1342], - _TokenTypeName[1342:1357], -} - -// TokenTypeString retrieves an enum value from the enum constants string name. -// Throws an error if the param is not part of the enum. -func TokenTypeString(s string) (TokenType, error) { - if val, ok := _TokenTypeNameToValueMap[s]; ok { - return val, nil - } - - if val, ok := _TokenTypeNameToValueMap[strings.ToLower(s)]; ok { - return val, nil - } - return 0, fmt.Errorf("%s does not belong to TokenType values", s) -} - -// TokenTypeValues returns all values of the enum -func TokenTypeValues() []TokenType { - return _TokenTypeValues -} - -// TokenTypeStrings returns a slice of all String values of the enum -func TokenTypeStrings() []string { - strs := make([]string, len(_TokenTypeNames)) - copy(strs, _TokenTypeNames) - return strs -} - -// IsATokenType returns "true" if the value is listed in the enum definition. "false" otherwise -func (i TokenType) IsATokenType() bool { - _, ok := _TokenTypeMap[i] - return ok -} - -// MarshalText implements the encoding.TextMarshaler interface for TokenType -func (i TokenType) MarshalText() ([]byte, error) { - return []byte(i.String()), nil -} - -// UnmarshalText implements the encoding.TextUnmarshaler interface for TokenType -func (i *TokenType) UnmarshalText(text []byte) error { - var err error - *i, err = TokenTypeString(string(text)) - return err -} diff --git a/vendor/github.com/alecthomas/chroma/v2/types.go b/vendor/github.com/alecthomas/chroma/v2/types.go deleted file mode 100644 index a576293755f1692852f2188c0e1f346fa99bebc6..0000000000000000000000000000000000000000 --- a/vendor/github.com/alecthomas/chroma/v2/types.go +++ /dev/null @@ -1,343 +0,0 @@ -package chroma - -//go:generate enumer -text -type TokenType - -// TokenType is the type of token to highlight. -// -// It is also an Emitter, emitting a single token of itself -type TokenType int - -// Set of TokenTypes. -// -// Categories of types are grouped in ranges of 1000, while sub-categories are in ranges of 100. For -// example, the literal category is in the range 3000-3999. The sub-category for literal strings is -// in the range 3100-3199. - -// Meta token types. -const ( - // Default background style. - Background TokenType = -1 - iota - // PreWrapper style. - PreWrapper - // Line style. - Line - // Line numbers in output. - LineNumbers - // Line numbers in output when in table. - LineNumbersTable - // Line higlight style. - LineHighlight - // Line numbers table wrapper style. - LineTable - // Line numbers table TD wrapper style. - LineTableTD - // Line number links. - LineLink - // Code line wrapper style. - CodeLine - // Input that could not be tokenised. - Error - // Other is used by the Delegate lexer to indicate which tokens should be handled by the delegate. - Other - // No highlighting. - None - // Don't emit this token to the output. - Ignore - // Used as an EOF marker / nil token - EOFType TokenType = 0 -) - -// Keywords. -const ( - Keyword TokenType = 1000 + iota - KeywordConstant - KeywordDeclaration - KeywordNamespace - KeywordPseudo - KeywordReserved - KeywordType -) - -// Names. -const ( - Name TokenType = 2000 + iota - NameAttribute - NameBuiltin - NameBuiltinPseudo - NameClass - NameConstant - NameDecorator - NameEntity - NameException - NameFunction - NameFunctionMagic - NameKeyword - NameLabel - NameNamespace - NameOperator - NameOther - NamePseudo - NameProperty - NameTag - NameVariable - NameVariableAnonymous - NameVariableClass - NameVariableGlobal - NameVariableInstance - NameVariableMagic -) - -// Literals. -const ( - Literal TokenType = 3000 + iota - LiteralDate - LiteralOther -) - -// Strings. -const ( - LiteralString TokenType = 3100 + iota - LiteralStringAffix - LiteralStringAtom - LiteralStringBacktick - LiteralStringBoolean - LiteralStringChar - LiteralStringDelimiter - LiteralStringDoc - LiteralStringDouble - LiteralStringEscape - LiteralStringHeredoc - LiteralStringInterpol - LiteralStringName - LiteralStringOther - LiteralStringRegex - LiteralStringSingle - LiteralStringSymbol -) - -// Literals. -const ( - LiteralNumber TokenType = 3200 + iota - LiteralNumberBin - LiteralNumberFloat - LiteralNumberHex - LiteralNumberInteger - LiteralNumberIntegerLong - LiteralNumberOct - LiteralNumberByte -) - -// Operators. -const ( - Operator TokenType = 4000 + iota - OperatorWord -) - -// Punctuation. -const ( - Punctuation TokenType = 5000 + iota -) - -// Comments. -const ( - Comment TokenType = 6000 + iota - CommentHashbang - CommentMultiline - CommentSingle - CommentSpecial -) - -// Preprocessor "comments". -const ( - CommentPreproc TokenType = 6100 + iota - CommentPreprocFile -) - -// Generic tokens. -const ( - Generic TokenType = 7000 + iota - GenericDeleted - GenericEmph - GenericError - GenericHeading - GenericInserted - GenericOutput - GenericPrompt - GenericStrong - GenericSubheading - GenericTraceback - GenericUnderline -) - -// Text. -const ( - Text TokenType = 8000 + iota - TextWhitespace - TextSymbol - TextPunctuation -) - -// Aliases. -const ( - Whitespace = TextWhitespace - - Date = LiteralDate - - String = LiteralString - StringAffix = LiteralStringAffix - StringBacktick = LiteralStringBacktick - StringChar = LiteralStringChar - StringDelimiter = LiteralStringDelimiter - StringDoc = LiteralStringDoc - StringDouble = LiteralStringDouble - StringEscape = LiteralStringEscape - StringHeredoc = LiteralStringHeredoc - StringInterpol = LiteralStringInterpol - StringOther = LiteralStringOther - StringRegex = LiteralStringRegex - StringSingle = LiteralStringSingle - StringSymbol = LiteralStringSymbol - - Number = LiteralNumber - NumberBin = LiteralNumberBin - NumberFloat = LiteralNumberFloat - NumberHex = LiteralNumberHex - NumberInteger = LiteralNumberInteger - NumberIntegerLong = LiteralNumberIntegerLong - NumberOct = LiteralNumberOct -) - -var ( - StandardTypes = map[TokenType]string{ - Background: "bg", - PreWrapper: "chroma", - Line: "line", - LineNumbers: "ln", - LineNumbersTable: "lnt", - LineHighlight: "hl", - LineTable: "lntable", - LineTableTD: "lntd", - LineLink: "lnlinks", - CodeLine: "cl", - Text: "", - Whitespace: "w", - Error: "err", - Other: "x", - // I have no idea what this is used for... - // Escape: "esc", - - Keyword: "k", - KeywordConstant: "kc", - KeywordDeclaration: "kd", - KeywordNamespace: "kn", - KeywordPseudo: "kp", - KeywordReserved: "kr", - KeywordType: "kt", - - Name: "n", - NameAttribute: "na", - NameBuiltin: "nb", - NameBuiltinPseudo: "bp", - NameClass: "nc", - NameConstant: "no", - NameDecorator: "nd", - NameEntity: "ni", - NameException: "ne", - NameFunction: "nf", - NameFunctionMagic: "fm", - NameProperty: "py", - NameLabel: "nl", - NameNamespace: "nn", - NameOther: "nx", - NameTag: "nt", - NameVariable: "nv", - NameVariableClass: "vc", - NameVariableGlobal: "vg", - NameVariableInstance: "vi", - NameVariableMagic: "vm", - - Literal: "l", - LiteralDate: "ld", - - String: "s", - StringAffix: "sa", - StringBacktick: "sb", - StringChar: "sc", - StringDelimiter: "dl", - StringDoc: "sd", - StringDouble: "s2", - StringEscape: "se", - StringHeredoc: "sh", - StringInterpol: "si", - StringOther: "sx", - StringRegex: "sr", - StringSingle: "s1", - StringSymbol: "ss", - - Number: "m", - NumberBin: "mb", - NumberFloat: "mf", - NumberHex: "mh", - NumberInteger: "mi", - NumberIntegerLong: "il", - NumberOct: "mo", - - Operator: "o", - OperatorWord: "ow", - - Punctuation: "p", - - Comment: "c", - CommentHashbang: "ch", - CommentMultiline: "cm", - CommentPreproc: "cp", - CommentPreprocFile: "cpf", - CommentSingle: "c1", - CommentSpecial: "cs", - - Generic: "g", - GenericDeleted: "gd", - GenericEmph: "ge", - GenericError: "gr", - GenericHeading: "gh", - GenericInserted: "gi", - GenericOutput: "go", - GenericPrompt: "gp", - GenericStrong: "gs", - GenericSubheading: "gu", - GenericTraceback: "gt", - GenericUnderline: "gl", - } -) - -func (t TokenType) Parent() TokenType { - if t%100 != 0 { - return t / 100 * 100 - } - if t%1000 != 0 { - return t / 1000 * 1000 - } - return 0 -} - -func (t TokenType) Category() TokenType { - return t / 1000 * 1000 -} - -func (t TokenType) SubCategory() TokenType { - return t / 100 * 100 -} - -func (t TokenType) InCategory(other TokenType) bool { - return t/1000 == other/1000 -} - -func (t TokenType) InSubCategory(other TokenType) bool { - return t/100 == other/100 -} - -func (t TokenType) Emit(groups []string, _ *LexerState) Iterator { - return Literator(Token{Type: t, Value: groups[0]}) -} - -func (t TokenType) EmitterKind() string { return "token" } diff --git a/vendor/github.com/andybalholm/cascadia/.travis.yml b/vendor/github.com/andybalholm/cascadia/.travis.yml deleted file mode 100644 index 6f227517d646b25805b395abee4bd45580871241..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -language: go - -go: - - 1.3 - - 1.4 - -install: - - go get github.com/andybalholm/cascadia - -script: - - go test -v - -notifications: - email: false diff --git a/vendor/github.com/andybalholm/cascadia/LICENSE b/vendor/github.com/andybalholm/cascadia/LICENSE deleted file mode 100644 index ee5ad35acc7ae7070c37089197b6eb3a7d2dbf06..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/LICENSE +++ /dev/null @@ -1,24 +0,0 @@ -Copyright (c) 2011 Andy Balholm. All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/vendor/github.com/andybalholm/cascadia/README.md b/vendor/github.com/andybalholm/cascadia/README.md deleted file mode 100644 index 6433cb9ce1495a7631487806844f8b94653b3290..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/README.md +++ /dev/null @@ -1,144 +0,0 @@ -# cascadia - -[](https://travis-ci.org/andybalholm/cascadia) - -The Cascadia package implements CSS selectors for use with the parse trees produced by the html package. - -To test CSS selectors without writing Go code, check out [cascadia](https://github.com/suntong/cascadia) the command line tool, a thin wrapper around this package. - -[Refer to godoc here](https://godoc.org/github.com/andybalholm/cascadia). - -## Example - -The following is an example of how you can use Cascadia. - -```go -package main - -import ( - "fmt" - "log" - "strings" - - "github.com/andybalholm/cascadia" - "golang.org/x/net/html" -) - -var pricingHtml string = ` - -- ---Free
---$0/mo
--
-
- 10 users included -
- 2 GB of storage -
- See more -
-- ---Pro
---$15/mo
--
-
- 20 users included -
- 10 GB of storage -
- See more -
--` - -func Query(n *html.Node, query string) *html.Node { - sel, err := cascadia.Parse(query) - if err != nil { - return &html.Node{} - } - return cascadia.Query(n, sel) -} - -func QueryAll(n *html.Node, query string) []*html.Node { - sel, err := cascadia.Parse(query) - if err != nil { - return []*html.Node{} - } - return cascadia.QueryAll(n, sel) -} - -func AttrOr(n *html.Node, attrName, or string) string { - for _, a := range n.Attr { - if a.Key == attrName { - return a.Val - } - } - return or -} - -func main() { - doc, err := html.Parse(strings.NewReader(pricingHtml)) - if err != nil { - log.Fatal(err) - } - fmt.Printf("List of pricing plans:\n\n") - for i, p := range QueryAll(doc, "div.card.mb-4.box-shadow") { - planName := Query(p, "h4").FirstChild.Data - price := Query(p, ".pricing-card-title").FirstChild.Data - usersIncluded := Query(p, "li:first-child").FirstChild.Data - storage := Query(p, "li:nth-child(2)").FirstChild.Data - detailsUrl := AttrOr(Query(p, "li:last-child a"), "href", "(No link available)") - fmt.Printf( - "Plan #%d\nName: %s\nPrice: %s\nUsers: %s\nStorage: %s\nDetails: %s\n\n", - i+1, - planName, - price, - usersIncluded, - storage, - detailsUrl, - ) - } -} -``` -The output is: -``` -List of pricing plans: - -Plan #1 -Name: Free -Price: $0/mo -Users: 10 users included -Storage: 2 GB of storage -Details: https://example.com - -Plan #2 -Name: Pro -Price: $15/mo -Users: 20 users included -Storage: 10 GB of storage -Details: https://example.com - -Plan #3 -Name: Enterprise -Price: $29/mo -Users: 30 users included -Storage: 15 GB of storage -Details: (No link available) -``` diff --git a/vendor/github.com/andybalholm/cascadia/parser.go b/vendor/github.com/andybalholm/cascadia/parser.go deleted file mode 100644 index 06eccd581a871ad4622e4e3d161c803db1b8af54..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/parser.go +++ /dev/null @@ -1,889 +0,0 @@ -// Package cascadia is an implementation of CSS selectors. -package cascadia - -import ( - "errors" - "fmt" - "regexp" - "strconv" - "strings" -) - -// a parser for CSS selectors -type parser struct { - s string // the source text - i int // the current position - - // if `false`, parsing a pseudo-element - // returns an error. - acceptPseudoElements bool -} - -// parseEscape parses a backslash escape. -func (p *parser) parseEscape() (result string, err error) { - if len(p.s) < p.i+2 || p.s[p.i] != '\\' { - return "", errors.New("invalid escape sequence") - } - - start := p.i + 1 - c := p.s[start] - switch { - case c == '\r' || c == '\n' || c == '\f': - return "", errors.New("escaped line ending outside string") - case hexDigit(c): - // unicode escape (hex) - var i int - for i = start; i < start+6 && i < len(p.s) && hexDigit(p.s[i]); i++ { - // empty - } - v, _ := strconv.ParseUint(p.s[start:i], 16, 64) - if len(p.s) > i { - switch p.s[i] { - case '\r': - i++ - if len(p.s) > i && p.s[i] == '\n' { - i++ - } - case ' ', '\t', '\n', '\f': - i++ - } - } - p.i = i - return string(rune(v)), nil - } - - // Return the literal character after the backslash. - result = p.s[start : start+1] - p.i += 2 - return result, nil -} - -// toLowerASCII returns s with all ASCII capital letters lowercased. -func toLowerASCII(s string) string { - var b []byte - for i := 0; i < len(s); i++ { - if c := s[i]; 'A' <= c && c <= 'Z' { - if b == nil { - b = make([]byte, len(s)) - copy(b, s) - } - b[i] = s[i] + ('a' - 'A') - } - } - - if b == nil { - return s - } - - return string(b) -} - -func hexDigit(c byte) bool { - return '0' <= c && c <= '9' || 'a' <= c && c <= 'f' || 'A' <= c && c <= 'F' -} - -// nameStart returns whether c can be the first character of an identifier -// (not counting an initial hyphen, or an escape sequence). -func nameStart(c byte) bool { - return 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '_' || c > 127 -} - -// nameChar returns whether c can be a character within an identifier -// (not counting an escape sequence). -func nameChar(c byte) bool { - return 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || c == '_' || c > 127 || - c == '-' || '0' <= c && c <= '9' -} - -// parseIdentifier parses an identifier. -func (p *parser) parseIdentifier() (result string, err error) { - const prefix = '-' - var numPrefix int - - for len(p.s) > p.i && p.s[p.i] == prefix { - p.i++ - numPrefix++ - } - - if len(p.s) <= p.i { - return "", errors.New("expected identifier, found EOF instead") - } - - if c := p.s[p.i]; !(nameStart(c) || c == '\\') { - return "", fmt.Errorf("expected identifier, found %c instead", c) - } - - result, err = p.parseName() - if numPrefix > 0 && err == nil { - result = strings.Repeat(string(prefix), numPrefix) + result - } - return -} - -// parseName parses a name (which is like an identifier, but doesn't have -// extra restrictions on the first character). -func (p *parser) parseName() (result string, err error) { - i := p.i -loop: - for i < len(p.s) { - c := p.s[i] - switch { - case nameChar(c): - start := i - for i < len(p.s) && nameChar(p.s[i]) { - i++ - } - result += p.s[start:i] - case c == '\\': - p.i = i - val, err := p.parseEscape() - if err != nil { - return "", err - } - i = p.i - result += val - default: - break loop - } - } - - if result == "" { - return "", errors.New("expected name, found EOF instead") - } - - p.i = i - return result, nil -} - -// parseString parses a single- or double-quoted string. -func (p *parser) parseString() (result string, err error) { - i := p.i - if len(p.s) < i+2 { - return "", errors.New("expected string, found EOF instead") - } - - quote := p.s[i] - i++ - -loop: - for i < len(p.s) { - switch p.s[i] { - case '\\': - if len(p.s) > i+1 { - switch c := p.s[i+1]; c { - case '\r': - if len(p.s) > i+2 && p.s[i+2] == '\n' { - i += 3 - continue loop - } - fallthrough - case '\n', '\f': - i += 2 - continue loop - } - } - p.i = i - val, err := p.parseEscape() - if err != nil { - return "", err - } - i = p.i - result += val - case quote: - break loop - case '\r', '\n', '\f': - return "", errors.New("unexpected end of line in string") - default: - start := i - for i < len(p.s) { - if c := p.s[i]; c == quote || c == '\\' || c == '\r' || c == '\n' || c == '\f' { - break - } - i++ - } - result += p.s[start:i] - } - } - - if i >= len(p.s) { - return "", errors.New("EOF in string") - } - - // Consume the final quote. - i++ - - p.i = i - return result, nil -} - -// parseRegex parses a regular expression; the end is defined by encountering an -// unmatched closing ')' or ']' which is not consumed -func (p *parser) parseRegex() (rx *regexp.Regexp, err error) { - i := p.i - if len(p.s) < i+2 { - return nil, errors.New("expected regular expression, found EOF instead") - } - - // number of open parens or brackets; - // when it becomes negative, finished parsing regex - open := 0 - -loop: - for i < len(p.s) { - switch p.s[i] { - case '(', '[': - open++ - case ')', ']': - open-- - if open < 0 { - break loop - } - } - i++ - } - - if i >= len(p.s) { - return nil, errors.New("EOF in regular expression") - } - rx, err = regexp.Compile(p.s[p.i:i]) - p.i = i - return rx, err -} - -// skipWhitespace consumes whitespace characters and comments. -// It returns true if there was actually anything to skip. -func (p *parser) skipWhitespace() bool { - i := p.i - for i < len(p.s) { - switch p.s[i] { - case ' ', '\t', '\r', '\n', '\f': - i++ - continue - case '/': - if strings.HasPrefix(p.s[i:], "/*") { - end := strings.Index(p.s[i+len("/*"):], "*/") - if end != -1 { - i += end + len("/**/") - continue - } - } - } - break - } - - if i > p.i { - p.i = i - return true - } - - return false -} - -// consumeParenthesis consumes an opening parenthesis and any following -// whitespace. It returns true if there was actually a parenthesis to skip. -func (p *parser) consumeParenthesis() bool { - if p.i < len(p.s) && p.s[p.i] == '(' { - p.i++ - p.skipWhitespace() - return true - } - return false -} - -// consumeClosingParenthesis consumes a closing parenthesis and any preceding -// whitespace. It returns true if there was actually a parenthesis to skip. -func (p *parser) consumeClosingParenthesis() bool { - i := p.i - p.skipWhitespace() - if p.i < len(p.s) && p.s[p.i] == ')' { - p.i++ - return true - } - p.i = i - return false -} - -// parseTypeSelector parses a type selector (one that matches by tag name). -func (p *parser) parseTypeSelector() (result tagSelector, err error) { - tag, err := p.parseIdentifier() - if err != nil { - return - } - return tagSelector{tag: toLowerASCII(tag)}, nil -} - -// parseIDSelector parses a selector that matches by id attribute. -func (p *parser) parseIDSelector() (idSelector, error) { - if p.i >= len(p.s) { - return idSelector{}, fmt.Errorf("expected id selector (#id), found EOF instead") - } - if p.s[p.i] != '#' { - return idSelector{}, fmt.Errorf("expected id selector (#id), found '%c' instead", p.s[p.i]) - } - - p.i++ - id, err := p.parseName() - if err != nil { - return idSelector{}, err - } - - return idSelector{id: id}, nil -} - -// parseClassSelector parses a selector that matches by class attribute. -func (p *parser) parseClassSelector() (classSelector, error) { - if p.i >= len(p.s) { - return classSelector{}, fmt.Errorf("expected class selector (.class), found EOF instead") - } - if p.s[p.i] != '.' { - return classSelector{}, fmt.Errorf("expected class selector (.class), found '%c' instead", p.s[p.i]) - } - - p.i++ - class, err := p.parseIdentifier() - if err != nil { - return classSelector{}, err - } - - return classSelector{class: class}, nil -} - -// parseAttributeSelector parses a selector that matches by attribute value. -func (p *parser) parseAttributeSelector() (attrSelector, error) { - if p.i >= len(p.s) { - return attrSelector{}, fmt.Errorf("expected attribute selector ([attribute]), found EOF instead") - } - if p.s[p.i] != '[' { - return attrSelector{}, fmt.Errorf("expected attribute selector ([attribute]), found '%c' instead", p.s[p.i]) - } - - p.i++ - p.skipWhitespace() - key, err := p.parseIdentifier() - if err != nil { - return attrSelector{}, err - } - key = toLowerASCII(key) - - p.skipWhitespace() - if p.i >= len(p.s) { - return attrSelector{}, errors.New("unexpected EOF in attribute selector") - } - - if p.s[p.i] == ']' { - p.i++ - return attrSelector{key: key, operation: ""}, nil - } - - if p.i+2 >= len(p.s) { - return attrSelector{}, errors.New("unexpected EOF in attribute selector") - } - - op := p.s[p.i : p.i+2] - if op[0] == '=' { - op = "=" - } else if op[1] != '=' { - return attrSelector{}, fmt.Errorf(`expected equality operator, found "%s" instead`, op) - } - p.i += len(op) - - p.skipWhitespace() - if p.i >= len(p.s) { - return attrSelector{}, errors.New("unexpected EOF in attribute selector") - } - var val string - var rx *regexp.Regexp - if op == "#=" { - rx, err = p.parseRegex() - } else { - switch p.s[p.i] { - case '\'', '"': - val, err = p.parseString() - default: - val, err = p.parseIdentifier() - } - } - if err != nil { - return attrSelector{}, err - } - - p.skipWhitespace() - if p.i >= len(p.s) { - return attrSelector{}, errors.New("unexpected EOF in attribute selector") - } - - // check if the attribute contains an ignore case flag - ignoreCase := false - if p.s[p.i] == 'i' || p.s[p.i] == 'I' { - ignoreCase = true - p.i++ - } - - p.skipWhitespace() - if p.i >= len(p.s) { - return attrSelector{}, errors.New("unexpected EOF in attribute selector") - } - - if p.s[p.i] != ']' { - return attrSelector{}, fmt.Errorf("expected ']', found '%c' instead", p.s[p.i]) - } - p.i++ - - switch op { - case "=", "!=", "~=", "|=", "^=", "$=", "*=", "#=": - return attrSelector{key: key, val: val, operation: op, regexp: rx, insensitive: ignoreCase}, nil - default: - return attrSelector{}, fmt.Errorf("attribute operator %q is not supported", op) - } -} - -var ( - errExpectedParenthesis = errors.New("expected '(' but didn't find it") - errExpectedClosingParenthesis = errors.New("expected ')' but didn't find it") - errUnmatchedParenthesis = errors.New("unmatched '('") -) - -// parsePseudoclassSelector parses a pseudoclass selector like :not(p) or a pseudo-element -// For backwards compatibility, both ':' and '::' prefix are allowed for pseudo-elements. -// https://drafts.csswg.org/selectors-3/#pseudo-elements -// Returning a nil `Sel` (and a nil `error`) means we found a pseudo-element. -func (p *parser) parsePseudoclassSelector() (out Sel, pseudoElement string, err error) { - if p.i >= len(p.s) { - return nil, "", fmt.Errorf("expected pseudoclass selector (:pseudoclass), found EOF instead") - } - if p.s[p.i] != ':' { - return nil, "", fmt.Errorf("expected attribute selector (:pseudoclass), found '%c' instead", p.s[p.i]) - } - - p.i++ - var mustBePseudoElement bool - if p.i >= len(p.s) { - return nil, "", fmt.Errorf("got empty pseudoclass (or pseudoelement)") - } - if p.s[p.i] == ':' { // we found a pseudo-element - mustBePseudoElement = true - p.i++ - } - - name, err := p.parseIdentifier() - if err != nil { - return - } - name = toLowerASCII(name) - if mustBePseudoElement && (name != "after" && name != "backdrop" && name != "before" && - name != "cue" && name != "first-letter" && name != "first-line" && name != "grammar-error" && - name != "marker" && name != "placeholder" && name != "selection" && name != "spelling-error") { - return out, "", fmt.Errorf("unknown pseudoelement :%s", name) - } - - switch name { - case "not", "has", "haschild": - if !p.consumeParenthesis() { - return out, "", errExpectedParenthesis - } - sel, parseErr := p.parseSelectorGroup() - if parseErr != nil { - return out, "", parseErr - } - if !p.consumeClosingParenthesis() { - return out, "", errExpectedClosingParenthesis - } - - out = relativePseudoClassSelector{name: name, match: sel} - - case "contains", "containsown": - if !p.consumeParenthesis() { - return out, "", errExpectedParenthesis - } - if p.i == len(p.s) { - return out, "", errUnmatchedParenthesis - } - var val string - switch p.s[p.i] { - case '\'', '"': - val, err = p.parseString() - default: - val, err = p.parseIdentifier() - } - if err != nil { - return out, "", err - } - val = strings.ToLower(val) - p.skipWhitespace() - if p.i >= len(p.s) { - return out, "", errors.New("unexpected EOF in pseudo selector") - } - if !p.consumeClosingParenthesis() { - return out, "", errExpectedClosingParenthesis - } - - out = containsPseudoClassSelector{own: name == "containsown", value: val} - - case "matches", "matchesown": - if !p.consumeParenthesis() { - return out, "", errExpectedParenthesis - } - rx, err := p.parseRegex() - if err != nil { - return out, "", err - } - if p.i >= len(p.s) { - return out, "", errors.New("unexpected EOF in pseudo selector") - } - if !p.consumeClosingParenthesis() { - return out, "", errExpectedClosingParenthesis - } - - out = regexpPseudoClassSelector{own: name == "matchesown", regexp: rx} - - case "nth-child", "nth-last-child", "nth-of-type", "nth-last-of-type": - if !p.consumeParenthesis() { - return out, "", errExpectedParenthesis - } - a, b, err := p.parseNth() - if err != nil { - return out, "", err - } - if !p.consumeClosingParenthesis() { - return out, "", errExpectedClosingParenthesis - } - last := name == "nth-last-child" || name == "nth-last-of-type" - ofType := name == "nth-of-type" || name == "nth-last-of-type" - out = nthPseudoClassSelector{a: a, b: b, last: last, ofType: ofType} - - case "first-child": - out = nthPseudoClassSelector{a: 0, b: 1, ofType: false, last: false} - case "last-child": - out = nthPseudoClassSelector{a: 0, b: 1, ofType: false, last: true} - case "first-of-type": - out = nthPseudoClassSelector{a: 0, b: 1, ofType: true, last: false} - case "last-of-type": - out = nthPseudoClassSelector{a: 0, b: 1, ofType: true, last: true} - case "only-child": - out = onlyChildPseudoClassSelector{ofType: false} - case "only-of-type": - out = onlyChildPseudoClassSelector{ofType: true} - case "input": - out = inputPseudoClassSelector{} - case "empty": - out = emptyElementPseudoClassSelector{} - case "root": - out = rootPseudoClassSelector{} - case "link": - out = linkPseudoClassSelector{} - case "lang": - if !p.consumeParenthesis() { - return out, "", errExpectedParenthesis - } - if p.i == len(p.s) { - return out, "", errUnmatchedParenthesis - } - val, err := p.parseIdentifier() - if err != nil { - return out, "", err - } - val = strings.ToLower(val) - p.skipWhitespace() - if p.i >= len(p.s) { - return out, "", errors.New("unexpected EOF in pseudo selector") - } - if !p.consumeClosingParenthesis() { - return out, "", errExpectedClosingParenthesis - } - out = langPseudoClassSelector{lang: val} - case "enabled": - out = enabledPseudoClassSelector{} - case "disabled": - out = disabledPseudoClassSelector{} - case "checked": - out = checkedPseudoClassSelector{} - case "visited", "hover", "active", "focus", "target": - // Not applicable in a static context: never match. - out = neverMatchSelector{value: ":" + name} - case "after", "backdrop", "before", "cue", "first-letter", "first-line", "grammar-error", "marker", "placeholder", "selection", "spelling-error": - return nil, name, nil - default: - return out, "", fmt.Errorf("unknown pseudoclass or pseudoelement :%s", name) - } - return -} - -// parseInteger parses a decimal integer. -func (p *parser) parseInteger() (int, error) { - i := p.i - start := i - for i < len(p.s) && '0' <= p.s[i] && p.s[i] <= '9' { - i++ - } - if i == start { - return 0, errors.New("expected integer, but didn't find it") - } - p.i = i - - val, err := strconv.Atoi(p.s[start:i]) - if err != nil { - return 0, err - } - - return val, nil -} - -// parseNth parses the argument for :nth-child (normally of the form an+b). -func (p *parser) parseNth() (a, b int, err error) { - // initial state - if p.i >= len(p.s) { - goto eof - } - switch p.s[p.i] { - case '-': - p.i++ - goto negativeA - case '+': - p.i++ - goto positiveA - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - goto positiveA - case 'n', 'N': - a = 1 - p.i++ - goto readN - case 'o', 'O', 'e', 'E': - id, nameErr := p.parseName() - if nameErr != nil { - return 0, 0, nameErr - } - id = toLowerASCII(id) - if id == "odd" { - return 2, 1, nil - } - if id == "even" { - return 2, 0, nil - } - return 0, 0, fmt.Errorf("expected 'odd' or 'even', but found '%s' instead", id) - default: - goto invalid - } - -positiveA: - if p.i >= len(p.s) { - goto eof - } - switch p.s[p.i] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - a, err = p.parseInteger() - if err != nil { - return 0, 0, err - } - goto readA - case 'n', 'N': - a = 1 - p.i++ - goto readN - default: - goto invalid - } - -negativeA: - if p.i >= len(p.s) { - goto eof - } - switch p.s[p.i] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9': - a, err = p.parseInteger() - if err != nil { - return 0, 0, err - } - a = -a - goto readA - case 'n', 'N': - a = -1 - p.i++ - goto readN - default: - goto invalid - } - -readA: - if p.i >= len(p.s) { - goto eof - } - switch p.s[p.i] { - case 'n', 'N': - p.i++ - goto readN - default: - // The number we read as a is actually b. - return 0, a, nil - } - -readN: - p.skipWhitespace() - if p.i >= len(p.s) { - goto eof - } - switch p.s[p.i] { - case '+': - p.i++ - p.skipWhitespace() - b, err = p.parseInteger() - if err != nil { - return 0, 0, err - } - return a, b, nil - case '-': - p.i++ - p.skipWhitespace() - b, err = p.parseInteger() - if err != nil { - return 0, 0, err - } - return a, -b, nil - default: - return a, 0, nil - } - -eof: - return 0, 0, errors.New("unexpected EOF while attempting to parse expression of form an+b") - -invalid: - return 0, 0, errors.New("unexpected character while attempting to parse expression of form an+b") -} - -// parseSimpleSelectorSequence parses a selector sequence that applies to -// a single element. -func (p *parser) parseSimpleSelectorSequence() (Sel, error) { - var selectors []Sel - - if p.i >= len(p.s) { - return nil, errors.New("expected selector, found EOF instead") - } - - switch p.s[p.i] { - case '*': - // It's the universal selector. Just skip over it, since it doesn't affect the meaning. - p.i++ - if p.i+2 < len(p.s) && p.s[p.i:p.i+2] == "|*" { // other version of universal selector - p.i += 2 - } - case '#', '.', '[', ':': - // There's no type selector. Wait to process the other till the main loop. - default: - r, err := p.parseTypeSelector() - if err != nil { - return nil, err - } - selectors = append(selectors, r) - } - - var pseudoElement string -loop: - for p.i < len(p.s) { - var ( - ns Sel - newPseudoElement string - err error - ) - switch p.s[p.i] { - case '#': - ns, err = p.parseIDSelector() - case '.': - ns, err = p.parseClassSelector() - case '[': - ns, err = p.parseAttributeSelector() - case ':': - ns, newPseudoElement, err = p.parsePseudoclassSelector() - default: - break loop - } - if err != nil { - return nil, err - } - // From https://drafts.csswg.org/selectors-3/#pseudo-elements : - // "Only one pseudo-element may appear per selector, and if present - // it must appear after the sequence of simple selectors that - // represents the subjects of the selector."" - if ns == nil { // we found a pseudo-element - if pseudoElement != "" { - return nil, fmt.Errorf("only one pseudo-element is accepted per selector, got %s and %s", pseudoElement, newPseudoElement) - } - if !p.acceptPseudoElements { - return nil, fmt.Errorf("pseudo-element %s found, but pseudo-elements support is disabled", newPseudoElement) - } - pseudoElement = newPseudoElement - } else { - if pseudoElement != "" { - return nil, fmt.Errorf("pseudo-element %s must be at the end of selector", pseudoElement) - } - selectors = append(selectors, ns) - } - - } - if len(selectors) == 1 && pseudoElement == "" { // no need wrap the selectors in compoundSelector - return selectors[0], nil - } - return compoundSelector{selectors: selectors, pseudoElement: pseudoElement}, nil -} - -// parseSelector parses a selector that may include combinators. -func (p *parser) parseSelector() (Sel, error) { - p.skipWhitespace() - result, err := p.parseSimpleSelectorSequence() - if err != nil { - return nil, err - } - - for { - var ( - combinator byte - c Sel - ) - if p.skipWhitespace() { - combinator = ' ' - } - if p.i >= len(p.s) { - return result, nil - } - - switch p.s[p.i] { - case '+', '>', '~': - combinator = p.s[p.i] - p.i++ - p.skipWhitespace() - case ',', ')': - // These characters can't begin a selector, but they can legally occur after one. - return result, nil - } - - if combinator == 0 { - return result, nil - } - - c, err = p.parseSimpleSelectorSequence() - if err != nil { - return nil, err - } - result = combinedSelector{first: result, combinator: combinator, second: c} - } -} - -// parseSelectorGroup parses a group of selectors, separated by commas. -func (p *parser) parseSelectorGroup() (SelectorGroup, error) { - current, err := p.parseSelector() - if err != nil { - return nil, err - } - result := SelectorGroup{current} - - for p.i < len(p.s) { - if p.s[p.i] != ',' { - break - } - p.i++ - c, err := p.parseSelector() - if err != nil { - return nil, err - } - result = append(result, c) - } - return result, nil -} diff --git a/vendor/github.com/andybalholm/cascadia/pseudo_classes.go b/vendor/github.com/andybalholm/cascadia/pseudo_classes.go deleted file mode 100644 index 6234c3eb91c4e41467e75c072f3f793af459fcb2..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/pseudo_classes.go +++ /dev/null @@ -1,458 +0,0 @@ -package cascadia - -import ( - "bytes" - "fmt" - "regexp" - "strings" - - "golang.org/x/net/html" - "golang.org/x/net/html/atom" -) - -// This file implements the pseudo classes selectors, -// which share the implementation of PseudoElement() and Specificity() - -type abstractPseudoClass struct{} - -func (s abstractPseudoClass) Specificity() Specificity { - return Specificity{0, 1, 0} -} - -func (c abstractPseudoClass) PseudoElement() string { - return "" -} - -type relativePseudoClassSelector struct { - name string // one of "not", "has", "haschild" - match SelectorGroup -} - -func (s relativePseudoClassSelector) Match(n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - switch s.name { - case "not": - // matches elements that do not match a. - return !s.match.Match(n) - case "has": - // matches elements with any descendant that matches a. - return hasDescendantMatch(n, s.match) - case "haschild": - // matches elements with a child that matches a. - return hasChildMatch(n, s.match) - default: - panic(fmt.Sprintf("unsupported relative pseudo class selector : %s", s.name)) - } -} - -// hasChildMatch returns whether n has any child that matches a. -func hasChildMatch(n *html.Node, a Matcher) bool { - for c := n.FirstChild; c != nil; c = c.NextSibling { - if a.Match(c) { - return true - } - } - return false -} - -// hasDescendantMatch performs a depth-first search of n's descendants, -// testing whether any of them match a. It returns true as soon as a match is -// found, or false if no match is found. -func hasDescendantMatch(n *html.Node, a Matcher) bool { - for c := n.FirstChild; c != nil; c = c.NextSibling { - if a.Match(c) || (c.Type == html.ElementNode && hasDescendantMatch(c, a)) { - return true - } - } - return false -} - -// Specificity returns the specificity of the most specific selectors -// in the pseudo-class arguments. -// See https://www.w3.org/TR/selectors/#specificity-rules -func (s relativePseudoClassSelector) Specificity() Specificity { - var max Specificity - for _, sel := range s.match { - newSpe := sel.Specificity() - if max.Less(newSpe) { - max = newSpe - } - } - return max -} - -func (c relativePseudoClassSelector) PseudoElement() string { - return "" -} - -type containsPseudoClassSelector struct { - abstractPseudoClass - value string - own bool -} - -func (s containsPseudoClassSelector) Match(n *html.Node) bool { - var text string - if s.own { - // matches nodes that directly contain the given text - text = strings.ToLower(nodeOwnText(n)) - } else { - // matches nodes that contain the given text. - text = strings.ToLower(nodeText(n)) - } - return strings.Contains(text, s.value) -} - -type regexpPseudoClassSelector struct { - abstractPseudoClass - regexp *regexp.Regexp - own bool -} - -func (s regexpPseudoClassSelector) Match(n *html.Node) bool { - var text string - if s.own { - // matches nodes whose text directly matches the specified regular expression - text = nodeOwnText(n) - } else { - // matches nodes whose text matches the specified regular expression - text = nodeText(n) - } - return s.regexp.MatchString(text) -} - -// writeNodeText writes the text contained in n and its descendants to b. -func writeNodeText(n *html.Node, b *bytes.Buffer) { - switch n.Type { - case html.TextNode: - b.WriteString(n.Data) - case html.ElementNode: - for c := n.FirstChild; c != nil; c = c.NextSibling { - writeNodeText(c, b) - } - } -} - -// nodeText returns the text contained in n and its descendants. -func nodeText(n *html.Node) string { - var b bytes.Buffer - writeNodeText(n, &b) - return b.String() -} - -// nodeOwnText returns the contents of the text nodes that are direct -// children of n. -func nodeOwnText(n *html.Node) string { - var b bytes.Buffer - for c := n.FirstChild; c != nil; c = c.NextSibling { - if c.Type == html.TextNode { - b.WriteString(c.Data) - } - } - return b.String() -} - -type nthPseudoClassSelector struct { - abstractPseudoClass - a, b int - last, ofType bool -} - -func (s nthPseudoClassSelector) Match(n *html.Node) bool { - if s.a == 0 { - if s.last { - return simpleNthLastChildMatch(s.b, s.ofType, n) - } else { - return simpleNthChildMatch(s.b, s.ofType, n) - } - } - return nthChildMatch(s.a, s.b, s.last, s.ofType, n) -} - -// nthChildMatch implements :nth-child(an+b). -// If last is true, implements :nth-last-child instead. -// If ofType is true, implements :nth-of-type instead. -func nthChildMatch(a, b int, last, ofType bool, n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - - parent := n.Parent - if parent == nil { - return false - } - - i := -1 - count := 0 - for c := parent.FirstChild; c != nil; c = c.NextSibling { - if (c.Type != html.ElementNode) || (ofType && c.Data != n.Data) { - continue - } - count++ - if c == n { - i = count - if !last { - break - } - } - } - - if i == -1 { - // This shouldn't happen, since n should always be one of its parent's children. - return false - } - - if last { - i = count - i + 1 - } - - i -= b - if a == 0 { - return i == 0 - } - - return i%a == 0 && i/a >= 0 -} - -// simpleNthChildMatch implements :nth-child(b). -// If ofType is true, implements :nth-of-type instead. -func simpleNthChildMatch(b int, ofType bool, n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - - parent := n.Parent - if parent == nil { - return false - } - - count := 0 - for c := parent.FirstChild; c != nil; c = c.NextSibling { - if c.Type != html.ElementNode || (ofType && c.Data != n.Data) { - continue - } - count++ - if c == n { - return count == b - } - if count >= b { - return false - } - } - return false -} - -// simpleNthLastChildMatch implements :nth-last-child(b). -// If ofType is true, implements :nth-last-of-type instead. -func simpleNthLastChildMatch(b int, ofType bool, n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - - parent := n.Parent - if parent == nil { - return false - } - - count := 0 - for c := parent.LastChild; c != nil; c = c.PrevSibling { - if c.Type != html.ElementNode || (ofType && c.Data != n.Data) { - continue - } - count++ - if c == n { - return count == b - } - if count >= b { - return false - } - } - return false -} - -type onlyChildPseudoClassSelector struct { - abstractPseudoClass - ofType bool -} - -// Match implements :only-child. -// If `ofType` is true, it implements :only-of-type instead. -func (s onlyChildPseudoClassSelector) Match(n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - - parent := n.Parent - if parent == nil { - return false - } - - count := 0 - for c := parent.FirstChild; c != nil; c = c.NextSibling { - if (c.Type != html.ElementNode) || (s.ofType && c.Data != n.Data) { - continue - } - count++ - if count > 1 { - return false - } - } - - return count == 1 -} - -type inputPseudoClassSelector struct { - abstractPseudoClass -} - -// Matches input, select, textarea and button elements. -func (s inputPseudoClassSelector) Match(n *html.Node) bool { - return n.Type == html.ElementNode && (n.Data == "input" || n.Data == "select" || n.Data == "textarea" || n.Data == "button") -} - -type emptyElementPseudoClassSelector struct { - abstractPseudoClass -} - -// Matches empty elements. -func (s emptyElementPseudoClassSelector) Match(n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - - for c := n.FirstChild; c != nil; c = c.NextSibling { - switch c.Type { - case html.ElementNode: - return false - case html.TextNode: - if strings.TrimSpace(nodeText(c)) == "" { - continue - } else { - return false - } - } - } - - return true -} - -type rootPseudoClassSelector struct { - abstractPseudoClass -} - -// Match implements :root -func (s rootPseudoClassSelector) Match(n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - if n.Parent == nil { - return false - } - return n.Parent.Type == html.DocumentNode -} - -func hasAttr(n *html.Node, attr string) bool { - return matchAttribute(n, attr, func(string) bool { return true }) -} - -type linkPseudoClassSelector struct { - abstractPseudoClass -} - -// Match implements :link -func (s linkPseudoClassSelector) Match(n *html.Node) bool { - return (n.DataAtom == atom.A || n.DataAtom == atom.Area || n.DataAtom == atom.Link) && hasAttr(n, "href") -} - -type langPseudoClassSelector struct { - abstractPseudoClass - lang string -} - -func (s langPseudoClassSelector) Match(n *html.Node) bool { - own := matchAttribute(n, "lang", func(val string) bool { - return val == s.lang || strings.HasPrefix(val, s.lang+"-") - }) - if n.Parent == nil { - return own - } - return own || s.Match(n.Parent) -} - -type enabledPseudoClassSelector struct { - abstractPseudoClass -} - -func (s enabledPseudoClassSelector) Match(n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - switch n.DataAtom { - case atom.A, atom.Area, atom.Link: - return hasAttr(n, "href") - case atom.Optgroup, atom.Menuitem, atom.Fieldset: - return !hasAttr(n, "disabled") - case atom.Button, atom.Input, atom.Select, atom.Textarea, atom.Option: - return !hasAttr(n, "disabled") && !inDisabledFieldset(n) - } - return false -} - -type disabledPseudoClassSelector struct { - abstractPseudoClass -} - -func (s disabledPseudoClassSelector) Match(n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - switch n.DataAtom { - case atom.Optgroup, atom.Menuitem, atom.Fieldset: - return hasAttr(n, "disabled") - case atom.Button, atom.Input, atom.Select, atom.Textarea, atom.Option: - return hasAttr(n, "disabled") || inDisabledFieldset(n) - } - return false -} - -func hasLegendInPreviousSiblings(n *html.Node) bool { - for s := n.PrevSibling; s != nil; s = s.PrevSibling { - if s.DataAtom == atom.Legend { - return true - } - } - return false -} - -func inDisabledFieldset(n *html.Node) bool { - if n.Parent == nil { - return false - } - if n.Parent.DataAtom == atom.Fieldset && hasAttr(n.Parent, "disabled") && - (n.DataAtom != atom.Legend || hasLegendInPreviousSiblings(n)) { - return true - } - return inDisabledFieldset(n.Parent) -} - -type checkedPseudoClassSelector struct { - abstractPseudoClass -} - -func (s checkedPseudoClassSelector) Match(n *html.Node) bool { - if n.Type != html.ElementNode { - return false - } - switch n.DataAtom { - case atom.Input, atom.Menuitem: - return hasAttr(n, "checked") && matchAttribute(n, "type", func(val string) bool { - t := toLowerASCII(val) - return t == "checkbox" || t == "radio" - }) - case atom.Option: - return hasAttr(n, "selected") - } - return false -} diff --git a/vendor/github.com/andybalholm/cascadia/selector.go b/vendor/github.com/andybalholm/cascadia/selector.go deleted file mode 100644 index 87549be23958dfc5948fb4ea20ac998c02ea8d8a..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/selector.go +++ /dev/null @@ -1,586 +0,0 @@ -package cascadia - -import ( - "fmt" - "regexp" - "strings" - - "golang.org/x/net/html" -) - -// Matcher is the interface for basic selector functionality. -// Match returns whether a selector matches n. -type Matcher interface { - Match(n *html.Node) bool -} - -// Sel is the interface for all the functionality provided by selectors. -type Sel interface { - Matcher - Specificity() Specificity - - // Returns a CSS input compiling to this selector. - String() string - - // Returns a pseudo-element, or an empty string. - PseudoElement() string -} - -// Parse parses a selector. Use `ParseWithPseudoElement` -// if you need support for pseudo-elements. -func Parse(sel string) (Sel, error) { - p := &parser{s: sel} - compiled, err := p.parseSelector() - if err != nil { - return nil, err - } - - if p.i < len(sel) { - return nil, fmt.Errorf("parsing %q: %d bytes left over", sel, len(sel)-p.i) - } - - return compiled, nil -} - -// ParseWithPseudoElement parses a single selector, -// with support for pseudo-element. -func ParseWithPseudoElement(sel string) (Sel, error) { - p := &parser{s: sel, acceptPseudoElements: true} - compiled, err := p.parseSelector() - if err != nil { - return nil, err - } - - if p.i < len(sel) { - return nil, fmt.Errorf("parsing %q: %d bytes left over", sel, len(sel)-p.i) - } - - return compiled, nil -} - -// ParseGroup parses a selector, or a group of selectors separated by commas. -// Use `ParseGroupWithPseudoElements` -// if you need support for pseudo-elements. -func ParseGroup(sel string) (SelectorGroup, error) { - p := &parser{s: sel} - compiled, err := p.parseSelectorGroup() - if err != nil { - return nil, err - } - - if p.i < len(sel) { - return nil, fmt.Errorf("parsing %q: %d bytes left over", sel, len(sel)-p.i) - } - - return compiled, nil -} - -// ParseGroupWithPseudoElements parses a selector, or a group of selectors separated by commas. -// It supports pseudo-elements. -func ParseGroupWithPseudoElements(sel string) (SelectorGroup, error) { - p := &parser{s: sel, acceptPseudoElements: true} - compiled, err := p.parseSelectorGroup() - if err != nil { - return nil, err - } - - if p.i < len(sel) { - return nil, fmt.Errorf("parsing %q: %d bytes left over", sel, len(sel)-p.i) - } - - return compiled, nil -} - -// A Selector is a function which tells whether a node matches or not. -// -// This type is maintained for compatibility; I recommend using the newer and -// more idiomatic interfaces Sel and Matcher. -type Selector func(*html.Node) bool - -// Compile parses a selector and returns, if successful, a Selector object -// that can be used to match against html.Node objects. -func Compile(sel string) (Selector, error) { - compiled, err := ParseGroup(sel) - if err != nil { - return nil, err - } - - return Selector(compiled.Match), nil -} - -// MustCompile is like Compile, but panics instead of returning an error. -func MustCompile(sel string) Selector { - compiled, err := Compile(sel) - if err != nil { - panic(err) - } - return compiled -} - -// MatchAll returns a slice of the nodes that match the selector, -// from n and its children. -func (s Selector) MatchAll(n *html.Node) []*html.Node { - return s.matchAllInto(n, nil) -} - -func (s Selector) matchAllInto(n *html.Node, storage []*html.Node) []*html.Node { - if s(n) { - storage = append(storage, n) - } - - for child := n.FirstChild; child != nil; child = child.NextSibling { - storage = s.matchAllInto(child, storage) - } - - return storage -} - -func queryInto(n *html.Node, m Matcher, storage []*html.Node) []*html.Node { - for child := n.FirstChild; child != nil; child = child.NextSibling { - if m.Match(child) { - storage = append(storage, child) - } - storage = queryInto(child, m, storage) - } - - return storage -} - -// QueryAll returns a slice of all the nodes that match m, from the descendants -// of n. -func QueryAll(n *html.Node, m Matcher) []*html.Node { - return queryInto(n, m, nil) -} - -// Match returns true if the node matches the selector. -func (s Selector) Match(n *html.Node) bool { - return s(n) -} - -// MatchFirst returns the first node that matches s, from n and its children. -func (s Selector) MatchFirst(n *html.Node) *html.Node { - if s.Match(n) { - return n - } - - for c := n.FirstChild; c != nil; c = c.NextSibling { - m := s.MatchFirst(c) - if m != nil { - return m - } - } - return nil -} - -// Query returns the first node that matches m, from the descendants of n. -// If none matches, it returns nil. -func Query(n *html.Node, m Matcher) *html.Node { - for c := n.FirstChild; c != nil; c = c.NextSibling { - if m.Match(c) { - return c - } - if matched := Query(c, m); matched != nil { - return matched - } - } - - return nil -} - -// Filter returns the nodes in nodes that match the selector. -func (s Selector) Filter(nodes []*html.Node) (result []*html.Node) { - for _, n := range nodes { - if s(n) { - result = append(result, n) - } - } - return result -} - -// Filter returns the nodes that match m. -func Filter(nodes []*html.Node, m Matcher) (result []*html.Node) { - for _, n := range nodes { - if m.Match(n) { - result = append(result, n) - } - } - return result -} - -type tagSelector struct { - tag string -} - -// Matches elements with a given tag name. -func (t tagSelector) Match(n *html.Node) bool { - return n.Type == html.ElementNode && n.Data == t.tag -} - -func (c tagSelector) Specificity() Specificity { - return Specificity{0, 0, 1} -} - -func (c tagSelector) PseudoElement() string { - return "" -} - -type classSelector struct { - class string -} - -// Matches elements by class attribute. -func (t classSelector) Match(n *html.Node) bool { - return matchAttribute(n, "class", func(s string) bool { - return matchInclude(t.class, s, false) - }) -} - -func (c classSelector) Specificity() Specificity { - return Specificity{0, 1, 0} -} - -func (c classSelector) PseudoElement() string { - return "" -} - -type idSelector struct { - id string -} - -// Matches elements by id attribute. -func (t idSelector) Match(n *html.Node) bool { - return matchAttribute(n, "id", func(s string) bool { - return s == t.id - }) -} - -func (c idSelector) Specificity() Specificity { - return Specificity{1, 0, 0} -} - -func (c idSelector) PseudoElement() string { - return "" -} - -type attrSelector struct { - key, val, operation string - regexp *regexp.Regexp - insensitive bool -} - -// Matches elements by attribute value. -func (t attrSelector) Match(n *html.Node) bool { - switch t.operation { - case "": - return matchAttribute(n, t.key, func(string) bool { return true }) - case "=": - return matchAttribute(n, t.key, func(s string) bool { return matchInsensitiveValue(s, t.val, t.insensitive) }) - case "!=": - return attributeNotEqualMatch(t.key, t.val, n, t.insensitive) - case "~=": - // matches elements where the attribute named key is a whitespace-separated list that includes val. - return matchAttribute(n, t.key, func(s string) bool { return matchInclude(t.val, s, t.insensitive) }) - case "|=": - return attributeDashMatch(t.key, t.val, n, t.insensitive) - case "^=": - return attributePrefixMatch(t.key, t.val, n, t.insensitive) - case "$=": - return attributeSuffixMatch(t.key, t.val, n, t.insensitive) - case "*=": - return attributeSubstringMatch(t.key, t.val, n, t.insensitive) - case "#=": - return attributeRegexMatch(t.key, t.regexp, n) - default: - panic(fmt.Sprintf("unsuported operation : %s", t.operation)) - } -} - -// matches elements where we ignore (or not) the case of the attribute value -// the user attribute is the value set by the user to match elements -// the real attribute is the attribute value found in the code parsed -func matchInsensitiveValue(userAttr string, realAttr string, ignoreCase bool) bool { - if ignoreCase { - return strings.EqualFold(userAttr, realAttr) - } - return userAttr == realAttr - -} - -// matches elements where the attribute named key satisifes the function f. -func matchAttribute(n *html.Node, key string, f func(string) bool) bool { - if n.Type != html.ElementNode { - return false - } - for _, a := range n.Attr { - if a.Key == key && f(a.Val) { - return true - } - } - return false -} - -// attributeNotEqualMatch matches elements where -// the attribute named key does not have the value val. -func attributeNotEqualMatch(key, val string, n *html.Node, ignoreCase bool) bool { - if n.Type != html.ElementNode { - return false - } - for _, a := range n.Attr { - if a.Key == key && matchInsensitiveValue(a.Val, val, ignoreCase) { - return false - } - } - return true -} - -// returns true if s is a whitespace-separated list that includes val. -func matchInclude(val string, s string, ignoreCase bool) bool { - for s != "" { - i := strings.IndexAny(s, " \t\r\n\f") - if i == -1 { - return matchInsensitiveValue(s, val, ignoreCase) - } - if matchInsensitiveValue(s[:i], val, ignoreCase) { - return true - } - s = s[i+1:] - } - return false -} - -// matches elements where the attribute named key equals val or starts with val plus a hyphen. -func attributeDashMatch(key, val string, n *html.Node, ignoreCase bool) bool { - return matchAttribute(n, key, - func(s string) bool { - if matchInsensitiveValue(s, val, ignoreCase) { - return true - } - if len(s) <= len(val) { - return false - } - if matchInsensitiveValue(s[:len(val)], val, ignoreCase) && s[len(val)] == '-' { - return true - } - return false - }) -} - -// attributePrefixMatch returns a Selector that matches elements where -// the attribute named key starts with val. -func attributePrefixMatch(key, val string, n *html.Node, ignoreCase bool) bool { - return matchAttribute(n, key, - func(s string) bool { - if strings.TrimSpace(s) == "" { - return false - } - if ignoreCase { - return strings.HasPrefix(strings.ToLower(s), strings.ToLower(val)) - } - return strings.HasPrefix(s, val) - }) -} - -// attributeSuffixMatch matches elements where -// the attribute named key ends with val. -func attributeSuffixMatch(key, val string, n *html.Node, ignoreCase bool) bool { - return matchAttribute(n, key, - func(s string) bool { - if strings.TrimSpace(s) == "" { - return false - } - if ignoreCase { - return strings.HasSuffix(strings.ToLower(s), strings.ToLower(val)) - } - return strings.HasSuffix(s, val) - }) -} - -// attributeSubstringMatch matches nodes where -// the attribute named key contains val. -func attributeSubstringMatch(key, val string, n *html.Node, ignoreCase bool) bool { - return matchAttribute(n, key, - func(s string) bool { - if strings.TrimSpace(s) == "" { - return false - } - if ignoreCase { - return strings.Contains(strings.ToLower(s), strings.ToLower(val)) - } - return strings.Contains(s, val) - }) -} - -// attributeRegexMatch matches nodes where -// the attribute named key matches the regular expression rx -func attributeRegexMatch(key string, rx *regexp.Regexp, n *html.Node) bool { - return matchAttribute(n, key, - func(s string) bool { - return rx.MatchString(s) - }) -} - -func (c attrSelector) Specificity() Specificity { - return Specificity{0, 1, 0} -} - -func (c attrSelector) PseudoElement() string { - return "" -} - -// see pseudo_classes.go for pseudo classes selectors - -// on a static context, some selectors can't match anything -type neverMatchSelector struct { - value string -} - -func (s neverMatchSelector) Match(n *html.Node) bool { - return false -} - -func (s neverMatchSelector) Specificity() Specificity { - return Specificity{0, 0, 0} -} - -func (c neverMatchSelector) PseudoElement() string { - return "" -} - -type compoundSelector struct { - selectors []Sel - pseudoElement string -} - -// Matches elements if each sub-selectors matches. -func (t compoundSelector) Match(n *html.Node) bool { - if len(t.selectors) == 0 { - return n.Type == html.ElementNode - } - - for _, sel := range t.selectors { - if !sel.Match(n) { - return false - } - } - return true -} - -func (s compoundSelector) Specificity() Specificity { - var out Specificity - for _, sel := range s.selectors { - out = out.Add(sel.Specificity()) - } - if s.pseudoElement != "" { - // https://drafts.csswg.org/selectors-3/#specificity - out = out.Add(Specificity{0, 0, 1}) - } - return out -} - -func (c compoundSelector) PseudoElement() string { - return c.pseudoElement -} - -type combinedSelector struct { - first Sel - combinator byte - second Sel -} - -func (t combinedSelector) Match(n *html.Node) bool { - if t.first == nil { - return false // maybe we should panic - } - switch t.combinator { - case 0: - return t.first.Match(n) - case ' ': - return descendantMatch(t.first, t.second, n) - case '>': - return childMatch(t.first, t.second, n) - case '+': - return siblingMatch(t.first, t.second, true, n) - case '~': - return siblingMatch(t.first, t.second, false, n) - default: - panic("unknown combinator") - } -} - -// matches an element if it matches d and has an ancestor that matches a. -func descendantMatch(a, d Matcher, n *html.Node) bool { - if !d.Match(n) { - return false - } - - for p := n.Parent; p != nil; p = p.Parent { - if a.Match(p) { - return true - } - } - - return false -} - -// matches an element if it matches d and its parent matches a. -func childMatch(a, d Matcher, n *html.Node) bool { - return d.Match(n) && n.Parent != nil && a.Match(n.Parent) -} - -// matches an element if it matches s2 and is preceded by an element that matches s1. -// If adjacent is true, the sibling must be immediately before the element. -func siblingMatch(s1, s2 Matcher, adjacent bool, n *html.Node) bool { - if !s2.Match(n) { - return false - } - - if adjacent { - for n = n.PrevSibling; n != nil; n = n.PrevSibling { - if n.Type == html.TextNode || n.Type == html.CommentNode { - continue - } - return s1.Match(n) - } - return false - } - - // Walk backwards looking for element that matches s1 - for c := n.PrevSibling; c != nil; c = c.PrevSibling { - if s1.Match(c) { - return true - } - } - - return false -} - -func (s combinedSelector) Specificity() Specificity { - spec := s.first.Specificity() - if s.second != nil { - spec = spec.Add(s.second.Specificity()) - } - return spec -} - -// on combinedSelector, a pseudo-element only makes sens on the last -// selector, although others increase specificity. -func (c combinedSelector) PseudoElement() string { - if c.second == nil { - return "" - } - return c.second.PseudoElement() -} - -// A SelectorGroup is a list of selectors, which matches if any of the -// individual selectors matches. -type SelectorGroup []Sel - -// Match returns true if the node matches one of the single selectors. -func (s SelectorGroup) Match(n *html.Node) bool { - for _, sel := range s { - if sel.Match(n) { - return true - } - } - return false -} diff --git a/vendor/github.com/andybalholm/cascadia/serialize.go b/vendor/github.com/andybalholm/cascadia/serialize.go deleted file mode 100644 index 61acf04e1c69470888485381ea95c1195d908f18..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/serialize.go +++ /dev/null @@ -1,176 +0,0 @@ -package cascadia - -import ( - "fmt" - "strconv" - "strings" -) - -// implements the reverse operation Sel -> string - -var specialCharReplacer *strings.Replacer - -func init() { - var pairs []string - for _, s := range ",!\"#$%&'()*+ -./:;<=>?@[\\]^`{|}~" { - pairs = append(pairs, string(s), "\\"+string(s)) - } - specialCharReplacer = strings.NewReplacer(pairs...) -} - -// espace special CSS char -func escape(s string) string { return specialCharReplacer.Replace(s) } - -func (c tagSelector) String() string { - return c.tag -} - -func (c idSelector) String() string { - return "#" + escape(c.id) -} - -func (c classSelector) String() string { - return "." + escape(c.class) -} - -func (c attrSelector) String() string { - val := c.val - if c.operation == "#=" { - val = c.regexp.String() - } else if c.operation != "" { - val = fmt.Sprintf(`"%s"`, val) - } - - ignoreCase := "" - - if c.insensitive { - ignoreCase = " i" - } - - return fmt.Sprintf(`[%s%s%s%s]`, c.key, c.operation, val, ignoreCase) -} - -func (c relativePseudoClassSelector) String() string { - return fmt.Sprintf(":%s(%s)", c.name, c.match.String()) -} - -func (c containsPseudoClassSelector) String() string { - s := "contains" - if c.own { - s += "Own" - } - return fmt.Sprintf(`:%s("%s")`, s, c.value) -} - -func (c regexpPseudoClassSelector) String() string { - s := "matches" - if c.own { - s += "Own" - } - return fmt.Sprintf(":%s(%s)", s, c.regexp.String()) -} - -func (c nthPseudoClassSelector) String() string { - if c.a == 0 && c.b == 1 { // special cases - s := ":first-" - if c.last { - s = ":last-" - } - if c.ofType { - s += "of-type" - } else { - s += "child" - } - return s - } - var name string - switch [2]bool{c.last, c.ofType} { - case [2]bool{true, true}: - name = "nth-last-of-type" - case [2]bool{true, false}: - name = "nth-last-child" - case [2]bool{false, true}: - name = "nth-of-type" - case [2]bool{false, false}: - name = "nth-child" - } - s := fmt.Sprintf("+%d", c.b) - if c.b < 0 { // avoid +-8 invalid syntax - s = strconv.Itoa(c.b) - } - return fmt.Sprintf(":%s(%dn%s)", name, c.a, s) -} - -func (c onlyChildPseudoClassSelector) String() string { - if c.ofType { - return ":only-of-type" - } - return ":only-child" -} - -func (c inputPseudoClassSelector) String() string { - return ":input" -} - -func (c emptyElementPseudoClassSelector) String() string { - return ":empty" -} - -func (c rootPseudoClassSelector) String() string { - return ":root" -} - -func (c linkPseudoClassSelector) String() string { - return ":link" -} - -func (c langPseudoClassSelector) String() string { - return fmt.Sprintf(":lang(%s)", c.lang) -} - -func (c neverMatchSelector) String() string { - return c.value -} - -func (c enabledPseudoClassSelector) String() string { - return ":enabled" -} - -func (c disabledPseudoClassSelector) String() string { - return ":disabled" -} - -func (c checkedPseudoClassSelector) String() string { - return ":checked" -} - -func (c compoundSelector) String() string { - if len(c.selectors) == 0 && c.pseudoElement == "" { - return "*" - } - chunks := make([]string, len(c.selectors)) - for i, sel := range c.selectors { - chunks[i] = sel.String() - } - s := strings.Join(chunks, "") - if c.pseudoElement != "" { - s += "::" + c.pseudoElement - } - return s -} - -func (c combinedSelector) String() string { - start := c.first.String() - if c.second != nil { - start += fmt.Sprintf(" %s %s", string(c.combinator), c.second.String()) - } - return start -} - -func (c SelectorGroup) String() string { - ck := make([]string, len(c)) - for i, s := range c { - ck[i] = s.String() - } - return strings.Join(ck, ", ") -} diff --git a/vendor/github.com/andybalholm/cascadia/specificity.go b/vendor/github.com/andybalholm/cascadia/specificity.go deleted file mode 100644 index 8db864f9beb2ccfd23fb5b11bd2e0c860a880824..0000000000000000000000000000000000000000 --- a/vendor/github.com/andybalholm/cascadia/specificity.go +++ /dev/null @@ -1,26 +0,0 @@ -package cascadia - -// Specificity is the CSS specificity as defined in -// https://www.w3.org/TR/selectors/#specificity-rules -// with the convention Specificity = [A,B,C]. -type Specificity [3]int - -// returns `true` if s < other (strictly), false otherwise -func (s Specificity) Less(other Specificity) bool { - for i := range s { - if s[i] < other[i] { - return true - } - if s[i] > other[i] { - return false - } - } - return false -} - -func (s Specificity) Add(other Specificity) Specificity { - for i, sp := range other { - s[i] += sp - } - return s -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/.gitignore b/vendor/github.com/anthropics/anthropic-sdk-go/.gitignore deleted file mode 100644 index c6d0501519fa3ee487bda2139a267c353c0cf426..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -.prism.log -codegen.log -Brewfile.lock.json -.idea/ diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/.release-please-manifest.json b/vendor/github.com/anthropics/anthropic-sdk-go/.release-please-manifest.json deleted file mode 100644 index 4c313f9349eca9ef9febb53c01272d5ef2e98111..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/.release-please-manifest.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - ".": "1.4.0" -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/.stats.yml b/vendor/github.com/anthropics/anthropic-sdk-go/.stats.yml deleted file mode 100644 index 38642d41cf476967da372beba8e66e0e94ff6cd4..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/.stats.yml +++ /dev/null @@ -1,4 +0,0 @@ -configured_endpoints: 26 -openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/anthropic%2Fanthropic-a7b84017aa1126ad99443296dcd81ab2b53f1c346014b92096226cf993f30502.yml -openapi_spec_hash: 58d4e72c7906bd8a680ab17b99de6215 -config_hash: b08362db009c073fa7b1c154969cb200 diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/Brewfile b/vendor/github.com/anthropics/anthropic-sdk-go/Brewfile deleted file mode 100644 index 577e34a4b34cd98803132e4c5d2e790079414948..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/Brewfile +++ /dev/null @@ -1 +0,0 @@ -brew "go" diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/CHANGELOG.md b/vendor/github.com/anthropics/anthropic-sdk-go/CHANGELOG.md deleted file mode 100644 index 1e0b50278ac9d735206ea5af13ffe4887ed83177..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/CHANGELOG.md +++ /dev/null @@ -1,240 +0,0 @@ -# Changelog - -## 1.4.0 (2025-06-04) - -Full Changelog: [v1.3.0...v1.4.0](https://github.com/anthropics/anthropic-sdk-go/compare/v1.3.0...v1.4.0) - -### Features - -* **client:** allow overriding unions ([079149c](https://github.com/anthropics/anthropic-sdk-go/commit/079149c673981891ecd35906cd610f8d4a4b69a9)) - - -### Chores - -* **internal:** codegen related update ([853ba1f](https://github.com/anthropics/anthropic-sdk-go/commit/853ba1f46d2b6c476ee04d9c061368e708cc9e18)) - -## 1.3.0 (2025-06-03) - -Full Changelog: [v1.2.2...v1.3.0](https://github.com/anthropics/anthropic-sdk-go/compare/v1.2.2...v1.3.0) - -### Features - -* **client:** add support for new text_editor_20250429 tool ([b33c543](https://github.com/anthropics/anthropic-sdk-go/commit/b33c543f7dc3b74c3322b6f84c189b81f67b6154)) - -## 1.2.2 (2025-06-02) - -Full Changelog: [v1.2.1...v1.2.2](https://github.com/anthropics/anthropic-sdk-go/compare/v1.2.1...v1.2.2) - -### Bug Fixes - -* **client:** access subunions properly ([f29c162](https://github.com/anthropics/anthropic-sdk-go/commit/f29c1627fe94c6371937659d02f1af7b55583d60)) -* fix error ([bbc002c](https://github.com/anthropics/anthropic-sdk-go/commit/bbc002ccbbf9df681201d9b8ba806c37338c0fd3)) - - -### Chores - -* make go mod tidy continue on error ([ac184b4](https://github.com/anthropics/anthropic-sdk-go/commit/ac184b4f7afee4015d133a05ce819a8dac35be52)) - -## 1.2.1 (2025-05-23) - -Full Changelog: [v1.2.0...v1.2.1](https://github.com/anthropics/anthropic-sdk-go/compare/v1.2.0...v1.2.1) - -### Chores - -* **examples:** clean up MCP example ([66f406a](https://github.com/anthropics/anthropic-sdk-go/commit/66f406a04b9756281e7716e9b635c3e3f29397fb)) -* **internal:** fix release workflows ([6a0ff4c](https://github.com/anthropics/anthropic-sdk-go/commit/6a0ff4cad1c1b4ab6435df80fccd945d6ce07be7)) - -## 1.2.0 (2025-05-22) - -Full Changelog: [v1.1.0...v1.2.0](https://github.com/anthropics/anthropic-sdk-go/compare/v1.1.0...v1.2.0) - -### Features - -* **api:** add claude 4 models, files API, code execution tool, MCP connector and more ([b2e5cbf](https://github.com/anthropics/anthropic-sdk-go/commit/b2e5cbffd9d05228c2c2569974a6fa260c3f46be)) - - -### Bug Fixes - -* **tests:** fix model testing for anthropic.CalculateNonStreamingTimeout ([9956842](https://github.com/anthropics/anthropic-sdk-go/commit/995684240b77284a4590b1b9ae34a85e525d1e52)) - -## 1.1.0 (2025-05-22) - -Full Changelog: [v1.0.0...v1.1.0](https://github.com/anthropics/anthropic-sdk-go/compare/v1.0.0...v1.1.0) - -### Features - -* **api:** add claude 4 models, files API, code execution tool, MCP connector and more ([2740935](https://github.com/anthropics/anthropic-sdk-go/commit/2740935f444de2d46103a7c777ea75e7e214872e)) - - -### Bug Fixes - -* **tests:** fix model testing for anthropic.CalculateNonStreamingTimeout ([f1aa0a1](https://github.com/anthropics/anthropic-sdk-go/commit/f1aa0a1a32d1ca87b87a7d688daab31f2a36071c)) - -## 1.0.0 (2025-05-21) - -Full Changelog: [v0.2.0-beta.4...v1.0.0](https://github.com/anthropics/anthropic-sdk-go/compare/v0.2.0-beta.4...v1.0.0) - -### ⚠ BREAKING CHANGES - -* **client:** rename variant constructors -* **client:** remove is present - -### Features - -* **client:** improve variant constructor names ([227c96b](https://github.com/anthropics/anthropic-sdk-go/commit/227c96bf50e14827e112c31ad0f512354477a409)) -* **client:** rename variant constructors ([078fad6](https://github.com/anthropics/anthropic-sdk-go/commit/078fad6558642a20b5fb3e82186b03c2efc0ab47)) - - -### Bug Fixes - -* **client:** correctly set stream key for multipart ([f17bfe0](https://github.com/anthropics/anthropic-sdk-go/commit/f17bfe0aac0fb8228d9cad87ccca0deb7449a824)) -* **client:** don't panic on marshal with extra null field ([d67a151](https://github.com/anthropics/anthropic-sdk-go/commit/d67a151a6ef0870918c5eaf84ce996cb5b1860b7)) -* **client:** elide nil citations array ([09cadec](https://github.com/anthropics/anthropic-sdk-go/commit/09cadec3c076d74bda74e67c345a1aee1fdb7ce4)) -* **client:** fix bug with empty tool inputs and citation deltas in Accumulate ([f4ac348](https://github.com/anthropics/anthropic-sdk-go/commit/f4ac348658fb83485d6555c63f90920599c98d99)) -* **client:** increase max stream buffer size ([18a6ccf](https://github.com/anthropics/anthropic-sdk-go/commit/18a6ccf1961922a342467800c737fa000bdd254e)) -* **client:** remove is present ([385d99f](https://github.com/anthropics/anthropic-sdk-go/commit/385d99fa225c755d9af737425ad2ef4d66ad5ba9)) -* **client:** resolve naming collisions in union variants ([2cb6904](https://github.com/anthropics/anthropic-sdk-go/commit/2cb69048a6b583954934bc2926186564b5c74bf6)) -* **client:** use scanner for streaming ([82a2840](https://github.com/anthropics/anthropic-sdk-go/commit/82a2840ce0f8aa8bd63f7697c566f437c06bb132)) - - -### Chores - -* **examples:** remove fmt ([872e055](https://github.com/anthropics/anthropic-sdk-go/commit/872e0550171942c405786c7eedb23b8270f6e8de)) -* formatting ([1ce0ee8](https://github.com/anthropics/anthropic-sdk-go/commit/1ce0ee863c5df658909d81b138dc1ebedb78844a)) -* improve devcontainer setup ([9021490](https://github.com/anthropics/anthropic-sdk-go/commit/90214901d77ba57901e77d6ea31aafb06c120f2c)) - - -### Documentation - -* upgrade security note to warning ([#346](https://github.com/anthropics/anthropic-sdk-go/issues/346)) ([83e70de](https://github.com/anthropics/anthropic-sdk-go/commit/83e70decfb5da14a1ecf78402302f7f0600515ea)) - -## 0.2.0-beta.4 (2025-05-18) - -Full Changelog: [v0.2.0-beta.3...v0.2.0-beta.4](https://github.com/anthropics/anthropic-sdk-go/compare/v0.2.0-beta.3...v0.2.0-beta.4) - -### ⚠ BREAKING CHANGES - -* **client:** clearer array variant names -* **client:** rename resp package -* **client:** improve core function names -* **client:** improve union variant names -* **client:** improve param subunions & deduplicate types - -### Features - -* **api:** adds web search capabilities to the Claude API ([9ca314a](https://github.com/anthropics/anthropic-sdk-go/commit/9ca314a74998f24b5f17427698a8fa709b103581)) -* **api:** extract ContentBlockDelta events into their own schemas ([#165](https://github.com/anthropics/anthropic-sdk-go/issues/165)) ([6d75486](https://github.com/anthropics/anthropic-sdk-go/commit/6d75486e9f524f5511f787181106a679e3414498)) -* **api:** manual updates ([d405f97](https://github.com/anthropics/anthropic-sdk-go/commit/d405f97373cd7ae863a7400441d1d79c85f0ddd5)) -* **api:** manual updates ([e1326cd](https://github.com/anthropics/anthropic-sdk-go/commit/e1326cdd756beb871e939af8be8b45fd3d5fdc9a)) -* **api:** manual updates ([a92a382](https://github.com/anthropics/anthropic-sdk-go/commit/a92a382976d595dd32208109b480bf26dbbdc00f)) -* **api:** manual updates ([59bd507](https://github.com/anthropics/anthropic-sdk-go/commit/59bd5071282403373ddca9333fafc9efc90a16d6)) -* **client:** add dynamic streaming buffer to handle large lines ([510e099](https://github.com/anthropics/anthropic-sdk-go/commit/510e099e19fa71411502650eb387f1fee79f5d0d)) -* **client:** add escape hatch to omit required param fields ([#175](https://github.com/anthropics/anthropic-sdk-go/issues/175)) ([6df8184](https://github.com/anthropics/anthropic-sdk-go/commit/6df8184947d6568260fa0bc22a89a27d10eaacd0)) -* **client:** add helper method to generate constant structs ([015e8bc](https://github.com/anthropics/anthropic-sdk-go/commit/015e8bc7f74582fb5a3d69021ad3d61e96d65b36)) -* **client:** add support for endpoint-specific base URLs in python ([44645c9](https://github.com/anthropics/anthropic-sdk-go/commit/44645c9fd0b883db4deeb88bfee6922ec9845ace)) -* **client:** add support for reading base URL from environment variable ([835e632](https://github.com/anthropics/anthropic-sdk-go/commit/835e6326b658cd40590cd8bbed0932ab219e6d2d)) -* **client:** clearer array variant names ([1fdea8f](https://github.com/anthropics/anthropic-sdk-go/commit/1fdea8f9fedc470a917d12607b3b7ebe3f0f6439)) -* **client:** experimental support for unmarshalling into param structs ([94c8fa4](https://github.com/anthropics/anthropic-sdk-go/commit/94c8fa41ecb4792cb7da043bde2c0f5ddafe84b0)) -* **client:** improve param subunions & deduplicate types ([8daacf6](https://github.com/anthropics/anthropic-sdk-go/commit/8daacf6866e8bc706ec29e17046e53d4ed100364)) -* **client:** make response union's AsAny method type safe ([#174](https://github.com/anthropics/anthropic-sdk-go/issues/174)) ([f410ed0](https://github.com/anthropics/anthropic-sdk-go/commit/f410ed025ee57a05b0cec8d72a1cb43d30e564a6)) -* **client:** rename resp package ([8e7d278](https://github.com/anthropics/anthropic-sdk-go/commit/8e7d2788e9be7b954d07de731e7b27ad2e2a9e8e)) -* **client:** support custom http clients ([#177](https://github.com/anthropics/anthropic-sdk-go/issues/177)) ([ff7a793](https://github.com/anthropics/anthropic-sdk-go/commit/ff7a793b43b99dc148b30e408edfdc19e19c28b2)) -* **client:** support more time formats ([af2df86](https://github.com/anthropics/anthropic-sdk-go/commit/af2df86f24acbe6b9cdcc4e055c3ff754303e0ef)) -* **client:** support param struct overrides ([#167](https://github.com/anthropics/anthropic-sdk-go/issues/167)) ([e0d5eb0](https://github.com/anthropics/anthropic-sdk-go/commit/e0d5eb098c6441e99d53c6d997c7bcca460a238b)) -* **client:** support unions in query and forms ([#171](https://github.com/anthropics/anthropic-sdk-go/issues/171)) ([6bf1ce3](https://github.com/anthropics/anthropic-sdk-go/commit/6bf1ce36f0155dba20afd4b63bf96c4527e2baa5)) - - -### Bug Fixes - -* **client:** clean up reader resources ([2234386](https://github.com/anthropics/anthropic-sdk-go/commit/223438673ade3be3435bebf7063fd34ddf3dfb8e)) -* **client:** correctly update body in WithJSONSet ([f531c77](https://github.com/anthropics/anthropic-sdk-go/commit/f531c77c15859b1f2e61d654f4d9956cdfafa082)) -* **client:** deduplicate stop reason type ([#155](https://github.com/anthropics/anthropic-sdk-go/issues/155)) ([0f985ad](https://github.com/anthropics/anthropic-sdk-go/commit/0f985ad54ef47849d7d478c84d34c7350a4349b5)) -* **client:** fix bug where types occasionally wouldn't generate ([8988713](https://github.com/anthropics/anthropic-sdk-go/commit/8988713904ce73d3c82de635d98da48b98532366)) -* **client:** improve core function names ([0a2777f](https://github.com/anthropics/anthropic-sdk-go/commit/0a2777fd597a5eb74bcf6b1da48a9ff1988059de)) -* **client:** improve union variant names ([92718fd](https://github.com/anthropics/anthropic-sdk-go/commit/92718fd4058fd8535fd888a56f83fc2d3ec505ef)) -* **client:** include path for type names in example code ([5bbe836](https://github.com/anthropics/anthropic-sdk-go/commit/5bbe83639793878aa0ea52e8ff06b1d9ee72ed7c)) -* **client:** resolve issue with optional multipart files ([e2af94c](https://github.com/anthropics/anthropic-sdk-go/commit/e2af94c840a8f9da566c781fc99c57084e490ec1)) -* **client:** return error on bad custom url instead of panic ([#169](https://github.com/anthropics/anthropic-sdk-go/issues/169)) ([b086b55](https://github.com/anthropics/anthropic-sdk-go/commit/b086b55f4886474282d4e2ea9ee3495cbf25ec6b)) -* **client:** support multipart encoding array formats ([#170](https://github.com/anthropics/anthropic-sdk-go/issues/170)) ([611a25a](https://github.com/anthropics/anthropic-sdk-go/commit/611a25a427fc5303bb311fa4a2fec836d55b0933)) -* **client:** time format encoding fix ([d589846](https://github.com/anthropics/anthropic-sdk-go/commit/d589846c1a08ad56d639d60736e2b8e190f7f2b1)) -* **client:** unmarshal responses properly ([8344a1c](https://github.com/anthropics/anthropic-sdk-go/commit/8344a1c58dd497abbed8e9e689efca544256eaa8)) -* **client:** unmarshal stream events into fresh memory ([#168](https://github.com/anthropics/anthropic-sdk-go/issues/168)) ([9cc1257](https://github.com/anthropics/anthropic-sdk-go/commit/9cc1257a67340e446ac415ec9ddddded24bb1f9a)) -* handle empty bodies in WithJSONSet ([0bad01e](https://github.com/anthropics/anthropic-sdk-go/commit/0bad01e40a2a4b5b376ba27513d7e16d604459d9)) -* **internal:** fix type changes ([d8ef353](https://github.com/anthropics/anthropic-sdk-go/commit/d8ef3531840ac1dc0541d3b1cf0015d1db29e2b6)) -* **pagination:** handle errors when applying options ([2381476](https://github.com/anthropics/anthropic-sdk-go/commit/2381476e64991e781b696890c98f78001e256b3b)) - - -### Chores - -* **ci:** add timeout thresholds for CI jobs ([335e9f0](https://github.com/anthropics/anthropic-sdk-go/commit/335e9f0af2275f1af21aa7062afb50bee81771b6)) -* **ci:** only use depot for staging repos ([6818451](https://github.com/anthropics/anthropic-sdk-go/commit/68184515143aa1e4473208f794fa593668c94df4)) -* **ci:** run on more branches and use depot runners ([b0ca09d](https://github.com/anthropics/anthropic-sdk-go/commit/b0ca09d1d39a8de390c47be804847a7647ca3c67)) -* **client:** use new opt conversion ([#184](https://github.com/anthropics/anthropic-sdk-go/issues/184)) ([58dc74f](https://github.com/anthropics/anthropic-sdk-go/commit/58dc74f951aa6a0eb4355a0213c8695bfa7cb0ed)) -* **docs:** doc improvements ([#173](https://github.com/anthropics/anthropic-sdk-go/issues/173)) ([aebe8f6](https://github.com/anthropics/anthropic-sdk-go/commit/aebe8f68afa3de4460cda6e4032c7859e13cda81)) -* **docs:** document pre-request options ([8f5eb18](https://github.com/anthropics/anthropic-sdk-go/commit/8f5eb188146bd46ba990558a7e2348c8697d6405)) -* **docs:** readme improvements ([#176](https://github.com/anthropics/anthropic-sdk-go/issues/176)) ([b5769ff](https://github.com/anthropics/anthropic-sdk-go/commit/b5769ffcf5ef5345659ae848b875227718ea2425)) -* **docs:** update file uploads in README ([#166](https://github.com/anthropics/anthropic-sdk-go/issues/166)) ([a4a36bf](https://github.com/anthropics/anthropic-sdk-go/commit/a4a36bfbefa5a166774c23d8c5428fb55c1b4abe)) -* **docs:** update respjson package name ([28910b5](https://github.com/anthropics/anthropic-sdk-go/commit/28910b57821cab670561a25bee413375187ed747)) -* **internal:** expand CI branch coverage ([#178](https://github.com/anthropics/anthropic-sdk-go/issues/178)) ([900e2df](https://github.com/anthropics/anthropic-sdk-go/commit/900e2df3eb2d3e1309d85fdcf807998f701bea8a)) -* **internal:** reduce CI branch coverage ([343f6c6](https://github.com/anthropics/anthropic-sdk-go/commit/343f6c6c295dc3d39f65aae481bc10969dbb5694)) -* **internal:** remove CI condition ([#160](https://github.com/anthropics/anthropic-sdk-go/issues/160)) ([adfa1e2](https://github.com/anthropics/anthropic-sdk-go/commit/adfa1e2e349842aa88262af70b209d1a59dbb419)) -* **internal:** update config ([#157](https://github.com/anthropics/anthropic-sdk-go/issues/157)) ([46f0194](https://github.com/anthropics/anthropic-sdk-go/commit/46f019497bd9533390c4b9f0ebee6863263ce009)) -* **readme:** improve formatting ([66be9bb](https://github.com/anthropics/anthropic-sdk-go/commit/66be9bbb17ccc9d878e79b3c39605da3e2846297)) - - -### Documentation - -* remove or fix invalid readme examples ([142576c](https://github.com/anthropics/anthropic-sdk-go/commit/142576c73b4dab5b84a2bf2481506ad642ad31cc)) -* update documentation links to be more uniform ([457122b](https://github.com/anthropics/anthropic-sdk-go/commit/457122b79646dc17fa8752c98dbf4991edffc548)) - -## 0.2.0-beta.3 (2025-03-27) - -Full Changelog: [v0.2.0-beta.2...v0.2.0-beta.3](https://github.com/anthropics/anthropic-sdk-go/compare/v0.2.0-beta.2...v0.2.0-beta.3) - -### Chores - -* add hash of OpenAPI spec/config inputs to .stats.yml ([#154](https://github.com/anthropics/anthropic-sdk-go/issues/154)) ([76b91b5](https://github.com/anthropics/anthropic-sdk-go/commit/76b91b56fbf42fe8982e7b861885db179b1bdcc5)) -* fix typos ([#152](https://github.com/anthropics/anthropic-sdk-go/issues/152)) ([1cf6a6a](https://github.com/anthropics/anthropic-sdk-go/commit/1cf6a6ae25231b88d2eedbe0758f1281cbe439d8)) - -## 0.2.0-beta.2 (2025-03-25) - -Full Changelog: [v0.2.0-beta.1...v0.2.0-beta.2](https://github.com/anthropics/anthropic-sdk-go/compare/v0.2.0-beta.1...v0.2.0-beta.2) - -### Bug Fixes - -* **client:** use raw json for tool input ([1013c2b](https://github.com/anthropics/anthropic-sdk-go/commit/1013c2bdb87a27d2420dbe0dcadc57d1fe3589f2)) - - -### Chores - -* add request options to client tests ([#150](https://github.com/anthropics/anthropic-sdk-go/issues/150)) ([7c70ae1](https://github.com/anthropics/anthropic-sdk-go/commit/7c70ae134a345aff775694abcad255c76e7dfcba)) - -## 0.2.0-beta.1 (2025-03-25) - -Full Changelog: [v0.2.0-alpha.13...v0.2.0-beta.1](https://github.com/anthropics/anthropic-sdk-go/compare/v0.2.0-alpha.13...v0.2.0-beta.1) - -### ⚠ BREAKING CHANGES - -* **api:** migrate to v2 - -### Features - -* add SKIP_BREW env var to ./scripts/bootstrap ([#137](https://github.com/anthropics/anthropic-sdk-go/issues/137)) ([4057111](https://github.com/anthropics/anthropic-sdk-go/commit/40571110129d5c66f171ead36f5d725663262bc4)) -* **api:** migrate to v2 ([fcd95eb](https://github.com/anthropics/anthropic-sdk-go/commit/fcd95eb8f45d0ffedcd1e47cd0879d7e66783540)) -* **client:** accept RFC6838 JSON content types ([#139](https://github.com/anthropics/anthropic-sdk-go/issues/139)) ([78d17cd](https://github.com/anthropics/anthropic-sdk-go/commit/78d17cd4122893ba62b1e14714a1da004c128344)) -* **client:** allow custom baseurls without trailing slash ([#135](https://github.com/anthropics/anthropic-sdk-go/issues/135)) ([9b30fce](https://github.com/anthropics/anthropic-sdk-go/commit/9b30fce0a71a35910315e02cd3a2f2afc1fd7962)) -* **client:** improve default client options support ([07f82a6](https://github.com/anthropics/anthropic-sdk-go/commit/07f82a6f9e07bf9aadf4ca150287887cb9e75bc4)) -* **client:** improve default client options support ([#142](https://github.com/anthropics/anthropic-sdk-go/issues/142)) ([f261355](https://github.com/anthropics/anthropic-sdk-go/commit/f261355e497748bcb112eecb67a95d7c7c5075c0)) -* **client:** support v2 ([#147](https://github.com/anthropics/anthropic-sdk-go/issues/147)) ([6b3af98](https://github.com/anthropics/anthropic-sdk-go/commit/6b3af98e02a9b6126bd715d43f83b8adf8b861e8)) - - -### Chores - -* **docs:** clarify breaking changes ([#146](https://github.com/anthropics/anthropic-sdk-go/issues/146)) ([a2586b4](https://github.com/anthropics/anthropic-sdk-go/commit/a2586b4beb2b9a0ad252e90223fbb471e6c25bc1)) -* **internal:** codegen metadata ([ce0eca2](https://github.com/anthropics/anthropic-sdk-go/commit/ce0eca25c6a83fca9ececccb41faf04e74566e2d)) -* **internal:** remove extra empty newlines ([#143](https://github.com/anthropics/anthropic-sdk-go/issues/143)) ([2ed1584](https://github.com/anthropics/anthropic-sdk-go/commit/2ed1584c7d80fddf2ef5143eabbd33b8f1a4603d)) - - -### Refactors - -* tidy up dependencies ([#140](https://github.com/anthropics/anthropic-sdk-go/issues/140)) ([289cc1b](https://github.com/anthropics/anthropic-sdk-go/commit/289cc1b007094421305dfc4ef01ae68bb2d50ee5)) diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/CONTRIBUTING.md b/vendor/github.com/anthropics/anthropic-sdk-go/CONTRIBUTING.md deleted file mode 100644 index fe3189e9f1eeec0c964a1d537bc5ae996906a463..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/CONTRIBUTING.md +++ /dev/null @@ -1,66 +0,0 @@ -## Setting up the environment - -To set up the repository, run: - -```sh -$ ./scripts/bootstrap -$ ./scripts/lint -``` - -This will install all the required dependencies and build the SDK. - -You can also [install go 1.18+ manually](https://go.dev/doc/install). - -## Modifying/Adding code - -Most of the SDK is generated code. Modifications to code will be persisted between generations, but may -result in merge conflicts between manual patches and changes from the generator. The generator will never -modify the contents of the `lib/` and `examples/` directories. - -## Adding and running examples - -All files in the `examples/` directory are not modified by the generator and can be freely edited or added to. - -```go -# add an example to examples/--Enterprise
---$29/mo
--
-
- 30 users included -
- 15 GB of storage -
- See more -
/main.go - -package main - -func main() { - // ... -} -``` - -```sh -$ go run ./examples/ -``` - -## Using the repository from source - -To use a local version of this library from source in another project, edit the `go.mod` with a replace -directive. This can be done through the CLI with the following: - -```sh -$ go mod edit -replace github.com/anthropics/anthropic-sdk-go=/path/to/anthropic-sdk-go -``` - -## Running tests - -Most tests require you to [set up a mock server](https://github.com/stoplightio/prism) against the OpenAPI spec to run the tests. - -```sh -# you will need npm installed -$ npx prism mock path/to/your/openapi.yml -``` - -```sh -$ ./scripts/test -``` - -## Formatting - -This library uses the standard gofmt code formatter: - -```sh -$ ./scripts/format -``` diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/LICENSE b/vendor/github.com/anthropics/anthropic-sdk-go/LICENSE deleted file mode 100644 index ac71a66cf790ec2b4cc699891aed7671a6233dd7..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/LICENSE +++ /dev/null @@ -1,8 +0,0 @@ -Copyright 2023 Anthropic, PBC. - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/README.md b/vendor/github.com/anthropics/anthropic-sdk-go/README.md deleted file mode 100644 index a69d721296492025b319c2cde12114f389b26b22..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/README.md +++ /dev/null @@ -1,876 +0,0 @@ -# Anthropic Go API Library - - 
-
-The Anthropic Go library provides convenient access to the [Anthropic REST API](https://docs.anthropic.com/claude/reference/)
-from applications written in Go.
-
-## Installation
-
-
-
-```go
-import (
- "github.com/anthropics/anthropic-sdk-go" // imported as anthropic
-)
-```
-
-
-
-Or to pin the version:
-
-
-
-```sh
-go get -u 'github.com/anthropics/anthropic-sdk-go@v1.4.0'
-```
-
-
-
-## Requirements
-
-This library requires Go 1.18+.
-
-## Usage
-
-The full API of this library can be found in [api.md](api.md).
-
-```go
-package main
-
-import (
- "context"
- "fmt"
-
- "github.com/anthropics/anthropic-sdk-go"
- "github.com/anthropics/anthropic-sdk-go/option"
-)
-
-func main() {
- client := anthropic.NewClient(
- option.WithAPIKey("my-anthropic-api-key"), // defaults to os.LookupEnv("ANTHROPIC_API_KEY")
- )
- message, err := client.Messages.New(context.TODO(), anthropic.MessageNewParams{
- MaxTokens: 1024,
- Messages: []anthropic.MessageParam{{
- Content: []anthropic.ContentBlockParamUnion{{
- OfRequestTextBlock: &anthropic.TextBlockParam{Text: "What is a quaternion?"},
- }},
- Role: anthropic.MessageParamRoleUser,
- }},
- Model: anthropic.ModelClaude3_7SonnetLatest,
- })
- if err != nil {
- panic(err.Error())
- }
- fmt.Printf("%+v\n", message.Content)
-}
-
-```
-
--- -Conversations
- -```go -messages := []anthropic.MessageParam{ - anthropic.NewUserMessage(anthropic.NewTextBlock("What is my first name?")), -} - -message, err := client.Messages.New(context.TODO(), anthropic.MessageNewParams{ - Model: anthropic.ModelClaude3_7SonnetLatest, - Messages: messages, - MaxTokens: 1024, -}) -if err != nil { - panic(err) -} - -fmt.Printf("%+v\n", message.Content) - -messages = append(messages, message.ToParam()) -messages = append(messages, anthropic.NewUserMessage( - anthropic.NewTextBlock("My full name is John Doe"), -)) - -message, err = client.Messages.New(context.TODO(), anthropic.MessageNewParams{ - Model: anthropic.ModelClaude3_7SonnetLatest, - Messages: messages, - MaxTokens: 1024, -}) - -fmt.Printf("%+v\n", message.Content) -``` - --- -System prompts
- -```go -message, err := client.Messages.New(context.TODO(), anthropic.MessageNewParams{ - Model: anthropic.ModelClaude3_7SonnetLatest, - MaxTokens: 1024, - System: []anthropic.TextBlockParam{ - {Text: "Be very serious at all times."}, - }, - Messages: messages, -}) -``` - --- -Streaming
- -```go -content := "What is a quaternion?" - -stream := client.Messages.NewStreaming(context.TODO(), anthropic.MessageNewParams{ - Model: anthropic.ModelClaude3_7SonnetLatest, - MaxTokens: 1024, - Messages: []anthropic.MessageParam{ - anthropic.NewUserMessage(anthropic.NewTextBlock(content)), - }, -}) - -message := anthropic.Message{} -for stream.Next() { - event := stream.Current() - err := message.Accumulate(event) - if err != nil { - panic(err) - } - - switch eventVariant := event.AsAny().(type) { - case anthropic.ContentBlockDeltaEvent: - switch deltaVariant := eventVariant.Delta.AsAny().(type) { - case anthropic.TextDelta: - print(deltaVariant.Text) - } - - } -} - -if stream.Err() != nil { - panic(stream.Err()) -} -``` - --- -### Request fields - -The anthropic library uses the [`omitzero`](https://tip.golang.org/doc/go1.24#encodingjsonpkgencodingjson) -semantics from the Go 1.24+ `encoding/json` release for request fields. - -Required primitive fields (`int64`, `string`, etc.) feature the tagTool calling
- -```go -package main - -import ( - "context" - "encoding/json" - "fmt" - - "github.com/anthropics/anthropic-sdk-go" - "github.com/invopop/jsonschema" -) - -func main() { - client := anthropic.NewClient() - - content := "Where is San Francisco?" - - println("[user]: " + content) - - messages := []anthropic.MessageParam{ - anthropic.NewUserMessage(anthropic.NewTextBlock(content)), - } - - toolParams := []anthropic.ToolParam{ - { - Name: "get_coordinates", - Description: anthropic.String("Accepts a place as an address, then returns the latitude and longitude coordinates."), - InputSchema: GetCoordinatesInputSchema, - }, - } - tools := make([]anthropic.ToolUnionParam, len(toolParams)) - for i, toolParam := range toolParams { - tools[i] = anthropic.ToolUnionParam{OfTool: &toolParam} - } - - for { - message, err := client.Messages.New(context.TODO(), anthropic.MessageNewParams{ - Model: anthropic.ModelClaude3_7SonnetLatest, - MaxTokens: 1024, - Messages: messages, - Tools: tools, - }) - - if err != nil { - panic(err) - } - - print(color("[assistant]: ")) - for _, block := range message.Content { - switch block := block.AsAny().(type) { - case anthropic.TextBlock: - println(block.Text) - println() - case anthropic.ToolUseBlock: - inputJSON, _ := json.Marshal(block.Input) - println(block.Name + ": " + string(inputJSON)) - println() - } - } - - messages = append(messages, message.ToParam()) - toolResults := []anthropic.ContentBlockParamUnion{} - - for _, block := range message.Content { - switch variant := block.AsAny().(type) { - case anthropic.ToolUseBlock: - print(color("[user (" + block.Name + ")]: ")) - - var response interface{} - switch block.Name { - case "get_coordinates": - var input struct { - Location string `json:"location"` - } - - err := json.Unmarshal([]byte(variant.JSON.Input.Raw()), &input) - if err != nil { - panic(err) - } - - response = GetCoordinates(input.Location) - } - - b, err := json.Marshal(response) - if err != nil { - panic(err) - } - - println(string(b)) - - toolResults = append(toolResults, anthropic.NewToolResultBlock(block.ID, string(b), false)) - } - - } - if len(toolResults) == 0 { - break - } - messages = append(messages, anthropic.NewUserMessage(toolResults...)) - } -} - -type GetCoordinatesInput struct { - Location string `json:"location" jsonschema_description:"The location to look up."` -} - -var GetCoordinatesInputSchema = GenerateSchema[GetCoordinatesInput]() - -type GetCoordinateResponse struct { - Long float64 `json:"long"` - Lat float64 `json:"lat"` -} - -func GetCoordinates(location string) GetCoordinateResponse { - return GetCoordinateResponse{ - Long: -122.4194, - Lat: 37.7749, - } -} - -func GenerateSchema[T any]() anthropic.ToolInputSchemaParam { - reflector := jsonschema.Reflector{ - AllowAdditionalProperties: false, - DoNotReference: true, - } - var v T - - schema := reflector.Reflect(v) - - return anthropic.ToolInputSchemaParam{ - Properties: schema.Properties, - } -} - -func color(s string) string { - return fmt.Sprintf("\033[1;%sm%s\033[0m", "33", s) -} -``` - -\`json:"...,required"\`. These -fields are always serialized, even their zero values. - -Optional primitive types are wrapped in a `param.Opt[T]`. These fields can be set with the provided constructors, `anthropic.String(string)`, `anthropic.Int(int64)`, etc. - -Any `param.Opt[T]`, map, slice, struct or string enum uses the -tag\`json:"...,omitzero"\`. Its zero value is considered omitted. - -The `param.IsOmitted(any)` function can confirm the presence of any `omitzero` field. - -```go -p := anthropic.ExampleParams{ - ID: "id_xxx", // required property - Name: anthropic.String("..."), // optional property - - Point: anthropic.Point{ - X: 0, // required field will serialize as 0 - Y: anthropic.Int(1), // optional field will serialize as 1 - // ... omitted non-required fields will not be serialized - }, - - Origin: anthropic.Origin{}, // the zero value of [Origin] is considered omitted -} -``` - -To send `null` instead of a `param.Opt[T]`, use `param.Null[T]()`. -To send `null` instead of a struct `T`, use `param.NullStruct[T]()`. - -```go -p.Name = param.Null[string]() // 'null' instead of string -p.Point = param.NullStruct[Point]() // 'null' instead of struct - -param.IsNull(p.Name) // true -param.IsNull(p.Point) // true -``` - -Request structs contain a `.SetExtraFields(map[string]any)` method which can send non-conforming -fields in the request body. Extra fields overwrite any struct fields with a matching -key. - -> [!WARNING] -> For security reasons, only use `SetExtraFields` with trusted data. - -To send a custom value instead of a struct, use `param.Override[T](value)`. - -```go -// In cases where the API specifies a given type, -// but you want to send something else, use [SetExtraFields]: -p.SetExtraFields(map[string]any{ - "x": 0.01, // send "x" as a float instead of int -}) - -// Send a number instead of an object -custom := param.Override[anthropic.FooParams](12) -``` - -### Request unions - -Unions are represented as a struct with fields prefixed by "Of" for each of it's variants, -only one field can be non-zero. The non-zero field will be serialized. - -Sub-properties of the union can be accessed via methods on the union struct. -These methods return a mutable pointer to the underlying data, if present. - -```go -// Only one field can be non-zero, use param.IsOmitted() to check if a field is set -type AnimalUnionParam struct { - OfCat *Cat `json:",omitzero,inline` - OfDog *Dog `json:",omitzero,inline` -} - -animal := AnimalUnionParam{ - OfCat: &Cat{ - Name: "Whiskers", - Owner: PersonParam{ - Address: AddressParam{Street: "3333 Coyote Hill Rd", Zip: 0}, - }, - }, -} - -// Mutating a field -if address := animal.GetOwner().GetAddress(); address != nil { - address.ZipCode = 94304 -} -``` - -### Response objects - -All fields in response structs are ordinary value types (not pointers or wrappers). -Response structs also include a special `JSON` field containing metadata about -each property. - -```go -type Animal struct { - Name string `json:"name,nullable"` - Owners int `json:"owners"` - Age int `json:"age"` - JSON struct { - Name respjson.Field - Owner respjson.Field - Age respjson.Field - ExtraFields map[string]respjson.Field - } `json:"-"` -} -``` - -To handle optional data, use the `.Valid()` method on the JSON field. -`.Valid()` returns true if a field is not `null`, not present, or couldn't be marshaled. - -If `.Valid()` is false, the corresponding field will simply be its zero value. - -```go -raw := `{"owners": 1, "name": null}` - -var res Animal -json.Unmarshal([]byte(raw), &res) - -// Accessing regular fields - -res.Owners // 1 -res.Name // "" -res.Age // 0 - -// Optional field checks - -res.JSON.Owners.Valid() // true -res.JSON.Name.Valid() // false -res.JSON.Age.Valid() // false - -// Raw JSON values - -res.JSON.Owners.Raw() // "1" -res.JSON.Name.Raw() == "null" // true -res.JSON.Name.Raw() == respjson.Null // true -res.JSON.Age.Raw() == "" // true -res.JSON.Age.Raw() == respjson.Omitted // true -``` - -These `.JSON` structs also include an `ExtraFields` map containing -any properties in the json response that were not specified -in the struct. This can be useful for API features not yet -present in the SDK. - -```go -body := res.JSON.ExtraFields["my_unexpected_field"].Raw() -``` - -### Response Unions - -In responses, unions are represented by a flattened struct containing all possible fields from each of the -object variants. -To convert it to a variant use the `.AsFooVariant()` method or the `.AsAny()` method if present. - -If a response value union contains primitive values, primitive fields will be alongside -the properties but prefixed with `Of` and feature the tag `json:"...,inline"`. - -```go -type AnimalUnion struct { - // From variants [Dog], [Cat] - Owner Person `json:"owner"` - // From variant [Dog] - DogBreed string `json:"dog_breed"` - // From variant [Cat] - CatBreed string `json:"cat_breed"` - // ... - - JSON struct { - Owner respjson.Field - // ... - } `json:"-"` -} - -// If animal variant -if animal.Owner.Address.ZipCode == "" { - panic("missing zip code") -} - -// Switch on the variant -switch variant := animal.AsAny().(type) { -case Dog: -case Cat: -default: - panic("unexpected type") -} -``` - -### RequestOptions - -This library uses the functional options pattern. Functions defined in the -`option` package return a `RequestOption`, which is a closure that mutates a -`RequestConfig`. These options can be supplied to the client or at individual -requests. For example: - -```go -client := anthropic.NewClient( - // Adds a header to every request made by the client - option.WithHeader("X-Some-Header", "custom_header_info"), -) - -client.Messages.New(context.TODO(), ..., - // Override the header - option.WithHeader("X-Some-Header", "some_other_custom_header_info"), - // Add an undocumented field to the request body, using sjson syntax - option.WithJSONSet("some.json.path", map[string]string{"my": "object"}), -) -``` - -See the [full list of request options](https://pkg.go.dev/github.com/anthropics/anthropic-sdk-go/option). - -### Pagination - -This library provides some conveniences for working with paginated list endpoints. - -You can use `.ListAutoPaging()` methods to iterate through items across all pages: - -```go -iter := client.Beta.Messages.Batches.ListAutoPaging(context.TODO(), anthropic.BetaMessageBatchListParams{ - Limit: anthropic.Int(20), -}) -// Automatically fetches more pages as needed. -for iter.Next() { - betaMessageBatch := iter.Current() - fmt.Printf("%+v\n", betaMessageBatch) -} -if err := iter.Err(); err != nil { - panic(err.Error()) -} -``` - -Or you can use simple `.List()` methods to fetch a single page and receive a standard response object -with additional helper methods like `.GetNextPage()`, e.g.: - -```go -page, err := client.Beta.Messages.Batches.List(context.TODO(), anthropic.BetaMessageBatchListParams{ - Limit: anthropic.Int(20), -}) -for page != nil { - for _, batch := range page.Data { - fmt.Printf("%+v\n", batch) - } - page, err = page.GetNextPage() -} -if err != nil { - panic(err.Error()) -} -``` - -### Errors - -When the API returns a non-success status code, we return an error with type -`*anthropic.Error`. This contains the `StatusCode`, `*http.Request`, and -`*http.Response` values of the request, as well as the JSON of the error body -(much like other response objects in the SDK). - -To handle errors, we recommend that you use the `errors.As` pattern: - -```go -_, err := client.Messages.New(context.TODO(), anthropic.MessageNewParams{ - MaxTokens: 1024, - Messages: []anthropic.MessageParam{{ - Content: []anthropic.ContentBlockParamUnion{{ - OfText: &anthropic.TextBlockParam{Text: "What is a quaternion?", CacheControl: anthropic.NewCacheControlEphemeralParam(), Citations: []anthropic.TextCitationParamUnion{{ - OfCharLocation: &anthropic.CitationCharLocationParam{CitedText: "cited_text", DocumentIndex: 0, DocumentTitle: anthropic.String("x"), EndCharIndex: 0, StartCharIndex: 0}, - }}}, - }}, - Role: anthropic.MessageParamRoleUser, - }}, - Model: anthropic.ModelClaude3_7SonnetLatest, -}) -if err != nil { - var apierr *anthropic.Error - if errors.As(err, &apierr) { - println(string(apierr.DumpRequest(true))) // Prints the serialized HTTP request - println(string(apierr.DumpResponse(true))) // Prints the serialized HTTP response - } - panic(err.Error()) // GET "/v1/messages": 400 Bad Request { ... } -} -``` - -When other errors occur, they are returned unwrapped; for example, -if HTTP transport fails, you might receive `*url.Error` wrapping `*net.OpError`. - -### Timeouts - -Requests do not time out by default; use context to configure a timeout for a request lifecycle. - -Note that if a request is [retried](#retries), the context timeout does not start over. -To set a per-retry timeout, use `option.WithRequestTimeout()`. - -```go -// This sets the timeout for the request, including all the retries. -ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) -defer cancel() -client.Messages.New( - ctx, - anthropic.MessageNewParams{ - MaxTokens: 1024, - Messages: []anthropic.MessageParam{{ - Content: []anthropic.ContentBlockParamUnion{{ - OfRequestTextBlock: &anthropic.TextBlockParam{Text: "What is a quaternion?"}, - }}, - Role: anthropic.MessageParamRoleUser, - }}, - Model: anthropic.ModelClaude3_7SonnetLatest, - }, - // This sets the per-retry timeout - option.WithRequestTimeout(20*time.Second), -) -``` - -### Long Requests - -> [!IMPORTANT] -> We highly encourage you use the streaming Messages API for longer running requests. - -We do not recommend setting a large `MaxTokens` value without using streaming as some networks may drop idle connections after a certain period of time, which -can cause the request to fail or [timeout](#timeouts) without receiving a response from Anthropic. - -This SDK will also return an error if a non-streaming request is expected to be above roughly 10 minutes long. -Calling `.Messages.NewStreaming()` or [setting a custom timeout](#timeouts) disables this error. - -### File uploads - -Request parameters that correspond to file uploads in multipart requests are typed as -`io.Reader`. The contents of the `io.Reader` will by default be sent as a multipart form -part with the file name of "anonymous_file" and content-type of "application/octet-stream", so we -recommend always specifyig a custom content-type with the `anthropic.File(reader io.Reader, filename string, contentType string)` -helper we provide to easily wrap any `io.Reader` with the appropriate file name and content type. - -```go -// A file from the file system -file, err := os.Open("/path/to/file.json") -anthropic.BetaFileUploadParams{ - File: anthropic.File(file, "custom-name.json", "application/json"), - Betas: []anthropic.AnthropicBeta{anthropic.AnthropicBetaFilesAPI2025_04_14}, -} - -// A file from a string -anthropic.BetaFileUploadParams{ - File: anthropic.File(strings.NewReader("my file contents"), "custom-name.json", "application/json"), - Betas: []anthropic.AnthropicBeta{anthropic.AnthropicBetaFilesAPI2025_04_14}, -} -``` - -The file name and content-type can also be customized by implementing `Name() string` or `ContentType() -string` on the run-time type of `io.Reader`. Note that `os.File` implements `Name() string`, so a -file returned by `os.Open` will be sent with the file name on disk. - -### Retries - -Certain errors will be automatically retried 2 times by default, with a short exponential backoff. -We retry by default all connection errors, 408 Request Timeout, 409 Conflict, 429 Rate Limit, -and >=500 Internal errors. - -You can use the `WithMaxRetries` option to configure or disable this: - -```go -// Configure the default for all requests: -client := anthropic.NewClient( - option.WithMaxRetries(0), // default is 2 -) - -// Override per-request: -client.Messages.New( - context.TODO(), - anthropic.MessageNewParams{ - MaxTokens: 1024, - Messages: []anthropic.MessageParam{{ - Content: []anthropic.ContentBlockParamUnion{{ - OfRequestTextBlock: &anthropic.TextBlockParam{Text: "What is a quaternion?"}, - }}, - Role: anthropic.MessageParamRoleUser, - }}, - Model: anthropic.ModelClaude3_7SonnetLatest, - }, - option.WithMaxRetries(5), -) -``` - -### Accessing raw response data (e.g. response headers) - -You can access the raw HTTP response data by using the `option.WithResponseInto()` request option. This is useful when -you need to examine response headers, status codes, or other details. - -```go -// Create a variable to store the HTTP response -var response *http.Response -message, err := client.Messages.New( - context.TODO(), - anthropic.MessageNewParams{ - MaxTokens: 1024, - Messages: []anthropic.MessageParam{{ - Content: []anthropic.ContentBlockParamUnion{{ - OfText: &anthropic.TextBlockParam{Text: "What is a quaternion?", CacheControl: anthropic.NewCacheControlEphemeralParam(), Citations: []anthropic.TextCitationParamUnion{{ - OfCharLocation: &anthropic.CitationCharLocationParam{CitedText: "cited_text", DocumentIndex: 0, DocumentTitle: anthropic.String("x"), EndCharIndex: 0, StartCharIndex: 0}, - }}}, - }}, - Role: anthropic.MessageParamRoleUser, - }}, - Model: anthropic.ModelClaude3_7SonnetLatest, - }, - option.WithResponseInto(&response), -) -if err != nil { - // handle error -} -fmt.Printf("%+v\n", message) - -fmt.Printf("Status Code: %d\n", response.StatusCode) -fmt.Printf("Headers: %+#v\n", response.Header) -``` - -### Making custom/undocumented requests - -This library is typed for convenient access to the documented API. If you need to access undocumented -endpoints, params, or response properties, the library can still be used. - -#### Undocumented endpoints - -To make requests to undocumented endpoints, you can use `client.Get`, `client.Post`, and other HTTP verbs. -`RequestOptions` on the client, such as retries, will be respected when making these requests. - -```go -var ( - // params can be an io.Reader, a []byte, an encoding/json serializable object, - // or a "…Params" struct defined in this library. - params map[string]any - - // result can be an []byte, *http.Response, a encoding/json deserializable object, - // or a model defined in this library. - result *http.Response -) -err := client.Post(context.Background(), "/unspecified", params, &result) -if err != nil { - … -} -``` - -#### Undocumented request params - -To make requests using undocumented parameters, you may use either the `option.WithQuerySet()` -or the `option.WithJSONSet()` methods. - -```go -params := FooNewParams{ - ID: "id_xxxx", - Data: FooNewParamsData{ - FirstName: anthropic.String("John"), - }, -} -client.Foo.New(context.Background(), params, option.WithJSONSet("data.last_name", "Doe")) -``` - -#### Undocumented response properties - -To access undocumented response properties, you may either access the raw JSON of the response as a string -with `result.JSON.RawJSON()`, or get the raw JSON of a particular field on the result with -`result.JSON.Foo.Raw()`. - -Any fields that are not present on the response struct will be saved and can be accessed by `result.JSON.ExtraFields()` which returns the extra fields as a `map[string]Field`. - -### Middleware - -We provide `option.WithMiddleware` which applies the given -middleware to requests. - -```go -func Logger(req *http.Request, next option.MiddlewareNext) (res *http.Response, err error) { - // Before the request - start := time.Now() - LogReq(req) - - // Forward the request to the next handler - res, err = next(req) - - // Handle stuff after the request - end := time.Now() - LogRes(res, err, start - end) - - return res, err -} - -client := anthropic.NewClient( - option.WithMiddleware(Logger), -) -``` - -When multiple middlewares are provided as variadic arguments, the middlewares -are applied left to right. If `option.WithMiddleware` is given -multiple times, for example first in the client then the method, the -middleware in the client will run first and the middleware given in the method -will run next. - -You may also replace the default `http.Client` with -`option.WithHTTPClient(client)`. Only one http client is -accepted (this overwrites any previous client) and receives requests after any -middleware has been applied. - -## Amazon Bedrock - -To use this library with [Amazon Bedrock](https://aws.amazon.com/bedrock/claude/), -use the bedrock request option `bedrock.WithLoadDefaultConfig(…)` which reads the -[default config](https://docs.aws.amazon.com/cli/latest/userguide/cli-chap-configure.html). - -Importing the `bedrock` library also globally registers a decoder for `application/vnd.amazon.eventstream` for -streaming. - -```go -package main - -import ( - "github.com/anthropics/anthropic-sdk-go" - "github.com/anthropics/anthropic-sdk-go/bedrock" -) - -func main() { - client := anthropic.NewClient( - bedrock.WithLoadDefaultConfig(context.Background()), - ) -} -``` - -If you already have an `aws.Config`, you can also use it directly with `bedrock.WithConfig(cfg)`. - -Read more about Anthropic and Amazon Bedrock [here](https://docs.anthropic.com/en/api/claude-on-amazon-bedrock). - -## Google Vertex AI - -To use this library with [Google Vertex AI](https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/use-claude), -use the request option `vertex.WithGoogleAuth(…)` which reads the -[Application Default Credentials](https://cloud.google.com/docs/authentication/application-default-credentials). - -```go -package main - -import ( - "context" - - "github.com/anthropics/anthropic-sdk-go" - "github.com/anthropics/anthropic-sdk-go/vertex" -) - -func main() { - client := anthropic.NewClient( - vertex.WithGoogleAuth(context.Background(), "us-central1", "id-xxx"), - ) -} -``` - -If you already have `*google.Credentials`, you can also use it directly with -`vertex.WithCredentials(ctx, region, projectId, creds)`. - -Read more about Anthropic and Google Vertex [here](https://docs.anthropic.com/en/api/claude-on-vertex-ai). - -## Semantic versioning - -This package generally follows [SemVer](https://semver.org/spec/v2.0.0.html) conventions, though certain backwards-incompatible changes may be released as minor versions: - -1. Changes to library internals which are technically public but not intended or documented for external use. _(Please open a GitHub issue to let us know if you are relying on such internals.)_ -2. Changes that we do not expect to impact the vast majority of users in practice. - -We take backwards-compatibility seriously and work hard to ensure you can rely on a smooth upgrade experience. - -We are keen for your feedback; please open an [issue](https://www.github.com/anthropics/anthropic-sdk-go/issues) with questions, bugs, or suggestions. - -## Contributing - -See [the contributing documentation](./CONTRIBUTING.md). diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/SECURITY.md b/vendor/github.com/anthropics/anthropic-sdk-go/SECURITY.md deleted file mode 100644 index 49f2cc770a17a0263ed54c0a5b58ed460111167b..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/SECURITY.md +++ /dev/null @@ -1,27 +0,0 @@ -# Security Policy - -## Reporting Security Issues - -This SDK is generated by [Stainless Software Inc](http://stainless.com). Stainless takes security seriously, and encourages you to report any security vulnerability promptly so that appropriate action can be taken. - -To report a security issue, please contact the Stainless team at security@stainless.com. - -## Responsible Disclosure - -We appreciate the efforts of security researchers and individuals who help us maintain the security of -SDKs we generate. If you believe you have found a security vulnerability, please adhere to responsible -disclosure practices by allowing us a reasonable amount of time to investigate and address the issue -before making any information public. - -## Reporting Non-SDK Related Security Issues - -If you encounter security issues that are not directly related to SDKs but pertain to the services -or products provided by Anthropic, please follow the respective company's security reporting guidelines. - -### Anthropic Terms and Policies - -Please contact support@anthropic.com for any questions or concerns regarding the security of our services. - ---- - -Thank you for helping us keep the SDKs and systems they interact with secure. diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/aliases.go b/vendor/github.com/anthropics/anthropic-sdk-go/aliases.go deleted file mode 100644 index ac8ef283c6f5235af3a37c3d081bb99c690f423b..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/aliases.go +++ /dev/null @@ -1,50 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "github.com/anthropics/anthropic-sdk-go/internal/apierror" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "github.com/anthropics/anthropic-sdk-go/shared" -) - -// aliased to make [param.APIUnion] private when embedding -type paramUnion = param.APIUnion - -// aliased to make [param.APIObject] private when embedding -type paramObj = param.APIObject - -type Error = apierror.Error - -// This is an alias to an internal type. -type APIErrorObject = shared.APIErrorObject - -// This is an alias to an internal type. -type AuthenticationError = shared.AuthenticationError - -// This is an alias to an internal type. -type BillingError = shared.BillingError - -// This is an alias to an internal type. -type ErrorObjectUnion = shared.ErrorObjectUnion - -// This is an alias to an internal type. -type ErrorResponse = shared.ErrorResponse - -// This is an alias to an internal type. -type GatewayTimeoutError = shared.GatewayTimeoutError - -// This is an alias to an internal type. -type InvalidRequestError = shared.InvalidRequestError - -// This is an alias to an internal type. -type NotFoundError = shared.NotFoundError - -// This is an alias to an internal type. -type OverloadedError = shared.OverloadedError - -// This is an alias to an internal type. -type PermissionError = shared.PermissionError - -// This is an alias to an internal type. -type RateLimitError = shared.RateLimitError diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/api.md b/vendor/github.com/anthropics/anthropic-sdk-go/api.md deleted file mode 100644 index 0f8713636796eea9a7b10b144dd4c04517f0ebdd..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/api.md +++ /dev/null @@ -1,329 +0,0 @@ -# Shared Response Types - -- shared.APIErrorObject -- shared.AuthenticationError -- shared.BillingError -- shared.ErrorObjectUnion -- shared.ErrorResponse -- shared.GatewayTimeoutError -- shared.InvalidRequestError -- shared.NotFoundError -- shared.OverloadedError -- shared.PermissionError -- shared.RateLimitError - -# Messages - -Params Types: - -- anthropic.Base64ImageSourceParam -- anthropic.Base64PDFSourceParam -- anthropic.CacheControlEphemeralParam -- anthropic.CitationCharLocationParam -- anthropic.CitationContentBlockLocationParam -- anthropic.CitationPageLocationParam -- anthropic.CitationWebSearchResultLocationParam -- anthropic.CitationsConfigParam -- anthropic.ContentBlockParamUnion -- anthropic.ContentBlockSourceParam -- anthropic.ContentBlockSourceContentUnionParam -- anthropic.DocumentBlockParam -- anthropic.ImageBlockParam -- anthropic.MessageCountTokensToolUnionParam -- anthropic.MessageParam -- anthropic.MetadataParam -- anthropic.Model -- anthropic.PlainTextSourceParam -- anthropic.RedactedThinkingBlockParam -- anthropic.ServerToolUseBlockParam -- anthropic.TextBlockParam -- anthropic.TextCitationParamUnion -- anthropic.ThinkingBlockParam -- anthropic.ThinkingConfigDisabledParam -- anthropic.ThinkingConfigEnabledParam -- anthropic.ThinkingConfigParamUnion -- anthropic.ToolParam -- anthropic.ToolBash20250124Param -- anthropic.ToolChoiceUnionParam -- anthropic.ToolChoiceAnyParam -- anthropic.ToolChoiceAutoParam -- anthropic.ToolChoiceNoneParam -- anthropic.ToolChoiceToolParam -- anthropic.ToolResultBlockParam -- anthropic.ToolTextEditor20250124Param -- anthropic.ToolUnionParam -- anthropic.ToolUseBlockParam -- anthropic.URLImageSourceParam -- anthropic.URLPDFSourceParam -- anthropic.WebSearchResultBlockParam -- anthropic.WebSearchTool20250305Param -- anthropic.WebSearchToolRequestErrorParam -- anthropic.WebSearchToolResultBlockParam -- anthropic.WebSearchToolResultBlockParamContentUnion - -Response Types: - -- anthropic.CitationCharLocation -- anthropic.CitationContentBlockLocation -- anthropic.CitationPageLocation -- anthropic.CitationsDelta -- anthropic.CitationsWebSearchResultLocation -- anthropic.ContentBlockUnion -- anthropic.InputJSONDelta -- anthropic.Message -- anthropic.MessageDeltaUsage -- anthropic.MessageTokensCount -- anthropic.Model -- anthropic.RawContentBlockDeltaUnion -- anthropic.ContentBlockDeltaEvent -- anthropic.ContentBlockStartEvent -- anthropic.ContentBlockStopEvent -- anthropic.MessageDeltaEvent -- anthropic.MessageStartEvent -- anthropic.MessageStopEvent -- anthropic.MessageStreamEventUnion -- anthropic.RedactedThinkingBlock -- anthropic.ServerToolUsage -- anthropic.ServerToolUseBlock -- anthropic.SignatureDelta -- anthropic.StopReason -- anthropic.TextBlock -- anthropic.TextCitationUnion -- anthropic.TextDelta -- anthropic.ThinkingBlock -- anthropic.ThinkingDelta -- anthropic.ToolUseBlock -- anthropic.Usage -- anthropic.WebSearchResultBlock -- anthropic.WebSearchToolResultBlock -- anthropic.WebSearchToolResultBlockContentUnion -- anthropic.WebSearchToolResultError - -Methods: - --client.Messages.New(ctx context.Context, body anthropic.MessageNewParams) (anthropic.Message, error)--client.Messages.CountTokens(ctx context.Context, body anthropic.MessageCountTokensParams) (anthropic.MessageTokensCount, error)- -## Batches - -Response Types: - -- anthropic.DeletedMessageBatch -- anthropic.MessageBatch -- anthropic.MessageBatchCanceledResult -- anthropic.MessageBatchErroredResult -- anthropic.MessageBatchExpiredResult -- anthropic.MessageBatchIndividualResponse -- anthropic.MessageBatchRequestCounts -- anthropic.MessageBatchResultUnion -- anthropic.MessageBatchSucceededResult - -Methods: - --client.Messages.Batches.New(ctx context.Context, body anthropic.MessageBatchNewParams) (anthropic.MessageBatch, error)--client.Messages.Batches.Get(ctx context.Context, messageBatchID string) (anthropic.MessageBatch, error)--client.Messages.Batches.List(ctx context.Context, query anthropic.MessageBatchListParams) (pagination.Page[anthropic.MessageBatch], error)--client.Messages.Batches.Delete(ctx context.Context, messageBatchID string) (anthropic.DeletedMessageBatch, error)--client.Messages.Batches.Cancel(ctx context.Context, messageBatchID string) (anthropic.MessageBatch, error)--client.Messages.Batches.Results(ctx context.Context, messageBatchID string) (anthropic.MessageBatchIndividualResponse, error)- -# Models - -Response Types: - -- anthropic.ModelInfo - -Methods: - --client.Models.Get(ctx context.Context, modelID string, query anthropic.ModelGetParams) (anthropic.ModelInfo, error)--client.Models.List(ctx context.Context, params anthropic.ModelListParams) (pagination.Page[anthropic.ModelInfo], error)- -# Beta - -Params Types: - -- anthropic.AnthropicBeta - -Response Types: - -- anthropic.BetaAPIError -- anthropic.BetaAuthenticationError -- anthropic.BetaBillingError -- anthropic.BetaErrorUnion -- anthropic.BetaErrorResponse -- anthropic.BetaGatewayTimeoutError -- anthropic.BetaInvalidRequestError -- anthropic.BetaNotFoundError -- anthropic.BetaOverloadedError -- anthropic.BetaPermissionError -- anthropic.BetaRateLimitError - -## Models - -Response Types: - -- anthropic.BetaModelInfo - -Methods: - --client.Beta.Models.Get(ctx context.Context, modelID string, query anthropic.BetaModelGetParams) (anthropic.BetaModelInfo, error)--client.Beta.Models.List(ctx context.Context, params anthropic.BetaModelListParams) (pagination.Page[anthropic.BetaModelInfo], error)- -## Messages - -Params Types: - -- anthropic.BetaBase64ImageSourceParam -- anthropic.BetaBase64PDFBlockParam -- anthropic.BetaBase64PDFSourceParam -- anthropic.BetaCacheControlEphemeralParam -- anthropic.BetaCitationCharLocationParam -- anthropic.BetaCitationContentBlockLocationParam -- anthropic.BetaCitationPageLocationParam -- anthropic.BetaCitationWebSearchResultLocationParam -- anthropic.BetaCitationsConfigParam -- anthropic.BetaCodeExecutionOutputBlockParam -- anthropic.BetaCodeExecutionResultBlockParam -- anthropic.BetaCodeExecutionTool20250522Param -- anthropic.BetaCodeExecutionToolResultBlockParam -- anthropic.BetaCodeExecutionToolResultBlockParamContentUnion -- anthropic.BetaCodeExecutionToolResultErrorCode -- anthropic.BetaCodeExecutionToolResultErrorParam -- anthropic.BetaContainerUploadBlockParam -- anthropic.BetaContentBlockParamUnion -- anthropic.BetaContentBlockSourceParam -- anthropic.BetaContentBlockSourceContentUnionParam -- anthropic.BetaFileDocumentSourceParam -- anthropic.BetaFileImageSourceParam -- anthropic.BetaImageBlockParam -- anthropic.BetaMCPToolUseBlockParam -- anthropic.BetaMessageParam -- anthropic.BetaMetadataParam -- anthropic.BetaPlainTextSourceParam -- anthropic.BetaRedactedThinkingBlockParam -- anthropic.BetaRequestMCPServerToolConfigurationParam -- anthropic.BetaRequestMCPServerURLDefinitionParam -- anthropic.BetaRequestMCPToolResultBlockParam -- anthropic.BetaServerToolUseBlockParam -- anthropic.BetaTextBlockParam -- anthropic.BetaTextCitationParamUnion -- anthropic.BetaThinkingBlockParam -- anthropic.BetaThinkingConfigDisabledParam -- anthropic.BetaThinkingConfigEnabledParam -- anthropic.BetaThinkingConfigParamUnion -- anthropic.BetaToolParam -- anthropic.BetaToolBash20241022Param -- anthropic.BetaToolBash20250124Param -- anthropic.BetaToolChoiceUnionParam -- anthropic.BetaToolChoiceAnyParam -- anthropic.BetaToolChoiceAutoParam -- anthropic.BetaToolChoiceNoneParam -- anthropic.BetaToolChoiceToolParam -- anthropic.BetaToolComputerUse20241022Param -- anthropic.BetaToolComputerUse20250124Param -- anthropic.BetaToolResultBlockParam -- anthropic.BetaToolTextEditor20241022Param -- anthropic.BetaToolTextEditor20250124Param -- anthropic.BetaToolTextEditor20250429Param -- anthropic.BetaToolUnionParam -- anthropic.BetaToolUseBlockParam -- anthropic.BetaURLImageSourceParam -- anthropic.BetaURLPDFSourceParam -- anthropic.BetaWebSearchResultBlockParam -- anthropic.BetaWebSearchTool20250305Param -- anthropic.BetaWebSearchToolRequestErrorParam -- anthropic.BetaWebSearchToolResultBlockParam -- anthropic.BetaWebSearchToolResultBlockParamContentUnion -- anthropic.BetaWebSearchToolResultErrorCode - -Response Types: - -- anthropic.BetaCacheCreation -- anthropic.BetaCitationCharLocation -- anthropic.BetaCitationContentBlockLocation -- anthropic.BetaCitationPageLocation -- anthropic.BetaCitationsDelta -- anthropic.BetaCitationsWebSearchResultLocation -- anthropic.BetaCodeExecutionOutputBlock -- anthropic.BetaCodeExecutionResultBlock -- anthropic.BetaCodeExecutionToolResultBlock -- anthropic.BetaCodeExecutionToolResultBlockContentUnion -- anthropic.BetaCodeExecutionToolResultError -- anthropic.BetaCodeExecutionToolResultErrorCode -- anthropic.BetaContainer -- anthropic.BetaContainerUploadBlock -- anthropic.BetaContentBlockUnion -- anthropic.BetaInputJSONDelta -- anthropic.BetaMCPToolResultBlock -- anthropic.BetaMCPToolUseBlock -- anthropic.BetaMessage -- anthropic.BetaMessageDeltaUsage -- anthropic.BetaMessageTokensCount -- anthropic.BetaRawContentBlockDeltaUnion -- anthropic.BetaRawContentBlockDeltaEvent -- anthropic.BetaRawContentBlockStartEvent -- anthropic.BetaRawContentBlockStopEvent -- anthropic.BetaRawMessageDeltaEvent -- anthropic.BetaRawMessageStartEvent -- anthropic.BetaRawMessageStopEvent -- anthropic.BetaRawMessageStreamEventUnion -- anthropic.BetaRedactedThinkingBlock -- anthropic.BetaServerToolUsage -- anthropic.BetaServerToolUseBlock -- anthropic.BetaSignatureDelta -- anthropic.BetaStopReason -- anthropic.BetaTextBlock -- anthropic.BetaTextCitationUnion -- anthropic.BetaTextDelta -- anthropic.BetaThinkingBlock -- anthropic.BetaThinkingDelta -- anthropic.BetaToolUseBlock -- anthropic.BetaUsage -- anthropic.BetaWebSearchResultBlock -- anthropic.BetaWebSearchToolResultBlock -- anthropic.BetaWebSearchToolResultBlockContentUnion -- anthropic.BetaWebSearchToolResultError -- anthropic.BetaWebSearchToolResultErrorCode - -Methods: - --client.Beta.Messages.New(ctx context.Context, params anthropic.BetaMessageNewParams) (anthropic.BetaMessage, error)--client.Beta.Messages.CountTokens(ctx context.Context, params anthropic.BetaMessageCountTokensParams) (anthropic.BetaMessageTokensCount, error)- -### Batches - -Response Types: - -- anthropic.BetaDeletedMessageBatch -- anthropic.BetaMessageBatch -- anthropic.BetaMessageBatchCanceledResult -- anthropic.BetaMessageBatchErroredResult -- anthropic.BetaMessageBatchExpiredResult -- anthropic.BetaMessageBatchIndividualResponse -- anthropic.BetaMessageBatchRequestCounts -- anthropic.BetaMessageBatchResultUnion -- anthropic.BetaMessageBatchSucceededResult - -Methods: - --client.Beta.Messages.Batches.New(ctx context.Context, params anthropic.BetaMessageBatchNewParams) (anthropic.BetaMessageBatch, error)--client.Beta.Messages.Batches.Get(ctx context.Context, messageBatchID string, query anthropic.BetaMessageBatchGetParams) (anthropic.BetaMessageBatch, error)--client.Beta.Messages.Batches.List(ctx context.Context, params anthropic.BetaMessageBatchListParams) (pagination.Page[anthropic.BetaMessageBatch], error)--client.Beta.Messages.Batches.Delete(ctx context.Context, messageBatchID string, body anthropic.BetaMessageBatchDeleteParams) (anthropic.BetaDeletedMessageBatch, error)--client.Beta.Messages.Batches.Cancel(ctx context.Context, messageBatchID string, body anthropic.BetaMessageBatchCancelParams) (anthropic.BetaMessageBatch, error)--client.Beta.Messages.Batches.Results(ctx context.Context, messageBatchID string, query anthropic.BetaMessageBatchResultsParams) (anthropic.BetaMessageBatchIndividualResponse, error)- -## Files - -Response Types: - -- anthropic.DeletedFile -- anthropic.FileMetadata - -Methods: - --client.Beta.Files.List(ctx context.Context, params anthropic.BetaFileListParams) (pagination.Page[anthropic.FileMetadata], error)--client.Beta.Files.Delete(ctx context.Context, fileID string, body anthropic.BetaFileDeleteParams) (anthropic.DeletedFile, error)--client.Beta.Files.Download(ctx context.Context, fileID string, query anthropic.BetaFileDownloadParams) (http.Response, error)--client.Beta.Files.GetMetadata(ctx context.Context, fileID string, query anthropic.BetaFileGetMetadataParams) (anthropic.FileMetadata, error)--client.Beta.Files.Upload(ctx context.Context, params anthropic.BetaFileUploadParams) (anthropic.FileMetadata, error)diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/bedrock/bedrock.go b/vendor/github.com/anthropics/anthropic-sdk-go/bedrock/bedrock.go deleted file mode 100644 index 57b0008a817977f719edac9f6b02757fa6e82ff1..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/bedrock/bedrock.go +++ /dev/null @@ -1,245 +0,0 @@ -package bedrock - -import ( - "bytes" - "context" - "crypto/sha256" - "encoding/base64" - "encoding/hex" - "encoding/json" - "fmt" - "io" - "net/http" - "time" - - "github.com/aws/aws-sdk-go-v2/aws" - "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream" - "github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi" - v4 "github.com/aws/aws-sdk-go-v2/aws/signer/v4" - "github.com/aws/aws-sdk-go-v2/config" - "github.com/tidwall/gjson" - "github.com/tidwall/sjson" - - "github.com/anthropics/anthropic-sdk-go/internal/requestconfig" - "github.com/anthropics/anthropic-sdk-go/option" - "github.com/anthropics/anthropic-sdk-go/packages/ssestream" -) - -const DefaultVersion = "bedrock-2023-05-31" - -var DefaultEndpoints = map[string]bool{ - "/v1/complete": true, - "/v1/messages": true, -} - -type eventstreamChunk struct { - Bytes string `json:"bytes"` - P string `json:"p"` -} - -type eventstreamDecoder struct { - eventstream.Decoder - - rc io.ReadCloser - evt ssestream.Event - err error -} - -func (e *eventstreamDecoder) Close() error { - return e.rc.Close() -} - -func (e *eventstreamDecoder) Err() error { - return e.err -} - -func (e *eventstreamDecoder) Next() bool { - if e.err != nil { - return false - } - - msg, err := e.Decoder.Decode(e.rc, nil) - if err != nil { - e.err = err - return false - } - - messageType := msg.Headers.Get(eventstreamapi.MessageTypeHeader) - if messageType == nil { - e.err = fmt.Errorf("%s event header not present", eventstreamapi.MessageTypeHeader) - return false - } - - switch messageType.String() { - case eventstreamapi.EventMessageType: - eventType := msg.Headers.Get(eventstreamapi.EventTypeHeader) - if eventType == nil { - e.err = fmt.Errorf("%s event header not present", eventstreamapi.EventTypeHeader) - return false - } - - if eventType.String() == "chunk" { - chunk := eventstreamChunk{} - err = json.Unmarshal(msg.Payload, &chunk) - if err != nil { - e.err = err - return false - } - decoded, err := base64.StdEncoding.DecodeString(chunk.Bytes) - if err != nil { - e.err = err - return false - } - e.evt = ssestream.Event{ - Type: gjson.GetBytes(decoded, "type").String(), - Data: decoded, - } - } - - case eventstreamapi.ExceptionMessageType: - // See https://github.com/aws/aws-sdk-go-v2/blob/885de40869f9bcee29ad11d60967aa0f1b571d46/service/iotsitewise/deserializers.go#L15511C1-L15567C2 - exceptionType := msg.Headers.Get(eventstreamapi.ExceptionTypeHeader) - if exceptionType == nil { - e.err = fmt.Errorf("%s event header not present", eventstreamapi.ExceptionTypeHeader) - return false - } - - // See https://github.com/aws/aws-sdk-go-v2/blob/885de40869f9bcee29ad11d60967aa0f1b571d46/aws/protocol/restjson/decoder_util.go#L15-L48k - var errInfo struct { - Code string - Type string `json:"__type"` - Message string - } - err = json.Unmarshal(msg.Payload, &errInfo) - if err != nil && err != io.EOF { - e.err = fmt.Errorf("received exception %s: parsing exception payload failed: %w", exceptionType.String(), err) - return false - } - - errorCode := "UnknownError" - errorMessage := errorCode - if ev := exceptionType.String(); len(ev) > 0 { - errorCode = ev - } else if len(errInfo.Code) > 0 { - errorCode = errInfo.Code - } else if len(errInfo.Type) > 0 { - errorCode = errInfo.Type - } - - if len(errInfo.Message) > 0 { - errorMessage = errInfo.Message - } - e.err = fmt.Errorf("received exception %s: %s", errorCode, errorMessage) - return false - - case eventstreamapi.ErrorMessageType: - errorCode := "UnknownError" - errorMessage := errorCode - if header := msg.Headers.Get(eventstreamapi.ErrorCodeHeader); header != nil { - errorCode = header.String() - } - if header := msg.Headers.Get(eventstreamapi.ErrorMessageHeader); header != nil { - errorMessage = header.String() - } - e.err = fmt.Errorf("received error %s: %s", errorCode, errorMessage) - return false - } - - return true -} - -func (e *eventstreamDecoder) Event() ssestream.Event { - return e.evt -} - -var ( - _ ssestream.Decoder = &eventstreamDecoder{} -) - -func init() { - ssestream.RegisterDecoder("application/vnd.amazon.eventstream", func(rc io.ReadCloser) ssestream.Decoder { - return &eventstreamDecoder{rc: rc} - }) -} - -// WithLoadDefaultConfig returns a request option which loads the default config for Amazon and registers -// middleware that intercepts request to the Messages API so that this SDK can be used with Amazon Bedrock. -// -// If you already have an [aws.Config], it is recommended that you instead call [WithConfig] directly. -func WithLoadDefaultConfig(ctx context.Context, optFns ...func(*config.LoadOptions) error) option.RequestOption { - cfg, err := config.LoadDefaultConfig(ctx, optFns...) - if err != nil { - panic(err) - } - return WithConfig(cfg) -} - -// WithConfig returns a request option which uses the provided config and registers middleware that -// intercepts request to the Messages API so that this SDK can be used with Amazon Bedrock. -func WithConfig(cfg aws.Config) option.RequestOption { - signer := v4.NewSigner() - middleware := bedrockMiddleware(signer, cfg) - - return requestconfig.RequestOptionFunc(func(rc *requestconfig.RequestConfig) error { - return rc.Apply( - option.WithBaseURL(fmt.Sprintf("https://bedrock-runtime.%s.amazonaws.com", cfg.Region)), - option.WithMiddleware(middleware), - ) - }) -} - -func bedrockMiddleware(signer *v4.Signer, cfg aws.Config) option.Middleware { - return func(r *http.Request, next option.MiddlewareNext) (res *http.Response, err error) { - var body []byte - if r.Body != nil { - body, err = io.ReadAll(r.Body) - if err != nil { - return nil, err - } - r.Body.Close() - - if !gjson.GetBytes(body, "anthropic_version").Exists() { - body, _ = sjson.SetBytes(body, "anthropic_version", DefaultVersion) - } - - if r.Method == http.MethodPost && DefaultEndpoints[r.URL.Path] { - model := gjson.GetBytes(body, "model").String() - stream := gjson.GetBytes(body, "stream").Bool() - - body, _ = sjson.DeleteBytes(body, "model") - body, _ = sjson.DeleteBytes(body, "stream") - - var path string - if stream { - path = fmt.Sprintf("/model/%s/invoke-with-response-stream", model) - } else { - path = fmt.Sprintf("/model/%s/invoke", model) - } - - r.URL.Path = path - } - - reader := bytes.NewReader(body) - r.Body = io.NopCloser(reader) - r.GetBody = func() (io.ReadCloser, error) { - _, err := reader.Seek(0, 0) - return io.NopCloser(reader), err - } - r.ContentLength = int64(len(body)) - } - - ctx := r.Context() - credentials, err := cfg.Credentials.Retrieve(ctx) - if err != nil { - return nil, err - } - - hash := sha256.Sum256(body) - err = signer.SignHTTP(ctx, credentials, r, hex.EncodeToString(hash[:]), "bedrock", cfg.Region, time.Now()) - if err != nil { - return nil, err - } - - return next(r) - } -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/beta.go b/vendor/github.com/anthropics/anthropic-sdk-go/beta.go deleted file mode 100644 index ad78798cfddae1d3678959918f5db5b606d1ce83..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/beta.go +++ /dev/null @@ -1,364 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "encoding/json" - - "github.com/anthropics/anthropic-sdk-go/internal/apijson" - "github.com/anthropics/anthropic-sdk-go/option" - "github.com/anthropics/anthropic-sdk-go/packages/respjson" - "github.com/anthropics/anthropic-sdk-go/shared/constant" -) - -// BetaService contains methods and other services that help with interacting with -// the anthropic API. -// -// Note, unlike clients, this service does not read variables from the environment -// automatically. You should not instantiate this service directly, and instead use -// the [NewBetaService] method instead. -type BetaService struct { - Options []option.RequestOption - Models BetaModelService - Messages BetaMessageService - Files BetaFileService -} - -// NewBetaService generates a new service that applies the given options to each -// request. These options are applied after the parent client's options (if there -// is one), and before any request-specific options. -func NewBetaService(opts ...option.RequestOption) (r BetaService) { - r = BetaService{} - r.Options = opts - r.Models = NewBetaModelService(opts...) - r.Messages = NewBetaMessageService(opts...) - r.Files = NewBetaFileService(opts...) - return -} - -type AnthropicBeta = string - -const ( - AnthropicBetaMessageBatches2024_09_24 AnthropicBeta = "message-batches-2024-09-24" - AnthropicBetaPromptCaching2024_07_31 AnthropicBeta = "prompt-caching-2024-07-31" - AnthropicBetaComputerUse2024_10_22 AnthropicBeta = "computer-use-2024-10-22" - AnthropicBetaComputerUse2025_01_24 AnthropicBeta = "computer-use-2025-01-24" - AnthropicBetaPDFs2024_09_25 AnthropicBeta = "pdfs-2024-09-25" - AnthropicBetaTokenCounting2024_11_01 AnthropicBeta = "token-counting-2024-11-01" - AnthropicBetaTokenEfficientTools2025_02_19 AnthropicBeta = "token-efficient-tools-2025-02-19" - AnthropicBetaOutput128k2025_02_19 AnthropicBeta = "output-128k-2025-02-19" - AnthropicBetaFilesAPI2025_04_14 AnthropicBeta = "files-api-2025-04-14" - AnthropicBetaMCPClient2025_04_04 AnthropicBeta = "mcp-client-2025-04-04" - AnthropicBetaDevFullThinking2025_05_14 AnthropicBeta = "dev-full-thinking-2025-05-14" - AnthropicBetaInterleavedThinking2025_05_14 AnthropicBeta = "interleaved-thinking-2025-05-14" - AnthropicBetaCodeExecution2025_05_22 AnthropicBeta = "code-execution-2025-05-22" - AnthropicBetaExtendedCacheTTL2025_04_11 AnthropicBeta = "extended-cache-ttl-2025-04-11" -) - -type BetaAPIError struct { - Message string `json:"message,required"` - Type constant.APIError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaAPIError) RawJSON() string { return r.JSON.raw } -func (r *BetaAPIError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaAuthenticationError struct { - Message string `json:"message,required"` - Type constant.AuthenticationError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaAuthenticationError) RawJSON() string { return r.JSON.raw } -func (r *BetaAuthenticationError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaBillingError struct { - Message string `json:"message,required"` - Type constant.BillingError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaBillingError) RawJSON() string { return r.JSON.raw } -func (r *BetaBillingError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaErrorUnion contains all possible properties and values from -// [BetaInvalidRequestError], [BetaAuthenticationError], [BetaBillingError], -// [BetaPermissionError], [BetaNotFoundError], [BetaRateLimitError], -// [BetaGatewayTimeoutError], [BetaAPIError], [BetaOverloadedError]. -// -// Use the [BetaErrorUnion.AsAny] method to switch on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaErrorUnion struct { - Message string `json:"message"` - // Any of "invalid_request_error", "authentication_error", "billing_error", - // "permission_error", "not_found_error", "rate_limit_error", "timeout_error", - // "api_error", "overloaded_error". - Type string `json:"type"` - JSON struct { - Message respjson.Field - Type respjson.Field - raw string - } `json:"-"` -} - -// anyBetaError is implemented by each variant of [BetaErrorUnion] to add type -// safety for the return type of [BetaErrorUnion.AsAny] -type anyBetaError interface { - implBetaErrorUnion() -} - -func (BetaInvalidRequestError) implBetaErrorUnion() {} -func (BetaAuthenticationError) implBetaErrorUnion() {} -func (BetaBillingError) implBetaErrorUnion() {} -func (BetaPermissionError) implBetaErrorUnion() {} -func (BetaNotFoundError) implBetaErrorUnion() {} -func (BetaRateLimitError) implBetaErrorUnion() {} -func (BetaGatewayTimeoutError) implBetaErrorUnion() {} -func (BetaAPIError) implBetaErrorUnion() {} -func (BetaOverloadedError) implBetaErrorUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaErrorUnion.AsAny().(type) { -// case anthropic.BetaInvalidRequestError: -// case anthropic.BetaAuthenticationError: -// case anthropic.BetaBillingError: -// case anthropic.BetaPermissionError: -// case anthropic.BetaNotFoundError: -// case anthropic.BetaRateLimitError: -// case anthropic.BetaGatewayTimeoutError: -// case anthropic.BetaAPIError: -// case anthropic.BetaOverloadedError: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaErrorUnion) AsAny() anyBetaError { - switch u.Type { - case "invalid_request_error": - return u.AsInvalidRequestError() - case "authentication_error": - return u.AsAuthenticationError() - case "billing_error": - return u.AsBillingError() - case "permission_error": - return u.AsPermissionError() - case "not_found_error": - return u.AsNotFoundError() - case "rate_limit_error": - return u.AsRateLimitError() - case "timeout_error": - return u.AsTimeoutError() - case "api_error": - return u.AsAPIError() - case "overloaded_error": - return u.AsOverloadedError() - } - return nil -} - -func (u BetaErrorUnion) AsInvalidRequestError() (v BetaInvalidRequestError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsAuthenticationError() (v BetaAuthenticationError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsBillingError() (v BetaBillingError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsPermissionError() (v BetaPermissionError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsNotFoundError() (v BetaNotFoundError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsRateLimitError() (v BetaRateLimitError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsTimeoutError() (v BetaGatewayTimeoutError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsAPIError() (v BetaAPIError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaErrorUnion) AsOverloadedError() (v BetaOverloadedError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaErrorUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaErrorUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaErrorResponse struct { - Error BetaErrorUnion `json:"error,required"` - Type constant.Error `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Error respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaErrorResponse) RawJSON() string { return r.JSON.raw } -func (r *BetaErrorResponse) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaGatewayTimeoutError struct { - Message string `json:"message,required"` - Type constant.TimeoutError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaGatewayTimeoutError) RawJSON() string { return r.JSON.raw } -func (r *BetaGatewayTimeoutError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaInvalidRequestError struct { - Message string `json:"message,required"` - Type constant.InvalidRequestError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaInvalidRequestError) RawJSON() string { return r.JSON.raw } -func (r *BetaInvalidRequestError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaNotFoundError struct { - Message string `json:"message,required"` - Type constant.NotFoundError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaNotFoundError) RawJSON() string { return r.JSON.raw } -func (r *BetaNotFoundError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaOverloadedError struct { - Message string `json:"message,required"` - Type constant.OverloadedError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaOverloadedError) RawJSON() string { return r.JSON.raw } -func (r *BetaOverloadedError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaPermissionError struct { - Message string `json:"message,required"` - Type constant.PermissionError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaPermissionError) RawJSON() string { return r.JSON.raw } -func (r *BetaPermissionError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRateLimitError struct { - Message string `json:"message,required"` - Type constant.RateLimitError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRateLimitError) RawJSON() string { return r.JSON.raw } -func (r *BetaRateLimitError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/betafile.go b/vendor/github.com/anthropics/anthropic-sdk-go/betafile.go deleted file mode 100644 index 593b21108c7b399ddc3bac414f72db4d328007a3..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/betafile.go +++ /dev/null @@ -1,270 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "bytes" - "context" - "errors" - "fmt" - "io" - "mime/multipart" - "net/http" - "net/url" - "time" - - "github.com/anthropics/anthropic-sdk-go/internal/apiform" - "github.com/anthropics/anthropic-sdk-go/internal/apijson" - "github.com/anthropics/anthropic-sdk-go/internal/apiquery" - "github.com/anthropics/anthropic-sdk-go/internal/requestconfig" - "github.com/anthropics/anthropic-sdk-go/option" - "github.com/anthropics/anthropic-sdk-go/packages/pagination" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "github.com/anthropics/anthropic-sdk-go/packages/respjson" - "github.com/anthropics/anthropic-sdk-go/shared/constant" -) - -// BetaFileService contains methods and other services that help with interacting -// with the anthropic API. -// -// Note, unlike clients, this service does not read variables from the environment -// automatically. You should not instantiate this service directly, and instead use -// the [NewBetaFileService] method instead. -type BetaFileService struct { - Options []option.RequestOption -} - -// NewBetaFileService generates a new service that applies the given options to -// each request. These options are applied after the parent client's options (if -// there is one), and before any request-specific options. -func NewBetaFileService(opts ...option.RequestOption) (r BetaFileService) { - r = BetaFileService{} - r.Options = opts - return -} - -// List Files -func (r *BetaFileService) List(ctx context.Context, params BetaFileListParams, opts ...option.RequestOption) (res *pagination.Page[FileMetadata], err error) { - var raw *http.Response - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "files-api-2025-04-14"), option.WithResponseInto(&raw)}, opts...) - path := "v1/files?beta=true" - cfg, err := requestconfig.NewRequestConfig(ctx, http.MethodGet, path, params, &res, opts...) - if err != nil { - return nil, err - } - err = cfg.Execute() - if err != nil { - return nil, err - } - res.SetPageConfig(cfg, raw) - return res, nil -} - -// List Files -func (r *BetaFileService) ListAutoPaging(ctx context.Context, params BetaFileListParams, opts ...option.RequestOption) *pagination.PageAutoPager[FileMetadata] { - return pagination.NewPageAutoPager(r.List(ctx, params, opts...)) -} - -// Delete File -func (r *BetaFileService) Delete(ctx context.Context, fileID string, body BetaFileDeleteParams, opts ...option.RequestOption) (res *DeletedFile, err error) { - for _, v := range body.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "files-api-2025-04-14")}, opts...) - if fileID == "" { - err = errors.New("missing required file_id parameter") - return - } - path := fmt.Sprintf("v1/files/%s?beta=true", fileID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) - return -} - -// Download File -func (r *BetaFileService) Download(ctx context.Context, fileID string, query BetaFileDownloadParams, opts ...option.RequestOption) (res *http.Response, err error) { - for _, v := range query.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "files-api-2025-04-14"), option.WithHeader("Accept", "application/binary")}, opts...) - if fileID == "" { - err = errors.New("missing required file_id parameter") - return - } - path := fmt.Sprintf("v1/files/%s/content?beta=true", fileID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodGet, path, nil, &res, opts...) - return -} - -// Get File Metadata -func (r *BetaFileService) GetMetadata(ctx context.Context, fileID string, query BetaFileGetMetadataParams, opts ...option.RequestOption) (res *FileMetadata, err error) { - for _, v := range query.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "files-api-2025-04-14")}, opts...) - if fileID == "" { - err = errors.New("missing required file_id parameter") - return - } - path := fmt.Sprintf("v1/files/%s?beta=true", fileID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodGet, path, nil, &res, opts...) - return -} - -// Upload File -func (r *BetaFileService) Upload(ctx context.Context, params BetaFileUploadParams, opts ...option.RequestOption) (res *FileMetadata, err error) { - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "files-api-2025-04-14")}, opts...) - path := "v1/files?beta=true" - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &res, opts...) - return -} - -type DeletedFile struct { - // ID of the deleted file. - ID string `json:"id,required"` - // Deleted object type. - // - // For file deletion, this is always `"file_deleted"`. - // - // Any of "file_deleted". - Type DeletedFileType `json:"type"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r DeletedFile) RawJSON() string { return r.JSON.raw } -func (r *DeletedFile) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Deleted object type. -// -// For file deletion, this is always `"file_deleted"`. -type DeletedFileType string - -const ( - DeletedFileTypeFileDeleted DeletedFileType = "file_deleted" -) - -type FileMetadata struct { - // Unique object identifier. - // - // The format and length of IDs may change over time. - ID string `json:"id,required"` - // RFC 3339 datetime string representing when the file was created. - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - // Original filename of the uploaded file. - Filename string `json:"filename,required"` - // MIME type of the file. - MimeType string `json:"mime_type,required"` - // Size of the file in bytes. - SizeBytes int64 `json:"size_bytes,required"` - // Object type. - // - // For files, this is always `"file"`. - Type constant.File `json:"type,required"` - // Whether the file can be downloaded. - Downloadable bool `json:"downloadable"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - CreatedAt respjson.Field - Filename respjson.Field - MimeType respjson.Field - SizeBytes respjson.Field - Type respjson.Field - Downloadable respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r FileMetadata) RawJSON() string { return r.JSON.raw } -func (r *FileMetadata) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaFileListParams struct { - // ID of the object to use as a cursor for pagination. When provided, returns the - // page of results immediately after this object. - AfterID param.Opt[string] `query:"after_id,omitzero" json:"-"` - // ID of the object to use as a cursor for pagination. When provided, returns the - // page of results immediately before this object. - BeforeID param.Opt[string] `query:"before_id,omitzero" json:"-"` - // Number of items to return per page. - // - // Defaults to `20`. Ranges from `1` to `1000`. - Limit param.Opt[int64] `query:"limit,omitzero" json:"-"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -// URLQuery serializes [BetaFileListParams]'s query parameters as `url.Values`. -func (r BetaFileListParams) URLQuery() (v url.Values, err error) { - return apiquery.MarshalWithSettings(r, apiquery.QuerySettings{ - ArrayFormat: apiquery.ArrayQueryFormatComma, - NestedFormat: apiquery.NestedQueryFormatBrackets, - }) -} - -type BetaFileDeleteParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -type BetaFileDownloadParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -type BetaFileGetMetadataParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -type BetaFileUploadParams struct { - // The file to upload - File io.Reader `json:"file,omitzero,required" format:"binary"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -func (r BetaFileUploadParams) MarshalMultipart() (data []byte, contentType string, err error) { - buf := bytes.NewBuffer(nil) - writer := multipart.NewWriter(buf) - err = apiform.MarshalRoot(r, writer) - if err == nil { - err = apiform.WriteExtras(writer, r.ExtraFields()) - } - if err != nil { - writer.Close() - return nil, "", err - } - err = writer.Close() - if err != nil { - return nil, "", err - } - return buf.Bytes(), writer.FormDataContentType(), nil -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/betamessage.go b/vendor/github.com/anthropics/anthropic-sdk-go/betamessage.go deleted file mode 100644 index 74576efeeba93450340c6c8162b0c1a48a720cca..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/betamessage.go +++ /dev/null @@ -1,5823 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "context" - "encoding/json" - "fmt" - "net/http" - "time" - - "github.com/anthropics/anthropic-sdk-go/internal/apijson" - "github.com/anthropics/anthropic-sdk-go/internal/paramutil" - "github.com/anthropics/anthropic-sdk-go/internal/requestconfig" - "github.com/anthropics/anthropic-sdk-go/option" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "github.com/anthropics/anthropic-sdk-go/packages/respjson" - "github.com/anthropics/anthropic-sdk-go/packages/ssestream" - "github.com/anthropics/anthropic-sdk-go/shared/constant" -) - -// BetaMessageService contains methods and other services that help with -// interacting with the anthropic API. -// -// Note, unlike clients, this service does not read variables from the environment -// automatically. You should not instantiate this service directly, and instead use -// the [NewBetaMessageService] method instead. -type BetaMessageService struct { - Options []option.RequestOption - Batches BetaMessageBatchService -} - -// NewBetaMessageService generates a new service that applies the given options to -// each request. These options are applied after the parent client's options (if -// there is one), and before any request-specific options. -func NewBetaMessageService(opts ...option.RequestOption) (r BetaMessageService) { - r = BetaMessageService{} - r.Options = opts - r.Batches = NewBetaMessageBatchService(opts...) - return -} - -// Send a structured list of input messages with text and/or image content, and the -// model will generate the next message in the conversation. -// -// The Messages API can be used for either single queries or stateless multi-turn -// conversations. -// -// Learn more about the Messages API in our [user guide](/en/docs/initial-setup) -// -// Note: If you choose to set a timeout for this request, we recommend 10 minutes. -func (r *BetaMessageService) New(ctx context.Context, params BetaMessageNewParams, opts ...option.RequestOption) (res *BetaMessage, err error) { - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - - // For non-streaming requests, calculate the appropriate timeout based on maxTokens - // and check against model-specific limits - timeout, timeoutErr := CalculateNonStreamingTimeout(int(params.MaxTokens), params.Model, opts) - if timeoutErr != nil { - return nil, timeoutErr - } - opts = append(opts, option.WithRequestTimeout(timeout)) - - path := "v1/messages?beta=true" - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &res, opts...) - return -} - -// Send a structured list of input messages with text and/or image content, and the -// model will generate the next message in the conversation. -// -// The Messages API can be used for either single queries or stateless multi-turn -// conversations. -// -// Learn more about the Messages API in our [user guide](/en/docs/initial-setup) -// -// Note: If you choose to set a timeout for this request, we recommend 10 minutes. -func (r *BetaMessageService) NewStreaming(ctx context.Context, params BetaMessageNewParams, opts ...option.RequestOption) (stream *ssestream.Stream[BetaRawMessageStreamEventUnion]) { - var ( - raw *http.Response - err error - ) - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithJSONSet("stream", true)}, opts...) - path := "v1/messages?beta=true" - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &raw, opts...) - return ssestream.NewStream[BetaRawMessageStreamEventUnion](ssestream.NewDecoder(raw), err) -} - -// Count the number of tokens in a Message. -// -// The Token Count API can be used to count the number of tokens in a Message, -// including tools, images, and documents, without creating it. -// -// Learn more about token counting in our -// [user guide](/en/docs/build-with-claude/token-counting) -func (r *BetaMessageService) CountTokens(ctx context.Context, params BetaMessageCountTokensParams, opts ...option.RequestOption) (res *BetaMessageTokensCount, err error) { - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - path := "v1/messages/count_tokens?beta=true" - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &res, opts...) - return -} - -// The properties Data, MediaType, Type are required. -type BetaBase64ImageSourceParam struct { - Data string `json:"data,required" format:"byte"` - // Any of "image/jpeg", "image/png", "image/gif", "image/webp". - MediaType BetaBase64ImageSourceMediaType `json:"media_type,omitzero,required"` - // This field can be elided, and will marshal its zero value as "base64". - Type constant.Base64 `json:"type,required"` - paramObj -} - -func (r BetaBase64ImageSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaBase64ImageSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaBase64ImageSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaBase64ImageSourceMediaType string - -const ( - BetaBase64ImageSourceMediaTypeImageJPEG BetaBase64ImageSourceMediaType = "image/jpeg" - BetaBase64ImageSourceMediaTypeImagePNG BetaBase64ImageSourceMediaType = "image/png" - BetaBase64ImageSourceMediaTypeImageGIF BetaBase64ImageSourceMediaType = "image/gif" - BetaBase64ImageSourceMediaTypeImageWebP BetaBase64ImageSourceMediaType = "image/webp" -) - -// The properties Source, Type are required. -type BetaBase64PDFBlockParam struct { - Source BetaBase64PDFBlockSourceUnionParam `json:"source,omitzero,required"` - Context param.Opt[string] `json:"context,omitzero"` - Title param.Opt[string] `json:"title,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - Citations BetaCitationsConfigParam `json:"citations,omitzero"` - // This field can be elided, and will marshal its zero value as "document". - Type constant.Document `json:"type,required"` - paramObj -} - -func (r BetaBase64PDFBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaBase64PDFBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaBase64PDFBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaBase64PDFBlockSourceUnionParam struct { - OfBase64 *BetaBase64PDFSourceParam `json:",omitzero,inline"` - OfText *BetaPlainTextSourceParam `json:",omitzero,inline"` - OfContent *BetaContentBlockSourceParam `json:",omitzero,inline"` - OfURL *BetaURLPDFSourceParam `json:",omitzero,inline"` - OfFile *BetaFileDocumentSourceParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaBase64PDFBlockSourceUnionParam) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfBase64, - u.OfText, - u.OfContent, - u.OfURL, - u.OfFile) -} -func (u *BetaBase64PDFBlockSourceUnionParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaBase64PDFBlockSourceUnionParam) asAny() any { - if !param.IsOmitted(u.OfBase64) { - return u.OfBase64 - } else if !param.IsOmitted(u.OfText) { - return u.OfText - } else if !param.IsOmitted(u.OfContent) { - return u.OfContent - } else if !param.IsOmitted(u.OfURL) { - return u.OfURL - } else if !param.IsOmitted(u.OfFile) { - return u.OfFile - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaBase64PDFBlockSourceUnionParam) GetContent() *BetaContentBlockSourceContentUnionParam { - if vt := u.OfContent; vt != nil { - return &vt.Content - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaBase64PDFBlockSourceUnionParam) GetURL() *string { - if vt := u.OfURL; vt != nil { - return &vt.URL - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaBase64PDFBlockSourceUnionParam) GetFileID() *string { - if vt := u.OfFile; vt != nil { - return &vt.FileID - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaBase64PDFBlockSourceUnionParam) GetData() *string { - if vt := u.OfBase64; vt != nil { - return (*string)(&vt.Data) - } else if vt := u.OfText; vt != nil { - return (*string)(&vt.Data) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaBase64PDFBlockSourceUnionParam) GetMediaType() *string { - if vt := u.OfBase64; vt != nil { - return (*string)(&vt.MediaType) - } else if vt := u.OfText; vt != nil { - return (*string)(&vt.MediaType) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaBase64PDFBlockSourceUnionParam) GetType() *string { - if vt := u.OfBase64; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfText; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfContent; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfURL; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfFile; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -func init() { - apijson.RegisterUnion[BetaBase64PDFBlockSourceUnionParam]( - "type", - apijson.Discriminator[BetaBase64PDFSourceParam]("base64"), - apijson.Discriminator[BetaPlainTextSourceParam]("text"), - apijson.Discriminator[BetaContentBlockSourceParam]("content"), - apijson.Discriminator[BetaURLPDFSourceParam]("url"), - apijson.Discriminator[BetaFileDocumentSourceParam]("file"), - ) -} - -func init() { - apijson.RegisterUnion[BetaContentBlockParamUnion]( - "type", - apijson.Discriminator[BetaServerToolUseBlockParam]("server_tool_use"), - apijson.Discriminator[BetaWebSearchToolResultBlockParam]("web_search_tool_result"), - apijson.Discriminator[BetaCodeExecutionToolResultBlockParam]("code_execution_tool_result"), - apijson.Discriminator[BetaMCPToolUseBlockParam]("mcp_tool_use"), - apijson.Discriminator[BetaRequestMCPToolResultBlockParam]("mcp_tool_result"), - apijson.Discriminator[BetaTextBlockParam]("text"), - apijson.Discriminator[BetaImageBlockParam]("image"), - apijson.Discriminator[BetaToolUseBlockParam]("tool_use"), - apijson.Discriminator[BetaToolResultBlockParam]("tool_result"), - apijson.Discriminator[BetaBase64PDFBlockParam]("document"), - apijson.Discriminator[BetaThinkingBlockParam]("thinking"), - apijson.Discriminator[BetaRedactedThinkingBlockParam]("redacted_thinking"), - apijson.Discriminator[BetaContainerUploadBlockParam]("container_upload"), - ) -} - -func init() { - apijson.RegisterUnion[BetaImageBlockParamSourceUnion]( - "type", - apijson.Discriminator[BetaBase64ImageSourceParam]("base64"), - apijson.Discriminator[BetaURLImageSourceParam]("url"), - apijson.Discriminator[BetaFileImageSourceParam]("file"), - ) -} - -func init() { - apijson.RegisterUnion[BetaTextCitationParamUnion]( - "type", - apijson.Discriminator[BetaCitationCharLocationParam]("char_location"), - apijson.Discriminator[BetaCitationPageLocationParam]("page_location"), - apijson.Discriminator[BetaCitationContentBlockLocationParam]("content_block_location"), - apijson.Discriminator[BetaCitationWebSearchResultLocationParam]("web_search_result_location"), - ) -} - -func init() { - apijson.RegisterUnion[BetaThinkingConfigParamUnion]( - "type", - apijson.Discriminator[BetaThinkingConfigEnabledParam]("enabled"), - apijson.Discriminator[BetaThinkingConfigDisabledParam]("disabled"), - ) -} - -func init() { - apijson.RegisterUnion[BetaToolChoiceUnionParam]( - "type", - apijson.Discriminator[BetaToolChoiceAutoParam]("auto"), - apijson.Discriminator[BetaToolChoiceAnyParam]("any"), - apijson.Discriminator[BetaToolChoiceToolParam]("tool"), - apijson.Discriminator[BetaToolChoiceNoneParam]("none"), - ) -} - -func init() { - apijson.RegisterUnion[BetaToolResultBlockParamContentUnion]( - "type", - apijson.Discriminator[BetaTextBlockParam]("text"), - apijson.Discriminator[BetaImageBlockParam]("image"), - ) -} - -// The properties Data, MediaType, Type are required. -type BetaBase64PDFSourceParam struct { - Data string `json:"data,required" format:"byte"` - // This field can be elided, and will marshal its zero value as "application/pdf". - MediaType constant.ApplicationPDF `json:"media_type,required"` - // This field can be elided, and will marshal its zero value as "base64". - Type constant.Base64 `json:"type,required"` - paramObj -} - -func (r BetaBase64PDFSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaBase64PDFSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaBase64PDFSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func NewBetaCacheControlEphemeralParam() BetaCacheControlEphemeralParam { - return BetaCacheControlEphemeralParam{ - Type: "ephemeral", - } -} - -// This struct has a constant value, construct it with -// [NewBetaCacheControlEphemeralParam]. -type BetaCacheControlEphemeralParam struct { - // The time-to-live for the cache control breakpoint. - // - // This may be one the following values: - // - // - `5m`: 5 minutes - // - `1h`: 1 hour - // - // Defaults to `5m`. - // - // Any of "5m", "1h". - TTL BetaCacheControlEphemeralTTL `json:"ttl,omitzero"` - Type constant.Ephemeral `json:"type,required"` - paramObj -} - -func (r BetaCacheControlEphemeralParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCacheControlEphemeralParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCacheControlEphemeralParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The time-to-live for the cache control breakpoint. -// -// This may be one the following values: -// -// - `5m`: 5 minutes -// - `1h`: 1 hour -// -// Defaults to `5m`. -type BetaCacheControlEphemeralTTL string - -const ( - BetaCacheControlEphemeralTTLTTL5m BetaCacheControlEphemeralTTL = "5m" - BetaCacheControlEphemeralTTLTTL1h BetaCacheControlEphemeralTTL = "1h" -) - -type BetaCacheCreation struct { - // The number of input tokens used to create the 1 hour cache entry. - Ephemeral1hInputTokens int64 `json:"ephemeral_1h_input_tokens,required"` - // The number of input tokens used to create the 5 minute cache entry. - Ephemeral5mInputTokens int64 `json:"ephemeral_5m_input_tokens,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Ephemeral1hInputTokens respjson.Field - Ephemeral5mInputTokens respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCacheCreation) RawJSON() string { return r.JSON.raw } -func (r *BetaCacheCreation) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCitationCharLocation struct { - CitedText string `json:"cited_text,required"` - DocumentIndex int64 `json:"document_index,required"` - DocumentTitle string `json:"document_title,required"` - EndCharIndex int64 `json:"end_char_index,required"` - StartCharIndex int64 `json:"start_char_index,required"` - Type constant.CharLocation `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - CitedText respjson.Field - DocumentIndex respjson.Field - DocumentTitle respjson.Field - EndCharIndex respjson.Field - StartCharIndex respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCitationCharLocation) RawJSON() string { return r.JSON.raw } -func (r *BetaCitationCharLocation) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties CitedText, DocumentIndex, DocumentTitle, EndCharIndex, -// StartCharIndex, Type are required. -type BetaCitationCharLocationParam struct { - DocumentTitle param.Opt[string] `json:"document_title,omitzero,required"` - CitedText string `json:"cited_text,required"` - DocumentIndex int64 `json:"document_index,required"` - EndCharIndex int64 `json:"end_char_index,required"` - StartCharIndex int64 `json:"start_char_index,required"` - // This field can be elided, and will marshal its zero value as "char_location". - Type constant.CharLocation `json:"type,required"` - paramObj -} - -func (r BetaCitationCharLocationParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCitationCharLocationParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCitationCharLocationParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCitationContentBlockLocation struct { - CitedText string `json:"cited_text,required"` - DocumentIndex int64 `json:"document_index,required"` - DocumentTitle string `json:"document_title,required"` - EndBlockIndex int64 `json:"end_block_index,required"` - StartBlockIndex int64 `json:"start_block_index,required"` - Type constant.ContentBlockLocation `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - CitedText respjson.Field - DocumentIndex respjson.Field - DocumentTitle respjson.Field - EndBlockIndex respjson.Field - StartBlockIndex respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCitationContentBlockLocation) RawJSON() string { return r.JSON.raw } -func (r *BetaCitationContentBlockLocation) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties CitedText, DocumentIndex, DocumentTitle, EndBlockIndex, -// StartBlockIndex, Type are required. -type BetaCitationContentBlockLocationParam struct { - DocumentTitle param.Opt[string] `json:"document_title,omitzero,required"` - CitedText string `json:"cited_text,required"` - DocumentIndex int64 `json:"document_index,required"` - EndBlockIndex int64 `json:"end_block_index,required"` - StartBlockIndex int64 `json:"start_block_index,required"` - // This field can be elided, and will marshal its zero value as - // "content_block_location". - Type constant.ContentBlockLocation `json:"type,required"` - paramObj -} - -func (r BetaCitationContentBlockLocationParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCitationContentBlockLocationParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCitationContentBlockLocationParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCitationPageLocation struct { - CitedText string `json:"cited_text,required"` - DocumentIndex int64 `json:"document_index,required"` - DocumentTitle string `json:"document_title,required"` - EndPageNumber int64 `json:"end_page_number,required"` - StartPageNumber int64 `json:"start_page_number,required"` - Type constant.PageLocation `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - CitedText respjson.Field - DocumentIndex respjson.Field - DocumentTitle respjson.Field - EndPageNumber respjson.Field - StartPageNumber respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCitationPageLocation) RawJSON() string { return r.JSON.raw } -func (r *BetaCitationPageLocation) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties CitedText, DocumentIndex, DocumentTitle, EndPageNumber, -// StartPageNumber, Type are required. -type BetaCitationPageLocationParam struct { - DocumentTitle param.Opt[string] `json:"document_title,omitzero,required"` - CitedText string `json:"cited_text,required"` - DocumentIndex int64 `json:"document_index,required"` - EndPageNumber int64 `json:"end_page_number,required"` - StartPageNumber int64 `json:"start_page_number,required"` - // This field can be elided, and will marshal its zero value as "page_location". - Type constant.PageLocation `json:"type,required"` - paramObj -} - -func (r BetaCitationPageLocationParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCitationPageLocationParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCitationPageLocationParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties CitedText, EncryptedIndex, Title, Type, URL are required. -type BetaCitationWebSearchResultLocationParam struct { - Title param.Opt[string] `json:"title,omitzero,required"` - CitedText string `json:"cited_text,required"` - EncryptedIndex string `json:"encrypted_index,required"` - URL string `json:"url,required"` - // This field can be elided, and will marshal its zero value as - // "web_search_result_location". - Type constant.WebSearchResultLocation `json:"type,required"` - paramObj -} - -func (r BetaCitationWebSearchResultLocationParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCitationWebSearchResultLocationParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCitationWebSearchResultLocationParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCitationsConfigParam struct { - Enabled param.Opt[bool] `json:"enabled,omitzero"` - paramObj -} - -func (r BetaCitationsConfigParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCitationsConfigParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCitationsConfigParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCitationsDelta struct { - Citation BetaCitationsDeltaCitationUnion `json:"citation,required"` - Type constant.CitationsDelta `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Citation respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCitationsDelta) RawJSON() string { return r.JSON.raw } -func (r *BetaCitationsDelta) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaCitationsDeltaCitationUnion contains all possible properties and values from -// [BetaCitationCharLocation], [BetaCitationPageLocation], -// [BetaCitationContentBlockLocation], [BetaCitationsWebSearchResultLocation]. -// -// Use the [BetaCitationsDeltaCitationUnion.AsAny] method to switch on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaCitationsDeltaCitationUnion struct { - CitedText string `json:"cited_text"` - DocumentIndex int64 `json:"document_index"` - DocumentTitle string `json:"document_title"` - // This field is from variant [BetaCitationCharLocation]. - EndCharIndex int64 `json:"end_char_index"` - // This field is from variant [BetaCitationCharLocation]. - StartCharIndex int64 `json:"start_char_index"` - // Any of "char_location", "page_location", "content_block_location", - // "web_search_result_location". - Type string `json:"type"` - // This field is from variant [BetaCitationPageLocation]. - EndPageNumber int64 `json:"end_page_number"` - // This field is from variant [BetaCitationPageLocation]. - StartPageNumber int64 `json:"start_page_number"` - // This field is from variant [BetaCitationContentBlockLocation]. - EndBlockIndex int64 `json:"end_block_index"` - // This field is from variant [BetaCitationContentBlockLocation]. - StartBlockIndex int64 `json:"start_block_index"` - // This field is from variant [BetaCitationsWebSearchResultLocation]. - EncryptedIndex string `json:"encrypted_index"` - // This field is from variant [BetaCitationsWebSearchResultLocation]. - Title string `json:"title"` - // This field is from variant [BetaCitationsWebSearchResultLocation]. - URL string `json:"url"` - JSON struct { - CitedText respjson.Field - DocumentIndex respjson.Field - DocumentTitle respjson.Field - EndCharIndex respjson.Field - StartCharIndex respjson.Field - Type respjson.Field - EndPageNumber respjson.Field - StartPageNumber respjson.Field - EndBlockIndex respjson.Field - StartBlockIndex respjson.Field - EncryptedIndex respjson.Field - Title respjson.Field - URL respjson.Field - raw string - } `json:"-"` -} - -// anyBetaCitationsDeltaCitation is implemented by each variant of -// [BetaCitationsDeltaCitationUnion] to add type safety for the return type of -// [BetaCitationsDeltaCitationUnion.AsAny] -type anyBetaCitationsDeltaCitation interface { - implBetaCitationsDeltaCitationUnion() -} - -func (BetaCitationCharLocation) implBetaCitationsDeltaCitationUnion() {} -func (BetaCitationPageLocation) implBetaCitationsDeltaCitationUnion() {} -func (BetaCitationContentBlockLocation) implBetaCitationsDeltaCitationUnion() {} -func (BetaCitationsWebSearchResultLocation) implBetaCitationsDeltaCitationUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaCitationsDeltaCitationUnion.AsAny().(type) { -// case anthropic.BetaCitationCharLocation: -// case anthropic.BetaCitationPageLocation: -// case anthropic.BetaCitationContentBlockLocation: -// case anthropic.BetaCitationsWebSearchResultLocation: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaCitationsDeltaCitationUnion) AsAny() anyBetaCitationsDeltaCitation { - switch u.Type { - case "char_location": - return u.AsCharLocation() - case "page_location": - return u.AsPageLocation() - case "content_block_location": - return u.AsContentBlockLocation() - case "web_search_result_location": - return u.AsWebSearchResultLocation() - } - return nil -} - -func (u BetaCitationsDeltaCitationUnion) AsCharLocation() (v BetaCitationCharLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaCitationsDeltaCitationUnion) AsPageLocation() (v BetaCitationPageLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaCitationsDeltaCitationUnion) AsContentBlockLocation() (v BetaCitationContentBlockLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaCitationsDeltaCitationUnion) AsWebSearchResultLocation() (v BetaCitationsWebSearchResultLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaCitationsDeltaCitationUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaCitationsDeltaCitationUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCitationsWebSearchResultLocation struct { - CitedText string `json:"cited_text,required"` - EncryptedIndex string `json:"encrypted_index,required"` - Title string `json:"title,required"` - Type constant.WebSearchResultLocation `json:"type,required"` - URL string `json:"url,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - CitedText respjson.Field - EncryptedIndex respjson.Field - Title respjson.Field - Type respjson.Field - URL respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCitationsWebSearchResultLocation) RawJSON() string { return r.JSON.raw } -func (r *BetaCitationsWebSearchResultLocation) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCodeExecutionOutputBlock struct { - FileID string `json:"file_id,required"` - Type constant.CodeExecutionOutput `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - FileID respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCodeExecutionOutputBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaCodeExecutionOutputBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties FileID, Type are required. -type BetaCodeExecutionOutputBlockParam struct { - FileID string `json:"file_id,required"` - // This field can be elided, and will marshal its zero value as - // "code_execution_output". - Type constant.CodeExecutionOutput `json:"type,required"` - paramObj -} - -func (r BetaCodeExecutionOutputBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCodeExecutionOutputBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCodeExecutionOutputBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCodeExecutionResultBlock struct { - Content []BetaCodeExecutionOutputBlock `json:"content,required"` - ReturnCode int64 `json:"return_code,required"` - Stderr string `json:"stderr,required"` - Stdout string `json:"stdout,required"` - Type constant.CodeExecutionResult `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Content respjson.Field - ReturnCode respjson.Field - Stderr respjson.Field - Stdout respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCodeExecutionResultBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaCodeExecutionResultBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Content, ReturnCode, Stderr, Stdout, Type are required. -type BetaCodeExecutionResultBlockParam struct { - Content []BetaCodeExecutionOutputBlockParam `json:"content,omitzero,required"` - ReturnCode int64 `json:"return_code,required"` - Stderr string `json:"stderr,required"` - Stdout string `json:"stdout,required"` - // This field can be elided, and will marshal its zero value as - // "code_execution_result". - Type constant.CodeExecutionResult `json:"type,required"` - paramObj -} - -func (r BetaCodeExecutionResultBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCodeExecutionResultBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCodeExecutionResultBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Name, Type are required. -type BetaCodeExecutionTool20250522Param struct { - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as "code_execution". - Name constant.CodeExecution `json:"name,required"` - // This field can be elided, and will marshal its zero value as - // "code_execution_20250522". - Type constant.CodeExecution20250522 `json:"type,required"` - paramObj -} - -func (r BetaCodeExecutionTool20250522Param) MarshalJSON() (data []byte, err error) { - type shadow BetaCodeExecutionTool20250522Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCodeExecutionTool20250522Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCodeExecutionToolResultBlock struct { - Content BetaCodeExecutionToolResultBlockContentUnion `json:"content,required"` - ToolUseID string `json:"tool_use_id,required"` - Type constant.CodeExecutionToolResult `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Content respjson.Field - ToolUseID respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCodeExecutionToolResultBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaCodeExecutionToolResultBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaCodeExecutionToolResultBlockContentUnion contains all possible properties -// and values from [BetaCodeExecutionToolResultError], -// [BetaCodeExecutionResultBlock]. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaCodeExecutionToolResultBlockContentUnion struct { - // This field is from variant [BetaCodeExecutionToolResultError]. - ErrorCode BetaCodeExecutionToolResultErrorCode `json:"error_code"` - Type string `json:"type"` - // This field is from variant [BetaCodeExecutionResultBlock]. - Content []BetaCodeExecutionOutputBlock `json:"content"` - // This field is from variant [BetaCodeExecutionResultBlock]. - ReturnCode int64 `json:"return_code"` - // This field is from variant [BetaCodeExecutionResultBlock]. - Stderr string `json:"stderr"` - // This field is from variant [BetaCodeExecutionResultBlock]. - Stdout string `json:"stdout"` - JSON struct { - ErrorCode respjson.Field - Type respjson.Field - Content respjson.Field - ReturnCode respjson.Field - Stderr respjson.Field - Stdout respjson.Field - raw string - } `json:"-"` -} - -func (u BetaCodeExecutionToolResultBlockContentUnion) AsResponseCodeExecutionToolResultError() (v BetaCodeExecutionToolResultError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaCodeExecutionToolResultBlockContentUnion) AsResponseCodeExecutionResultBlock() (v BetaCodeExecutionResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaCodeExecutionToolResultBlockContentUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaCodeExecutionToolResultBlockContentUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Content, ToolUseID, Type are required. -type BetaCodeExecutionToolResultBlockParam struct { - Content BetaCodeExecutionToolResultBlockParamContentUnion `json:"content,omitzero,required"` - ToolUseID string `json:"tool_use_id,required"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as - // "code_execution_tool_result". - Type constant.CodeExecutionToolResult `json:"type,required"` - paramObj -} - -func (r BetaCodeExecutionToolResultBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCodeExecutionToolResultBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCodeExecutionToolResultBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func BetaNewCodeExecutionToolRequestError(errorCode BetaCodeExecutionToolResultErrorCode) BetaCodeExecutionToolResultBlockParamContentUnion { - var variant BetaCodeExecutionToolResultErrorParam - variant.ErrorCode = errorCode - return BetaCodeExecutionToolResultBlockParamContentUnion{OfError: &variant} -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaCodeExecutionToolResultBlockParamContentUnion struct { - OfError *BetaCodeExecutionToolResultErrorParam `json:",omitzero,inline"` - OfResultBlock *BetaCodeExecutionResultBlockParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaCodeExecutionToolResultBlockParamContentUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfError, u.OfResultBlock) -} -func (u *BetaCodeExecutionToolResultBlockParamContentUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaCodeExecutionToolResultBlockParamContentUnion) asAny() any { - if !param.IsOmitted(u.OfError) { - return u.OfError - } else if !param.IsOmitted(u.OfResultBlock) { - return u.OfResultBlock - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaCodeExecutionToolResultBlockParamContentUnion) GetErrorCode() *string { - if vt := u.OfError; vt != nil { - return (*string)(&vt.ErrorCode) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaCodeExecutionToolResultBlockParamContentUnion) GetContent() []BetaCodeExecutionOutputBlockParam { - if vt := u.OfResultBlock; vt != nil { - return vt.Content - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaCodeExecutionToolResultBlockParamContentUnion) GetReturnCode() *int64 { - if vt := u.OfResultBlock; vt != nil { - return &vt.ReturnCode - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaCodeExecutionToolResultBlockParamContentUnion) GetStderr() *string { - if vt := u.OfResultBlock; vt != nil { - return &vt.Stderr - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaCodeExecutionToolResultBlockParamContentUnion) GetStdout() *string { - if vt := u.OfResultBlock; vt != nil { - return &vt.Stdout - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaCodeExecutionToolResultBlockParamContentUnion) GetType() *string { - if vt := u.OfError; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfResultBlock; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -type BetaCodeExecutionToolResultError struct { - // Any of "invalid_tool_input", "unavailable", "too_many_requests", - // "execution_time_exceeded". - ErrorCode BetaCodeExecutionToolResultErrorCode `json:"error_code,required"` - Type constant.CodeExecutionToolResultError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ErrorCode respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaCodeExecutionToolResultError) RawJSON() string { return r.JSON.raw } -func (r *BetaCodeExecutionToolResultError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaCodeExecutionToolResultErrorCode string - -const ( - BetaCodeExecutionToolResultErrorCodeInvalidToolInput BetaCodeExecutionToolResultErrorCode = "invalid_tool_input" - BetaCodeExecutionToolResultErrorCodeUnavailable BetaCodeExecutionToolResultErrorCode = "unavailable" - BetaCodeExecutionToolResultErrorCodeTooManyRequests BetaCodeExecutionToolResultErrorCode = "too_many_requests" - BetaCodeExecutionToolResultErrorCodeExecutionTimeExceeded BetaCodeExecutionToolResultErrorCode = "execution_time_exceeded" -) - -// The properties ErrorCode, Type are required. -type BetaCodeExecutionToolResultErrorParam struct { - // Any of "invalid_tool_input", "unavailable", "too_many_requests", - // "execution_time_exceeded". - ErrorCode BetaCodeExecutionToolResultErrorCode `json:"error_code,omitzero,required"` - // This field can be elided, and will marshal its zero value as - // "code_execution_tool_result_error". - Type constant.CodeExecutionToolResultError `json:"type,required"` - paramObj -} - -func (r BetaCodeExecutionToolResultErrorParam) MarshalJSON() (data []byte, err error) { - type shadow BetaCodeExecutionToolResultErrorParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaCodeExecutionToolResultErrorParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Information about the container used in the request (for the code execution -// tool) -type BetaContainer struct { - // Identifier for the container used in this request - ID string `json:"id,required"` - // The time at which the container will expire. - ExpiresAt time.Time `json:"expires_at,required" format:"date-time"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - ExpiresAt respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaContainer) RawJSON() string { return r.JSON.raw } -func (r *BetaContainer) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Response model for a file uploaded to the container. -type BetaContainerUploadBlock struct { - FileID string `json:"file_id,required"` - Type constant.ContainerUpload `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - FileID respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaContainerUploadBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaContainerUploadBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// A content block that represents a file to be uploaded to the container Files -// uploaded via this block will be available in the container's input directory. -// -// The properties FileID, Type are required. -type BetaContainerUploadBlockParam struct { - FileID string `json:"file_id,required"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as "container_upload". - Type constant.ContainerUpload `json:"type,required"` - paramObj -} - -func (r BetaContainerUploadBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaContainerUploadBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaContainerUploadBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaContentBlockUnion contains all possible properties and values from -// [BetaTextBlock], [BetaToolUseBlock], [BetaServerToolUseBlock], -// [BetaWebSearchToolResultBlock], [BetaCodeExecutionToolResultBlock], -// [BetaMCPToolUseBlock], [BetaMCPToolResultBlock], [BetaContainerUploadBlock], -// [BetaThinkingBlock], [BetaRedactedThinkingBlock]. -// -// Use the [BetaContentBlockUnion.AsAny] method to switch on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaContentBlockUnion struct { - // This field is from variant [BetaTextBlock]. - Citations []BetaTextCitationUnion `json:"citations"` - // This field is from variant [BetaTextBlock]. - Text string `json:"text"` - // Any of "text", "tool_use", "server_tool_use", "web_search_tool_result", - // "code_execution_tool_result", "mcp_tool_use", "mcp_tool_result", - // "container_upload", "thinking", "redacted_thinking". - Type string `json:"type"` - ID string `json:"id"` - Input json.RawMessage `json:"input"` - Name string `json:"name"` - // This field is a union of [BetaWebSearchToolResultBlockContentUnion], - // [BetaCodeExecutionToolResultBlockContentUnion], - // [BetaMCPToolResultBlockContentUnion] - Content BetaContentBlockUnionContent `json:"content"` - ToolUseID string `json:"tool_use_id"` - // This field is from variant [BetaMCPToolUseBlock]. - ServerName string `json:"server_name"` - // This field is from variant [BetaMCPToolResultBlock]. - IsError bool `json:"is_error"` - // This field is from variant [BetaContainerUploadBlock]. - FileID string `json:"file_id"` - // This field is from variant [BetaThinkingBlock]. - Signature string `json:"signature"` - // This field is from variant [BetaThinkingBlock]. - Thinking string `json:"thinking"` - // This field is from variant [BetaRedactedThinkingBlock]. - Data string `json:"data"` - JSON struct { - Citations respjson.Field - Text respjson.Field - Type respjson.Field - ID respjson.Field - Input respjson.Field - Name respjson.Field - Content respjson.Field - ToolUseID respjson.Field - ServerName respjson.Field - IsError respjson.Field - FileID respjson.Field - Signature respjson.Field - Thinking respjson.Field - Data respjson.Field - raw string - } `json:"-"` -} - -func (r BetaContentBlockUnion) ToParam() BetaContentBlockParamUnion { - switch variant := r.AsAny().(type) { - case BetaTextBlock: - p := variant.ToParam() - return BetaContentBlockParamUnion{OfText: &p} - case BetaToolUseBlock: - p := variant.ToParam() - return BetaContentBlockParamUnion{OfToolUse: &p} - case BetaThinkingBlock: - p := variant.ToParam() - return BetaContentBlockParamUnion{OfThinking: &p} - case BetaRedactedThinkingBlock: - p := variant.ToParam() - return BetaContentBlockParamUnion{OfRedactedThinking: &p} - } - return BetaContentBlockParamUnion{} -} - -// anyBetaContentBlock is implemented by each variant of [BetaContentBlockUnion] to -// add type safety for the return type of [BetaContentBlockUnion.AsAny] -type anyBetaContentBlock interface { - implBetaContentBlockUnion() -} - -func (BetaTextBlock) implBetaContentBlockUnion() {} -func (BetaToolUseBlock) implBetaContentBlockUnion() {} -func (BetaServerToolUseBlock) implBetaContentBlockUnion() {} -func (BetaWebSearchToolResultBlock) implBetaContentBlockUnion() {} -func (BetaCodeExecutionToolResultBlock) implBetaContentBlockUnion() {} -func (BetaMCPToolUseBlock) implBetaContentBlockUnion() {} -func (BetaMCPToolResultBlock) implBetaContentBlockUnion() {} -func (BetaContainerUploadBlock) implBetaContentBlockUnion() {} -func (BetaThinkingBlock) implBetaContentBlockUnion() {} -func (BetaRedactedThinkingBlock) implBetaContentBlockUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaContentBlockUnion.AsAny().(type) { -// case anthropic.BetaTextBlock: -// case anthropic.BetaToolUseBlock: -// case anthropic.BetaServerToolUseBlock: -// case anthropic.BetaWebSearchToolResultBlock: -// case anthropic.BetaCodeExecutionToolResultBlock: -// case anthropic.BetaMCPToolUseBlock: -// case anthropic.BetaMCPToolResultBlock: -// case anthropic.BetaContainerUploadBlock: -// case anthropic.BetaThinkingBlock: -// case anthropic.BetaRedactedThinkingBlock: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaContentBlockUnion) AsAny() anyBetaContentBlock { - switch u.Type { - case "text": - return u.AsText() - case "tool_use": - return u.AsToolUse() - case "server_tool_use": - return u.AsServerToolUse() - case "web_search_tool_result": - return u.AsWebSearchToolResult() - case "code_execution_tool_result": - return u.AsCodeExecutionToolResult() - case "mcp_tool_use": - return u.AsMCPToolUse() - case "mcp_tool_result": - return u.AsMCPToolResult() - case "container_upload": - return u.AsContainerUpload() - case "thinking": - return u.AsThinking() - case "redacted_thinking": - return u.AsRedactedThinking() - } - return nil -} - -func (u BetaContentBlockUnion) AsText() (v BetaTextBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsToolUse() (v BetaToolUseBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsServerToolUse() (v BetaServerToolUseBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsWebSearchToolResult() (v BetaWebSearchToolResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsCodeExecutionToolResult() (v BetaCodeExecutionToolResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsMCPToolUse() (v BetaMCPToolUseBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsMCPToolResult() (v BetaMCPToolResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsContainerUpload() (v BetaContainerUploadBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsThinking() (v BetaThinkingBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaContentBlockUnion) AsRedactedThinking() (v BetaRedactedThinkingBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaContentBlockUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaContentBlockUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaContentBlockUnionContent is an implicit subunion of [BetaContentBlockUnion]. -// BetaContentBlockUnionContent provides convenient access to the sub-properties of -// the union. -// -// For type safety it is recommended to directly use a variant of the -// [BetaContentBlockUnion]. -// -// If the underlying value is not a json object, one of the following properties -// will be valid: OfBetaWebSearchResultBlockArray OfString -// OfBetaMCPToolResultBlockContent] -type BetaContentBlockUnionContent struct { - // This field will be present if the value is a [[]BetaWebSearchResultBlock] - // instead of an object. - OfBetaWebSearchResultBlockArray []BetaWebSearchResultBlock `json:",inline"` - // This field will be present if the value is a [string] instead of an object. - OfString string `json:",inline"` - // This field will be present if the value is a [[]BetaTextBlock] instead of an - // object. - OfBetaMCPToolResultBlockContent []BetaTextBlock `json:",inline"` - ErrorCode string `json:"error_code"` - Type string `json:"type"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - Content []BetaCodeExecutionOutputBlock `json:"content"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - ReturnCode int64 `json:"return_code"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - Stderr string `json:"stderr"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - Stdout string `json:"stdout"` - JSON struct { - OfBetaWebSearchResultBlockArray respjson.Field - OfString respjson.Field - OfBetaMCPToolResultBlockContent respjson.Field - ErrorCode respjson.Field - Type respjson.Field - Content respjson.Field - ReturnCode respjson.Field - Stderr respjson.Field - Stdout respjson.Field - raw string - } `json:"-"` -} - -func (r *BetaContentBlockUnionContent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func NewBetaServerToolUseBlock(id string, input any, name BetaServerToolUseBlockParamName) BetaContentBlockParamUnion { - var serverToolUse BetaServerToolUseBlockParam - serverToolUse.ID = id - serverToolUse.Input = input - serverToolUse.Name = name - return BetaContentBlockParamUnion{OfServerToolUse: &serverToolUse} -} - -func NewBetaWebSearchToolResultBlock[ - T []BetaWebSearchResultBlockParam | BetaWebSearchToolRequestErrorParam, -](content T, toolUseID string) BetaContentBlockParamUnion { - var webSearchToolResult BetaWebSearchToolResultBlockParam - switch v := any(content).(type) { - case []BetaWebSearchResultBlockParam: - webSearchToolResult.Content.OfResultBlock = v - case BetaWebSearchToolRequestErrorParam: - webSearchToolResult.Content.OfError = &v - } - webSearchToolResult.ToolUseID = toolUseID - return BetaContentBlockParamUnion{OfWebSearchToolResult: &webSearchToolResult} -} - -func NewBetaCodeExecutionToolResultBlock[ - T BetaCodeExecutionToolResultErrorParam | BetaCodeExecutionResultBlockParam, -](content T, toolUseID string) BetaContentBlockParamUnion { - var codeExecutionToolResult BetaCodeExecutionToolResultBlockParam - switch v := any(content).(type) { - case BetaCodeExecutionToolResultErrorParam: - codeExecutionToolResult.Content.OfError = &v - case BetaCodeExecutionResultBlockParam: - codeExecutionToolResult.Content.OfResultBlock = &v - } - codeExecutionToolResult.ToolUseID = toolUseID - return BetaContentBlockParamUnion{OfCodeExecutionToolResult: &codeExecutionToolResult} -} - -func NewBetaMCPToolResultBlock(toolUseID string) BetaContentBlockParamUnion { - var mcpToolResult BetaRequestMCPToolResultBlockParam - mcpToolResult.ToolUseID = toolUseID - return BetaContentBlockParamUnion{OfMCPToolResult: &mcpToolResult} -} - -func NewBetaTextBlock(text string) BetaContentBlockParamUnion { - var variant BetaTextBlockParam - variant.Text = text - return BetaContentBlockParamUnion{OfText: &variant} -} - -func NewBetaImageBlock[ - T BetaBase64ImageSourceParam | BetaURLImageSourceParam | BetaFileImageSourceParam, -](source T) BetaContentBlockParamUnion { - var image BetaImageBlockParam - switch v := any(source).(type) { - case BetaBase64ImageSourceParam: - image.Source.OfBase64 = &v - case BetaURLImageSourceParam: - image.Source.OfURL = &v - case BetaFileImageSourceParam: - image.Source.OfFile = &v - } - return BetaContentBlockParamUnion{OfImage: &image} -} - -func NewBetaToolUseBlock(id string, input any, name string) BetaContentBlockParamUnion { - var toolUse BetaToolUseBlockParam - toolUse.ID = id - toolUse.Input = input - toolUse.Name = name - return BetaContentBlockParamUnion{OfToolUse: &toolUse} -} - -func NewBetaToolResultBlock(toolUseID string, content string, isError bool) BetaContentBlockParamUnion { - toolResult := BetaToolResultBlockParam{ - Content: []BetaToolResultBlockParamContentUnion{ - {OfText: &BetaTextBlockParam{Text: content}}, - }, - ToolUseID: toolUseID, - IsError: Bool(isError), - } - return BetaContentBlockParamUnion{OfToolResult: &toolResult} -} - -func NewBetaDocumentBlock[ - T BetaBase64PDFSourceParam | BetaPlainTextSourceParam | BetaContentBlockSourceParam | BetaURLPDFSourceParam | BetaFileDocumentSourceParam, -](source T) BetaContentBlockParamUnion { - var document BetaBase64PDFBlockParam - switch v := any(source).(type) { - case BetaBase64PDFSourceParam: - document.Source.OfBase64 = &v - case BetaPlainTextSourceParam: - document.Source.OfText = &v - case BetaContentBlockSourceParam: - document.Source.OfContent = &v - case BetaURLPDFSourceParam: - document.Source.OfURL = &v - case BetaFileDocumentSourceParam: - document.Source.OfFile = &v - } - return BetaContentBlockParamUnion{OfDocument: &document} -} - -func NewBetaThinkingBlock(signature string, thinking string) BetaContentBlockParamUnion { - var variant BetaThinkingBlockParam - variant.Signature = signature - variant.Thinking = thinking - return BetaContentBlockParamUnion{OfThinking: &variant} -} - -func NewBetaRedactedThinkingBlock(data string) BetaContentBlockParamUnion { - var redactedThinking BetaRedactedThinkingBlockParam - redactedThinking.Data = data - return BetaContentBlockParamUnion{OfRedactedThinking: &redactedThinking} -} - -func NewBetaContainerUploadBlock(fileID string) BetaContentBlockParamUnion { - var containerUpload BetaContainerUploadBlockParam - containerUpload.FileID = fileID - return BetaContentBlockParamUnion{OfContainerUpload: &containerUpload} -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaContentBlockParamUnion struct { - OfServerToolUse *BetaServerToolUseBlockParam `json:",omitzero,inline"` - OfWebSearchToolResult *BetaWebSearchToolResultBlockParam `json:",omitzero,inline"` - OfCodeExecutionToolResult *BetaCodeExecutionToolResultBlockParam `json:",omitzero,inline"` - OfMCPToolUse *BetaMCPToolUseBlockParam `json:",omitzero,inline"` - OfMCPToolResult *BetaRequestMCPToolResultBlockParam `json:",omitzero,inline"` - OfText *BetaTextBlockParam `json:",omitzero,inline"` - OfImage *BetaImageBlockParam `json:",omitzero,inline"` - OfToolUse *BetaToolUseBlockParam `json:",omitzero,inline"` - OfToolResult *BetaToolResultBlockParam `json:",omitzero,inline"` - OfDocument *BetaBase64PDFBlockParam `json:",omitzero,inline"` - OfThinking *BetaThinkingBlockParam `json:",omitzero,inline"` - OfRedactedThinking *BetaRedactedThinkingBlockParam `json:",omitzero,inline"` - OfContainerUpload *BetaContainerUploadBlockParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaContentBlockParamUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfServerToolUse, - u.OfWebSearchToolResult, - u.OfCodeExecutionToolResult, - u.OfMCPToolUse, - u.OfMCPToolResult, - u.OfText, - u.OfImage, - u.OfToolUse, - u.OfToolResult, - u.OfDocument, - u.OfThinking, - u.OfRedactedThinking, - u.OfContainerUpload) -} -func (u *BetaContentBlockParamUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaContentBlockParamUnion) asAny() any { - if !param.IsOmitted(u.OfServerToolUse) { - return u.OfServerToolUse - } else if !param.IsOmitted(u.OfWebSearchToolResult) { - return u.OfWebSearchToolResult - } else if !param.IsOmitted(u.OfCodeExecutionToolResult) { - return u.OfCodeExecutionToolResult - } else if !param.IsOmitted(u.OfMCPToolUse) { - return u.OfMCPToolUse - } else if !param.IsOmitted(u.OfMCPToolResult) { - return u.OfMCPToolResult - } else if !param.IsOmitted(u.OfText) { - return u.OfText - } else if !param.IsOmitted(u.OfImage) { - return u.OfImage - } else if !param.IsOmitted(u.OfToolUse) { - return u.OfToolUse - } else if !param.IsOmitted(u.OfToolResult) { - return u.OfToolResult - } else if !param.IsOmitted(u.OfDocument) { - return u.OfDocument - } else if !param.IsOmitted(u.OfThinking) { - return u.OfThinking - } else if !param.IsOmitted(u.OfRedactedThinking) { - return u.OfRedactedThinking - } else if !param.IsOmitted(u.OfContainerUpload) { - return u.OfContainerUpload - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetServerName() *string { - if vt := u.OfMCPToolUse; vt != nil { - return &vt.ServerName - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetText() *string { - if vt := u.OfText; vt != nil { - return &vt.Text - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetContext() *string { - if vt := u.OfDocument; vt != nil && vt.Context.Valid() { - return &vt.Context.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetTitle() *string { - if vt := u.OfDocument; vt != nil && vt.Title.Valid() { - return &vt.Title.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetSignature() *string { - if vt := u.OfThinking; vt != nil { - return &vt.Signature - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetThinking() *string { - if vt := u.OfThinking; vt != nil { - return &vt.Thinking - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetData() *string { - if vt := u.OfRedactedThinking; vt != nil { - return &vt.Data - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetFileID() *string { - if vt := u.OfContainerUpload; vt != nil { - return &vt.FileID - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetID() *string { - if vt := u.OfServerToolUse; vt != nil { - return (*string)(&vt.ID) - } else if vt := u.OfMCPToolUse; vt != nil { - return (*string)(&vt.ID) - } else if vt := u.OfToolUse; vt != nil { - return (*string)(&vt.ID) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetName() *string { - if vt := u.OfServerToolUse; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfMCPToolUse; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfToolUse; vt != nil { - return (*string)(&vt.Name) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetType() *string { - if vt := u.OfServerToolUse; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfWebSearchToolResult; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfCodeExecutionToolResult; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfMCPToolUse; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfMCPToolResult; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfText; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfImage; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfToolUse; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfToolResult; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfDocument; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfThinking; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfRedactedThinking; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfContainerUpload; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetToolUseID() *string { - if vt := u.OfWebSearchToolResult; vt != nil { - return (*string)(&vt.ToolUseID) - } else if vt := u.OfCodeExecutionToolResult; vt != nil { - return (*string)(&vt.ToolUseID) - } else if vt := u.OfMCPToolResult; vt != nil { - return (*string)(&vt.ToolUseID) - } else if vt := u.OfToolResult; vt != nil { - return (*string)(&vt.ToolUseID) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaContentBlockParamUnion) GetIsError() *bool { - if vt := u.OfMCPToolResult; vt != nil && vt.IsError.Valid() { - return &vt.IsError.Value - } else if vt := u.OfToolResult; vt != nil && vt.IsError.Valid() { - return &vt.IsError.Value - } - return nil -} - -// Returns a pointer to the underlying variant's Input property, if present. -func (u BetaContentBlockParamUnion) GetInput() *any { - if vt := u.OfServerToolUse; vt != nil { - return &vt.Input - } else if vt := u.OfMCPToolUse; vt != nil { - return &vt.Input - } else if vt := u.OfToolUse; vt != nil { - return &vt.Input - } - return nil -} - -// Returns a pointer to the underlying variant's CacheControl property, if present. -func (u BetaContentBlockParamUnion) GetCacheControl() *BetaCacheControlEphemeralParam { - if vt := u.OfServerToolUse; vt != nil { - return &vt.CacheControl - } else if vt := u.OfWebSearchToolResult; vt != nil { - return &vt.CacheControl - } else if vt := u.OfCodeExecutionToolResult; vt != nil { - return &vt.CacheControl - } else if vt := u.OfMCPToolUse; vt != nil { - return &vt.CacheControl - } else if vt := u.OfMCPToolResult; vt != nil { - return &vt.CacheControl - } else if vt := u.OfText; vt != nil { - return &vt.CacheControl - } else if vt := u.OfImage; vt != nil { - return &vt.CacheControl - } else if vt := u.OfToolUse; vt != nil { - return &vt.CacheControl - } else if vt := u.OfToolResult; vt != nil { - return &vt.CacheControl - } else if vt := u.OfDocument; vt != nil { - return &vt.CacheControl - } else if vt := u.OfContainerUpload; vt != nil { - return &vt.CacheControl - } - return nil -} - -// Returns a subunion which exports methods to access subproperties -// -// Or use AsAny() to get the underlying value -func (u BetaContentBlockParamUnion) GetContent() (res betaContentBlockParamUnionContent) { - if vt := u.OfWebSearchToolResult; vt != nil { - res.any = vt.Content.asAny() - } else if vt := u.OfCodeExecutionToolResult; vt != nil { - res.any = vt.Content.asAny() - } else if vt := u.OfMCPToolResult; vt != nil { - res.any = vt.Content.asAny() - } else if vt := u.OfToolResult; vt != nil { - res.any = &vt.Content - } - return -} - -// Can have the runtime types [*[]BetaWebSearchResultBlockParam], -// [*BetaCodeExecutionToolResultErrorParam], [*BetaCodeExecutionResultBlockParam], -// [*string], [_[]BetaTextBlockParam], [_[]BetaToolResultBlockParamContentUnion] -type betaContentBlockParamUnionContent struct{ any } - -// Use the following switch statement to get the type of the union: -// -// switch u.AsAny().(type) { -// case *[]anthropic.BetaWebSearchResultBlockParam: -// case *anthropic.BetaCodeExecutionToolResultErrorParam: -// case *anthropic.BetaCodeExecutionResultBlockParam: -// case *string: -// case *[]anthropic.BetaTextBlockParam: -// case *[]anthropic.BetaToolResultBlockParamContentUnion: -// default: -// fmt.Errorf("not present") -// } -func (u betaContentBlockParamUnionContent) AsAny() any { return u.any } - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionContent) GetContent() []BetaCodeExecutionOutputBlockParam { - switch vt := u.any.(type) { - case *BetaCodeExecutionToolResultBlockParamContentUnion: - return vt.GetContent() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionContent) GetReturnCode() *int64 { - switch vt := u.any.(type) { - case *BetaCodeExecutionToolResultBlockParamContentUnion: - return vt.GetReturnCode() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionContent) GetStderr() *string { - switch vt := u.any.(type) { - case *BetaCodeExecutionToolResultBlockParamContentUnion: - return vt.GetStderr() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionContent) GetStdout() *string { - switch vt := u.any.(type) { - case *BetaCodeExecutionToolResultBlockParamContentUnion: - return vt.GetStdout() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionContent) GetErrorCode() *string { - switch vt := u.any.(type) { - case *BetaWebSearchToolResultBlockParamContentUnion: - if vt := vt.OfError; vt != nil { - return (*string)(&vt.ErrorCode) - } - case *BetaCodeExecutionToolResultBlockParamContentUnion: - return vt.GetErrorCode() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionContent) GetType() *string { - switch vt := u.any.(type) { - case *BetaWebSearchToolResultBlockParamContentUnion: - if vt := vt.OfError; vt != nil { - return (*string)(&vt.Type) - } - case *BetaCodeExecutionToolResultBlockParamContentUnion: - return vt.GetType() - } - return nil -} - -// Returns a subunion which exports methods to access subproperties -// -// Or use AsAny() to get the underlying value -func (u BetaContentBlockParamUnion) GetCitations() (res betaContentBlockParamUnionCitations) { - if vt := u.OfText; vt != nil { - res.any = &vt.Citations - } else if vt := u.OfDocument; vt != nil { - res.any = &vt.Citations - } - return -} - -// Can have the runtime types [*[]BetaTextCitationParamUnion], -// [*BetaCitationsConfigParam] -type betaContentBlockParamUnionCitations struct{ any } - -// Use the following switch statement to get the type of the union: -// -// switch u.AsAny().(type) { -// case *[]anthropic.BetaTextCitationParamUnion: -// case *anthropic.BetaCitationsConfigParam: -// default: -// fmt.Errorf("not present") -// } -func (u betaContentBlockParamUnionCitations) AsAny() any { return u.any } - -// Returns a subunion which exports methods to access subproperties -// -// Or use AsAny() to get the underlying value -func (u BetaContentBlockParamUnion) GetSource() (res betaContentBlockParamUnionSource) { - if vt := u.OfImage; vt != nil { - res.any = vt.Source.asAny() - } else if vt := u.OfDocument; vt != nil { - res.any = vt.Source.asAny() - } - return -} - -// Can have the runtime types [*BetaBase64ImageSourceParam], -// [*BetaURLImageSourceParam], [*BetaFileImageSourceParam], -// [*BetaBase64PDFSourceParam], [*BetaPlainTextSourceParam], -// [*BetaContentBlockSourceParam], [*BetaURLPDFSourceParam], -// [*BetaFileDocumentSourceParam] -type betaContentBlockParamUnionSource struct{ any } - -// Use the following switch statement to get the type of the union: -// -// switch u.AsAny().(type) { -// case *anthropic.BetaBase64ImageSourceParam: -// case *anthropic.BetaURLImageSourceParam: -// case *anthropic.BetaFileImageSourceParam: -// case *anthropic.BetaBase64PDFSourceParam: -// case *anthropic.BetaPlainTextSourceParam: -// case *anthropic.BetaContentBlockSourceParam: -// case *anthropic.BetaURLPDFSourceParam: -// case *anthropic.BetaFileDocumentSourceParam: -// default: -// fmt.Errorf("not present") -// } -func (u betaContentBlockParamUnionSource) AsAny() any { return u.any } - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionSource) GetContent() *BetaContentBlockSourceContentUnionParam { - switch vt := u.any.(type) { - case *BetaBase64PDFBlockSourceUnionParam: - return vt.GetContent() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionSource) GetData() *string { - switch vt := u.any.(type) { - case *BetaImageBlockParamSourceUnion: - return vt.GetData() - case *BetaBase64PDFBlockSourceUnionParam: - return vt.GetData() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionSource) GetMediaType() *string { - switch vt := u.any.(type) { - case *BetaImageBlockParamSourceUnion: - return vt.GetMediaType() - case *BetaBase64PDFBlockSourceUnionParam: - return vt.GetMediaType() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionSource) GetType() *string { - switch vt := u.any.(type) { - case *BetaImageBlockParamSourceUnion: - return vt.GetType() - case *BetaBase64PDFBlockSourceUnionParam: - return vt.GetType() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionSource) GetURL() *string { - switch vt := u.any.(type) { - case *BetaImageBlockParamSourceUnion: - return vt.GetURL() - case *BetaBase64PDFBlockSourceUnionParam: - return vt.GetURL() - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u betaContentBlockParamUnionSource) GetFileID() *string { - switch vt := u.any.(type) { - case *BetaImageBlockParamSourceUnion: - return vt.GetFileID() - case *BetaBase64PDFBlockSourceUnionParam: - return vt.GetFileID() - } - return nil -} - -// The properties Content, Type are required. -type BetaContentBlockSourceParam struct { - Content BetaContentBlockSourceContentUnionParam `json:"content,omitzero,required"` - // This field can be elided, and will marshal its zero value as "content". - Type constant.Content `json:"type,required"` - paramObj -} - -func (r BetaContentBlockSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaContentBlockSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaContentBlockSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaContentBlockSourceContentUnionParam struct { - OfString param.Opt[string] `json:",omitzero,inline"` - OfBetaContentBlockSourceContent []BetaContentBlockSourceContentUnionParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaContentBlockSourceContentUnionParam) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfString, u.OfBetaContentBlockSourceContent) -} -func (u *BetaContentBlockSourceContentUnionParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaContentBlockSourceContentUnionParam) asAny() any { - if !param.IsOmitted(u.OfString) { - return &u.OfString.Value - } else if !param.IsOmitted(u.OfBetaContentBlockSourceContent) { - return &u.OfBetaContentBlockSourceContent - } - return nil -} - -// The properties FileID, Type are required. -type BetaFileDocumentSourceParam struct { - FileID string `json:"file_id,required"` - // This field can be elided, and will marshal its zero value as "file". - Type constant.File `json:"type,required"` - paramObj -} - -func (r BetaFileDocumentSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaFileDocumentSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaFileDocumentSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties FileID, Type are required. -type BetaFileImageSourceParam struct { - FileID string `json:"file_id,required"` - // This field can be elided, and will marshal its zero value as "file". - Type constant.File `json:"type,required"` - paramObj -} - -func (r BetaFileImageSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaFileImageSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaFileImageSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Source, Type are required. -type BetaImageBlockParam struct { - Source BetaImageBlockParamSourceUnion `json:"source,omitzero,required"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as "image". - Type constant.Image `json:"type,required"` - paramObj -} - -func (r BetaImageBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaImageBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaImageBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaImageBlockParamSourceUnion struct { - OfBase64 *BetaBase64ImageSourceParam `json:",omitzero,inline"` - OfURL *BetaURLImageSourceParam `json:",omitzero,inline"` - OfFile *BetaFileImageSourceParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaImageBlockParamSourceUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfBase64, u.OfURL, u.OfFile) -} -func (u *BetaImageBlockParamSourceUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaImageBlockParamSourceUnion) asAny() any { - if !param.IsOmitted(u.OfBase64) { - return u.OfBase64 - } else if !param.IsOmitted(u.OfURL) { - return u.OfURL - } else if !param.IsOmitted(u.OfFile) { - return u.OfFile - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaImageBlockParamSourceUnion) GetData() *string { - if vt := u.OfBase64; vt != nil { - return &vt.Data - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaImageBlockParamSourceUnion) GetMediaType() *string { - if vt := u.OfBase64; vt != nil { - return (*string)(&vt.MediaType) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaImageBlockParamSourceUnion) GetURL() *string { - if vt := u.OfURL; vt != nil { - return &vt.URL - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaImageBlockParamSourceUnion) GetFileID() *string { - if vt := u.OfFile; vt != nil { - return &vt.FileID - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaImageBlockParamSourceUnion) GetType() *string { - if vt := u.OfBase64; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfURL; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfFile; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -type BetaInputJSONDelta struct { - PartialJSON string `json:"partial_json,required"` - Type constant.InputJSONDelta `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - PartialJSON respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaInputJSONDelta) RawJSON() string { return r.JSON.raw } -func (r *BetaInputJSONDelta) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMCPToolResultBlock struct { - Content BetaMCPToolResultBlockContentUnion `json:"content,required"` - IsError bool `json:"is_error,required"` - ToolUseID string `json:"tool_use_id,required"` - Type constant.MCPToolResult `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Content respjson.Field - IsError respjson.Field - ToolUseID respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMCPToolResultBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaMCPToolResultBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaMCPToolResultBlockContentUnion contains all possible properties and values -// from [string], [[]BetaTextBlock]. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -// -// If the underlying value is not a json object, one of the following properties -// will be valid: OfString OfBetaMCPToolResultBlockContent] -type BetaMCPToolResultBlockContentUnion struct { - // This field will be present if the value is a [string] instead of an object. - OfString string `json:",inline"` - // This field will be present if the value is a [[]BetaTextBlock] instead of an - // object. - OfBetaMCPToolResultBlockContent []BetaTextBlock `json:",inline"` - JSON struct { - OfString respjson.Field - OfBetaMCPToolResultBlockContent respjson.Field - raw string - } `json:"-"` -} - -func (u BetaMCPToolResultBlockContentUnion) AsString() (v string) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaMCPToolResultBlockContentUnion) AsBetaMCPToolResultBlockContent() (v []BetaTextBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaMCPToolResultBlockContentUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaMCPToolResultBlockContentUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMCPToolUseBlock struct { - ID string `json:"id,required"` - Input any `json:"input,required"` - // The name of the MCP tool - Name string `json:"name,required"` - // The name of the MCP server - ServerName string `json:"server_name,required"` - Type constant.MCPToolUse `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - Input respjson.Field - Name respjson.Field - ServerName respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMCPToolUseBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaMCPToolUseBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties ID, Input, Name, ServerName, Type are required. -type BetaMCPToolUseBlockParam struct { - ID string `json:"id,required"` - Input any `json:"input,omitzero,required"` - Name string `json:"name,required"` - // The name of the MCP server - ServerName string `json:"server_name,required"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as "mcp_tool_use". - Type constant.MCPToolUse `json:"type,required"` - paramObj -} - -func (r BetaMCPToolUseBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaMCPToolUseBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMCPToolUseBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessage struct { - // Unique object identifier. - // - // The format and length of IDs may change over time. - ID string `json:"id,required"` - // Information about the container used in the request (for the code execution - // tool) - Container BetaContainer `json:"container,required"` - // Content generated by the model. - // - // This is an array of content blocks, each of which has a `type` that determines - // its shape. - // - // Example: - // - // ```json - // [{ "type": "text", "text": "Hi, I'm Claude." }] - // ``` - // - // If the request input `messages` ended with an `assistant` turn, then the - // response `content` will continue directly from that last turn. You can use this - // to constrain the model's output. - // - // For example, if the input `messages` were: - // - // ```json - // [ - // - // { - // "role": "user", - // "content": "What's the Greek name for Sun? (A) Sol (B) Helios (C) Sun" - // }, - // { "role": "assistant", "content": "The best answer is (" } - // - // ] - // ``` - // - // Then the response `content` might be: - // - // ```json - // [{ "type": "text", "text": "B)" }] - // ``` - Content []BetaContentBlockUnion `json:"content,required"` - // The model that will complete your prompt.\n\nSee - // [models](https://docs.anthropic.com/en/docs/models-overview) for additional - // details and options. - Model Model `json:"model,required"` - // Conversational role of the generated message. - // - // This will always be `"assistant"`. - Role constant.Assistant `json:"role,required"` - // The reason that we stopped. - // - // This may be one the following values: - // - // - `"end_turn"`: the model reached a natural stopping point - // - `"max_tokens"`: we exceeded the requested `max_tokens` or the model's maximum - // - `"stop_sequence"`: one of your provided custom `stop_sequences` was generated - // - `"tool_use"`: the model invoked one or more tools - // - // In non-streaming mode this value is always non-null. In streaming mode, it is - // null in the `message_start` event and non-null otherwise. - // - // Any of "end_turn", "max_tokens", "stop_sequence", "tool_use", "pause_turn", - // "refusal". - StopReason BetaStopReason `json:"stop_reason,required"` - // Which custom stop sequence was generated, if any. - // - // This value will be a non-null string if one of your custom stop sequences was - // generated. - StopSequence string `json:"stop_sequence,required"` - // Object type. - // - // For Messages, this is always `"message"`. - Type constant.Message `json:"type,required"` - // Billing and rate-limit usage. - // - // Anthropic's API bills and rate-limits by token counts, as tokens represent the - // underlying cost to our systems. - // - // Under the hood, the API transforms requests into a format suitable for the - // model. The model's output then goes through a parsing stage before becoming an - // API response. As a result, the token counts in `usage` will not match one-to-one - // with the exact visible content of an API request or response. - // - // For example, `output_tokens` will be non-zero, even for an empty string response - // from Claude. - // - // Total input tokens in a request is the summation of `input_tokens`, - // `cache_creation_input_tokens`, and `cache_read_input_tokens`. - Usage BetaUsage `json:"usage,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - Container respjson.Field - Content respjson.Field - Model respjson.Field - Role respjson.Field - StopReason respjson.Field - StopSequence respjson.Field - Type respjson.Field - Usage respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessage) RawJSON() string { return r.JSON.raw } -func (r *BetaMessage) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func (r BetaMessage) ToParam() BetaMessageParam { - var p BetaMessageParam - p.Role = BetaMessageParamRole(r.Role) - p.Content = make([]BetaContentBlockParamUnion, len(r.Content)) - for i, c := range r.Content { - contentParams := c.ToParam() - p.Content[i] = contentParams - } - return p -} - -// The reason that we stopped. -// -// This may be one the following values: -// -// - `"end_turn"`: the model reached a natural stopping point -// - `"max_tokens"`: we exceeded the requested `max_tokens` or the model's maximum -// - `"stop_sequence"`: one of your provided custom `stop_sequences` was generated -// - `"tool_use"`: the model invoked one or more tools -// -// In non-streaming mode this value is always non-null. In streaming mode, it is -// null in the `message_start` event and non-null otherwise. -type BetaMessageStopReason string - -const ( - BetaMessageStopReasonEndTurn BetaMessageStopReason = "end_turn" - BetaMessageStopReasonMaxTokens BetaMessageStopReason = "max_tokens" - BetaMessageStopReasonStopSequence BetaMessageStopReason = "stop_sequence" - BetaMessageStopReasonToolUse BetaMessageStopReason = "tool_use" -) - -type BetaMessageDeltaUsage struct { - // The cumulative number of input tokens used to create the cache entry. - CacheCreationInputTokens int64 `json:"cache_creation_input_tokens,required"` - // The cumulative number of input tokens read from the cache. - CacheReadInputTokens int64 `json:"cache_read_input_tokens,required"` - // The cumulative number of input tokens which were used. - InputTokens int64 `json:"input_tokens,required"` - // The cumulative number of output tokens which were used. - OutputTokens int64 `json:"output_tokens,required"` - // The number of server tool requests. - ServerToolUse BetaServerToolUsage `json:"server_tool_use,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - CacheCreationInputTokens respjson.Field - CacheReadInputTokens respjson.Field - InputTokens respjson.Field - OutputTokens respjson.Field - ServerToolUse respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageDeltaUsage) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageDeltaUsage) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Content, Role are required. -type BetaMessageParam struct { - Content []BetaContentBlockParamUnion `json:"content,omitzero,required"` - // Any of "user", "assistant". - Role BetaMessageParamRole `json:"role,omitzero,required"` - paramObj -} - -func NewBetaUserMessage(blocks ...BetaContentBlockParamUnion) BetaMessageParam { - return BetaMessageParam{ - Role: BetaMessageParamRoleUser, - Content: blocks, - } -} - -func (r BetaMessageParam) MarshalJSON() (data []byte, err error) { - type shadow BetaMessageParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMessageParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessageParamRole string - -const ( - BetaMessageParamRoleUser BetaMessageParamRole = "user" - BetaMessageParamRoleAssistant BetaMessageParamRole = "assistant" -) - -type BetaMessageTokensCount struct { - // The total number of tokens across the provided list of messages, system prompt, - // and tools. - InputTokens int64 `json:"input_tokens,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - InputTokens respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageTokensCount) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageTokensCount) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMetadataParam struct { - // An external identifier for the user who is associated with the request. - // - // This should be a uuid, hash value, or other opaque identifier. Anthropic may use - // this id to help detect abuse. Do not include any identifying information such as - // name, email address, or phone number. - UserID param.Opt[string] `json:"user_id,omitzero"` - paramObj -} - -func (r BetaMetadataParam) MarshalJSON() (data []byte, err error) { - type shadow BetaMetadataParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMetadataParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Data, MediaType, Type are required. -type BetaPlainTextSourceParam struct { - Data string `json:"data,required"` - // This field can be elided, and will marshal its zero value as "text/plain". - MediaType constant.TextPlain `json:"media_type,required"` - // This field can be elided, and will marshal its zero value as "text". - Type constant.Text `json:"type,required"` - paramObj -} - -func (r BetaPlainTextSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaPlainTextSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaPlainTextSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaRawContentBlockDeltaUnion contains all possible properties and values from -// [BetaTextDelta], [BetaInputJSONDelta], [BetaCitationsDelta], -// [BetaThinkingDelta], [BetaSignatureDelta]. -// -// Use the [BetaRawContentBlockDeltaUnion.AsAny] method to switch on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaRawContentBlockDeltaUnion struct { - // This field is from variant [BetaTextDelta]. - Text string `json:"text"` - // Any of "text_delta", "input_json_delta", "citations_delta", "thinking_delta", - // "signature_delta". - Type string `json:"type"` - // This field is from variant [BetaInputJSONDelta]. - PartialJSON string `json:"partial_json"` - // This field is from variant [BetaCitationsDelta]. - Citation BetaCitationsDeltaCitationUnion `json:"citation"` - // This field is from variant [BetaThinkingDelta]. - Thinking string `json:"thinking"` - // This field is from variant [BetaSignatureDelta]. - Signature string `json:"signature"` - JSON struct { - Text respjson.Field - Type respjson.Field - PartialJSON respjson.Field - Citation respjson.Field - Thinking respjson.Field - Signature respjson.Field - raw string - } `json:"-"` -} - -// anyBetaRawContentBlockDelta is implemented by each variant of -// [BetaRawContentBlockDeltaUnion] to add type safety for the return type of -// [BetaRawContentBlockDeltaUnion.AsAny] -type anyBetaRawContentBlockDelta interface { - implBetaRawContentBlockDeltaUnion() -} - -func (BetaTextDelta) implBetaRawContentBlockDeltaUnion() {} -func (BetaInputJSONDelta) implBetaRawContentBlockDeltaUnion() {} -func (BetaCitationsDelta) implBetaRawContentBlockDeltaUnion() {} -func (BetaThinkingDelta) implBetaRawContentBlockDeltaUnion() {} -func (BetaSignatureDelta) implBetaRawContentBlockDeltaUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaRawContentBlockDeltaUnion.AsAny().(type) { -// case anthropic.BetaTextDelta: -// case anthropic.BetaInputJSONDelta: -// case anthropic.BetaCitationsDelta: -// case anthropic.BetaThinkingDelta: -// case anthropic.BetaSignatureDelta: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaRawContentBlockDeltaUnion) AsAny() anyBetaRawContentBlockDelta { - switch u.Type { - case "text_delta": - return u.AsTextDelta() - case "input_json_delta": - return u.AsInputJSONDelta() - case "citations_delta": - return u.AsCitationsDelta() - case "thinking_delta": - return u.AsThinkingDelta() - case "signature_delta": - return u.AsSignatureDelta() - } - return nil -} - -func (u BetaRawContentBlockDeltaUnion) AsTextDelta() (v BetaTextDelta) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockDeltaUnion) AsInputJSONDelta() (v BetaInputJSONDelta) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockDeltaUnion) AsCitationsDelta() (v BetaCitationsDelta) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockDeltaUnion) AsThinkingDelta() (v BetaThinkingDelta) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockDeltaUnion) AsSignatureDelta() (v BetaSignatureDelta) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaRawContentBlockDeltaUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaRawContentBlockDeltaUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRawContentBlockDeltaEvent struct { - Delta BetaRawContentBlockDeltaUnion `json:"delta,required"` - Index int64 `json:"index,required"` - Type constant.ContentBlockDelta `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Delta respjson.Field - Index respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRawContentBlockDeltaEvent) RawJSON() string { return r.JSON.raw } -func (r *BetaRawContentBlockDeltaEvent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRawContentBlockStartEvent struct { - // Response model for a file uploaded to the container. - ContentBlock BetaRawContentBlockStartEventContentBlockUnion `json:"content_block,required"` - Index int64 `json:"index,required"` - Type constant.ContentBlockStart `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ContentBlock respjson.Field - Index respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRawContentBlockStartEvent) RawJSON() string { return r.JSON.raw } -func (r *BetaRawContentBlockStartEvent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaRawContentBlockStartEventContentBlockUnion contains all possible properties -// and values from [BetaTextBlock], [BetaToolUseBlock], [BetaServerToolUseBlock], -// [BetaWebSearchToolResultBlock], [BetaCodeExecutionToolResultBlock], -// [BetaMCPToolUseBlock], [BetaMCPToolResultBlock], [BetaContainerUploadBlock], -// [BetaThinkingBlock], [BetaRedactedThinkingBlock]. -// -// Use the [BetaRawContentBlockStartEventContentBlockUnion.AsAny] method to switch -// on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaRawContentBlockStartEventContentBlockUnion struct { - // This field is from variant [BetaTextBlock]. - Citations []BetaTextCitationUnion `json:"citations"` - // This field is from variant [BetaTextBlock]. - Text string `json:"text"` - // Any of "text", "tool_use", "server_tool_use", "web_search_tool_result", - // "code_execution_tool_result", "mcp_tool_use", "mcp_tool_result", - // "container_upload", "thinking", "redacted_thinking". - Type string `json:"type"` - ID string `json:"id"` - Input any `json:"input"` - Name string `json:"name"` - // This field is a union of [BetaWebSearchToolResultBlockContentUnion], - // [BetaCodeExecutionToolResultBlockContentUnion], - // [BetaMCPToolResultBlockContentUnion] - Content BetaRawContentBlockStartEventContentBlockUnionContent `json:"content"` - ToolUseID string `json:"tool_use_id"` - // This field is from variant [BetaMCPToolUseBlock]. - ServerName string `json:"server_name"` - // This field is from variant [BetaMCPToolResultBlock]. - IsError bool `json:"is_error"` - // This field is from variant [BetaContainerUploadBlock]. - FileID string `json:"file_id"` - // This field is from variant [BetaThinkingBlock]. - Signature string `json:"signature"` - // This field is from variant [BetaThinkingBlock]. - Thinking string `json:"thinking"` - // This field is from variant [BetaRedactedThinkingBlock]. - Data string `json:"data"` - JSON struct { - Citations respjson.Field - Text respjson.Field - Type respjson.Field - ID respjson.Field - Input respjson.Field - Name respjson.Field - Content respjson.Field - ToolUseID respjson.Field - ServerName respjson.Field - IsError respjson.Field - FileID respjson.Field - Signature respjson.Field - Thinking respjson.Field - Data respjson.Field - raw string - } `json:"-"` -} - -// anyBetaRawContentBlockStartEventContentBlock is implemented by each variant of -// [BetaRawContentBlockStartEventContentBlockUnion] to add type safety for the -// return type of [BetaRawContentBlockStartEventContentBlockUnion.AsAny] -type anyBetaRawContentBlockStartEventContentBlock interface { - implBetaRawContentBlockStartEventContentBlockUnion() -} - -func (BetaTextBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaToolUseBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaServerToolUseBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaWebSearchToolResultBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaCodeExecutionToolResultBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaMCPToolUseBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaMCPToolResultBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaContainerUploadBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaThinkingBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} -func (BetaRedactedThinkingBlock) implBetaRawContentBlockStartEventContentBlockUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaRawContentBlockStartEventContentBlockUnion.AsAny().(type) { -// case anthropic.BetaTextBlock: -// case anthropic.BetaToolUseBlock: -// case anthropic.BetaServerToolUseBlock: -// case anthropic.BetaWebSearchToolResultBlock: -// case anthropic.BetaCodeExecutionToolResultBlock: -// case anthropic.BetaMCPToolUseBlock: -// case anthropic.BetaMCPToolResultBlock: -// case anthropic.BetaContainerUploadBlock: -// case anthropic.BetaThinkingBlock: -// case anthropic.BetaRedactedThinkingBlock: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaRawContentBlockStartEventContentBlockUnion) AsAny() anyBetaRawContentBlockStartEventContentBlock { - switch u.Type { - case "text": - return u.AsText() - case "tool_use": - return u.AsToolUse() - case "server_tool_use": - return u.AsServerToolUse() - case "web_search_tool_result": - return u.AsWebSearchToolResult() - case "code_execution_tool_result": - return u.AsCodeExecutionToolResult() - case "mcp_tool_use": - return u.AsMCPToolUse() - case "mcp_tool_result": - return u.AsMCPToolResult() - case "container_upload": - return u.AsContainerUpload() - case "thinking": - return u.AsThinking() - case "redacted_thinking": - return u.AsRedactedThinking() - } - return nil -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsText() (v BetaTextBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsToolUse() (v BetaToolUseBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsServerToolUse() (v BetaServerToolUseBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsWebSearchToolResult() (v BetaWebSearchToolResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsCodeExecutionToolResult() (v BetaCodeExecutionToolResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsMCPToolUse() (v BetaMCPToolUseBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsMCPToolResult() (v BetaMCPToolResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsContainerUpload() (v BetaContainerUploadBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsThinking() (v BetaThinkingBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawContentBlockStartEventContentBlockUnion) AsRedactedThinking() (v BetaRedactedThinkingBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaRawContentBlockStartEventContentBlockUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaRawContentBlockStartEventContentBlockUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaRawContentBlockStartEventContentBlockUnionContent is an implicit subunion of -// [BetaRawContentBlockStartEventContentBlockUnion]. -// BetaRawContentBlockStartEventContentBlockUnionContent provides convenient access -// to the sub-properties of the union. -// -// For type safety it is recommended to directly use a variant of the -// [BetaRawContentBlockStartEventContentBlockUnion]. -// -// If the underlying value is not a json object, one of the following properties -// will be valid: OfBetaWebSearchResultBlockArray OfString -// OfBetaMCPToolResultBlockContent] -type BetaRawContentBlockStartEventContentBlockUnionContent struct { - // This field will be present if the value is a [[]BetaWebSearchResultBlock] - // instead of an object. - OfBetaWebSearchResultBlockArray []BetaWebSearchResultBlock `json:",inline"` - // This field will be present if the value is a [string] instead of an object. - OfString string `json:",inline"` - // This field will be present if the value is a [[]BetaTextBlock] instead of an - // object. - OfBetaMCPToolResultBlockContent []BetaTextBlock `json:",inline"` - ErrorCode string `json:"error_code"` - Type string `json:"type"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - Content []BetaCodeExecutionOutputBlock `json:"content"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - ReturnCode int64 `json:"return_code"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - Stderr string `json:"stderr"` - // This field is from variant [BetaCodeExecutionToolResultBlockContentUnion]. - Stdout string `json:"stdout"` - JSON struct { - OfBetaWebSearchResultBlockArray respjson.Field - OfString respjson.Field - OfBetaMCPToolResultBlockContent respjson.Field - ErrorCode respjson.Field - Type respjson.Field - Content respjson.Field - ReturnCode respjson.Field - Stderr respjson.Field - Stdout respjson.Field - raw string - } `json:"-"` -} - -func (r *BetaRawContentBlockStartEventContentBlockUnionContent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRawContentBlockStopEvent struct { - Index int64 `json:"index,required"` - Type constant.ContentBlockStop `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Index respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRawContentBlockStopEvent) RawJSON() string { return r.JSON.raw } -func (r *BetaRawContentBlockStopEvent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRawMessageDeltaEvent struct { - Delta BetaRawMessageDeltaEventDelta `json:"delta,required"` - Type constant.MessageDelta `json:"type,required"` - // Billing and rate-limit usage. - // - // Anthropic's API bills and rate-limits by token counts, as tokens represent the - // underlying cost to our systems. - // - // Under the hood, the API transforms requests into a format suitable for the - // model. The model's output then goes through a parsing stage before becoming an - // API response. As a result, the token counts in `usage` will not match one-to-one - // with the exact visible content of an API request or response. - // - // For example, `output_tokens` will be non-zero, even for an empty string response - // from Claude. - // - // Total input tokens in a request is the summation of `input_tokens`, - // `cache_creation_input_tokens`, and `cache_read_input_tokens`. - Usage BetaMessageDeltaUsage `json:"usage,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Delta respjson.Field - Type respjson.Field - Usage respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRawMessageDeltaEvent) RawJSON() string { return r.JSON.raw } -func (r *BetaRawMessageDeltaEvent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRawMessageDeltaEventDelta struct { - // Information about the container used in the request (for the code execution - // tool) - Container BetaContainer `json:"container,required"` - // Any of "end_turn", "max_tokens", "stop_sequence", "tool_use", "pause_turn", - // "refusal". - StopReason BetaStopReason `json:"stop_reason,required"` - StopSequence string `json:"stop_sequence,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Container respjson.Field - StopReason respjson.Field - StopSequence respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRawMessageDeltaEventDelta) RawJSON() string { return r.JSON.raw } -func (r *BetaRawMessageDeltaEventDelta) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRawMessageStartEvent struct { - Message BetaMessage `json:"message,required"` - Type constant.MessageStart `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRawMessageStartEvent) RawJSON() string { return r.JSON.raw } -func (r *BetaRawMessageStartEvent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRawMessageStopEvent struct { - Type constant.MessageStop `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRawMessageStopEvent) RawJSON() string { return r.JSON.raw } -func (r *BetaRawMessageStopEvent) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaRawMessageStreamEventUnion contains all possible properties and values from -// [BetaRawMessageStartEvent], [BetaRawMessageDeltaEvent], -// [BetaRawMessageStopEvent], [BetaRawContentBlockStartEvent], -// [BetaRawContentBlockDeltaEvent], [BetaRawContentBlockStopEvent]. -// -// Use the [BetaRawMessageStreamEventUnion.AsAny] method to switch on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaRawMessageStreamEventUnion struct { - // This field is from variant [BetaRawMessageStartEvent]. - Message BetaMessage `json:"message"` - // Any of "message_start", "message_delta", "message_stop", "content_block_start", - // "content_block_delta", "content_block_stop". - Type string `json:"type"` - // This field is a union of [BetaRawMessageDeltaEventDelta], - // [BetaRawContentBlockDeltaUnion] - Delta BetaRawMessageStreamEventUnionDelta `json:"delta"` - // This field is from variant [BetaRawMessageDeltaEvent]. - Usage BetaMessageDeltaUsage `json:"usage"` - // This field is from variant [BetaRawContentBlockStartEvent]. - ContentBlock BetaRawContentBlockStartEventContentBlockUnion `json:"content_block"` - Index int64 `json:"index"` - JSON struct { - Message respjson.Field - Type respjson.Field - Delta respjson.Field - Usage respjson.Field - ContentBlock respjson.Field - Index respjson.Field - raw string - } `json:"-"` -} - -// anyBetaRawMessageStreamEvent is implemented by each variant of -// [BetaRawMessageStreamEventUnion] to add type safety for the return type of -// [BetaRawMessageStreamEventUnion.AsAny] -type anyBetaRawMessageStreamEvent interface { - implBetaRawMessageStreamEventUnion() -} - -func (BetaRawMessageStartEvent) implBetaRawMessageStreamEventUnion() {} -func (BetaRawMessageDeltaEvent) implBetaRawMessageStreamEventUnion() {} -func (BetaRawMessageStopEvent) implBetaRawMessageStreamEventUnion() {} -func (BetaRawContentBlockStartEvent) implBetaRawMessageStreamEventUnion() {} -func (BetaRawContentBlockDeltaEvent) implBetaRawMessageStreamEventUnion() {} -func (BetaRawContentBlockStopEvent) implBetaRawMessageStreamEventUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaRawMessageStreamEventUnion.AsAny().(type) { -// case anthropic.BetaRawMessageStartEvent: -// case anthropic.BetaRawMessageDeltaEvent: -// case anthropic.BetaRawMessageStopEvent: -// case anthropic.BetaRawContentBlockStartEvent: -// case anthropic.BetaRawContentBlockDeltaEvent: -// case anthropic.BetaRawContentBlockStopEvent: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaRawMessageStreamEventUnion) AsAny() anyBetaRawMessageStreamEvent { - switch u.Type { - case "message_start": - return u.AsMessageStart() - case "message_delta": - return u.AsMessageDelta() - case "message_stop": - return u.AsMessageStop() - case "content_block_start": - return u.AsContentBlockStart() - case "content_block_delta": - return u.AsContentBlockDelta() - case "content_block_stop": - return u.AsContentBlockStop() - } - return nil -} - -func (u BetaRawMessageStreamEventUnion) AsMessageStart() (v BetaRawMessageStartEvent) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawMessageStreamEventUnion) AsMessageDelta() (v BetaRawMessageDeltaEvent) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawMessageStreamEventUnion) AsMessageStop() (v BetaRawMessageStopEvent) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawMessageStreamEventUnion) AsContentBlockStart() (v BetaRawContentBlockStartEvent) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawMessageStreamEventUnion) AsContentBlockDelta() (v BetaRawContentBlockDeltaEvent) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaRawMessageStreamEventUnion) AsContentBlockStop() (v BetaRawContentBlockStopEvent) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaRawMessageStreamEventUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaRawMessageStreamEventUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaRawMessageStreamEventUnionDelta is an implicit subunion of -// [BetaRawMessageStreamEventUnion]. BetaRawMessageStreamEventUnionDelta provides -// convenient access to the sub-properties of the union. -// -// For type safety it is recommended to directly use a variant of the -// [BetaRawMessageStreamEventUnion]. -type BetaRawMessageStreamEventUnionDelta struct { - // This field is from variant [BetaRawMessageDeltaEventDelta]. - Container BetaContainer `json:"container"` - // This field is from variant [BetaRawMessageDeltaEventDelta]. - StopReason BetaStopReason `json:"stop_reason"` - // This field is from variant [BetaRawMessageDeltaEventDelta]. - StopSequence string `json:"stop_sequence"` - // This field is from variant [BetaRawContentBlockDeltaUnion]. - Text string `json:"text"` - Type string `json:"type"` - // This field is from variant [BetaRawContentBlockDeltaUnion]. - PartialJSON string `json:"partial_json"` - // This field is from variant [BetaRawContentBlockDeltaUnion]. - Citation BetaCitationsDeltaCitationUnion `json:"citation"` - // This field is from variant [BetaRawContentBlockDeltaUnion]. - Thinking string `json:"thinking"` - // This field is from variant [BetaRawContentBlockDeltaUnion]. - Signature string `json:"signature"` - JSON struct { - Container respjson.Field - StopReason respjson.Field - StopSequence respjson.Field - Text respjson.Field - Type respjson.Field - PartialJSON respjson.Field - Citation respjson.Field - Thinking respjson.Field - Signature respjson.Field - raw string - } `json:"-"` -} - -func (r *BetaRawMessageStreamEventUnionDelta) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Accumulate builds up the Message incrementally from a MessageStreamEvent. The Message then can be used as -// any other Message, except with the caveat that the Message.JSON field which normally can be used to inspect -// the JSON sent over the network may not be populated fully. -// -// message := anthropic.Message{} -// for stream.Next() { -// event := stream.Current() -// message.Accumulate(event) -// } -func (acc *BetaMessage) Accumulate(event BetaRawMessageStreamEventUnion) error { - if acc == nil { - return fmt.Errorf("accumulate: cannot accumlate into nil Message") - } - - switch event := event.AsAny().(type) { - case BetaRawMessageStartEvent: - *acc = event.Message - case BetaRawMessageDeltaEvent: - acc.StopReason = event.Delta.StopReason - acc.StopSequence = event.Delta.StopSequence - acc.Usage.OutputTokens = event.Usage.OutputTokens - case BetaRawMessageStopEvent: - accJson, err := json.Marshal(acc) - if err != nil { - return fmt.Errorf("error converting content block to JSON: %w", err) - } - acc.JSON.raw = string(accJson) - case BetaRawContentBlockStartEvent: - acc.Content = append(acc.Content, BetaContentBlockUnion{}) - err := acc.Content[len(acc.Content)-1].UnmarshalJSON([]byte(event.ContentBlock.RawJSON())) - if err != nil { - return err - } - case BetaRawContentBlockDeltaEvent: - if len(acc.Content) == 0 { - return fmt.Errorf("received event of type %s but there was no content block", event.Type) - } - cb := &acc.Content[len(acc.Content)-1] - switch delta := event.Delta.AsAny().(type) { - case BetaTextDelta: - cb.Text += delta.Text - case BetaInputJSONDelta: - if len(delta.PartialJSON) != 0 { - if string(cb.Input) == "{}" { - cb.Input = []byte(delta.PartialJSON) - } else { - cb.Input = append(cb.Input, []byte(delta.PartialJSON)...) - } - } - case BetaThinkingDelta: - cb.Thinking += delta.Thinking - case BetaSignatureDelta: - cb.Signature += delta.Signature - case BetaCitationsDelta: - citation := BetaTextCitationUnion{} - err := citation.UnmarshalJSON([]byte(delta.Citation.RawJSON())) - if err != nil { - return fmt.Errorf("could not unmarshal citation delta into citation type: %w", err) - } - cb.Citations = append(cb.Citations, citation) - } - case BetaRawContentBlockStopEvent: - if len(acc.Content) == 0 { - return fmt.Errorf("received event of type %s but there was no content block", event.Type) - } - contentBlock := &acc.Content[len(acc.Content)-1] - cbJson, err := json.Marshal(contentBlock) - if err != nil { - return fmt.Errorf("error converting content block to JSON: %w", err) - } - contentBlock.JSON.raw = string(cbJson) - } - - return nil -} - -type BetaRedactedThinkingBlock struct { - Data string `json:"data,required"` - Type constant.RedactedThinking `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Data respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaRedactedThinkingBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaRedactedThinkingBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func (r BetaRedactedThinkingBlock) ToParam() BetaRedactedThinkingBlockParam { - var p BetaRedactedThinkingBlockParam - p.Type = r.Type - p.Data = r.Data - return p -} - -// The properties Data, Type are required. -type BetaRedactedThinkingBlockParam struct { - Data string `json:"data,required"` - // This field can be elided, and will marshal its zero value as - // "redacted_thinking". - Type constant.RedactedThinking `json:"type,required"` - paramObj -} - -func (r BetaRedactedThinkingBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaRedactedThinkingBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaRedactedThinkingBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaRequestMCPServerToolConfigurationParam struct { - Enabled param.Opt[bool] `json:"enabled,omitzero"` - AllowedTools []string `json:"allowed_tools,omitzero"` - paramObj -} - -func (r BetaRequestMCPServerToolConfigurationParam) MarshalJSON() (data []byte, err error) { - type shadow BetaRequestMCPServerToolConfigurationParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaRequestMCPServerToolConfigurationParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Name, Type, URL are required. -type BetaRequestMCPServerURLDefinitionParam struct { - Name string `json:"name,required"` - URL string `json:"url,required"` - AuthorizationToken param.Opt[string] `json:"authorization_token,omitzero"` - ToolConfiguration BetaRequestMCPServerToolConfigurationParam `json:"tool_configuration,omitzero"` - // This field can be elided, and will marshal its zero value as "url". - Type constant.URL `json:"type,required"` - paramObj -} - -func (r BetaRequestMCPServerURLDefinitionParam) MarshalJSON() (data []byte, err error) { - type shadow BetaRequestMCPServerURLDefinitionParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaRequestMCPServerURLDefinitionParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties ToolUseID, Type are required. -type BetaRequestMCPToolResultBlockParam struct { - ToolUseID string `json:"tool_use_id,required"` - IsError param.Opt[bool] `json:"is_error,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - Content BetaRequestMCPToolResultBlockParamContentUnion `json:"content,omitzero"` - // This field can be elided, and will marshal its zero value as "mcp_tool_result". - Type constant.MCPToolResult `json:"type,required"` - paramObj -} - -func (r BetaRequestMCPToolResultBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaRequestMCPToolResultBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaRequestMCPToolResultBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaRequestMCPToolResultBlockParamContentUnion struct { - OfString param.Opt[string] `json:",omitzero,inline"` - OfBetaMCPToolResultBlockContent []BetaTextBlockParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaRequestMCPToolResultBlockParamContentUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfString, u.OfBetaMCPToolResultBlockContent) -} -func (u *BetaRequestMCPToolResultBlockParamContentUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaRequestMCPToolResultBlockParamContentUnion) asAny() any { - if !param.IsOmitted(u.OfString) { - return &u.OfString.Value - } else if !param.IsOmitted(u.OfBetaMCPToolResultBlockContent) { - return &u.OfBetaMCPToolResultBlockContent - } - return nil -} - -type BetaServerToolUsage struct { - // The number of web search tool requests. - WebSearchRequests int64 `json:"web_search_requests,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - WebSearchRequests respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaServerToolUsage) RawJSON() string { return r.JSON.raw } -func (r *BetaServerToolUsage) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaServerToolUseBlock struct { - ID string `json:"id,required"` - Input any `json:"input,required"` - // Any of "web_search", "code_execution". - Name BetaServerToolUseBlockName `json:"name,required"` - Type constant.ServerToolUse `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - Input respjson.Field - Name respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaServerToolUseBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaServerToolUseBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaServerToolUseBlockName string - -const ( - BetaServerToolUseBlockNameWebSearch BetaServerToolUseBlockName = "web_search" - BetaServerToolUseBlockNameCodeExecution BetaServerToolUseBlockName = "code_execution" -) - -// The properties ID, Input, Name, Type are required. -type BetaServerToolUseBlockParam struct { - ID string `json:"id,required"` - Input any `json:"input,omitzero,required"` - // Any of "web_search", "code_execution". - Name BetaServerToolUseBlockParamName `json:"name,omitzero,required"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as "server_tool_use". - Type constant.ServerToolUse `json:"type,required"` - paramObj -} - -func (r BetaServerToolUseBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaServerToolUseBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaServerToolUseBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaServerToolUseBlockParamName string - -const ( - BetaServerToolUseBlockParamNameWebSearch BetaServerToolUseBlockParamName = "web_search" - BetaServerToolUseBlockParamNameCodeExecution BetaServerToolUseBlockParamName = "code_execution" -) - -type BetaSignatureDelta struct { - Signature string `json:"signature,required"` - Type constant.SignatureDelta `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Signature respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaSignatureDelta) RawJSON() string { return r.JSON.raw } -func (r *BetaSignatureDelta) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaStopReason string - -const ( - BetaStopReasonEndTurn BetaStopReason = "end_turn" - BetaStopReasonMaxTokens BetaStopReason = "max_tokens" - BetaStopReasonStopSequence BetaStopReason = "stop_sequence" - BetaStopReasonToolUse BetaStopReason = "tool_use" - BetaStopReasonPauseTurn BetaStopReason = "pause_turn" - BetaStopReasonRefusal BetaStopReason = "refusal" -) - -type BetaTextBlock struct { - // Citations supporting the text block. - // - // The type of citation returned will depend on the type of document being cited. - // Citing a PDF results in `page_location`, plain text results in `char_location`, - // and content document results in `content_block_location`. - Citations []BetaTextCitationUnion `json:"citations,required"` - Text string `json:"text,required"` - Type constant.Text `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Citations respjson.Field - Text respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaTextBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaTextBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func (r BetaTextBlock) ToParam() BetaTextBlockParam { - var p BetaTextBlockParam - p.Type = r.Type - p.Text = r.Text - - // Distinguish between a nil and zero length slice, since some compatible - // APIs may not require citations. - if r.Citations != nil { - p.Citations = make([]BetaTextCitationParamUnion, len(r.Citations)) - } - - for i, citation := range r.Citations { - switch citationVariant := citation.AsAny().(type) { - case BetaCitationCharLocation: - var citationParam BetaCitationCharLocationParam - citationParam.Type = citationVariant.Type - citationParam.DocumentTitle = paramutil.ToOpt(citationVariant.DocumentTitle, citationVariant.JSON.DocumentTitle) - citationParam.CitedText = citationVariant.CitedText - citationParam.DocumentIndex = citationVariant.DocumentIndex - citationParam.EndCharIndex = citationVariant.EndCharIndex - citationParam.StartCharIndex = citationVariant.StartCharIndex - p.Citations[i] = BetaTextCitationParamUnion{OfCharLocation: &citationParam} - case BetaCitationPageLocation: - var citationParam BetaCitationPageLocationParam - citationParam.Type = citationVariant.Type - citationParam.DocumentTitle = paramutil.ToOpt(citationVariant.DocumentTitle, citationVariant.JSON.DocumentTitle) - citationParam.DocumentIndex = citationVariant.DocumentIndex - citationParam.EndPageNumber = citationVariant.EndPageNumber - citationParam.StartPageNumber = citationVariant.StartPageNumber - p.Citations[i] = BetaTextCitationParamUnion{OfPageLocation: &citationParam} - case BetaCitationContentBlockLocation: - var citationParam BetaCitationContentBlockLocationParam - citationParam.Type = citationVariant.Type - citationParam.DocumentTitle = paramutil.ToOpt(citationVariant.DocumentTitle, citationVariant.JSON.DocumentTitle) - citationParam.CitedText = citationVariant.CitedText - citationParam.DocumentIndex = citationVariant.DocumentIndex - citationParam.EndBlockIndex = citationVariant.EndBlockIndex - citationParam.StartBlockIndex = citationVariant.StartBlockIndex - p.Citations[i] = BetaTextCitationParamUnion{OfContentBlockLocation: &citationParam} - } - } - return p -} - -// The properties Text, Type are required. -type BetaTextBlockParam struct { - Text string `json:"text,required"` - Citations []BetaTextCitationParamUnion `json:"citations,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as "text". - Type constant.Text `json:"type,required"` - paramObj -} - -func (r BetaTextBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaTextBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaTextBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaTextCitationUnion contains all possible properties and values from -// [BetaCitationCharLocation], [BetaCitationPageLocation], -// [BetaCitationContentBlockLocation], [BetaCitationsWebSearchResultLocation]. -// -// Use the [BetaTextCitationUnion.AsAny] method to switch on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaTextCitationUnion struct { - CitedText string `json:"cited_text"` - DocumentIndex int64 `json:"document_index"` - DocumentTitle string `json:"document_title"` - // This field is from variant [BetaCitationCharLocation]. - EndCharIndex int64 `json:"end_char_index"` - // This field is from variant [BetaCitationCharLocation]. - StartCharIndex int64 `json:"start_char_index"` - // Any of "char_location", "page_location", "content_block_location", - // "web_search_result_location". - Type string `json:"type"` - // This field is from variant [BetaCitationPageLocation]. - EndPageNumber int64 `json:"end_page_number"` - // This field is from variant [BetaCitationPageLocation]. - StartPageNumber int64 `json:"start_page_number"` - // This field is from variant [BetaCitationContentBlockLocation]. - EndBlockIndex int64 `json:"end_block_index"` - // This field is from variant [BetaCitationContentBlockLocation]. - StartBlockIndex int64 `json:"start_block_index"` - // This field is from variant [BetaCitationsWebSearchResultLocation]. - EncryptedIndex string `json:"encrypted_index"` - // This field is from variant [BetaCitationsWebSearchResultLocation]. - Title string `json:"title"` - // This field is from variant [BetaCitationsWebSearchResultLocation]. - URL string `json:"url"` - JSON struct { - CitedText respjson.Field - DocumentIndex respjson.Field - DocumentTitle respjson.Field - EndCharIndex respjson.Field - StartCharIndex respjson.Field - Type respjson.Field - EndPageNumber respjson.Field - StartPageNumber respjson.Field - EndBlockIndex respjson.Field - StartBlockIndex respjson.Field - EncryptedIndex respjson.Field - Title respjson.Field - URL respjson.Field - raw string - } `json:"-"` -} - -// anyBetaTextCitation is implemented by each variant of [BetaTextCitationUnion] to -// add type safety for the return type of [BetaTextCitationUnion.AsAny] -type anyBetaTextCitation interface { - implBetaTextCitationUnion() -} - -func (BetaCitationCharLocation) implBetaTextCitationUnion() {} -func (BetaCitationPageLocation) implBetaTextCitationUnion() {} -func (BetaCitationContentBlockLocation) implBetaTextCitationUnion() {} -func (BetaCitationsWebSearchResultLocation) implBetaTextCitationUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaTextCitationUnion.AsAny().(type) { -// case anthropic.BetaCitationCharLocation: -// case anthropic.BetaCitationPageLocation: -// case anthropic.BetaCitationContentBlockLocation: -// case anthropic.BetaCitationsWebSearchResultLocation: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaTextCitationUnion) AsAny() anyBetaTextCitation { - switch u.Type { - case "char_location": - return u.AsCharLocation() - case "page_location": - return u.AsPageLocation() - case "content_block_location": - return u.AsContentBlockLocation() - case "web_search_result_location": - return u.AsWebSearchResultLocation() - } - return nil -} - -func (u BetaTextCitationUnion) AsCharLocation() (v BetaCitationCharLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaTextCitationUnion) AsPageLocation() (v BetaCitationPageLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaTextCitationUnion) AsContentBlockLocation() (v BetaCitationContentBlockLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaTextCitationUnion) AsWebSearchResultLocation() (v BetaCitationsWebSearchResultLocation) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaTextCitationUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaTextCitationUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaTextCitationParamUnion struct { - OfCharLocation *BetaCitationCharLocationParam `json:",omitzero,inline"` - OfPageLocation *BetaCitationPageLocationParam `json:",omitzero,inline"` - OfContentBlockLocation *BetaCitationContentBlockLocationParam `json:",omitzero,inline"` - OfWebSearchResultLocation *BetaCitationWebSearchResultLocationParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaTextCitationParamUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfCharLocation, u.OfPageLocation, u.OfContentBlockLocation, u.OfWebSearchResultLocation) -} -func (u *BetaTextCitationParamUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaTextCitationParamUnion) asAny() any { - if !param.IsOmitted(u.OfCharLocation) { - return u.OfCharLocation - } else if !param.IsOmitted(u.OfPageLocation) { - return u.OfPageLocation - } else if !param.IsOmitted(u.OfContentBlockLocation) { - return u.OfContentBlockLocation - } else if !param.IsOmitted(u.OfWebSearchResultLocation) { - return u.OfWebSearchResultLocation - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetEndCharIndex() *int64 { - if vt := u.OfCharLocation; vt != nil { - return &vt.EndCharIndex - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetStartCharIndex() *int64 { - if vt := u.OfCharLocation; vt != nil { - return &vt.StartCharIndex - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetEndPageNumber() *int64 { - if vt := u.OfPageLocation; vt != nil { - return &vt.EndPageNumber - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetStartPageNumber() *int64 { - if vt := u.OfPageLocation; vt != nil { - return &vt.StartPageNumber - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetEndBlockIndex() *int64 { - if vt := u.OfContentBlockLocation; vt != nil { - return &vt.EndBlockIndex - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetStartBlockIndex() *int64 { - if vt := u.OfContentBlockLocation; vt != nil { - return &vt.StartBlockIndex - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetEncryptedIndex() *string { - if vt := u.OfWebSearchResultLocation; vt != nil { - return &vt.EncryptedIndex - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetTitle() *string { - if vt := u.OfWebSearchResultLocation; vt != nil && vt.Title.Valid() { - return &vt.Title.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetURL() *string { - if vt := u.OfWebSearchResultLocation; vt != nil { - return &vt.URL - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetCitedText() *string { - if vt := u.OfCharLocation; vt != nil { - return (*string)(&vt.CitedText) - } else if vt := u.OfPageLocation; vt != nil { - return (*string)(&vt.CitedText) - } else if vt := u.OfContentBlockLocation; vt != nil { - return (*string)(&vt.CitedText) - } else if vt := u.OfWebSearchResultLocation; vt != nil { - return (*string)(&vt.CitedText) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetDocumentIndex() *int64 { - if vt := u.OfCharLocation; vt != nil { - return (*int64)(&vt.DocumentIndex) - } else if vt := u.OfPageLocation; vt != nil { - return (*int64)(&vt.DocumentIndex) - } else if vt := u.OfContentBlockLocation; vt != nil { - return (*int64)(&vt.DocumentIndex) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetDocumentTitle() *string { - if vt := u.OfCharLocation; vt != nil && vt.DocumentTitle.Valid() { - return &vt.DocumentTitle.Value - } else if vt := u.OfPageLocation; vt != nil && vt.DocumentTitle.Valid() { - return &vt.DocumentTitle.Value - } else if vt := u.OfContentBlockLocation; vt != nil && vt.DocumentTitle.Valid() { - return &vt.DocumentTitle.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaTextCitationParamUnion) GetType() *string { - if vt := u.OfCharLocation; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfPageLocation; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfContentBlockLocation; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfWebSearchResultLocation; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -type BetaTextDelta struct { - Text string `json:"text,required"` - Type constant.TextDelta `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Text respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaTextDelta) RawJSON() string { return r.JSON.raw } -func (r *BetaTextDelta) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaThinkingBlock struct { - Signature string `json:"signature,required"` - Thinking string `json:"thinking,required"` - Type constant.Thinking `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Signature respjson.Field - Thinking respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaThinkingBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaThinkingBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func (r BetaThinkingBlock) ToParam() BetaThinkingBlockParam { - var p BetaThinkingBlockParam - p.Type = r.Type - p.Signature = r.Signature - p.Thinking = r.Thinking - return p -} - -// The properties Signature, Thinking, Type are required. -type BetaThinkingBlockParam struct { - Signature string `json:"signature,required"` - Thinking string `json:"thinking,required"` - // This field can be elided, and will marshal its zero value as "thinking". - Type constant.Thinking `json:"type,required"` - paramObj -} - -func (r BetaThinkingBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaThinkingBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaThinkingBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func NewBetaThinkingConfigDisabledParam() BetaThinkingConfigDisabledParam { - return BetaThinkingConfigDisabledParam{ - Type: "disabled", - } -} - -// This struct has a constant value, construct it with -// [NewBetaThinkingConfigDisabledParam]. -type BetaThinkingConfigDisabledParam struct { - Type constant.Disabled `json:"type,required"` - paramObj -} - -func (r BetaThinkingConfigDisabledParam) MarshalJSON() (data []byte, err error) { - type shadow BetaThinkingConfigDisabledParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaThinkingConfigDisabledParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties BudgetTokens, Type are required. -type BetaThinkingConfigEnabledParam struct { - // Determines how many tokens Claude can use for its internal reasoning process. - // Larger budgets can enable more thorough analysis for complex problems, improving - // response quality. - // - // Must be ≥1024 and less than `max_tokens`. - // - // See - // [extended thinking](https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking) - // for details. - BudgetTokens int64 `json:"budget_tokens,required"` - // This field can be elided, and will marshal its zero value as "enabled". - Type constant.Enabled `json:"type,required"` - paramObj -} - -func (r BetaThinkingConfigEnabledParam) MarshalJSON() (data []byte, err error) { - type shadow BetaThinkingConfigEnabledParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaThinkingConfigEnabledParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func BetaThinkingConfigParamOfEnabled(budgetTokens int64) BetaThinkingConfigParamUnion { - var enabled BetaThinkingConfigEnabledParam - enabled.BudgetTokens = budgetTokens - return BetaThinkingConfigParamUnion{OfEnabled: &enabled} -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaThinkingConfigParamUnion struct { - OfEnabled *BetaThinkingConfigEnabledParam `json:",omitzero,inline"` - OfDisabled *BetaThinkingConfigDisabledParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaThinkingConfigParamUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfEnabled, u.OfDisabled) -} -func (u *BetaThinkingConfigParamUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaThinkingConfigParamUnion) asAny() any { - if !param.IsOmitted(u.OfEnabled) { - return u.OfEnabled - } else if !param.IsOmitted(u.OfDisabled) { - return u.OfDisabled - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaThinkingConfigParamUnion) GetBudgetTokens() *int64 { - if vt := u.OfEnabled; vt != nil { - return &vt.BudgetTokens - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaThinkingConfigParamUnion) GetType() *string { - if vt := u.OfEnabled; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfDisabled; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -type BetaThinkingDelta struct { - Thinking string `json:"thinking,required"` - Type constant.ThinkingDelta `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Thinking respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaThinkingDelta) RawJSON() string { return r.JSON.raw } -func (r *BetaThinkingDelta) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties InputSchema, Name are required. -type BetaToolParam struct { - // [JSON schema](https://json-schema.org/draft/2020-12) for this tool's input. - // - // This defines the shape of the `input` that your tool accepts and that the model - // will produce. - InputSchema BetaToolInputSchemaParam `json:"input_schema,omitzero,required"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - Name string `json:"name,required"` - // Description of what this tool does. - // - // Tool descriptions should be as detailed as possible. The more information that - // the model has about what the tool is and how to use it, the better it will - // perform. You can use natural language descriptions to reinforce important - // aspects of the tool input JSON schema. - Description param.Opt[string] `json:"description,omitzero"` - // Any of "custom". - Type BetaToolType `json:"type,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - paramObj -} - -func (r BetaToolParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// [JSON schema](https://json-schema.org/draft/2020-12) for this tool's input. -// -// This defines the shape of the `input` that your tool accepts and that the model -// will produce. -// -// The property Type is required. -type BetaToolInputSchemaParam struct { - Properties any `json:"properties,omitzero"` - Required []string `json:"required,omitzero"` - // This field can be elided, and will marshal its zero value as "object". - Type constant.Object `json:"type,required"` - ExtraFields map[string]any `json:"-"` - paramObj -} - -func (r BetaToolInputSchemaParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolInputSchemaParam - return param.MarshalWithExtras(r, (*shadow)(&r), r.ExtraFields) -} -func (r *BetaToolInputSchemaParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaToolType string - -const ( - BetaToolTypeCustom BetaToolType = "custom" -) - -// The properties Name, Type are required. -type BetaToolBash20241022Param struct { - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as "bash". - Name constant.Bash `json:"name,required"` - // This field can be elided, and will marshal its zero value as "bash_20241022". - Type constant.Bash20241022 `json:"type,required"` - paramObj -} - -func (r BetaToolBash20241022Param) MarshalJSON() (data []byte, err error) { - type shadow BetaToolBash20241022Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolBash20241022Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Name, Type are required. -type BetaToolBash20250124Param struct { - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as "bash". - Name constant.Bash `json:"name,required"` - // This field can be elided, and will marshal its zero value as "bash_20250124". - Type constant.Bash20250124 `json:"type,required"` - paramObj -} - -func (r BetaToolBash20250124Param) MarshalJSON() (data []byte, err error) { - type shadow BetaToolBash20250124Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolBash20250124Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func BetaToolChoiceParamOfTool(name string) BetaToolChoiceUnionParam { - var tool BetaToolChoiceToolParam - tool.Name = name - return BetaToolChoiceUnionParam{OfTool: &tool} -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaToolChoiceUnionParam struct { - OfAuto *BetaToolChoiceAutoParam `json:",omitzero,inline"` - OfAny *BetaToolChoiceAnyParam `json:",omitzero,inline"` - OfTool *BetaToolChoiceToolParam `json:",omitzero,inline"` - OfNone *BetaToolChoiceNoneParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaToolChoiceUnionParam) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfAuto, u.OfAny, u.OfTool, u.OfNone) -} -func (u *BetaToolChoiceUnionParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaToolChoiceUnionParam) asAny() any { - if !param.IsOmitted(u.OfAuto) { - return u.OfAuto - } else if !param.IsOmitted(u.OfAny) { - return u.OfAny - } else if !param.IsOmitted(u.OfTool) { - return u.OfTool - } else if !param.IsOmitted(u.OfNone) { - return u.OfNone - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolChoiceUnionParam) GetName() *string { - if vt := u.OfTool; vt != nil { - return &vt.Name - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolChoiceUnionParam) GetType() *string { - if vt := u.OfAuto; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfAny; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfTool; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfNone; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolChoiceUnionParam) GetDisableParallelToolUse() *bool { - if vt := u.OfAuto; vt != nil && vt.DisableParallelToolUse.Valid() { - return &vt.DisableParallelToolUse.Value - } else if vt := u.OfAny; vt != nil && vt.DisableParallelToolUse.Valid() { - return &vt.DisableParallelToolUse.Value - } else if vt := u.OfTool; vt != nil && vt.DisableParallelToolUse.Valid() { - return &vt.DisableParallelToolUse.Value - } - return nil -} - -// The model will use any available tools. -// -// The property Type is required. -type BetaToolChoiceAnyParam struct { - // Whether to disable parallel tool use. - // - // Defaults to `false`. If set to `true`, the model will output exactly one tool - // use. - DisableParallelToolUse param.Opt[bool] `json:"disable_parallel_tool_use,omitzero"` - // This field can be elided, and will marshal its zero value as "any". - Type constant.Any `json:"type,required"` - paramObj -} - -func (r BetaToolChoiceAnyParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolChoiceAnyParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolChoiceAnyParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The model will automatically decide whether to use tools. -// -// The property Type is required. -type BetaToolChoiceAutoParam struct { - // Whether to disable parallel tool use. - // - // Defaults to `false`. If set to `true`, the model will output at most one tool - // use. - DisableParallelToolUse param.Opt[bool] `json:"disable_parallel_tool_use,omitzero"` - // This field can be elided, and will marshal its zero value as "auto". - Type constant.Auto `json:"type,required"` - paramObj -} - -func (r BetaToolChoiceAutoParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolChoiceAutoParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolChoiceAutoParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func NewBetaToolChoiceNoneParam() BetaToolChoiceNoneParam { - return BetaToolChoiceNoneParam{ - Type: "none", - } -} - -// The model will not be allowed to use tools. -// -// This struct has a constant value, construct it with -// [NewBetaToolChoiceNoneParam]. -type BetaToolChoiceNoneParam struct { - Type constant.None `json:"type,required"` - paramObj -} - -func (r BetaToolChoiceNoneParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolChoiceNoneParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolChoiceNoneParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The model will use the specified tool with `tool_choice.name`. -// -// The properties Name, Type are required. -type BetaToolChoiceToolParam struct { - // The name of the tool to use. - Name string `json:"name,required"` - // Whether to disable parallel tool use. - // - // Defaults to `false`. If set to `true`, the model will output exactly one tool - // use. - DisableParallelToolUse param.Opt[bool] `json:"disable_parallel_tool_use,omitzero"` - // This field can be elided, and will marshal its zero value as "tool". - Type constant.Tool `json:"type,required"` - paramObj -} - -func (r BetaToolChoiceToolParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolChoiceToolParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolChoiceToolParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties DisplayHeightPx, DisplayWidthPx, Name, Type are required. -type BetaToolComputerUse20241022Param struct { - // The height of the display in pixels. - DisplayHeightPx int64 `json:"display_height_px,required"` - // The width of the display in pixels. - DisplayWidthPx int64 `json:"display_width_px,required"` - // The X11 display number (e.g. 0, 1) for the display. - DisplayNumber param.Opt[int64] `json:"display_number,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as "computer". - Name constant.Computer `json:"name,required"` - // This field can be elided, and will marshal its zero value as - // "computer_20241022". - Type constant.Computer20241022 `json:"type,required"` - paramObj -} - -func (r BetaToolComputerUse20241022Param) MarshalJSON() (data []byte, err error) { - type shadow BetaToolComputerUse20241022Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolComputerUse20241022Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties DisplayHeightPx, DisplayWidthPx, Name, Type are required. -type BetaToolComputerUse20250124Param struct { - // The height of the display in pixels. - DisplayHeightPx int64 `json:"display_height_px,required"` - // The width of the display in pixels. - DisplayWidthPx int64 `json:"display_width_px,required"` - // The X11 display number (e.g. 0, 1) for the display. - DisplayNumber param.Opt[int64] `json:"display_number,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as "computer". - Name constant.Computer `json:"name,required"` - // This field can be elided, and will marshal its zero value as - // "computer_20250124". - Type constant.Computer20250124 `json:"type,required"` - paramObj -} - -func (r BetaToolComputerUse20250124Param) MarshalJSON() (data []byte, err error) { - type shadow BetaToolComputerUse20250124Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolComputerUse20250124Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties ToolUseID, Type are required. -type BetaToolResultBlockParam struct { - ToolUseID string `json:"tool_use_id,required"` - IsError param.Opt[bool] `json:"is_error,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - Content []BetaToolResultBlockParamContentUnion `json:"content,omitzero"` - // This field can be elided, and will marshal its zero value as "tool_result". - Type constant.ToolResult `json:"type,required"` - paramObj -} - -func (r BetaToolResultBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolResultBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolResultBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaToolResultBlockParamContentUnion struct { - OfText *BetaTextBlockParam `json:",omitzero,inline"` - OfImage *BetaImageBlockParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaToolResultBlockParamContentUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfText, u.OfImage) -} -func (u *BetaToolResultBlockParamContentUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaToolResultBlockParamContentUnion) asAny() any { - if !param.IsOmitted(u.OfText) { - return u.OfText - } else if !param.IsOmitted(u.OfImage) { - return u.OfImage - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolResultBlockParamContentUnion) GetText() *string { - if vt := u.OfText; vt != nil { - return &vt.Text - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolResultBlockParamContentUnion) GetCitations() []BetaTextCitationParamUnion { - if vt := u.OfText; vt != nil { - return vt.Citations - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolResultBlockParamContentUnion) GetSource() *BetaImageBlockParamSourceUnion { - if vt := u.OfImage; vt != nil { - return &vt.Source - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolResultBlockParamContentUnion) GetType() *string { - if vt := u.OfText; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfImage; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -// Returns a pointer to the underlying variant's CacheControl property, if present. -func (u BetaToolResultBlockParamContentUnion) GetCacheControl() *BetaCacheControlEphemeralParam { - if vt := u.OfText; vt != nil { - return &vt.CacheControl - } else if vt := u.OfImage; vt != nil { - return &vt.CacheControl - } - return nil -} - -// The properties Name, Type are required. -type BetaToolTextEditor20241022Param struct { - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as - // "str_replace_editor". - Name constant.StrReplaceEditor `json:"name,required"` - // This field can be elided, and will marshal its zero value as - // "text_editor_20241022". - Type constant.TextEditor20241022 `json:"type,required"` - paramObj -} - -func (r BetaToolTextEditor20241022Param) MarshalJSON() (data []byte, err error) { - type shadow BetaToolTextEditor20241022Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolTextEditor20241022Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Name, Type are required. -type BetaToolTextEditor20250124Param struct { - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as - // "str_replace_editor". - Name constant.StrReplaceEditor `json:"name,required"` - // This field can be elided, and will marshal its zero value as - // "text_editor_20250124". - Type constant.TextEditor20250124 `json:"type,required"` - paramObj -} - -func (r BetaToolTextEditor20250124Param) MarshalJSON() (data []byte, err error) { - type shadow BetaToolTextEditor20250124Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolTextEditor20250124Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Name, Type are required. -type BetaToolTextEditor20250429Param struct { - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as - // "str_replace_based_edit_tool". - Name constant.StrReplaceBasedEditTool `json:"name,required"` - // This field can be elided, and will marshal its zero value as - // "text_editor_20250429". - Type constant.TextEditor20250429 `json:"type,required"` - paramObj -} - -func (r BetaToolTextEditor20250429Param) MarshalJSON() (data []byte, err error) { - type shadow BetaToolTextEditor20250429Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolTextEditor20250429Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func BetaToolUnionParamOfTool(inputSchema BetaToolInputSchemaParam, name string) BetaToolUnionParam { - var variant BetaToolParam - variant.InputSchema = inputSchema - variant.Name = name - return BetaToolUnionParam{OfTool: &variant} -} - -func BetaToolUnionParamOfComputerUseTool20241022(displayHeightPx int64, displayWidthPx int64) BetaToolUnionParam { - var variant BetaToolComputerUse20241022Param - variant.DisplayHeightPx = displayHeightPx - variant.DisplayWidthPx = displayWidthPx - return BetaToolUnionParam{OfComputerUseTool20241022: &variant} -} - -func BetaToolUnionParamOfComputerUseTool20250124(displayHeightPx int64, displayWidthPx int64) BetaToolUnionParam { - var variant BetaToolComputerUse20250124Param - variant.DisplayHeightPx = displayHeightPx - variant.DisplayWidthPx = displayWidthPx - return BetaToolUnionParam{OfComputerUseTool20250124: &variant} -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaToolUnionParam struct { - OfTool *BetaToolParam `json:",omitzero,inline"` - OfComputerUseTool20241022 *BetaToolComputerUse20241022Param `json:",omitzero,inline"` - OfBashTool20241022 *BetaToolBash20241022Param `json:",omitzero,inline"` - OfTextEditor20241022 *BetaToolTextEditor20241022Param `json:",omitzero,inline"` - OfComputerUseTool20250124 *BetaToolComputerUse20250124Param `json:",omitzero,inline"` - OfBashTool20250124 *BetaToolBash20250124Param `json:",omitzero,inline"` - OfTextEditor20250124 *BetaToolTextEditor20250124Param `json:",omitzero,inline"` - OfTextEditor20250429 *BetaToolTextEditor20250429Param `json:",omitzero,inline"` - OfWebSearchTool20250305 *BetaWebSearchTool20250305Param `json:",omitzero,inline"` - OfCodeExecutionTool20250522 *BetaCodeExecutionTool20250522Param `json:",omitzero,inline"` - paramUnion -} - -func (u BetaToolUnionParam) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfTool, - u.OfComputerUseTool20241022, - u.OfBashTool20241022, - u.OfTextEditor20241022, - u.OfComputerUseTool20250124, - u.OfBashTool20250124, - u.OfTextEditor20250124, - u.OfTextEditor20250429, - u.OfWebSearchTool20250305, - u.OfCodeExecutionTool20250522) -} -func (u *BetaToolUnionParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaToolUnionParam) asAny() any { - if !param.IsOmitted(u.OfTool) { - return u.OfTool - } else if !param.IsOmitted(u.OfComputerUseTool20241022) { - return u.OfComputerUseTool20241022 - } else if !param.IsOmitted(u.OfBashTool20241022) { - return u.OfBashTool20241022 - } else if !param.IsOmitted(u.OfTextEditor20241022) { - return u.OfTextEditor20241022 - } else if !param.IsOmitted(u.OfComputerUseTool20250124) { - return u.OfComputerUseTool20250124 - } else if !param.IsOmitted(u.OfBashTool20250124) { - return u.OfBashTool20250124 - } else if !param.IsOmitted(u.OfTextEditor20250124) { - return u.OfTextEditor20250124 - } else if !param.IsOmitted(u.OfTextEditor20250429) { - return u.OfTextEditor20250429 - } else if !param.IsOmitted(u.OfWebSearchTool20250305) { - return u.OfWebSearchTool20250305 - } else if !param.IsOmitted(u.OfCodeExecutionTool20250522) { - return u.OfCodeExecutionTool20250522 - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetInputSchema() *BetaToolInputSchemaParam { - if vt := u.OfTool; vt != nil { - return &vt.InputSchema - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetDescription() *string { - if vt := u.OfTool; vt != nil && vt.Description.Valid() { - return &vt.Description.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetAllowedDomains() []string { - if vt := u.OfWebSearchTool20250305; vt != nil { - return vt.AllowedDomains - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetBlockedDomains() []string { - if vt := u.OfWebSearchTool20250305; vt != nil { - return vt.BlockedDomains - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetMaxUses() *int64 { - if vt := u.OfWebSearchTool20250305; vt != nil && vt.MaxUses.Valid() { - return &vt.MaxUses.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetUserLocation() *BetaWebSearchTool20250305UserLocationParam { - if vt := u.OfWebSearchTool20250305; vt != nil { - return &vt.UserLocation - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetName() *string { - if vt := u.OfTool; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfComputerUseTool20241022; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfBashTool20241022; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfTextEditor20241022; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfBashTool20250124; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfTextEditor20250124; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfTextEditor20250429; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfWebSearchTool20250305; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfCodeExecutionTool20250522; vt != nil { - return (*string)(&vt.Name) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetType() *string { - if vt := u.OfTool; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfComputerUseTool20241022; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfBashTool20241022; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfTextEditor20241022; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfBashTool20250124; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfTextEditor20250124; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfTextEditor20250429; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfWebSearchTool20250305; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfCodeExecutionTool20250522; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetDisplayHeightPx() *int64 { - if vt := u.OfComputerUseTool20241022; vt != nil { - return (*int64)(&vt.DisplayHeightPx) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*int64)(&vt.DisplayHeightPx) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetDisplayWidthPx() *int64 { - if vt := u.OfComputerUseTool20241022; vt != nil { - return (*int64)(&vt.DisplayWidthPx) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*int64)(&vt.DisplayWidthPx) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaToolUnionParam) GetDisplayNumber() *int64 { - if vt := u.OfComputerUseTool20241022; vt != nil && vt.DisplayNumber.Valid() { - return &vt.DisplayNumber.Value - } else if vt := u.OfComputerUseTool20250124; vt != nil && vt.DisplayNumber.Valid() { - return &vt.DisplayNumber.Value - } - return nil -} - -// Returns a pointer to the underlying variant's CacheControl property, if present. -func (u BetaToolUnionParam) GetCacheControl() *BetaCacheControlEphemeralParam { - if vt := u.OfTool; vt != nil { - return &vt.CacheControl - } else if vt := u.OfComputerUseTool20241022; vt != nil { - return &vt.CacheControl - } else if vt := u.OfBashTool20241022; vt != nil { - return &vt.CacheControl - } else if vt := u.OfTextEditor20241022; vt != nil { - return &vt.CacheControl - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return &vt.CacheControl - } else if vt := u.OfBashTool20250124; vt != nil { - return &vt.CacheControl - } else if vt := u.OfTextEditor20250124; vt != nil { - return &vt.CacheControl - } else if vt := u.OfTextEditor20250429; vt != nil { - return &vt.CacheControl - } else if vt := u.OfWebSearchTool20250305; vt != nil { - return &vt.CacheControl - } else if vt := u.OfCodeExecutionTool20250522; vt != nil { - return &vt.CacheControl - } - return nil -} - -type BetaToolUseBlock struct { - ID string `json:"id,required"` - Input any `json:"input,required"` - Name string `json:"name,required"` - Type constant.ToolUse `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - Input respjson.Field - Name respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaToolUseBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaToolUseBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func (r BetaToolUseBlock) ToParam() BetaToolUseBlockParam { - var p BetaToolUseBlockParam - p.Type = r.Type - p.ID = r.ID - p.Input = r.Input - p.Name = r.Name - return p -} - -// The properties ID, Input, Name, Type are required. -type BetaToolUseBlockParam struct { - ID string `json:"id,required"` - Input any `json:"input,omitzero,required"` - Name string `json:"name,required"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as "tool_use". - Type constant.ToolUse `json:"type,required"` - paramObj -} - -func (r BetaToolUseBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaToolUseBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaToolUseBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Type, URL are required. -type BetaURLImageSourceParam struct { - URL string `json:"url,required"` - // This field can be elided, and will marshal its zero value as "url". - Type constant.URL `json:"type,required"` - paramObj -} - -func (r BetaURLImageSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaURLImageSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaURLImageSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Type, URL are required. -type BetaURLPDFSourceParam struct { - URL string `json:"url,required"` - // This field can be elided, and will marshal its zero value as "url". - Type constant.URL `json:"type,required"` - paramObj -} - -func (r BetaURLPDFSourceParam) MarshalJSON() (data []byte, err error) { - type shadow BetaURLPDFSourceParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaURLPDFSourceParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaUsage struct { - // Breakdown of cached tokens by TTL - CacheCreation BetaCacheCreation `json:"cache_creation,required"` - // The number of input tokens used to create the cache entry. - CacheCreationInputTokens int64 `json:"cache_creation_input_tokens,required"` - // The number of input tokens read from the cache. - CacheReadInputTokens int64 `json:"cache_read_input_tokens,required"` - // The number of input tokens which were used. - InputTokens int64 `json:"input_tokens,required"` - // The number of output tokens which were used. - OutputTokens int64 `json:"output_tokens,required"` - // The number of server tool requests. - ServerToolUse BetaServerToolUsage `json:"server_tool_use,required"` - // If the request used the priority, standard, or batch tier. - // - // Any of "standard", "priority", "batch". - ServiceTier BetaUsageServiceTier `json:"service_tier,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - CacheCreation respjson.Field - CacheCreationInputTokens respjson.Field - CacheReadInputTokens respjson.Field - InputTokens respjson.Field - OutputTokens respjson.Field - ServerToolUse respjson.Field - ServiceTier respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaUsage) RawJSON() string { return r.JSON.raw } -func (r *BetaUsage) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// If the request used the priority, standard, or batch tier. -type BetaUsageServiceTier string - -const ( - BetaUsageServiceTierStandard BetaUsageServiceTier = "standard" - BetaUsageServiceTierPriority BetaUsageServiceTier = "priority" - BetaUsageServiceTierBatch BetaUsageServiceTier = "batch" -) - -type BetaWebSearchResultBlock struct { - EncryptedContent string `json:"encrypted_content,required"` - PageAge string `json:"page_age,required"` - Title string `json:"title,required"` - Type constant.WebSearchResult `json:"type,required"` - URL string `json:"url,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - EncryptedContent respjson.Field - PageAge respjson.Field - Title respjson.Field - Type respjson.Field - URL respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaWebSearchResultBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaWebSearchResultBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties EncryptedContent, Title, Type, URL are required. -type BetaWebSearchResultBlockParam struct { - EncryptedContent string `json:"encrypted_content,required"` - Title string `json:"title,required"` - URL string `json:"url,required"` - PageAge param.Opt[string] `json:"page_age,omitzero"` - // This field can be elided, and will marshal its zero value as - // "web_search_result". - Type constant.WebSearchResult `json:"type,required"` - paramObj -} - -func (r BetaWebSearchResultBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaWebSearchResultBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaWebSearchResultBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Name, Type are required. -type BetaWebSearchTool20250305Param struct { - // Maximum number of times the tool can be used in the API request. - MaxUses param.Opt[int64] `json:"max_uses,omitzero"` - // If provided, only these domains will be included in results. Cannot be used - // alongside `blocked_domains`. - AllowedDomains []string `json:"allowed_domains,omitzero"` - // If provided, these domains will never appear in results. Cannot be used - // alongside `allowed_domains`. - BlockedDomains []string `json:"blocked_domains,omitzero"` - // Parameters for the user's location. Used to provide more relevant search - // results. - UserLocation BetaWebSearchTool20250305UserLocationParam `json:"user_location,omitzero"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // Name of the tool. - // - // This is how the tool will be called by the model and in `tool_use` blocks. - // - // This field can be elided, and will marshal its zero value as "web_search". - Name constant.WebSearch `json:"name,required"` - // This field can be elided, and will marshal its zero value as - // "web_search_20250305". - Type constant.WebSearch20250305 `json:"type,required"` - paramObj -} - -func (r BetaWebSearchTool20250305Param) MarshalJSON() (data []byte, err error) { - type shadow BetaWebSearchTool20250305Param - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaWebSearchTool20250305Param) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Parameters for the user's location. Used to provide more relevant search -// results. -// -// The property Type is required. -type BetaWebSearchTool20250305UserLocationParam struct { - // The city of the user. - City param.Opt[string] `json:"city,omitzero"` - // The two letter - // [ISO country code](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) of the - // user. - Country param.Opt[string] `json:"country,omitzero"` - // The region of the user. - Region param.Opt[string] `json:"region,omitzero"` - // The [IANA timezone](https://nodatime.org/TimeZones) of the user. - Timezone param.Opt[string] `json:"timezone,omitzero"` - // This field can be elided, and will marshal its zero value as "approximate". - Type constant.Approximate `json:"type,required"` - paramObj -} - -func (r BetaWebSearchTool20250305UserLocationParam) MarshalJSON() (data []byte, err error) { - type shadow BetaWebSearchTool20250305UserLocationParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaWebSearchTool20250305UserLocationParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties ErrorCode, Type are required. -type BetaWebSearchToolRequestErrorParam struct { - // Any of "invalid_tool_input", "unavailable", "max_uses_exceeded", - // "too_many_requests", "query_too_long". - ErrorCode BetaWebSearchToolResultErrorCode `json:"error_code,omitzero,required"` - // This field can be elided, and will marshal its zero value as - // "web_search_tool_result_error". - Type constant.WebSearchToolResultError `json:"type,required"` - paramObj -} - -func (r BetaWebSearchToolRequestErrorParam) MarshalJSON() (data []byte, err error) { - type shadow BetaWebSearchToolRequestErrorParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaWebSearchToolRequestErrorParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaWebSearchToolResultBlock struct { - Content BetaWebSearchToolResultBlockContentUnion `json:"content,required"` - ToolUseID string `json:"tool_use_id,required"` - Type constant.WebSearchToolResult `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Content respjson.Field - ToolUseID respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaWebSearchToolResultBlock) RawJSON() string { return r.JSON.raw } -func (r *BetaWebSearchToolResultBlock) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaWebSearchToolResultBlockContentUnion contains all possible properties and -// values from [BetaWebSearchToolResultError], [[]BetaWebSearchResultBlock]. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -// -// If the underlying value is not a json object, one of the following properties -// will be valid: OfBetaWebSearchResultBlockArray] -type BetaWebSearchToolResultBlockContentUnion struct { - // This field will be present if the value is a [[]BetaWebSearchResultBlock] - // instead of an object. - OfBetaWebSearchResultBlockArray []BetaWebSearchResultBlock `json:",inline"` - // This field is from variant [BetaWebSearchToolResultError]. - ErrorCode BetaWebSearchToolResultErrorCode `json:"error_code"` - // This field is from variant [BetaWebSearchToolResultError]. - Type constant.WebSearchToolResultError `json:"type"` - JSON struct { - OfBetaWebSearchResultBlockArray respjson.Field - ErrorCode respjson.Field - Type respjson.Field - raw string - } `json:"-"` -} - -func (u BetaWebSearchToolResultBlockContentUnion) AsResponseWebSearchToolResultError() (v BetaWebSearchToolResultError) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaWebSearchToolResultBlockContentUnion) AsBetaWebSearchResultBlockArray() (v []BetaWebSearchResultBlock) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaWebSearchToolResultBlockContentUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaWebSearchToolResultBlockContentUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties Content, ToolUseID, Type are required. -type BetaWebSearchToolResultBlockParam struct { - Content BetaWebSearchToolResultBlockParamContentUnion `json:"content,omitzero,required"` - ToolUseID string `json:"tool_use_id,required"` - // Create a cache control breakpoint at this content block. - CacheControl BetaCacheControlEphemeralParam `json:"cache_control,omitzero"` - // This field can be elided, and will marshal its zero value as - // "web_search_tool_result". - Type constant.WebSearchToolResult `json:"type,required"` - paramObj -} - -func (r BetaWebSearchToolResultBlockParam) MarshalJSON() (data []byte, err error) { - type shadow BetaWebSearchToolResultBlockParam - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaWebSearchToolResultBlockParam) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func BetaNewWebSearchToolRequestError(errorCode BetaWebSearchToolResultErrorCode) BetaWebSearchToolResultBlockParamContentUnion { - var variant BetaWebSearchToolRequestErrorParam - variant.ErrorCode = errorCode - return BetaWebSearchToolResultBlockParamContentUnion{OfError: &variant} -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaWebSearchToolResultBlockParamContentUnion struct { - OfResultBlock []BetaWebSearchResultBlockParam `json:",omitzero,inline"` - OfError *BetaWebSearchToolRequestErrorParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaWebSearchToolResultBlockParamContentUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfResultBlock, u.OfError) -} -func (u *BetaWebSearchToolResultBlockParamContentUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaWebSearchToolResultBlockParamContentUnion) asAny() any { - if !param.IsOmitted(u.OfResultBlock) { - return &u.OfResultBlock - } else if !param.IsOmitted(u.OfError) { - return u.OfError - } - return nil -} - -type BetaWebSearchToolResultError struct { - // Any of "invalid_tool_input", "unavailable", "max_uses_exceeded", - // "too_many_requests", "query_too_long". - ErrorCode BetaWebSearchToolResultErrorCode `json:"error_code,required"` - Type constant.WebSearchToolResultError `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ErrorCode respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaWebSearchToolResultError) RawJSON() string { return r.JSON.raw } -func (r *BetaWebSearchToolResultError) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaWebSearchToolResultErrorCode string - -const ( - BetaWebSearchToolResultErrorCodeInvalidToolInput BetaWebSearchToolResultErrorCode = "invalid_tool_input" - BetaWebSearchToolResultErrorCodeUnavailable BetaWebSearchToolResultErrorCode = "unavailable" - BetaWebSearchToolResultErrorCodeMaxUsesExceeded BetaWebSearchToolResultErrorCode = "max_uses_exceeded" - BetaWebSearchToolResultErrorCodeTooManyRequests BetaWebSearchToolResultErrorCode = "too_many_requests" - BetaWebSearchToolResultErrorCodeQueryTooLong BetaWebSearchToolResultErrorCode = "query_too_long" -) - -type BetaMessageNewParams struct { - // The maximum number of tokens to generate before stopping. - // - // Note that our models may stop _before_ reaching this maximum. This parameter - // only specifies the absolute maximum number of tokens to generate. - // - // Different models have different maximum values for this parameter. See - // [models](https://docs.anthropic.com/en/docs/models-overview) for details. - MaxTokens int64 `json:"max_tokens,required"` - // Input messages. - // - // Our models are trained to operate on alternating `user` and `assistant` - // conversational turns. When creating a new `Message`, you specify the prior - // conversational turns with the `messages` parameter, and the model then generates - // the next `Message` in the conversation. Consecutive `user` or `assistant` turns - // in your request will be combined into a single turn. - // - // Each input message must be an object with a `role` and `content`. You can - // specify a single `user`-role message, or you can include multiple `user` and - // `assistant` messages. - // - // If the final message uses the `assistant` role, the response content will - // continue immediately from the content in that message. This can be used to - // constrain part of the model's response. - // - // Example with a single `user` message: - // - // ```json - // [{ "role": "user", "content": "Hello, Claude" }] - // ``` - // - // Example with multiple conversational turns: - // - // ```json - // [ - // - // { "role": "user", "content": "Hello there." }, - // { "role": "assistant", "content": "Hi, I'm Claude. How can I help you?" }, - // { "role": "user", "content": "Can you explain LLMs in plain English?" } - // - // ] - // ``` - // - // Example with a partially-filled response from Claude: - // - // ```json - // [ - // - // { - // "role": "user", - // "content": "What's the Greek name for Sun? (A) Sol (B) Helios (C) Sun" - // }, - // { "role": "assistant", "content": "The best answer is (" } - // - // ] - // ``` - // - // Each input message `content` may be either a single `string` or an array of - // content blocks, where each block has a specific `type`. Using a `string` for - // `content` is shorthand for an array of one content block of type `"text"`. The - // following input messages are equivalent: - // - // ```json - // { "role": "user", "content": "Hello, Claude" } - // ``` - // - // ```json - // { "role": "user", "content": [{ "type": "text", "text": "Hello, Claude" }] } - // ``` - // - // Starting with Claude 3 models, you can also send image content blocks: - // - // ```json - // - // { - // "role": "user", - // "content": [ - // { - // "type": "image", - // "source": { - // "type": "base64", - // "media_type": "image/jpeg", - // "data": "/9j/4AAQSkZJRg..." - // } - // }, - // { "type": "text", "text": "What is in this image?" } - // ] - // } - // - // ``` - // - // We currently support the `base64` source type for images, and the `image/jpeg`, - // `image/png`, `image/gif`, and `image/webp` media types. - // - // See [examples](https://docs.anthropic.com/en/api/messages-examples#vision) for - // more input examples. - // - // Note that if you want to include a - // [system prompt](https://docs.anthropic.com/en/docs/system-prompts), you can use - // the top-level `system` parameter — there is no `"system"` role for input - // messages in the Messages API. - // - // There is a limit of 100000 messages in a single request. - Messages []BetaMessageParam `json:"messages,omitzero,required"` - // The model that will complete your prompt.\n\nSee - // [models](https://docs.anthropic.com/en/docs/models-overview) for additional - // details and options. - Model Model `json:"model,omitzero,required"` - // Container identifier for reuse across requests. - Container param.Opt[string] `json:"container,omitzero"` - // Amount of randomness injected into the response. - // - // Defaults to `1.0`. Ranges from `0.0` to `1.0`. Use `temperature` closer to `0.0` - // for analytical / multiple choice, and closer to `1.0` for creative and - // generative tasks. - // - // Note that even with `temperature` of `0.0`, the results will not be fully - // deterministic. - Temperature param.Opt[float64] `json:"temperature,omitzero"` - // Only sample from the top K options for each subsequent token. - // - // Used to remove "long tail" low probability responses. - // [Learn more technical details here](https://towardsdatascience.com/how-to-sample-from-language-models-682bceb97277). - // - // Recommended for advanced use cases only. You usually only need to use - // `temperature`. - TopK param.Opt[int64] `json:"top_k,omitzero"` - // Use nucleus sampling. - // - // In nucleus sampling, we compute the cumulative distribution over all the options - // for each subsequent token in decreasing probability order and cut it off once it - // reaches a particular probability specified by `top_p`. You should either alter - // `temperature` or `top_p`, but not both. - // - // Recommended for advanced use cases only. You usually only need to use - // `temperature`. - TopP param.Opt[float64] `json:"top_p,omitzero"` - // MCP servers to be utilized in this request - MCPServers []BetaRequestMCPServerURLDefinitionParam `json:"mcp_servers,omitzero"` - // An object describing metadata about the request. - Metadata BetaMetadataParam `json:"metadata,omitzero"` - // Determines whether to use priority capacity (if available) or standard capacity - // for this request. - // - // Anthropic offers different levels of service for your API requests. See - // [service-tiers](https://docs.anthropic.com/en/api/service-tiers) for details. - // - // Any of "auto", "standard_only". - ServiceTier BetaMessageNewParamsServiceTier `json:"service_tier,omitzero"` - // Custom text sequences that will cause the model to stop generating. - // - // Our models will normally stop when they have naturally completed their turn, - // which will result in a response `stop_reason` of `"end_turn"`. - // - // If you want the model to stop generating when it encounters custom strings of - // text, you can use the `stop_sequences` parameter. If the model encounters one of - // the custom sequences, the response `stop_reason` value will be `"stop_sequence"` - // and the response `stop_sequence` value will contain the matched stop sequence. - StopSequences []string `json:"stop_sequences,omitzero"` - // System prompt. - // - // A system prompt is a way of providing context and instructions to Claude, such - // as specifying a particular goal or role. See our - // [guide to system prompts](https://docs.anthropic.com/en/docs/system-prompts). - System []BetaTextBlockParam `json:"system,omitzero"` - // Configuration for enabling Claude's extended thinking. - // - // When enabled, responses include `thinking` content blocks showing Claude's - // thinking process before the final answer. Requires a minimum budget of 1,024 - // tokens and counts towards your `max_tokens` limit. - // - // See - // [extended thinking](https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking) - // for details. - Thinking BetaThinkingConfigParamUnion `json:"thinking,omitzero"` - // How the model should use the provided tools. The model can use a specific tool, - // any available tool, decide by itself, or not use tools at all. - ToolChoice BetaToolChoiceUnionParam `json:"tool_choice,omitzero"` - // Definitions of tools that the model may use. - // - // If you include `tools` in your API request, the model may return `tool_use` - // content blocks that represent the model's use of those tools. You can then run - // those tools using the tool input generated by the model and then optionally - // return results back to the model using `tool_result` content blocks. - // - // Each tool definition includes: - // - // - `name`: Name of the tool. - // - `description`: Optional, but strongly-recommended description of the tool. - // - `input_schema`: [JSON schema](https://json-schema.org/draft/2020-12) for the - // tool `input` shape that the model will produce in `tool_use` output content - // blocks. - // - // For example, if you defined `tools` as: - // - // ```json - // [ - // - // { - // "name": "get_stock_price", - // "description": "Get the current stock price for a given ticker symbol.", - // "input_schema": { - // "type": "object", - // "properties": { - // "ticker": { - // "type": "string", - // "description": "The stock ticker symbol, e.g. AAPL for Apple Inc." - // } - // }, - // "required": ["ticker"] - // } - // } - // - // ] - // ``` - // - // And then asked the model "What's the S&P 500 at today?", the model might produce - // `tool_use` content blocks in the response like this: - // - // ```json - // [ - // - // { - // "type": "tool_use", - // "id": "toolu_01D7FLrfh4GYq7yT1ULFeyMV", - // "name": "get_stock_price", - // "input": { "ticker": "^GSPC" } - // } - // - // ] - // ``` - // - // You might then run your `get_stock_price` tool with `{"ticker": "^GSPC"}` as an - // input, and return the following back to the model in a subsequent `user` - // message: - // - // ```json - // [ - // - // { - // "type": "tool_result", - // "tool_use_id": "toolu_01D7FLrfh4GYq7yT1ULFeyMV", - // "content": "259.75 USD" - // } - // - // ] - // ``` - // - // Tools can be used for workflows that include running client-side tools and - // functions, or more generally whenever you want the model to produce a particular - // JSON structure of output. - // - // See our [guide](https://docs.anthropic.com/en/docs/tool-use) for more details. - Tools []BetaToolUnionParam `json:"tools,omitzero"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -func (r BetaMessageNewParams) MarshalJSON() (data []byte, err error) { - type shadow BetaMessageNewParams - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMessageNewParams) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Determines whether to use priority capacity (if available) or standard capacity -// for this request. -// -// Anthropic offers different levels of service for your API requests. See -// [service-tiers](https://docs.anthropic.com/en/api/service-tiers) for details. -type BetaMessageNewParamsServiceTier string - -const ( - BetaMessageNewParamsServiceTierAuto BetaMessageNewParamsServiceTier = "auto" - BetaMessageNewParamsServiceTierStandardOnly BetaMessageNewParamsServiceTier = "standard_only" -) - -type BetaMessageCountTokensParams struct { - // Input messages. - // - // Our models are trained to operate on alternating `user` and `assistant` - // conversational turns. When creating a new `Message`, you specify the prior - // conversational turns with the `messages` parameter, and the model then generates - // the next `Message` in the conversation. Consecutive `user` or `assistant` turns - // in your request will be combined into a single turn. - // - // Each input message must be an object with a `role` and `content`. You can - // specify a single `user`-role message, or you can include multiple `user` and - // `assistant` messages. - // - // If the final message uses the `assistant` role, the response content will - // continue immediately from the content in that message. This can be used to - // constrain part of the model's response. - // - // Example with a single `user` message: - // - // ```json - // [{ "role": "user", "content": "Hello, Claude" }] - // ``` - // - // Example with multiple conversational turns: - // - // ```json - // [ - // - // { "role": "user", "content": "Hello there." }, - // { "role": "assistant", "content": "Hi, I'm Claude. How can I help you?" }, - // { "role": "user", "content": "Can you explain LLMs in plain English?" } - // - // ] - // ``` - // - // Example with a partially-filled response from Claude: - // - // ```json - // [ - // - // { - // "role": "user", - // "content": "What's the Greek name for Sun? (A) Sol (B) Helios (C) Sun" - // }, - // { "role": "assistant", "content": "The best answer is (" } - // - // ] - // ``` - // - // Each input message `content` may be either a single `string` or an array of - // content blocks, where each block has a specific `type`. Using a `string` for - // `content` is shorthand for an array of one content block of type `"text"`. The - // following input messages are equivalent: - // - // ```json - // { "role": "user", "content": "Hello, Claude" } - // ``` - // - // ```json - // { "role": "user", "content": [{ "type": "text", "text": "Hello, Claude" }] } - // ``` - // - // Starting with Claude 3 models, you can also send image content blocks: - // - // ```json - // - // { - // "role": "user", - // "content": [ - // { - // "type": "image", - // "source": { - // "type": "base64", - // "media_type": "image/jpeg", - // "data": "/9j/4AAQSkZJRg..." - // } - // }, - // { "type": "text", "text": "What is in this image?" } - // ] - // } - // - // ``` - // - // We currently support the `base64` source type for images, and the `image/jpeg`, - // `image/png`, `image/gif`, and `image/webp` media types. - // - // See [examples](https://docs.anthropic.com/en/api/messages-examples#vision) for - // more input examples. - // - // Note that if you want to include a - // [system prompt](https://docs.anthropic.com/en/docs/system-prompts), you can use - // the top-level `system` parameter — there is no `"system"` role for input - // messages in the Messages API. - // - // There is a limit of 100000 messages in a single request. - Messages []BetaMessageParam `json:"messages,omitzero,required"` - // The model that will complete your prompt.\n\nSee - // [models](https://docs.anthropic.com/en/docs/models-overview) for additional - // details and options. - Model Model `json:"model,omitzero,required"` - // MCP servers to be utilized in this request - MCPServers []BetaRequestMCPServerURLDefinitionParam `json:"mcp_servers,omitzero"` - // System prompt. - // - // A system prompt is a way of providing context and instructions to Claude, such - // as specifying a particular goal or role. See our - // [guide to system prompts](https://docs.anthropic.com/en/docs/system-prompts). - System BetaMessageCountTokensParamsSystemUnion `json:"system,omitzero"` - // Configuration for enabling Claude's extended thinking. - // - // When enabled, responses include `thinking` content blocks showing Claude's - // thinking process before the final answer. Requires a minimum budget of 1,024 - // tokens and counts towards your `max_tokens` limit. - // - // See - // [extended thinking](https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking) - // for details. - Thinking BetaThinkingConfigParamUnion `json:"thinking,omitzero"` - // How the model should use the provided tools. The model can use a specific tool, - // any available tool, decide by itself, or not use tools at all. - ToolChoice BetaToolChoiceUnionParam `json:"tool_choice,omitzero"` - // Definitions of tools that the model may use. - // - // If you include `tools` in your API request, the model may return `tool_use` - // content blocks that represent the model's use of those tools. You can then run - // those tools using the tool input generated by the model and then optionally - // return results back to the model using `tool_result` content blocks. - // - // Each tool definition includes: - // - // - `name`: Name of the tool. - // - `description`: Optional, but strongly-recommended description of the tool. - // - `input_schema`: [JSON schema](https://json-schema.org/draft/2020-12) for the - // tool `input` shape that the model will produce in `tool_use` output content - // blocks. - // - // For example, if you defined `tools` as: - // - // ```json - // [ - // - // { - // "name": "get_stock_price", - // "description": "Get the current stock price for a given ticker symbol.", - // "input_schema": { - // "type": "object", - // "properties": { - // "ticker": { - // "type": "string", - // "description": "The stock ticker symbol, e.g. AAPL for Apple Inc." - // } - // }, - // "required": ["ticker"] - // } - // } - // - // ] - // ``` - // - // And then asked the model "What's the S&P 500 at today?", the model might produce - // `tool_use` content blocks in the response like this: - // - // ```json - // [ - // - // { - // "type": "tool_use", - // "id": "toolu_01D7FLrfh4GYq7yT1ULFeyMV", - // "name": "get_stock_price", - // "input": { "ticker": "^GSPC" } - // } - // - // ] - // ``` - // - // You might then run your `get_stock_price` tool with `{"ticker": "^GSPC"}` as an - // input, and return the following back to the model in a subsequent `user` - // message: - // - // ```json - // [ - // - // { - // "type": "tool_result", - // "tool_use_id": "toolu_01D7FLrfh4GYq7yT1ULFeyMV", - // "content": "259.75 USD" - // } - // - // ] - // ``` - // - // Tools can be used for workflows that include running client-side tools and - // functions, or more generally whenever you want the model to produce a particular - // JSON structure of output. - // - // See our [guide](https://docs.anthropic.com/en/docs/tool-use) for more details. - Tools []BetaMessageCountTokensParamsToolUnion `json:"tools,omitzero"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -func (r BetaMessageCountTokensParams) MarshalJSON() (data []byte, err error) { - type shadow BetaMessageCountTokensParams - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMessageCountTokensParams) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaMessageCountTokensParamsSystemUnion struct { - OfString param.Opt[string] `json:",omitzero,inline"` - OfBetaTextBlockArray []BetaTextBlockParam `json:",omitzero,inline"` - paramUnion -} - -func (u BetaMessageCountTokensParamsSystemUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfString, u.OfBetaTextBlockArray) -} -func (u *BetaMessageCountTokensParamsSystemUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaMessageCountTokensParamsSystemUnion) asAny() any { - if !param.IsOmitted(u.OfString) { - return &u.OfString.Value - } else if !param.IsOmitted(u.OfBetaTextBlockArray) { - return &u.OfBetaTextBlockArray - } - return nil -} - -// Only one field can be non-zero. -// -// Use [param.IsOmitted] to confirm if a field is set. -type BetaMessageCountTokensParamsToolUnion struct { - OfTool *BetaToolParam `json:",omitzero,inline"` - OfComputerUseTool20241022 *BetaToolComputerUse20241022Param `json:",omitzero,inline"` - OfBashTool20241022 *BetaToolBash20241022Param `json:",omitzero,inline"` - OfTextEditor20241022 *BetaToolTextEditor20241022Param `json:",omitzero,inline"` - OfComputerUseTool20250124 *BetaToolComputerUse20250124Param `json:",omitzero,inline"` - OfBashTool20250124 *BetaToolBash20250124Param `json:",omitzero,inline"` - OfTextEditor20250124 *BetaToolTextEditor20250124Param `json:",omitzero,inline"` - OfTextEditor20250429 *BetaToolTextEditor20250429Param `json:",omitzero,inline"` - OfWebSearchTool20250305 *BetaWebSearchTool20250305Param `json:",omitzero,inline"` - OfCodeExecutionTool20250522 *BetaCodeExecutionTool20250522Param `json:",omitzero,inline"` - paramUnion -} - -func (u BetaMessageCountTokensParamsToolUnion) MarshalJSON() ([]byte, error) { - return param.MarshalUnion(u, u.OfTool, - u.OfComputerUseTool20241022, - u.OfBashTool20241022, - u.OfTextEditor20241022, - u.OfComputerUseTool20250124, - u.OfBashTool20250124, - u.OfTextEditor20250124, - u.OfTextEditor20250429, - u.OfWebSearchTool20250305, - u.OfCodeExecutionTool20250522) -} -func (u *BetaMessageCountTokensParamsToolUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, u) -} - -func (u *BetaMessageCountTokensParamsToolUnion) asAny() any { - if !param.IsOmitted(u.OfTool) { - return u.OfTool - } else if !param.IsOmitted(u.OfComputerUseTool20241022) { - return u.OfComputerUseTool20241022 - } else if !param.IsOmitted(u.OfBashTool20241022) { - return u.OfBashTool20241022 - } else if !param.IsOmitted(u.OfTextEditor20241022) { - return u.OfTextEditor20241022 - } else if !param.IsOmitted(u.OfComputerUseTool20250124) { - return u.OfComputerUseTool20250124 - } else if !param.IsOmitted(u.OfBashTool20250124) { - return u.OfBashTool20250124 - } else if !param.IsOmitted(u.OfTextEditor20250124) { - return u.OfTextEditor20250124 - } else if !param.IsOmitted(u.OfTextEditor20250429) { - return u.OfTextEditor20250429 - } else if !param.IsOmitted(u.OfWebSearchTool20250305) { - return u.OfWebSearchTool20250305 - } else if !param.IsOmitted(u.OfCodeExecutionTool20250522) { - return u.OfCodeExecutionTool20250522 - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetInputSchema() *BetaToolInputSchemaParam { - if vt := u.OfTool; vt != nil { - return &vt.InputSchema - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetDescription() *string { - if vt := u.OfTool; vt != nil && vt.Description.Valid() { - return &vt.Description.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetAllowedDomains() []string { - if vt := u.OfWebSearchTool20250305; vt != nil { - return vt.AllowedDomains - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetBlockedDomains() []string { - if vt := u.OfWebSearchTool20250305; vt != nil { - return vt.BlockedDomains - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetMaxUses() *int64 { - if vt := u.OfWebSearchTool20250305; vt != nil && vt.MaxUses.Valid() { - return &vt.MaxUses.Value - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetUserLocation() *BetaWebSearchTool20250305UserLocationParam { - if vt := u.OfWebSearchTool20250305; vt != nil { - return &vt.UserLocation - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetName() *string { - if vt := u.OfTool; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfComputerUseTool20241022; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfBashTool20241022; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfTextEditor20241022; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfBashTool20250124; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfTextEditor20250124; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfTextEditor20250429; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfWebSearchTool20250305; vt != nil { - return (*string)(&vt.Name) - } else if vt := u.OfCodeExecutionTool20250522; vt != nil { - return (*string)(&vt.Name) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetType() *string { - if vt := u.OfTool; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfComputerUseTool20241022; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfBashTool20241022; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfTextEditor20241022; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfBashTool20250124; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfTextEditor20250124; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfTextEditor20250429; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfWebSearchTool20250305; vt != nil { - return (*string)(&vt.Type) - } else if vt := u.OfCodeExecutionTool20250522; vt != nil { - return (*string)(&vt.Type) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetDisplayHeightPx() *int64 { - if vt := u.OfComputerUseTool20241022; vt != nil { - return (*int64)(&vt.DisplayHeightPx) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*int64)(&vt.DisplayHeightPx) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetDisplayWidthPx() *int64 { - if vt := u.OfComputerUseTool20241022; vt != nil { - return (*int64)(&vt.DisplayWidthPx) - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return (*int64)(&vt.DisplayWidthPx) - } - return nil -} - -// Returns a pointer to the underlying variant's property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetDisplayNumber() *int64 { - if vt := u.OfComputerUseTool20241022; vt != nil && vt.DisplayNumber.Valid() { - return &vt.DisplayNumber.Value - } else if vt := u.OfComputerUseTool20250124; vt != nil && vt.DisplayNumber.Valid() { - return &vt.DisplayNumber.Value - } - return nil -} - -// Returns a pointer to the underlying variant's CacheControl property, if present. -func (u BetaMessageCountTokensParamsToolUnion) GetCacheControl() *BetaCacheControlEphemeralParam { - if vt := u.OfTool; vt != nil { - return &vt.CacheControl - } else if vt := u.OfComputerUseTool20241022; vt != nil { - return &vt.CacheControl - } else if vt := u.OfBashTool20241022; vt != nil { - return &vt.CacheControl - } else if vt := u.OfTextEditor20241022; vt != nil { - return &vt.CacheControl - } else if vt := u.OfComputerUseTool20250124; vt != nil { - return &vt.CacheControl - } else if vt := u.OfBashTool20250124; vt != nil { - return &vt.CacheControl - } else if vt := u.OfTextEditor20250124; vt != nil { - return &vt.CacheControl - } else if vt := u.OfTextEditor20250429; vt != nil { - return &vt.CacheControl - } else if vt := u.OfWebSearchTool20250305; vt != nil { - return &vt.CacheControl - } else if vt := u.OfCodeExecutionTool20250522; vt != nil { - return &vt.CacheControl - } - return nil -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/betamessagebatch.go b/vendor/github.com/anthropics/anthropic-sdk-go/betamessagebatch.go deleted file mode 100644 index b0d50f2e63ece46b3eda8252b8c250cf6e4d09fc..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/betamessagebatch.go +++ /dev/null @@ -1,879 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "context" - "encoding/json" - "errors" - "fmt" - "net/http" - "net/url" - "time" - - "github.com/anthropics/anthropic-sdk-go/internal/apijson" - "github.com/anthropics/anthropic-sdk-go/internal/apiquery" - "github.com/anthropics/anthropic-sdk-go/internal/requestconfig" - "github.com/anthropics/anthropic-sdk-go/option" - "github.com/anthropics/anthropic-sdk-go/packages/jsonl" - "github.com/anthropics/anthropic-sdk-go/packages/pagination" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "github.com/anthropics/anthropic-sdk-go/packages/respjson" - "github.com/anthropics/anthropic-sdk-go/shared/constant" -) - -// BetaMessageBatchService contains methods and other services that help with -// interacting with the anthropic API. -// -// Note, unlike clients, this service does not read variables from the environment -// automatically. You should not instantiate this service directly, and instead use -// the [NewBetaMessageBatchService] method instead. -type BetaMessageBatchService struct { - Options []option.RequestOption -} - -// NewBetaMessageBatchService generates a new service that applies the given -// options to each request. These options are applied after the parent client's -// options (if there is one), and before any request-specific options. -func NewBetaMessageBatchService(opts ...option.RequestOption) (r BetaMessageBatchService) { - r = BetaMessageBatchService{} - r.Options = opts - return -} - -// Send a batch of Message creation requests. -// -// The Message Batches API can be used to process multiple Messages API requests at -// once. Once a Message Batch is created, it begins processing immediately. Batches -// can take up to 24 hours to complete. -// -// Learn more about the Message Batches API in our -// [user guide](/en/docs/build-with-claude/batch-processing) -func (r *BetaMessageBatchService) New(ctx context.Context, params BetaMessageBatchNewParams, opts ...option.RequestOption) (res *BetaMessageBatch, err error) { - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "message-batches-2024-09-24")}, opts...) - path := "v1/messages/batches?beta=true" - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &res, opts...) - return -} - -// This endpoint is idempotent and can be used to poll for Message Batch -// completion. To access the results of a Message Batch, make a request to the -// `results_url` field in the response. -// -// Learn more about the Message Batches API in our -// [user guide](/en/docs/build-with-claude/batch-processing) -func (r *BetaMessageBatchService) Get(ctx context.Context, messageBatchID string, query BetaMessageBatchGetParams, opts ...option.RequestOption) (res *BetaMessageBatch, err error) { - for _, v := range query.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "message-batches-2024-09-24")}, opts...) - if messageBatchID == "" { - err = errors.New("missing required message_batch_id parameter") - return - } - path := fmt.Sprintf("v1/messages/batches/%s?beta=true", messageBatchID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodGet, path, nil, &res, opts...) - return -} - -// List all Message Batches within a Workspace. Most recently created batches are -// returned first. -// -// Learn more about the Message Batches API in our -// [user guide](/en/docs/build-with-claude/batch-processing) -func (r *BetaMessageBatchService) List(ctx context.Context, params BetaMessageBatchListParams, opts ...option.RequestOption) (res *pagination.Page[BetaMessageBatch], err error) { - var raw *http.Response - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "message-batches-2024-09-24"), option.WithResponseInto(&raw)}, opts...) - path := "v1/messages/batches?beta=true" - cfg, err := requestconfig.NewRequestConfig(ctx, http.MethodGet, path, params, &res, opts...) - if err != nil { - return nil, err - } - err = cfg.Execute() - if err != nil { - return nil, err - } - res.SetPageConfig(cfg, raw) - return res, nil -} - -// List all Message Batches within a Workspace. Most recently created batches are -// returned first. -// -// Learn more about the Message Batches API in our -// [user guide](/en/docs/build-with-claude/batch-processing) -func (r *BetaMessageBatchService) ListAutoPaging(ctx context.Context, params BetaMessageBatchListParams, opts ...option.RequestOption) *pagination.PageAutoPager[BetaMessageBatch] { - return pagination.NewPageAutoPager(r.List(ctx, params, opts...)) -} - -// Delete a Message Batch. -// -// Message Batches can only be deleted once they've finished processing. If you'd -// like to delete an in-progress batch, you must first cancel it. -// -// Learn more about the Message Batches API in our -// [user guide](/en/docs/build-with-claude/batch-processing) -func (r *BetaMessageBatchService) Delete(ctx context.Context, messageBatchID string, body BetaMessageBatchDeleteParams, opts ...option.RequestOption) (res *BetaDeletedMessageBatch, err error) { - for _, v := range body.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "message-batches-2024-09-24")}, opts...) - if messageBatchID == "" { - err = errors.New("missing required message_batch_id parameter") - return - } - path := fmt.Sprintf("v1/messages/batches/%s?beta=true", messageBatchID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodDelete, path, nil, &res, opts...) - return -} - -// Batches may be canceled any time before processing ends. Once cancellation is -// initiated, the batch enters a `canceling` state, at which time the system may -// complete any in-progress, non-interruptible requests before finalizing -// cancellation. -// -// The number of canceled requests is specified in `request_counts`. To determine -// which requests were canceled, check the individual results within the batch. -// Note that cancellation may not result in any canceled requests if they were -// non-interruptible. -// -// Learn more about the Message Batches API in our -// [user guide](/en/docs/build-with-claude/batch-processing) -func (r *BetaMessageBatchService) Cancel(ctx context.Context, messageBatchID string, body BetaMessageBatchCancelParams, opts ...option.RequestOption) (res *BetaMessageBatch, err error) { - for _, v := range body.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "message-batches-2024-09-24")}, opts...) - if messageBatchID == "" { - err = errors.New("missing required message_batch_id parameter") - return - } - path := fmt.Sprintf("v1/messages/batches/%s/cancel?beta=true", messageBatchID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, nil, &res, opts...) - return -} - -// Streams the results of a Message Batch as a `.jsonl` file. -// -// Each line in the file is a JSON object containing the result of a single request -// in the Message Batch. Results are not guaranteed to be in the same order as -// requests. Use the `custom_id` field to match results to requests. -// -// Learn more about the Message Batches API in our -// [user guide](/en/docs/build-with-claude/batch-processing) -func (r *BetaMessageBatchService) ResultsStreaming(ctx context.Context, messageBatchID string, query BetaMessageBatchResultsParams, opts ...option.RequestOption) (stream *jsonl.Stream[BetaMessageBatchIndividualResponse]) { - var ( - raw *http.Response - err error - ) - for _, v := range query.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithHeader("anthropic-beta", "message-batches-2024-09-24"), option.WithHeader("Accept", "application/x-jsonl")}, opts...) - if messageBatchID == "" { - err = errors.New("missing required message_batch_id parameter") - return - } - path := fmt.Sprintf("v1/messages/batches/%s/results?beta=true", messageBatchID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodGet, path, nil, &raw, opts...) - return jsonl.NewStream[BetaMessageBatchIndividualResponse](raw, err) -} - -type BetaDeletedMessageBatch struct { - // ID of the Message Batch. - ID string `json:"id,required"` - // Deleted object type. - // - // For Message Batches, this is always `"message_batch_deleted"`. - Type constant.MessageBatchDeleted `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaDeletedMessageBatch) RawJSON() string { return r.JSON.raw } -func (r *BetaDeletedMessageBatch) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessageBatch struct { - // Unique object identifier. - // - // The format and length of IDs may change over time. - ID string `json:"id,required"` - // RFC 3339 datetime string representing the time at which the Message Batch was - // archived and its results became unavailable. - ArchivedAt time.Time `json:"archived_at,required" format:"date-time"` - // RFC 3339 datetime string representing the time at which cancellation was - // initiated for the Message Batch. Specified only if cancellation was initiated. - CancelInitiatedAt time.Time `json:"cancel_initiated_at,required" format:"date-time"` - // RFC 3339 datetime string representing the time at which the Message Batch was - // created. - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - // RFC 3339 datetime string representing the time at which processing for the - // Message Batch ended. Specified only once processing ends. - // - // Processing ends when every request in a Message Batch has either succeeded, - // errored, canceled, or expired. - EndedAt time.Time `json:"ended_at,required" format:"date-time"` - // RFC 3339 datetime string representing the time at which the Message Batch will - // expire and end processing, which is 24 hours after creation. - ExpiresAt time.Time `json:"expires_at,required" format:"date-time"` - // Processing status of the Message Batch. - // - // Any of "in_progress", "canceling", "ended". - ProcessingStatus BetaMessageBatchProcessingStatus `json:"processing_status,required"` - // Tallies requests within the Message Batch, categorized by their status. - // - // Requests start as `processing` and move to one of the other statuses only once - // processing of the entire batch ends. The sum of all values always matches the - // total number of requests in the batch. - RequestCounts BetaMessageBatchRequestCounts `json:"request_counts,required"` - // URL to a `.jsonl` file containing the results of the Message Batch requests. - // Specified only once processing ends. - // - // Results in the file are not guaranteed to be in the same order as requests. Use - // the `custom_id` field to match results to requests. - ResultsURL string `json:"results_url,required"` - // Object type. - // - // For Message Batches, this is always `"message_batch"`. - Type constant.MessageBatch `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - ArchivedAt respjson.Field - CancelInitiatedAt respjson.Field - CreatedAt respjson.Field - EndedAt respjson.Field - ExpiresAt respjson.Field - ProcessingStatus respjson.Field - RequestCounts respjson.Field - ResultsURL respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageBatch) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageBatch) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Processing status of the Message Batch. -type BetaMessageBatchProcessingStatus string - -const ( - BetaMessageBatchProcessingStatusInProgress BetaMessageBatchProcessingStatus = "in_progress" - BetaMessageBatchProcessingStatusCanceling BetaMessageBatchProcessingStatus = "canceling" - BetaMessageBatchProcessingStatusEnded BetaMessageBatchProcessingStatus = "ended" -) - -type BetaMessageBatchCanceledResult struct { - Type constant.Canceled `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageBatchCanceledResult) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageBatchCanceledResult) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessageBatchErroredResult struct { - Error BetaErrorResponse `json:"error,required"` - Type constant.Errored `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Error respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageBatchErroredResult) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageBatchErroredResult) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessageBatchExpiredResult struct { - Type constant.Expired `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageBatchExpiredResult) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageBatchExpiredResult) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// This is a single line in the response `.jsonl` file and does not represent the -// response as a whole. -type BetaMessageBatchIndividualResponse struct { - // Developer-provided ID created for each request in a Message Batch. Useful for - // matching results to requests, as results may be given out of request order. - // - // Must be unique for each request within the Message Batch. - CustomID string `json:"custom_id,required"` - // Processing result for this request. - // - // Contains a Message output if processing was successful, an error response if - // processing failed, or the reason why processing was not attempted, such as - // cancellation or expiration. - Result BetaMessageBatchResultUnion `json:"result,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - CustomID respjson.Field - Result respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageBatchIndividualResponse) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageBatchIndividualResponse) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessageBatchRequestCounts struct { - // Number of requests in the Message Batch that have been canceled. - // - // This is zero until processing of the entire Message Batch has ended. - Canceled int64 `json:"canceled,required"` - // Number of requests in the Message Batch that encountered an error. - // - // This is zero until processing of the entire Message Batch has ended. - Errored int64 `json:"errored,required"` - // Number of requests in the Message Batch that have expired. - // - // This is zero until processing of the entire Message Batch has ended. - Expired int64 `json:"expired,required"` - // Number of requests in the Message Batch that are processing. - Processing int64 `json:"processing,required"` - // Number of requests in the Message Batch that have completed successfully. - // - // This is zero until processing of the entire Message Batch has ended. - Succeeded int64 `json:"succeeded,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Canceled respjson.Field - Errored respjson.Field - Expired respjson.Field - Processing respjson.Field - Succeeded respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageBatchRequestCounts) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageBatchRequestCounts) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// BetaMessageBatchResultUnion contains all possible properties and values from -// [BetaMessageBatchSucceededResult], [BetaMessageBatchErroredResult], -// [BetaMessageBatchCanceledResult], [BetaMessageBatchExpiredResult]. -// -// Use the [BetaMessageBatchResultUnion.AsAny] method to switch on the variant. -// -// Use the methods beginning with 'As' to cast the union to one of its variants. -type BetaMessageBatchResultUnion struct { - // This field is from variant [BetaMessageBatchSucceededResult]. - Message BetaMessage `json:"message"` - // Any of "succeeded", "errored", "canceled", "expired". - Type string `json:"type"` - // This field is from variant [BetaMessageBatchErroredResult]. - Error BetaErrorResponse `json:"error"` - JSON struct { - Message respjson.Field - Type respjson.Field - Error respjson.Field - raw string - } `json:"-"` -} - -// anyBetaMessageBatchResult is implemented by each variant of -// [BetaMessageBatchResultUnion] to add type safety for the return type of -// [BetaMessageBatchResultUnion.AsAny] -type anyBetaMessageBatchResult interface { - implBetaMessageBatchResultUnion() -} - -func (BetaMessageBatchSucceededResult) implBetaMessageBatchResultUnion() {} -func (BetaMessageBatchErroredResult) implBetaMessageBatchResultUnion() {} -func (BetaMessageBatchCanceledResult) implBetaMessageBatchResultUnion() {} -func (BetaMessageBatchExpiredResult) implBetaMessageBatchResultUnion() {} - -// Use the following switch statement to find the correct variant -// -// switch variant := BetaMessageBatchResultUnion.AsAny().(type) { -// case anthropic.BetaMessageBatchSucceededResult: -// case anthropic.BetaMessageBatchErroredResult: -// case anthropic.BetaMessageBatchCanceledResult: -// case anthropic.BetaMessageBatchExpiredResult: -// default: -// fmt.Errorf("no variant present") -// } -func (u BetaMessageBatchResultUnion) AsAny() anyBetaMessageBatchResult { - switch u.Type { - case "succeeded": - return u.AsSucceeded() - case "errored": - return u.AsErrored() - case "canceled": - return u.AsCanceled() - case "expired": - return u.AsExpired() - } - return nil -} - -func (u BetaMessageBatchResultUnion) AsSucceeded() (v BetaMessageBatchSucceededResult) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaMessageBatchResultUnion) AsErrored() (v BetaMessageBatchErroredResult) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaMessageBatchResultUnion) AsCanceled() (v BetaMessageBatchCanceledResult) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -func (u BetaMessageBatchResultUnion) AsExpired() (v BetaMessageBatchExpiredResult) { - apijson.UnmarshalRoot(json.RawMessage(u.JSON.raw), &v) - return -} - -// Returns the unmodified JSON received from the API -func (u BetaMessageBatchResultUnion) RawJSON() string { return u.JSON.raw } - -func (r *BetaMessageBatchResultUnion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessageBatchSucceededResult struct { - Message BetaMessage `json:"message,required"` - Type constant.Succeeded `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - Message respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaMessageBatchSucceededResult) RawJSON() string { return r.JSON.raw } -func (r *BetaMessageBatchSucceededResult) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaMessageBatchNewParams struct { - // List of requests for prompt completion. Each is an individual request to create - // a Message. - Requests []BetaMessageBatchNewParamsRequest `json:"requests,omitzero,required"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -func (r BetaMessageBatchNewParams) MarshalJSON() (data []byte, err error) { - type shadow BetaMessageBatchNewParams - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMessageBatchNewParams) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// The properties CustomID, Params are required. -type BetaMessageBatchNewParamsRequest struct { - // Developer-provided ID created for each request in a Message Batch. Useful for - // matching results to requests, as results may be given out of request order. - // - // Must be unique for each request within the Message Batch. - CustomID string `json:"custom_id,required"` - // Messages API creation parameters for the individual request. - // - // See the [Messages API reference](/en/api/messages) for full documentation on - // available parameters. - Params BetaMessageBatchNewParamsRequestParams `json:"params,omitzero,required"` - paramObj -} - -func (r BetaMessageBatchNewParamsRequest) MarshalJSON() (data []byte, err error) { - type shadow BetaMessageBatchNewParamsRequest - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMessageBatchNewParamsRequest) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -// Messages API creation parameters for the individual request. -// -// See the [Messages API reference](/en/api/messages) for full documentation on -// available parameters. -// -// The properties MaxTokens, Messages, Model are required. -type BetaMessageBatchNewParamsRequestParams struct { - // The maximum number of tokens to generate before stopping. - // - // Note that our models may stop _before_ reaching this maximum. This parameter - // only specifies the absolute maximum number of tokens to generate. - // - // Different models have different maximum values for this parameter. See - // [models](https://docs.anthropic.com/en/docs/models-overview) for details. - MaxTokens int64 `json:"max_tokens,required"` - // Input messages. - // - // Our models are trained to operate on alternating `user` and `assistant` - // conversational turns. When creating a new `Message`, you specify the prior - // conversational turns with the `messages` parameter, and the model then generates - // the next `Message` in the conversation. Consecutive `user` or `assistant` turns - // in your request will be combined into a single turn. - // - // Each input message must be an object with a `role` and `content`. You can - // specify a single `user`-role message, or you can include multiple `user` and - // `assistant` messages. - // - // If the final message uses the `assistant` role, the response content will - // continue immediately from the content in that message. This can be used to - // constrain part of the model's response. - // - // Example with a single `user` message: - // - // ```json - // [{ "role": "user", "content": "Hello, Claude" }] - // ``` - // - // Example with multiple conversational turns: - // - // ```json - // [ - // - // { "role": "user", "content": "Hello there." }, - // { "role": "assistant", "content": "Hi, I'm Claude. How can I help you?" }, - // { "role": "user", "content": "Can you explain LLMs in plain English?" } - // - // ] - // ``` - // - // Example with a partially-filled response from Claude: - // - // ```json - // [ - // - // { - // "role": "user", - // "content": "What's the Greek name for Sun? (A) Sol (B) Helios (C) Sun" - // }, - // { "role": "assistant", "content": "The best answer is (" } - // - // ] - // ``` - // - // Each input message `content` may be either a single `string` or an array of - // content blocks, where each block has a specific `type`. Using a `string` for - // `content` is shorthand for an array of one content block of type `"text"`. The - // following input messages are equivalent: - // - // ```json - // { "role": "user", "content": "Hello, Claude" } - // ``` - // - // ```json - // { "role": "user", "content": [{ "type": "text", "text": "Hello, Claude" }] } - // ``` - // - // Starting with Claude 3 models, you can also send image content blocks: - // - // ```json - // - // { - // "role": "user", - // "content": [ - // { - // "type": "image", - // "source": { - // "type": "base64", - // "media_type": "image/jpeg", - // "data": "/9j/4AAQSkZJRg..." - // } - // }, - // { "type": "text", "text": "What is in this image?" } - // ] - // } - // - // ``` - // - // We currently support the `base64` source type for images, and the `image/jpeg`, - // `image/png`, `image/gif`, and `image/webp` media types. - // - // See [examples](https://docs.anthropic.com/en/api/messages-examples#vision) for - // more input examples. - // - // Note that if you want to include a - // [system prompt](https://docs.anthropic.com/en/docs/system-prompts), you can use - // the top-level `system` parameter — there is no `"system"` role for input - // messages in the Messages API. - // - // There is a limit of 100000 messages in a single request. - Messages []BetaMessageParam `json:"messages,omitzero,required"` - // The model that will complete your prompt.\n\nSee - // [models](https://docs.anthropic.com/en/docs/models-overview) for additional - // details and options. - Model Model `json:"model,omitzero,required"` - // Container identifier for reuse across requests. - Container param.Opt[string] `json:"container,omitzero"` - // Whether to incrementally stream the response using server-sent events. - // - // See [streaming](https://docs.anthropic.com/en/api/messages-streaming) for - // details. - Stream param.Opt[bool] `json:"stream,omitzero"` - // Amount of randomness injected into the response. - // - // Defaults to `1.0`. Ranges from `0.0` to `1.0`. Use `temperature` closer to `0.0` - // for analytical / multiple choice, and closer to `1.0` for creative and - // generative tasks. - // - // Note that even with `temperature` of `0.0`, the results will not be fully - // deterministic. - Temperature param.Opt[float64] `json:"temperature,omitzero"` - // Only sample from the top K options for each subsequent token. - // - // Used to remove "long tail" low probability responses. - // [Learn more technical details here](https://towardsdatascience.com/how-to-sample-from-language-models-682bceb97277). - // - // Recommended for advanced use cases only. You usually only need to use - // `temperature`. - TopK param.Opt[int64] `json:"top_k,omitzero"` - // Use nucleus sampling. - // - // In nucleus sampling, we compute the cumulative distribution over all the options - // for each subsequent token in decreasing probability order and cut it off once it - // reaches a particular probability specified by `top_p`. You should either alter - // `temperature` or `top_p`, but not both. - // - // Recommended for advanced use cases only. You usually only need to use - // `temperature`. - TopP param.Opt[float64] `json:"top_p,omitzero"` - // MCP servers to be utilized in this request - MCPServers []BetaRequestMCPServerURLDefinitionParam `json:"mcp_servers,omitzero"` - // An object describing metadata about the request. - Metadata BetaMetadataParam `json:"metadata,omitzero"` - // Determines whether to use priority capacity (if available) or standard capacity - // for this request. - // - // Anthropic offers different levels of service for your API requests. See - // [service-tiers](https://docs.anthropic.com/en/api/service-tiers) for details. - // - // Any of "auto", "standard_only". - ServiceTier string `json:"service_tier,omitzero"` - // Custom text sequences that will cause the model to stop generating. - // - // Our models will normally stop when they have naturally completed their turn, - // which will result in a response `stop_reason` of `"end_turn"`. - // - // If you want the model to stop generating when it encounters custom strings of - // text, you can use the `stop_sequences` parameter. If the model encounters one of - // the custom sequences, the response `stop_reason` value will be `"stop_sequence"` - // and the response `stop_sequence` value will contain the matched stop sequence. - StopSequences []string `json:"stop_sequences,omitzero"` - // System prompt. - // - // A system prompt is a way of providing context and instructions to Claude, such - // as specifying a particular goal or role. See our - // [guide to system prompts](https://docs.anthropic.com/en/docs/system-prompts). - System []BetaTextBlockParam `json:"system,omitzero"` - // Configuration for enabling Claude's extended thinking. - // - // When enabled, responses include `thinking` content blocks showing Claude's - // thinking process before the final answer. Requires a minimum budget of 1,024 - // tokens and counts towards your `max_tokens` limit. - // - // See - // [extended thinking](https://docs.anthropic.com/en/docs/build-with-claude/extended-thinking) - // for details. - Thinking BetaThinkingConfigParamUnion `json:"thinking,omitzero"` - // How the model should use the provided tools. The model can use a specific tool, - // any available tool, decide by itself, or not use tools at all. - ToolChoice BetaToolChoiceUnionParam `json:"tool_choice,omitzero"` - // Definitions of tools that the model may use. - // - // If you include `tools` in your API request, the model may return `tool_use` - // content blocks that represent the model's use of those tools. You can then run - // those tools using the tool input generated by the model and then optionally - // return results back to the model using `tool_result` content blocks. - // - // Each tool definition includes: - // - // - `name`: Name of the tool. - // - `description`: Optional, but strongly-recommended description of the tool. - // - `input_schema`: [JSON schema](https://json-schema.org/draft/2020-12) for the - // tool `input` shape that the model will produce in `tool_use` output content - // blocks. - // - // For example, if you defined `tools` as: - // - // ```json - // [ - // - // { - // "name": "get_stock_price", - // "description": "Get the current stock price for a given ticker symbol.", - // "input_schema": { - // "type": "object", - // "properties": { - // "ticker": { - // "type": "string", - // "description": "The stock ticker symbol, e.g. AAPL for Apple Inc." - // } - // }, - // "required": ["ticker"] - // } - // } - // - // ] - // ``` - // - // And then asked the model "What's the S&P 500 at today?", the model might produce - // `tool_use` content blocks in the response like this: - // - // ```json - // [ - // - // { - // "type": "tool_use", - // "id": "toolu_01D7FLrfh4GYq7yT1ULFeyMV", - // "name": "get_stock_price", - // "input": { "ticker": "^GSPC" } - // } - // - // ] - // ``` - // - // You might then run your `get_stock_price` tool with `{"ticker": "^GSPC"}` as an - // input, and return the following back to the model in a subsequent `user` - // message: - // - // ```json - // [ - // - // { - // "type": "tool_result", - // "tool_use_id": "toolu_01D7FLrfh4GYq7yT1ULFeyMV", - // "content": "259.75 USD" - // } - // - // ] - // ``` - // - // Tools can be used for workflows that include running client-side tools and - // functions, or more generally whenever you want the model to produce a particular - // JSON structure of output. - // - // See our [guide](https://docs.anthropic.com/en/docs/tool-use) for more details. - Tools []BetaToolUnionParam `json:"tools,omitzero"` - paramObj -} - -func (r BetaMessageBatchNewParamsRequestParams) MarshalJSON() (data []byte, err error) { - type shadow BetaMessageBatchNewParamsRequestParams - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *BetaMessageBatchNewParamsRequestParams) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func init() { - apijson.RegisterFieldValidator[BetaMessageBatchNewParamsRequestParams]( - "service_tier", "auto", "standard_only", - ) -} - -type BetaMessageBatchGetParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -type BetaMessageBatchListParams struct { - // ID of the object to use as a cursor for pagination. When provided, returns the - // page of results immediately after this object. - AfterID param.Opt[string] `query:"after_id,omitzero" json:"-"` - // ID of the object to use as a cursor for pagination. When provided, returns the - // page of results immediately before this object. - BeforeID param.Opt[string] `query:"before_id,omitzero" json:"-"` - // Number of items to return per page. - // - // Defaults to `20`. Ranges from `1` to `1000`. - Limit param.Opt[int64] `query:"limit,omitzero" json:"-"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -// URLQuery serializes [BetaMessageBatchListParams]'s query parameters as -// `url.Values`. -func (r BetaMessageBatchListParams) URLQuery() (v url.Values, err error) { - return apiquery.MarshalWithSettings(r, apiquery.QuerySettings{ - ArrayFormat: apiquery.ArrayQueryFormatComma, - NestedFormat: apiquery.NestedQueryFormatBrackets, - }) -} - -type BetaMessageBatchDeleteParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -type BetaMessageBatchCancelParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -type BetaMessageBatchResultsParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/betamodel.go b/vendor/github.com/anthropics/anthropic-sdk-go/betamodel.go deleted file mode 100644 index 72c70a9ad404705989dfcb59571a8c1ec4bd053d..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/betamodel.go +++ /dev/null @@ -1,149 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "context" - "errors" - "fmt" - "net/http" - "net/url" - "time" - - "github.com/anthropics/anthropic-sdk-go/internal/apijson" - "github.com/anthropics/anthropic-sdk-go/internal/apiquery" - "github.com/anthropics/anthropic-sdk-go/internal/requestconfig" - "github.com/anthropics/anthropic-sdk-go/option" - "github.com/anthropics/anthropic-sdk-go/packages/pagination" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "github.com/anthropics/anthropic-sdk-go/packages/respjson" - "github.com/anthropics/anthropic-sdk-go/shared/constant" -) - -// BetaModelService contains methods and other services that help with interacting -// with the anthropic API. -// -// Note, unlike clients, this service does not read variables from the environment -// automatically. You should not instantiate this service directly, and instead use -// the [NewBetaModelService] method instead. -type BetaModelService struct { - Options []option.RequestOption -} - -// NewBetaModelService generates a new service that applies the given options to -// each request. These options are applied after the parent client's options (if -// there is one), and before any request-specific options. -func NewBetaModelService(opts ...option.RequestOption) (r BetaModelService) { - r = BetaModelService{} - r.Options = opts - return -} - -// Get a specific model. -// -// The Models API response can be used to determine information about a specific -// model or resolve a model alias to a model ID. -func (r *BetaModelService) Get(ctx context.Context, modelID string, query BetaModelGetParams, opts ...option.RequestOption) (res *BetaModelInfo, err error) { - for _, v := range query.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - if modelID == "" { - err = errors.New("missing required model_id parameter") - return - } - path := fmt.Sprintf("v1/models/%s?beta=true", modelID) - err = requestconfig.ExecuteNewRequest(ctx, http.MethodGet, path, nil, &res, opts...) - return -} - -// List available models. -// -// The Models API response can be used to determine which models are available for -// use in the API. More recently released models are listed first. -func (r *BetaModelService) List(ctx context.Context, params BetaModelListParams, opts ...option.RequestOption) (res *pagination.Page[BetaModelInfo], err error) { - var raw *http.Response - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithResponseInto(&raw)}, opts...) - path := "v1/models?beta=true" - cfg, err := requestconfig.NewRequestConfig(ctx, http.MethodGet, path, params, &res, opts...) - if err != nil { - return nil, err - } - err = cfg.Execute() - if err != nil { - return nil, err - } - res.SetPageConfig(cfg, raw) - return res, nil -} - -// List available models. -// -// The Models API response can be used to determine which models are available for -// use in the API. More recently released models are listed first. -func (r *BetaModelService) ListAutoPaging(ctx context.Context, params BetaModelListParams, opts ...option.RequestOption) *pagination.PageAutoPager[BetaModelInfo] { - return pagination.NewPageAutoPager(r.List(ctx, params, opts...)) -} - -type BetaModelInfo struct { - // Unique model identifier. - ID string `json:"id,required"` - // RFC 3339 datetime string representing the time at which the model was released. - // May be set to an epoch value if the release date is unknown. - CreatedAt time.Time `json:"created_at,required" format:"date-time"` - // A human-readable name for the model. - DisplayName string `json:"display_name,required"` - // Object type. - // - // For Models, this is always `"model"`. - Type constant.Model `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - CreatedAt respjson.Field - DisplayName respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r BetaModelInfo) RawJSON() string { return r.JSON.raw } -func (r *BetaModelInfo) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type BetaModelGetParams struct { - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -type BetaModelListParams struct { - // ID of the object to use as a cursor for pagination. When provided, returns the - // page of results immediately after this object. - AfterID param.Opt[string] `query:"after_id,omitzero" json:"-"` - // ID of the object to use as a cursor for pagination. When provided, returns the - // page of results immediately before this object. - BeforeID param.Opt[string] `query:"before_id,omitzero" json:"-"` - // Number of items to return per page. - // - // Defaults to `20`. Ranges from `1` to `1000`. - Limit param.Opt[int64] `query:"limit,omitzero" json:"-"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -// URLQuery serializes [BetaModelListParams]'s query parameters as `url.Values`. -func (r BetaModelListParams) URLQuery() (v url.Values, err error) { - return apiquery.MarshalWithSettings(r, apiquery.QuerySettings{ - ArrayFormat: apiquery.ArrayQueryFormatComma, - NestedFormat: apiquery.NestedQueryFormatBrackets, - }) -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/client.go b/vendor/github.com/anthropics/anthropic-sdk-go/client.go deleted file mode 100644 index f68de03c77c45c5d3f476ef237bce57a86f68f32..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/client.go +++ /dev/null @@ -1,126 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "context" - "net/http" - "os" - - "github.com/anthropics/anthropic-sdk-go/internal/requestconfig" - "github.com/anthropics/anthropic-sdk-go/option" -) - -// Client creates a struct with services and top level methods that help with -// interacting with the anthropic API. You should not instantiate this client -// directly, and instead use the [NewClient] method instead. -type Client struct { - Options []option.RequestOption - Completions CompletionService - Messages MessageService - Models ModelService - Beta BetaService -} - -// DefaultClientOptions read from the environment (ANTHROPIC_API_KEY, -// ANTHROPIC_AUTH_TOKEN, ANTHROPIC_BASE_URL). This should be used to initialize new -// clients. -func DefaultClientOptions() []option.RequestOption { - defaults := []option.RequestOption{option.WithEnvironmentProduction()} - if o, ok := os.LookupEnv("ANTHROPIC_BASE_URL"); ok { - defaults = append(defaults, option.WithBaseURL(o)) - } - if o, ok := os.LookupEnv("ANTHROPIC_API_KEY"); ok { - defaults = append(defaults, option.WithAPIKey(o)) - } - if o, ok := os.LookupEnv("ANTHROPIC_AUTH_TOKEN"); ok { - defaults = append(defaults, option.WithAuthToken(o)) - } - return defaults -} - -// NewClient generates a new client with the default option read from the -// environment (ANTHROPIC_API_KEY, ANTHROPIC_AUTH_TOKEN, ANTHROPIC_BASE_URL). The -// option passed in as arguments are applied after these default arguments, and all -// option will be passed down to the services and requests that this client makes. -func NewClient(opts ...option.RequestOption) (r Client) { - opts = append(DefaultClientOptions(), opts...) - - r = Client{Options: opts} - - r.Completions = NewCompletionService(opts...) - r.Messages = NewMessageService(opts...) - r.Models = NewModelService(opts...) - r.Beta = NewBetaService(opts...) - - return -} - -// Execute makes a request with the given context, method, URL, request params, -// response, and request options. This is useful for hitting undocumented endpoints -// while retaining the base URL, auth, retries, and other options from the client. -// -// If a byte slice or an [io.Reader] is supplied to params, it will be used as-is -// for the request body. -// -// The params is by default serialized into the body using [encoding/json]. If your -// type implements a MarshalJSON function, it will be used instead to serialize the -// request. If a URLQuery method is implemented, the returned [url.Values] will be -// used as query strings to the url. -// -// If your params struct uses [param.Field], you must provide either [MarshalJSON], -// [URLQuery], and/or [MarshalForm] functions. It is undefined behavior to use a -// struct uses [param.Field] without specifying how it is serialized. -// -// Any "…Params" object defined in this library can be used as the request -// argument. Note that 'path' arguments will not be forwarded into the url. -// -// The response body will be deserialized into the res variable, depending on its -// type: -// -// - A pointer to a [*http.Response] is populated by the raw response. -// - A pointer to a byte array will be populated with the contents of the request -// body. -// - A pointer to any other type uses this library's default JSON decoding, which -// respects UnmarshalJSON if it is defined on the type. -// - A nil value will not read the response body. -// -// For even greater flexibility, see [option.WithResponseInto] and -// [option.WithResponseBodyInto]. -func (r *Client) Execute(ctx context.Context, method string, path string, params any, res any, opts ...option.RequestOption) error { - opts = append(r.Options, opts...) - return requestconfig.ExecuteNewRequest(ctx, method, path, params, res, opts...) -} - -// Get makes a GET request with the given URL, params, and optionally deserializes -// to a response. See [Execute] documentation on the params and response. -func (r *Client) Get(ctx context.Context, path string, params any, res any, opts ...option.RequestOption) error { - return r.Execute(ctx, http.MethodGet, path, params, res, opts...) -} - -// Post makes a POST request with the given URL, params, and optionally -// deserializes to a response. See [Execute] documentation on the params and -// response. -func (r *Client) Post(ctx context.Context, path string, params any, res any, opts ...option.RequestOption) error { - return r.Execute(ctx, http.MethodPost, path, params, res, opts...) -} - -// Put makes a PUT request with the given URL, params, and optionally deserializes -// to a response. See [Execute] documentation on the params and response. -func (r *Client) Put(ctx context.Context, path string, params any, res any, opts ...option.RequestOption) error { - return r.Execute(ctx, http.MethodPut, path, params, res, opts...) -} - -// Patch makes a PATCH request with the given URL, params, and optionally -// deserializes to a response. See [Execute] documentation on the params and -// response. -func (r *Client) Patch(ctx context.Context, path string, params any, res any, opts ...option.RequestOption) error { - return r.Execute(ctx, http.MethodPatch, path, params, res, opts...) -} - -// Delete makes a DELETE request with the given URL, params, and optionally -// deserializes to a response. See [Execute] documentation on the params and -// response. -func (r *Client) Delete(ctx context.Context, path string, params any, res any, opts ...option.RequestOption) error { - return r.Execute(ctx, http.MethodDelete, path, params, res, opts...) -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/completion.go b/vendor/github.com/anthropics/anthropic-sdk-go/completion.go deleted file mode 100644 index e1e72a0e9dc68e92fefa296835e8ff1c9bece9a3..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/completion.go +++ /dev/null @@ -1,194 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package anthropic - -import ( - "context" - "fmt" - "net/http" - - "github.com/anthropics/anthropic-sdk-go/internal/apijson" - "github.com/anthropics/anthropic-sdk-go/internal/requestconfig" - "github.com/anthropics/anthropic-sdk-go/option" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "github.com/anthropics/anthropic-sdk-go/packages/respjson" - "github.com/anthropics/anthropic-sdk-go/packages/ssestream" - "github.com/anthropics/anthropic-sdk-go/shared/constant" -) - -// CompletionService contains methods and other services that help with interacting -// with the anthropic API. -// -// Note, unlike clients, this service does not read variables from the environment -// automatically. You should not instantiate this service directly, and instead use -// the [NewCompletionService] method instead. -type CompletionService struct { - Options []option.RequestOption -} - -// NewCompletionService generates a new service that applies the given options to -// each request. These options are applied after the parent client's options (if -// there is one), and before any request-specific options. -func NewCompletionService(opts ...option.RequestOption) (r CompletionService) { - r = CompletionService{} - r.Options = opts - return -} - -// [Legacy] Create a Text Completion. -// -// The Text Completions API is a legacy API. We recommend using the -// [Messages API](https://docs.anthropic.com/en/api/messages) going forward. -// -// Future models and features will not be compatible with Text Completions. See our -// [migration guide](https://docs.anthropic.com/en/api/migrating-from-text-completions-to-messages) -// for guidance in migrating from Text Completions to Messages. -// -// Note: If you choose to set a timeout for this request, we recommend 10 minutes. -func (r *CompletionService) New(ctx context.Context, params CompletionNewParams, opts ...option.RequestOption) (res *Completion, err error) { - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - path := "v1/complete" - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &res, opts...) - return -} - -// [Legacy] Create a Text Completion. -// -// The Text Completions API is a legacy API. We recommend using the -// [Messages API](https://docs.anthropic.com/en/api/messages) going forward. -// -// Future models and features will not be compatible with Text Completions. See our -// [migration guide](https://docs.anthropic.com/en/api/migrating-from-text-completions-to-messages) -// for guidance in migrating from Text Completions to Messages. -// -// Note: If you choose to set a timeout for this request, we recommend 10 minutes. -func (r *CompletionService) NewStreaming(ctx context.Context, params CompletionNewParams, opts ...option.RequestOption) (stream *ssestream.Stream[Completion]) { - var ( - raw *http.Response - err error - ) - for _, v := range params.Betas { - opts = append(opts, option.WithHeaderAdd("anthropic-beta", fmt.Sprintf("%s", v))) - } - opts = append(r.Options[:], opts...) - opts = append([]option.RequestOption{option.WithJSONSet("stream", true)}, opts...) - path := "v1/complete" - err = requestconfig.ExecuteNewRequest(ctx, http.MethodPost, path, params, &raw, opts...) - return ssestream.NewStream[Completion](ssestream.NewDecoder(raw), err) -} - -type Completion struct { - // Unique object identifier. - // - // The format and length of IDs may change over time. - ID string `json:"id,required"` - // The resulting completion up to and excluding the stop sequences. - Completion string `json:"completion,required"` - // The model that will complete your prompt.\n\nSee - // [models](https://docs.anthropic.com/en/docs/models-overview) for additional - // details and options. - Model Model `json:"model,required"` - // The reason that we stopped. - // - // This may be one the following values: - // - // - `"stop_sequence"`: we reached a stop sequence — either provided by you via the - // `stop_sequences` parameter, or a stop sequence built into the model - // - `"max_tokens"`: we exceeded `max_tokens_to_sample` or the model's maximum - StopReason string `json:"stop_reason,required"` - // Object type. - // - // For Text Completions, this is always `"completion"`. - Type constant.Completion `json:"type,required"` - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ID respjson.Field - Completion respjson.Field - Model respjson.Field - StopReason respjson.Field - Type respjson.Field - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` -} - -// Returns the unmodified JSON received from the API -func (r Completion) RawJSON() string { return r.JSON.raw } -func (r *Completion) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -type CompletionNewParams struct { - // The maximum number of tokens to generate before stopping. - // - // Note that our models may stop _before_ reaching this maximum. This parameter - // only specifies the absolute maximum number of tokens to generate. - MaxTokensToSample int64 `json:"max_tokens_to_sample,required"` - // The model that will complete your prompt.\n\nSee - // [models](https://docs.anthropic.com/en/docs/models-overview) for additional - // details and options. - Model Model `json:"model,omitzero,required"` - // The prompt that you want Claude to complete. - // - // For proper response generation you will need to format your prompt using - // alternating `\n\nHuman:` and `\n\nAssistant:` conversational turns. For example: - // - // ``` - // "\n\nHuman: {userQuestion}\n\nAssistant:" - // ``` - // - // See [prompt validation](https://docs.anthropic.com/en/api/prompt-validation) and - // our guide to - // [prompt design](https://docs.anthropic.com/en/docs/intro-to-prompting) for more - // details. - Prompt string `json:"prompt,required"` - // Amount of randomness injected into the response. - // - // Defaults to `1.0`. Ranges from `0.0` to `1.0`. Use `temperature` closer to `0.0` - // for analytical / multiple choice, and closer to `1.0` for creative and - // generative tasks. - // - // Note that even with `temperature` of `0.0`, the results will not be fully - // deterministic. - Temperature param.Opt[float64] `json:"temperature,omitzero"` - // Only sample from the top K options for each subsequent token. - // - // Used to remove "long tail" low probability responses. - // [Learn more technical details here](https://towardsdatascience.com/how-to-sample-from-language-models-682bceb97277). - // - // Recommended for advanced use cases only. You usually only need to use - // `temperature`. - TopK param.Opt[int64] `json:"top_k,omitzero"` - // Use nucleus sampling. - // - // In nucleus sampling, we compute the cumulative distribution over all the options - // for each subsequent token in decreasing probability order and cut it off once it - // reaches a particular probability specified by `top_p`. You should either alter - // `temperature` or `top_p`, but not both. - // - // Recommended for advanced use cases only. You usually only need to use - // `temperature`. - TopP param.Opt[float64] `json:"top_p,omitzero"` - // An object describing metadata about the request. - Metadata MetadataParam `json:"metadata,omitzero"` - // Sequences that will cause the model to stop generating. - // - // Our models stop on `"\n\nHuman:"`, and may include additional built-in stop - // sequences in the future. By providing the stop_sequences parameter, you may - // include additional strings that will cause the model to stop generating. - StopSequences []string `json:"stop_sequences,omitzero"` - // Optional header to specify the beta version(s) you want to use. - Betas []AnthropicBeta `header:"anthropic-beta,omitzero" json:"-"` - paramObj -} - -func (r CompletionNewParams) MarshalJSON() (data []byte, err error) { - type shadow CompletionNewParams - return param.MarshalObject(r, (*shadow)(&r)) -} -func (r *CompletionNewParams) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/field.go b/vendor/github.com/anthropics/anthropic-sdk-go/field.go deleted file mode 100644 index 8c2fd503a17203fe448108b91c728850de792a8c..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/field.go +++ /dev/null @@ -1,45 +0,0 @@ -package anthropic - -import ( - "github.com/anthropics/anthropic-sdk-go/packages/param" - "io" - "time" -) - -func String(s string) param.Opt[string] { return param.NewOpt(s) } -func Int(i int64) param.Opt[int64] { return param.NewOpt(i) } -func Bool(b bool) param.Opt[bool] { return param.NewOpt(b) } -func Float(f float64) param.Opt[float64] { return param.NewOpt(f) } -func Time(t time.Time) param.Opt[time.Time] { return param.NewOpt(t) } - -func Opt[T comparable](v T) param.Opt[T] { return param.NewOpt(v) } -func Ptr[T any](v T) *T { return &v } - -func IntPtr(v int64) *int64 { return &v } -func BoolPtr(v bool) *bool { return &v } -func FloatPtr(v float64) *float64 { return &v } -func StringPtr(v string) *string { return &v } -func TimePtr(v time.Time) *time.Time { return &v } - -func File(rdr io.Reader, filename string, contentType string) file { - return file{rdr, filename, contentType} -} - -type file struct { - io.Reader - name string - contentType string -} - -func (f file) Filename() string { - if f.name != "" { - return f.name - } else if named, ok := f.Reader.(interface{ Name() string }); ok { - return named.Name() - } - return "" -} - -func (f file) ContentType() string { - return f.contentType -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apierror/apierror.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apierror/apierror.go deleted file mode 100644 index c36ead14bcfe3b99e46bd2271c3c4411632c13a3..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apierror/apierror.go +++ /dev/null @@ -1,50 +0,0 @@ -// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details. - -package apierror - -import ( - "fmt" - "net/http" - "net/http/httputil" - - "github.com/anthropics/anthropic-sdk-go/internal/apijson" - "github.com/anthropics/anthropic-sdk-go/packages/respjson" -) - -// Error represents an error that originates from the API, i.e. when a request is -// made and the API returns a response with a HTTP status code. Other errors are -// not wrapped by this SDK. -type Error struct { - // JSON contains metadata for fields, check presence with [respjson.Field.Valid]. - JSON struct { - ExtraFields map[string]respjson.Field - raw string - } `json:"-"` - StatusCode int - Request *http.Request - Response *http.Response -} - -// Returns the unmodified JSON received from the API -func (r Error) RawJSON() string { return r.JSON.raw } -func (r *Error) UnmarshalJSON(data []byte) error { - return apijson.UnmarshalRoot(data, r) -} - -func (r *Error) Error() string { - // Attempt to re-populate the response body - return fmt.Sprintf("%s %q: %d %s %s", r.Request.Method, r.Request.URL, r.Response.StatusCode, http.StatusText(r.Response.StatusCode), r.JSON.raw) -} - -func (r *Error) DumpRequest(body bool) []byte { - if r.Request.GetBody != nil { - r.Request.Body, _ = r.Request.GetBody() - } - out, _ := httputil.DumpRequestOut(r.Request, body) - return out -} - -func (r *Error) DumpResponse(body bool) []byte { - out, _ := httputil.DumpResponse(r.Response, body) - return out -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/encoder.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/encoder.go deleted file mode 100644 index b600f2f47f55b218957b9f680ac51a95a2da9ac4..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/encoder.go +++ /dev/null @@ -1,465 +0,0 @@ -package apiform - -import ( - "fmt" - "io" - "mime/multipart" - "net/textproto" - "path" - "reflect" - "sort" - "strconv" - "strings" - "sync" - "time" - - "github.com/anthropics/anthropic-sdk-go/packages/param" -) - -var encoders sync.Map // map[encoderEntry]encoderFunc - -func Marshal(value any, writer *multipart.Writer) error { - e := &encoder{ - dateFormat: time.RFC3339, - arrayFmt: "comma", - } - return e.marshal(value, writer) -} - -func MarshalRoot(value any, writer *multipart.Writer) error { - e := &encoder{ - root: true, - dateFormat: time.RFC3339, - arrayFmt: "comma", - } - return e.marshal(value, writer) -} - -func MarshalWithSettings(value any, writer *multipart.Writer, arrayFormat string) error { - e := &encoder{ - arrayFmt: arrayFormat, - dateFormat: time.RFC3339, - } - return e.marshal(value, writer) -} - -type encoder struct { - arrayFmt string - dateFormat string - root bool -} - -type encoderFunc func(key string, value reflect.Value, writer *multipart.Writer) error - -type encoderField struct { - tag parsedStructTag - fn encoderFunc - idx []int -} - -type encoderEntry struct { - reflect.Type - dateFormat string - root bool -} - -func (e *encoder) marshal(value any, writer *multipart.Writer) error { - val := reflect.ValueOf(value) - if !val.IsValid() { - return nil - } - typ := val.Type() - enc := e.typeEncoder(typ) - return enc("", val, writer) -} - -func (e *encoder) typeEncoder(t reflect.Type) encoderFunc { - entry := encoderEntry{ - Type: t, - dateFormat: e.dateFormat, - root: e.root, - } - - if fi, ok := encoders.Load(entry); ok { - return fi.(encoderFunc) - } - - // To deal with recursive types, populate the map with an - // indirect func before we build it. This type waits on the - // real func (f) to be ready and then calls it. This indirect - // func is only used for recursive types. - var ( - wg sync.WaitGroup - f encoderFunc - ) - wg.Add(1) - fi, loaded := encoders.LoadOrStore(entry, encoderFunc(func(key string, v reflect.Value, writer *multipart.Writer) error { - wg.Wait() - return f(key, v, writer) - })) - if loaded { - return fi.(encoderFunc) - } - - // Compute the real encoder and replace the indirect func with it. - f = e.newTypeEncoder(t) - wg.Done() - encoders.Store(entry, f) - return f -} - -func (e *encoder) newTypeEncoder(t reflect.Type) encoderFunc { - if t.ConvertibleTo(reflect.TypeOf(time.Time{})) { - return e.newTimeTypeEncoder() - } - if t.Implements(reflect.TypeOf((*io.Reader)(nil)).Elem()) { - return e.newReaderTypeEncoder() - } - e.root = false - switch t.Kind() { - case reflect.Pointer: - inner := t.Elem() - - innerEncoder := e.typeEncoder(inner) - return func(key string, v reflect.Value, writer *multipart.Writer) error { - if !v.IsValid() || v.IsNil() { - return nil - } - return innerEncoder(key, v.Elem(), writer) - } - case reflect.Struct: - return e.newStructTypeEncoder(t) - case reflect.Slice, reflect.Array: - return e.newArrayTypeEncoder(t) - case reflect.Map: - return e.newMapEncoder(t) - case reflect.Interface: - return e.newInterfaceEncoder() - default: - return e.newPrimitiveTypeEncoder(t) - } -} - -func (e *encoder) newPrimitiveTypeEncoder(t reflect.Type) encoderFunc { - switch t.Kind() { - // Note that we could use `gjson` to encode these types but it would complicate our - // code more and this current code shouldn't cause any issues - case reflect.String: - return func(key string, v reflect.Value, writer *multipart.Writer) error { - return writer.WriteField(key, v.String()) - } - case reflect.Bool: - return func(key string, v reflect.Value, writer *multipart.Writer) error { - if v.Bool() { - return writer.WriteField(key, "true") - } - return writer.WriteField(key, "false") - } - case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64: - return func(key string, v reflect.Value, writer *multipart.Writer) error { - return writer.WriteField(key, strconv.FormatInt(v.Int(), 10)) - } - case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64: - return func(key string, v reflect.Value, writer *multipart.Writer) error { - return writer.WriteField(key, strconv.FormatUint(v.Uint(), 10)) - } - case reflect.Float32: - return func(key string, v reflect.Value, writer *multipart.Writer) error { - return writer.WriteField(key, strconv.FormatFloat(v.Float(), 'f', -1, 32)) - } - case reflect.Float64: - return func(key string, v reflect.Value, writer *multipart.Writer) error { - return writer.WriteField(key, strconv.FormatFloat(v.Float(), 'f', -1, 64)) - } - default: - return func(key string, v reflect.Value, writer *multipart.Writer) error { - return fmt.Errorf("unknown type received at primitive encoder: %s", t.String()) - } - } -} - -func arrayKeyEncoder(arrayFmt string) func(string, int) string { - var keyFn func(string, int) string - switch arrayFmt { - case "comma", "repeat": - keyFn = func(k string, _ int) string { return k } - case "brackets": - keyFn = func(key string, _ int) string { return key + "[]" } - case "indices:dots": - keyFn = func(k string, i int) string { - if k == "" { - return strconv.Itoa(i) - } - return k + "." + strconv.Itoa(i) - } - case "indices:brackets": - keyFn = func(k string, i int) string { - if k == "" { - return strconv.Itoa(i) - } - return k + "[" + strconv.Itoa(i) + "]" - } - } - return keyFn -} - -func (e *encoder) newArrayTypeEncoder(t reflect.Type) encoderFunc { - itemEncoder := e.typeEncoder(t.Elem()) - keyFn := arrayKeyEncoder(e.arrayFmt) - return func(key string, v reflect.Value, writer *multipart.Writer) error { - if keyFn == nil { - return fmt.Errorf("apiform: unsupported array format") - } - for i := 0; i < v.Len(); i++ { - err := itemEncoder(keyFn(key, i), v.Index(i), writer) - if err != nil { - return err - } - } - return nil - } -} - -func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc { - if t.Implements(reflect.TypeOf((*param.Optional)(nil)).Elem()) { - return e.newRichFieldTypeEncoder(t) - } - - for i := 0; i < t.NumField(); i++ { - if t.Field(i).Type == paramUnionType && t.Field(i).Anonymous { - return e.newStructUnionTypeEncoder(t) - } - } - - encoderFields := []encoderField{} - extraEncoder := (*encoderField)(nil) - - // This helper allows us to recursively collect field encoders into a flat - // array. The parameter `index` keeps track of the access patterns necessary - // to get to some field. - var collectEncoderFields func(r reflect.Type, index []int) - collectEncoderFields = func(r reflect.Type, index []int) { - for i := 0; i < r.NumField(); i++ { - idx := append(index, i) - field := t.FieldByIndex(idx) - if !field.IsExported() { - continue - } - // If this is an embedded struct, traverse one level deeper to extract - // the field and get their encoders as well. - if field.Anonymous { - collectEncoderFields(field.Type, idx) - continue - } - // If json tag is not present, then we skip, which is intentionally - // different behavior from the stdlib. - ptag, ok := parseFormStructTag(field) - if !ok { - continue - } - // We only want to support unexported field if they're tagged with - // `extras` because that field shouldn't be part of the public API. We - // also want to only keep the top level extras - if ptag.extras && len(index) == 0 { - extraEncoder = &encoderField{ptag, e.typeEncoder(field.Type.Elem()), idx} - continue - } - if ptag.name == "-" || ptag.name == "" { - continue - } - - dateFormat, ok := parseFormatStructTag(field) - oldFormat := e.dateFormat - if ok { - switch dateFormat { - case "date-time": - e.dateFormat = time.RFC3339 - case "date": - e.dateFormat = "2006-01-02" - } - } - - var encoderFn encoderFunc - if ptag.omitzero { - typeEncoderFn := e.typeEncoder(field.Type) - encoderFn = func(key string, value reflect.Value, writer *multipart.Writer) error { - if value.IsZero() { - return nil - } - return typeEncoderFn(key, value, writer) - } - } else { - encoderFn = e.typeEncoder(field.Type) - } - encoderFields = append(encoderFields, encoderField{ptag, encoderFn, idx}) - e.dateFormat = oldFormat - } - } - collectEncoderFields(t, []int{}) - - // Ensure deterministic output by sorting by lexicographic order - sort.Slice(encoderFields, func(i, j int) bool { - return encoderFields[i].tag.name < encoderFields[j].tag.name - }) - - return func(key string, value reflect.Value, writer *multipart.Writer) error { - if key != "" { - key = key + "." - } - - for _, ef := range encoderFields { - field := value.FieldByIndex(ef.idx) - err := ef.fn(key+ef.tag.name, field, writer) - if err != nil { - return err - } - } - - if extraEncoder != nil { - err := e.encodeMapEntries(key, value.FieldByIndex(extraEncoder.idx), writer) - if err != nil { - return err - } - } - - return nil - } -} - -var paramUnionType = reflect.TypeOf((*param.APIUnion)(nil)).Elem() - -func (e *encoder) newStructUnionTypeEncoder(t reflect.Type) encoderFunc { - var fieldEncoders []encoderFunc - for i := 0; i < t.NumField(); i++ { - field := t.Field(i) - if field.Type == paramUnionType && field.Anonymous { - fieldEncoders = append(fieldEncoders, nil) - continue - } - fieldEncoders = append(fieldEncoders, e.typeEncoder(field.Type)) - } - - return func(key string, value reflect.Value, writer *multipart.Writer) error { - for i := 0; i < t.NumField(); i++ { - if value.Field(i).Type() == paramUnionType { - continue - } - if !value.Field(i).IsZero() { - return fieldEncoders[i](key, value.Field(i), writer) - } - } - return fmt.Errorf("apiform: union %s has no field set", t.String()) - } -} - -func (e *encoder) newTimeTypeEncoder() encoderFunc { - format := e.dateFormat - return func(key string, value reflect.Value, writer *multipart.Writer) error { - return writer.WriteField(key, value.Convert(reflect.TypeOf(time.Time{})).Interface().(time.Time).Format(format)) - } -} - -func (e encoder) newInterfaceEncoder() encoderFunc { - return func(key string, value reflect.Value, writer *multipart.Writer) error { - value = value.Elem() - if !value.IsValid() { - return nil - } - return e.typeEncoder(value.Type())(key, value, writer) - } -} - -var quoteEscaper = strings.NewReplacer("\\", "\\\\", `"`, "\\\"") - -func escapeQuotes(s string) string { - return quoteEscaper.Replace(s) -} - -func (e *encoder) newReaderTypeEncoder() encoderFunc { - return func(key string, value reflect.Value, writer *multipart.Writer) error { - reader, ok := value.Convert(reflect.TypeOf((*io.Reader)(nil)).Elem()).Interface().(io.Reader) - if !ok { - return nil - } - filename := "anonymous_file" - contentType := "application/octet-stream" - if named, ok := reader.(interface{ Filename() string }); ok { - filename = named.Filename() - } else if named, ok := reader.(interface{ Name() string }); ok { - filename = path.Base(named.Name()) - } - if typed, ok := reader.(interface{ ContentType() string }); ok { - contentType = typed.ContentType() - } - - // Below is taken almost 1-for-1 from [multipart.CreateFormFile] - h := make(textproto.MIMEHeader) - h.Set("Content-Disposition", fmt.Sprintf(`form-data; name="%s"; filename="%s"`, escapeQuotes(key), escapeQuotes(filename))) - h.Set("Content-Type", contentType) - filewriter, err := writer.CreatePart(h) - if err != nil { - return err - } - _, err = io.Copy(filewriter, reader) - return err - } -} - -// Given a []byte of json (may either be an empty object or an object that already contains entries) -// encode all of the entries in the map to the json byte array. -func (e *encoder) encodeMapEntries(key string, v reflect.Value, writer *multipart.Writer) error { - type mapPair struct { - key string - value reflect.Value - } - - if key != "" { - key = key + "." - } - - pairs := []mapPair{} - - iter := v.MapRange() - for iter.Next() { - if iter.Key().Type().Kind() == reflect.String { - pairs = append(pairs, mapPair{key: iter.Key().String(), value: iter.Value()}) - } else { - return fmt.Errorf("cannot encode a map with a non string key") - } - } - - // Ensure deterministic output - sort.Slice(pairs, func(i, j int) bool { - return pairs[i].key < pairs[j].key - }) - - elementEncoder := e.typeEncoder(v.Type().Elem()) - for _, p := range pairs { - err := elementEncoder(key+string(p.key), p.value, writer) - if err != nil { - return err - } - } - - return nil -} - -func (e *encoder) newMapEncoder(_ reflect.Type) encoderFunc { - return func(key string, value reflect.Value, writer *multipart.Writer) error { - return e.encodeMapEntries(key, value, writer) - } -} - -func WriteExtras(writer *multipart.Writer, extras map[string]any) (err error) { - for k, v := range extras { - str, ok := v.(string) - if !ok { - break - } - err = writer.WriteField(k, str) - if err != nil { - break - } - } - return -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/form.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/form.go deleted file mode 100644 index 5445116e99316cec5e84775ff84d98cf6a0dec68..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/form.go +++ /dev/null @@ -1,5 +0,0 @@ -package apiform - -type Marshaler interface { - MarshalMultipart() ([]byte, string, error) -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/richparam.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/richparam.go deleted file mode 100644 index 644d8bfec30980968389ad0c5e8a7bdd2839ab5f..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/richparam.go +++ /dev/null @@ -1,20 +0,0 @@ -package apiform - -import ( - "github.com/anthropics/anthropic-sdk-go/packages/param" - "mime/multipart" - "reflect" -) - -func (e *encoder) newRichFieldTypeEncoder(t reflect.Type) encoderFunc { - f, _ := t.FieldByName("Value") - enc := e.newPrimitiveTypeEncoder(f.Type) - return func(key string, value reflect.Value, writer *multipart.Writer) error { - if opt, ok := value.Interface().(param.Optional); ok && opt.Valid() { - return enc(key, value.FieldByIndex(f.Index), writer) - } else if ok && param.IsNull(opt) { - return writer.WriteField(key, "null") - } - return nil - } -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/tag.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/tag.go deleted file mode 100644 index 736fc1ea656872b813c25868e85c702195516366..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiform/tag.go +++ /dev/null @@ -1,51 +0,0 @@ -package apiform - -import ( - "reflect" - "strings" -) - -const jsonStructTag = "json" -const formStructTag = "form" -const formatStructTag = "format" - -type parsedStructTag struct { - name string - required bool - extras bool - metadata bool - omitzero bool -} - -func parseFormStructTag(field reflect.StructField) (tag parsedStructTag, ok bool) { - raw, ok := field.Tag.Lookup(formStructTag) - if !ok { - raw, ok = field.Tag.Lookup(jsonStructTag) - } - if !ok { - return - } - parts := strings.Split(raw, ",") - if len(parts) == 0 { - return tag, false - } - tag.name = parts[0] - for _, part := range parts[1:] { - switch part { - case "required": - tag.required = true - case "extras": - tag.extras = true - case "metadata": - tag.metadata = true - case "omitzero": - tag.omitzero = true - } - } - return -} - -func parseFormatStructTag(field reflect.StructField) (format string, ok bool) { - format, ok = field.Tag.Lookup(formatStructTag) - return -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/decoder.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/decoder.go deleted file mode 100644 index 5e57b5020e6d78c3ded8ada72ff968138c7a8f13..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/decoder.go +++ /dev/null @@ -1,691 +0,0 @@ -// The deserialization algorithm from apijson may be subject to improvements -// between minor versions, particularly with respect to calling [json.Unmarshal] -// into param unions. - -package apijson - -import ( - "encoding/json" - "fmt" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "reflect" - "strconv" - "sync" - "time" - "unsafe" - - "github.com/tidwall/gjson" -) - -// decoders is a synchronized map with roughly the following type: -// map[reflect.Type]decoderFunc -var decoders sync.Map - -// Unmarshal is similar to [encoding/json.Unmarshal] and parses the JSON-encoded -// data and stores it in the given pointer. -func Unmarshal(raw []byte, to any) error { - d := &decoderBuilder{dateFormat: time.RFC3339} - return d.unmarshal(raw, to) -} - -// UnmarshalRoot is like Unmarshal, but doesn't try to call MarshalJSON on the -// root element. Useful if a struct's UnmarshalJSON is overrode to use the -// behavior of this encoder versus the standard library. -func UnmarshalRoot(raw []byte, to any) error { - d := &decoderBuilder{dateFormat: time.RFC3339, root: true} - return d.unmarshal(raw, to) -} - -// decoderBuilder contains the 'compile-time' state of the decoder. -type decoderBuilder struct { - // Whether or not this is the first element and called by [UnmarshalRoot], see - // the documentation there to see why this is necessary. - root bool - // The dateFormat (a format string for [time.Format]) which is chosen by the - // last struct tag that was seen. - dateFormat string -} - -// decoderState contains the 'run-time' state of the decoder. -type decoderState struct { - strict bool - exactness exactness - validator *validationEntry -} - -// Exactness refers to how close to the type the result was if deserialization -// was successful. This is useful in deserializing unions, where you want to try -// each entry, first with strict, then with looser validation, without actually -// having to do a lot of redundant work by marshalling twice (or maybe even more -// times). -type exactness int8 - -const ( - // Some values had to fudged a bit, for example by converting a string to an - // int, or an enum with extra values. - loose exactness = iota - // There are some extra arguments, but other wise it matches the union. - extras - // Exactly right. - exact -) - -type decoderFunc func(node gjson.Result, value reflect.Value, state *decoderState) error - -type decoderField struct { - tag parsedStructTag - fn decoderFunc - idx []int - goname string -} - -type decoderEntry struct { - reflect.Type - dateFormat string - root bool -} - -func (d *decoderBuilder) unmarshal(raw []byte, to any) error { - value := reflect.ValueOf(to).Elem() - result := gjson.ParseBytes(raw) - if !value.IsValid() { - return fmt.Errorf("apijson: cannot marshal into invalid value") - } - return d.typeDecoder(value.Type())(result, value, &decoderState{strict: false, exactness: exact}) -} - -// unmarshalWithExactness is used for internal testing purposes. -func (d *decoderBuilder) unmarshalWithExactness(raw []byte, to any) (exactness, error) { - value := reflect.ValueOf(to).Elem() - result := gjson.ParseBytes(raw) - if !value.IsValid() { - return 0, fmt.Errorf("apijson: cannot marshal into invalid value") - } - state := decoderState{strict: false, exactness: exact} - err := d.typeDecoder(value.Type())(result, value, &state) - return state.exactness, err -} - -func (d *decoderBuilder) typeDecoder(t reflect.Type) decoderFunc { - entry := decoderEntry{ - Type: t, - dateFormat: d.dateFormat, - root: d.root, - } - - if fi, ok := decoders.Load(entry); ok { - return fi.(decoderFunc) - } - - // To deal with recursive types, populate the map with an - // indirect func before we build it. This type waits on the - // real func (f) to be ready and then calls it. This indirect - // func is only used for recursive types. - var ( - wg sync.WaitGroup - f decoderFunc - ) - wg.Add(1) - fi, loaded := decoders.LoadOrStore(entry, decoderFunc(func(node gjson.Result, v reflect.Value, state *decoderState) error { - wg.Wait() - return f(node, v, state) - })) - if loaded { - return fi.(decoderFunc) - } - - // Compute the real decoder and replace the indirect func with it. - f = d.newTypeDecoder(t) - wg.Done() - decoders.Store(entry, f) - return f -} - -// validatedTypeDecoder wraps the type decoder with a validator. This is helpful -// for ensuring that enum fields are correct. -func (d *decoderBuilder) validatedTypeDecoder(t reflect.Type, entry *validationEntry) decoderFunc { - dec := d.typeDecoder(t) - if entry == nil { - return dec - } - - // Thread the current validation entry through the decoder, - // but clean up in time for the next field. - return func(node gjson.Result, v reflect.Value, state *decoderState) error { - state.validator = entry - err := dec(node, v, state) - state.validator = nil - return err - } -} - -func indirectUnmarshalerDecoder(n gjson.Result, v reflect.Value, state *decoderState) error { - return v.Addr().Interface().(json.Unmarshaler).UnmarshalJSON([]byte(n.Raw)) -} - -func unmarshalerDecoder(n gjson.Result, v reflect.Value, state *decoderState) error { - if v.Kind() == reflect.Pointer && v.CanSet() { - v.Set(reflect.New(v.Type().Elem())) - } - return v.Interface().(json.Unmarshaler).UnmarshalJSON([]byte(n.Raw)) -} - -func (d *decoderBuilder) newTypeDecoder(t reflect.Type) decoderFunc { - if t.ConvertibleTo(reflect.TypeOf(time.Time{})) { - return d.newTimeTypeDecoder(t) - } - - if t.Implements(reflect.TypeOf((*param.Optional)(nil)).Elem()) { - return d.newOptTypeDecoder(t) - } - - if !d.root && t.Implements(reflect.TypeOf((*json.Unmarshaler)(nil)).Elem()) { - return unmarshalerDecoder - } - if !d.root && reflect.PointerTo(t).Implements(reflect.TypeOf((*json.Unmarshaler)(nil)).Elem()) { - if _, ok := unionVariants[t]; !ok { - return indirectUnmarshalerDecoder - } - } - d.root = false - - if _, ok := unionRegistry[t]; ok { - if isStructUnion(t) { - return d.newStructUnionDecoder(t) - } - return d.newUnionDecoder(t) - } - - switch t.Kind() { - case reflect.Pointer: - inner := t.Elem() - innerDecoder := d.typeDecoder(inner) - - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - if !v.IsValid() { - return fmt.Errorf("apijson: unexpected invalid reflection value %+#v", v) - } - - newValue := reflect.New(inner).Elem() - err := innerDecoder(n, newValue, state) - if err != nil { - return err - } - - v.Set(newValue.Addr()) - return nil - } - case reflect.Struct: - if isStructUnion(t) { - return d.newStructUnionDecoder(t) - } - return d.newStructTypeDecoder(t) - case reflect.Array: - fallthrough - case reflect.Slice: - return d.newArrayTypeDecoder(t) - case reflect.Map: - return d.newMapDecoder(t) - case reflect.Interface: - return func(node gjson.Result, value reflect.Value, state *decoderState) error { - if !value.IsValid() { - return fmt.Errorf("apijson: unexpected invalid value %+#v", value) - } - if node.Value() != nil && value.CanSet() { - value.Set(reflect.ValueOf(node.Value())) - } - return nil - } - default: - return d.newPrimitiveTypeDecoder(t) - } -} - -func (d *decoderBuilder) newMapDecoder(t reflect.Type) decoderFunc { - keyType := t.Key() - itemType := t.Elem() - itemDecoder := d.typeDecoder(itemType) - - return func(node gjson.Result, value reflect.Value, state *decoderState) (err error) { - mapValue := reflect.MakeMapWithSize(t, len(node.Map())) - - node.ForEach(func(key, value gjson.Result) bool { - // It's fine for us to just use `ValueOf` here because the key types will - // always be primitive types so we don't need to decode it using the standard pattern - keyValue := reflect.ValueOf(key.Value()) - if !keyValue.IsValid() { - if err == nil { - err = fmt.Errorf("apijson: received invalid key type %v", keyValue.String()) - } - return false - } - if keyValue.Type() != keyType { - if err == nil { - err = fmt.Errorf("apijson: expected key type %v but got %v", keyType, keyValue.Type()) - } - return false - } - - itemValue := reflect.New(itemType).Elem() - itemerr := itemDecoder(value, itemValue, state) - if itemerr != nil { - if err == nil { - err = itemerr - } - return false - } - - mapValue.SetMapIndex(keyValue, itemValue) - return true - }) - - if err != nil { - return err - } - value.Set(mapValue) - return nil - } -} - -func (d *decoderBuilder) newArrayTypeDecoder(t reflect.Type) decoderFunc { - itemDecoder := d.typeDecoder(t.Elem()) - - return func(node gjson.Result, value reflect.Value, state *decoderState) (err error) { - if !node.IsArray() { - return fmt.Errorf("apijson: could not deserialize to an array") - } - - arrayNode := node.Array() - - arrayValue := reflect.MakeSlice(reflect.SliceOf(t.Elem()), len(arrayNode), len(arrayNode)) - for i, itemNode := range arrayNode { - err = itemDecoder(itemNode, arrayValue.Index(i), state) - if err != nil { - return err - } - } - - value.Set(arrayValue) - return nil - } -} - -func (d *decoderBuilder) newStructTypeDecoder(t reflect.Type) decoderFunc { - // map of json field name to struct field decoders - decoderFields := map[string]decoderField{} - anonymousDecoders := []decoderField{} - extraDecoder := (*decoderField)(nil) - var inlineDecoders []decoderField - - validationEntries := validationRegistry[t] - - for i := 0; i < t.NumField(); i++ { - idx := []int{i} - field := t.FieldByIndex(idx) - if !field.IsExported() { - continue - } - - var validator *validationEntry - for _, entry := range validationEntries { - if entry.field.Offset == field.Offset { - validator = &entry - break - } - } - - // If this is an embedded struct, traverse one level deeper to extract - // the fields and get their encoders as well. - if field.Anonymous { - anonymousDecoders = append(anonymousDecoders, decoderField{ - fn: d.typeDecoder(field.Type), - idx: idx[:], - }) - continue - } - // If json tag is not present, then we skip, which is intentionally - // different behavior from the stdlib. - ptag, ok := parseJSONStructTag(field) - if !ok { - continue - } - // We only want to support unexported fields if they're tagged with - // `extras` because that field shouldn't be part of the public API. - if ptag.extras { - extraDecoder = &decoderField{ptag, d.typeDecoder(field.Type.Elem()), idx, field.Name} - continue - } - if ptag.inline { - df := decoderField{ptag, d.typeDecoder(field.Type), idx, field.Name} - inlineDecoders = append(inlineDecoders, df) - continue - } - if ptag.metadata { - continue - } - - oldFormat := d.dateFormat - dateFormat, ok := parseFormatStructTag(field) - if ok { - switch dateFormat { - case "date-time": - d.dateFormat = time.RFC3339 - case "date": - d.dateFormat = "2006-01-02" - } - } - - decoderFields[ptag.name] = decoderField{ - ptag, - d.validatedTypeDecoder(field.Type, validator), - idx, field.Name, - } - - d.dateFormat = oldFormat - } - - return func(node gjson.Result, value reflect.Value, state *decoderState) (err error) { - if field := value.FieldByName("JSON"); field.IsValid() { - if raw := field.FieldByName("raw"); raw.IsValid() { - setUnexportedField(raw, node.Raw) - } - } - - for _, decoder := range anonymousDecoders { - // ignore errors - decoder.fn(node, value.FieldByIndex(decoder.idx), state) - } - - for _, inlineDecoder := range inlineDecoders { - var meta Field - dest := value.FieldByIndex(inlineDecoder.idx) - isValid := false - if dest.IsValid() && node.Type != gjson.Null { - inlineState := decoderState{exactness: state.exactness, strict: true} - err = inlineDecoder.fn(node, dest, &inlineState) - if err == nil { - isValid = true - } - } - - if node.Type == gjson.Null { - meta = Field{ - raw: node.Raw, - status: null, - } - } else if !isValid { - // If an inline decoder fails, unset the field and move on. - if dest.IsValid() { - dest.SetZero() - } - continue - } else if isValid { - meta = Field{ - raw: node.Raw, - status: valid, - } - } - setMetadataSubField(value, inlineDecoder.idx, inlineDecoder.goname, meta) - } - - typedExtraType := reflect.Type(nil) - typedExtraFields := reflect.Value{} - if extraDecoder != nil { - typedExtraType = value.FieldByIndex(extraDecoder.idx).Type() - typedExtraFields = reflect.MakeMap(typedExtraType) - } - untypedExtraFields := map[string]Field{} - - for fieldName, itemNode := range node.Map() { - df, explicit := decoderFields[fieldName] - var ( - dest reflect.Value - fn decoderFunc - meta Field - ) - if explicit { - fn = df.fn - dest = value.FieldByIndex(df.idx) - } - if !explicit && extraDecoder != nil { - dest = reflect.New(typedExtraType.Elem()).Elem() - fn = extraDecoder.fn - } - - isValid := false - if dest.IsValid() && itemNode.Type != gjson.Null { - err = fn(itemNode, dest, state) - if err == nil { - isValid = true - } - } - - // Handle null [param.Opt] - if itemNode.Type == gjson.Null && dest.IsValid() && dest.Type().Implements(reflect.TypeOf((*param.Optional)(nil)).Elem()) { - dest.Addr().Interface().(json.Unmarshaler).UnmarshalJSON([]byte(itemNode.Raw)) - continue - } - - if itemNode.Type == gjson.Null { - meta = Field{ - raw: itemNode.Raw, - status: null, - } - } else if !isValid { - meta = Field{ - raw: itemNode.Raw, - status: invalid, - } - } else if isValid { - meta = Field{ - raw: itemNode.Raw, - status: valid, - } - } - - if explicit { - setMetadataSubField(value, df.idx, df.goname, meta) - } - if !explicit { - untypedExtraFields[fieldName] = meta - } - if !explicit && extraDecoder != nil { - typedExtraFields.SetMapIndex(reflect.ValueOf(fieldName), dest) - } - } - - if extraDecoder != nil && typedExtraFields.Len() > 0 { - value.FieldByIndex(extraDecoder.idx).Set(typedExtraFields) - } - - // Set exactness to 'extras' if there are untyped, extra fields. - if len(untypedExtraFields) > 0 && state.exactness > extras { - state.exactness = extras - } - - if len(untypedExtraFields) > 0 { - setMetadataExtraFields(value, []int{-1}, "ExtraFields", untypedExtraFields) - } - return nil - } -} - -func (d *decoderBuilder) newPrimitiveTypeDecoder(t reflect.Type) decoderFunc { - switch t.Kind() { - case reflect.String: - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - v.SetString(n.String()) - if guardStrict(state, n.Type != gjson.String) { - return fmt.Errorf("apijson: failed to parse string strictly") - } - // Everything that is not an object can be loosely stringified. - if n.Type == gjson.JSON { - return fmt.Errorf("apijson: failed to parse string") - } - - state.validateString(v) - - if guardUnknown(state, v) { - return fmt.Errorf("apijson: failed string enum validation") - } - return nil - } - case reflect.Bool: - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - v.SetBool(n.Bool()) - if guardStrict(state, n.Type != gjson.True && n.Type != gjson.False) { - return fmt.Errorf("apijson: failed to parse bool strictly") - } - // Numbers and strings that are either 'true' or 'false' can be loosely - // deserialized as bool. - if n.Type == gjson.String && (n.Raw != "true" && n.Raw != "false") || n.Type == gjson.JSON { - return fmt.Errorf("apijson: failed to parse bool") - } - - state.validateBool(v) - - if guardUnknown(state, v) { - return fmt.Errorf("apijson: failed bool enum validation") - } - return nil - } - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - v.SetInt(n.Int()) - if guardStrict(state, n.Type != gjson.Number || n.Num != float64(int(n.Num))) { - return fmt.Errorf("apijson: failed to parse int strictly") - } - // Numbers, booleans, and strings that maybe look like numbers can be - // loosely deserialized as numbers. - if n.Type == gjson.JSON || (n.Type == gjson.String && !canParseAsNumber(n.Str)) { - return fmt.Errorf("apijson: failed to parse int") - } - - state.validateInt(v) - - if guardUnknown(state, v) { - return fmt.Errorf("apijson: failed int enum validation") - } - return nil - } - case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - v.SetUint(n.Uint()) - if guardStrict(state, n.Type != gjson.Number || n.Num != float64(int(n.Num)) || n.Num < 0) { - return fmt.Errorf("apijson: failed to parse uint strictly") - } - // Numbers, booleans, and strings that maybe look like numbers can be - // loosely deserialized as uint. - if n.Type == gjson.JSON || (n.Type == gjson.String && !canParseAsNumber(n.Str)) { - return fmt.Errorf("apijson: failed to parse uint") - } - if guardUnknown(state, v) { - return fmt.Errorf("apijson: failed uint enum validation") - } - return nil - } - case reflect.Float32, reflect.Float64: - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - v.SetFloat(n.Float()) - if guardStrict(state, n.Type != gjson.Number) { - return fmt.Errorf("apijson: failed to parse float strictly") - } - // Numbers, booleans, and strings that maybe look like numbers can be - // loosely deserialized as floats. - if n.Type == gjson.JSON || (n.Type == gjson.String && !canParseAsNumber(n.Str)) { - return fmt.Errorf("apijson: failed to parse float") - } - if guardUnknown(state, v) { - return fmt.Errorf("apijson: failed float enum validation") - } - return nil - } - default: - return func(node gjson.Result, v reflect.Value, state *decoderState) error { - return fmt.Errorf("unknown type received at primitive decoder: %s", t.String()) - } - } -} - -func (d *decoderBuilder) newOptTypeDecoder(t reflect.Type) decoderFunc { - for t.Kind() == reflect.Pointer { - t = t.Elem() - } - valueField, _ := t.FieldByName("Value") - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - state.validateOptKind(n, valueField.Type) - return v.Addr().Interface().(json.Unmarshaler).UnmarshalJSON([]byte(n.Raw)) - } -} - -func (d *decoderBuilder) newTimeTypeDecoder(t reflect.Type) decoderFunc { - format := d.dateFormat - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - parsed, err := time.Parse(format, n.Str) - if err == nil { - v.Set(reflect.ValueOf(parsed).Convert(t)) - return nil - } - - if guardStrict(state, true) { - return err - } - - layouts := []string{ - "2006-01-02", - "2006-01-02T15:04:05Z07:00", - "2006-01-02T15:04:05Z0700", - "2006-01-02T15:04:05", - "2006-01-02 15:04:05Z07:00", - "2006-01-02 15:04:05Z0700", - "2006-01-02 15:04:05", - } - - for _, layout := range layouts { - parsed, err := time.Parse(layout, n.Str) - if err == nil { - v.Set(reflect.ValueOf(parsed).Convert(t)) - return nil - } - } - - return fmt.Errorf("unable to leniently parse date-time string: %s", n.Str) - } -} - -func setUnexportedField(field reflect.Value, value any) { - reflect.NewAt(field.Type(), unsafe.Pointer(field.UnsafeAddr())).Elem().Set(reflect.ValueOf(value)) -} - -func guardStrict(state *decoderState, cond bool) bool { - if !cond { - return false - } - - if state.strict { - return true - } - - state.exactness = loose - return false -} - -func canParseAsNumber(str string) bool { - _, err := strconv.ParseFloat(str, 64) - return err == nil -} - -var stringType = reflect.TypeOf(string("")) - -func guardUnknown(state *decoderState, v reflect.Value) bool { - if have, ok := v.Interface().(interface{ IsKnown() bool }); guardStrict(state, ok && !have.IsKnown()) { - return true - } - - constantString, ok := v.Interface().(interface{ Default() string }) - named := v.Type() != stringType - if guardStrict(state, ok && named && v.Equal(reflect.ValueOf(constantString.Default()))) { - return true - } - return false -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/encoder.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/encoder.go deleted file mode 100644 index 8358a2f0a5166d084472069049349dcc92bccb71..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/encoder.go +++ /dev/null @@ -1,392 +0,0 @@ -package apijson - -import ( - "bytes" - "encoding/json" - "fmt" - "reflect" - "sort" - "strconv" - "strings" - "sync" - "time" - - "github.com/tidwall/sjson" -) - -var encoders sync.Map // map[encoderEntry]encoderFunc - -func Marshal(value any) ([]byte, error) { - e := &encoder{dateFormat: time.RFC3339} - return e.marshal(value) -} - -func MarshalRoot(value any) ([]byte, error) { - e := &encoder{root: true, dateFormat: time.RFC3339} - return e.marshal(value) -} - -type encoder struct { - dateFormat string - root bool -} - -type encoderFunc func(value reflect.Value) ([]byte, error) - -type encoderField struct { - tag parsedStructTag - fn encoderFunc - idx []int -} - -type encoderEntry struct { - reflect.Type - dateFormat string - root bool -} - -func (e *encoder) marshal(value any) ([]byte, error) { - val := reflect.ValueOf(value) - if !val.IsValid() { - return nil, nil - } - typ := val.Type() - enc := e.typeEncoder(typ) - return enc(val) -} - -func (e *encoder) typeEncoder(t reflect.Type) encoderFunc { - entry := encoderEntry{ - Type: t, - dateFormat: e.dateFormat, - root: e.root, - } - - if fi, ok := encoders.Load(entry); ok { - return fi.(encoderFunc) - } - - // To deal with recursive types, populate the map with an - // indirect func before we build it. This type waits on the - // real func (f) to be ready and then calls it. This indirect - // func is only used for recursive types. - var ( - wg sync.WaitGroup - f encoderFunc - ) - wg.Add(1) - fi, loaded := encoders.LoadOrStore(entry, encoderFunc(func(v reflect.Value) ([]byte, error) { - wg.Wait() - return f(v) - })) - if loaded { - return fi.(encoderFunc) - } - - // Compute the real encoder and replace the indirect func with it. - f = e.newTypeEncoder(t) - wg.Done() - encoders.Store(entry, f) - return f -} - -func marshalerEncoder(v reflect.Value) ([]byte, error) { - return v.Interface().(json.Marshaler).MarshalJSON() -} - -func indirectMarshalerEncoder(v reflect.Value) ([]byte, error) { - return v.Addr().Interface().(json.Marshaler).MarshalJSON() -} - -func (e *encoder) newTypeEncoder(t reflect.Type) encoderFunc { - if t.ConvertibleTo(reflect.TypeOf(time.Time{})) { - return e.newTimeTypeEncoder() - } - if !e.root && t.Implements(reflect.TypeOf((*json.Marshaler)(nil)).Elem()) { - return marshalerEncoder - } - if !e.root && reflect.PointerTo(t).Implements(reflect.TypeOf((*json.Marshaler)(nil)).Elem()) { - return indirectMarshalerEncoder - } - e.root = false - switch t.Kind() { - case reflect.Pointer: - inner := t.Elem() - - innerEncoder := e.typeEncoder(inner) - return func(v reflect.Value) ([]byte, error) { - if !v.IsValid() || v.IsNil() { - return nil, nil - } - return innerEncoder(v.Elem()) - } - case reflect.Struct: - return e.newStructTypeEncoder(t) - case reflect.Array: - fallthrough - case reflect.Slice: - return e.newArrayTypeEncoder(t) - case reflect.Map: - return e.newMapEncoder(t) - case reflect.Interface: - return e.newInterfaceEncoder() - default: - return e.newPrimitiveTypeEncoder(t) - } -} - -func (e *encoder) newPrimitiveTypeEncoder(t reflect.Type) encoderFunc { - switch t.Kind() { - // Note that we could use `gjson` to encode these types but it would complicate our - // code more and this current code shouldn't cause any issues - case reflect.String: - return func(v reflect.Value) ([]byte, error) { - return json.Marshal(v.Interface()) - } - case reflect.Bool: - return func(v reflect.Value) ([]byte, error) { - if v.Bool() { - return []byte("true"), nil - } - return []byte("false"), nil - } - case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64: - return func(v reflect.Value) ([]byte, error) { - return []byte(strconv.FormatInt(v.Int(), 10)), nil - } - case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64: - return func(v reflect.Value) ([]byte, error) { - return []byte(strconv.FormatUint(v.Uint(), 10)), nil - } - case reflect.Float32: - return func(v reflect.Value) ([]byte, error) { - return []byte(strconv.FormatFloat(v.Float(), 'f', -1, 32)), nil - } - case reflect.Float64: - return func(v reflect.Value) ([]byte, error) { - return []byte(strconv.FormatFloat(v.Float(), 'f', -1, 64)), nil - } - default: - return func(v reflect.Value) ([]byte, error) { - return nil, fmt.Errorf("unknown type received at primitive encoder: %s", t.String()) - } - } -} - -func (e *encoder) newArrayTypeEncoder(t reflect.Type) encoderFunc { - itemEncoder := e.typeEncoder(t.Elem()) - - return func(value reflect.Value) ([]byte, error) { - json := []byte("[]") - for i := 0; i < value.Len(); i++ { - var value, err = itemEncoder(value.Index(i)) - if err != nil { - return nil, err - } - if value == nil { - // Assume that empty items should be inserted as `null` so that the output array - // will be the same length as the input array - value = []byte("null") - } - - json, err = sjson.SetRawBytes(json, "-1", value) - if err != nil { - return nil, err - } - } - - return json, nil - } -} - -func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc { - encoderFields := []encoderField{} - extraEncoder := (*encoderField)(nil) - - // This helper allows us to recursively collect field encoders into a flat - // array. The parameter `index` keeps track of the access patterns necessary - // to get to some field. - var collectEncoderFields func(r reflect.Type, index []int) - collectEncoderFields = func(r reflect.Type, index []int) { - for i := 0; i < r.NumField(); i++ { - idx := append(index, i) - field := t.FieldByIndex(idx) - if !field.IsExported() { - continue - } - // If this is an embedded struct, traverse one level deeper to extract - // the field and get their encoders as well. - if field.Anonymous { - collectEncoderFields(field.Type, idx) - continue - } - // If json tag is not present, then we skip, which is intentionally - // different behavior from the stdlib. - ptag, ok := parseJSONStructTag(field) - if !ok { - continue - } - // We only want to support unexported field if they're tagged with - // `extras` because that field shouldn't be part of the public API. We - // also want to only keep the top level extras - if ptag.extras && len(index) == 0 { - extraEncoder = &encoderField{ptag, e.typeEncoder(field.Type.Elem()), idx} - continue - } - if ptag.name == "-" { - continue - } - - dateFormat, ok := parseFormatStructTag(field) - oldFormat := e.dateFormat - if ok { - switch dateFormat { - case "date-time": - e.dateFormat = time.RFC3339 - case "date": - e.dateFormat = "2006-01-02" - } - } - encoderFields = append(encoderFields, encoderField{ptag, e.typeEncoder(field.Type), idx}) - e.dateFormat = oldFormat - } - } - collectEncoderFields(t, []int{}) - - // Ensure deterministic output by sorting by lexicographic order - sort.Slice(encoderFields, func(i, j int) bool { - return encoderFields[i].tag.name < encoderFields[j].tag.name - }) - - return func(value reflect.Value) (json []byte, err error) { - json = []byte("{}") - - for _, ef := range encoderFields { - field := value.FieldByIndex(ef.idx) - encoded, err := ef.fn(field) - if err != nil { - return nil, err - } - if encoded == nil { - continue - } - json, err = sjson.SetRawBytes(json, ef.tag.name, encoded) - if err != nil { - return nil, err - } - } - - if extraEncoder != nil { - json, err = e.encodeMapEntries(json, value.FieldByIndex(extraEncoder.idx)) - if err != nil { - return nil, err - } - } - return - } -} - -func (e *encoder) newFieldTypeEncoder(t reflect.Type) encoderFunc { - f, _ := t.FieldByName("Value") - enc := e.typeEncoder(f.Type) - - return func(value reflect.Value) (json []byte, err error) { - present := value.FieldByName("Present") - if !present.Bool() { - return nil, nil - } - null := value.FieldByName("Null") - if null.Bool() { - return []byte("null"), nil - } - raw := value.FieldByName("Raw") - if !raw.IsNil() { - return e.typeEncoder(raw.Type())(raw) - } - return enc(value.FieldByName("Value")) - } -} - -func (e *encoder) newTimeTypeEncoder() encoderFunc { - format := e.dateFormat - return func(value reflect.Value) (json []byte, err error) { - return []byte(`"` + value.Convert(reflect.TypeOf(time.Time{})).Interface().(time.Time).Format(format) + `"`), nil - } -} - -func (e encoder) newInterfaceEncoder() encoderFunc { - return func(value reflect.Value) ([]byte, error) { - value = value.Elem() - if !value.IsValid() { - return nil, nil - } - return e.typeEncoder(value.Type())(value) - } -} - -// Given a []byte of json (may either be an empty object or an object that already contains entries) -// encode all of the entries in the map to the json byte array. -func (e *encoder) encodeMapEntries(json []byte, v reflect.Value) ([]byte, error) { - type mapPair struct { - key []byte - value reflect.Value - } - - pairs := []mapPair{} - keyEncoder := e.typeEncoder(v.Type().Key()) - - iter := v.MapRange() - for iter.Next() { - var encodedKeyString string - if iter.Key().Type().Kind() == reflect.String { - encodedKeyString = iter.Key().String() - } else { - var err error - encodedKeyBytes, err := keyEncoder(iter.Key()) - if err != nil { - return nil, err - } - encodedKeyString = string(encodedKeyBytes) - } - encodedKey := []byte(sjsonReplacer.Replace(encodedKeyString)) - pairs = append(pairs, mapPair{key: encodedKey, value: iter.Value()}) - } - - // Ensure deterministic output - sort.Slice(pairs, func(i, j int) bool { - return bytes.Compare(pairs[i].key, pairs[j].key) < 0 - }) - - elementEncoder := e.typeEncoder(v.Type().Elem()) - for _, p := range pairs { - encodedValue, err := elementEncoder(p.value) - if err != nil { - return nil, err - } - if len(encodedValue) == 0 { - continue - } - json, err = sjson.SetRawBytes(json, string(p.key), encodedValue) - if err != nil { - return nil, err - } - } - - return json, nil -} - -func (e *encoder) newMapEncoder(_ reflect.Type) encoderFunc { - return func(value reflect.Value) ([]byte, error) { - json := []byte("{}") - var err error - json, err = e.encodeMapEntries(json, value) - if err != nil { - return nil, err - } - return json, nil - } -} - -// If we want to set a literal key value into JSON using sjson, we need to make sure it doesn't have -// special characters that sjson interprets as a path. -var sjsonReplacer *strings.Replacer = strings.NewReplacer(".", "\\.", ":", "\\:", "*", "\\*") diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/enum.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/enum.go deleted file mode 100644 index 18b218a8e7f2f17365140bd90c4189e7a9bdd8e3..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/enum.go +++ /dev/null @@ -1,145 +0,0 @@ -package apijson - -import ( - "fmt" - "reflect" - "slices" - "sync" - - "github.com/tidwall/gjson" -) - -/********************/ -/* Validating Enums */ -/********************/ - -type validationEntry struct { - field reflect.StructField - required bool - legalValues struct { - strings []string - // 1 represents true, 0 represents false, -1 represents either - bools int - ints []int64 - } -} - -type validatorFunc func(reflect.Value) exactness - -var validators sync.Map -var validationRegistry = map[reflect.Type][]validationEntry{} - -func RegisterFieldValidator[T any, V string | bool | int](fieldName string, values ...V) { - var t T - parentType := reflect.TypeOf(t) - - if _, ok := validationRegistry[parentType]; !ok { - validationRegistry[parentType] = []validationEntry{} - } - - // The following checks run at initialization time, - // it is impossible for them to panic if any tests pass. - if parentType.Kind() != reflect.Struct { - panic(fmt.Sprintf("apijson: cannot initialize validator for non-struct %s", parentType.String())) - } - - var field reflect.StructField - found := false - for i := 0; i < parentType.NumField(); i++ { - ptag, ok := parseJSONStructTag(parentType.Field(i)) - if ok && ptag.name == fieldName { - field = parentType.Field(i) - found = true - break - } - } - - if !found { - panic(fmt.Sprintf("apijson: cannot find field %s in struct %s", fieldName, parentType.String())) - } - - newEntry := validationEntry{field: field} - newEntry.legalValues.bools = -1 // default to either - - switch values := any(values).(type) { - case []string: - newEntry.legalValues.strings = values - case []int: - newEntry.legalValues.ints = make([]int64, len(values)) - for i, value := range values { - newEntry.legalValues.ints[i] = int64(value) - } - case []bool: - for i, value := range values { - var next int - if value { - next = 1 - } - if i > 0 && newEntry.legalValues.bools != next { - newEntry.legalValues.bools = -1 // accept either - break - } - newEntry.legalValues.bools = next - } - } - - // Store the information necessary to create a validator, so that we can use it - // lazily create the validator function when did. - validationRegistry[parentType] = append(validationRegistry[parentType], newEntry) -} - -func (state *decoderState) validateString(v reflect.Value) { - if state.validator == nil { - return - } - if !slices.Contains(state.validator.legalValues.strings, v.String()) { - state.exactness = loose - } -} - -func (state *decoderState) validateInt(v reflect.Value) { - if state.validator == nil { - return - } - if !slices.Contains(state.validator.legalValues.ints, v.Int()) { - state.exactness = loose - } -} - -func (state *decoderState) validateBool(v reflect.Value) { - if state.validator == nil { - return - } - b := v.Bool() - if state.validator.legalValues.bools == 1 && b == false { - state.exactness = loose - } else if state.validator.legalValues.bools == 0 && b == true { - state.exactness = loose - } -} - -func (state *decoderState) validateOptKind(node gjson.Result, t reflect.Type) { - switch node.Type { - case gjson.JSON: - state.exactness = loose - case gjson.Null: - return - case gjson.False, gjson.True: - if t.Kind() != reflect.Bool { - state.exactness = loose - } - case gjson.Number: - switch t.Kind() { - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, - reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, - reflect.Float32, reflect.Float64: - return - default: - state.exactness = loose - } - case gjson.String: - if t.Kind() != reflect.String { - state.exactness = loose - } - } -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/field.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/field.go deleted file mode 100644 index 854d6dd78d77caec97b8dca68f50a48f4561bc5e..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/field.go +++ /dev/null @@ -1,23 +0,0 @@ -package apijson - -type status uint8 - -const ( - missing status = iota - null - invalid - valid -) - -type Field struct { - raw string - status status -} - -// Returns true if the field is explicitly `null` _or_ if it is not present at all (ie, missing). -// To check if the field's key is present in the JSON with an explicit null value, -// you must check `f.IsNull() && !f.IsMissing()`. -func (j Field) IsNull() bool { return j.status <= null } -func (j Field) IsMissing() bool { return j.status == missing } -func (j Field) IsInvalid() bool { return j.status == invalid } -func (j Field) Raw() string { return j.raw } diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/port.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/port.go deleted file mode 100644 index b40013c13ad1a79a30fc2fc191a7361b2071eaaa..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/port.go +++ /dev/null @@ -1,120 +0,0 @@ -package apijson - -import ( - "fmt" - "reflect" -) - -// Port copies over values from one struct to another struct. -func Port(from any, to any) error { - toVal := reflect.ValueOf(to) - fromVal := reflect.ValueOf(from) - - if toVal.Kind() != reflect.Ptr || toVal.IsNil() { - return fmt.Errorf("destination must be a non-nil pointer") - } - - for toVal.Kind() == reflect.Ptr { - toVal = toVal.Elem() - } - toType := toVal.Type() - - for fromVal.Kind() == reflect.Ptr { - fromVal = fromVal.Elem() - } - fromType := fromVal.Type() - - if toType.Kind() != reflect.Struct { - return fmt.Errorf("destination must be a non-nil pointer to a struct (%v %v)", toType, toType.Kind()) - } - - values := map[string]reflect.Value{} - fields := map[string]reflect.Value{} - - fromJSON := fromVal.FieldByName("JSON") - toJSON := toVal.FieldByName("JSON") - - // Iterate through the fields of v and load all the "normal" fields in the struct to the map of - // string to reflect.Value, as well as their raw .JSON.Foo counterpart indicated by j. - var getFields func(t reflect.Type, v reflect.Value) - getFields = func(t reflect.Type, v reflect.Value) { - j := v.FieldByName("JSON") - - // Recurse into anonymous fields first, since the fields on the object should win over the fields in the - // embedded object. - for i := 0; i < t.NumField(); i++ { - field := t.Field(i) - if field.Anonymous { - getFields(field.Type, v.Field(i)) - continue - } - } - - for i := 0; i < t.NumField(); i++ { - field := t.Field(i) - ptag, ok := parseJSONStructTag(field) - if !ok || ptag.name == "-" || ptag.name == "" { - continue - } - values[ptag.name] = v.Field(i) - if j.IsValid() { - fields[ptag.name] = j.FieldByName(field.Name) - } - } - } - getFields(fromType, fromVal) - - // Use the values from the previous step to populate the 'to' struct. - for i := 0; i < toType.NumField(); i++ { - field := toType.Field(i) - ptag, ok := parseJSONStructTag(field) - if !ok { - continue - } - if ptag.name == "-" { - continue - } - if value, ok := values[ptag.name]; ok { - delete(values, ptag.name) - if field.Type.Kind() == reflect.Interface { - toVal.Field(i).Set(value) - } else { - switch value.Kind() { - case reflect.String: - toVal.Field(i).SetString(value.String()) - case reflect.Bool: - toVal.Field(i).SetBool(value.Bool()) - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - toVal.Field(i).SetInt(value.Int()) - case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64: - toVal.Field(i).SetUint(value.Uint()) - case reflect.Float32, reflect.Float64: - toVal.Field(i).SetFloat(value.Float()) - default: - toVal.Field(i).Set(value) - } - } - } - - if fromJSONField, ok := fields[ptag.name]; ok { - if toJSONField := toJSON.FieldByName(field.Name); toJSONField.IsValid() { - toJSONField.Set(fromJSONField) - } - } - } - - // Finally, copy over the .JSON.raw and .JSON.ExtraFields - if toJSON.IsValid() { - if raw := toJSON.FieldByName("raw"); raw.IsValid() { - setUnexportedField(raw, fromJSON.Interface().(interface{ RawJSON() string }).RawJSON()) - } - - if toExtraFields := toJSON.FieldByName("ExtraFields"); toExtraFields.IsValid() { - if fromExtraFields := fromJSON.FieldByName("ExtraFields"); fromExtraFields.IsValid() { - setUnexportedField(toExtraFields, fromExtraFields.Interface()) - } - } - } - - return nil -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/registry.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/registry.go deleted file mode 100644 index 2a24982700894861fa84a7cbe40b23d34085af4d..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/registry.go +++ /dev/null @@ -1,51 +0,0 @@ -package apijson - -import ( - "reflect" - - "github.com/tidwall/gjson" -) - -type UnionVariant struct { - TypeFilter gjson.Type - DiscriminatorValue any - Type reflect.Type -} - -var unionRegistry = map[reflect.Type]unionEntry{} -var unionVariants = map[reflect.Type]any{} - -type unionEntry struct { - discriminatorKey string - variants []UnionVariant -} - -func Discriminator[T any](value any) UnionVariant { - var zero T - return UnionVariant{ - TypeFilter: gjson.JSON, - DiscriminatorValue: value, - Type: reflect.TypeOf(zero), - } -} - -func RegisterUnion[T any](discriminator string, variants ...UnionVariant) { - typ := reflect.TypeOf((*T)(nil)).Elem() - unionRegistry[typ] = unionEntry{ - discriminatorKey: discriminator, - variants: variants, - } - for _, variant := range variants { - unionVariants[variant.Type] = typ - } -} - -// Useful to wrap a union type to force it to use [apijson.UnmarshalJSON] since you cannot define an -// UnmarshalJSON function on the interface itself. -type UnionUnmarshaler[T any] struct { - Value T -} - -func (c *UnionUnmarshaler[T]) UnmarshalJSON(buf []byte) error { - return UnmarshalRoot(buf, &c.Value) -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/subfield.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/subfield.go deleted file mode 100644 index 34fe701a85988207931ff793da9ba79b73e58f78..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/subfield.go +++ /dev/null @@ -1,67 +0,0 @@ -package apijson - -import ( - "github.com/anthropics/anthropic-sdk-go/packages/respjson" - "reflect" -) - -func getSubField(root reflect.Value, index []int, name string) reflect.Value { - strct := root.FieldByIndex(index[:len(index)-1]) - if !strct.IsValid() { - panic("couldn't find encapsulating struct for field " + name) - } - meta := strct.FieldByName("JSON") - if !meta.IsValid() { - return reflect.Value{} - } - field := meta.FieldByName(name) - if !field.IsValid() { - return reflect.Value{} - } - return field -} - -func setMetadataSubField(root reflect.Value, index []int, name string, meta Field) { - target := getSubField(root, index, name) - if !target.IsValid() { - return - } - - if target.Type() == reflect.TypeOf(meta) { - target.Set(reflect.ValueOf(meta)) - } else if respMeta := meta.toRespField(); target.Type() == reflect.TypeOf(respMeta) { - target.Set(reflect.ValueOf(respMeta)) - } -} - -func setMetadataExtraFields(root reflect.Value, index []int, name string, metaExtras map[string]Field) { - target := getSubField(root, index, name) - if !target.IsValid() { - return - } - - if target.Type() == reflect.TypeOf(metaExtras) { - target.Set(reflect.ValueOf(metaExtras)) - return - } - - newMap := make(map[string]respjson.Field, len(metaExtras)) - if target.Type() == reflect.TypeOf(newMap) { - for k, v := range metaExtras { - newMap[k] = v.toRespField() - } - target.Set(reflect.ValueOf(newMap)) - } -} - -func (f Field) toRespField() respjson.Field { - if f.IsMissing() { - return respjson.Field{} - } else if f.IsNull() { - return respjson.NewField("null") - } else if f.IsInvalid() { - return respjson.NewInvalidField(f.raw) - } else { - return respjson.NewField(f.raw) - } -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/tag.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/tag.go deleted file mode 100644 index 812fb3caf437fa0765fcca77f53dd40e0ae4189e..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/tag.go +++ /dev/null @@ -1,47 +0,0 @@ -package apijson - -import ( - "reflect" - "strings" -) - -const jsonStructTag = "json" -const formatStructTag = "format" - -type parsedStructTag struct { - name string - required bool - extras bool - metadata bool - inline bool -} - -func parseJSONStructTag(field reflect.StructField) (tag parsedStructTag, ok bool) { - raw, ok := field.Tag.Lookup(jsonStructTag) - if !ok { - return - } - parts := strings.Split(raw, ",") - if len(parts) == 0 { - return tag, false - } - tag.name = parts[0] - for _, part := range parts[1:] { - switch part { - case "required": - tag.required = true - case "extras": - tag.extras = true - case "metadata": - tag.metadata = true - case "inline": - tag.inline = true - } - } - return -} - -func parseFormatStructTag(field reflect.StructField) (format string, ok bool) { - format, ok = field.Tag.Lookup(formatStructTag) - return -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/union.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/union.go deleted file mode 100644 index 4b9bda9c100e726e7e32fe176674b4d3cb83bb2b..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apijson/union.go +++ /dev/null @@ -1,202 +0,0 @@ -package apijson - -import ( - "errors" - "github.com/anthropics/anthropic-sdk-go/packages/param" - "reflect" - - "github.com/tidwall/gjson" -) - -var apiUnionType = reflect.TypeOf(param.APIUnion{}) - -func isStructUnion(t reflect.Type) bool { - if t.Kind() != reflect.Struct { - return false - } - for i := 0; i < t.NumField(); i++ { - if t.Field(i).Type == apiUnionType && t.Field(i).Anonymous { - return true - } - } - return false -} - -func RegisterDiscriminatedUnion[T any](key string, mappings map[string]reflect.Type) { - var t T - entry := unionEntry{ - discriminatorKey: key, - variants: []UnionVariant{}, - } - for k, typ := range mappings { - entry.variants = append(entry.variants, UnionVariant{ - DiscriminatorValue: k, - Type: typ, - }) - } - unionRegistry[reflect.TypeOf(t)] = entry -} - -func (d *decoderBuilder) newStructUnionDecoder(t reflect.Type) decoderFunc { - type variantDecoder struct { - decoder decoderFunc - field reflect.StructField - discriminatorValue any - } - - variants := []variantDecoder{} - for i := 0; i < t.NumField(); i++ { - field := t.Field(i) - - if field.Anonymous && field.Type == apiUnionType { - continue - } - - decoder := d.typeDecoder(field.Type) - variants = append(variants, variantDecoder{ - decoder: decoder, - field: field, - }) - } - - unionEntry, discriminated := unionRegistry[t] - for _, unionVariant := range unionEntry.variants { - for i := 0; i < len(variants); i++ { - variant := &variants[i] - if variant.field.Type.Elem() == unionVariant.Type { - variant.discriminatorValue = unionVariant.DiscriminatorValue - break - } - } - } - - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - if discriminated && n.Type == gjson.JSON && len(unionEntry.discriminatorKey) != 0 { - discriminator := n.Get(unionEntry.discriminatorKey).Value() - for _, variant := range variants { - if discriminator == variant.discriminatorValue { - inner := v.FieldByIndex(variant.field.Index) - return variant.decoder(n, inner, state) - } - } - return errors.New("apijson: was not able to find discriminated union variant") - } - - // Set bestExactness to worse than loose - bestExactness := loose - 1 - bestVariant := -1 - for i, variant := range variants { - // Pointers are used to discern JSON object variants from value variants - if n.Type != gjson.JSON && variant.field.Type.Kind() == reflect.Ptr { - continue - } - - sub := decoderState{strict: state.strict, exactness: exact} - inner := v.FieldByIndex(variant.field.Index) - err := variant.decoder(n, inner, &sub) - if err != nil { - continue - } - if sub.exactness == exact { - bestExactness = exact - bestVariant = i - break - } - if sub.exactness > bestExactness { - bestExactness = sub.exactness - bestVariant = i - } - } - - if bestExactness < loose { - return errors.New("apijson: was not able to coerce type as union") - } - - if guardStrict(state, bestExactness != exact) { - return errors.New("apijson: was not able to coerce type as union strictly") - } - - for i := 0; i < len(variants); i++ { - if i == bestVariant { - continue - } - v.FieldByIndex(variants[i].field.Index).SetZero() - } - - return nil - } -} - -// newUnionDecoder returns a decoderFunc that deserializes into a union using an -// algorithm roughly similar to Pydantic's [smart algorithm]. -// -// Conceptually this is equivalent to choosing the best schema based on how 'exact' -// the deserialization is for each of the schemas. -// -// If there is a tie in the level of exactness, then the tie is broken -// left-to-right. -// -// [smart algorithm]: https://docs.pydantic.dev/latest/concepts/unions/#smart-mode -func (d *decoderBuilder) newUnionDecoder(t reflect.Type) decoderFunc { - unionEntry, ok := unionRegistry[t] - if !ok { - panic("apijson: couldn't find union of type " + t.String() + " in union registry") - } - decoders := []decoderFunc{} - for _, variant := range unionEntry.variants { - decoder := d.typeDecoder(variant.Type) - decoders = append(decoders, decoder) - } - return func(n gjson.Result, v reflect.Value, state *decoderState) error { - // If there is a discriminator match, circumvent the exactness logic entirely - for idx, variant := range unionEntry.variants { - decoder := decoders[idx] - if variant.TypeFilter != n.Type { - continue - } - - if len(unionEntry.discriminatorKey) != 0 { - discriminatorValue := n.Get(unionEntry.discriminatorKey).Value() - if discriminatorValue == variant.DiscriminatorValue { - inner := reflect.New(variant.Type).Elem() - err := decoder(n, inner, state) - v.Set(inner) - return err - } - } - } - - // Set bestExactness to worse than loose - bestExactness := loose - 1 - for idx, variant := range unionEntry.variants { - decoder := decoders[idx] - if variant.TypeFilter != n.Type { - continue - } - sub := decoderState{strict: state.strict, exactness: exact} - inner := reflect.New(variant.Type).Elem() - err := decoder(n, inner, &sub) - if err != nil { - continue - } - if sub.exactness == exact { - v.Set(inner) - return nil - } - if sub.exactness > bestExactness { - v.Set(inner) - bestExactness = sub.exactness - } - } - - if bestExactness < loose { - return errors.New("apijson: was not able to coerce type as union") - } - - if guardStrict(state, bestExactness != exact) { - return errors.New("apijson: was not able to coerce type as union strictly") - } - - return nil - } -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/encoder.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/encoder.go deleted file mode 100644 index 08641cdfea954436edc509f46c44077ffd757d3a..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/encoder.go +++ /dev/null @@ -1,415 +0,0 @@ -package apiquery - -import ( - "encoding/json" - "fmt" - "reflect" - "strconv" - "strings" - "sync" - "time" - - "github.com/anthropics/anthropic-sdk-go/packages/param" -) - -var encoders sync.Map // map[reflect.Type]encoderFunc - -type encoder struct { - dateFormat string - root bool - settings QuerySettings -} - -type encoderFunc func(key string, value reflect.Value) ([]Pair, error) - -type encoderField struct { - tag parsedStructTag - fn encoderFunc - idx []int -} - -type encoderEntry struct { - reflect.Type - dateFormat string - root bool - settings QuerySettings -} - -type Pair struct { - key string - value string -} - -func (e *encoder) typeEncoder(t reflect.Type) encoderFunc { - entry := encoderEntry{ - Type: t, - dateFormat: e.dateFormat, - root: e.root, - settings: e.settings, - } - - if fi, ok := encoders.Load(entry); ok { - return fi.(encoderFunc) - } - - // To deal with recursive types, populate the map with an - // indirect func before we build it. This type waits on the - // real func (f) to be ready and then calls it. This indirect - // func is only used for recursive types. - var ( - wg sync.WaitGroup - f encoderFunc - ) - wg.Add(1) - fi, loaded := encoders.LoadOrStore(entry, encoderFunc(func(key string, v reflect.Value) ([]Pair, error) { - wg.Wait() - return f(key, v) - })) - if loaded { - return fi.(encoderFunc) - } - - // Compute the real encoder and replace the indirect func with it. - f = e.newTypeEncoder(t) - wg.Done() - encoders.Store(entry, f) - return f -} - -func marshalerEncoder(key string, value reflect.Value) ([]Pair, error) { - s, err := value.Interface().(json.Marshaler).MarshalJSON() - if err != nil { - return nil, fmt.Errorf("apiquery: json fallback marshal error %s", err) - } - return []Pair{{key, string(s)}}, nil -} - -func (e *encoder) newTypeEncoder(t reflect.Type) encoderFunc { - if t.ConvertibleTo(reflect.TypeOf(time.Time{})) { - return e.newTimeTypeEncoder(t) - } - - if t.Implements(reflect.TypeOf((*param.Optional)(nil)).Elem()) { - return e.newRichFieldTypeEncoder(t) - } - - if !e.root && t.Implements(reflect.TypeOf((*json.Marshaler)(nil)).Elem()) { - return marshalerEncoder - } - - e.root = false - switch t.Kind() { - case reflect.Pointer: - encoder := e.typeEncoder(t.Elem()) - return func(key string, value reflect.Value) (pairs []Pair, err error) { - if !value.IsValid() || value.IsNil() { - return - } - return encoder(key, value.Elem()) - } - case reflect.Struct: - return e.newStructTypeEncoder(t) - case reflect.Array: - fallthrough - case reflect.Slice: - return e.newArrayTypeEncoder(t) - case reflect.Map: - return e.newMapEncoder(t) - case reflect.Interface: - return e.newInterfaceEncoder() - default: - return e.newPrimitiveTypeEncoder(t) - } -} - -func (e *encoder) newStructTypeEncoder(t reflect.Type) encoderFunc { - if t.Implements(reflect.TypeOf((*param.Optional)(nil)).Elem()) { - return e.newRichFieldTypeEncoder(t) - } - - for i := 0; i < t.NumField(); i++ { - if t.Field(i).Type == paramUnionType && t.Field(i).Anonymous { - return e.newStructUnionTypeEncoder(t) - } - } - - encoderFields := []encoderField{} - - // This helper allows us to recursively collect field encoders into a flat - // array. The parameter `index` keeps track of the access patterns necessary - // to get to some field. - var collectEncoderFields func(r reflect.Type, index []int) - collectEncoderFields = func(r reflect.Type, index []int) { - for i := 0; i < r.NumField(); i++ { - idx := append(index, i) - field := t.FieldByIndex(idx) - if !field.IsExported() { - continue - } - // If this is an embedded struct, traverse one level deeper to extract - // the field and get their encoders as well. - if field.Anonymous { - collectEncoderFields(field.Type, idx) - continue - } - // If query tag is not present, then we skip, which is intentionally - // different behavior from the stdlib. - ptag, ok := parseQueryStructTag(field) - if !ok { - continue - } - - if (ptag.name == "-" || ptag.name == "") && !ptag.inline { - continue - } - - dateFormat, ok := parseFormatStructTag(field) - oldFormat := e.dateFormat - if ok { - switch dateFormat { - case "date-time": - e.dateFormat = time.RFC3339 - case "date": - e.dateFormat = "2006-01-02" - } - } - var encoderFn encoderFunc - if ptag.omitzero { - typeEncoderFn := e.typeEncoder(field.Type) - encoderFn = func(key string, value reflect.Value) ([]Pair, error) { - if value.IsZero() { - return nil, nil - } - return typeEncoderFn(key, value) - } - } else { - encoderFn = e.typeEncoder(field.Type) - } - encoderFields = append(encoderFields, encoderField{ptag, encoderFn, idx}) - e.dateFormat = oldFormat - } - } - collectEncoderFields(t, []int{}) - - return func(key string, value reflect.Value) (pairs []Pair, err error) { - for _, ef := range encoderFields { - var subkey string = e.renderKeyPath(key, ef.tag.name) - if ef.tag.inline { - subkey = key - } - - field := value.FieldByIndex(ef.idx) - subpairs, suberr := ef.fn(subkey, field) - if suberr != nil { - err = suberr - } - pairs = append(pairs, subpairs...) - } - return - } -} - -var paramUnionType = reflect.TypeOf((*param.APIUnion)(nil)).Elem() - -func (e *encoder) newStructUnionTypeEncoder(t reflect.Type) encoderFunc { - var fieldEncoders []encoderFunc - for i := 0; i < t.NumField(); i++ { - field := t.Field(i) - if field.Type == paramUnionType && field.Anonymous { - fieldEncoders = append(fieldEncoders, nil) - continue - } - fieldEncoders = append(fieldEncoders, e.typeEncoder(field.Type)) - } - - return func(key string, value reflect.Value) (pairs []Pair, err error) { - for i := 0; i < t.NumField(); i++ { - if value.Field(i).Type() == paramUnionType { - continue - } - if !value.Field(i).IsZero() { - return fieldEncoders[i](key, value.Field(i)) - } - } - return nil, fmt.Errorf("apiquery: union %s has no field set", t.String()) - } -} - -func (e *encoder) newMapEncoder(t reflect.Type) encoderFunc { - keyEncoder := e.typeEncoder(t.Key()) - elementEncoder := e.typeEncoder(t.Elem()) - return func(key string, value reflect.Value) (pairs []Pair, err error) { - iter := value.MapRange() - for iter.Next() { - encodedKey, err := keyEncoder("", iter.Key()) - if err != nil { - return nil, err - } - if len(encodedKey) != 1 { - return nil, fmt.Errorf("apiquery: unexpected number of parts for encoded map key, map may contain non-primitive") - } - subkey := encodedKey[0].value - keyPath := e.renderKeyPath(key, subkey) - subpairs, suberr := elementEncoder(keyPath, iter.Value()) - if suberr != nil { - err = suberr - } - pairs = append(pairs, subpairs...) - } - return - } -} - -func (e *encoder) renderKeyPath(key string, subkey string) string { - if len(key) == 0 { - return subkey - } - if e.settings.NestedFormat == NestedQueryFormatDots { - return fmt.Sprintf("%s.%s", key, subkey) - } - return fmt.Sprintf("%s[%s]", key, subkey) -} - -func (e *encoder) newArrayTypeEncoder(t reflect.Type) encoderFunc { - switch e.settings.ArrayFormat { - case ArrayQueryFormatComma: - innerEncoder := e.typeEncoder(t.Elem()) - return func(key string, v reflect.Value) ([]Pair, error) { - elements := []string{} - for i := 0; i < v.Len(); i++ { - innerPairs, err := innerEncoder("", v.Index(i)) - if err != nil { - return nil, err - } - for _, pair := range innerPairs { - elements = append(elements, pair.value) - } - } - if len(elements) == 0 { - return []Pair{}, nil - } - return []Pair{{key, strings.Join(elements, ",")}}, nil - } - case ArrayQueryFormatRepeat: - innerEncoder := e.typeEncoder(t.Elem()) - return func(key string, value reflect.Value) (pairs []Pair, err error) { - for i := 0; i < value.Len(); i++ { - subpairs, suberr := innerEncoder(key, value.Index(i)) - if suberr != nil { - err = suberr - } - pairs = append(pairs, subpairs...) - } - return - } - case ArrayQueryFormatIndices: - panic("The array indices format is not supported yet") - case ArrayQueryFormatBrackets: - innerEncoder := e.typeEncoder(t.Elem()) - return func(key string, value reflect.Value) (pairs []Pair, err error) { - pairs = []Pair{} - for i := 0; i < value.Len(); i++ { - subpairs, suberr := innerEncoder(key+"[]", value.Index(i)) - if suberr != nil { - err = suberr - } - pairs = append(pairs, subpairs...) - } - return - } - default: - panic(fmt.Sprintf("Unknown ArrayFormat value: %d", e.settings.ArrayFormat)) - } -} - -func (e *encoder) newPrimitiveTypeEncoder(t reflect.Type) encoderFunc { - switch t.Kind() { - case reflect.Pointer: - inner := t.Elem() - - innerEncoder := e.newPrimitiveTypeEncoder(inner) - return func(key string, v reflect.Value) ([]Pair, error) { - if !v.IsValid() || v.IsNil() { - return nil, nil - } - return innerEncoder(key, v.Elem()) - } - case reflect.String: - return func(key string, v reflect.Value) ([]Pair, error) { - return []Pair{{key, v.String()}}, nil - } - case reflect.Bool: - return func(key string, v reflect.Value) ([]Pair, error) { - if v.Bool() { - return []Pair{{key, "true"}}, nil - } - return []Pair{{key, "false"}}, nil - } - case reflect.Int, reflect.Int16, reflect.Int32, reflect.Int64: - return func(key string, v reflect.Value) ([]Pair, error) { - return []Pair{{key, strconv.FormatInt(v.Int(), 10)}}, nil - } - case reflect.Uint, reflect.Uint16, reflect.Uint32, reflect.Uint64: - return func(key string, v reflect.Value) ([]Pair, error) { - return []Pair{{key, strconv.FormatUint(v.Uint(), 10)}}, nil - } - case reflect.Float32, reflect.Float64: - return func(key string, v reflect.Value) ([]Pair, error) { - return []Pair{{key, strconv.FormatFloat(v.Float(), 'f', -1, 64)}}, nil - } - case reflect.Complex64, reflect.Complex128: - bitSize := 64 - if t.Kind() == reflect.Complex128 { - bitSize = 128 - } - return func(key string, v reflect.Value) ([]Pair, error) { - return []Pair{{key, strconv.FormatComplex(v.Complex(), 'f', -1, bitSize)}}, nil - } - default: - return func(key string, v reflect.Value) ([]Pair, error) { - return nil, nil - } - } -} - -func (e *encoder) newFieldTypeEncoder(t reflect.Type) encoderFunc { - f, _ := t.FieldByName("Value") - enc := e.typeEncoder(f.Type) - - return func(key string, value reflect.Value) ([]Pair, error) { - present := value.FieldByName("Present") - if !present.Bool() { - return nil, nil - } - null := value.FieldByName("Null") - if null.Bool() { - return nil, fmt.Errorf("apiquery: field cannot be null") - } - raw := value.FieldByName("Raw") - if !raw.IsNil() { - return e.typeEncoder(raw.Type())(key, raw) - } - return enc(key, value.FieldByName("Value")) - } -} - -func (e *encoder) newTimeTypeEncoder(_ reflect.Type) encoderFunc { - format := e.dateFormat - return func(key string, value reflect.Value) ([]Pair, error) { - return []Pair{{ - key, - value.Convert(reflect.TypeOf(time.Time{})).Interface().(time.Time).Format(format), - }}, nil - } -} - -func (e encoder) newInterfaceEncoder() encoderFunc { - return func(key string, value reflect.Value) ([]Pair, error) { - value = value.Elem() - if !value.IsValid() { - return nil, nil - } - return e.typeEncoder(value.Type())(key, value) - } - -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/query.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/query.go deleted file mode 100644 index 0f379fa33ae487b7844dc1b75ea303be3a856206..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/query.go +++ /dev/null @@ -1,55 +0,0 @@ -package apiquery - -import ( - "net/url" - "reflect" - "time" -) - -func MarshalWithSettings(value any, settings QuerySettings) (url.Values, error) { - e := encoder{time.RFC3339, true, settings} - kv := url.Values{} - val := reflect.ValueOf(value) - if !val.IsValid() { - return nil, nil - } - typ := val.Type() - - pairs, err := e.typeEncoder(typ)("", val) - if err != nil { - return nil, err - } - for _, pair := range pairs { - kv.Add(pair.key, pair.value) - } - return kv, nil -} - -func Marshal(value any) (url.Values, error) { - return MarshalWithSettings(value, QuerySettings{}) -} - -type Queryer interface { - URLQuery() (url.Values, error) -} - -type QuerySettings struct { - NestedFormat NestedQueryFormat - ArrayFormat ArrayQueryFormat -} - -type NestedQueryFormat int - -const ( - NestedQueryFormatBrackets NestedQueryFormat = iota - NestedQueryFormatDots -) - -type ArrayQueryFormat int - -const ( - ArrayQueryFormatComma ArrayQueryFormat = iota - ArrayQueryFormatRepeat - ArrayQueryFormatIndices - ArrayQueryFormatBrackets -) diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/richparam.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/richparam.go deleted file mode 100644 index 0d67013754b1c9dc550acc65c28e06a90fb1e020..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/richparam.go +++ /dev/null @@ -1,19 +0,0 @@ -package apiquery - -import ( - "github.com/anthropics/anthropic-sdk-go/packages/param" - "reflect" -) - -func (e *encoder) newRichFieldTypeEncoder(t reflect.Type) encoderFunc { - f, _ := t.FieldByName("Value") - enc := e.typeEncoder(f.Type) - return func(key string, value reflect.Value) ([]Pair, error) { - if opt, ok := value.Interface().(param.Optional); ok && opt.Valid() { - return enc(key, value.FieldByIndex(f.Index)) - } else if ok && param.IsNull(opt) { - return []Pair{{key, "null"}}, nil - } - return nil, nil - } -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/tag.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/tag.go deleted file mode 100644 index 772c40e1a9746ce9e6e575775b6bd24072911b5b..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/apiquery/tag.go +++ /dev/null @@ -1,44 +0,0 @@ -package apiquery - -import ( - "reflect" - "strings" -) - -const queryStructTag = "query" -const formatStructTag = "format" - -type parsedStructTag struct { - name string - omitempty bool - omitzero bool - inline bool -} - -func parseQueryStructTag(field reflect.StructField) (tag parsedStructTag, ok bool) { - raw, ok := field.Tag.Lookup(queryStructTag) - if !ok { - return - } - parts := strings.Split(raw, ",") - if len(parts) == 0 { - return tag, false - } - tag.name = parts[0] - for _, part := range parts[1:] { - switch part { - case "omitzero": - tag.omitzero = true - case "omitempty": - tag.omitempty = true - case "inline": - tag.inline = true - } - } - return -} - -func parseFormatStructTag(field reflect.StructField) (format string, ok bool) { - format, ok = field.Tag.Lookup(formatStructTag) - return -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/encoding/json/decode.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/encoding/json/decode.go deleted file mode 100644 index f1c7ef53f6ba197b93a720dabe9198758190b24e..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/encoding/json/decode.go +++ /dev/null @@ -1,1324 +0,0 @@ -// Vendored from Go 1.24.0-pre-release -// To find alterations, check package shims, and comments beginning in SHIM(). -// -// Copyright 2010 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Represents JSON data structure using native Go types: booleans, floats, -// strings, arrays, and maps. - -package json - -import ( - "encoding" - "encoding/base64" - "fmt" - "github.com/anthropics/anthropic-sdk-go/internal/encoding/json/shims" - "reflect" - "strconv" - "strings" - "unicode" - "unicode/utf16" - "unicode/utf8" - _ "unsafe" // for linkname -) - -// Unmarshal parses the JSON-encoded data and stores the result -// in the value pointed to by v. If v is nil or not a pointer, -// Unmarshal returns an [InvalidUnmarshalError]. -// -// Unmarshal uses the inverse of the encodings that -// [Marshal] uses, allocating maps, slices, and pointers as necessary, -// with the following additional rules: -// -// To unmarshal JSON into a pointer, Unmarshal first handles the case of -// the JSON being the JSON literal null. In that case, Unmarshal sets -// the pointer to nil. Otherwise, Unmarshal unmarshals the JSON into -// the value pointed at by the pointer. If the pointer is nil, Unmarshal -// allocates a new value for it to point to. -// -// To unmarshal JSON into a value implementing [Unmarshaler], -// Unmarshal calls that value's [Unmarshaler.UnmarshalJSON] method, including -// when the input is a JSON null. -// Otherwise, if the value implements [encoding.TextUnmarshaler] -// and the input is a JSON quoted string, Unmarshal calls -// [encoding.TextUnmarshaler.UnmarshalText] with the unquoted form of the string. -// -// To unmarshal JSON into a struct, Unmarshal matches incoming object -// keys to the keys used by [Marshal] (either the struct field name or its tag), -// preferring an exact match but also accepting a case-insensitive match. By -// default, object keys which don't have a corresponding struct field are -// ignored (see [Decoder.DisallowUnknownFields] for an alternative). -// -// To unmarshal JSON into an interface value, -// Unmarshal stores one of these in the interface value: -// -// - bool, for JSON booleans -// - float64, for JSON numbers -// - string, for JSON strings -// - []any, for JSON arrays -// - map[string]any, for JSON objects -// - nil for JSON null -// -// To unmarshal a JSON array into a slice, Unmarshal resets the slice length -// to zero and then appends each element to the slice. -// As a special case, to unmarshal an empty JSON array into a slice, -// Unmarshal replaces the slice with a new empty slice. -// -// To unmarshal a JSON array into a Go array, Unmarshal decodes -// JSON array elements into corresponding Go array elements. -// If the Go array is smaller than the JSON array, -// the additional JSON array elements are discarded. -// If the JSON array is smaller than the Go array, -// the additional Go array elements are set to zero values. -// -// To unmarshal a JSON object into a map, Unmarshal first establishes a map to -// use. If the map is nil, Unmarshal allocates a new map. Otherwise Unmarshal -// reuses the existing map, keeping existing entries. Unmarshal then stores -// key-value pairs from the JSON object into the map. The map's key type must -// either be any string type, an integer, or implement [encoding.TextUnmarshaler]. -// -// If the JSON-encoded data contain a syntax error, Unmarshal returns a [SyntaxError]. -// -// If a JSON value is not appropriate for a given target type, -// or if a JSON number overflows the target type, Unmarshal -// skips that field and completes the unmarshaling as best it can. -// If no more serious errors are encountered, Unmarshal returns -// an [UnmarshalTypeError] describing the earliest such error. In any -// case, it's not guaranteed that all the remaining fields following -// the problematic one will be unmarshaled into the target object. -// -// The JSON null value unmarshals into an interface, map, pointer, or slice -// by setting that Go value to nil. Because null is often used in JSON to mean -// “not present,” unmarshaling a JSON null into any other Go type has no effect -// on the value and produces no error. -// -// When unmarshaling quoted strings, invalid UTF-8 or -// invalid UTF-16 surrogate pairs are not treated as an error. -// Instead, they are replaced by the Unicode replacement -// character U+FFFD. -func Unmarshal(data []byte, v any) error { - // Check for well-formedness. - // Avoids filling out half a data structure - // before discovering a JSON syntax error. - var d decodeState - err := checkValid(data, &d.scan) - if err != nil { - return err - } - - d.init(data) - return d.unmarshal(v) -} - -// Unmarshaler is the interface implemented by types -// that can unmarshal a JSON description of themselves. -// The input can be assumed to be a valid encoding of -// a JSON value. UnmarshalJSON must copy the JSON data -// if it wishes to retain the data after returning. -// -// By convention, to approximate the behavior of [Unmarshal] itself, -// Unmarshalers implement UnmarshalJSON([]byte("null")) as a no-op. -type Unmarshaler interface { - UnmarshalJSON([]byte) error -} - -// An UnmarshalTypeError describes a JSON value that was -// not appropriate for a value of a specific Go type. -type UnmarshalTypeError struct { - Value string // description of JSON value - "bool", "array", "number -5" - Type reflect.Type // type of Go value it could not be assigned to - Offset int64 // error occurred after reading Offset bytes - Struct string // name of the struct type containing the field - Field string // the full path from root node to the field, include embedded struct -} - -func (e *UnmarshalTypeError) Error() string { - if e.Struct != "" || e.Field != "" { - return "json: cannot unmarshal " + e.Value + " into Go struct field " + e.Struct + "." + e.Field + " of type " + e.Type.String() - } - return "json: cannot unmarshal " + e.Value + " into Go value of type " + e.Type.String() -} - -// An UnmarshalFieldError describes a JSON object key that -// led to an unexported (and therefore unwritable) struct field. -// -// Deprecated: No longer used; kept for compatibility. -type UnmarshalFieldError struct { - Key string - Type reflect.Type - Field reflect.StructField -} - -func (e *UnmarshalFieldError) Error() string { - return "json: cannot unmarshal object key " + strconv.Quote(e.Key) + " into unexported field " + e.Field.Name + " of type " + e.Type.String() -} - -// An InvalidUnmarshalError describes an invalid argument passed to [Unmarshal]. -// (The argument to [Unmarshal] must be a non-nil pointer.) -type InvalidUnmarshalError struct { - Type reflect.Type -} - -func (e *InvalidUnmarshalError) Error() string { - if e.Type == nil { - return "json: Unmarshal(nil)" - } - - if e.Type.Kind() != reflect.Pointer { - return "json: Unmarshal(non-pointer " + e.Type.String() + ")" - } - return "json: Unmarshal(nil " + e.Type.String() + ")" -} - -func (d *decodeState) unmarshal(v any) error { - rv := reflect.ValueOf(v) - if rv.Kind() != reflect.Pointer || rv.IsNil() { - return &InvalidUnmarshalError{reflect.TypeOf(v)} - } - - d.scan.reset() - d.scanWhile(scanSkipSpace) - // We decode rv not rv.Elem because the Unmarshaler interface - // test must be applied at the top level of the value. - err := d.value(rv) - if err != nil { - return d.addErrorContext(err) - } - return d.savedError -} - -// A Number represents a JSON number literal. -type Number string - -// String returns the literal text of the number. -func (n Number) String() string { return string(n) } - -// Float64 returns the number as a float64. -func (n Number) Float64() (float64, error) { - return strconv.ParseFloat(string(n), 64) -} - -// Int64 returns the number as an int64. -func (n Number) Int64() (int64, error) { - return strconv.ParseInt(string(n), 10, 64) -} - -// An errorContext provides context for type errors during decoding. -type errorContext struct { - Struct reflect.Type - FieldStack []string -} - -// decodeState represents the state while decoding a JSON value. -type decodeState struct { - data []byte - off int // next read offset in data - opcode int // last read result - scan scanner - errorContext *errorContext - savedError error - useNumber bool - disallowUnknownFields bool -} - -// readIndex returns the position of the last byte read. -func (d *decodeState) readIndex() int { - return d.off - 1 -} - -// phasePanicMsg is used as a panic message when we end up with something that -// shouldn't happen. It can indicate a bug in the JSON decoder, or that -// something is editing the data slice while the decoder executes. -const phasePanicMsg = "JSON decoder out of sync - data changing underfoot?" - -func (d *decodeState) init(data []byte) *decodeState { - d.data = data - d.off = 0 - d.savedError = nil - if d.errorContext != nil { - d.errorContext.Struct = nil - // Reuse the allocated space for the FieldStack slice. - d.errorContext.FieldStack = d.errorContext.FieldStack[:0] - } - return d -} - -// saveError saves the first err it is called with, -// for reporting at the end of the unmarshal. -func (d *decodeState) saveError(err error) { - if d.savedError == nil { - d.savedError = d.addErrorContext(err) - } -} - -// addErrorContext returns a new error enhanced with information from d.errorContext -func (d *decodeState) addErrorContext(err error) error { - if d.errorContext != nil && (d.errorContext.Struct != nil || len(d.errorContext.FieldStack) > 0) { - switch err := err.(type) { - case *UnmarshalTypeError: - err.Struct = d.errorContext.Struct.Name() - fieldStack := d.errorContext.FieldStack - if err.Field != "" { - fieldStack = append(fieldStack, err.Field) - } - err.Field = strings.Join(fieldStack, ".") - } - } - return err -} - -// skip scans to the end of what was started. -func (d *decodeState) skip() { - s, data, i := &d.scan, d.data, d.off - depth := len(s.parseState) - for { - op := s.step(s, data[i]) - i++ - if len(s.parseState) < depth { - d.off = i - d.opcode = op - return - } - } -} - -// scanNext processes the byte at d.data[d.off]. -func (d *decodeState) scanNext() { - if d.off < len(d.data) { - d.opcode = d.scan.step(&d.scan, d.data[d.off]) - d.off++ - } else { - d.opcode = d.scan.eof() - d.off = len(d.data) + 1 // mark processed EOF with len+1 - } -} - -// scanWhile processes bytes in d.data[d.off:] until it -// receives a scan code not equal to op. -func (d *decodeState) scanWhile(op int) { - s, data, i := &d.scan, d.data, d.off - for i < len(data) { - newOp := s.step(s, data[i]) - i++ - if newOp != op { - d.opcode = newOp - d.off = i - return - } - } - - d.off = len(data) + 1 // mark processed EOF with len+1 - d.opcode = d.scan.eof() -} - -// rescanLiteral is similar to scanWhile(scanContinue), but it specialises the -// common case where we're decoding a literal. The decoder scans the input -// twice, once for syntax errors and to check the length of the value, and the -// second to perform the decoding. -// -// Only in the second step do we use decodeState to tokenize literals, so we -// know there aren't any syntax errors. We can take advantage of that knowledge, -// and scan a literal's bytes much more quickly. -func (d *decodeState) rescanLiteral() { - data, i := d.data, d.off -Switch: - switch data[i-1] { - case '"': // string - for ; i < len(data); i++ { - switch data[i] { - case '\\': - i++ // escaped char - case '"': - i++ // tokenize the closing quote too - break Switch - } - } - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-': // number - for ; i < len(data); i++ { - switch data[i] { - case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', - '.', 'e', 'E', '+', '-': - default: - break Switch - } - } - case 't': // true - i += len("rue") - case 'f': // false - i += len("alse") - case 'n': // null - i += len("ull") - } - if i < len(data) { - d.opcode = stateEndValue(&d.scan, data[i]) - } else { - d.opcode = scanEnd - } - d.off = i + 1 -} - -// value consumes a JSON value from d.data[d.off-1:], decoding into v, and -// reads the following byte ahead. If v is invalid, the value is discarded. -// The first byte of the value has been read already. -func (d *decodeState) value(v reflect.Value) error { - switch d.opcode { - default: - panic(phasePanicMsg) - - case scanBeginArray: - if v.IsValid() { - if err := d.array(v); err != nil { - return err - } - } else { - d.skip() - } - d.scanNext() - - case scanBeginObject: - if v.IsValid() { - if err := d.object(v); err != nil { - return err - } - } else { - d.skip() - } - d.scanNext() - - case scanBeginLiteral: - // All bytes inside literal return scanContinue op code. - start := d.readIndex() - d.rescanLiteral() - - if v.IsValid() { - if err := d.literalStore(d.data[start:d.readIndex()], v, false); err != nil { - return err - } - } - } - return nil -} - -type unquotedValue struct{} - -// valueQuoted is like value but decodes a -// quoted string literal or literal null into an interface value. -// If it finds anything other than a quoted string literal or null, -// valueQuoted returns unquotedValue{}. -func (d *decodeState) valueQuoted() any { - switch d.opcode { - default: - panic(phasePanicMsg) - - case scanBeginArray, scanBeginObject: - d.skip() - d.scanNext() - - case scanBeginLiteral: - v := d.literalInterface() - switch v.(type) { - case nil, string: - return v - } - } - return unquotedValue{} -} - -// indirect walks down v allocating pointers as needed, -// until it gets to a non-pointer. -// If it encounters an Unmarshaler, indirect stops and returns that. -// If decodingNull is true, indirect stops at the first settable pointer so it -// can be set to nil. -func indirect(v reflect.Value, decodingNull bool) (Unmarshaler, encoding.TextUnmarshaler, reflect.Value) { - // Issue #24153 indicates that it is generally not a guaranteed property - // that you may round-trip a reflect.Value by calling Value.Addr().Elem() - // and expect the value to still be settable for values derived from - // unexported embedded struct fields. - // - // The logic below effectively does this when it first addresses the value - // (to satisfy possible pointer methods) and continues to dereference - // subsequent pointers as necessary. - // - // After the first round-trip, we set v back to the original value to - // preserve the original RW flags contained in reflect.Value. - v0 := v - haveAddr := false - - // If v is a named type and is addressable, - // start with its address, so that if the type has pointer methods, - // we find them. - if v.Kind() != reflect.Pointer && v.Type().Name() != "" && v.CanAddr() { - haveAddr = true - v = v.Addr() - } - for { - // Load value from interface, but only if the result will be - // usefully addressable. - if v.Kind() == reflect.Interface && !v.IsNil() { - e := v.Elem() - if e.Kind() == reflect.Pointer && !e.IsNil() && (!decodingNull || e.Elem().Kind() == reflect.Pointer) { - haveAddr = false - v = e - continue - } - } - - if v.Kind() != reflect.Pointer { - break - } - - if decodingNull && v.CanSet() { - break - } - - // Prevent infinite loop if v is an interface pointing to its own address: - // var v any - // v = &v - if v.Elem().Kind() == reflect.Interface && v.Elem().Elem().Equal(v) { - v = v.Elem() - break - } - if v.IsNil() { - v.Set(reflect.New(v.Type().Elem())) - } - if v.Type().NumMethod() > 0 && v.CanInterface() { - if u, ok := v.Interface().(Unmarshaler); ok { - return u, nil, reflect.Value{} - } - if !decodingNull { - if u, ok := v.Interface().(encoding.TextUnmarshaler); ok { - return nil, u, reflect.Value{} - } - } - } - - if haveAddr { - v = v0 // restore original value after round-trip Value.Addr().Elem() - haveAddr = false - } else { - v = v.Elem() - } - } - return nil, nil, v -} - -// array consumes an array from d.data[d.off-1:], decoding into v. -// The first byte of the array ('[') has been read already. -func (d *decodeState) array(v reflect.Value) error { - // Check for unmarshaler. - u, ut, pv := indirect(v, false) - if u != nil { - start := d.readIndex() - d.skip() - return u.UnmarshalJSON(d.data[start:d.off]) - } - if ut != nil { - d.saveError(&UnmarshalTypeError{Value: "array", Type: v.Type(), Offset: int64(d.off)}) - d.skip() - return nil - } - v = pv - - // Check type of target. - switch v.Kind() { - case reflect.Interface: - if v.NumMethod() == 0 { - // Decoding into nil interface? Switch to non-reflect code. - ai := d.arrayInterface() - v.Set(reflect.ValueOf(ai)) - return nil - } - // Otherwise it's invalid. - fallthrough - default: - d.saveError(&UnmarshalTypeError{Value: "array", Type: v.Type(), Offset: int64(d.off)}) - d.skip() - return nil - case reflect.Array, reflect.Slice: - break - } - - i := 0 - for { - // Look ahead for ] - can only happen on first iteration. - d.scanWhile(scanSkipSpace) - if d.opcode == scanEndArray { - break - } - - // Expand slice length, growing the slice if necessary. - if v.Kind() == reflect.Slice { - if i >= v.Cap() { - v.Grow(1) - } - if i >= v.Len() { - v.SetLen(i + 1) - } - } - - if i < v.Len() { - // Decode into element. - if err := d.value(v.Index(i)); err != nil { - return err - } - } else { - // Ran out of fixed array: skip. - if err := d.value(reflect.Value{}); err != nil { - return err - } - } - i++ - - // Next token must be , or ]. - if d.opcode == scanSkipSpace { - d.scanWhile(scanSkipSpace) - } - if d.opcode == scanEndArray { - break - } - if d.opcode != scanArrayValue { - panic(phasePanicMsg) - } - } - - if i < v.Len() { - if v.Kind() == reflect.Array { - for ; i < v.Len(); i++ { - v.Index(i).SetZero() // zero remainder of array - } - } else { - v.SetLen(i) // truncate the slice - } - } - if i == 0 && v.Kind() == reflect.Slice { - v.Set(reflect.MakeSlice(v.Type(), 0, 0)) - } - return nil -} - -var nullLiteral = []byte("null") - -// SHIM(reflect): reflect.TypeFor[T]() reflect.T -var textUnmarshalerType = shims.TypeFor[encoding.TextUnmarshaler]() - -// object consumes an object from d.data[d.off-1:], decoding into v. -// The first byte ('{') of the object has been read already. -func (d *decodeState) object(v reflect.Value) error { - // Check for unmarshaler. - u, ut, pv := indirect(v, false) - if u != nil { - start := d.readIndex() - d.skip() - return u.UnmarshalJSON(d.data[start:d.off]) - } - if ut != nil { - d.saveError(&UnmarshalTypeError{Value: "object", Type: v.Type(), Offset: int64(d.off)}) - d.skip() - return nil - } - v = pv - t := v.Type() - - // Decoding into nil interface? Switch to non-reflect code. - if v.Kind() == reflect.Interface && v.NumMethod() == 0 { - oi := d.objectInterface() - v.Set(reflect.ValueOf(oi)) - return nil - } - - var fields structFields - - // Check type of target: - // struct or - // map[T1]T2 where T1 is string, an integer type, - // or an encoding.TextUnmarshaler - switch v.Kind() { - case reflect.Map: - // Map key must either have string kind, have an integer kind, - // or be an encoding.TextUnmarshaler. - switch t.Key().Kind() { - case reflect.String, - reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, - reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: - default: - if !reflect.PointerTo(t.Key()).Implements(textUnmarshalerType) { - d.saveError(&UnmarshalTypeError{Value: "object", Type: t, Offset: int64(d.off)}) - d.skip() - return nil - } - } - if v.IsNil() { - v.Set(reflect.MakeMap(t)) - } - case reflect.Struct: - fields = cachedTypeFields(t) - // ok - default: - d.saveError(&UnmarshalTypeError{Value: "object", Type: t, Offset: int64(d.off)}) - d.skip() - return nil - } - - var mapElem reflect.Value - var origErrorContext errorContext - if d.errorContext != nil { - origErrorContext = *d.errorContext - } - - for { - // Read opening " of string key or closing }. - d.scanWhile(scanSkipSpace) - if d.opcode == scanEndObject { - // closing } - can only happen on first iteration. - break - } - if d.opcode != scanBeginLiteral { - panic(phasePanicMsg) - } - - // Read key. - start := d.readIndex() - d.rescanLiteral() - item := d.data[start:d.readIndex()] - key, ok := unquoteBytes(item) - if !ok { - panic(phasePanicMsg) - } - - // Figure out field corresponding to key. - var subv reflect.Value - destring := false // whether the value is wrapped in a string to be decoded first - - if v.Kind() == reflect.Map { - elemType := t.Elem() - if !mapElem.IsValid() { - mapElem = reflect.New(elemType).Elem() - } else { - mapElem.SetZero() - } - subv = mapElem - } else { - f := fields.byExactName[string(key)] - if f == nil { - f = fields.byFoldedName[string(foldName(key))] - } - if f != nil { - subv = v - destring = f.quoted - if d.errorContext == nil { - d.errorContext = new(errorContext) - } - for i, ind := range f.index { - if subv.Kind() == reflect.Pointer { - if subv.IsNil() { - // If a struct embeds a pointer to an unexported type, - // it is not possible to set a newly allocated value - // since the field is unexported. - // - // See https://golang.org/issue/21357 - if !subv.CanSet() { - d.saveError(fmt.Errorf("json: cannot set embedded pointer to unexported struct: %v", subv.Type().Elem())) - // Invalidate subv to ensure d.value(subv) skips over - // the JSON value without assigning it to subv. - subv = reflect.Value{} - destring = false - break - } - subv.Set(reflect.New(subv.Type().Elem())) - } - subv = subv.Elem() - } - if i < len(f.index)-1 { - d.errorContext.FieldStack = append( - d.errorContext.FieldStack, - subv.Type().Field(ind).Name, - ) - } - subv = subv.Field(ind) - } - d.errorContext.Struct = t - d.errorContext.FieldStack = append(d.errorContext.FieldStack, f.name) - } else if d.disallowUnknownFields { - d.saveError(fmt.Errorf("json: unknown field %q", key)) - } - } - - // Read : before value. - if d.opcode == scanSkipSpace { - d.scanWhile(scanSkipSpace) - } - if d.opcode != scanObjectKey { - panic(phasePanicMsg) - } - d.scanWhile(scanSkipSpace) - - if destring { - switch qv := d.valueQuoted().(type) { - case nil: - if err := d.literalStore(nullLiteral, subv, false); err != nil { - return err - } - case string: - if err := d.literalStore([]byte(qv), subv, true); err != nil { - return err - } - default: - d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal unquoted value into %v", subv.Type())) - } - } else { - if err := d.value(subv); err != nil { - return err - } - } - - // Write value back to map; - // if using struct, subv points into struct already. - if v.Kind() == reflect.Map { - kt := t.Key() - var kv reflect.Value - if reflect.PointerTo(kt).Implements(textUnmarshalerType) { - kv = reflect.New(kt) - if err := d.literalStore(item, kv, true); err != nil { - return err - } - kv = kv.Elem() - } else { - switch kt.Kind() { - case reflect.String: - kv = reflect.New(kt).Elem() - kv.SetString(string(key)) - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - s := string(key) - n, err := strconv.ParseInt(s, 10, 64) - // SHIM(reflect): reflect.Type.OverflowInt(int64) bool - okt := shims.OverflowableType{Type: kt} - if err != nil || okt.OverflowInt(n) { - d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: kt, Offset: int64(start + 1)}) - break - } - kv = reflect.New(kt).Elem() - kv.SetInt(n) - case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: - s := string(key) - n, err := strconv.ParseUint(s, 10, 64) - // SHIM(reflect): reflect.Type.OverflowUint(uint64) bool - okt := shims.OverflowableType{Type: kt} - if err != nil || okt.OverflowUint(n) { - d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: kt, Offset: int64(start + 1)}) - break - } - kv = reflect.New(kt).Elem() - kv.SetUint(n) - default: - panic("json: Unexpected key type") // should never occur - } - } - if kv.IsValid() { - v.SetMapIndex(kv, subv) - } - } - - // Next token must be , or }. - if d.opcode == scanSkipSpace { - d.scanWhile(scanSkipSpace) - } - if d.errorContext != nil { - // Reset errorContext to its original state. - // Keep the same underlying array for FieldStack, to reuse the - // space and avoid unnecessary allocs. - d.errorContext.FieldStack = d.errorContext.FieldStack[:len(origErrorContext.FieldStack)] - d.errorContext.Struct = origErrorContext.Struct - } - if d.opcode == scanEndObject { - break - } - if d.opcode != scanObjectValue { - panic(phasePanicMsg) - } - } - return nil -} - -// convertNumber converts the number literal s to a float64 or a Number -// depending on the setting of d.useNumber. -func (d *decodeState) convertNumber(s string) (any, error) { - if d.useNumber { - return Number(s), nil - } - f, err := strconv.ParseFloat(s, 64) - if err != nil { - // SHIM(reflect): reflect.TypeFor[T]() reflect.Type - return nil, &UnmarshalTypeError{Value: "number " + s, Type: shims.TypeFor[float64](), Offset: int64(d.off)} - } - return f, nil -} - -// SHIM(reflect): TypeFor[T]() reflect.Type -var numberType = shims.TypeFor[Number]() - -// literalStore decodes a literal stored in item into v. -// -// fromQuoted indicates whether this literal came from unwrapping a -// string from the ",string" struct tag option. this is used only to -// produce more helpful error messages. -func (d *decodeState) literalStore(item []byte, v reflect.Value, fromQuoted bool) error { - // Check for unmarshaler. - if len(item) == 0 { - // Empty string given. - d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) - return nil - } - isNull := item[0] == 'n' // null - u, ut, pv := indirect(v, isNull) - if u != nil { - return u.UnmarshalJSON(item) - } - if ut != nil { - if item[0] != '"' { - if fromQuoted { - d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) - return nil - } - val := "number" - switch item[0] { - case 'n': - val = "null" - case 't', 'f': - val = "bool" - } - d.saveError(&UnmarshalTypeError{Value: val, Type: v.Type(), Offset: int64(d.readIndex())}) - return nil - } - s, ok := unquoteBytes(item) - if !ok { - if fromQuoted { - return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()) - } - panic(phasePanicMsg) - } - return ut.UnmarshalText(s) - } - - v = pv - - switch c := item[0]; c { - case 'n': // null - // The main parser checks that only true and false can reach here, - // but if this was a quoted string input, it could be anything. - if fromQuoted && string(item) != "null" { - d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) - break - } - switch v.Kind() { - case reflect.Interface, reflect.Pointer, reflect.Map, reflect.Slice: - v.SetZero() - // otherwise, ignore null for primitives/string - } - case 't', 'f': // true, false - value := item[0] == 't' - // The main parser checks that only true and false can reach here, - // but if this was a quoted string input, it could be anything. - if fromQuoted && string(item) != "true" && string(item) != "false" { - d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) - break - } - switch v.Kind() { - default: - if fromQuoted { - d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())) - } else { - d.saveError(&UnmarshalTypeError{Value: "bool", Type: v.Type(), Offset: int64(d.readIndex())}) - } - case reflect.Bool: - v.SetBool(value) - case reflect.Interface: - if v.NumMethod() == 0 { - v.Set(reflect.ValueOf(value)) - } else { - d.saveError(&UnmarshalTypeError{Value: "bool", Type: v.Type(), Offset: int64(d.readIndex())}) - } - } - - case '"': // string - s, ok := unquoteBytes(item) - if !ok { - if fromQuoted { - return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()) - } - panic(phasePanicMsg) - } - switch v.Kind() { - default: - d.saveError(&UnmarshalTypeError{Value: "string", Type: v.Type(), Offset: int64(d.readIndex())}) - case reflect.Slice: - if v.Type().Elem().Kind() != reflect.Uint8 { - d.saveError(&UnmarshalTypeError{Value: "string", Type: v.Type(), Offset: int64(d.readIndex())}) - break - } - b := make([]byte, base64.StdEncoding.DecodedLen(len(s))) - n, err := base64.StdEncoding.Decode(b, s) - if err != nil { - d.saveError(err) - break - } - v.SetBytes(b[:n]) - case reflect.String: - t := string(s) - if v.Type() == numberType && !isValidNumber(t) { - return fmt.Errorf("json: invalid number literal, trying to unmarshal %q into Number", item) - } - v.SetString(t) - case reflect.Interface: - if v.NumMethod() == 0 { - v.Set(reflect.ValueOf(string(s))) - } else { - d.saveError(&UnmarshalTypeError{Value: "string", Type: v.Type(), Offset: int64(d.readIndex())}) - } - } - - default: // number - if c != '-' && (c < '0' || c > '9') { - if fromQuoted { - return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()) - } - panic(phasePanicMsg) - } - switch v.Kind() { - default: - if v.Kind() == reflect.String && v.Type() == numberType { - // s must be a valid number, because it's - // already been tokenized. - v.SetString(string(item)) - break - } - if fromQuoted { - return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()) - } - d.saveError(&UnmarshalTypeError{Value: "number", Type: v.Type(), Offset: int64(d.readIndex())}) - case reflect.Interface: - n, err := d.convertNumber(string(item)) - if err != nil { - d.saveError(err) - break - } - if v.NumMethod() != 0 { - d.saveError(&UnmarshalTypeError{Value: "number", Type: v.Type(), Offset: int64(d.readIndex())}) - break - } - v.Set(reflect.ValueOf(n)) - - case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64: - n, err := strconv.ParseInt(string(item), 10, 64) - if err != nil || v.OverflowInt(n) { - d.saveError(&UnmarshalTypeError{Value: "number " + string(item), Type: v.Type(), Offset: int64(d.readIndex())}) - break - } - v.SetInt(n) - - case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr: - n, err := strconv.ParseUint(string(item), 10, 64) - if err != nil || v.OverflowUint(n) { - d.saveError(&UnmarshalTypeError{Value: "number " + string(item), Type: v.Type(), Offset: int64(d.readIndex())}) - break - } - v.SetUint(n) - - case reflect.Float32, reflect.Float64: - n, err := strconv.ParseFloat(string(item), v.Type().Bits()) - if err != nil || v.OverflowFloat(n) { - d.saveError(&UnmarshalTypeError{Value: "number " + string(item), Type: v.Type(), Offset: int64(d.readIndex())}) - break - } - v.SetFloat(n) - } - } - return nil -} - -// The xxxInterface routines build up a value to be stored -// in an empty interface. They are not strictly necessary, -// but they avoid the weight of reflection in this common case. - -// valueInterface is like value but returns any. -func (d *decodeState) valueInterface() (val any) { - switch d.opcode { - default: - panic(phasePanicMsg) - case scanBeginArray: - val = d.arrayInterface() - d.scanNext() - case scanBeginObject: - val = d.objectInterface() - d.scanNext() - case scanBeginLiteral: - val = d.literalInterface() - } - return -} - -// arrayInterface is like array but returns []any. -func (d *decodeState) arrayInterface() []any { - var v = make([]any, 0) - for { - // Look ahead for ] - can only happen on first iteration. - d.scanWhile(scanSkipSpace) - if d.opcode == scanEndArray { - break - } - - v = append(v, d.valueInterface()) - - // Next token must be , or ]. - if d.opcode == scanSkipSpace { - d.scanWhile(scanSkipSpace) - } - if d.opcode == scanEndArray { - break - } - if d.opcode != scanArrayValue { - panic(phasePanicMsg) - } - } - return v -} - -// objectInterface is like object but returns map[string]any. -func (d *decodeState) objectInterface() map[string]any { - m := make(map[string]any) - for { - // Read opening " of string key or closing }. - d.scanWhile(scanSkipSpace) - if d.opcode == scanEndObject { - // closing } - can only happen on first iteration. - break - } - if d.opcode != scanBeginLiteral { - panic(phasePanicMsg) - } - - // Read string key. - start := d.readIndex() - d.rescanLiteral() - item := d.data[start:d.readIndex()] - key, ok := unquote(item) - if !ok { - panic(phasePanicMsg) - } - - // Read : before value. - if d.opcode == scanSkipSpace { - d.scanWhile(scanSkipSpace) - } - if d.opcode != scanObjectKey { - panic(phasePanicMsg) - } - d.scanWhile(scanSkipSpace) - - // Read value. - m[key] = d.valueInterface() - - // Next token must be , or }. - if d.opcode == scanSkipSpace { - d.scanWhile(scanSkipSpace) - } - if d.opcode == scanEndObject { - break - } - if d.opcode != scanObjectValue { - panic(phasePanicMsg) - } - } - return m -} - -// literalInterface consumes and returns a literal from d.data[d.off-1:] and -// it reads the following byte ahead. The first byte of the literal has been -// read already (that's how the caller knows it's a literal). -func (d *decodeState) literalInterface() any { - // All bytes inside literal return scanContinue op code. - start := d.readIndex() - d.rescanLiteral() - - item := d.data[start:d.readIndex()] - - switch c := item[0]; c { - case 'n': // null - return nil - - case 't', 'f': // true, false - return c == 't' - - case '"': // string - s, ok := unquote(item) - if !ok { - panic(phasePanicMsg) - } - return s - - default: // number - if c != '-' && (c < '0' || c > '9') { - panic(phasePanicMsg) - } - n, err := d.convertNumber(string(item)) - if err != nil { - d.saveError(err) - } - return n - } -} - -// getu4 decodes \uXXXX from the beginning of s, returning the hex value, -// or it returns -1. -func getu4(s []byte) rune { - if len(s) < 6 || s[0] != '\\' || s[1] != 'u' { - return -1 - } - var r rune - for _, c := range s[2:6] { - switch { - case '0' <= c && c <= '9': - c = c - '0' - case 'a' <= c && c <= 'f': - c = c - 'a' + 10 - case 'A' <= c && c <= 'F': - c = c - 'A' + 10 - default: - return -1 - } - r = r*16 + rune(c) - } - return r -} - -// unquote converts a quoted JSON string literal s into an actual string t. -// The rules are different than for Go, so cannot use strconv.Unquote. -func unquote(s []byte) (t string, ok bool) { - s, ok = unquoteBytes(s) - t = string(s) - return -} - -// unquoteBytes should be an internal detail, -// but widely used packages access it using linkname. -// Notable members of the hall of shame include: -// - github.com/bytedance/sonic -// -// Do not remove or change the type signature. -// See go.dev/issue/67401. -// -//go:linkname unquoteBytes -func unquoteBytes(s []byte) (t []byte, ok bool) { - if len(s) < 2 || s[0] != '"' || s[len(s)-1] != '"' { - return - } - s = s[1 : len(s)-1] - - // Check for unusual characters. If there are none, - // then no unquoting is needed, so return a slice of the - // original bytes. - r := 0 - for r < len(s) { - c := s[r] - if c == '\\' || c == '"' || c < ' ' { - break - } - if c < utf8.RuneSelf { - r++ - continue - } - rr, size := utf8.DecodeRune(s[r:]) - if rr == utf8.RuneError && size == 1 { - break - } - r += size - } - if r == len(s) { - return s, true - } - - b := make([]byte, len(s)+2*utf8.UTFMax) - w := copy(b, s[0:r]) - for r < len(s) { - // Out of room? Can only happen if s is full of - // malformed UTF-8 and we're replacing each - // byte with RuneError. - if w >= len(b)-2*utf8.UTFMax { - nb := make([]byte, (len(b)+utf8.UTFMax)*2) - copy(nb, b[0:w]) - b = nb - } - switch c := s[r]; { - case c == '\\': - r++ - if r >= len(s) { - return - } - switch s[r] { - default: - return - case '"', '\\', '/', '\'': - b[w] = s[r] - r++ - w++ - case 'b': - b[w] = '\b' - r++ - w++ - case 'f': - b[w] = '\f' - r++ - w++ - case 'n': - b[w] = '\n' - r++ - w++ - case 'r': - b[w] = '\r' - r++ - w++ - case 't': - b[w] = '\t' - r++ - w++ - case 'u': - r-- - rr := getu4(s[r:]) - if rr < 0 { - return - } - r += 6 - if utf16.IsSurrogate(rr) { - rr1 := getu4(s[r:]) - if dec := utf16.DecodeRune(rr, rr1); dec != unicode.ReplacementChar { - // A valid pair; consume. - r += 6 - w += utf8.EncodeRune(b[w:], dec) - break - } - // Invalid surrogate; fall back to replacement rune. - rr = unicode.ReplacementChar - } - w += utf8.EncodeRune(b[w:], rr) - } - - // Quote, control characters are invalid. - case c == '"', c < ' ': - return - - // ASCII - case c < utf8.RuneSelf: - b[w] = c - r++ - w++ - - // Coerce to well-formed UTF-8. - default: - rr, size := utf8.DecodeRune(s[r:]) - r += size - w += utf8.EncodeRune(b[w:], rr) - } - } - return b[0:w], true -} diff --git a/vendor/github.com/anthropics/anthropic-sdk-go/internal/encoding/json/encode.go b/vendor/github.com/anthropics/anthropic-sdk-go/internal/encoding/json/encode.go deleted file mode 100644 index 98b819d4a405f470b53eebd4558496bd2b612a8c..0000000000000000000000000000000000000000 --- a/vendor/github.com/anthropics/anthropic-sdk-go/internal/encoding/json/encode.go +++ /dev/null @@ -1,1398 +0,0 @@ -// Vendored from Go 1.24.0-pre-release -// To find alterations, check package shims, and comments beginning in SHIM(). -// -// Copyright 2010 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -// Package json implements encoding and decoding of JSON as defined in -// RFC 7159. The mapping between JSON and Go values is described -// in the documentation for the Marshal and Unmarshal functions. -// -// See "JSON and Go" for an introduction to this package: -// https://golang.org/doc/articles/json_and_go.html -package json - -import ( - "bytes" - "cmp" - "encoding" - "encoding/base64" - "fmt" - "github.com/anthropics/anthropic-sdk-go/internal/encoding/json/sentinel" - "github.com/anthropics/anthropic-sdk-go/internal/encoding/json/shims" - "math" - "reflect" - "slices" - "strconv" - "strings" - "sync" - "unicode" - "unicode/utf8" - _ "unsafe" // for linkname -) - -// Marshal returns the JSON encoding of v. -// -// Marshal traverses the value v recursively. -// If an encountered value implements [Marshaler] -// and is not a nil pointer, Marshal calls [Marshaler.MarshalJSON] -// to produce JSON. If no [Marshaler.MarshalJSON] method is present but the -// value implements [encoding.TextMarshaler] instead, Marshal calls -// [encoding.TextMarshaler.MarshalText] and encodes the result as a JSON string. -// The nil pointer exception is not strictly necessary -// but mimics a similar, necessary exception in the behavior of -// [Unmarshaler.UnmarshalJSON]. -// -// Otherwise, Marshal uses the following type-dependent default encodings: -// -// Boolean values encode as JSON booleans. -// -// Floating point, integer, and [Number] values encode as JSON numbers. -// NaN and +/-Inf values will return an [UnsupportedValueError]. -// -// String values encode as JSON strings coerced to valid UTF-8, -// replacing invalid bytes with the Unicode replacement rune. -// So that the JSON will be safe to embed inside HTML tag. -func (p *Policy) addDefaultSkipElementContent() { - p.init() - - p.setOfElementsToSkipContent["frame"] = struct{}{} - p.setOfElementsToSkipContent["frameset"] = struct{}{} - p.setOfElementsToSkipContent["iframe"] = struct{}{} - p.setOfElementsToSkipContent["noembed"] = struct{}{} - p.setOfElementsToSkipContent["noframes"] = struct{}{} - p.setOfElementsToSkipContent["noscript"] = struct{}{} - p.setOfElementsToSkipContent["nostyle"] = struct{}{} - p.setOfElementsToSkipContent["object"] = struct{}{} - p.setOfElementsToSkipContent["script"] = struct{}{} - p.setOfElementsToSkipContent["style"] = struct{}{} - p.setOfElementsToSkipContent["title"] = struct{}{} -} diff --git a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go b/vendor/github.com/microcosm-cc/bluemonday/sanitize.go deleted file mode 100644 index 47c31f7daf772841498102df025085126d5d5f68..0000000000000000000000000000000000000000 --- a/vendor/github.com/microcosm-cc/bluemonday/sanitize.go +++ /dev/null @@ -1,1096 +0,0 @@ -// Copyright (c) 2014, David Kitchen