General fixes

dfed · Nov 26, 2023 · 04cc4d1 · 04cc4d1
1 parent 6256267
commit 04cc4d1
Show file tree

Hide file tree

Showing 11 changed files with 260 additions and 152 deletions.
diff --git a/Sources/SafeDI/SafeDI.swift b/Sources/SafeDI/SafeDI.swift
@@ -24,11 +24,11 @@
 #else
 
 // TODO: Document macro.
-@attached(member, names: named(`init`), named(build), named(getDependencies), arbitrary)
+@attached(member, names: arbitrary)
 public macro builder(_ propertyName: StaticString) = #externalMacro(module: "SafeDIMacros", type: "BuilderMacro")
 
 // TODO: Document macro.
-@attached(member, names: named(`init`))
+@attached(member, names: arbitrary)
 public macro dependencies() = #externalMacro(module: "SafeDIMacros", type: "DependenciesMacro")
 
 // TODO: Document macro.

diff --git a/Sources/SafeDIMacros/Extensions/ArrayExtensions.swift b/Sources/SafeDIMacros/Extensions/ArrayExtensions.swift
@@ -23,6 +23,19 @@ import SwiftSyntaxBuilder
 
 extension Array where Element == Dependency {
 
+    var variantUnlabeledParameterList: FunctionParameterListSyntax {
+        FunctionParameterListSyntax(
+            filter { $0.source == .variant }
+                .map { "\(raw: $0.type)" }
+                .transformUntilLast {
+                    var functionPamameterSyntax = $0
+                    functionPamameterSyntax.trailingComma = TokenSyntax(.comma, presence: .present)
+                    functionPamameterSyntax.trailingTrivia = .space
+                    return functionPamameterSyntax
+                }
+        )
+    }
+
     var variantParameterList: FunctionParameterListSyntax {
         FunctionParameterListSyntax(
             filter { $0.source == .variant }
@@ -36,6 +49,12 @@ extension Array where Element == Dependency {
         )
     }
 
+    var variantUnlabeledExpressionList: String {
+        filter { $0.isVariant }
+            .map { "\($0.variableName)" }
+            .joined(separator: ", ")
+    }
+
     var variantLabeledExpressionList: String {
         filter { $0.isVariant }
             .map { "\($0.variableName): \($0.variableName)" }

diff --git a/Sources/SafeDIMacros/Extensions/FunctionDeclSyntaxExtensions.swift b/Sources/SafeDIMacros/Extensions/FunctionDeclSyntaxExtensions.swift
@@ -4,7 +4,11 @@ import SwiftSyntaxBuilder
 extension FunctionDeclSyntax {
 
     static var buildTemplate: Self {
-        try! FunctionDeclSyntax("public func build(<#T##parameter#>: <#T##ParameterType#>) \(returnClauseTemplate)")
+        try! FunctionDeclSyntax("""
+            func build(<#T##parameter#>: <#T##ParameterType#>) \(returnClauseTemplate) {
+                <#T##ConcreteBuiltProductType#>(<#T##parameter#>: <#T##ParameterType#>)
+            }
+        """)
     }
 
     static var returnClauseTemplate: ReturnClauseSyntax {

diff --git a/Sources/SafeDIMacros/Extensions/StructDeclSyntaxExtensions.swift b/Sources/SafeDIMacros/Extensions/StructDeclSyntaxExtensions.swift
@@ -25,14 +25,15 @@ extension StructDeclSyntax {
 
     static var dependenciesTemplate: Self {
         try! StructDeclSyntax("""
+
             @dependencies public struct Dependencies {
-                \(FunctionDeclSyntax.buildTemplate) {
-                    <#T##ConcreteBuiltProductType#>(<#T##parameter#>: <#T##ParameterType#>)
-                }
+                \(FunctionDeclSyntax.buildTemplate)
 
                 private let <#T##dependency#>: <#T##DependencyType#>
             }
-            """)
+
+            """
+        )
     }
 
 }
diff --git a/Sources/SafeDIMacros/Extensions/SyntaxExtensions.swift b/Sources/SafeDIMacros/Extensions/SyntaxExtensions.swift
diff --git a/Sources/SafeDIMacros/Internal/BuilderVisitor.swift b/Sources/SafeDIMacros/Internal/BuilderVisitor.swift
@@ -32,41 +32,77 @@ final class BuilderVisitor: SyntaxVisitor {
     // MARK: SyntaxVisitor
 
     override func visit(_ node: VariableDeclSyntax) -> SyntaxVisitorContinueKind {
+        guard
+            let parent = node.parent,
+            let typedParent = MemberBlockItemSyntax(parent),
+            let greatGrandparent = parent.parent?.parent,
+            var modifiedGreatGrandparent = MemberBlockSyntax(greatGrandparent),
+            let index = modifiedGreatGrandparent.members.index(of: typedParent)
+        else {
+            return .skipChildren
+        }
+
+        modifiedGreatGrandparent.members.remove(at: index)
+
         diagnostics.append(Diagnostic(
-            node: node.modifiers,
+            node: node,
             error: FixableBuilderError.unexpectedVariableDeclaration,
             changes: [
                 .replace(
-                    oldNode: Syntax(node),
-                    newNode: .empty
+                    oldNode: greatGrandparent,
+                    newNode: Syntax(modifiedGreatGrandparent)
                 )
             ]
         ))
         return .skipChildren
     }
 
     override func visit(_ node: InitializerDeclSyntax) -> SyntaxVisitorContinueKind {
+        guard
+            let parent = node.parent,
+            let typedParent = MemberBlockItemSyntax(parent),
+            let greatGrandparent = parent.parent?.parent,
+            var modifiedGreatGrandparent = MemberBlockSyntax(greatGrandparent),
+            let index = modifiedGreatGrandparent.members.index(of: typedParent)
+        else {
+            return .skipChildren
+        }
+
+        modifiedGreatGrandparent.members.remove(at: index)
+
         diagnostics.append(Diagnostic(
-            node: node.modifiers,
+            node: node,
             error: FixableBuilderError.unexpectedInitializer,
             changes: [
                 .replace(
-                    oldNode: Syntax(node),
-                    newNode: .empty
+                    oldNode: greatGrandparent,
+                    newNode: Syntax(modifiedGreatGrandparent)
                 )
             ]
         ))
         return .skipChildren
     }
 
     override func visit(_ node: FunctionDeclSyntax) -> SyntaxVisitorContinueKind {
+        guard
+            let parent = node.parent,
+            let typedParent = MemberBlockItemSyntax(parent),
+            let greatGrandparent = parent.parent?.parent,
+            var modifiedGreatGrandparent = MemberBlockSyntax(greatGrandparent),
+            let index = modifiedGreatGrandparent.members.index(of: typedParent)
+        else {
+            return .skipChildren
+        }
+
+        modifiedGreatGrandparent.members.remove(at: index)
+
         diagnostics.append(Diagnostic(
-            node: node.modifiers,
+            node: node,
             error: FixableBuilderError.unexpectedFuncationDeclaration,
             changes: [
                 .replace(
-                    oldNode: Syntax(node),
-                    newNode: .empty
+                    oldNode: greatGrandparent,
+                    newNode: Syntax(modifiedGreatGrandparent)
                 )
             ]
         ))