mirc: optimize generate code more beutiful

alimy · Apr 4, 2020 · 00da520 · 00da520
1 parent c30dd2e
commit 00da520
Show file tree

Hide file tree

Showing 38 changed files with 382 additions and 382 deletions.
diff --git a/examples/mirc/main.go b/examples/mirc/main.go
@@ -7,8 +7,8 @@ package main
 import (
 	"log"
 
-	"github.com/alimy/mir/v2/core"
-	"github.com/alimy/mir/v2/engine"
+	. "github.com/alimy/mir/v2/core"
+	. "github.com/alimy/mir/v2/engine"
 
 	_ "github.com/alimy/mir/v2/examples/mirc/routes"
 	_ "github.com/alimy/mir/v2/examples/mirc/routes/v1"
@@ -18,12 +18,12 @@ import (
 //go:generate go run main.go
 func main() {
 	log.Println("generate code start")
-	opts := core.Options{
-		core.RunMode(core.InSerialDebugMode),
-		core.GeneratorName(core.GeneratorGin),
-		core.SinkPath("./gen"),
+	opts := Options{
+		RunMode(InSerialDebugMode),
+		GeneratorName(GeneratorGin),
+		SinkPath("./gen"),
 	}
-	if err := engine.Generate(opts); err != nil {
+	if err := Generate(opts); err != nil {
 		log.Fatal(err)
 	}
 	log.Println("generate code finish")

diff --git a/examples/mirc/routes/site.go b/examples/mirc/routes/site.go
@@ -5,17 +5,17 @@
 package routes
 
 import (
-	"github.com/alimy/mir/v2"
-	"github.com/alimy/mir/v2/engine"
+	. "github.com/alimy/mir/v2"
+	. "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-	engine.AddEntry(new(Site))
+	AddEntry(new(Site))
 }
 
 // Site mir's struct tag define
 type Site struct {
-	Chain    mir.Chain `mir:"-"`
-	Index    mir.Get   `mir:"/index/"`
-	Articles mir.Get   `mir:"/articles/:category/"`
+	Chain    Chain `mir:"-"`
+	Index    Get   `mir:"/index/"`
+	Articles Get   `mir:"/articles/:category/"`
 }
diff --git a/examples/mirc/routes/v1/site.go b/examples/mirc/routes/v1/site.go
@@ -5,18 +5,18 @@
 package v1
 
 import (
-	"github.com/alimy/mir/v2"
-	"github.com/alimy/mir/v2/engine"
+	. "github.com/alimy/mir/v2"
+	. "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-	engine.AddEntry(new(Site))
+	AddEntry(new(Site))
 }
 
 // Site mir's struct tag define
 type Site struct {
-	Chain    mir.Chain `mir:"-"`
-	Group    mir.Group `mir:"v1"`
-	Index    mir.Get   `mir:"/index/"`
-	Articles mir.Get   `mir:"/articles/:category/"`
+	Chain    Chain `mir:"-"`
+	Group    Group `mir:"v1"`
+	Index    Get   `mir:"/index/"`
+	Articles Get   `mir:"/articles/:category/"`
 }
diff --git a/examples/mirc/routes/v2/site.go b/examples/mirc/routes/v2/site.go
@@ -5,18 +5,18 @@
 package v2
 
 import (
-	"github.com/alimy/mir/v2"
-	"github.com/alimy/mir/v2/engine"
+	. "github.com/alimy/mir/v2"
+	. "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-	engine.AddEntry(new(Site))
+	AddEntry(new(Site))
 }
 
 // Site mir's struct tag define
 type Site struct {
-	Group    mir.Group `mir:"v2"`
-	Index    mir.Get   `mir:"/index/"`
-	Articles mir.Get   `mir:"/articles/:category/"`
-	Category mir.Get   `mir:"/category/"`
+	Group    Group `mir:"v2"`
+	Index    Get   `mir:"/index/"`
+	Articles Get   `mir:"/articles/:category/"`
+	Category Get   `mir:"/category/"`
 }
diff --git a/mirc/cmd/templates/chi_mirc_main.tmpl b/mirc/cmd/templates/chi_mirc_main.tmpl
@@ -3,8 +3,8 @@ package main
 import (
     "log"
 
-    "github.com/alimy/mir/v2/core"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2/core"
+    . "github.com/alimy/mir/v2/engine"
 
     _ "{{ .PkgName }}/mirc/routes"
     _ "{{ .PkgName }}/mirc/routes/v1"
@@ -14,12 +14,12 @@ import (
 //go:generate go run main.go
 func main() {
     log.Println("generate code start")
-    opts := core.Options{
-        core.RunMode(core.InSerialMode),
-        core.GeneratorName(core.GeneratorChi),
-        core.SinkPath("./gen"),
+    opts := Options{
+        RunMode(InSerialMode),
+        GeneratorName(GeneratorChi),
+        SinkPath("./gen"),
     }
-    if err := engine.Generate(opts); err != nil {
+    if err := Generate(opts); err != nil {
         log.Fatal(err)
     }
     log.Println("generate code finish")

diff --git a/mirc/cmd/templates/chi_mirc_routes_site.tmpl b/mirc/cmd/templates/chi_mirc_routes_site.tmpl
@@ -1,17 +1,17 @@
 package routes
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site interface info
 type Site struct {
-    Chain    mir.Chain `mir:"-"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/{category}/{id:[0-9]+}"`
+    Chain    Chain `mir:"-"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/{category}/{id:[0-9]+}"`
 }
diff --git a/mirc/cmd/templates/chi_mirc_routes_site_v1.tmpl b/mirc/cmd/templates/chi_mirc_routes_site_v1.tmpl
@@ -1,18 +1,18 @@
 package v1
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site v1 interface info
 type Site struct {
-    Chain    mir.Chain `mir:"-"`
-    Group    mir.Group `mir:"v1"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/{category}/{id:[0-9]+}"`
+    Chain    Chain `mir:"-"`
+    Group    Group `mir:"v1"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/{category}/{id:[0-9]+}"`
 }
diff --git a/mirc/cmd/templates/chi_mirc_routes_site_v2.tmpl b/mirc/cmd/templates/chi_mirc_routes_site_v2.tmpl
@@ -1,18 +1,18 @@
 package v2
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site v2 interface info
 type Site struct {
-    Group    mir.Group `mir:"v2"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/{category}/{id:[0-9]+}"`
-    Category mir.Get   `mir:"/category/"`
+    Group    Group `mir:"v2"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/{category}/{id:[0-9]+}"`
+    Category Get   `mir:"/category/"`
 }
diff --git a/mirc/cmd/templates/echo_mirc_main.tmpl b/mirc/cmd/templates/echo_mirc_main.tmpl
@@ -3,8 +3,8 @@ package main
 import (
     "log"
 
-    "github.com/alimy/mir/v2/core"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2/core"
+    . "github.com/alimy/mir/v2/engine"
 
     _ "{{ .PkgName }}/mirc/routes"
     _ "{{ .PkgName }}/mirc/routes/v1"
@@ -14,12 +14,12 @@ import (
 //go:generate go run main.go
 func main() {
     log.Println("generate code start")
-    opts := core.Options{
-        core.RunMode(core.InSerialMode),
-        core.GeneratorName(core.GeneratorEcho),
-        core.SinkPath("./gen"),
+    opts := Options{
+        RunMode(InSerialMode),
+        GeneratorName(GeneratorEcho),
+        SinkPath("./gen"),
     }
-    if err := engine.Generate(opts); err != nil {
+    if err := Generate(opts); err != nil {
         log.Fatal(err)
     }
     log.Println("generate code finish")

diff --git a/mirc/cmd/templates/echo_mirc_routes_site.tmpl b/mirc/cmd/templates/echo_mirc_routes_site.tmpl
@@ -1,17 +1,17 @@
 package routes
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site interface info
 type Site struct {
-    Chain    mir.Chain `mir:"-"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/:category/"`
+    Chain    Chain `mir:"-"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/:category/"`
 }
diff --git a/mirc/cmd/templates/echo_mirc_routes_site_v1.tmpl b/mirc/cmd/templates/echo_mirc_routes_site_v1.tmpl
@@ -1,18 +1,18 @@
 package v1
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site v1 interface info
 type Site struct {
-    Chain    mir.Chain `mir:"-"`
-    Group    mir.Group `mir:"v1"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/:category/"`
+    Chain    Chain `mir:"-"`
+    Group    Group `mir:"v1"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/:category/"`
 }
diff --git a/mirc/cmd/templates/echo_mirc_routes_site_v2.tmpl b/mirc/cmd/templates/echo_mirc_routes_site_v2.tmpl
@@ -1,18 +1,18 @@
 package v2
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site v2 interface info
 type Site struct {
-    Group    mir.Group `mir:"v2"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/:category/"`
-    Category mir.Get   `mir:"/category/"`
+    Group    Group `mir:"v2"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/:category/"`
+    Category Get   `mir:"/category/"`
 }
diff --git a/mirc/cmd/templates/fiber_mirc_main.tmpl b/mirc/cmd/templates/fiber_mirc_main.tmpl
@@ -3,8 +3,8 @@ package main
 import (
     "log"
 
-    "github.com/alimy/mir/v2/core"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2/core"
+    . "github.com/alimy/mir/v2/engine"
 
     _ "{{ .PkgName }}/mirc/routes"
     _ "{{ .PkgName }}/mirc/routes/v1"
@@ -14,13 +14,13 @@ import (
 //go:generate go run main.go
 func main() {
     log.Println("generate code start")
-    opts := core.Options{
-        core.RunMode(core.InSerialMode),
-        core.GeneratorName(core.GeneratorFiber),
-        core.NoneQuery(true),
-        core.SinkPath("./gen"),
+    opts := Options{
+        RunMode(InSerialMode),
+        GeneratorName(GeneratorFiber),
+        NoneQuery(true),
+        SinkPath("./gen"),
     }
-    if err := engine.Generate(opts); err != nil {
+    if err := Generate(opts); err != nil {
         log.Fatal(err)
     }
     log.Println("generate code finish")

diff --git a/mirc/cmd/templates/fiber_mirc_routes_site.tmpl b/mirc/cmd/templates/fiber_mirc_routes_site.tmpl
@@ -1,17 +1,17 @@
 package routes
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site interface info
 type Site struct {
-    Chain    mir.Chain `mir:"-"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/:category/"`
+    Chain    Chain `mir:"-"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/:category/"`
 }
diff --git a/mirc/cmd/templates/fiber_mirc_routes_site_v1.tmpl b/mirc/cmd/templates/fiber_mirc_routes_site_v1.tmpl
@@ -1,18 +1,18 @@
 package v1
 
 import (
-    "github.com/alimy/mir/v2"
-    "github.com/alimy/mir/v2/engine"
+    . "github.com/alimy/mir/v2"
+    . "github.com/alimy/mir/v2/engine"
 )
 
 func init() {
-    engine.AddEntry(new(Site))
+    AddEntry(new(Site))
 }
 
 // Site site v1 interface info
 type Site struct {
-    Chain    mir.Chain `mir:"-"`
-    Group    mir.Group `mir:"v1"`
-    Index    mir.Get   `mir:"/index/"`
-    Articles mir.Get   `mir:"/articles/:category/"`
+    Chain    Chain `mir:"-"`
+    Group    Group `mir:"v1"`
+    Index    Get   `mir:"/index/"`
+    Articles Get   `mir:"/articles/:category/"`
 }