feat(core): add RootBean & created on demand

Author: lvan100

conf/reader/prop/prop.go

@@ -23,7 +23,9 @@ func Read(b []byte) (map[string]any, error) {
 
 	p := properties.NewProperties()
 	p.DisableExpansion = true
-	_ = p.Load(b, properties.UTF8) // always no error
+	if err := p.Load(b, properties.UTF8); err != nil {
+		return nil, err
+	}
 
 	ret := make(map[string]any)
 	for k, v := range p.Map() {

conf/reader/prop/prop_test.go

@@ -24,6 +24,11 @@ import (
 
 func TestRead(t *testing.T) {
 
+	t.Run("error", func(t *testing.T) {
+		_, err := Read([]byte(`=1`))
+		assert.ThatError(t, err).Matches(`properties: Line 1: "1"`)
+	})
+
 	t.Run("basic type", func(t *testing.T) {
 		r, err := Read([]byte(`
 			empty=

gs/gs.go

@@ -280,6 +280,11 @@ func Component[T any](i T) T {
 	return i
 }
 
+// RootBean registers a root bean definition.
+func RootBean(b *RegisteredBean) {
+	gs_app.GS.C.RootBean(b)
+}
+
 // Object registers a bean definition for a given object.
 func Object(i any) *RegisteredBean {
 	b := gs_bean.NewBean(reflect.ValueOf(i))

gs/internal/gs_app/app.go

@@ -108,7 +108,7 @@ func (app *App) RunWith(fn func(ctx context.Context) error) error {
 // loading, IoC container refreshing, dependency injection, and runs
 // runners, jobs and servers.
 func (app *App) Start() error {
-	app.C.Object(app)
+	app.C.RootBean(app.C.Object(app))
 
 	// loads the layered app properties
 	var p conf.Properties

gs/internal/gs_app/app_test.go

@@ -91,9 +91,9 @@ func TestApp(t *testing.T) {
 		t.Cleanup(Reset)
 
 		app := NewApp()
-		app.C.Provide(func() (*http.Server, error) {
+		app.C.RootBean(app.C.Provide(func() (*http.Server, error) {
 			return nil, errors.New("fail to create bean")
-		})
+		}))
 		err := app.Run()
 		assert.ThatError(t, err).Matches("fail to create bean")
 	})

gs/internal/gs_app/boot.go

@@ -71,6 +71,11 @@ func (b *BootImpl) Config() *gs_conf.BootConfig {
 	return b.p
 }
 
+// RootBean registers a root bean definition.
+func (b *BootImpl) RootBean(x *gs.RegisteredBean) {
+	b.c.RootBean(x)
+}
+
 // Object registers an object bean.
 func (b *BootImpl) Object(i any) *gs.RegisteredBean {
 	b.flag = true
@@ -103,7 +108,7 @@ func (b *BootImpl) Run() error {
 	if !b.flag {
 		return nil
 	}
-	b.c.Object(b)
+	b.c.RootBean(b.c.Object(b))
 
 	var p conf.Properties
 

gs/internal/gs_app/boot_test.go

@@ -60,9 +60,9 @@ func TestBoot(t *testing.T) {
 		t.Cleanup(Reset)
 
 		boot := NewBoot().(*BootImpl)
-		boot.Provide(func() (*bytes.Buffer, error) {
+		boot.RootBean(boot.Provide(func() (*bytes.Buffer, error) {
 			return nil, errors.New("fail to create bean")
-		})
+		}))
 		err := boot.Run()
 		assert.ThatError(t, err).Matches("fail to create bean")
 	})

gs/internal/gs_core/core.go

@@ -43,7 +43,7 @@ func (c *Container) Refresh(p conf.Properties) error {
 		return err
 	}
 	c.Injecting = injecting.New(p)
-	if err := c.Injecting.Refresh(c.Beans()); err != nil {
+	if err := c.Injecting.Refresh(c.Roots(), c.Beans()); err != nil {
 		return err
 	}
 	c.Resolving = nil

gs/internal/gs_core/core_test.go

@@ -50,7 +50,7 @@ func TestContainer(t *testing.T) {
 
 	t.Run("inject error", func(t *testing.T) {
 		c := New()
-		c.Provide(func(addr string) *http.Server { return nil })
+		c.RootBean(c.Provide(func(addr string) *http.Server { return nil }))
 		err := c.Refresh(conf.New())
 		assert.ThatError(t, err).Matches("parse tag .* error: invalid syntax")
 	})

gs/internal/gs_core/injecting/injecting.go

@@ -80,7 +80,7 @@ func (c *Injecting) RefreshProperties(p conf.Properties) error {
 }
 
 // Refresh loads and wires all provided bean definitions.
-func (c *Injecting) Refresh(beans []*gs_bean.BeanDefinition) (err error) {
+func (c *Injecting) Refresh(roots, beans []*gs_bean.BeanDefinition) (err error) {
 	allowCircularReferences := cast.ToBool(c.p.Data().Get("spring.allow-circular-references"))
 	forceAutowireIsNullable := cast.ToBool(c.p.Data().Get("spring.force-autowire-is-nullable"))
 
@@ -113,7 +113,7 @@ func (c *Injecting) Refresh(beans []*gs_bean.BeanDefinition) (err error) {
 
 	// Injects all beans
 	r.state = Refreshing
-	for _, b := range beans {
+	for _, b := range roots {
 		if err = r.wireBean(b, stack); err != nil {
 			return err
 		}