refactor dir and log level (#19)

fix: barry 2024-10-25 20:52:44

Author: kooksee

di/di.go

@@ -1,10 +1,10 @@
 package di
 
 import (
-	"github.com/pubgo/dix"
+	"github.com/pubgo/dix/dix_internal"
 )
 
-var _dix = dix.New(dix.WithValuesNull())
+var _dix = dix_internal.New(dix_internal.WithValuesNull())
 
 // Provide 注册对象构造器
 func Provide(data any) {
@@ -14,12 +14,12 @@ func Provide(data any) {
 // Inject 注入对象
 //
 //	data: <*struct>或<func>
-func Inject[T any](data T, opts ...dix.Option) T {
+func Inject[T any](data T, opts ...dix_internal.Option) T {
 	_ = _dix.Inject(data, opts...)
 	return data
 }
 
 // Graph Dix graph
-func Graph() *dix.Graph {
+func Graph() *dix_internal.Graph {
 	return _dix.Graph()
 }

dix.go

@@ -3,26 +3,26 @@ package dix
 import (
 	"reflect"
 
-	"github.com/pubgo/dix/internal/dix_inter"
+	"github.com/pubgo/dix/dix_internal"
 )
 
 const (
-	InjectMethodPrefix = dix_inter.InjectMethodPrefix
+	InjectMethodPrefix = dix_internal.InjectMethodPrefix
 )
 
 type (
-	Option  = dix_inter.Option
-	Options = dix_inter.Options
-	Dix     = dix_inter.Dix
-	Graph   = dix_inter.Graph
+	Option  = dix_internal.Option
+	Options = dix_internal.Options
+	Dix     = dix_internal.Dix
+	Graph   = dix_internal.Graph
 )
 
 func WithValuesNull() Option {
-	return dix_inter.WithValuesNull()
+	return dix_internal.WithValuesNull()
 }
 
 func New(opts ...Option) *Dix {
-	return dix_inter.New(opts...)
+	return dix_internal.New(opts...)
 }
 
 func Inject[T any](di *Dix, data T, opts ...Option) T {

internal/dix_inter/aaa.go renamed to dix_internal/aaa.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 import (
 	"reflect"
@@ -26,3 +26,7 @@ type Graph struct {
 }
 
 var logger = log.GetLogger("dix")
+
+func SetLogLevel(lvl log.Level) {
+	logger = logger.WithLevel(lvl)
+}

internal/dix_inter/api.go renamed to dix_internal/api.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 // New Dix new
 func New(opts ...Option) *Dix {

internal/dix_inter/cycle-check.go renamed to dix_internal/cycle-check.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 import (
 	"container/list"

internal/dix_inter/dix.go renamed to dix_internal/dix.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 import (
 	"fmt"

internal/dix_inter/graph.go renamed to dix_internal/graph.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 import (
 	"bytes"

internal/dix_inter/node.go renamed to dix_internal/node.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 import (
 	"fmt"

internal/dix_inter/option.go renamed to dix_internal/option.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 type (
 	Option  func(opts *Options)

internal/dix_inter/util.go renamed to dix_internal/util.go

@@ -1,4 +1,4 @@
-package dix_inter
+package dix_internal
 
 import (
 	"fmt"