refactor: new (simpler) version of the sl library

This commit is contained in:
2023-01-31 13:43:20 +01:00
parent cacf58bc1d
commit be57412c40
12 changed files with 196 additions and 151 deletions
+10 -12
View File
@@ -8,7 +8,6 @@ import (
"phc/website/services/database"
"phc/website/services/server"
"phc/website/services/server/dev"
lista_utenti "phc/website/services/server/lista-utenti"
"phc/website/sl"
)
@@ -17,23 +16,20 @@ func main() {
// sl.Inject[config.Interface](l, &config.EnvConfig{})
sl.InjectValue[config.Interface](l, &config.Custom{
ModeValue: "production",
HostValue: ":4000",
sl.InjectValue(l, config.Slot, &config.Config{
Mode: "production",
Host: ":4000",
})
sl.InjectValue[database.Database](l, &database.Memory{})
sl.InjectValue(l, database.Slot, database.Database(
&database.Memory{}),
)
sl.Inject(l, &dev.Dev{})
sl.Inject(l, &lista_utenti.ListaUtenti{})
sl.Inject(l, &server.Server{})
_, err := sl.Use[*server.Server](l)
if err != nil {
if _, err := server.Configure(l); err != nil {
log.Fatal(err)
}
dev, err := sl.Use[*dev.Dev](l)
dev, err := sl.Use(l, dev.Slot)
if err != nil {
log.Fatal(err)
}
@@ -48,4 +44,6 @@ func main() {
if err := enc.Encode(dev.HtmlRouteBindings); err != nil {
log.Fatal(err)
}
log.Printf(`generated "out/routes.json"`)
}
+6 -14
View File
@@ -6,22 +6,18 @@ import (
"phc/website/services/config"
"phc/website/services/database"
"phc/website/services/server"
"phc/website/services/server/dev"
lista_utenti "phc/website/services/server/lista-utenti"
"phc/website/sl"
)
func main() {
l := sl.New()
// sl.Inject[config.Interface](l, &config.EnvConfig{})
config := sl.InjectValue[config.Interface](l, &config.Custom{
ModeValue: "production",
HostValue: ":4000",
cfg := sl.InjectValue(l, config.Slot, &config.Config{
Mode: "production",
Host: ":4000",
})
sl.InjectValue[database.Database](l, &database.Memory{
sl.InjectValue[database.Database](l, database.Slot, &database.Memory{
Users: []model.User{
{
Id: "claire",
@@ -38,14 +34,10 @@ func main() {
},
})
sl.Inject(l, &dev.Dev{})
sl.Inject(l, &lista_utenti.ListaUtenti{})
sl.Inject(l, &server.Server{})
server, err := sl.Use[*server.Server](l)
srv, err := server.Configure(l)
if err != nil {
log.Fatal(err)
}
log.Fatal(server.Router.Listen(config.Host()))
log.Fatal(srv.Router.Listen(cfg.Host))
}