merge branch from main

Author: angrychow

docs/uniast-en.md

@@ -81,7 +81,10 @@ A repository consists of entity Modules and relationship Graph
 
 ```json
 {
-    "Identity": "/Users/bytedance/golang/work/abcoder/tmp/localsession",
+    "id": "/Users/bytedance/golang/work/abcoder/tmp/localsession",
+    "ASTVersion": "xx",
+    "ToolVersion": "yy",
+    "Path": "/a/b/localsession",
     "Modules": {
         "github.com/bytedance/gopkg@v0.0.0-20230728082804-614d0af6619b": {},
         "github.com/cloudwego/localsession": {}
@@ -90,7 +93,7 @@ A repository consists of entity Modules and relationship Graph
 }
 ```
 
-- Identity: The unique name of the repo. Since the abcoder parser does not currently retrieve repository git information, the absolute path where it is currently located is generally used as the Identity
+- id: The unique name of the repo. Since the abcoder parser does not currently retrieve repository git information, the absolute path where it is currently located is generally used as the Identity
 
 
 - Modules: Contains submodules, a dictionary of {ModPath}: {Module AST}. Both repository modules and external dependency modules can appear in Modules, but need to be distinguished by ModulePath.
@@ -104,7 +107,10 @@ A repository consists of entity Modules and relationship Graph
 
 - Path: The file directory of the repository, usually should be an absolute path
 
-- ASTVersion: The UniAST version used to parse
+- ASTVersion: The UniAST version spefication when the repository is parsed
+
+- ToolVersion: The abcoder version used to parse
+
 
 ### Module
 

docs/uniast-zh.md

@@ -81,7 +81,10 @@ Universal Abstract-Syntax-Tree 是 ABCoder 建立的一种 LLM 亲和、语言
 
 ```json
 {
-    "Identity": "/Users/bytedance/golang/work/abcoder/tmp/localsession",
+    "id": "/Users/bytedance/golang/work/abcoder/tmp/localsession",
+    "ASTVersion": "xx",
+    "ToolVersion": "yy",
+    "Path": "/a/b/localsession",
     "Modules": {
         "github.com/bytedance/gopkg@v0.0.0-20230728082804-614d0af6619b": {},
         "github.com/cloudwego/localsession": {}
@@ -90,7 +93,7 @@ Universal Abstract-Syntax-Tree 是 ABCoder 建立的一种 LLM 亲和、语言
 }
 ```
 
-- Identity: repo 的唯一名称。由于 abcoder parser 目前不获取仓库 git 信息，因此一般使用当前所处的绝对路径作为 Identity
+- id: repo 的唯一名称。由于 abcoder parser 目前不获取仓库 git 信息，因此一般使用当前所处的绝对路径作为 Identity
 
 
 - Modules: 包含的子模块，{ModPath} : {Module AST} 的字典，本仓库模块和外部依赖模块都可以出现在 Modules 中，但是需要通过 ModulePath 来区分。
@@ -104,7 +107,9 @@ Universal Abstract-Syntax-Tree 是 ABCoder 建立的一种 LLM 亲和、语言
 
 - Path: 仓库的文件目录，通常应该为绝对路径
 
-- ASTVersion: 解析时使用的 UniAST 版本
+- ASTVersion: 解析时对应的 UniAST 版本
+
+- ToolVersion: 解析时使用的 abcoder 版本
 
 
 ### Module

lang/golang/parser/ctx.go

@@ -142,6 +142,14 @@ func (ctx *fileContext) GetMod(impt string) (string, error) {
 	if isSysPkg(impt) {
 		return "", errSysImport
 	}
+
+	// fileContext 中的 import 信息只有**当前文件的引用路径**，但是存在一种场景就是实际调用的节点在另外的一个Package，导致漏解析
+	// 常见于"链式调用"、"另一个 pkg 的全局变量的类型在另外一个 pkg 下"
+	if ctx.module != nil && ctx.module.Packages != nil {
+		if _, exist := ctx.module.Packages[impt]; exist {
+			return ctx.module.Name, nil
+		}
+	}
 	for _, ims := range ctx.imports.ProjectImports {
 		if ims == impt {
 			return ctx.module.Name, nil
@@ -483,7 +491,11 @@ func (ctx *fileContext) getTypeinfo(typ types.Type) (ti typeInfo) {
 		ti.IsStdOrBuiltin = true
 	}
 	// collect sub Named type here
-	for i := 1; i < len(tobjs); i++ {
+	i := 0
+	if isNamed {
+		i = 1
+	}
+	for ; i < len(tobjs); i++ {
 		tobj := tobjs[i]
 		if isGoBuiltins(tobj.Name()) {
 			continue

lang/golang/parser/file.go

@@ -609,6 +609,11 @@ func (p *GoParser) parseInterface(ctx *fileContext, name *ast.Ident, decl *ast.I
 			fn.IsMethod = true
 			fn.IsInterfaceMethod = true
 			fn.Signature = string(ctx.GetRawContent(fieldDecl))
+			// collect func signature deps
+			ty := ctx.GetTypeInfo(fieldDecl.Type)
+			for _, dep := range ty.Deps {
+				fn.Types = InsertDependency(fn.Types, NewDependency(dep, ctx.FileLine(fieldDecl)))
+			}
 		}
 		p.collectTypes(ctx, fieldDecl.Type, st, inlined)
 	}

lang/parse.go

@@ -35,6 +35,7 @@ import (
 	"github.com/cloudwego/abcoder/lang/register"
 	"github.com/cloudwego/abcoder/lang/rust"
 	"github.com/cloudwego/abcoder/lang/uniast"
+	"github.com/cloudwego/abcoder/version"
 )
 
 // ParseOptions is the options for parsing the repo.
@@ -105,6 +106,7 @@ func Parse(ctx context.Context, uri string, args ParseOptions) ([]byte, error) {
 	}
 
 	repo.ASTVersion = uniast.Version
+	repo.ToolVersion = version.Version
 
 	out, err := json.Marshal(repo)
 	if err != nil {

lang/uniast/ast.go

@@ -83,11 +83,12 @@ type NodeGraph map[string]*Node
 
 // Repository
 type Repository struct {
-	ASTVersion string
-	Name       string             `json:"id"` // module name
-	Path       string             // repo path
-	Modules    map[string]*Module // module name => module
-	Graph      NodeGraph          // node id => node
+	Name        string             `json:"id"` // module name
+	ASTVersion  string             // uniast version
+	ToolVersion string             // abcoder version
+	Path        string             // repo absolute path
+	Modules     map[string]*Module // module name => module
+	Graph       NodeGraph          // node id => node
 }
 
 func (r Repository) ID() string {

lang/uniast/version.go

@@ -16,4 +16,4 @@
 
 package uniast
 
-const Version = "v0.1.3"
+const Version = "v0.1.4"

main.go

@@ -47,6 +47,7 @@ import (
 	"github.com/cloudwego/abcoder/llm/agent"
 	"github.com/cloudwego/abcoder/llm/mcp"
 	"github.com/cloudwego/abcoder/llm/tool"
+	"github.com/cloudwego/abcoder/version"
 )
 
 const Usage = `abcoder <Action> [Language] <Path> [Flags]
@@ -106,7 +107,7 @@ func main() {
 
 	switch action {
 	case "version":
-		fmt.Fprintf(os.Stdout, "%s\n", Version)
+		fmt.Fprintf(os.Stdout, "%s\n", version.Version)
 
 	case "parse":
 		language, uri := parseArgsAndFlags(flags, true, flagHelp, flagVerbose)
@@ -183,7 +184,7 @@ func main() {
 
 		svr := mcp.NewServer(mcp.ServerOptions{
 			ServerName:    "abcoder",
-			ServerVersion: Version,
+			ServerVersion: version.Version,
 			Verbose:       *flagVerbose,
 			ASTReadToolsOptions: tool.ASTReadToolsOptions{
 				RepoASTsDir: uri,
@@ -308,6 +309,8 @@ func parseTSProject(ctx context.Context, repoPath string, opts lang.ParseOptions
 
 	cmd := exec.CommandContext(ctx, parserPath, args...)
 	cmd.Env = append(os.Environ(), "NODE_OPTIONS=--max-old-space-size=65536")
+	cmd.Env = append(cmd.Env, "ABCODER_TOOL_VERSION="+version.Version)
+	cmd.Env = append(cmd.Env, "ABCODER_AST_VERSION="+uniast.Version)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 

testdata/go/0_golang/pkg/util.go

@@ -161,3 +161,7 @@ var CaseVarFunc CaseStruct = func() CaseStruct {
 		FieldExternalType: entity.MyStruct{},
 	}
 }()
+
+type CaseInterface interface {
+	CaseMethodDeps(a int, b entity.MyStruct) Integer
+}

ts-parser/package.json

@@ -43,4 +43,4 @@
     "ts-node": "^10.9.0",
     "typescript": "^5.0.0"
   }
-}
+}