Merge pull request 'Update workflows' (#80) from atolstikhin/micro-config-flag:master into master

Reviewed-on: #80

.gitea/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,24 @@
+---
+name: Bug report
+about: For reporting bugs in go-micro
+title: "[BUG]"
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+
+1. What are you trying to do?
+2. What did you expect to happen?
+3. What happens instead?
+
+**How to reproduce the bug:**
+
+If possible, please include a minimal code snippet here.
+
+**Environment:**
+Go Version: please paste `go version` output here
+```
+please paste `go env` output here
+```

.gitea/ISSUE_TEMPLATE/feature-request---enhancement.md

@@ -0,0 +1,17 @@
+---
+name: Feature request / Enhancement
+about: If you have a need not served by go-micro
+title: "[FEATURE]"
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitea/ISSUE_TEMPLATE/question.md

@@ -0,0 +1,14 @@
+---
+name: Question
+about: Ask a question about go-micro
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+Before asking, please check if your question has already been answered: 
+
+1. Check the documentation - https://micro.mu/docs/
+2. Check the examples and plugins - https://github.com/micro/examples & https://github.com/micro/go-plugins
+3. Search existing issues

.gitea/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,9 @@
+## Pull Request template
+Please, go through these steps before clicking submit on this PR.
+
+1. Give a descriptive title to your PR.
+2. Provide a description of your changes.
+3. Make sure you have some relevant tests.
+4. Put `closes #XXXX` in your comment to auto-close the issue that your PR fixes (if applicable).
+
+**PLEASE REMOVE THIS TEMPLATE BEFORE SUBMITTING**

.gitea/workflows/job_lint.yml

@@ -0,0 +1,29 @@
+name: lint
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable' 
+    - name: setup deps
+      run: go get -v ./...
+    - name: run lint
+      uses: https://github.com/golangci/golangci-lint-action@v6
+      with:
+        version: 'latest'

.gitea/workflows/job_test.yml

@@ -0,0 +1,34 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup deps
+      run: go get -v ./...
+    - name: run test
+      env:
+        INTEGRATION_TESTS: yes
+      run: go test -mod readonly -v ./...

.gitea/workflows/job_tests.yml

@@ -0,0 +1,53 @@
+name: test
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+    branches:
+    - master
+    - v3
+    - v4
+  push:
+    branches:
+    - master
+    - v3
+    - v4
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - name: checkout code
+      uses: actions/checkout@v4
+      with:
+        filter: 'blob:none'
+    - name: checkout tests
+      uses: actions/checkout@v4
+      with:
+        ref: master
+        filter: 'blob:none'
+        repository: unistack-org/micro-tests
+        path: micro-tests
+    - name: setup go
+      uses: actions/setup-go@v5
+      with:
+        cache-dependency-path: "**/*.sum"
+        go-version: 'stable'
+    - name: setup go work
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        go work init
+        go work use .
+        go work use micro-tests        
+    - name: setup deps
+      env:
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: go get -v ./...
+    - name: run tests
+      env:
+        INTEGRATION_TESTS: yes
+        GOWORK: /workspace/${{ github.repository_owner }}/go.work
+      run: |
+        cd micro-tests
+        go test -mod readonly -v ./... || true        

.golangci.yml

@@ -0,0 +1,5 @@
+run:
+  concurrency: 8
+  deadline: 5m
+  issues-exit-code: 1
+  tests: true

flag.go

@@ -1,15 +1,18 @@
-package flag
+package flag // import "go.unistack.org/micro-config-flag/v4"
 
 import (
 	"context"
 	"errors"
 	"flag"
 	"fmt"
+	"os"
 	"reflect"
+	"strings"
 	"time"
 
-	"github.com/unistack-org/micro/v3/config"
-	rutil "github.com/unistack-org/micro/v3/util/reflect"
+	"go.unistack.org/micro/v4/config"
+	"go.unistack.org/micro/v4/options"
+	rutil "go.unistack.org/micro/v4/util/reflect"
 )
 
 var (
@@ -27,32 +30,69 @@ var (
 */
 
 type flagConfig struct {
+	fset *flag.FlagSet
 	opts config.Options
+	name string
+	env  string
 }
 
 func (c *flagConfig) Options() config.Options {
 	return c.opts
 }
 
-func (c *flagConfig) Init(opts ...config.Option) error {
+func (c *flagConfig) Init(opts ...options.Option) error {
+	var err error
+
 	for _, o := range opts {
-		o(&c.opts)
+		if err = o(&c.opts); err != nil {
+			return err
 		}
+	}
+
+	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
+	c.configure()
 
 	fields, err := rutil.StructFields(c.opts.Struct)
 	if err != nil {
+		if !c.opts.AllowFail {
 			return err
 		}
 
+		if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+			return err
+		}
+
+		return nil
+	}
+
 	for _, sf := range fields {
 		tf, ok := sf.Field.Tag.Lookup(c.opts.StructTag)
 		if !ok {
 			continue
 		}
-		fn, fv, fd := getFlagOpts(tf)
+
+		fn, fd, fv := getFlagOpts(tf)
+		if tf, ok = sf.Field.Tag.Lookup(c.env); ok {
+			fd += fmt.Sprintf(" (env %s)", tf)
+		}
 
 		rcheck := true
-		switch sf.Value.Interface().(type) {
+
+		if !sf.Value.IsValid() {
+			continue
+		}
+		vi := sf.Value.Interface()
+		if vi == nil {
+			continue
+		}
+		if f := flag.Lookup(fn); f != nil {
+			return nil
+		}
+
+		switch vi.(type) {
 		case time.Duration:
 			err = c.flagDuration(sf.Value, fn, fv, fd)
 			rcheck = false
@@ -60,9 +100,17 @@ func (c *flagConfig) Init(opts ...config.Option) error {
 			err = c.flagTime(sf.Value, fn, fv, fd)
 			rcheck = false
 		}
+
 		if err != nil {
+			if !c.opts.AllowFail {
 				return err
 			}
+			if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+				return err
+			}
+
+			return nil
+		}
 
 		if !rcheck {
 			continue
@@ -93,23 +141,60 @@ func (c *flagConfig) Init(opts ...config.Option) error {
 			err = c.flagMap(sf.Value, fn, fv, fd)
 		}
 		if err != nil {
+			if !c.opts.AllowFail {
 				return err
 			}
 
+			if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+				return err
+			}
+
+			return nil
+		}
+	}
+
+	if err := config.DefaultAfterInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {
+		return err
 	}
 
 	return nil
 }
 
-func (c *flagConfig) Load(ctx context.Context, opts ...config.LoadOption) error {
+func (c *flagConfig) Load(ctx context.Context, opts ...options.Option) error {
+	if c.opts.SkipLoad != nil && c.opts.SkipLoad(ctx, c) {
+		return nil
+	}
+
 	options := config.NewLoadOptions(opts...)
 	_ = options
+
+	if err := config.DefaultBeforeLoad(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
+	if err := config.DefaultAfterLoad(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
 	// TODO: allow merge, append and so
 	flag.Parse()
+
 	return nil
 }
 
-func (c *flagConfig) Save(ctx context.Context, opts ...config.SaveOption) error {
+func (c *flagConfig) Save(ctx context.Context, opts ...options.Option) error {
+	if c.opts.SkipSave != nil && c.opts.SkipSave(ctx, c) {
+		return nil
+	}
+
+	if err := config.DefaultBeforeSave(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
+	if err := config.DefaultAfterSave(ctx, c); err != nil && !c.opts.AllowFail {
+		return err
+	}
+
 	return nil
 }
 
@@ -121,14 +206,129 @@ func (c *flagConfig) Name() string {
 	return c.opts.Name
 }
 
-func (c *flagConfig) Watch(ctx context.Context, opts ...config.WatchOption) (config.Watcher, error) {
+func (c *flagConfig) Watch(ctx context.Context, opts ...options.Option) (config.Watcher, error) {
 	return nil, fmt.Errorf("not implemented")
 }
 
-func NewConfig(opts ...config.Option) config.Config {
+func (c *flagConfig) usage() {
+	mapDelim := DefaultMapDelim
+	sliceDelim := DefaultSliceDelim
+
+	if c.opts.Context != nil {
+		if d, ok := c.opts.Context.Value(mapDelimKey{}).(string); ok {
+			mapDelim = d
+		}
+		if d, ok := c.opts.Context.Value(sliceDelimKey{}).(string); ok {
+			sliceDelim = d
+		}
+	}
+
+	if c.name == "" {
+		fmt.Fprintf(c.fset.Output(), "Usage:\n")
+	} else {
+		fmt.Fprintf(c.fset.Output(), "Usage of %s:\n", c.name)
+	}
+
+	c.fset.VisitAll(func(f *flag.Flag) {
+		var b strings.Builder
+		fmt.Fprintf(&b, "  -%s", f.Name) // Two spaces before -; see next two comments.
+		_, usage := flag.UnquoteUsage(f)
+		name := "value"
+		v := reflect.TypeOf(f.Value).String()
+		b.WriteString(" ")
+		switch v {
+		case "*flag.boolFlag":
+			name = "bool"
+		case "*flag.durationValue":
+			name = "duration"
+		case "*flag.float64Value":
+			name = "float"
+		case "*flag.intValue", "*flag.int64Value":
+			name = "int"
+		case "*flag.stringValue":
+			name = "string"
+		case "*flag.uintValue", "*flag.uint64Value":
+			name = "uint"
+		case "*flag.mapValue":
+			//	nv := f.Value.(*mapValue)
+			name = fmt.Sprintf("string key=val with %q as separator", mapDelim)
+		case "*flag.sliceValue":
+			//	nv := f.Value.(*sliceValue)
+			name = fmt.Sprintf("string with %q as separator", sliceDelim)
+		}
+		b.WriteString(name)
+
+		// Boolean flags of one ASCII letter are so common we
+		// treat them specially, putting their usage on the same line.
+		if b.Len() <= 4 { // space, space, '-', 'x'.
+			b.WriteString("\t")
+		} else {
+			// Four spaces before the tab triggers good alignment
+			// for both 4- and 8-space tab stops.
+			b.WriteString("\n    \t")
+		}
+		b.WriteString(strings.ReplaceAll(usage, "\n", "\n    \t"))
+
+		if f.Value.String() == f.DefValue {
+			fmt.Fprintf(&b, " (default %q)", f.DefValue)
+		} else {
+			fmt.Fprintf(&b, " (default %q current %q)", f.DefValue, f.Value)
+		}
+
+		fmt.Fprint(c.fset.Output(), b.String(), "\n")
+	})
+}
+
+func (c *flagConfig) configure() {
+	flagSet := flag.CommandLine
+	flagSetName := os.Args[0]
+	flagSetErrorHandling := flag.ExitOnError
+	flagEnv := "env"
+	var flagUsage func()
+	var isSet bool
+
+	if c.opts.Context != nil {
+		if v, ok := c.opts.Context.Value(flagSetNameKey{}).(string); ok {
+			isSet = true
+			flagSetName = v
+		}
+		if v, ok := c.opts.Context.Value(flagSetErrorHandlingKey{}).(flag.ErrorHandling); ok {
+			isSet = true
+			flagSetErrorHandling = v
+		}
+		if v, ok := c.opts.Context.Value(flagSetKey{}).(*flag.FlagSet); ok {
+			flagSet = v
+		}
+		if v, ok := c.opts.Context.Value(flagSetUsageKey{}).(func()); ok {
+			flagUsage = v
+		}
+		if v, ok := c.opts.Context.Value(flagEnvKey{}).(string); ok {
+			flagEnv = v
+		}
+	}
+	c.fset = flagSet
+
+	if isSet {
+		c.fset.Init(flagSetName, flagSetErrorHandling)
+	}
+	if flagUsage != nil {
+		c.fset.Usage = flagUsage
+	} else {
+		c.fset.Usage = c.usage
+	}
+	c.env = flagEnv
+
+	c.name = flagSetName
+}
+
+func NewConfig(opts ...options.Option) config.Config {
 	options := config.NewOptions(opts...)
 	if len(options.StructTag) == 0 {
 		options.StructTag = DefaultStructTag
 	}
-	return &flagConfig{opts: options}
+
+	c := &flagConfig{opts: options}
+	c.configure()
+
+	return c
 }

flag_test.go

@@ -2,47 +2,67 @@ package flag
 
 import (
 	"context"
+	"flag"
 	"os"
 	"testing"
 	"time"
 
-	"github.com/unistack-org/micro/v3/config"
+	"go.unistack.org/micro/v4/config"
 )
 
 func TestLoad(t *testing.T) {
+	time.Local = time.UTC
 	os.Args = append(os.Args, "-broker", "5566:33")
 	os.Args = append(os.Args, "-verbose")
 	os.Args = append(os.Args, "-wait", "5s")
 	os.Args = append(os.Args, "-addr", "33,44")
 	os.Args = append(os.Args, "-time", time.RFC822)
 	os.Args = append(os.Args, "-metadata", "key=20")
+	os.Args = append(os.Args, "-components", "all=info,api=debug")
+	os.Args = append(os.Args, "-addr", "33,44")
+	os.Args = append(os.Args, "-badflag", "test")
+	type NestedConfig struct {
+		Value string `flag:"name=nested_value"`
+	}
 	type Config struct {
+		Time           time.Time         `flag:"name=time,desc='some time',default='02 Jan 06 15:04 MST'"`
+		Components     map[string]string `flag:"name=components,desc='components logging'"`
+		Metadata       map[string]int    `flag:"name=metadata,desc='some meta',default=''"`
+		Nested         *NestedConfig
 		Broker         string        `flag:"name=broker,desc='description with, comma',default='127.0.0.1:9092'"`
-		Verbose  bool           `flag:"name=verbose,desc='verbose output',default='false'"`
+		WithoutDesc    string        `flag:"name=without_desc,default='without_default'"`
+		WithoutAll     string        `flag:"name=without_all"`
+		WithoutDefault string        `flag:"name=without_default,desc='with'"`
 		Addr           []string      `flag:"name=addr,desc='addrs',default='127.0.0.1:9092'"`
 		Wait           time.Duration `flag:"name=wait,desc='wait time',default='2s'"`
-		Time     time.Time      `flag:"name=time,desc='some time',default='02 Jan 06 15:04 MST'"`
-		Metadata map[string]int `flag:"name=metadata,desc='some meta',default=''"`
+		Verbose        bool          `flag:"name=verbose,desc='verbose output',default='false'"`
 	}
 
 	ctx := context.Background()
-	cfg := &Config{}
+	cfg := &Config{Nested: &NestedConfig{}}
 
-	c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822))
+	c := NewConfig(config.Struct(cfg), TimeFormat(time.RFC822), FlagErrorHandling(flag.ContinueOnError))
 	if err := c.Init(); err != nil {
-		t.Fatal(err)
+		t.Fatalf("init failed: %v", err)
+	}
+
+	// double init test
+	if err := c.Init(); err != nil {
+		t.Fatalf("init failed: %v", err)
 	}
 
 	if err := c.Load(ctx); err != nil {
-		t.Fatal(err)
+		t.Fatalf("load failed: %v", err)
 	}
 
 	if cfg.Broker != "5566:33" {
 		t.Fatalf("failed to parse flags broker value invalid: %#+v", cfg)
 	}
-	if tf := cfg.Time.Format(time.RFC822); tf != "02 Jan 06 14:32 MSK" {
-		t.Fatalf("parse time error: %v", cfg.Time)
+	if tf := cfg.Time.Format(time.RFC822); tf != "02 Jan 06 15:04 MST" {
+		t.Fatalf("parse time error: %s != %s", tf, "02 Jan 06 15:04 MST")
 	}
 
-	t.Logf("cfg %#+v", cfg)
+	if len(cfg.Components) != 2 {
+		t.Fatalf("cant parse map components %#+v", cfg)
+	}
 }

go.mod

@@ -1,5 +1,10 @@
-module github.com/unistack-org/micro-config-flag/v3
+module go.unistack.org/micro-config-flag/v4
 
-go 1.16
+go 1.18
 
-require github.com/unistack-org/micro/v3 v3.5.9
+require go.unistack.org/micro/v4 v4.0.17
+
+require (
+	dario.cat/mergo v1.0.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
+)

go.sum

@@ -1,18 +1,9 @@
-github.com/ef-ds/deque v1.0.4/go.mod h1:gXDnTC3yqvBcHbq2lcExjtAcVrOnJCbMcZXmuj8Z4tg=
-github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
-github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
-github.com/patrickmn/go-cache v2.1.0+incompatible/go.mod h1:3Qf8kWWT7OJRJbdiICTKqZju1ZixQ/KpMGzzAfe6+WQ=
-github.com/silas/dag v0.0.0-20210121180416-41cf55125c34/go.mod h1:7RTUFBdIRC9nZ7/3RyRNH1bdqIShrDejd1YbLwgPS+I=
-github.com/unistack-org/micro/v3 v3.5.9 h1:9iIxGZ56bVME7E9hqKIHeSHXkn69M9KFyJfaUzi7B9k=
-github.com/unistack-org/micro/v3 v3.5.9/go.mod h1:zQnZPEy842kQNcyjmVys6tdMjty4PHdyUUKYm1wrg1s=
-golang.org/x/net v0.0.0-20210510120150-4163338589ed/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
+dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+go.unistack.org/micro/v4 v4.0.17 h1:mF7uM+J4ILdG+1fcwzKYCwDlxhdbF/e1WnGzKKLnIXc=
+go.unistack.org/micro/v4 v4.0.17/go.mod h1:ZDgU9931vm2l7X6RN/6UuwRIVp24GRdmQ7dKmegArk4=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

options.go

@@ -1,26 +1,63 @@
 package flag
 
 import (
-	"github.com/unistack-org/micro/v3/config"
+	"flag"
+
+	"go.unistack.org/micro/v4/options"
 )
 
 type sliceDelimKey struct{}
 
 // SliceDelim set the slice delimeter
-func SliceDelim(s string) config.Option {
-	return config.SetOption(sliceDelimKey{}, s)
+func SliceDelim(s string) options.Option {
+	return options.ContextOption(sliceDelimKey{}, s)
 }
 
 type mapDelimKey struct{}
 
 // MapDelim set the map delimeter
-func MapDelim(s string) config.Option {
-	return config.SetOption(mapDelimKey{}, s)
+func MapDelim(s string) options.Option {
+	return options.ContextOption(mapDelimKey{}, s)
 }
 
 type timeFormatKey struct{}
 
 // TimeFormat set the time format
-func TimeFormat(s string) config.Option {
-	return config.SetOption(timeFormatKey{}, s)
+func TimeFormat(s string) options.Option {
+	return options.ContextOption(timeFormatKey{}, s)
+}
+
+type flagSetKey struct{}
+
+// FlagSet set flag set name
+func FlagSet(f *flag.FlagSet) options.Option {
+	return options.ContextOption(flagSetKey{}, f)
+}
+
+type flagSetNameKey struct{}
+
+// FlagSetName set flag set name
+func FlagSetName(n string) options.Option {
+	return options.ContextOption(flagSetNameKey{}, n)
+}
+
+type flagSetErrorHandlingKey struct{}
+
+// FlagErrorHandling set flag set error handling
+func FlagErrorHandling(eh flag.ErrorHandling) options.Option {
+	return options.ContextOption(flagSetErrorHandlingKey{}, eh)
+}
+
+type flagSetUsageKey struct{}
+
+// FlagUsage set flag set usage func
+func FlagUsage(fn func()) options.Option {
+	return options.ContextOption(flagSetUsageKey{}, fn)
+}
+
+type flagEnvKey struct{}
+
+// FlagEnv set flag set usage func
+func FlagEnv(n string) options.Option {
+	return options.ContextOption(flagEnvKey{}, n)
 }

util.go

@@ -2,12 +2,139 @@ package flag
 
 import (
 	"flag"
+	"fmt"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
 )
 
+type mapValue struct {
+	delim string
+	def   string
+	v     reflect.Value
+}
+
+func (v *mapValue) String() string {
+	if v.v.Kind() != reflect.Invalid {
+		var kv []string
+		it := v.v.MapRange()
+		for it.Next() {
+			k := it.Key().Interface()
+			v := it.Value().Interface()
+			kv = append(kv, fmt.Sprintf("%v=%v", k, v))
+		}
+		return strings.Join(kv, ",")
+	}
+	return v.def
+}
+
+func (v *mapValue) Get() interface{} {
+	return v.v.Interface()
+}
+
+func (v *mapValue) Set(s string) error {
+	ps := strings.Split(s, v.delim)
+	if len(ps) == 0 {
+		return nil
+	}
+	v.v.Set(reflect.MakeMapWithSize(v.v.Type(), len(ps)))
+	kt := v.v.Type().Key().Kind()
+	vt := v.v.Type().Elem().Kind()
+
+	for i := 0; i < len(ps); i++ {
+		fs := strings.Split(ps[i], "=")
+		switch len(fs) {
+		case 0:
+			return nil
+		case 1:
+			if len(fs[0]) == 0 {
+				return nil
+			}
+			return ErrInvalidValue
+		case 2:
+			break
+		default:
+			return ErrInvalidValue
+		}
+		key, err := convertType(reflect.ValueOf(fs[0]), kt)
+		if err != nil {
+			return err
+		}
+		val, err := convertType(reflect.ValueOf(fs[1]), vt)
+		if err != nil {
+			return err
+		}
+		v.v.SetMapIndex(key.Convert(v.v.Type().Key()), val.Convert(v.v.Type().Elem()))
+	}
+	return nil
+}
+
+type sliceValue struct {
+	delim string
+	def   string
+	v     reflect.Value
+}
+
+func (v *sliceValue) String() string {
+	if v.v.Kind() != reflect.Invalid {
+		var kv []string
+		for idx := 0; idx < v.v.Len(); idx++ {
+			kv = append(kv, fmt.Sprintf("%v", v.v.Index(idx).Interface()))
+		}
+		return strings.Join(kv, ",")
+	}
+	return v.def
+}
+
+func (v *sliceValue) Get() interface{} {
+	return v.v.Interface()
+}
+
+func (v *sliceValue) Set(s string) error {
+	p := strings.Split(s, v.delim)
+	v.v.Set(reflect.MakeSlice(v.v.Type(), len(p), len(p)))
+	switch v.v.Type().Elem().Kind() {
+	case reflect.Int, reflect.Int64:
+		for idx := range p {
+			i, err := strconv.ParseInt(p[idx], 10, 64)
+			if err != nil {
+				return err
+			}
+			v.v.Index(idx).SetInt(i)
+		}
+	case reflect.Uint, reflect.Uint64:
+		for idx := range p {
+			i, err := strconv.ParseUint(p[idx], 10, 64)
+			if err != nil {
+				return err
+			}
+			v.v.Index(idx).SetUint(i)
+		}
+	case reflect.Float64:
+		for idx := range p {
+			i, err := strconv.ParseFloat(p[idx], 64)
+			if err != nil {
+				return err
+			}
+			v.v.Index(idx).SetFloat(i)
+		}
+	case reflect.Bool:
+		for idx := range p {
+			i, err := strconv.ParseBool(p[idx])
+			if err != nil {
+				return err
+			}
+			v.v.Index(idx).SetBool(i)
+		}
+	case reflect.String:
+		for idx := range p {
+			v.v.Index(idx).SetString(p[idx])
+		}
+	}
+	return nil
+}
+
 func convertType(v reflect.Value, t reflect.Kind) (reflect.Value, error) {
 	switch v.Kind() {
 	case reflect.String:
@@ -51,50 +178,12 @@ func (c *flagConfig) flagSlice(v reflect.Value, fn, fv, fd string) error {
 		}
 	}
 
-	flag.Func(fn, fd, func(s string) error {
-		p := strings.Split(s, delim)
-		v.Set(reflect.MakeSlice(v.Type(), len(p), len(p)))
-		switch v.Type().Elem().Kind() {
-		case reflect.Int, reflect.Int64:
-			for idx := range p {
-				i, err := strconv.ParseInt(p[idx], 10, 64)
-				if err != nil {
+	v.Set(reflect.MakeSlice(v.Type(), 0, 0))
+	mp := &sliceValue{v: v, def: fv, delim: delim}
+	if err := mp.Set(fv); err != nil {
 		return err
 	}
-				v.Index(idx).SetInt(i)
-			}
-		case reflect.Uint, reflect.Uint64:
-			for idx := range p {
-				i, err := strconv.ParseUint(p[idx], 10, 64)
-				if err != nil {
-					return err
-				}
-				v.Index(idx).SetUint(i)
-			}
-		case reflect.Float64:
-			for idx := range p {
-				i, err := strconv.ParseFloat(p[idx], 64)
-				if err != nil {
-					return err
-				}
-				v.Index(idx).SetFloat(i)
-			}
-		case reflect.Bool:
-			for idx := range p {
-				i, err := strconv.ParseBool(p[idx])
-				if err != nil {
-					return err
-				}
-				v.Index(idx).SetBool(i)
-			}
-		case reflect.String:
-			for idx := range p {
-				v.Index(idx).SetString(p[idx])
-			}
-		}
-		return nil
-	})
-
+	flag.Var(mp, fn, fd)
 	return nil
 }
 
@@ -105,43 +194,12 @@ func (c *flagConfig) flagMap(v reflect.Value, fn, fv, fd string) error {
 			delim = d
 		}
 	}
-	flag.Func(fn, fd, func(s string) error {
-		ps := strings.Split(s, delim)
-		if len(ps) == 0 {
-			return nil
-		}
-		v.Set(reflect.MakeMapWithSize(v.Type(), len(ps)))
-		kt := v.Type().Key().Kind()
-		vt := v.Type().Elem().Kind()
-
-		for i := 0; i < len(ps); i++ {
-			fs := strings.Split(ps[i], "=")
-			switch len(fs) {
-			case 0:
-				return nil
-			case 1:
-				if len(fs[0]) == 0 {
-					return nil
-				}
-				return ErrInvalidValue
-			case 2:
-				break
-			default:
-				return ErrInvalidValue
-			}
-			key, err := convertType(reflect.ValueOf(fs[0]), kt)
-			if err != nil {
+	v.Set(reflect.MakeMapWithSize(v.Type(), 0))
+	mp := &mapValue{v: v, def: fv, delim: delim}
+	if err := mp.Set(fv); err != nil {
 		return err
 	}
-			val, err := convertType(reflect.ValueOf(fs[1]), vt)
-			if err != nil {
-				return err
-			}
-			v.SetMapIndex(key.Convert(v.Type().Key()), val.Convert(v.Type().Elem()))
-		}
-		return nil
-	})
-
+	flag.Var(mp, fn, fd)
 	return nil
 }
 
@@ -172,7 +230,7 @@ func (c *flagConfig) flagDuration(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := time.ParseDuration(fd)
+	i, err := time.ParseDuration(fv)
 	if err != nil {
 		return err
 	}
@@ -185,7 +243,7 @@ func (c *flagConfig) flagBool(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseBool(fd)
+	i, err := strconv.ParseBool(fv)
 	if err != nil {
 		return err
 	}
@@ -207,11 +265,11 @@ func (c *flagConfig) flagInt(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseInt(fd, 10, 64)
+	i, err := strconv.ParseInt(fv, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.IntVar(nv, fn, int(i), fd)
+	flag.IntVar(nv, fn, int(i), fv)
 	return nil
 }
 
@@ -220,11 +278,11 @@ func (c *flagConfig) flagInt64(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseInt(fd, 10, 64)
+	i, err := strconv.ParseInt(fv, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.Int64Var(nv, fn, int64(i), fd)
+	flag.Int64Var(nv, fn, int64(i), fv)
 	return nil
 }
 
@@ -233,11 +291,11 @@ func (c *flagConfig) flagUint(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseUint(fd, 10, 64)
+	i, err := strconv.ParseUint(fv, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.UintVar(nv, fn, uint(i), fd)
+	flag.UintVar(nv, fn, uint(i), fv)
 	return nil
 }
 
@@ -246,11 +304,11 @@ func (c *flagConfig) flagUint64(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseUint(fd, 10, 64)
+	i, err := strconv.ParseUint(fv, 10, 64)
 	if err != nil {
 		return err
 	}
-	flag.Uint64Var(nv, fn, uint64(i), fd)
+	flag.Uint64Var(nv, fn, uint64(i), fv)
 	return nil
 }
 
@@ -259,14 +317,15 @@ func (c *flagConfig) flagFloat64(v reflect.Value, fn, fv, fd string) error {
 	if !ok {
 		return ErrInvalidValue
 	}
-	i, err := strconv.ParseFloat(fd, 64)
+	i, err := strconv.ParseFloat(fv, 64)
 	if err != nil {
 		return err
 	}
-	flag.Float64Var(nv, fn, float64(i), fd)
+	flag.Float64Var(nv, fn, float64(i), fv)
 	return nil
 }
 
+/*
 func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
 	nv, ok := v.Addr().Interface().(*string)
 	if !ok {
@@ -275,33 +334,77 @@ func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
 	flag.StringVar(nv, fn, fv, fd)
 	return nil
 }
+*/
 
 func getFlagOpts(tf string) (string, string, string) {
-	ret := make([]string, 3)
-	vals := strings.Split(tf, ",")
-	f := 0
-	for _, val := range vals {
-		p := strings.Split(val, "=")
-		switch p[0] {
+	var name, desc, def string
+	delim := ","
+
+	var buf string
+	for idx := 0; idx < len(tf); idx++ {
+		buf += string(tf[idx])
+		switch buf {
 		case "name":
-			f = 0
-		case "desc":
-			f = 1
-		case "default":
-			f = 2
-		default:
-			ret[f] += "," + val
+			ndx := idx + 2
+			stop := ","
+			var quote bool
+			for ; ndx < len(tf); ndx++ {
+				if string(tf[ndx]) == stop {
+					if quote {
+						ndx++
+					}
+					break
+				}
+				if string(tf[ndx]) == "'" {
+					stop = "'"
+					quote = true
 					continue
 				}
-		ret[f] = p[1]
+				name += string(tf[ndx])
 			}
-	for idx := range ret {
-		if ret[idx][0] == '\'' {
-			ret[idx] = ret[idx][1:]
+			idx = ndx
+			buf = ""
+		case "desc":
+			ndx := idx + 2
+			stop := ","
+			var quote bool
+			for ; ndx < len(tf); ndx++ {
+				if string(tf[ndx]) == stop {
+					if quote {
+						ndx++
 					}
-		if ret[idx][len(ret[idx])-1] == '\'' {
-			ret[idx] = ret[idx][:len(ret[idx])-1]
+					break
+				}
+				if string(tf[ndx]) == "'" {
+					stop = "'"
+					quote = true
+					continue
+				}
+				desc += string(tf[ndx])
+			}
+			idx = ndx
+			buf = ""
+		case "default":
+			ndx := idx + 2
+			stop := ","
+			var quote bool
+			for ; ndx < len(tf); ndx++ {
+				if string(tf[ndx]) == stop && (stop != delim) {
+					if quote {
+						ndx++
+					}
+					break
+				}
+				if string(tf[ndx]) == "'" {
+					stop = "'"
+					quote = true
+					continue
+				}
+				def += string(tf[ndx])
+			}
+			idx = ndx
+			buf = ""
 		}
 	}
-	return ret[0], ret[1], ret[2]
+	return name, desc, def
 }