fix: parseDependency parses all dependencies for all search dir now. (#2097)

if all dependecies were not loaded before parseTypes, every step for parseTypes/collectionConst may load new packages.
it's will break uniqueness checking

Author: okhowang

golist.go

@@ -8,9 +8,39 @@ import (
 	"go/build"
 	"os/exec"
 	"path/filepath"
+	"slices"
 )
 
-func listPackages(ctx context.Context, dir string, env []string, args ...string) (pkgs []*build.Package, finalErr error) {
+func listPackages(ctx context.Context, dirs []string, env []string, args ...string) ([]*build.Package, error) {
+	pkgMap := make(map[string]*build.Package)
+	for i, dir := range dirs {
+		pkgs, err := listOnePackages(ctx, dir, env, args...)
+		if err != nil {
+			if i == 0 {
+				return nil, fmt.Errorf("pkg %s cannot find all dependencies, %s", dir, err)
+			}
+			continue // ignore search dir load error?
+		}
+		for _, pkg := range pkgs {
+			pkgMap[pkg.Dir] = pkg
+		}
+	}
+	pkgs := make([]*build.Package, 0, len(pkgMap))
+	for _, pkg := range pkgMap {
+		pkgs = append(pkgs, pkg)
+	}
+	slices.SortFunc(pkgs, func(a, b *build.Package) int {
+		if a.Dir < b.Dir {
+			return -1
+		} else if a.Dir > b.Dir {
+			return 1
+		}
+		return 0
+	})
+	return pkgs, nil
+}
+
+func listOnePackages(ctx context.Context, dir string, env []string, args ...string) (pkgs []*build.Package, finalErr error) {
 	cmd := exec.CommandContext(ctx, "go", append([]string{"list", "-json", "-e"}, args...)...)
 	cmd.Env = env
 	cmd.Dir = dir

golist_test.go

@@ -42,7 +42,7 @@ func TestListPackages(t *testing.T) {
 
 	for _, c := range cases {
 		t.Run(c.name, func(t *testing.T) {
-			_, err := listPackages(context.TODO(), c.searchDir, nil, c.args...)
+			_, err := listOnePackages(context.TODO(), c.searchDir, nil, c.args...)
 			if c.except != nil {
 				assert.NotNil(t, err)
 			} else {

parser.go

@@ -419,10 +419,11 @@ func (parser *Parser) ParseAPIMultiSearchDir(searchDirs []string, mainAPIFile st
 
 	// Use 'go list' command instead of depth.Resolve()
 	if parser.ParseDependency > 0 {
+		allDir := append([]string{filepath.Dir(absMainAPIFilePath)}, searchDirs...)
 		if parser.parseGoList {
-			pkgs, err := listPackages(context.Background(), filepath.Dir(absMainAPIFilePath), nil, "-deps")
+			pkgs, err := listPackages(context.Background(), allDir, nil, "-deps")
 			if err != nil {
-				return fmt.Errorf("pkg %s cannot find all dependencies, %s", filepath.Dir(absMainAPIFilePath), err)
+				return err
 			}
 
 			length := len(pkgs)
@@ -433,23 +434,35 @@ func (parser *Parser) ParseAPIMultiSearchDir(searchDirs []string, mainAPIFile st
 				}
 			}
 		} else {
-			var t depth.Tree
-			t.ResolveInternal = true
-			t.MaxDepth = parseDepth
-
-			pkgName, err := getPkgName(filepath.Dir(absMainAPIFilePath))
-			if err != nil {
-				return err
+			dirImported := make(map[string]struct{}) // for deduplication
+			for _, dir := range allDir {             // ignore search dir (have been parsed)
+				absDir, err := filepath.Abs(dir)
+				if err == nil {
+					dirImported[absDir] = struct{}{}
+				}
 			}
+			for index, dir := range allDir {
+				var t depth.Tree
+				t.ResolveInternal = true
+				t.MaxDepth = parseDepth
 
-			err = t.Resolve(pkgName)
-			if err != nil {
-				return fmt.Errorf("pkg %s cannot find all dependencies, %s", pkgName, err)
-			}
-			for i := 0; i < len(t.Root.Deps); i++ {
-				err := parser.getAllGoFileInfoFromDeps(&t.Root.Deps[i], parser.ParseDependency)
+				pkgName, err := getPkgName(dir)
 				if err != nil {
-					return err
+					if index == 0 { // ignore error when load search dir
+						return err
+					}
+					continue
+				}
+
+				err = t.Resolve(pkgName)
+				if err != nil {
+					return fmt.Errorf("pkg %s cannot find all dependencies, %s", pkgName, err)
+				}
+				for i := 0; i < len(t.Root.Deps); i++ {
+					err := parser.getAllGoFileInfoFromDeps(&t.Root.Deps[i], parser.ParseDependency, dirImported)
+					if err != nil {
+						return err
+					}
 				}
 			}
 		}
@@ -1867,7 +1880,7 @@ func (parser *Parser) getAllGoFileInfo(packageDir, searchDir string) error {
 	})
 }
 
-func (parser *Parser) getAllGoFileInfoFromDeps(pkg *depth.Pkg, parseFlag ParseFlag) error {
+func (parser *Parser) getAllGoFileInfoFromDeps(pkg *depth.Pkg, parseFlag ParseFlag, dirImported map[string]struct{}) error {
 	ignoreInternal := pkg.Internal && !parser.ParseInternal
 	if ignoreInternal || !pkg.Resolved { // ignored internal and not resolved dependencies
 		return nil
@@ -1883,6 +1896,10 @@ func (parser *Parser) getAllGoFileInfoFromDeps(pkg *depth.Pkg, parseFlag ParseFl
 	}
 
 	srcDir := pkg.Raw.Dir
+	if _, ok := dirImported[srcDir]; ok {
+		return nil
+	}
+	dirImported[srcDir] = struct{}{}
 
 	files, err := os.ReadDir(srcDir) // only parsing files in the dir(don't contain sub dir files)
 	if err != nil {
@@ -1901,7 +1918,7 @@ func (parser *Parser) getAllGoFileInfoFromDeps(pkg *depth.Pkg, parseFlag ParseFl
 	}
 
 	for i := 0; i < len(pkg.Deps); i++ {
-		if err := parser.getAllGoFileInfoFromDeps(&pkg.Deps[i], parseFlag); err != nil {
+		if err := parser.getAllGoFileInfoFromDeps(&pkg.Deps[i], parseFlag, dirImported); err != nil {
 			return err
 		}
 	}