Feature/added routes file

examples/bare/README.md

@@ -0,0 +1,12 @@
+
+Examples of gooo api.
+
+
+## How to run
+
+## Generate code from swagger.yml
+
+```bash
+go run cmd/app.go
+```
+

examples/bare/cmd/app.go

@@ -6,12 +6,12 @@ import (
 	"net/http"
 	"time"
 
+	"github.com/gooolib/logger"
 	"github.com/version-1/gooo/examples/bare/internal/swagger"
 	"github.com/version-1/gooo/pkg/core/api/app"
 	"github.com/version-1/gooo/pkg/core/api/request"
 	"github.com/version-1/gooo/pkg/core/api/response"
 	"github.com/version-1/gooo/pkg/core/api/route"
-	"github.com/gooolib/logger"
 	"github.com/version-1/gooo/pkg/toolkit/middleware"
 )
 

examples/core/README.md

@@ -0,0 +1,18 @@
+
+Examples of gooo to generate code from a swagger.yml file.
+
+
+## How to run
+
+## Generate code from swagger.yml
+
+```bash
+go run cmd/app.go
+```
+
+## Run Server
+
+```bash
+
+go run generated/cmd/main.go
+```

examples/core/generated/cmd/main.go

@@ -0,0 +1,35 @@
+package main
+
+// This is a generated file. DO NOT EDIT manually.
+import (
+	"context"
+	"log"
+	"net/http"
+
+	"github.com/gooolib/logger"
+	"github.com/version-1/gooo/examples/core/generated/internal/routes"
+	"github.com/version-1/gooo/pkg/core/api/app"
+)
+
+func main() {
+	cfg := &app.Config{}
+	cfg.SetLogger(logger.DefaultLogger)
+
+	server := &app.App{
+		Addr:   ":8080",
+		Config: cfg,
+		ErrorHandler: func(w http.ResponseWriter, r *http.Request, err error) {
+			cfg.Logger().Errorf("Error: %+v", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			w.Write([]byte("Internal server error"))
+		},
+	}
+
+	routeList := routes.Routes()
+	app.WithDefaultMiddlewares(server, routeList...)
+
+	ctx := context.Background()
+	if err := server.Run(ctx); err != nil {
+		log.Fatalf("failed to run app: %s", err)
+	}
+}

examples/core/generated/internal/routes/routeimplments.go

@@ -0,0 +1,47 @@
+package routes
+
+import (
+	"github.com/version-1/gooo/examples/core/generated/internal/schema"
+	"github.com/version-1/gooo/pkg/core/api/request"
+	"github.com/version-1/gooo/pkg/core/api/response"
+)
+
+func GetUsers(res *response.Response[schema.User], req *request.Request[request.Void]) {
+	// do something
+}
+
+func PostUsers(res *response.Response[schema.User], req *request.Request[schema.MutateUser]) {
+	// do something
+}
+
+func PatchUsersId(res *response.Response[schema.User], req *request.Request[schema.MutateUser]) {
+	// do something
+}
+
+func DeleteUsersId(res *response.Response[schema.User], req *request.Request[request.Void]) {
+	// do something
+}
+
+func GetUsersId(res *response.Response[schema.User], req *request.Request[request.Void]) {
+	// do something
+}
+
+func GetPosts(res *response.Response[schema.Post], req *request.Request[request.Void]) {
+	// do something
+}
+
+func PostPosts(res *response.Response[schema.Post], req *request.Request[schema.MutatePost]) {
+	// do something
+}
+
+func PatchPostsId(res *response.Response[schema.Post], req *request.Request[schema.MutatePost]) {
+	// do something
+}
+
+func DeletePostsId(res *response.Response[schema.Post], req *request.Request[request.Void]) {
+	// do something
+}
+
+func GetPostsId(res *response.Response[schema.Post], req *request.Request[request.Void]) {
+	// do something
+}

examples/core/generated/internal/routes/routes.go

@@ -0,0 +1,90 @@
+package routes
+
+// This is a generated file. DO NOT EDIT manually.
+import (
+	"github.com/version-1/gooo/examples/core/generated/internal/schema"
+	"github.com/version-1/gooo/pkg/core/api/request"
+	"github.com/version-1/gooo/pkg/core/api/response"
+	"github.com/version-1/gooo/pkg/core/api/route"
+)
+
+func PostUsersHandler() route.HandlerInterface {
+	return route.JSON[schema.MutateUser, schema.User]().Get("/users", func(res *response.Response[schema.User], req *request.Request[schema.MutateUser]) {
+		PostUsers(res, req)
+	})
+}
+
+func GetUsersHandler() route.HandlerInterface {
+	return route.JSON[request.Void, schema.User]().Get("/users", func(res *response.Response[schema.User], req *request.Request[request.Void]) {
+		GetUsers(res, req)
+	})
+}
+
+func GetUsersIdHandler() route.HandlerInterface {
+	return route.JSON[request.Void, schema.User]().Get("/users/{id}", func(res *response.Response[schema.User], req *request.Request[request.Void]) {
+		GetUsersId(res, req)
+	})
+}
+
+func PatchUsersIdHandler() route.HandlerInterface {
+	return route.JSON[schema.MutateUser, schema.User]().Get("/users/{id}", func(res *response.Response[schema.User], req *request.Request[schema.MutateUser]) {
+		PatchUsersId(res, req)
+	})
+}
+
+func DeleteUsersIdHandler() route.HandlerInterface {
+	return route.JSON[request.Void, schema.User]().Get("/users/{id}", func(res *response.Response[schema.User], req *request.Request[request.Void]) {
+		DeleteUsersId(res, req)
+	})
+}
+
+func GetPostsHandler() route.HandlerInterface {
+	return route.JSON[request.Void, schema.Post]().Get("/posts", func(res *response.Response[schema.Post], req *request.Request[request.Void]) {
+		GetPosts(res, req)
+	})
+}
+
+func PostPostsHandler() route.HandlerInterface {
+	return route.JSON[schema.MutatePost, schema.Post]().Get("/posts", func(res *response.Response[schema.Post], req *request.Request[schema.MutatePost]) {
+		PostPosts(res, req)
+	})
+}
+
+func GetPostsIdHandler() route.HandlerInterface {
+	return route.JSON[request.Void, schema.Post]().Get("/posts/{id}", func(res *response.Response[schema.Post], req *request.Request[request.Void]) {
+		GetPostsId(res, req)
+	})
+}
+
+func PatchPostsIdHandler() route.HandlerInterface {
+	return route.JSON[schema.MutatePost, schema.Post]().Get("/posts/{id}", func(res *response.Response[schema.Post], req *request.Request[schema.MutatePost]) {
+		PatchPostsId(res, req)
+	})
+}
+
+func DeletePostsIdHandler() route.HandlerInterface {
+	return route.JSON[request.Void, schema.Post]().Get("/posts/{id}", func(res *response.Response[schema.Post], req *request.Request[request.Void]) {
+		DeletePostsId(res, req)
+	})
+}
+
+func Routes() []route.HandlerInterface {
+	routes := route.GroupHandler{
+		Path: "/users",
+
+		Handlers: []route.HandlerInterface{
+			PostUsersHandler(),
+			GetUsersHandler(),
+			GetUsersIdHandler(),
+			PatchUsersIdHandler(),
+			DeleteUsersIdHandler(),
+			GetPostsHandler(),
+			PostPostsHandler(),
+			GetPostsIdHandler(),
+			PatchPostsIdHandler(),
+			DeletePostsIdHandler(),
+		},
+	}
+
+	return routes.Children()
+}

pkg/core/schema/generate.go

@@ -22,11 +22,24 @@ func NewGenerator(r *v3_0_0.RootSchema, outDir string, baseURL string) *Generato
 
 func (g *Generator) Generate() error {
 	schemaFile := template.SchemaFile{Schema: g.r, PackageName: "schema"}
+	routeImplementsFile := template.RouteImplementsFile{Schema: g.r, PackageName: "routes"}
+	routeImplementsFile.Dependencies = []string{
+		fmt.Sprintf("%s/%s", g.baseURL, filepath.Dir(schemaFile.Filename())),
+	}
+	routesFile := template.RoutesFile{Schema: g.r, PackageName: "routes"}
+	routesFile.Dependencies = []string{
+		fmt.Sprintf("%s/%s", g.baseURL, filepath.Dir(schemaFile.Filename())),
+	}
+
 	mainFile := template.Main{Schema: g.r}
 
-	mainFile.Dependencies = []string{fmt.Sprintf("%s/%s", g.baseURL, filepath.Dir(schemaFile.Filename()))}
+	mainFile.Dependencies = []string{
+		fmt.Sprintf("%s/%s", g.baseURL, filepath.Dir(routesFile.Filename())),
+	}
 
 	g.outputs = append(g.outputs, schemaFile)
+	g.outputs = append(g.outputs, routeImplementsFile)
+	g.outputs = append(g.outputs, routesFile)
 	g.outputs = append(g.outputs, mainFile)
 
 	for _, tmpl := range g.outputs {

pkg/core/schema/template/common.go

@@ -0,0 +1,29 @@
+package template
+
+import (
+	"bytes"
+	"embed"
+	"text/template"
+
+	"github.com/gooolib/errors"
+)
+
+//go:embed components/common/*.go.tmpl
+var commonTmpl embed.FS
+
+type CommonPlainTemplateParams struct {
+	Package      string
+	HeadComments string
+	Dependencies []string
+	Content      string
+}
+
+func (p CommonPlainTemplateParams) Render() (string, error) {
+	var b bytes.Buffer
+	tmpl := template.Must(template.New("plain").ParseFS(commonTmpl, "components/common/plain.go.tmpl"))
+	if err := tmpl.ExecuteTemplate(&b, "plain.go.tmpl", p); err != nil {
+		return "", errors.Wrap(err)
+	}
+
+	return b.String(), nil
+}

pkg/core/schema/template/components/common/plain.go.tmpl

@@ -0,0 +1,10 @@
+package {{ .Package }}
+
+{{ .HeadComments }}
+import (
+  {{ range .Dependencies }}
+    "{{ . }}"
+  {{ end }}
+)
+
+{{ .Content }}

pkg/core/schema/template/components/entry.go.tmpl

@@ -21,19 +21,12 @@ func main() {
     },
   }
 
-  RegisterRoutes(server)
+  routeList := routes.Routes()
+  app.WithDefaultMiddlewares(server, routeList...)
+
   ctx := context.Background()
   if err := server.Run(ctx); err != nil {
     log.Fatalf("failed to run app: %s", err)
   }
 }
 
-func RegisterRoutes(srv *app.App) {
-  routes := route.GroupHandler{
-    Path: "/users",
-    Handlers: []route.HandlerInterface{
-      {{ .Routes }}
-    },
-  }
-  app.WithDefaultMiddlewares(srv, routes.Children()...)
-}

pkg/core/schema/template/components/routehandler.go.tmpl

@@ -0,0 +1,6 @@
+func {{ .FuncName }}Handler() route.HandlerInterface {
+	return route.JSON[{{.InputType}}, {{.OutputType}}]().Get("{{.Path}}", func(res *response.Response[{{ .OutputType }}], req *request.Request[{{ .InputType }}]) {
+    {{ .FuncName }}(res, req)
+	})
+}
+