refactor: new (simpler) version of the sl library

services/server/dev/dev.go

@@ -9,35 +9,39 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
+var Slot = sl.NewSlot[*Dev]()
+
 type Dev struct {
 	HtmlRouteBindings map[string]string
 }
 
-func (m *Dev) Initialize(l *sl.ServiceLocator) error {
-	m.HtmlRouteBindings = map[string]string{}
-
-	router, err := sl.Use[*routes.Router](l)
-	if err != nil {
-		return err
+func New(l *sl.ServiceLocator) (*Dev, error) {
+	dev := &Dev{
+		map[string]string{},
 	}
 
-	router.Get("/api/dev/routes", func(c *fiber.Ctx) error {
-		return c.JSON(m.HtmlRouteBindings)
+	router, err := sl.Use(l, routes.Api)
+	if err != nil {
+		return nil, err
+	}
+
+	router.Get("/dev/routes", func(c *fiber.Ctx) error {
+		return c.JSON(dev.HtmlRouteBindings)
 	})
 
-	return nil
+	return dev, nil
 }
 
 // UseVitePage this hook will link the provided "mountPoint" to the "frontendHtml" page
-func UseVitePage[T any](l *sl.ServiceLocator, mountPoint, frontendHtml string) func(c *fiber.Ctx) error {
+func UseVitePage(l *sl.ServiceLocator, mountPoint, frontendHtml string) func(c *fiber.Ctx) error {
 	log.Printf(`registering vite route %q for %q`, frontendHtml, mountPoint)
 
-	dev, err := sl.Use[*Dev](l)
+	dev, err := sl.Use(l, Slot)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	dev.HtmlRouteBindings[mountPoint] = path.Join("./frontend/", frontendHtml)
+	dev.HtmlRouteBindings[mountPoint] = frontendHtml
 
 	return func(c *fiber.Ctx) error {
 		return c.SendFile(path.Join("./out/frontend/", frontendHtml))

services/server/lista-utenti/lista-utenti.go

@@ -9,24 +9,22 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-type ListaUtenti struct{}
-
-func (s *ListaUtenti) Initialize(l *sl.ServiceLocator) error {
-
-	db, err := sl.Use[database.Database](l)
+func Configure(l *sl.ServiceLocator) error {
+	db, err := sl.Use(l, database.Slot)
 	if err != nil {
 		return err
 	}
 
-	router, err := sl.Use[*routes.Router](l)
+	r, err := sl.Use(l, routes.Root)
 	if err != nil {
 		return err
 	}
 
-	router.Get("/utenti",
-		dev.UseVitePage[ListaUtenti](l, "/utenti", "pages/lista-utenti/index.html"),
+	r.Get("/utenti",
+		dev.UseVitePage(l, "/utenti", "pages/lista-utenti/index.html"),
 	)
-	router.Get("/api/lista-utenti", func(c *fiber.Ctx) error {
+
+	r.Get("/api/lista-utenti", func(c *fiber.Ctx) error {
 		users, err := db.ReadUsers()
 		if err != nil {
 			return err

services/server/lista-utenti/lista-utenti_test.go

@@ -8,8 +8,6 @@ import (
 	"net/http"
 	"phc/website/model"
 	"phc/website/services/database"
-	"phc/website/services/server/dev"
-	lista_utenti "phc/website/services/server/lista-utenti"
 	"phc/website/services/server/routes"
 	"phc/website/sl"
 	"testing"
@@ -22,7 +20,7 @@ import (
 func Test1(t *testing.T) {
 	l := sl.New()
 
-	sl.InjectValue[database.Database](l, &database.Memory{
+	sl.InjectValue[database.Database](l, database.Slot, &database.Memory{
 		Users: []model.User{
 			{
 				Id:          "claire",
@@ -39,11 +37,8 @@ func Test1(t *testing.T) {
 		},
 	})
 
-	sl.Inject(l, &dev.Dev{})
-	sl.Inject(l, &lista_utenti.ListaUtenti{})
-
 	r := fiber.New()
-	sl.InjectValue(l, routes.NewRouter(r))
+	sl.InjectValue(l, routes.Root, fiber.Router(r))
 
 	req, err := http.NewRequest("GET", "http://localhost:4000/api/lista-utenti", nil)
 	if err != nil {

services/server/routes/routes.go

@@ -6,10 +6,6 @@ import (
 	"github.com/gofiber/fiber/v2"
 )
 
-func NewRouter(r fiber.Router) *Router {
-	return &Router{r}
-}
+var Root = sl.NewSlot[fiber.Router]()
 
-type Router struct{ fiber.Router }
-
-func (s *Router) Initialize(l *sl.ServiceLocator) error { return nil }
+var Api = sl.NewSlot[fiber.Router]()

services/server/server.go

@@ -11,16 +11,21 @@ import (
 
 type Server struct{ Router *fiber.App }
 
-func (s *Server) Initialize(l *sl.ServiceLocator) error {
-	s.Router = fiber.New(fiber.Config{})
-	sl.InjectValue(l, routes.NewRouter(s.Router))
+func Configure(l *sl.ServiceLocator) (*Server, error) {
+	r := fiber.New(fiber.Config{})
 
-	if _, err := sl.Use[*dev.Dev](l); err != nil {
-		return err
+	sl.InjectValue(l, routes.Root, r.Group("/"))
+	sl.InjectValue(l, routes.Api, r.Group("/api"))
+
+	devServerInterop, err := dev.New(l)
+	if err != nil {
+		return nil, err
 	}
-	if _, err := sl.Use[*lista_utenti.ListaUtenti](l); err != nil {
-		return err
+	sl.InjectValue(l, dev.Slot, devServerInterop)
+
+	if err := lista_utenti.Configure(l); err != nil {
+		return nil, err
 	}
 
-	return nil
+	return &Server{r}, nil
 }