Skip to content

Embedded Structs in Code Generation #1909

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

Merged
oneirocosm merged 3 commits into from
Feb 7, 2025
Merged

Embedded Structs in Code Generation #1909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4776b3f
feat: add embedded structs to generated ts code
oneirocosm Feb 6, 2025
2137133
feat: add embedded structs to generated go code
oneirocosm Feb 6, 2025
1acb1ee
fix: metaconsts spacing
oneirocosm Feb 6, 2025
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
4 changes: 2 additions & 2 deletions cmd/generatego/main-generatego.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func GenerateWaveObjMetaConsts() error {
fmt.Fprintf(os.Stderr, "generating waveobj meta consts file to %s\n", WaveObjMetaConstsFileName)
var buf strings.Builder
gogen.GenerateBoilerplate(&buf, "waveobj", []string{})
gogen.GenerateMetaMapConsts(&buf, "MetaKey_", reflect.TypeOf(waveobj.MetaTSType{}))
gogen.GenerateMetaMapConsts(&buf, "MetaKey_", reflect.TypeOf(waveobj.MetaTSType{}), false)
buf.WriteString("\n")
written, err := utilfn.WriteFileIfDifferent(WaveObjMetaConstsFileName, []byte(buf.String()))
if !written {
Expand All @@ -69,7 +69,7 @@ func GenerateSettingsMetaConsts() error {
fmt.Fprintf(os.Stderr, "generating settings meta consts file to %s\n", SettingsMetaConstsFileName)
var buf strings.Builder
gogen.GenerateBoilerplate(&buf, "wconfig", []string{})
gogen.GenerateMetaMapConsts(&buf, "ConfigKey_", reflect.TypeOf(wconfig.SettingsType{}))
gogen.GenerateMetaMapConsts(&buf, "ConfigKey_", reflect.TypeOf(wconfig.SettingsType{}), false)
buf.WriteString("\n")
written, err := utilfn.WriteFileIfDifferent(SettingsMetaConstsFileName, []byte(buf.String()))
if !written {
Expand Down
10 changes: 10 additions & 0 deletions frontend/types/gotypes.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -768,6 +768,16 @@ declare global {

// telemetrydata.TEventProps
type TEventProps = {
"client:arch"?: string;
"client:version"?: string;
"client:initial_version"?: string;
"client:buildtime"?: string;
"client:osrelease"?: string;
"client:isdev"?: boolean;
"autoupdate:channel"?: string;
"autoupdate:enabled"?: boolean;
"loc:countrycode"?: string;
"loc:regioncode"?: string;
"activity:activeminutes"?: number;
"activity:fgminutes"?: number;
"activity:openminutes"?: number;
Expand Down
18 changes: 15 additions & 3 deletions pkg/gogen/gogen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,25 @@ func getBeforeColonPart(s string) string {
return s
}

func GenerateMetaMapConsts(buf *strings.Builder, constPrefix string, rtype reflect.Type) {
buf.WriteString("const (\n")
func GenerateMetaMapConsts(buf *strings.Builder, constPrefix string, rtype reflect.Type, embedded bool) {
if !embedded {
buf.WriteString("const (\n")
} else {
buf.WriteString("\n")
}
var lastBeforeColon = ""
isFirst := true
for idx := 0; idx < rtype.NumField(); idx++ {
field := rtype.Field(idx)
if field.PkgPath != "" {
continue
}
if field.Anonymous {
var embeddedBuf strings.Builder
GenerateMetaMapConsts(&embeddedBuf, constPrefix, field.Type, true)
buf.WriteString(embeddedBuf.String())
continue
}
fieldName := field.Name
jsonTag := utilfn.GetJsonTag(field)
if jsonTag == "" {
Expand All @@ -58,7 +68,9 @@ func GenerateMetaMapConsts(buf *strings.Builder, constPrefix string, rtype refle
buf.WriteString(fmt.Sprintf("\t%-40s = %q\n", cname, jsonTag))
isFirst = false
}
buf.WriteString(")\n")
if !embedded {
buf.WriteString(")\n")
}
}

func GenMethod_Call(buf *strings.Builder, methodDecl *wshrpc.WshRpcMethodDecl) {
Expand Down
28 changes: 19 additions & 9 deletions pkg/tsgen/tsgen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,26 +176,34 @@ var tsRenameMap = map[string]string{
"MetaSettingsType": "SettingsType",
}

func generateTSTypeInternal(rtype reflect.Type, tsTypesMap map[reflect.Type]string) (string, []reflect.Type) {
func generateTSTypeInternal(rtype reflect.Type, tsTypesMap map[reflect.Type]string, embedded bool) (string, []reflect.Type) {
var buf bytes.Buffer
tsTypeName := rtype.Name()
if tsRename, ok := tsRenameMap[tsTypeName]; ok {
tsTypeName = tsRename
}
var isWaveObj bool
buf.WriteString(fmt.Sprintf("// %s\n", rtype.String()))
if rtype.Implements(waveObjRType) || reflect.PointerTo(rtype).Implements(waveObjRType) {
isWaveObj = true
buf.WriteString(fmt.Sprintf("type %s = WaveObj & {\n", tsTypeName))
} else {
buf.WriteString(fmt.Sprintf("type %s = {\n", tsTypeName))
if !embedded {
buf.WriteString(fmt.Sprintf("// %s\n", rtype.String()))
if rtype.Implements(waveObjRType) || reflect.PointerTo(rtype).Implements(waveObjRType) {
isWaveObj = true
buf.WriteString(fmt.Sprintf("type %s = WaveObj & {\n", tsTypeName))
} else {
buf.WriteString(fmt.Sprintf("type %s = {\n", tsTypeName))
}
}
var subTypes []reflect.Type
for i := 0; i < rtype.NumField(); i++ {
field := rtype.Field(i)
if field.PkgPath != "" {
continue
}
if field.Anonymous {
embeddedBuf, embeddedTypes := generateTSTypeInternal(field.Type, tsTypesMap, true)
buf.WriteString(embeddedBuf)
subTypes = append(subTypes, embeddedTypes...)
continue
}
fieldName := getTSFieldName(field)
if fieldName == "" {
continue
Expand Down Expand Up @@ -225,7 +233,9 @@ func generateTSTypeInternal(rtype reflect.Type, tsTypesMap map[reflect.Type]stri
}
buf.WriteString(fmt.Sprintf(" %s%s: %s;\n", fieldName, optMarker, tsType))
}
buf.WriteString("};\n")
if !embedded {
buf.WriteString("};\n")
}
return buf.String(), subTypes
}

Expand Down Expand Up @@ -303,7 +313,7 @@ func GenerateTSType(rtype reflect.Type, tsTypesMap map[reflect.Type]string) {
if rtype.Kind() != reflect.Struct {
return
}
tsType, subTypes := generateTSTypeInternal(rtype, tsTypesMap)
tsType, subTypes := generateTSTypeInternal(rtype, tsTypesMap, false)
tsTypesMap[rtype] = tsType
for _, subType := range subTypes {
GenerateTSType(subType, tsTypesMap)
Expand Down
14 changes: 9 additions & 5 deletions pkg/wconfig/settingsconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,7 @@ const AnySchema = `
}
`

type SettingsType struct {
AppClear bool `json:"app:*,omitempty"`
AppGlobalHotkey string `json:"app:globalhotkey,omitempty"`
AppDismissArchitectureWarning bool `json:"app:dismissarchitecturewarning,omitempty"`

type AiSettingsType struct {
AiClear bool `json:"ai:*,omitempty"`
AiPreset string `json:"ai:preset,omitempty"`
AiApiType string `json:"ai:apitype,omitempty"`
Expand All @@ -50,6 +46,14 @@ type SettingsType struct {
AiTimeoutMs float64 `json:"ai:timeoutms,omitempty"`
AiFontSize float64 `json:"ai:fontsize,omitempty"`
AiFixedFontSize float64 `json:"ai:fixedfontsize,omitempty"`
}

type SettingsType struct {
AppClear bool `json:"app:*,omitempty"`
AppGlobalHotkey string `json:"app:globalhotkey,omitempty"`
AppDismissArchitectureWarning bool `json:"app:dismissarchitecturewarning,omitempty"`

AiSettingsType

TermClear bool `json:"term:*,omitempty"`
TermFontSize float64 `json:"term:fontsize,omitempty"`
Expand Down
Loading