last refactor

Author: leogdion

Sources/TokenVisitor/StructureProperty.swift

@@ -41,7 +41,7 @@ import SwiftSyntax
 /// - Function declaration "name" property → StructureValue with identifier text
 /// - Function declaration "body" property → Reference to "CodeBlockSyntax"
 /// - Missing optional property → nil value with just the property name
-package struct StructureProperty: Codable, Equatable {
+package struct StructureProperty: Codable, Equatable, Sendable {
   // MARK: - String Constants
 
   /// Property name for collection element type information.
@@ -107,7 +107,7 @@ package struct StructureProperty: Codable, Equatable {
   ///   - type: The syntax node type (will be converted to string)
   internal init(reference name: String, type: Any) {
     let typeString = "\(type)"
-    self.init(name: name, value: StructureValue(text: typeString), ref: typeString)
+    self.init(name: name, value: StructureValue(value: type), ref: typeString)
   }
 
   /// Creates a StructureProperty for a primitive value.
@@ -116,7 +116,7 @@ package struct StructureProperty: Codable, Equatable {
   ///   - name: The property name
   ///   - value: The primitive value (will be converted to string)
   internal init(primitive name: String, value: Any) {
-    self.init(name: name, value: StructureValue(text: "\(value)"), ref: nil)
+    self.init(name: name, value: StructureValue(value: value), ref: nil)
   }
 
   internal init(token name: String, tokenSyntax: TokenSyntax) {

Sources/TokenVisitor/StructureValue.swift

@@ -40,22 +40,22 @@ import Foundation
 /// - Token value: text="let", kind="keyword(SwiftSyntax.Keyword.let)"
 /// - Type reference: text="VariableDeclSyntax", kind=nil
 /// - Literal value: text="42", kind="integerLiteral(42)"
-package struct StructureValue: Codable, Equatable {
+package struct StructureValue: Codable, Equatable, Sendable {
   /// The string representation of this value.
   /// Contains the actual text content or type name.
-  package let text: String
+  private let text: String
 
   /// Optional kind information that provides additional context about the value type.
   /// Present for tokens to indicate their specific token kind (e.g., "keyword", "identifier").
   /// Nil for simple text values and type references.
-  package let kind: String?
+  private let kind: String?
 
   /// Creates a new StructureValue with the specified content.
   ///
   /// - Parameters:
   ///   - text: The string representation of the value
   ///   - kind: Optional kind information for additional context
-  package init(text: String, kind: String? = nil) {
+  internal init(text: String, kind: String? = nil) {
     self.text = text
     self.kind = kind
   }
@@ -65,8 +65,7 @@ package struct StructureValue: Codable, Equatable {
   /// - Parameters:
   ///   - value: Any value that will be converted to a string
   ///   - kind: Optional kind information for additional context
-  package init(value: Any, kind: String? = nil) {
-    self.text = "\(value)"
-    self.kind = kind
+  internal init(value: Any, kind: String? = nil) {
+    self.init(text: "\(value)", kind: kind)
   }
 }

Sources/TokenVisitor/SyntaxClassifiable.swift

@@ -34,7 +34,7 @@ import Foundation
 ///
 /// This protocol allows syntax nodes to self-identify their classification,
 /// making the classification process more type-safe and extensible.
-package protocol SyntaxClassifiable {
+package protocol SyntaxClassifiable: Sendable {
   /// Returns the semantic classification of this syntax node type.
   static var syntaxType: SyntaxType { get }
 }

Sources/TokenVisitor/SyntaxType.swift

@@ -39,7 +39,7 @@ import Foundation
 ///
 /// The classification is based on the SwiftSyntax type hierarchy and groups
 /// related syntax elements into meaningful categories.
-package enum SyntaxType: String, Codable, Equatable {
+package enum SyntaxType: String, Codable, Equatable, Sendable {
   /// Declaration syntax elements.
   /// Includes: struct, class, enum, func, var, let, import, protocol, extension, etc.
   case decl

Sources/TokenVisitor/Token.swift

@@ -40,26 +40,26 @@ import Foundation
 /// newlines, comments, and other formatting elements that don't directly
 /// participate in the Swift language grammar but are important for
 /// code reconstruction and analysis.
-package struct Token: Codable, Equatable {
+package struct Token: Codable, Equatable, Sendable {
   /// The classification of this token (e.g., "keyword", "identifier", "integerLiteral").
   /// Corresponds to SwiftSyntax TokenKind descriptions.
-  package let kind: String
+  private let kind: String
 
   /// Trivia that appears before this token.
   /// Includes whitespace, comments, and other non-semantic text preceding the token.
-  package var leadingTrivia: String
+  internal private(set) var leadingTrivia: String
 
   /// Trivia that appears after this token.
   /// Includes whitespace, comments, and other non-semantic text following the token.
-  package var trailingTrivia: String
+  internal private(set) var trailingTrivia: String
 
   /// Creates a new Token with the specified properties.
   ///
   /// - Parameters:
   ///   - kind: The token classification
   ///   - leadingTrivia: Text appearing before the token
   ///   - trailingTrivia: Text appearing after the token
-  package init(kind: String, leadingTrivia: String, trailingTrivia: String) {
+  internal init(kind: String, leadingTrivia: String, trailingTrivia: String) {
     self.kind = kind
     self.leadingTrivia = leadingTrivia
     self.trailingTrivia = trailingTrivia

Sources/TokenVisitor/TokenVisitor.swift

@@ -128,25 +128,19 @@ internal final class TokenVisitor<NodeType: TreeNodeProtocol>: SyntaxRewriter {
     // Store the actual token text content
     current?.text = token.text
 
+    // Process leading trivia (whitespace, comments before the token)
+    let leadingTrivia = token.leadingTrivia.map(processTriviaPiece).joined()
+
+    // Process trailing trivia (whitespace, comments after the token)
+    let trailingTrivia = token.trailingTrivia.map(processTriviaPiece).joined()
+
     // Create token metadata with kind information
     current?.token = Token(
       kind: "\(token.tokenKind)",
-      leadingTrivia: .empty,
-      trailingTrivia: .empty
+      leadingTrivia: leadingTrivia,
+      trailingTrivia: trailingTrivia
     )
 
-    // Process leading trivia (whitespace, comments before the token)
-    for piece in token.leadingTrivia {
-      let trivia = processTriviaPiece(piece)
-      current?.token?.leadingTrivia += trivia
-    }
-
-    // Process trailing trivia (whitespace, comments after the token)
-    for piece in token.trailingTrivia {
-      let trivia = processTriviaPiece(piece)
-      current?.token?.trailingTrivia += trivia
-    }
-
     return token
   }
 

Sources/TokenVisitor/TreeNodeProtocol+Extensions.swift

@@ -179,9 +179,9 @@ extension TreeNodeProtocol {
 }
 
 extension String {
-  fileprivate static let defaultFileName = ""
+  internal static let defaultFileName = ""
 
-  fileprivate init?(_ keyPath: AnyKeyPath) {
+  internal init?(_ keyPath: AnyKeyPath) {
     let keyPathString = String(describing: keyPath)
 
     // Extract the last component after the last dot