fix: reset to v0.6.4 & add skeleton api & lock fix

Author: wantWhatBike

.gitignore

@@ -17,4 +17,5 @@ tmp/codegraph/*.profile
 .costrict
 .coignore
 .documents
-.cospec
+.cospec
+internal/service/*.profile

internal/dto/backend.go

@@ -1,7 +1,9 @@
 // internal/dto/backend.go - 后端API请求和响应数据结构定义
 package dto
 
-import "codebase-indexer/pkg/codegraph/types"
+import (
+	"codebase-indexer/pkg/codegraph/types"
+)
 
 // SearchReferenceRequest 关系检索请求
 type SearchReferenceRequest struct {
@@ -205,6 +207,45 @@ func ToPosition(ranges []int32) Position {
 
 }
 
+// GetFileSkeletonRequest 获取文件骨架请求
+type GetFileSkeletonRequest struct {
+	ClientId      string `form:"clientId" binding:"required"`
+	WorkspacePath string `form:"workspacePath" binding:"required"`
+	FilePath      string `form:"filePath" binding:"required"`
+	FilteredBy    string `form:"filteredBy,omitempty"` // 可选: definition | reference
+}
+
+// FileSkeletonData 文件骨架响应数据
+type FileSkeletonData struct {
+	Path      string                 `json:"path"`
+	Language  string                 `json:"language"`
+	Timestamp int64                  `json:"timestamp"`
+	Imports   []*FileSkeletonImport  `json:"imports,omitempty"`
+	Package   *FileSkeletonPackage   `json:"package,omitempty"`
+	Elements  []*FileSkeletonElement `json:"elements"`
+}
+
+// FileSkeletonImport 导入信息（还原后的原始内容）
+type FileSkeletonImport struct {
+	Content string `json:"content"` // 原始导入语句
+	Range   []int  `json:"range"`   // [startLine, startCol, endLine, endCol] - 从1开始
+}
+
+// FileSkeletonPackage 包信息
+type FileSkeletonPackage struct {
+	Name  string `json:"name"`
+	Range []int  `json:"range"` // 从1开始
+}
+
+// FileSkeletonElement 元素信息
+type FileSkeletonElement struct {
+	Name         string `json:"name"`
+	Signature    string `json:"signature"`    // 通过行号读取的签名，限制200字符
+	IsDefinition bool   `json:"isDefinition"` // 默认为 false
+	ElementType  string `json:"elementType"`  // 类型名称字符串（如 "FUNCTION"）
+	Range        []int  `json:"range"`        // [startLine, startCol, endLine, endCol] - 从1开始
+}
+
 const (
 	Embedding = "embedding"
 	Codegraph = "codegraph"

internal/service/codebase.go

@@ -72,6 +72,7 @@ const definitionFillContentNodeLimit = 20
 const definitionFillContentLineLimit = 200
 const DefaultMaxCodeSnippetLines = 500
 const DefaultMaxCodeSnippets = 200
+const maxSignatureLength = 200
 
 // NewCodebaseService 创建新的代码库服务
 func NewCodebaseService(
@@ -631,6 +632,42 @@ func (l *codebaseService) DeleteIndex(ctx context.Context, req *dto.DeleteIndexR
 	return nil
 }
 
+func (s *codebaseService) GetFileSkeleton(ctx context.Context, req *dto.GetFileSkeletonRequest) (*dto.FileSkeletonData, error) {
+	// 1. 参数校验
+	if req.WorkspacePath == "" || req.FilePath == "" {
+		return nil, errs.NewMissingParamError("workspacePath or filePath")
+	}
+
+	// 2. 路径处理（相对/绝对）
+	filePath := req.FilePath
+	if !filepath.IsAbs(filePath) {
+		filePath = filepath.Join(req.WorkspacePath, filePath)
+	}
+
+	// 验证路径是否在 workspace 内
+	if err := s.checkPath(ctx, req.WorkspacePath, []string{filePath}); err != nil {
+		return nil, err
+	}
+
+	// 3. 获取原始 FileElementTable
+	table, err := s.indexer.GetFileElementTable(ctx, req.WorkspacePath, filePath)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get file element table: %w", err)
+	}
+
+	// 4. 读取文件内容（用于提取签名和还原imports）
+	fileContent, err := s.workspaceReader.ReadFile(ctx, filePath, types.ReadOptions{})
+	if err != nil {
+		s.logger.Warn("failed to read file content for %s: %v", filePath, err)
+		fileContent = nil // 继续处理，但签名和imports还原会失败
+	}
+
+	// 5. 转换数据结构
+	result := convertToFileSkeletonData(table, fileContent, req.FilteredBy)
+
+	return result, nil
+}
+
 func convertStatus(status int) string {
 	var indexStatus string
 	switch status {
@@ -645,3 +682,131 @@ func convertStatus(status int) string {
 	}
 	return indexStatus
 }
+
+// convertToFileSkeletonData 转换 FileElementTable 到 FileSkeletonData
+func convertToFileSkeletonData(
+	table *codegraphpb.FileElementTable,
+	fileContent []byte,
+	filteredBy string,
+) *dto.FileSkeletonData {
+	// 按行分割文件内容（KISS原则）
+	var lines []string
+	if fileContent != nil {
+		lines = strings.Split(string(fileContent), "\n")
+	}
+
+	// 转换 imports
+	imports := make([]*dto.FileSkeletonImport, 0, len(table.Imports))
+	for _, imp := range table.Imports {
+		content := restoreImportContent(lines, imp.Range)
+		imports = append(imports, &dto.FileSkeletonImport{
+			Content: content,
+			Range:   convertRange(imp.Range),
+		})
+	}
+
+	// 转换 package
+	var pkg *dto.FileSkeletonPackage
+	if table.Package != nil {
+		pkg = &dto.FileSkeletonPackage{
+			Name:  table.Package.Name,
+			Range: convertRange(table.Package.Range),
+		}
+	}
+
+	// 转换和过滤 elements
+	elements := make([]*dto.FileSkeletonElement, 0, len(table.Elements))
+	for _, elem := range table.Elements {
+		// 根据 filteredBy 参数过滤
+		if filteredBy == "definition" && !elem.IsDefinition {
+			continue
+		}
+		if filteredBy == "reference" && elem.IsDefinition {
+			continue
+		}
+
+		// 提取签名
+		signature := extractSignature(lines, elem.Range, maxSignatureLength)
+		if signature == "" {
+			signature = elem.Name // 如果为空则使用 name
+		}
+
+		elements = append(elements, &dto.FileSkeletonElement{
+			Name:         elem.Name,
+			Signature:    signature,
+			IsDefinition: elem.IsDefinition,
+			ElementType:  convertElementType(elem.ElementType),
+			Range:        convertRange(elem.Range),
+		})
+	}
+
+	return &dto.FileSkeletonData{
+		Path:      table.Path,
+		Language:  table.Language,
+		Timestamp: table.Timestamp,
+		Imports:   imports,
+		Package:   pkg,
+		Elements:  elements,
+	}
+}
+
+// extractSignature 提取签名（从指定行读取，限制长度）
+func extractSignature(lines []string, ranges []int32, maxLength int) string {
+	if len(ranges) < 1 || lines == nil || len(lines) == 0 {
+		return ""
+	}
+	lineNumber := int(ranges[0]) // 0-based
+	if lineNumber < 0 || lineNumber >= len(lines) {
+		return ""
+	}
+	line := strings.TrimSpace(lines[lineNumber])
+	if len(line) > maxLength {
+		return line[:maxLength]
+	}
+	return line
+}
+
+// restoreImportContent 还原 import 的原始内容
+func restoreImportContent(lines []string, ranges []int32) string {
+	if len(ranges) < 3 || lines == nil {
+		return ""
+	}
+	startLine := int(ranges[0]) // 0-based
+	endLine := int(ranges[2])   // 0-based
+
+	if startLine < 0 || endLine >= len(lines) || startLine > endLine {
+		return ""
+	}
+
+	// 单行import
+	if startLine == endLine {
+		return strings.TrimSpace(lines[startLine])
+	}
+
+	// 多行import（合并为一行）
+	var builder strings.Builder
+	for i := startLine; i <= endLine && i < len(lines); i++ {
+		trimmed := strings.TrimSpace(lines[i])
+		if trimmed != "" {
+			builder.WriteString(trimmed)
+			if i < endLine {
+				builder.WriteString(" ")
+			}
+		}
+	}
+	return builder.String()
+}
+
+// convertElementType 转换 ElementType 枚举到字符串名称
+func convertElementType(et codegraphpb.ElementType) string {
+	return codegraphpb.ElementType_name[int32(et)]
+}
+
+// convertRange 转换 range（+1 转换：0-based -> 1-based）
+func convertRange(protoRange []int32) []int {
+	result := make([]int, len(protoRange))
+	for i, v := range protoRange {
+		result[i] = int(v) + 1
+	}
+	return result
+}

internal/service/indexer_test.go

@@ -778,11 +778,11 @@ func TestIndexer_QueryCallGraph_BySymbolName(t *testing.T) {
 		// 	IncludeExts:  []string{".go"},
 		// },
 		{
-			name:         "buildCallGraphBFS方法调用链",
+			name:         "setupTestEnvironment方法调用链",
 			filePath:     "internal/service/indexer_test.go",
-			symbolName:   "buildCallGraphBFS",
+			symbolName:   "setupTestEnvironment",
 			maxLayer:     20,
-			desc:         "查询buildCallGraphBFS方法的调用链",
+			desc:         "查询setupTestEnvironment方法的调用链",
 			project:      "codebase-indexer",
 			workspaceDir: "/home/kcx/codeWorkspace/codebase-indexer",
 			IncludeExts:  []string{".go"},
@@ -895,7 +895,9 @@ func TestIndexer_QueryCallGraph_BySymbolName(t *testing.T) {
 			env := setupTestEnvironment(t)
 			defer teardownTestEnvironment(t, env, nil)
 
-			env.workspaceDir = tc.workspaceDir
+			if tc.workspaceDir != "" {
+				env.workspaceDir = tc.workspaceDir
+			}
 			testVisitPattern.IncludeExts = tc.IncludeExts
 
 			err := initWorkspaceModel(env)
@@ -1006,7 +1008,9 @@ func TestIndexer_QueryCallGraph_ByLineRange(t *testing.T) {
 			env := setupTestEnvironment(t)
 			defer teardownTestEnvironment(t, env, nil)
 
-			env.workspaceDir = tc.workspaceDir
+			if tc.workspaceDir != "" {
+				env.workspaceDir = tc.workspaceDir
+			}
 			testVisitPattern.IncludeExts = tc.IncludeExts
 
 			err := initWorkspaceModel(env)
@@ -1026,12 +1030,13 @@ func TestIndexer_QueryCallGraph_ByLineRange(t *testing.T) {
 			assert.NoError(t, err)
 			indexEnd := time.Now()
 
-			// 构建完整文件路径
 			start := time.Now()
+			// 构建完整文件路径
+			fullPath := filepath.Join(env.workspaceDir, tc.filePath)
 			// 查询调用链
 			opts := &types.QueryCallGraphOptions{
 				Workspace: env.workspaceDir,
-				FilePath:  tc.filePath,
+				FilePath:  fullPath,
 				LineRange: fmt.Sprintf("%d-%d", tc.startLine, tc.endLine),
 				MaxLayer:  tc.maxLayer,
 			}

pkg/codegraph/resolver/javascript.go

@@ -22,6 +22,15 @@ var jsReplacer = strings.NewReplacer(
 	")", "",
 )
 
+// JavaScript 保留关键字集合
+var jsReservedKeywords = map[string]bool{
+	"if": true, "else": true, "for": true, "while": true, "do": true,
+	"switch": true, "case": true, "default": true,
+	"try": true, "catch": true, "finally": true,
+	"break": true, "continue": true, "return": true,
+	"throw": true, "with": true, "yield": true, "await": true,
+}
+
 type JavaScriptResolver struct {
 }
 
@@ -105,6 +114,17 @@ func (js *JavaScriptResolver) resolveFunction(ctx context.Context, element *Func
 }
 
 func (js *JavaScriptResolver) resolveMethod(ctx context.Context, element *Method, rc *ResolveContext) ([]Element, error) {
+	// 验证：拒绝保留关键字作为方法名
+	for _, capture := range rc.Match.Captures {
+		nodeCaptureName := rc.CaptureNames[capture.Index]
+		if types.ToElementType(nodeCaptureName) == types.ElementTypeMethodName {
+			methodName := capture.Node.Utf8Text(rc.SourceFile.Content)
+			if jsReservedKeywords[methodName] {
+				return []Element{}, nil
+			}
+		}
+	}
+
 	elements := []Element{element}
 	rootCap := rc.Match.Captures[0]
 	for _, capture := range rc.Match.Captures {