Renamings

Author: Alexander Schmutz

Sources/StructBuilderMacro/BuildableMacro.swift

@@ -16,17 +16,17 @@ public struct BuildableMacro: PeerMacro {
         in context: Context
     ) throws -> [SwiftSyntax.DeclSyntax] where Context : SwiftSyntaxMacros.MacroExpansionContext, Declaration : SwiftSyntax.DeclSyntaxProtocol {
         if let structDecl = declaration.as(StructDeclSyntax.self) {
-            let structBuilder = makeStructBuilder(structDecl: structDecl)
+            let structBuilder = generateBuilderFromStruct(structDecl: structDecl)
             return [DeclSyntax(structBuilder)]
         }
 
         if let enumDecl = declaration.as(EnumDeclSyntax.self) {
-            let enumBuilder = try makeEnumBuilder(enumDecl: enumDecl)
+            let enumBuilder = try generateBuilderFromEnum(enumDecl: enumDecl)
             return [DeclSyntax(enumBuilder)]
         }
 
         if let classDecl = declaration.as(ClassDeclSyntax.self) {
-            let classBuilder = try makeClassBuilder(classDecl: classDecl)
+            let classBuilder = try generateBuilderFromClass(classDecl: classDecl)
             return [DeclSyntax(classBuilder)]
         }
 

…tBuilderMacro/Enum/MakeEnumBuilder.swift …Macro/Enum/GenerateBuilderFromEnum.swiftSources/StructBuilderMacro/Enum/MakeEnumBuilder.swift renamed to Sources/StructBuilderMacro/Enum/GenerateBuilderFromEnum.swift Sources/StructBuilderMacro/Enum/MakeEnumBuilder.swift renamed to Sources/StructBuilderMacro/Enum/GenerateBuilderFromEnum.swift

@@ -1,13 +1,13 @@
 //
-//  MakeEnumBuilder.swift
+//  GenerateBuilderFromEnum.swift
 //
 //
 //  Created by Alexander Schmutz on 09.02.24.
 //
 
 import SwiftSyntax
 
-func makeEnumBuilder(enumDecl: EnumDeclSyntax) throws -> StructDeclSyntax {
+func generateBuilderFromEnum(enumDecl: EnumDeclSyntax) throws -> StructDeclSyntax {
     let enumMember = EnumMember(
         identifier: TokenSyntax(stringLiteral: "value"),
         type: TypeSyntax(stringLiteral: enumDecl.name.text),

…ro/StructAndClass/MakeClassBuilder.swift …tAndClass/GenerateBuilderFromClass.swiftSources/StructBuilderMacro/StructAndClass/MakeClassBuilder.swift renamed to Sources/StructBuilderMacro/StructAndClass/GenerateBuilderFromClass.swift Sources/StructBuilderMacro/StructAndClass/MakeClassBuilder.swift renamed to Sources/StructBuilderMacro/StructAndClass/GenerateBuilderFromClass.swift

@@ -1,17 +1,17 @@
 //
-//  MakeClassBuilder.swift
+//  GenerateBuilderFromClass.swift
 //
 //
 //  Created by Alexander Schmutz on 09.02.24.
 //
 
 import SwiftSyntax
 
-func makeClassBuilder(classDecl: ClassDeclSyntax) throws -> StructDeclSyntax {
+func generateBuilderFromClass(classDecl: ClassDeclSyntax) throws -> StructDeclSyntax {
     guard let initialiserDecl = getFirstInitialiser(from: classDecl.memberBlock) else {
         throw "Missing initialiser"
     }
     let structMembers = extractInitializerMembers(from: initialiserDecl)
 
-    return makeStructBuilderFrom(structName: classDecl.name, structMembers: structMembers)
+    return makeStructBuilder(withStructName: classDecl.name, and: structMembers)
 }

Sources/StructBuilderMacro/StructAndClass/GenerateBuilderFromStruct.swift

@@ -0,0 +1,21 @@
+//
+//  GenerateBuilderFromStruct.swift
+//
+//
+//  Created by Alexander Schmutz on 09.02.24.
+//
+
+import SwiftSyntax
+
+func generateBuilderFromStruct(structDecl: StructDeclSyntax) -> StructDeclSyntax {
+    let structMembers = getStructMembers(structDecl: structDecl)
+    return makeStructBuilder(withStructName: structDecl.name, and: structMembers)
+}
+
+private func getStructMembers(structDecl: StructDeclSyntax) -> [StructMember] {
+    if let initialiserDecl = getFirstInitialiser(from: structDecl.memberBlock) {
+        return extractInitializerMembers(from: initialiserDecl)
+    } else {
+        return extractMembersFrom(structDecl.memberBlock.members)
+    }
+}

Sources/StructBuilderMacro/StructAndClass/Helper/MakeStructBuilder.swift

@@ -0,0 +1,22 @@
+//
+//  MakeStructBuilder.swift
+//
+//
+//  Created by Alexander Schmutz on 13.02.24.
+//
+
+import SwiftSyntax
+
+func makeStructBuilder(withStructName structName: TokenSyntax, and structMembers: [StructMember]) -> StructDeclSyntax {
+    StructDeclSyntax(name: getStructBuilderName(from: structName)) {
+        MemberBlockItemListSyntax {
+            for structMember in structMembers {
+                MemberBlockItemSyntax(decl: makeVariableDecl(structMember: structMember))
+            }
+            MemberBlockItemSyntax(
+                leadingTrivia: .newlines(2),
+                decl: makeFunctionDecl(name: structName, structMembers: structMembers)
+            )
+        }
+    }
+}