admin/wire
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parse: use reflect.StructTag to detect wire tags #179 (#181)

Browse Source
This commit is contained in:
Y.Horie
2019-06-04 06:00:48 +09:00
committed by shantuo
parent b5d7d7864b
commit 000df02f3d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/wire/parse.go
View File

@@ -22,6 +22,7 @@ import (
"go/token" "go/token"
"go/types" "go/types"
"os" "os"
"reflect"
"strconv" "strconv"
"strings" "strings"
@@ -816,7 +817,7 @@ func processStructProvider(fset *token.FileSet, info *types.Info, call *ast.Call
} }
if allFields(call) { if allFields(call) {
for i := 0; i < st.NumFields(); i++ { for i := 0; i < st.NumFields(); i++ {
if isPrevented(st, i) { if isPrevented(st.Tag(i)) {
continue continue
} }
f := st.Field(i) f := st.Field(i)
@@ -863,9 +864,8 @@ func allFields(call *ast.CallExpr) bool {
// isPrevented checks whether field i is prevented by tag "-". // isPrevented checks whether field i is prevented by tag "-".
// Since this is the only tag used by wire, we can do string comparison // Since this is the only tag used by wire, we can do string comparison
// without using reflect. // without using reflect.
// TODO(#179): parse the wire tag more robustly. func isPrevented(tag string) bool {
func isPrevented(st *types.Struct, i int) bool { return reflect.StructTag(tag).Get("wire") == "-"
return strings.Contains(st.Tag(i), `wire:"-"`)
} }
// processBind creates an interface binding from a wire.Bind call. // processBind creates an interface binding from a wire.Bind call.
@@ -1049,7 +1049,7 @@ func checkField(f ast.Expr, st *types.Struct) (*types.Var, error) {
} }
for i := 0; i < st.NumFields(); i++ { for i := 0; i < st.NumFields(); i++ {
if strings.EqualFold(strconv.Quote(st.Field(i).Name()), b.Value) { if strings.EqualFold(strconv.Quote(st.Field(i).Name()), b.Value) {
if isPrevented(st, i) { if isPrevented(st.Tag(i)) {
return nil, fmt.Errorf("%s is prevented from injecting by wire", b.Value) return nil, fmt.Errorf("%s is prevented from injecting by wire", b.Value)
} }
return st.Field(i), nil return st.Field(i), nil