refactor: Move generated code to api package

cmd/root.go

@@ -36,17 +36,11 @@ func Execute() {
 }
 
 func init() {
-	//
-	// Add commands to the root command.
-	//
 	rootCmd.AddCommand(NewConvertCommand().Command)
 	rootCmd.AddCommand(NewDocsCommand().Command)
 	rootCmd.AddCommand(server.NewCommand().Command)
 
-	//
 	// Register flags.
-	//
-
 	pflags := rootCmd.PersistentFlags()
 
 	pflags.BoolP(ArgsVerbose, ArgsVerboseShorthand, false, "Enable verbose output")
@@ -58,6 +52,7 @@ func initializeConfig(cmd *cobra.Command) error {
 
 	v.SetConfigName(defaultConfigFilename)
 	v.AddConfigPath(".")
+	// Add glasscms config directory to the search path.
 
 	var cfgNotFoundError viper.ConfigFileNotFoundError
 	if err := v.ReadInConfig(); err != nil {

cmd/server/server.go

@@ -1,9 +1,14 @@
 package server
 
 import (
+	"github.com/glass-cms/glasscms/database"
 	"github.com/spf13/cobra"
 )
 
+type Config struct {
+	Database *database.Config `mapstructure:"database"`
+}
+
 type Command struct {
 	Command *cobra.Command
 }

codegen-server.yaml

@@ -1,5 +1,5 @@
-package: server
+package: api
 generate:
   std-http-server: true
   models: true
-output: server/server.gen.go
+output: api/api.gen.go

config.yaml

@@ -1 +1,4 @@
-output: ./out/
+output: ./out/
+database:
+  driver: sqlite3
+

database/config.go

@@ -33,18 +33,18 @@ var (
 // Config represents the configuration for a database connection.
 type Config struct {
 	// Driver is the name of the database driver.
-	Driver string
+	Driver string `mapstructure:"driver"`
 
 	// DSN is the Data Source Name. It specifies the username, password, and database name
 	// that are used to connect to the database.
-	DSN string
+	DSN string `mapstructure:"dsn"`
 
 	// MaxConnection is the maximum number of connections that can be opened to the database.
-	MaxConnections int
+	MaxConnections int `mapstructure:"max_connections"`
 
 	// MaxIdleConnections is the maximum number of idle connections that can be maintained.
 	// Idle connections are connections that are open but not in use.
-	MaxIdleConnections int
+	MaxIdleConnections int `mapstructure:"max_idle_connections"`
 }
 
 // NewConnection creates a new database connection using the provided configuration.

item/item.go

@@ -9,7 +9,6 @@ const (
 type Item struct {
 	UID string `json:"uid" yaml:"uid"`
 	// Name is the full resource name of the item.
-	// Format: collections/{collection}/items/{item}
 	Name        string         `json:"name" yaml:"name"`
 	DisplayName string         `json:"display_name" yaml:"display_name"`
 	Path        string         `json:"path" yaml:"path"`

server/item.go

@@ -0,0 +1,18 @@
+package server
+
+import "net/http"
+
+func (s *Server) ItemsDelete(w http.ResponseWriter, _ *http.Request) {
+	// TODO.
+	w.WriteHeader(http.StatusNotImplemented)
+}
+
+func (s *Server) ItemsList(w http.ResponseWriter, _ *http.Request) {
+	// TODO.
+	w.WriteHeader(http.StatusNotImplemented)
+}
+
+func (s *Server) ItemsCreate(w http.ResponseWriter, _ *http.Request) {
+	// TODO.
+	w.WriteHeader(http.StatusNotImplemented)
+}

server/server.go

@@ -6,6 +6,8 @@ import (
 	"log/slog"
 	"net/http"
 	"time"
+
+	"github.com/glass-cms/glasscms/api"
 )
 
 const (
@@ -20,7 +22,7 @@ type Server struct {
 	server *http.Server
 }
 
-var _ ServerInterface = (*Server)(nil)
+var _ api.ServerInterface = (*Server)(nil)
 
 func New(
 	logger *slog.Logger,
@@ -31,7 +33,7 @@ func New(
 	}
 
 	server.server = &http.Server{
-		Handler:      HandlerFromMux(server, http.NewServeMux()),
+		Handler:      api.HandlerFromMux(server, http.NewServeMux()),
 		Addr:         fmt.Sprintf(":%v", DefaultPort),
 		ReadTimeout:  DefaultReadTimeout,
 		WriteTimeout: DefaultWriteTimeout,
@@ -64,18 +66,3 @@ func (s *Server) Shutdown() {
 
 	s.logger.Info("server stopped")
 }
-
-func (s *Server) ItemsDelete(w http.ResponseWriter, _ *http.Request) {
-	// TODO.
-	w.WriteHeader(http.StatusNotImplemented)
-}
-
-func (s *Server) ItemsList(w http.ResponseWriter, _ *http.Request) {
-	// TODO.
-	w.WriteHeader(http.StatusNotImplemented)
-}
-
-func (s *Server) ItemsCreate(w http.ResponseWriter, _ *http.Request) {
-	// TODO.
-	w.WriteHeader(http.StatusNotImplemented)
-}