Adding Extension

Author: leogdion

Macros/Options/Package@swift-6.1.swift

@@ -7,16 +7,6 @@
 import CompilerPluginSupport
 import PackageDescription
 
-let swiftSettings = [
-  SwiftSetting.enableUpcomingFeature("BareSlashRegexLiterals"),
-  SwiftSetting.enableUpcomingFeature("ConciseMagicFile"),
-  SwiftSetting.enableUpcomingFeature("ExistentialAny"),
-  SwiftSetting.enableUpcomingFeature("ForwardTrailingClosures"),
-  SwiftSetting.enableUpcomingFeature("ImplicitOpenExistentials"),
-  SwiftSetting.enableUpcomingFeature("StrictConcurrency"),
-  SwiftSetting.enableUpcomingFeature("DisableOutwardActorInference"),
-  SwiftSetting.enableExperimentalFeature("StrictConcurrency")
-]
 
 let package = Package(
   name: "Options",
@@ -42,17 +32,15 @@ let package = Package(
   targets: [
     .target(
       name: "Options",
-      dependencies: ["OptionsMacros"],
-      swiftSettings: swiftSettings
+      dependencies: ["OptionsMacros"]
     ),
     .macro(
       name: "OptionsMacros",
       dependencies: [
         .product(name: "SyntaxKit", package: "SyntaxKit"),
         .product(name: "SwiftSyntaxMacros", package: "swift-syntax"),
         .product(name: "SwiftCompilerPlugin", package: "swift-syntax")
-      ],
-      swiftSettings: swiftSettings
+      ]
     ),
     .testTarget(
       name: "OptionsTests",

Macros/Options/Sources/OptionsMacros/OptionsMacro.swift

@@ -39,18 +39,54 @@ public struct OptionsMacro: ExtensionMacro, PeerMacro {
       throw InvalidDeclError.kind(declaration.kind)
     }
 
-    let extensionDecl = try ExtensionDeclSyntax(
-      enumDecl: enumDecl, conformingTo: protocols
+    // Build `typealias <EnumName>Set = EnumSet<EnumName>`
+    let typeName = enumDecl.name
+    let aliasName = "\(typeName.trimmed)Set"
+    let aliasDecl = TypeAlias(aliasName, equals: "EnumSet<\(typeName)>").syntax
+
+    let memberItem = MemberBlockItemSyntax(
+      decl: DeclSyntax(aliasDecl.as(TypeAliasDeclSyntax.self)! ),
+      trailingTrivia: .newline
     )
-    return [extensionDecl]
+
+    // Build member block
+    let memberBlock = MemberBlockSyntax(
+      leftBrace: .leftBraceToken(leadingTrivia: .space, trailingTrivia: .newline),
+      members: MemberBlockItemListSyntax([memberItem]),
+      rightBrace: .rightBraceToken(leadingTrivia: .newline)
+    )
+
+    // Build inheritance clause from `protocols` argument
+    let inheritanceClause: InheritanceClauseSyntax? = protocols.isEmpty ? nil : InheritanceClauseSyntax(
+      colon: .colonToken(),
+      inheritedTypes: InheritedTypeListSyntax(
+        protocols.enumerated().map { idx, proto in
+          var inherited = InheritedTypeSyntax(type: proto)
+          if idx < protocols.count - 1 {
+            inherited = inherited.with(\.trailingComma, .commaToken(trailingTrivia: .space))
+          }
+          return inherited
+        }
+      )
+    )
+
+    // Assemble extension
+    let extDecl = ExtensionDeclSyntax(
+      modifiers: DeclModifierListSyntax([]),
+      extendedType: IdentifierTypeSyntax(name: typeName),
+      inheritanceClause: inheritanceClause,
+      memberBlock: memberBlock
+    )
+
+    return [extDecl]
   }
 
   public static func expansion(of node: SwiftSyntax.AttributeSyntax, providingPeersOf declaration: some SwiftSyntax.DeclSyntaxProtocol, in context: some SwiftSyntaxMacros.MacroExpansionContext) throws -> [SwiftSyntax.DeclSyntax] {
     guard let enumDecl = declaration.as(EnumDeclSyntax.self) else {
       throw InvalidDeclError.kind(declaration.kind)
     }
 
-  let typeName = enumDecl.name
+    let typeName = enumDecl.name
 
   guard let declSyntax : DeclSyntax = .init(TypeAlias("\(typeName.trimmed)Set", equals: "EnumSet<\(typeName)>").expr) else {
     throw InvalidDeclError.kind(declaration.kind)