mirc adapt go-mir v4

assert/assert.go

@@ -20,6 +20,11 @@ type Binding[T any] interface {
 	Bind(T) mir.Error
 }
 
+// Binding2[R, P] binding interface for custom T context
+type Binding2[R, P any] interface {
+	Bind(R, P) mir.Error
+}
+
 // Render[T] render interface for custom T context
 type Render[T any] interface {
 	Render(T)
@@ -46,6 +51,11 @@ func RegisterType2[B, R any]() {
 	_typeAssertor = anyTypeAssertor2[B, R]{}
 }
 
+// RegisterType2[B, P, R] register custom TypeAssertor to assert Binding[B]/Render[R] interface
+func RegisterType3[B, P, R any]() {
+	_typeAssertor = anyTypeAssertor3[B, P, R]{}
+}
+
 // AssertBinding assert Binding interface for obj
 func AssertBinding(obj any) bool {
 	return _typeAssertor.AssertBinding(obj)

assert/assert_any.go

@@ -10,6 +10,9 @@ type anyTypeAssertor[T any] struct{}
 // anyTypeAssertor2 a common type assert for type B(Binding) and R(Render)
 type anyTypeAssertor2[B, R any] struct{}
 
+// anyTypeAssertor3 a common type assert for type B(Binding)/P(Params) and R(Render)
+type anyTypeAssertor3[B, P, R any] struct{}
+
 func (anyTypeAssertor[T]) AssertBinding(obj any) bool {
 	_, ok := obj.(Binding[T])
 	return ok
@@ -29,3 +32,13 @@ func (anyTypeAssertor2[B, R]) AssertRender(obj any) bool {
 	_, ok := obj.(Render[R])
 	return ok
 }
+
+func (anyTypeAssertor3[B, P, R]) AssertBinding(obj any) bool {
+	_, ok := obj.(Binding2[B, P])
+	return ok
+}
+
+func (anyTypeAssertor3[B, P, R]) AssertRender(obj any) bool {
+	_, ok := obj.(Render[R])
+	return ok
+}

core/core.go

@@ -207,6 +207,13 @@ func AssertType2[B, R any]() Option {
 	})
 }
 
+// AssertType3[B, P, R] register assert.TypeAssertor for custom B(Binding)/P(Params) and R(Render) type
+func AssertType3[B, P, R any]() Option {
+	return optFunc(func(_opts *InitOpts) {
+		assert.RegisterType3[B, P, R]()
+	})
+}
+
 // WatchCtxDone set generator whether watch context done when Register Servants in
 // generated code. default watch context done.
 func WatchCtxDone(enable bool) Option {

docs/content.en/docs/quick-start/_index.md

@@ -30,7 +30,7 @@ Mir is a toolkit to develop RESTful API backend service like develop service of
 
 ## Generate a simple template project
 ```bash
-% go install github.com/alimy/mir/mirc/v3@latest
+% go install github.com/alimy/mir/mirc/v4@latest
 % mirc new -h
 create template project
 

docs/content.en/docs/tutorials/generate-template-project.md

@@ -5,7 +5,7 @@ title: "Generate Template Project"
 
 ## Generate Template Project
 ```bash
-% go install github.com/alimy/mir/mirc/v3@latest
+% go install github.com/alimy/mir/mirc/v4@latest
 % mirc new -h
 create template project
 

docs/content.zh/docs/quck-start/_index.md

@@ -30,7 +30,7 @@ Mir 是一套提供类似gRPC服务开发体验的快速开发RESTful API后端
 
 ## 生成样板项目
 ```bash
-% go install github.com/alimy/mir/mirc/v3@latest
+% go install github.com/alimy/mir/mirc/v4@latest
 % mirc new -h
 create template project
 

docs/content.zh/docs/tutorials/generate-template-project.md

@@ -5,7 +5,7 @@ title: "生成样板项目"
 
 ## 生成样板项目
 ```bash
-% go get github.com/alimy/mir/mirc/v3@latest
+% go get github.com/alimy/mir/mirc/v4@latest
 % mirc new -h
 create template project
 

engine/httprouter/assert.go

@@ -9,14 +9,15 @@ import (
 
 	"github.com/alimy/mir/v4"
 	"github.com/alimy/mir/v4/assert"
+	"github.com/julienschmidt/httprouter"
 )
 
 func init() {
 	assert.Register(typeAssertor{})
 }
 
 type Binding interface {
-	Bind(*http.Request) mir.Error
+	Bind(*http.Request, httprouter.Params) mir.Error
 }
 
 type Render interface {

engine/httprouter/go.mod

@@ -2,4 +2,7 @@ module github.com/alimy/mir/engine/httprouter/v4
 
 go 1.19
 
-require github.com/alimy/mir/v4 v4.0.0-alpha.8
+require (
+	github.com/alimy/mir/v4 v4.0.0-alpha.8
+	github.com/julienschmidt/httprouter v1.3.0
+)

engine/httprouter/go.sum

@@ -1,2 +1,4 @@
 github.com/alimy/mir/v4 v4.0.0-alpha.8 h1:nYhkbDosfDa9lyzfrAv/axbb8leUISHhCMi1F76c2PE=
 github.com/alimy/mir/v4 v4.0.0-alpha.8/go.mod h1:d58dBvw2KImcVbAUANrciEV/of0arMNsI9c/5UNCMMc=
+github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=

examples/go.mod

@@ -1,6 +1,6 @@
 module github.com/alimy/mir-example/v4
 
-go 1.18
+go 1.19
 
 require (
 	github.com/alimy/mir/v4 v4.0.0-alpha.4

internal/generator/templates/httprouter_iface.tmpl

@@ -13,15 +13,15 @@ import (
 )
 {{- if .DeclareCoreInterface }}
 type _binding_ interface {
-	Bind(*http.Request) mir.Error
+	Bind(*http.Request, httprouter.Params) mir.Error
 }
 
 type _render_ interface {
 	Render(http.ResponseWriter)
 }
 
 type _default_ interface {
-	Bind(*http.Request, any) mir.Error
+	Bind(*http.Request, httprouter.Params, any) mir.Error
 	Render(http.ResponseWriter, any, mir.Error)
 }
 {{- end }}
@@ -52,9 +52,9 @@ func Register{{.TypeName}}Servant(router *httprouter.Router, s {{.TypeName}}) {
 	req := new({{.InName}})
 	{{if .IsBindIn -}}
 	var bv _binding_ = req
-	if err := bv.Bind(hr); err != nil {
+	if err := bv.Bind(hr, p); err != nil {
 	{{- else -}}
-	if err := s.Bind(hr, req); err != nil {
+	if err := s.Bind(hr, p, req); err != nil {
 	{{- end }}
 		s.Render(rw, nil, err)
 		return
@@ -89,9 +89,9 @@ func Register{{.TypeName}}Servant(router *httprouter.Router, s {{.TypeName}}) {
 	req := new({{.InName}})
 	{{if .IsBindIn -}}
 	var bv _binding_ = req
-	if err := bv.Bind(hr); err != nil {
+	if err := bv.Bind(hr, p); err != nil {
 	{{- else -}}
-	if err := s.Bind(hr, req); err != nil {
+	if err := s.Bind(hr, p, req); err != nil {
 	{{- end }}
 		s.Render(rw, nil, err)
 		return
@@ -116,7 +116,8 @@ func Register{{.TypeName}}Servant(router *httprouter.Router, s {{.TypeName}}) {
 		{{range .AnyHttpMethods}}        router.Handle("{{.}}", "{{joinPath $.Group $field.Path}}", h)
 		{{end}}    }
 	{{end}}
-{{end}}}
+{{- end -}}
+}
 
 {{ $unimplementedServant := print "Unimplemented" .TypeName "Servant" }}
 // {{$unimplementedServant}} can be embedded to have forward compatible implementations.

internal/generator/templates/mux_iface.tmpl

@@ -127,7 +127,8 @@ func Register{{.TypeName}}Servant(e *mux.Router, s {{.TypeName}}) {
 	}).Methods({{.HttpMethodArgs}}){{if notEmptyStr .Host}}.
         Host("{{.Host}}"){{end}}{{if valideQuery .Queries}}.
         Queries({{inflateQuery .Queries}}){{end}}{{end}}
-{{end}}}
+{{- end -}}
+}
 
 {{ $unimplementedServant := print "Unimplemented" .TypeName "Servant" }}
 // {{$unimplementedServant}} can be embedded to have forward compatible implementations.

mirc/Makefile

@@ -48,7 +48,7 @@ fmt:
 .PHONY: check-all
 check-all: check-debug-all
 
-STYLES = chi hertz echo fiber fiber-v2 gin httprouter iris macaron mux
+STYLES = chi hertz echo fiber gin httprouter iris macaron mux
 .PHONY: check-debug-all
 check-debug-all:
 	@for target in $(STYLES); do \

mirc/templates/chi/go.mod.tmpl

@@ -1,11 +1,12 @@
 module {{ .PkgName }}
 
-go 1.18
+go 1.19
 
 require (
-	github.com/alimy/mir/v4 v3.2.1
+	github.com/alimy/mir/v4 v4.0.0-beta.1
 	github.com/go-chi/chi/v5 v5.0.8
 )
+
 {{if notEmptyStr .MirPkgName }}
 replace (
     github.com/alimy/mir/v4 => {{ .MirPkgName }}

mirc/templates/chi/go.sum.tmpl

@@ -1,4 +1,4 @@
-github.com/alimy/mir/v4 v3.2.1 h1:vnAHdqzMccP8C0DDyY3hAV50cVNBfDopgcyvv8TL9L4=
-github.com/alimy/mir/v4 v3.2.1/go.mod h1:ybhT2ijOiDn0lLwWzIY6vXdv+uzZrctS7VFfczcXBWU=
+github.com/alimy/mir/v4 v4.0.0-beta.1 h1:DEL1zr/SdN71Jz/xbF0RTXNN2GdUkQtb1jAAFwJG3bU=
+github.com/alimy/mir/v4 v4.0.0-beta.1/go.mod h1:d58dBvw2KImcVbAUANrciEV/of0arMNsI9c/5UNCMMc=
 github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
 github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=