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.

Sign up for GitHub

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

feat: Generate services via Xuanwo/gg #742

Merged
merged 5 commits into from
Sep 13, 2021
Merged

feat: Generate services via Xuanwo/gg #742

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1bc44a1
feat: Generate services via Xuanwo/gg
Xuanwo Sep 4, 2021
80add71
Redesign api
Xuanwo Sep 8, 2021
29dfea2
Merge branch 'master' into gen_service
Xuanwo Sep 8, 2021
5d8f493
Merge branch 'master' into gen_service
Xuanwo Sep 13, 2021
ca6f4cd
Upgrade Xuanwo/gg
Xuanwo Sep 13, 2021
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
30 changes: 1 addition & 29 deletions cmd/definitions/bindata/bindata.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 14 additions & 14 deletions cmd/definitions/gen_func.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

func generateFunc(ns *Namespace, path string) {
f := gg.Group()
f := gg.NewGroup()

nsNameP := templateutils.ToPascal(ns.Name)

Expand All @@ -23,38 +23,38 @@ func generateFunc(ns *Namespace, path string) {
fnNameP := templateutils.ToPascal(fn.Name)

if fn.Local {
gfn := f.Function(fnNameC).
Receiver("s", "*"+nsNameP)
gfn := f.NewFunction(fnNameC).
WithReceiver("s", "*"+nsNameP)
for _, v := range fn.Params {
// We need to remove pair from generated functions.
if v.Type() == "...Pair" {
continue
}
gfn.Parameter(v.Name, v.Type())
gfn.AddParameter(v.Name, v.Type())
}
gfn.Parameter("opt", "pair"+nsNameP+fnNameP)
gfn.AddParameter("opt", "pair"+nsNameP+fnNameP)
for _, v := range fn.Results {
gfn.Result(v.Name, v.Type())
gfn.AddResult(v.Name, v.Type())
}
gfn.Body(gg.String(`panic("not implemented")`))
gfn.AddBody(gg.S(`panic("not implemented")`))
continue
}

gfn := f.Function(fnNameC).
Receiver("s", "*"+nsNameP)
gfn.Parameter("ctx", "context.Context")
gfn := f.NewFunction(fnNameC).
WithReceiver("s", "*"+nsNameP)
gfn.AddParameter("ctx", "context.Context")
for _, v := range fn.Params {
// We need to remove pair from generated functions.
if v.Type() == "...Pair" {
continue
}
gfn.Parameter(v.Name, v.Type())
gfn.AddParameter(v.Name, v.Type())
}
gfn.Parameter("opt", "pair"+nsNameP+fnNameP)
gfn.AddParameter("opt", "pair"+nsNameP+fnNameP)
for _, v := range fn.Results {
gfn.Result(v.Name, v.Type())
gfn.AddResult(v.Name, v.Type())
}
gfn.Body(gg.String(`panic("not implemented")`))
gfn.AddBody(`panic("not implemented")`)
continue
}

Expand Down
103 changes: 49 additions & 54 deletions cmd/definitions/gen_info.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,94 +4,89 @@
package main

import (
"fmt"

"github.com/Xuanwo/gg"
"github.com/Xuanwo/templateutils"
log "github.com/sirupsen/logrus"
)

func generateInfo(data *Data, path string) {
f := gg.Group()
f.LineComment("Code generated by go generate cmd/definitions; DO NOT EDIT.")
f.Package("types")
f.Imports().Path("fmt")
f := gg.NewGroup()
f.AddLineComment("Code generated by go generate cmd/definitions; DO NOT EDIT.")
f.AddPackage("types")
f.NewImport().AddPath("fmt")

for serviceName, infos := range data.InfosMap {
serviceNameC := templateutils.ToCamel(serviceName)
serviceNameP := templateutils.ToPascal(serviceName)
serviceNameK := templateutils.ToKebab(serviceName)

// Generate field bits
f.LineComment("Field index in %s bit", serviceNameC)
consts := f.Const()
f.AddLineComment("Field index in %s bit", serviceNameC)
consts := f.NewConst()
for k, v := range infos {
consts.Field(
fmt.Sprintf("%sIndex%s",
consts.AddField(
gg.S("%sIndex%s",
serviceNameC, templateutils.ToPascal(v.Name)),
fmt.Sprintf("1<<%d", k),
gg.S("1<<%d", k),
)
}

// Generate struct
st := f.Struct(serviceNameP)
st := f.NewStruct(serviceNameP)
for _, v := range infos {
st.Field(v.TypeName(), v.Type())
st.AddField(v.TypeName(), v.Type())
}
st.Line()
st.LineComment("bit used as a bitmap for object value, 0 means not set, 1 means set")
st.Field("bit", "uint64")
st.Field("m", "map[string]interface{}")
st.AddLine()
st.AddLineComment("bit used as a bitmap for object value, 0 means not set, 1 means set")
st.AddField("bit", "uint64")
st.AddField("m", "map[string]interface{}")

// Generate Get/Set functions.
for _, v := range infos {
// If the value is export, we don't need to generate MustGetXxxx
if v.Export {
f.Function("Get"+v.DisplayName()).
Receiver("m", "*"+serviceNameP).
Result("", v.Type()).
Body(gg.Return().Id("m." + v.TypeName()))
f.Function("Set"+v.DisplayName()).
Receiver("m", "*"+serviceNameP).
Parameter("v", v.Type()).
Result("", "*"+serviceNameP).
Body(
gg.String("m.%s = v", v.TypeName()),
gg.Return().Id("m"),
f.NewFunction("Get"+v.DisplayName()).
WithReceiver("m", "*"+serviceNameP).
AddResult("", v.Type()).
AddBody(gg.Return("m." + v.TypeName()))
f.NewFunction("Set"+v.DisplayName()).
WithReceiver("m", "*"+serviceNameP).
AddParameter("v", v.Type()).
AddResult("", "*"+serviceNameP).
AddBody(
gg.S("m.%s = v", v.TypeName()),
gg.Return("m"),
)
continue
}
f.Function("Get"+v.DisplayName()).
Receiver("m", "*"+serviceNameP).
Result("", v.Type()).
Result("", "bool").
Body(
gg.If(gg.String("m.bit & %sIndex%s != 0",
f.NewFunction("Get"+v.DisplayName()).
WithReceiver("m", "*"+serviceNameP).
AddResult("", v.Type()).
AddResult("", "bool").
AddBody(
gg.If(gg.S("m.bit & %sIndex%s != 0",
serviceNameC, templateutils.ToPascal(v.Name))).
Body(
gg.Return().Id("m."+v.TypeName()).Lit(true)),
gg.Return().Id(templateutils.ZeroValue(v.Type())).Lit(false),
AddBody(gg.Return("m."+v.TypeName(), gg.Lit(true))),
gg.Return(templateutils.ZeroValue(v.Type()), gg.Lit(false)),
)
f.Function("MustGet"+v.DisplayName()).
Receiver("m", "*"+serviceNameP).
Result("", v.Type()).
Body(
gg.If(gg.String("m.bit & %sIndex%s == 0",
f.NewFunction("MustGet"+v.DisplayName()).
WithReceiver("m", "*"+serviceNameP).
AddResult("", v.Type()).
AddBody(
gg.If(gg.S("m.bit & %sIndex%s == 0",
serviceNameC, templateutils.ToPascal(v.Name))).
Body(gg.String(
AddBody(gg.S(
`panic(fmt.Sprintf("%s %s is not set"))`,
serviceNameK, v.Name)),
gg.Return().Id("m."+v.TypeName()),
)
f.Function("Set"+v.DisplayName()).
Receiver("m", "*"+serviceNameP).
Parameter("v", v.Type()).
Result("", "*"+serviceNameP).
Body(
gg.String("m.%s = v", v.TypeName()),
gg.String("m.bit |= %sIndex%s",
serviceNameC, templateutils.ToPascal(v.Name)),
gg.Return().Id("m"),
gg.Return("m."+v.TypeName()))
f.NewFunction("Set"+v.DisplayName()).
WithReceiver("m", "*"+serviceNameP).
AddParameter("v", v.Type()).
AddResult("", "*"+serviceNameP).
AddBody(
gg.S("m.%s = v", v.TypeName()),
gg.S("m.bit |= %sIndex%s", serviceNameC, templateutils.ToPascal(v.Name)),
gg.Return("m"),
)
}
}
Expand Down
Loading