add -c for more compact representation

Author: miku

cmd/zek/main.go

@@ -26,6 +26,7 @@ var (
 	exampleMaxChars      = flag.Int("x", 25, "max chars for example")
 	version              = flag.Bool("version", false, "show version")
 	structName           = flag.String("n", "", "use a different name for the top-level struct")
+	compact              = flag.Bool("c", false, "emit more compact struct")
 )
 
 func main() {
@@ -78,6 +79,7 @@ func main() {
 		sw.WithJSONTags = *withJSONTags
 		sw.Strict = *strict
 		sw.ExampleMaxChars = *exampleMaxChars
+		sw.Compact = *compact
 
 		if err := sw.WriteNode(root); err != nil {
 			log.Fatal(err)
@@ -117,6 +119,7 @@ func main() {
 		sw.WithComments = *withComments
 		sw.Strict = *strict
 		sw.ExampleMaxChars = *exampleMaxChars
+		sw.Compact = *compact
 
 		if err := sw.WriteNode(root); err != nil {
 			log.Fatal(err)

structwriter.go

@@ -89,6 +89,7 @@ type StructWriter struct {
 	ExampleMaxChars   int                 // Max length of example comment.
 	Strict            bool                // Whether to ignore implementation holes.
 	WithJSONTags      bool                // Include JSON struct tags.
+	Compact           bool                // Emit more compact struct.
 }
 
 // NewStructWriter can write a node to a given writer. Default list of
@@ -212,6 +213,12 @@ func (sw *StructWriter) writeNode(node *Node, top bool) (err error) {
 	if node.IsMultivalued() && !top {
 		io.WriteString(sew, "[]")
 	}
+
+	if sw.Compact && len(node.Children) == 0 && len(node.Attr) == 0 {
+		fmt.Fprintf(sew, "string `xml:\"%s\"`\n", node.Name.Local)
+		return nil
+	}
+
 	io.WriteString(sew, "struct {\n")
 	if top {
 		sw.writeNameField(sew, node)