fix:(uniast) collect parameters when buildgraph (#40)

* fix:(uniast) collect parameters when buildgraph

* fix:(go) should match the longest prefix of a PkgPath to find ModPath

* license

Author: AsterDY

lang/golang/parser/ctx.go

@@ -152,17 +152,11 @@ func (ctx *fileContext) GetMod(impt string) (string, error) {
 			return ims[0], nil
 		}
 	}
-	// try find self first
-	if strings.HasPrefix(impt, ctx.module.Name) {
-		return ctx.module.Name, nil
-	}
-	// try find in go.mod
-	for dep, ver := range ctx.module.Dependencies {
-		if strings.HasPrefix(impt, dep) {
-			return ver, nil
-		}
+	mod, _ := matchMod(impt, ctx.module.Dependencies)
+	if mod == "" {
+		return "", fmt.Errorf("not found mod for %s", impt)
 	}
-	return "", fmt.Errorf("not found mod: %s", impt)
+	return mod, nil
 }
 
 func (ctx *fileContext) FileLine(node ast.Node) FileLine {

lang/golang/parser/file.go

@@ -422,6 +422,9 @@ func (p *GoParser) parseFunc(ctx *fileContext, funcDecl *ast.FuncDecl) (*Functio
 	// method receiver
 	var receiver *Receiver
 	isMethod := funcDecl.Recv != nil
+	if strings.HasSuffix(ctx.filePath, "cmds/life_stat/main.go") && funcDecl.Name.Name == "init" {
+
+	}
 	if isMethod {
 		// TODO: reserve the pointer message?
 		ti := ctx.GetTypeInfo(funcDecl.Recv.List[0].Type)

lang/golang/parser/pkg.go

@@ -21,6 +21,8 @@ import (
 	"go/types"
 	"os"
 	"path/filepath"
+	"sort"
+	"strconv"
 	"strings"
 
 	. "github.com/cloudwego/abcoder/lang/uniast"
@@ -33,7 +35,7 @@ func (p *GoParser) parseImports(fset *token.FileSet, file []byte, mod *Module, i
 	sysImports := make(map[string]string)
 	ret := &importInfo{}
 	for _, imp := range impts {
-		importPath := imp.Path.Value[1 : len(imp.Path.Value)-1] // remove the quotes
+		importPath, _ := strconv.Unquote(imp.Path.Value) // remove the quotes
 		importAlias := ""
 		// Check if user has defined an alias for current import
 		if imp.Name != nil {
@@ -49,12 +51,14 @@ func (p *GoParser) parseImports(fset *token.FileSet, file []byte, mod *Module, i
 			// Ignoring golang standard libraries（like net/http）
 			sysImports[importAlias] = importPath
 		} else {
-			// Distinguish between project packages and third party packages
-			if strings.HasPrefix(importPath, mod.Name) {
+			match, path := matchMod(importPath, mod.Dependencies)
+			if match == "" {
+				if !strings.HasPrefix(importPath, mod.Name) {
+					return nil, fmt.Errorf("package %s not found mod", importPath)
+				}
 				projectImports[importAlias] = importPath
 			} else {
-				mod := mod.GetDependency(importPath)
-				thirdPartyImports[importAlias] = [2]string{mod, importPath}
+				thirdPartyImports[importAlias] = [2]string{path, importPath}
 			}
 		}
 	}
@@ -64,6 +68,24 @@ func (p *GoParser) parseImports(fset *token.FileSet, file []byte, mod *Module, i
 	return ret, nil
 }
 
+func matchMod(impt string, modules map[string]string) (name string, path string) {
+	matches := [][2]string{}
+	for name, path := range modules {
+		if strings.HasPrefix(impt, name) {
+			matches = append(matches, [2]string{name, path})
+		}
+	}
+
+	if len(matches) > 0 {
+		sort.Slice(matches, func(i, j int) bool {
+			return len(matches[i][0]) > len(matches[j][0])
+		})
+		name = matches[0][0]
+		path = matches[0][1]
+	}
+	return
+}
+
 func (p *GoParser) ParseNode(pkgPath string, name string) (Repository, error) {
 	out := NewRepository(p.repo.Name)
 	if pkgPath == "" {
@@ -117,19 +139,10 @@ func (p *GoParser) ParsePackage(pkgPath PkgPath) (Repository, error) {
 }
 
 func (p *GoParser) parsePackage(pkgPath PkgPath) (err error) {
-	mod, dir := p.getModuleFromPkg(pkgPath)
+	mod, _ := p.getModuleFromPkg(pkgPath)
 	if mod == "" {
 		return fmt.Errorf("not found module for package %s", pkgPath)
 	}
-	if dir == "" {
-		// NOTICE: external package should set the dir to the one of its referer
-		for _, m := range p.repo.Modules {
-			if m.GetDependency(pkgPath) != "" {
-				dir = filepath.Join(p.homePageDir, m.Dir)
-				break
-			}
-		}
-	}
 	// fast-path: check cache first
 	if p.visited[pkgPath] {
 		return nil

lang/golang/parser/pkg_test.go

@@ -191,3 +191,41 @@ func Test_goParser_ParseNode(t *testing.T) {
 		})
 	}
 }
+
+func Test_matchMod(t *testing.T) {
+	type args struct {
+		impt    string
+		modules map[string]string
+	}
+	tests := []struct {
+		name     string
+		args     args
+		wantName string
+		wantPath string
+	}{
+		{
+			name: "test",
+			args: args{
+				impt: "github.com/xx/yy/zz",
+				modules: map[string]string{
+					"github.com/xx/yy":    "github.com/xx/yy@v1",
+					"github.com/xx/yy/zz": "github.com/xx/yy/zz@v2",
+					"github.com/xx/yy/bb": "github.com/xx/yy/bb@v3",
+				},
+			},
+			wantName: "github.com/xx/yy/zz",
+			wantPath: "github.com/xx/yy/zz@v2",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotName, gotPath := matchMod(tt.args.impt, tt.args.modules)
+			if gotName != tt.wantName {
+				t.Errorf("matchMod() gotName = %v, want %v", gotName, tt.wantName)
+			}
+			if gotPath != tt.wantPath {
+				t.Errorf("matchMod() gotPath = %v, want %v", gotPath, tt.wantPath)
+			}
+		})
+	}
+}

lang/uniast/ast.go

@@ -218,22 +218,6 @@ func NewModule(name string, dir string, language Language) *Module {
 	return &ret
 }
 
-func (p *Module) GetDependency(pkg string) string {
-	// // search internal library first
-	// if lib := p.Libraries[mod]; lib != nil {
-	// 	return lib
-	// }
-	// match the prefix of name for each repo.Dependencies
-	for k, v := range p.Dependencies {
-		if strings.HasPrefix(pkg, k) {
-			return v
-		}
-	}
-	// FIXME: return value's dependency may not explicitly defined in go.mod, thus may not be found
-	// fmt.Fprintf(os.Stderr, "Error: not found dependency for %v", pkg)
-	return ""
-}
-
 // Package
 type Package struct {
 	IsMain bool

lang/uniast/node.go

@@ -164,6 +164,12 @@ func (r *Repository) BuildGraph() error {
 		for _, pkg := range mod.Packages {
 			for _, f := range pkg.Functions {
 				n := r.SetNode(f.Identity, FUNC)
+				for _, dep := range f.Params {
+					r.AddRelation(n, dep.Identity, dep.FileLine, DEPENDENCY)
+				}
+				for _, dep := range f.Results {
+					r.AddRelation(n, dep.Identity, dep.FileLine, DEPENDENCY)
+				}
 				for _, dep := range f.FunctionCalls {
 					r.AddRelation(n, dep.Identity, dep.FileLine, DEPENDENCY)
 				}

script/pretty_json.go

@@ -0,0 +1,67 @@
+// Copyright 2025 CloudWeGo Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     https://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"io/ioutil"
+	"os"
+)
+
+// prettyPrintJSON 读取 JSON 文件，格式化后写回原文件
+func prettyPrintJSON(filePath string) error {
+	// 读取文件内容
+	fileContent, err := ioutil.ReadFile(filePath)
+	if err != nil {
+		return fmt.Errorf("读取文件失败: %w", err)
+	}
+
+	var data interface{}
+	// 解析 JSON 数据
+	err = json.Unmarshal(fileContent, &data)
+	if err != nil {
+		return fmt.Errorf("解析 JSON 数据失败: %w", err)
+	}
+
+	// 格式化 JSON 数据
+	prettyJSON, err := json.MarshalIndent(data, "", "    ")
+	if err != nil {
+		return fmt.Errorf("格式化 JSON 数据失败: %w", err)
+	}
+
+	// 将格式化后的 JSON 数据写回原文件
+	err = ioutil.WriteFile(filePath, prettyJSON, 0644)
+	if err != nil {
+		return fmt.Errorf("写入文件失败: %w", err)
+	}
+
+	return nil
+}
+
+func main() {
+	if len(os.Args) != 2 {
+		fmt.Println("用法: go run pretty_json.go <json_file_path>")
+		os.Exit(1)
+	}
+
+	filePath := os.Args[1]
+	err := prettyPrintJSON(filePath)
+	if err != nil {
+		fmt.Printf("错误: %v\n", err)
+		os.Exit(1)
+	}
+	fmt.Printf("JSON 文件 %s 已成功格式化。\n", filePath)
+}