Add Config.QueryOptions

client_test.go

@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
+	"strconv"
 	"strings"
 	"testing"
 	"time"
@@ -378,7 +379,11 @@ func TestClient_With(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch {
 		case r.Method == http.MethodGet && r.URL.Path == "/echo":
-			err := json.NewEncoder(w).Encode(map[string]string{"message": r.Header.Get("Message")})
+			cnt, _ := strconv.Atoi(r.URL.Query().Get("count"))
+			if cnt == 0 {
+				cnt = 1
+			}
+			err := json.NewEncoder(w).Encode(map[string]string{"message": strings.Repeat(r.Header.Get("Message"), cnt)})
 			if err != nil {
 				w.WriteHeader(http.StatusInternalServerError)
 				return
@@ -412,14 +417,15 @@ func TestClient_With(t *testing.T) {
 	var resp2 Response
 	cli = cli.With(
 		hx.Header("Message", "bar"),
+		hx.Query("count", "3"),
 	)
 	err = cli.Get(context.Background(), ts.URL+"/echo",
 		hx.WhenSuccess(hx.AsJSON(&resp2)),
 	)
 	if err != nil {
 		t.Errorf("returned %v, want nil", err)
 	}
-	if got, want := resp2.Message, "bar"; got != want {
+	if got, want := resp2.Message, "barbarbar"; got != want {
 		t.Errorf("returned %q, want %q", got, want)
 	}
 }

config.go

@@ -9,6 +9,7 @@ import (
 
 type Config struct {
 	URLOptions       []func(context.Context, *url.URL) error
+	QueryOptions     []func(context.Context, url.Values) error
 	BodyOption       func(context.Context) (io.Reader, error)
 	ClientOptions    []func(context.Context, *http.Client) error
 	RequestHandlers  []RequestHandler
@@ -78,6 +79,18 @@ func (cfg *Config) buildURL(ctx context.Context) (*url.URL, error) {
 			return nil, err
 		}
 	}
+	if n := len(cfg.QueryOptions); n > 0 {
+		q := make(url.Values, n)
+		for _, f := range cfg.QueryOptions {
+			err := f(ctx, q)
+			if err != nil {
+				return nil, err
+			}
+		}
+		if len(q) > 0 {
+			u.RawQuery = q.Encode()
+		}
+	}
 
 	return u, nil
 }

option.go

@@ -85,11 +85,11 @@ func URL(urlStr string) Option {
 
 // Query sets an url query parameter.
 func Query(k, v string) Option {
-	return newURLOption(func(_ context.Context, u *url.URL) error {
-		q := u.Query()
-		q.Set(k, v)
-		u.RawQuery = q.Encode()
-		return nil
+	return OptionFunc(func(c *Config) {
+		c.QueryOptions = append(c.QueryOptions, func(_ context.Context, q url.Values) error {
+			q.Set(k, v)
+			return nil
+		})
 	})
 }