Merge pull request #21 from seitau/fix/multiple-types-import

fix: multiple types import

Author: moznion

cmd/gonstructor/gonstructor.go

@@ -79,10 +79,12 @@ func main() {
 		log.Fatal(fmt.Errorf("[error] failed to parse a file: %w", err))
 	}
 
-	alreadyOpenedWithTruncFilesSet := map[string]bool{}
-
-	fileHeaderGenerated := false
-	for _, typeName := range typeNames {
+	var (
+		alreadyOpenedWithTruncFilesSet = map[string]bool{}
+		fileHeaderGenerated            = false
+		rootStmt                       = g.NewRoot()
+	)
+	for i, typeName := range typeNames {
 		fields, err := constructor.CollectConstructorFieldsFromAST(typeName, astFiles)
 		if err != nil {
 			log.Fatal(fmt.Errorf("[error] failed to collect fields from files: %w", err))
@@ -96,8 +98,6 @@ func main() {
 			}
 		}
 
-		rootStmt := g.NewRoot()
-
 		if !fileHeaderGenerated {
 			rootStmt = rootStmt.AddStatements(
 				g.NewComment(fmt.Sprintf(" Code generated by gonstructor %s; DO NOT EDIT.", strings.Join(os.Args[1:], " "))),
@@ -140,40 +140,43 @@ func main() {
 		if *withGetter {
 			rootStmt = rootStmt.AddStatements(internal.GenerateGetters(typeName, fields))
 		}
-
-		code, err := rootStmt.Goimports().EnableSyntaxChecking().Generate(0)
-		if err != nil {
-			log.Fatal(fmt.Errorf("[error] failed to generate code: %w", err))
+		if i != len(typeNames)-1 {
+			rootStmt = rootStmt.AddStatements(g.NewNewline())
 		}
+	}
 
-		err = func() error {
-			fileName := getFilenameToGenerate(typeName, *output, args)
+	code, err := rootStmt.Goimports().EnableSyntaxChecking().Generate(0)
+	if err != nil {
+		log.Fatal(fmt.Errorf("[error] failed to generate code: %w", err))
+	}
 
-			fileOpenFlag := os.O_APPEND | os.O_WRONLY | os.O_CREATE
-			if !alreadyOpenedWithTruncFilesSet[fileName] {
-				// truncate and make a blank file
-				fileOpenFlag = os.O_TRUNC | os.O_WRONLY | os.O_CREATE
-			}
+	err = func() error {
+		fileName := getFilenameToGenerate(typeNames[0], *output, args)
 
-			f, err := os.OpenFile(fileName, fileOpenFlag, 0644)
-			if err != nil {
-				return fmt.Errorf("[error] failed open a file to output the generated code: %w", err)
-			}
+		fileOpenFlag := os.O_APPEND | os.O_WRONLY | os.O_CREATE
+		if !alreadyOpenedWithTruncFilesSet[fileName] {
+			// truncate and make a blank file
+			fileOpenFlag = os.O_TRUNC | os.O_WRONLY | os.O_CREATE
+		}
 
-			defer f.Close()
+		f, err := os.OpenFile(fileName, fileOpenFlag, 0644)
+		if err != nil {
+			return fmt.Errorf("[error] failed open a file to output the generated code: %w", err)
+		}
 
-			alreadyOpenedWithTruncFilesSet[fileName] = true
+		defer f.Close()
 
-			_, err = f.WriteString(code)
-			if err != nil {
-				return fmt.Errorf("[error] failed output generated code to a file: %w", err)
-			}
+		alreadyOpenedWithTruncFilesSet[fileName] = true
 
-			return nil
-		}()
+		_, err = f.WriteString(code)
 		if err != nil {
-			log.Fatal(err)
+			return fmt.Errorf("[error] failed output generated code to a file: %w", err)
 		}
+
+		return nil
+	}()
+	if err != nil {
+		log.Fatal(err)
 	}
 }