Merge pull request #9 from strider2038/next

Next

README.md

@@ -56,8 +56,7 @@ To set up quick options use tag `di` with combination of values:
 * `set` - to generate setters for internal and public containers;
 * `close` - to generate closer method call;
 * `required` - to generate argument for public container constructor;
-* `public` - to generate getter for public container;
-* `external` - no definition, panic if empty, force public setter.
+* `public` - to generate getter for public container.
 
 Example of `definitions/container.go`
 
@@ -82,11 +81,32 @@ type RepositoryContainer struct {
 }
 ```
 
-## Known issues
-
-### Struct field is compared with nil for internal container
-
-Workaround: don't use struct by values as services or set `required` option to generate constructor.
+## Configuration
+
+DIGEN configuration can be presented in `digen.yaml`/`digen.yml`/`digen.json` file in the project root directory.
+
+```yaml
+version: v0.2
+container:
+  # base directory with Dependency Injection Container files
+  dir: di # required
+factories:
+  # option can be used to disable return error by default
+  returnError: true
+errorHandling:
+  # options for error handling
+  # default values described below, can be omitted
+  new:
+    pkg: 'fmt'
+    func: 'Errorf'
+  join:
+    pkg: 'errors'
+    func: 'Join'
+  wrap:
+    pkg: 'fmt'
+    func: 'Errorf'
+    verb: '%w'
+```
 
 ## TODO
 
@@ -114,7 +134,6 @@ Workaround: don't use struct by values as services or set `required` option to g
 * [ ] custom close functions
 * [ ] describe basic app example
 * [ ] add complex app example with tests and fake repository
-* [ ] multi container config
-* [ ] parse from multiple definition files (may encounter potential conflicts for imports)
 * [ ] definitions updater
+* [ ] remove `SetError` method
 * [ ] write doc

examples/basic/di/README.md

@@ -25,8 +25,7 @@ To set up service definition options use tags:
 * `set` - to generate setters for internal and public containers;
 * `close` - to generate closer method call;
 * `required` - to generate argument for public container constructor;
-* `public` - to generate getter for public container;
-* `external` - no definition, panic if empty, force public setter.
+* `public` - to generate getter for public container.
 
 ## Links
 

examples/basic/digen.yaml

@@ -1,3 +1,3 @@
-version: v0.1
+version: v0.2
 container:
   dir: di

go.mod

@@ -10,11 +10,12 @@ require (
 	github.com/iancoleman/strcase v0.3.0
 	github.com/manifoldco/promptui v0.9.0
 	github.com/muonsoft/errors v0.4.1
-	github.com/pterm/pterm v0.12.79
+	github.com/pterm/pterm v0.12.80
+	github.com/spf13/afero v1.11.0
 	github.com/spf13/cobra v1.8.1
-	github.com/spf13/viper v1.19.0
-	github.com/stretchr/testify v1.9.0
+	github.com/stretchr/testify v1.10.0
 	golang.org/x/mod v0.22.0
+	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
@@ -24,31 +25,17 @@ require (
 	github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/gookit/color v1.5.4 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/lithammer/fuzzysearch v1.1.8 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-runewidth v0.0.15 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
-	github.com/sagikazarmark/locafero v0.4.0 // indirect
-	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
-	github.com/sourcegraph/conc v0.3.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	go.uber.org/atomic v1.9.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
-	golang.org/x/sys v0.18.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
+	golang.org/x/sys v0.27.0 // indirect
+	golang.org/x/term v0.26.0 // indirect
+	golang.org/x/text v0.21.0 // indirect
 )