Changes from Swift-App-Template

Sources/SyntaxKit/Declarations/Class+Modifiers.swift

@@ -0,0 +1,76 @@
+//
+//  Class+Modifiers.swift
+//  SyntaxKit
+//
+//  Created by Leo Dion.
+//  Copyright © 2026 BrightDigit.
+//
+//  Permission is hereby granted, free of charge, to any person
+//  obtaining a copy of this software and associated documentation
+//  files (the “Software”), to deal in the Software without
+//  restriction, including without limitation the rights to use,
+//  copy, modify, merge, publish, distribute, sublicense, and/or
+//  sell copies of the Software, and to permit persons to whom the
+//  Software is furnished to do so, subject to the following
+//  conditions:
+//
+//  The above copyright notice and this permission notice shall be
+//  included in all copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+//  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+//  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+//  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+//  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+//  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+//  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+//  OTHER DEALINGS IN THE SOFTWARE.
+//
+
+extension Class {
+  /// Sets the generic parameters for the class.
+  /// - Parameter generics: The list of generic parameter names.
+  /// - Returns: A copy of the class with the generic parameters set.
+  public func generic(_ generics: String...) -> Self {
+    var copy = self
+    copy.genericParameters = generics
+    return copy
+  }
+
+  /// Sets the inheritance for the class.
+  /// - Parameter inheritance: The types to inherit from.
+  /// - Returns: A copy of the class with the inheritance set.
+  public func inherits(_ inheritance: String...) -> Self {
+    var copy = self
+    copy.inheritance = inheritance
+    return copy
+  }
+
+  /// Marks the class declaration as `final`.
+  /// - Returns: A copy of the class marked as `final`.
+  public func final() -> Self {
+    var copy = self
+    copy.isFinal = true
+    return copy
+  }
+
+  /// Sets the access modifier for the class declaration.
+  /// - Parameter access: The access modifier.
+  /// - Returns: A copy of the class with the access modifier set.
+  public func access(_ access: AccessModifier) -> Self {
+    var copy = self
+    copy.accessModifier = access
+    return copy
+  }
+
+  /// Adds an attribute to the class declaration.
+  /// - Parameters:
+  ///   - attribute: The attribute name (without the @ symbol).
+  ///   - arguments: The arguments for the attribute, if any.
+  /// - Returns: A copy of the class with the attribute added.
+  public func attribute(_ attribute: String, arguments: [String] = []) -> Self {
+    var copy = self
+    copy.attributes.append(AttributeInfo(name: attribute, arguments: arguments))
+    return copy
+  }
+}

Sources/SyntaxKit/Declarations/Class.swift

@@ -31,12 +31,13 @@ public import SwiftSyntax
 
 /// A Swift `class` declaration.
 public struct Class: CodeBlock, Sendable {
-  private let name: String
-  private let members: [any CodeBlock]
-  private var inheritance: [String] = []
-  private var genericParameters: [String] = []
-  private var isFinal: Bool = false
-  private var attributes: [AttributeInfo] = []
+  internal let name: String
+  internal let members: [any CodeBlock]
+  internal var inheritance: [String] = []
+  internal var genericParameters: [String] = []
+  internal var isFinal: Bool = false
+  internal var attributes: [AttributeInfo] = []
+  internal var accessModifier: AccessModifier?
 
   /// The SwiftSyntax representation of this class declaration.
   public var syntax: any SyntaxProtocol {
@@ -107,11 +108,16 @@ public struct Class: CodeBlock, Sendable {
 
     // Modifiers
     var modifiers: DeclModifierListSyntax = []
-    if isFinal {
+    if let access = accessModifier {
       modifiers = DeclModifierListSyntax([
-        DeclModifierSyntax(name: .keyword(.final, trailingTrivia: .space))
+        DeclModifierSyntax(name: .keyword(access.keyword, trailingTrivia: .space))
       ])
     }
+    if isFinal {
+      modifiers = DeclModifierListSyntax(
+        modifiers + [DeclModifierSyntax(name: .keyword(.final, trailingTrivia: .space))]
+      )
+    }
 
     return ClassDeclSyntax(
       attributes: attributeList,
@@ -135,43 +141,6 @@ public struct Class: CodeBlock, Sendable {
     self.members = try content()
   }
 
-  /// Sets the generic parameters for the class.
-  /// - Parameter generics: The list of generic parameter names.
-  /// - Returns: A copy of the class with the generic parameters set.
-  public func generic(_ generics: String...) -> Self {
-    var copy = self
-    copy.genericParameters = generics
-    return copy
-  }
-
-  /// Sets the inheritance for the class.
-  /// - Parameter inheritance: The types to inherit from.
-  /// - Returns: A copy of the class with the inheritance set.
-  public func inherits(_ inheritance: String...) -> Self {
-    var copy = self
-    copy.inheritance = inheritance
-    return copy
-  }
-
-  /// Marks the class declaration as `final`.
-  /// - Returns: A copy of the class marked as `final`.
-  public func final() -> Self {
-    var copy = self
-    copy.isFinal = true
-    return copy
-  }
-
-  /// Adds an attribute to the class declaration.
-  /// - Parameters:
-  ///   - attribute: The attribute name (without the @ symbol).
-  ///   - arguments: The arguments for the attribute, if any.
-  /// - Returns: A copy of the class with the attribute added.
-  public func attribute(_ attribute: String, arguments: [String] = []) -> Self {
-    var copy = self
-    copy.attributes.append(AttributeInfo(name: attribute, arguments: arguments))
-    return copy
-  }
-
   private func buildAttributeList(from attributes: [AttributeInfo]) -> AttributeListSyntax {
     if attributes.isEmpty {
       return AttributeListSyntax([])
@@ -189,13 +158,13 @@ public struct Class: CodeBlock, Sendable {
         rightParen = .rightParenToken()
 
         let argumentList = arguments.map { argument in
-          DeclReferenceExprSyntax(baseName: .identifier(argument))
+          ExprSyntax(attributeArgument: argument)
         }
 
         argumentsSyntax = .argumentList(
           LabeledExprListSyntax(
             argumentList.enumerated().map { index, expr in
-              var element = LabeledExprSyntax(expression: ExprSyntax(expr))
+              var element = LabeledExprSyntax(expression: expr)
               if index < argumentList.count - 1 {
                 element = element.with(\.trailingComma, .commaToken(trailingTrivia: .space))
               }
@@ -213,6 +182,7 @@ public struct Class: CodeBlock, Sendable {
           arguments: argumentsSyntax,
           rightParen: rightParen
         )
+        .with(\.trailingTrivia, .newline)
       )
     }
 

Sources/SyntaxKit/Declarations/Enum.swift

@@ -134,13 +134,13 @@ public struct Enum: CodeBlock, Sendable {
         rightParen = .rightParenToken()
 
         let argumentList = arguments.map { argument in
-          DeclReferenceExprSyntax(baseName: .identifier(argument))
+          ExprSyntax(attributeArgument: argument)
         }
 
         argumentsSyntax = .argumentList(
           LabeledExprListSyntax(
             argumentList.enumerated().map { index, expr in
-              var element = LabeledExprSyntax(expression: ExprSyntax(expr))
+              var element = LabeledExprSyntax(expression: expr)
               if index < argumentList.count - 1 {
                 element = element.with(\.trailingComma, .commaToken(trailingTrivia: .space))
               }
@@ -158,6 +158,7 @@ public struct Enum: CodeBlock, Sendable {
           arguments: argumentsSyntax,
           rightParen: rightParen
         )
+        .with(\.trailingTrivia, .newline)
       )
     }
     return AttributeListSyntax(attributeElements)

Sources/SyntaxKit/Declarations/Extension.swift

@@ -131,13 +131,13 @@ public struct Extension: CodeBlock, Sendable {
         rightParen = .rightParenToken()
 
         let argumentList = arguments.map { argument in
-          DeclReferenceExprSyntax(baseName: .identifier(argument))
+          ExprSyntax(attributeArgument: argument)
         }
 
         argumentsSyntax = .argumentList(
           LabeledExprListSyntax(
             argumentList.enumerated().map { index, expr in
-              var element = LabeledExprSyntax(expression: ExprSyntax(expr))
+              var element = LabeledExprSyntax(expression: expr)
               if index < argumentList.count - 1 {
                 element = element.with(\.trailingComma, .commaToken(trailingTrivia: .space))
               }
@@ -155,6 +155,7 @@ public struct Extension: CodeBlock, Sendable {
           arguments: argumentsSyntax,
           rightParen: rightParen
         )
+        .with(\.trailingTrivia, .newline)
       )
     }
     return AttributeListSyntax(attributeElements)

Sources/SyntaxKit/Declarations/Import.swift

@@ -101,13 +101,13 @@ public struct Import: CodeBlock, Sendable {
         rightParen = .rightParenToken()
 
         let argumentList = arguments.map { argument in
-          DeclReferenceExprSyntax(baseName: .identifier(argument))
+          ExprSyntax(attributeArgument: argument)
         }
 
         argumentsSyntax = .argumentList(
           LabeledExprListSyntax(
             argumentList.enumerated().map { index, expr in
-              var element = LabeledExprSyntax(expression: ExprSyntax(expr))
+              var element = LabeledExprSyntax(expression: expr)
               if index < argumentList.count - 1 {
                 element = element.with(\.trailingComma, .commaToken(trailingTrivia: .space))
               }
@@ -125,6 +125,7 @@ public struct Import: CodeBlock, Sendable {
           arguments: argumentsSyntax,
           rightParen: rightParen
         )
+        .with(\.trailingTrivia, .space)
       )
     }
     return AttributeListSyntax(attributeElements)