refactor(构建器): 将依赖独立出来

Author: storezhang

get.go

@@ -1,8 +1,8 @@
 package pangu
 
 import (
-	"github.com/pangum/pangu/internal/runtime"
+	"github.com/pangum/pangu/internal/container"
 )
 
 // Get 用于向框架获取一系列依赖
-type Get = runtime.Get
+type Get = container.Get

internal/builder/banner.go

@@ -35,6 +35,7 @@ func (b *Banner) Binary(binary []byte) (ban *Banner) {
 }
 
 func (b *Banner) Build() (application *Application) {
+	b.params.Set = true
 	b.application.params.Banner = b.params
 	application = b.application
 

internal/builder/code.go

@@ -39,6 +39,7 @@ func (c *Code) Panic(panic int) (code *Code) {
 }
 
 func (c *Code) Build() (application *Application) {
+	c.params.Set = true
 	c.application.params.Code = c.params
 	application = c.application
 

internal/builder/config.go

@@ -23,6 +23,7 @@ func NewConfig(application *Application) (config *Config) {
 }
 
 func (c *Config) Build() (application *Application) {
+	c.params.Set = true
 	application.params.Config = c.params
 	application = c.application
 

internal/builder/help.go

@@ -39,6 +39,7 @@ func (h *Help) Subcommand(tooltip string) (help *Help) {
 }
 
 func (h *Help) Build() (application *Application) {
+	h.params.Set = true
 	h.application.params.Help = h.params
 	application = h.application
 

internal/command/serve.go

@@ -55,7 +55,8 @@ func (s *Serve) start(ctx *runtime.Context) (err error) {
 	wg.Add(len(s.serves))
 
 	for _, serve := range s.serves {
-		go s.startServe(serve, wg, &err)
+		cloned := serve
+		go s.startServe(cloned, wg, &err)
 	}
 
 	// 注册退出信号处理

internal/container/dependencies.go

@@ -9,40 +9,84 @@ import (
 
 type Dependency struct {
 	container   *dig.Container
-	param       *param.Dependency
+	params      *param.Dependency
 	constructor *verifier.Constructor
 }
 
 func NewDependency(container *dig.Container, params *param.Dependency, constructor *verifier.Constructor) *Dependency {
 	return &Dependency{
 		container:   container,
 		constructor: constructor,
-		param:       params,
+		params:      params,
 	}
 }
 
-func (d *Dependency) Put(constructor runtime.Constructor) (err error) {
-	if ve := d.constructor.Verify(constructor); nil != ve {
-		err = ve
-	} else if pe := d.container.Provide(constructor); nil != pe {
-		err = pe
+func (d *Dependency) Inject() (err error) {
+	if de := d.puts(); nil != de {
+		err = de
+	} else if ge := d.gets(); nil != ge {
+		err = ge
 	}
 
 	return
 }
 
-func (d *Dependency) Provide(constructor runtime.Constructor) {
-	if err := d.Put(constructor); nil != err {
+func (d *Dependency) Apply() {
+	if err := d.Inject(); nil != err {
 		panic(err)
 	}
 }
 
-func (d *Dependency) Get(getter runtime.Getter) error {
-	return d.container.Invoke(getter)
+func (d *Dependency) gets() (err error) {
+	for _, get := range d.params.Gets {
+		err = d.invoke(get)
+		if nil != err {
+			break
+		}
+	}
+
+	return
 }
 
-func (d *Dependency) Invoke(getter runtime.Getter) {
-	if err := d.Get(getter); nil != err {
-		panic(err)
+func (d *Dependency) invoke(get *param.Get) (err error) {
+	for _, getter := range get.Getters {
+		err = d.container.Invoke(getter)
+		if nil != err {
+			break
+		}
 	}
+
+	return
+}
+
+func (d *Dependency) puts() (err error) {
+	for _, put := range d.params.Puts {
+		err = d.put(put)
+		if nil != err {
+			break
+		}
+	}
+
+	return
+}
+
+func (d *Dependency) put(put *param.Put) (err error) {
+	for _, constructor := range put.Constructors {
+		err = d.provide(constructor)
+		if nil != err {
+			break
+		}
+	}
+
+	return
+}
+
+func (d *Dependency) provide(constructor runtime.Constructor) (err error) {
+	if ve := d.constructor.Verify(constructor); nil != ve {
+		err = ve
+	} else if pe := d.container.Provide(constructor); nil != pe {
+		err = pe
+	}
+
+	return
 }

internal/container/dependency.go

@@ -1,4 +1,4 @@
-package runtime
+package container
 
 import (
 	"github.com/storezhang/dig"

internal/runtime/get.go internal/container/get.go

@@ -1,4 +1,4 @@
-package runtime
+package container
 
 import (
 	"github.com/storezhang/dig"