Merge pull request #19 from rofle100lvl/ExtensionsSupprot

rofle100lvl · web-flow · commit 04874d52a40e · 2025-11-29T01:37:22.000+01:00
Added extension support in search
diff --git a/Sources/UseGraphPeriphery/Data/Extensions/Declaration+Extensions.swift b/Sources/UseGraphPeriphery/Data/Extensions/Declaration+Extensions.swift
@@ -21,12 +21,69 @@ extension Declaration {
         }
         return parent
     }
+    
+    private func isExtensionKind(_ kind: Declaration.Kind) -> Bool {
+        return kind == .extension ||
+               kind == .extensionEnum ||
+               kind == .extensionStruct ||
+               kind == .extensionClass ||
+               kind == .extensionProtocol
+    }
+    
+    private func findParentExtension() -> Declaration? {
+        var parent: Declaration? = self.parent
+        while let currentParent = parent {
+            if isExtensionKind(currentParent.kind) {
+                return currentParent
+            }
+            parent = currentParent.parent
+        }
+        return nil
+    }
+    
+    private func extractExtensionInfo(from extensionDecl: Declaration, sourceGraph: SourceGraph) -> String? {
+        // Find the extended type in the extensions dictionary
+        for (extendedDecl, extensionSet) in sourceGraph.extensions {
+            if extensionSet.contains(extensionDecl) {
+                return "extension:\(extendedDecl.name ?? "Unknown"):\(extensionDecl.kind.rawValue):\(extensionDecl.location.line)"
+            }
+        }
+        
+        // If not found in dictionary, use the extension's own name
+        return "extension:\(extensionDecl.name ?? "Unknown"):\(extensionDecl.kind.rawValue):\(extensionDecl.location.line)"
+    }
+    
+    private func findExtensionByLocation(for declaration: Declaration, in sourceGraph: SourceGraph) -> Declaration? {
+        guard let parent = declaration.parent else { return nil }
+        
+        // Check if parent has extensions
+        guard let extensionSet = sourceGraph.extensions[parent] else { return nil }
+        
+        let declFile = declaration.location.file.path.string
+        let declLine = declaration.location.line
+        
+        // Find extension in the same file that starts before the declaration
+        var bestMatch: Declaration? = nil
+        var bestMatchLine = 0
+        
+        for ext in extensionSet {
+            let extFile = ext.location.file.path.string
+            let extLine = ext.location.line
+            
+            // Extension must be in the same file and start before the declaration
+            if extFile == declFile && extLine < declLine && extLine > bestMatchLine {
+                bestMatch = ext
+                bestMatchLine = extLine
+            }
+        }
+        
+        return bestMatch
+    }
 
-    func presentAsNode() -> Node? {
+    func presentAsNode(sourceGraph: SourceGraph? = nil) -> Node? {
         let entity = findEntity()
         guard let entity else { return nil }
 
-        // Безопасное извлечение модуля
         let moduleName = entity.location.file.modules.first ?? "UnknownModule"
 
         return Node(
@@ -39,4 +96,16 @@ extension Declaration {
             usrs: entity.usrs
         )
     }
+    
+    func getExtensionInfo(sourceGraph: SourceGraph) -> String? {
+        // First try to find extension through parent hierarchy
+        if let parentExtension = findParentExtension() {
+            return extractExtensionInfo(from: parentExtension, sourceGraph: sourceGraph)
+        }
+        // If not found through parent, try to find by location
+        else if let extensionByLocation = findExtensionByLocation(for: self, in: sourceGraph) {
+            return extractExtensionInfo(from: extensionByLocation, sourceGraph: sourceGraph)
+        }
+        return nil
+    }
 }
diff --git a/Sources/UseGraphPeriphery/Data/Repositories/SourceGraphRepository.swift b/Sources/UseGraphPeriphery/Data/Repositories/SourceGraphRepository.swift
@@ -21,8 +21,8 @@ public final class SourceGraphRepository: SourceGraphRepositoryProtocol {
             
             guard let entity = reference.parent?.findEntity(),
                   entity != declaration.findEntity(),
-                  let entityParent = entity.presentAsNode(),
-                  let declarationParent = declaration.presentAsNode() else { return }
+                  let entityParent = entity.presentAsNode(sourceGraph: sourceGraph),
+                  let declarationParent = declaration.presentAsNode(sourceGraph: sourceGraph) else { return }
             
             let edge: EdgeWithoutReference
             
@@ -38,13 +38,17 @@ public final class SourceGraphRepository: SourceGraphRepositoryProtocol {
                 )
             }
             
+            // Получаем extensionInfo для declaration (вызываемого метода/свойства)
+            let extensionInfo = declaration.getExtensionInfo(sourceGraph: sourceGraph)
+            
             if edgeDict[edge] == nil {
                 edgeDict[edge] = []
             }
             edgeDict[edge]?.append(
                 Reference(
                     line: reference.location.line,
-                    file: reference.location.file.path.string
+                    file: reference.location.file.path.string,
+                    extensionInfo: extensionInfo
                 )
             )
         }
diff --git a/Sources/UseGraphPeriphery/Data/Services/GraphOutputService.swift b/Sources/UseGraphPeriphery/Data/Services/GraphOutputService.swift
@@ -58,18 +58,29 @@ public final class GraphOutputService: GraphOutputServiceProtocol {
         let edgesCSV = csvBuilder.createCSV(from: coreEdges)
         let nodesCSV = csvBuilder.createCSV(from: Array(uniqueSet))
         
+        // Collect all references from all edges
+        var allReferences: [Reference] = []
+        for edge in edges {
+            allReferences.append(contentsOf: edge.references)
+        }
+        let referencesCSV = csvBuilder.createCSV(from: allReferences)
+        
         let nodesUrl = URL(fileURLWithPath: FileManager.default.currentDirectoryPath)
             .appending(path: "Nodes.csv")
         let edgesUrl = URL(fileURLWithPath: FileManager.default.currentDirectoryPath)
             .appending(path: "Edges.csv")
+        let referencesUrl = URL(fileURLWithPath: FileManager.default.currentDirectoryPath)
+            .appending(path: "References.csv")
         
         guard let edgesData = edgesCSV.data(using: .utf8),
-              let nodesData = nodesCSV.data(using: .utf8) else {
+              let nodesData = nodesCSV.data(using: .utf8),
+              let referencesData = referencesCSV.data(using: .utf8) else {
             throw OutputFormatError.formatIsNotCorrect
         }
         
         FileManager.default.createFile(atPath: edgesUrl.path(), contents: edgesData)
         FileManager.default.createFile(atPath: nodesUrl.path(), contents: nodesData)
+        FileManager.default.createFile(atPath: referencesUrl.path(), contents: referencesData)
     }
     
     private func mapToGraphVizFormat(format: OutputFormat) -> Format? {
diff --git a/Sources/UseGraphPeriphery/Domain/Models/Reference.swift b/Sources/UseGraphPeriphery/Domain/Models/Reference.swift
@@ -1,15 +1,32 @@
 import Foundation
+import Utils
 
-public struct Reference: Hashable, Comparable {
+public struct Reference: Hashable, Comparable, CSVRepresentable {
     public static func < (lhs: Reference, rhs: Reference) -> Bool {
         lhs.file < rhs.file || lhs.line < rhs.line
     }
     
     public let line: Int
     public let file: String
+    public let extensionInfo: String?
     
-    public init(line: Int, file: String) {
+    public init(line: Int, file: String, extensionInfo: String? = nil) {
         self.line = line
         self.file = file
+        self.extensionInfo = extensionInfo
+    }
+    
+    // CSVRepresentable
+    public var csvRepresentation: String {
+        let fields = [
+            String(line),
+            file,
+            extensionInfo ?? ""
+        ]
+        return fields.joined(separator: ",")
+    }
+    
+    public var fields: [String] {
+        return ["line", "file", "extensionInfo"]
     }
 }
diff --git a/Tests/UseGraphPeripheryTests/TestHelpers/ExtensionTestHelpers.swift b/Tests/UseGraphPeripheryTests/TestHelpers/ExtensionTestHelpers.swift
@@ -0,0 +1,106 @@
+import XCTest
+@testable import UseGraphPeriphery
+
+enum ExtensionTestHelpers {
+    
+    /// Проверяет extensionInfo в reference и возвращает распарсенные компоненты
+    static func validateExtensionInfo(
+        _ extensionInfo: String,
+        edge: UseGraphPeriphery.Edge,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) -> (extendedType: String, extensionKind: String, extensionLine: String)? {
+        
+        // Проверяем формат
+        XCTAssertTrue(extensionInfo.contains("extension:"), 
+                     "Extension info should start with 'extension:'", 
+                     file: file, line: line)
+        
+        // Парсим extensionInfo: "extension:<Type>:<Kind>:<Line>"
+        let components = extensionInfo.split(separator: ":")
+        XCTAssertEqual(components.count, 4, 
+                      "Extension info should have 4 components: \(extensionInfo)", 
+                      file: file, line: line)
+        
+        guard components.count == 4 else { return nil }
+        
+        let extendedType = String(components[1])
+        let extensionKind = String(components[2])
+        let extensionLine = String(components[3])
+        
+        // Проверяем, что extended type соответствует target в edge
+        XCTAssertEqual(edge.to.entityName, extendedType, 
+                      "Extended type '\(extendedType)' in extensionInfo should match edge target '\(edge.to.entityName ?? "nil")'",
+                      file: file, line: line)
+        
+        // Проверяем, что extension kind корректный
+        XCTAssertTrue(extensionKind.contains("extension"), 
+                     "Extension kind '\(extensionKind)' should contain 'extension'",
+                     file: file, line: line)
+        
+        return (extendedType, extensionKind, extensionLine)
+    }
+    
+    /// Проверяет конкретные значения extensionInfo для известного типа
+    static func assertExtensionInfo(
+        _ extensionInfo: String,
+        extendedType expectedType: String,
+        extensionKind expectedKind: String,
+        extensionLine expectedLine: String,
+        file: StaticString = #file,
+        line: UInt = #line
+    ) {
+        let components = extensionInfo.split(separator: ":")
+        guard components.count == 4 else {
+            XCTFail("Invalid extensionInfo format: \(extensionInfo)", file: file, line: line)
+            return
+        }
+        
+        let extendedType = String(components[1])
+        let extensionKind = String(components[2])
+        let extensionLine = String(components[3])
+        
+        XCTAssertEqual(extendedType, expectedType, 
+                      "Extended type should be '\(expectedType)'", 
+                      file: file, line: line)
+        XCTAssertEqual(extensionKind, expectedKind, 
+                      "Extension kind should be '\(expectedKind)'", 
+                      file: file, line: line)
+        XCTAssertEqual(extensionLine, expectedLine, 
+                      "Extension line should be '\(expectedLine)'", 
+                      file: file, line: line)
+    }
+    
+    /// Собирает все references с extensionInfo из edges
+    static func collectReferencesWithExtension(
+        from edges: [UseGraphPeriphery.Edge]
+    ) -> [(edge: UseGraphPeriphery.Edge, ref: UseGraphPeriphery.Reference)] {
+        var result: [(edge: UseGraphPeriphery.Edge, ref: UseGraphPeriphery.Reference)] = []
+        
+        for edge in edges {
+            for ref in edge.references {
+                if ref.extensionInfo != nil {
+                    result.append((edge, ref))
+                }
+            }
+        }
+        
+        return result
+    }
+    
+    /// Выводит детальную информацию о references с extensionInfo
+    static func printExtensionReferences(
+        _ references: [(edge: UseGraphPeriphery.Edge, ref: UseGraphPeriphery.Reference)]
+    ) {
+        print("\n📍 Found \(references.count) references with extensionInfo:")
+        for (index, item) in references.enumerated() {
+            print("  [\(index)] \(item.edge.from.entityName ?? "?") -> \(item.edge.to.entityName ?? "?")")
+            print("       Line: \(item.ref.line), extensionInfo: \(item.ref.extensionInfo ?? "nil")")
+            
+            if let extInfo = item.ref.extensionInfo,
+               let parsed = validateExtensionInfo(extInfo, edge: item.edge) {
+                print("       Parsed: type=\(parsed.extendedType), kind=\(parsed.extensionKind), line=\(parsed.extensionLine)")
+            }
+        }
+    }
+}
diff --git a/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Edges.csv b/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Edges.csv
@@ -0,0 +1,2 @@
+Source,Target,Type
+MyLibrary.B.class.s:9MyLibrary1BC@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:9,MyLibrary.A.struct.s:9MyLibrary1AV@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:3,directed
diff --git a/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Nodes.csv b/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Nodes.csv
@@ -0,0 +1,3 @@
+id,moduleName,fileName,line,entityName,entityType
+MyLibrary.B.class.s:9MyLibrary1BC@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:9,MyLibrary,/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift,9,B,class
+MyLibrary.A.struct.s:9MyLibrary1AV@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:3,MyLibrary,/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift,3,A,struct
diff --git a/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/References.csv b/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/References.csv
@@ -0,0 +1,2 @@
+line,file,extensionInfo
+10,/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift,
diff --git a/Tests/UseGraphPeripheryTests/TestProject/MyProtocolLibrary/Package.swift b/Tests/UseGraphPeripheryTests/TestProject/MyProtocolLibrary/Package.swift
@@ -0,0 +1,15 @@
+// swift-tools-version: 5.9
+import PackageDescription
+
+let package = Package(
+    name: "MyProtocolLibrary",
+    products: [
+        .library(
+            name: "MyProtocolLibrary",
+            targets: ["MyProtocolLibrary"]),
+    ],
+    targets: [
+        .target(
+            name: "MyProtocolLibrary"),
+    ]
+)
diff --git a/Tests/UseGraphPeripheryTests/TestProject/MyProtocolLibrary/Sources/MyProtocolLibrary/ProtocolExtensionExample.swift b/Tests/UseGraphPeripheryTests/TestProject/MyProtocolLibrary/Sources/MyProtocolLibrary/ProtocolExtensionExample.swift
@@ -0,0 +1,55 @@
+import Foundation
+
+// Базовый протокол
+public protocol Describable {
+    var name: String { get }
+}
+
+// Extension добавляет computed property и метод к протоколу
+public extension Describable {
+    var fullDescription: String {
+        return "Description: \(name)"
+    }
+    
+    func printDescription() {
+        print(fullDescription)
+    }
+}
+
+// Struct, который реализует протокол
+public struct Product: Describable {
+    public let name: String
+    public let price: Double
+    
+    public init(name: String, price: Double) {
+        self.name = name
+        self.price = price
+    }
+}
+
+// Extension для struct с computed property
+public extension Product {
+    var priceDescription: String {
+        return "Price: $\(price)"
+    }
+    
+    var isExpensive: Bool {
+        return price > 100
+    }
+}
+
+// Класс, который использует методы и свойства из extensions
+public class ProductManager {
+    public init() {}
+    
+    public func displayProduct(_ product: Product) -> String {
+        let desc = product.fullDescription // Из protocol extension
+        let price = product.priceDescription // Из struct extension
+        let expensive = product.isExpensive ? "Expensive" : "Affordable" // Из struct extension
+        return "\(desc), \(price), \(expensive)"
+    }
+    
+    public func printProduct(_ product: Product) {
+        product.printDescription() // Из protocol extension
+    }
+}
diff --git a/Tests/UseGraphPeripheryTests/UseGraphPeripheryCSVOutputTests.swift b/Tests/UseGraphPeripheryTests/UseGraphPeripheryCSVOutputTests.swift
diff --git a/Tests/UseGraphPeripheryTests/UseGraphPeripheryExtensionIntegrationTests.swift b/Tests/UseGraphPeripheryTests/UseGraphPeripheryExtensionIntegrationTests.swift
diff --git a/Tests/UseGraphPeripheryTests/UseGraphPeripheryIntegrationTests.swift b/Tests/UseGraphPeripheryTests/UseGraphPeripheryIntegrationTests.swift
diff --git a/Tests/UseGraphPeripheryTests/UseGraphPeripheryProtocolExtensionTests.swift b/Tests/UseGraphPeripheryTests/UseGraphPeripheryProtocolExtensionTests.swift

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public final class SourceGraphRepository: SourceGraphRepositoryProtocol {`
`21`	`21`
`22`	`22`	`guard let entity = reference.parent?.findEntity(),`
`23`	`23`	`entity != declaration.findEntity(),`
`24`		`- let entityParent = entity.presentAsNode(),`
`25`		`- let declarationParent = declaration.presentAsNode() else { return }`
	`24`	`+ let entityParent = entity.presentAsNode(sourceGraph: sourceGraph),`
	`25`	`+ let declarationParent = declaration.presentAsNode(sourceGraph: sourceGraph) else { return }`
`26`	`26`
`27`	`27`	`let edge: EdgeWithoutReference`
`28`	`28`
`@@ -38,13 +38,17 @@ public final class SourceGraphRepository: SourceGraphRepositoryProtocol {`
`38`	`38`	`)`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ // Получаем extensionInfo для declaration (вызываемого метода/свойства)`
	`42`	`+ let extensionInfo = declaration.getExtensionInfo(sourceGraph: sourceGraph)`
	`43`	`+`
`41`	`44`	`if edgeDict[edge] == nil {`
`42`	`45`	`edgeDict[edge] = []`
`43`	`46`	`}`
`44`	`47`	`edgeDict[edge]?.append(`
`45`	`48`	`Reference(`
`46`	`49`	`line: reference.location.line,`
`47`		`- file: reference.location.file.path.string`
	`50`	`+ file: reference.location.file.path.string,`
	`51`	`+ extensionInfo: extensionInfo`
`48`	`52`	`)`
`49`	`53`	`)`
`50`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Source,Target,Type`
	`2`	`+MyLibrary.B.class.s:9MyLibrary1BC@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:9,MyLibrary.A.struct.s:9MyLibrary1AV@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:3,directed`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+id,moduleName,fileName,line,entityName,entityType`
	`2`	`+MyLibrary.B.class.s:9MyLibrary1BC@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:9,MyLibrary,/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift,9,B,class`
	`3`	`+MyLibrary.A.struct.s:9MyLibrary1AV@/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift:3,MyLibrary,/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift,3,A,struct`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+line,file,extensionInfo`
	`2`	`+10,/Users/rofle100lvl/Desktop/UseGraph/Tests/UseGraphPeripheryTests/TestProject/MyLibrary/Sources/MyLibrary/UserRepository.swift,`