Embedded Structs in Code Generation (#1909)

This allows code generation to properly embed structs when embedded in
the original types. It affects the generation of `gotypes.d.ts` and
`metaconsts.go`.

Additionally, the `AiSettingsType` has been split off and embedded into
the original `SettingsType` to make schema generation easier.

Author: oneirocosm

cmd/generatego/main-generatego.go

@@ -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 {
@@ -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 {

frontend/types/gotypes.d.ts

@@ -799,6 +799,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;

pkg/gogen/gogen.go

@@ -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 == "" {
@@ -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) {

pkg/tsgen/tsgen.go

@@ -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
@@ -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
 }
 
@@ -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)

pkg/wconfig/settingsconfig.go

@@ -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"`
@@ -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"`