To make it easier for users to set up configuration files without having to remember various fields, the configuration file is written with all empty fields by default except for the Impl field.

Author: tsingbx

cmd/llcppcfg/gen/cfg_test.go

@@ -473,6 +473,10 @@ func Test_sortIncludes(t *testing.T) {
 }
 
 func TestNewLLCppConfig(t *testing.T) {
+	want := llcppg.NewDefault()
+	want.Name = "libcjson"
+	want.CFlags = "$(pkg-config --cflags libcjson)"
+	want.Libs = "$(pkg-config --libs libcjson)"
 	type args struct {
 		name string
 		flag FlagMode
@@ -488,13 +492,7 @@ func TestNewLLCppConfig(t *testing.T) {
 				"libcjson",
 				WithTab,
 			},
-			&llcppg.Config{
-				Name:           "libcjson",
-				CFlags:         "$(pkg-config --cflags libcjson)",
-				Libs:           "$(pkg-config --libs libcjson)",
-				Cplusplus:      false,
-				KeepUnderScore: false,
-			},
+			want,
 		},
 	}
 	for _, tt := range tests {

config/config.go

@@ -7,36 +7,54 @@ import (
 )
 
 type Condition struct {
-	OS   []string `json:"os"`
-	Arch []string `json:"arch"`
+	OS   []string `json:"os,omitempty"`
+	Arch []string `json:"arch,omitempty"`
 }
 
 type ImplFiles struct {
-	Files []string  `json:"files"`
-	Cond  Condition `json:"cond"`
+	Files []string  `json:"files,omitempty"`
+	Cond  Condition `json:"cond,omitempty"`
 }
 
 // Config represents a configuration for the llcppg tool.
 type Config struct {
 	Name   string `json:"name"`
 	CFlags string `json:"cflags"`
 	// NOTE(MeterosLiu): libs can be empty when we're in headerOnly mode
-	Libs           string            `json:"libs,omitempty"`
+	Libs           string            `json:"libs"`
 	Include        []string          `json:"include"`
-	TrimPrefixes   []string          `json:"trimPrefixes,omitempty"`
-	Cplusplus      bool              `json:"cplusplus,omitempty"`
-	Deps           []string          `json:"deps,omitempty"`
-	KeepUnderScore bool              `json:"keepUnderScore,omitempty"`
+	TrimPrefixes   []string          `json:"trimPrefixes"`
+	Cplusplus      bool              `json:"cplusplus"`
+	Deps           []string          `json:"deps"`
+	KeepUnderScore bool              `json:"keepUnderScore"`
 	Impl           []ImplFiles       `json:"impl,omitempty"`
-	Mix            bool              `json:"mix,omitempty"`
-	SymMap         map[string]string `json:"symMap,omitempty"`
-	TypeMap        map[string]string `json:"typeMap,omitempty"`
-	StaticLib      bool              `json:"staticLib,omitempty"`
-	HeaderOnly     bool              `json:"headerOnly,omitempty"`
+	Mix            bool              `json:"mix"`
+	SymMap         map[string]string `json:"symMap"`
+	TypeMap        map[string]string `json:"typeMap"`
+	StaticLib      bool              `json:"staticLib"`
+	HeaderOnly     bool              `json:"headerOnly"`
 }
 
+// To make it easier for users to set up configuration files without
+// having to remember various fields, the configuration file is written
+// with all empty fields by default except for the Impl field.
 func NewDefault() *Config {
-	return &Config{}
+	return &Config{
+		Name:           "",
+		CFlags:         "",
+		Libs:           "",
+		Include:        []string{},
+		TrimPrefixes:   []string{},
+		Cplusplus:      false,
+		Deps:           []string{},
+		KeepUnderScore: false,
+		Impl:           []ImplFiles{},
+		Mix:            false,
+		SymMap:         map[string]string{},
+		TypeMap:        map[string]string{},
+		StaticLib:      false,
+		HeaderOnly:     false,
+	}
 }
 
 type SymbolInfo struct {