Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add flag to select map encoding #1

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,20 @@ import (
var ErrWrongPackageCount = errors.New("Must be part of only one package")

type Generator struct {
Path string
Filename string
Package string
GenStructs []string
Path string
Filename string
Package string
GenStructs []string
MapEncoding bool
}

type templateData struct {
Path string
Filebase string
Package string
GenStructs []string
PkgPath string
Path string
Filebase string
Package string
GenStructs []string
PkgPath string
MapEncoding bool
}

func (g Generator) GenerateCborTypes() error {
Expand All @@ -41,11 +43,12 @@ func (g Generator) GenerateCborTypes() error {
return ErrWrongPackageCount
}
tdata := templateData{
Path: g.Path,
Package: g.Package,
Filebase: strings.TrimSuffix(g.Filename, ".go"),
PkgPath: pkgs[0].PkgPath,
GenStructs: g.GenStructs,
Path: g.Path,
Package: g.Package,
Filebase: strings.TrimSuffix(g.Filename, ".go"),
PkgPath: pkgs[0].PkgPath,
GenStructs: g.GenStructs,
MapEncoding: g.MapEncoding,
}

rt, err := template.New("run_cbor_gen").Parse(runTemplate)
Expand Down Expand Up @@ -98,7 +101,11 @@ import (

func RunCborGen() error {
genName := "{{.Path}}/{{.Filebase}}_cbor_gen.go"
{{ if .MapEncoding }}
if err := cborgen.WriteMapEncodersToFile(
{{ else }}
if err := cborgen.WriteTupleEncodersToFile(
{{ end }}
genName,
"{{.Package}}",
{{range .GenStructs}}
Expand Down
14 changes: 10 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@ func main() {
app := &cli.App{
Name: "cbor-gen-for",
Usage: "Generate CBOR encoders for types",
Flags: []cli.Flag{
&cli.BoolFlag{
Name: "map-encoding",
},
},
Action: func(c *cli.Context) error {
filename := os.Getenv("GOFILE")
path, _ := os.Getwd()
err := Generator{
Filename: filename,
Path: path,
Package: os.Getenv("GOPACKAGE"),
GenStructs: c.Args().Slice(),
Filename: filename,
Path: path,
Package: os.Getenv("GOPACKAGE"),
GenStructs: c.Args().Slice(),
MapEncoding: c.Bool("map-encoding"),
}.GenerateCborTypes()

return err
Expand Down