feat: add embedded structs to generated go code

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 {

pkg/gogen/gogen.go

@@ -33,15 +33,23 @@ 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")
+	}
 	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 +66,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/wconfig/metaconsts.go

@@ -9,8 +9,19 @@ const (
 	ConfigKey_AppClear                       = "app:*"
 	ConfigKey_AppGlobalHotkey                = "app:globalhotkey"
 	ConfigKey_AppDismissArchitectureWarning  = "app:dismissarchitecturewarning"
-
-	ConfigKey_AiSettingsType                 = "AiSettingsType"
+	ConfigKey_AiClear                        = "ai:*"
+	ConfigKey_AiPreset                       = "ai:preset"
+	ConfigKey_AiApiType                      = "ai:apitype"
+	ConfigKey_AiBaseURL                      = "ai:baseurl"
+	ConfigKey_AiApiToken                     = "ai:apitoken"
+	ConfigKey_AiName                         = "ai:name"
+	ConfigKey_AiModel                        = "ai:model"
+	ConfigKey_AiOrgID                        = "ai:orgid"
+	ConfigKey_AIApiVersion                   = "ai:apiversion"
+	ConfigKey_AiMaxTokens                    = "ai:maxtokens"
+	ConfigKey_AiTimeoutMs                    = "ai:timeoutms"
+	ConfigKey_AiFontSize                     = "ai:fontsize"
+	ConfigKey_AiFixedFontSize                = "ai:fixedfontsize"
 
 	ConfigKey_TermClear                      = "term:*"
 	ConfigKey_TermFontSize                   = "term:fontsize"