Add Optional bson Support

Adds a new flag, `-bson`, which will also generate `MarshalBSON` and
`UnmarshalBSON` commands that satisfy interfaces specified in
gopkg.in/mgo.v2/bson.
This commit is contained in:
wyc 2016-11-04 18:03:45 -04:00
parent ff3de3c0dd
commit fa7370477d
2 changed files with 36 additions and 10 deletions

View File

@ -82,6 +82,9 @@ var (
typeNames = flag.String("type", "", "comma-separated list of type names; must be set") typeNames = flag.String("type", "", "comma-separated list of type names; must be set")
outputPrefix = flag.String("prefix", "", "prefix to be added to the output file") outputPrefix = flag.String("prefix", "", "prefix to be added to the output file")
outputSuffix = flag.String("suffix", "_jsonenums", "suffix to be added to the output file") outputSuffix = flag.String("suffix", "_jsonenums", "suffix to be added to the output file")
// BSON Support
bsonMode = flag.Bool("bson", false, "enable BSON-mode and generate BSON output in addition to JSON")
) )
func main() { func main() {
@ -109,14 +112,26 @@ func main() {
log.Fatalf("parsing package: %v", err) log.Fatalf("parsing package: %v", err)
} }
funcPrefixes := []string{"JSON"}
imports := []string{"encoding/json"}
if *bsonMode {
funcPrefixes = append(funcPrefixes, "BSON")
imports = append(imports, "gopkg.in/mgo.v2/bson")
}
var analysis = struct { var analysis = struct {
Command string Command string
PackageName string PackageName string
TypesAndValues map[string][]string TypesAndValues map[string][]string
// ["JSON", "BSON"]
FuncPrefixes []string
Imports []string
}{ }{
Command: strings.Join(os.Args[1:], " "), Command: strings.Join(os.Args[1:], " "),
PackageName: pkg.Name, PackageName: pkg.Name,
TypesAndValues: make(map[string][]string), TypesAndValues: make(map[string][]string),
FuncPrefixes: funcPrefixes,
Imports: imports,
} }
// Run generate for each type. // Run generate for each type.

View File

@ -6,17 +6,24 @@
package main package main
import "text/template" import (
"strings"
"text/template"
)
var generatedTmpl = template.Must(template.New("generated").Parse(` var generatedTmpl = template.Must(template.New("generated").
Funcs(template.FuncMap{"toLower": strings.ToLower}).Parse(`
// generated by jsonenums {{.Command}}; DO NOT EDIT // generated by jsonenums {{.Command}}; DO NOT EDIT
package {{.PackageName}} package {{.PackageName}}
import ( import (
"encoding/json" {{range .Imports}}
"{{.}}"
{{end}}
"fmt" "fmt"
) )
{{$funcPrefixes := .FuncPrefixes}}
{{range $typename, $values := .TypesAndValues}} {{range $typename, $values := .TypesAndValues}}
@ -42,22 +49,24 @@ func init() {
} }
} }
// MarshalJSON is generated so {{$typename}} satisfies json.Marshaler. {{ range $_, $funcPrefix := $funcPrefixes}}
func (r {{$typename}}) MarshalJSON() ([]byte, error) {
// Marshal{{$funcPrefix}} is generated so {{$typename}} satisfies {{$funcPrefix | toLower}}.Marshaler.
func (r {{$typename}}) Marshal{{$funcPrefix}}() ([]byte, error) {
if s, ok := interface{}(r).(fmt.Stringer); ok { if s, ok := interface{}(r).(fmt.Stringer); ok {
return json.Marshal(s.String()) return {{$funcPrefix | toLower}}.Marshal(s.String())
} }
s, ok := _{{$typename}}ValueToName[r] s, ok := _{{$typename}}ValueToName[r]
if !ok { if !ok {
return nil, fmt.Errorf("invalid {{$typename}}: %d", r) return nil, fmt.Errorf("invalid {{$typename}}: %d", r)
} }
return json.Marshal(s) return {{$funcPrefix | toLower}}.Marshal(s)
} }
// UnmarshalJSON is generated so {{$typename}} satisfies json.Unmarshaler. // Unmarshal{{$funcPrefix}} is generated so {{$typename}} satisfies {{$funcPrefix | toLower}}.Unmarshaler.
func (r *{{$typename}}) UnmarshalJSON(data []byte) error { func (r *{{$typename}}) Unmarshal{{$funcPrefix}}(data []byte) error {
var s string var s string
if err := json.Unmarshal(data, &s); err != nil { if err := {{$funcPrefix | toLower}}.Unmarshal(data, &s); err != nil {
return fmt.Errorf("{{$typename}} should be a string, got %s", data) return fmt.Errorf("{{$typename}} should be a string, got %s", data)
} }
v, ok := _{{$typename}}NameToValue[s] v, ok := _{{$typename}}NameToValue[s]
@ -68,5 +77,7 @@ func (r *{{$typename}}) UnmarshalJSON(data []byte) error {
return nil return nil
} }
{{end}}
{{end}} {{end}}
`)) `))