Merge branch 'master' into exclude

README.md

@@ -1,6 +1,7 @@
 # go-plantuml
 [![Build Status](https://github.com/bykof/go-plantuml/actions/workflows/test.yml/badge.svg)](https://github.com/bykof/go-plantuml/actions/workflows/test.yml/badge.svg)
 [![Go Report Card](https://goreportcard.com/badge/github.com/bykof/go-plantuml)](https://goreportcard.com/report/github.com/bykof/go-plantuml)
+[![go-recipes](https://raw.githubusercontent.com/nikolaydubina/go-recipes/main/badge.svg?raw=true)](https://github.com/nikolaydubina/go-recipes)
 
 go-plantuml generates plantuml diagrams from go source files or directories.
 

astParser/formatters.go

@@ -2,8 +2,9 @@ package astParser
 
 import (
 	"fmt"
-	"github.com/bykof/go-plantuml/domain"
 	"strings"
+
+	"github.com/bykof/go-plantuml/domain"
 )
 
 func formatArrayType(typeName string) string {

astParser/formatters_test.go

@@ -1,9 +1,11 @@
 package astParser
 
 import (
-	"github.com/bykof/go-plantuml/domain"
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/bykof/go-plantuml/domain"
 )
 
 func Test_formatArrayType(t *testing.T) {

astParser/mapper_test.go

@@ -1,10 +1,12 @@
 package astParser
 
 import (
-	"github.com/bykof/go-plantuml/domain"
-	"github.com/magiconair/properties/assert"
 	"go/ast"
 	"testing"
+
+	"github.com/magiconair/properties/assert"
+
+	"github.com/bykof/go-plantuml/domain"
 )
 
 func Test_starExprToField(t *testing.T) {

astParser/mappers.go

@@ -1,8 +1,9 @@
 package astParser
 
 import (
-	"github.com/bykof/go-plantuml/domain"
 	"go/ast"
+
+	"github.com/bykof/go-plantuml/domain"
 )
 
 func starExprToField(fieldName string, starExpr *ast.StarExpr) domain.Field {

astParser/parser.go

@@ -5,8 +5,8 @@ import (
 	"go/ast"
 	"go/parser"
 	"go/token"
-	"io/ioutil"
 	"log"
+	"os"
 	"path/filepath"
 	"reflect"
 	"regexp"
@@ -22,7 +22,7 @@ func ParseDirectory(directoryPath string, opts ...ParserOptionFunc) domain.Packa
 	}
 
 	var packages domain.Packages
-	files, err := ioutil.ReadDir(directoryPath)
+	files, err := os.ReadDir(directoryPath)
 	if err != nil {
 		log.Fatal(err)
 	}

cmd/generate.go

@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"io/ioutil"
 	"log"
+	"os"
 
 	"github.com/spf13/cobra"
 
@@ -41,7 +41,7 @@ var (
 			}
 
 			formattedPlantUML := formatter.FormatPlantUML(packages)
-			err := ioutil.WriteFile(outPath, []byte(formattedPlantUML), 0644)
+			err := os.WriteFile(outPath, []byte(formattedPlantUML), 0644)
 			if err != nil {
 				log.Fatal(err)
 			}

cmd/root.go

@@ -2,10 +2,10 @@ package cmd
 
 import (
 	"fmt"
-	"github.com/spf13/cobra"
 	"os"
 
 	homedir "github.com/mitchellh/go-homedir"
+	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
 

domain/class.go

@@ -17,9 +17,8 @@ type (
 func (class Class) HasRelation(toClass Class) bool {
 	for _, field := range class.Fields {
 		fieldTypeName := string(field.Type)
-		if strings.HasPrefix(fieldTypeName, "*") {
-			fieldTypeName = fieldTypeName[1:]
-		}
+
+		fieldTypeName = strings.TrimPrefix(fieldTypeName, "*")
 
 		if fieldTypeName == toClass.Name {
 			return true

domain/class_test.go

@@ -1,8 +1,9 @@
 package domain
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestClass_HasRelation(t *testing.T) {

domain/field_test.go

@@ -1,8 +1,9 @@
 package domain
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestField_IsPrivate(t *testing.T) {

domain/function_test.go

@@ -1,8 +1,9 @@
 package domain
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestFunction_IsPrivate(t *testing.T) {

domain/interface_test.go

@@ -1,8 +1,9 @@
 package domain
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestInterface_IsImplementedBy(t *testing.T) {

domain/package_test.go

@@ -1,8 +1,9 @@
 package domain
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPackages_AllClasses(t *testing.T) {

domain/type_test.go

@@ -1,8 +1,9 @@
 package domain
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestType_ToString(t *testing.T) {

formatter/plantUml.go

@@ -2,8 +2,9 @@ package formatter
 
 import (
 	"fmt"
-	"github.com/bykof/go-plantuml/domain"
 	"strings"
+
+	"github.com/bykof/go-plantuml/domain"
 )
 
 const PlantUMLInterfaceFormat = `interface %s{

test/user/models/user.go

@@ -8,7 +8,6 @@ type (
 		LastName       string
 		Age            uint8
 		Address        *models.Address
-		privateAddress models.Address
 	}
 )