modify the location of option

Author: demoManito

api/metadata/metadata.pb.go

@@ -15,10 +15,10 @@ import (
 )
 
 const (
-	contextPackage          = protogen.GoImportPath("context")
-	transportHTTPPackage    = protogen.GoImportPath("github.com/go-kratos/kratos/v2/transport/http")
-	bindingPackage          = protogen.GoImportPath("github.com/go-kratos/kratos/v2/transport/http/binding")
-	formEncodeOptionPackage = protogen.GoImportPath("github.com/go-kratos/kratos/v2/encoding/form/option")
+	contextPackage       = protogen.GoImportPath("context")
+	transportHTTPPackage = protogen.GoImportPath("github.com/go-kratos/kratos/v2/transport/http")
+	bindingPackage       = protogen.GoImportPath("github.com/go-kratos/kratos/v2/transport/http/binding")
+	formPackage          = protogen.GoImportPath("github.com/go-kratos/kratos/v2/encoding/form")
 )
 
 var methodSets = make(map[string]int)
@@ -55,7 +55,7 @@ func generateFileContent(gen *protogen.Plugin, file *protogen.File, g *protogen.
 	g.P("// is compatible with the kratos package it is being compiled against.")
 	g.P("var _ = new(", contextPackage.Ident("Context"), ")")
 	g.P("var _ = ", bindingPackage.Ident("EncodeURL"))
-	g.P("var _ = ", formEncodeOptionPackage.Ident("Encode"))
+	g.P("var _ = ", formPackage.Ident("Encode"))
 	g.P("const _ = ", transportHTTPPackage.Ident("SupportPackageIsVersion1"))
 	g.P()
 

api/metadata/metadata_grpc.pb.go

@@ -70,7 +70,7 @@ func New{{.ServiceType}}HTTPClient (client *http.Client) {{.ServiceType}}HTTPCli
 func (c *{{$svrType}}HTTPClientImpl) {{.Name}}(ctx context.Context, in *{{.Request}}, opts ...http.CallOption) (*{{.Reply}}, error) {
 	var out {{.Reply}}
 	pattern := "{{.Path}}"
-	path := binding.EncodeURL(pattern, in, {{not .HasBody}}, option.Encode().UseProtoTextAsKey({{.UseProtoTextEncodeURL}}))
+	path := binding.EncodeURL(pattern, in, {{not .HasBody}}, form.Encode().UseProtoTextAsKey({{.UseProtoTextEncodeURL}}))
 	opts = append(opts, http.Operation(Operation{{$svrType}}{{.OriginalName}}))
 	opts = append(opts, http.PathTemplate(pattern))
 	{{if .HasBody -}}

api/metadata/metadata_http.pb.go

@@ -1,4 +1,4 @@
-package option
+package form
 
 // EncodeOption is the encoding options.
 type EncodeOption struct {

cmd/protoc-gen-go-http/http.go

@@ -1,4 +1,4 @@
-package option
+package form
 
 import "testing"
 

cmd/protoc-gen-go-http/httpTemplate.tpl

@@ -12,7 +12,6 @@ import (
 	"google.golang.org/protobuf/types/known/wrapperspb"
 
 	"github.com/go-kratos/kratos/v2/encoding"
-	"github.com/go-kratos/kratos/v2/encoding/form/option"
 	bdtest "github.com/go-kratos/kratos/v2/internal/testdata/binding"
 	"github.com/go-kratos/kratos/v2/internal/testdata/complex"
 	ectest "github.com/go-kratos/kratos/v2/internal/testdata/encoding"
@@ -271,7 +270,7 @@ func TestEncodeFieldMask(t *testing.T) {
 	if v != "updateMask=foo,bar" {
 		t.Errorf("got %s", v)
 	}
-	v = EncodeFieldMask(req.ProtoReflect(), option.Encode().UseProtoTextAsKey(true))
+	v = EncodeFieldMask(req.ProtoReflect(), Encode().UseProtoTextAsKey(true))
 	if v != "update_mask=foo,bar" {
 		t.Errorf("got %s", v)
 	}
@@ -289,7 +288,7 @@ func TestOptional(t *testing.T) {
 		t.Fatalf("got %s", query.Encode())
 	}
 
-	query, _ = EncodeValues(req, option.Encode().UseProtoTextAsKey(true))
+	query, _ = EncodeValues(req, Encode().UseProtoTextAsKey(true))
 	if query.Encode() != "name=foo&opt_int32=100&sub.naming=bar" {
 		t.Fatalf("got %s", query.Encode())
 	}

encoding/form/option/encode.go renamed to encoding/form/encodeoption.go

@@ -11,12 +11,10 @@ import (
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"
-
-	"github.com/go-kratos/kratos/v2/encoding/form/option"
 )
 
 // EncodeValues encode a message into url values.
-func EncodeValues(msg any, opts ...*option.EncodeOption) (url.Values, error) {
+func EncodeValues(msg any, opts ...*EncodeOption) (url.Values, error) {
 	if msg == nil || (reflect.ValueOf(msg).Kind() == reflect.Ptr && reflect.ValueOf(msg).IsNil()) {
 		return url.Values{}, nil
 	}
@@ -31,8 +29,8 @@ func EncodeValues(msg any, opts ...*option.EncodeOption) (url.Values, error) {
 	return encoder.Encode(msg)
 }
 
-func encodeByField(u url.Values, path string, m protoreflect.Message, opts ...*option.EncodeOption) (finalErr error) {
-	opt := option.MergeEncodeOptions(opts...)
+func encodeByField(u url.Values, path string, m protoreflect.Message, opts ...*EncodeOption) (finalErr error) {
+	opt := MergeEncodeOptions(opts...)
 	m.Range(func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
 		var (
 			key     string
@@ -180,8 +178,8 @@ func encodeMessage(msgDescriptor protoreflect.MessageDescriptor, value protorefl
 }
 
 // EncodeFieldMask return field mask name=paths
-func EncodeFieldMask(m protoreflect.Message, opts ...*option.EncodeOption) (query string) {
-	opt := option.MergeEncodeOptions(opts...)
+func EncodeFieldMask(m protoreflect.Message, opts ...*EncodeOption) (query string) {
+	opt := MergeEncodeOptions(opts...)
 	m.Range(func(fd protoreflect.FieldDescriptor, v protoreflect.Value) bool {
 		if fd.Kind() == protoreflect.MessageKind {
 			if msg := fd.Message(); msg.FullName() == fieldMaskFullName {