Added global actor preference extraction (#12)

Author: NSFatalError

Package.resolved

@@ -22,7 +22,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://github.com/swiftlang/swift-syntax",
-            "600.0.0" ..< "602.0.0"
+            "600.0.0" ..< "604.0.0"
         )
     ],
     targets: [

Package.swift

@@ -20,9 +20,40 @@ extension DeclBuilder {
 
     public var inheritedAccessControlLevel: TokenSyntax? {
         let settings = settings.accessControlLevel
-        return basicDeclaration.accessControlLevel(
-            inheritedBy: settings.inheritingDeclaration,
-            maxAllowed: settings.maxAllowed
-        )
+        guard let accessControlLevel = basicDeclaration.accessControlLevel,
+              let index = TokenKind.accessControlLevels.firstIndex(of: accessControlLevel.tokenKind),
+              let maxAllowedIndex = Keyword.accessControlLevels.firstIndex(of: settings.maxAllowed)
+        else {
+            return nil
+        }
+
+        guard index <= maxAllowedIndex else {
+            let tokenKind = TokenKind.accessControlLevels[maxAllowedIndex]
+            return TokenSyntax(tokenKind, presence: .present).withTrailingSpace
+        }
+
+        switch settings.inheritingDeclaration {
+        case .member:
+            if let internalIndex = Keyword.accessControlLevels.firstIndex(of: .internal),
+               index <= internalIndex {
+                return nil
+            }
+        case .peer:
+            break
+        }
+
+        return accessControlLevel.trimmed.withTrailingSpace
+    }
+
+    public var inheritedGlobalActorIsolation: AttributeSyntax? {
+        let globalActor: AttributeSyntax? = switch settings.globalActorIsolationPreference {
+        case .nonisolated:
+            nil
+        case let .isolated(globalActor):
+            "@\(globalActor)"
+        case .none:
+            basicDeclaration.globalActor?.trimmed
+        }
+        return globalActor?.withTrailingSpace
     }
 }

Sources/PrincipleMacros/Builders/Declarations/Common/DeclBuilder.swift

@@ -11,9 +11,14 @@ import SwiftSyntax
 public struct DeclBuilderSettings {
 
     public var accessControlLevel: AccessControlLevel
+    public var globalActorIsolationPreference: GlobalActorIsolationPreference?
 
-    public init(accessControlLevel: AccessControlLevel) {
+    public init(
+        accessControlLevel: AccessControlLevel,
+        globalActorIsolationPreference: GlobalActorIsolationPreference? = nil
+    ) {
         self.accessControlLevel = accessControlLevel
+        self.globalActorIsolationPreference = globalActorIsolationPreference
     }
 }
 

Sources/PrincipleMacros/Builders/Declarations/Common/DeclBuilderSettings.swift

@@ -0,0 +1,21 @@
+//
+//  ActorDeclBuilder.swift
+//  PrincipleMacros
+//
+//  Created by Kamil Strzelecki on 18/08/2025.
+//  Copyright © 2025 Kamil Strzelecki. All rights reserved.
+//
+
+import SwiftSyntax
+
+public protocol ActorDeclBuilder: TypeDeclBuilder {
+
+    var declaration: ActorDeclSyntax { get }
+}
+
+extension ActorDeclBuilder {
+
+    public var typeDeclaration: any TypeDeclSyntax {
+        declaration
+    }
+}

Sources/PrincipleMacros/Builders/Declarations/Types/ActorDeclBuilder.swift

@@ -10,28 +10,50 @@ import SwiftSyntax
 
 public struct ParameterExtractor {
 
-    private let arguments: LabeledExprListSyntax
+    private let arguments: LabeledExprListSyntax?
     private let trailingClosure: ClosureExprSyntax?
 
     public init(from node: some FreestandingMacroExpansionSyntax) {
         self.arguments = node.arguments
         self.trailingClosure = node.trailingClosure
     }
 
-    public func expression(withLabel label: TokenSyntax?) throws -> ExprSyntax {
-        let match = arguments.first { element in
-            element.label?.trimmedDescription == label?.trimmedDescription
+    public init(from node: AttributeSyntax) {
+        self.arguments = switch node.arguments {
+        case let .argumentList(arguments):
+            arguments
+        default:
+            nil
         }
+        self.trailingClosure = nil
+    }
 
-        guard let match else {
-            throw ParameterExtractionError.notFound
+    public func expression(
+        withLabel label: TokenSyntax?
+    ) -> ExprSyntax? {
+        let match = arguments?.first { element in
+            element.label?.trimmedDescription == label?.trimmedDescription
         }
+        return match?.expression.trimmed
+    }
 
-        return match.expression.trimmed
+    public func trailingClosure(
+        withLabel label: TokenSyntax?
+    ) throws -> ExprSyntax? {
+        if let trailingClosure {
+            return ExprSyntax(trailingClosure)
+        }
+        return expression(withLabel: label)
     }
 
-    public func rawString(withLabel label: TokenSyntax?) throws -> String {
-        let rawString = try expression(withLabel: label)
+    public func rawString(
+        withLabel label: TokenSyntax?
+    ) throws -> String? {
+        guard let expression = expression(withLabel: label) else {
+            return nil
+        }
+
+        let rawString = expression
             .as(StringLiteralExprSyntax.self)?
             .representedLiteralValue
 
@@ -42,10 +64,23 @@ public struct ParameterExtractor {
         return rawString
     }
 
-    public func trailingClosure(withLabel label: TokenSyntax?) throws -> ExprSyntax {
-        if let trailingClosure {
-            return ExprSyntax(trailingClosure)
+    public func globalActorIsolationPreference(
+        withLabel label: TokenSyntax?
+    ) throws -> GlobalActorIsolationPreference? {
+        guard let expression = expression(withLabel: label) else {
+            return nil
+        }
+
+        if NilLiteralExprSyntax(expression) != nil {
+            return .nonisolated
+        }
+
+        if let memberAccessExpression = MemberAccessExprSyntax(expression),
+           memberAccessExpression.declName.baseName.tokenKind == .keyword(.self),
+           let baseType = memberAccessExpression.base {
+            return .isolated("\(baseType)")
         }
-        return try expression(withLabel: label)
+
+        throw ParameterExtractionError.unexpectedSyntaxType
     }
 }

Sources/PrincipleMacros/Parameters/ParameterExtractor.swift

@@ -9,4 +9,5 @@
 import SwiftSyntax
 
 public typealias BasicDeclSyntax = DeclSyntaxProtocol
+    & WithAttributesSyntax
     & WithModifiersSyntax

Sources/PrincipleMacros/Syntax/Custom/BasicDeclSyntax.swift

@@ -8,7 +8,7 @@
 
 import SwiftSyntax
 
-public protocol TypeDeclSyntax: DeclGroupSyntax, NamedDeclSyntax, WithModifiersSyntax {
+public protocol TypeDeclSyntax: DeclGroupSyntax, NamedDeclSyntax, BasicDeclSyntax {
 
     var isFinal: Bool { get }
 }

Sources/PrincipleMacros/Syntax/Custom/TypeDeclSyntax.swift

@@ -41,55 +41,23 @@ extension WithModifiersSyntax {
     }
 }
 
-extension WithModifiersSyntax {
-
-    public func accessControlLevel(
-        inheritedBy inheritingDeclaration: InheritingDeclaration,
-        maxAllowed: Keyword
-    ) -> TokenSyntax? {
-        guard let accessControlLevel,
-              let index = TokenKind.accessControlLevels.firstIndex(of: accessControlLevel.tokenKind),
-              let maxAllowedIndex = Keyword.accessControlLevels.firstIndex(of: maxAllowed)
-        else {
-            return nil
-        }
-
-        guard index <= maxAllowedIndex else {
-            let tokenKind = TokenKind.accessControlLevels[maxAllowedIndex]
-            return TokenSyntax(tokenKind, presence: .present)
-        }
-
-        switch inheritingDeclaration {
-        case .member:
-            if let internalIndex = Keyword.accessControlLevels.firstIndex(of: .internal),
-               index <= internalIndex {
-                return nil
-            }
-        case .peer:
-            break
-        }
-
-        return accessControlLevel.trimmed.withTrailingSpace
-    }
-}
-
 extension TokenKind {
 
-    fileprivate static let typeScopeSpecifiers = Keyword.typeScopeSpecifiers
+    static let typeScopeSpecifiers = Keyword.typeScopeSpecifiers
         .map(TokenKind.keyword)
 
-    fileprivate static let accessControlLevels = Keyword.accessControlLevels
+    static let accessControlLevels = Keyword.accessControlLevels
         .map(TokenKind.keyword)
 }
 
 extension Keyword {
 
-    fileprivate static let typeScopeSpecifiers: [Keyword] = [
+    static let typeScopeSpecifiers: [Keyword] = [
         .static,
         .class
     ]
 
-    fileprivate static let accessControlLevels: [Keyword] = [
+    static let accessControlLevels: [Keyword] = [
         .private,
         .fileprivate,
         .internal,

Sources/PrincipleMacros/Syntax/Extensions/WithModifiersSyntax.swift

@@ -0,0 +1,15 @@
+//
+//  GlobalActorIsolationPreference.swift
+//  PrincipleMacros
+//
+//  Created by Kamil Strzelecki on 18/08/2025.
+//  Copyright © 2025 Kamil Strzelecki. All rights reserved.
+//
+
+import SwiftSyntax
+
+public enum GlobalActorIsolationPreference: Hashable {
+
+    case nonisolated
+    case isolated(TypeSyntax)
+}