feat: enhancement kcl import go struct with schema name and doc field

Signed-off-by: peefy <[email protected]>
kcl-lang · Aug 12, 2024 · 1dd374f · 1dd374f
1 parent 0ecd8eb
commit 1dd374f
Show file tree

Hide file tree

Showing 5 changed files with 1,509 additions and 14 deletions.
diff --git a/pkg/tools/gen/genkcl.go b/pkg/tools/gen/genkcl.go
@@ -11,7 +11,7 @@ import (
 
 type GenKclOptions struct {
 	Mode                  Mode
-	CastingOption         castingOption
+	CastingOption         CastingOption
 	UseIntegersForNumbers bool
 }
 

diff --git a/pkg/tools/gen/genkcl_gostruct.go b/pkg/tools/gen/genkcl_gostruct.go
@@ -183,7 +183,8 @@ func (ctx *genKclTypeContext) convertSchemaFromGoPackage() ([]convertResult, err
 		name := s.name
 		if _, ok := ctx.resultMap[name]; !ok {
 			result := convertResult{IsSchema: true}
-			ctx.resultMap[name] = result
+			result.schema.Name = name
+			result.schema.Description = s.doc
 			for _, field := range s.fields {
 				typeName := ctx.typeName(name, field.name, field.ty)
 				fieldName := formatName(field.name)
@@ -192,15 +193,13 @@ func (ctx *genKclTypeContext) convertSchemaFromGoPackage() ([]convertResult, err
 					fieldName = tagName
 					typeName = tagTy
 				}
-				result.schema.Name = name
-				result.schema.Description = s.doc
 				result.schema.Properties = append(result.Properties, property{
 					Name:        fieldName,
 					Type:        typeName,
 					Description: s.fieldDocs[field.name],
 				})
-				ctx.resultMap[name] = result
 			}
+			ctx.resultMap[name] = result
 		}
 	}
 	// Append anonymous structs