Fix attachments without newline

Author: SubvertDev

Modules/Sources/BBBuilder/Builder/BBBuilder.swift

@@ -113,12 +113,14 @@ public struct BBBuilder {
                     let isNextNodeMedia = nodes[safe: index + 1]?.isMedia ?? false
                     if isNextNodeTextable || isNextNodeMedia {
                         logger.info("Next node is textable OR media, unwrapping")
-                        var isAttachmentDelimeneter = false
-                        if case .attachment = nodes[safe: index - 1] { isAttachmentDelimeneter = true }
+                        var isAttachmentDelimeter = false
+                        if case .attachment = nodes[safe: index - 1] {
+                            isAttachmentDelimeter = true
+                        }
                         mergedNodes[mergedNodes.count - 1] = unwrap(
                             node: node,
                             with: mutableText,
-                            isAttachmentDelimeter: isAttachmentDelimeneter,
+                            isAttachmentDelimeter: isAttachmentDelimeter,
                             listType: listType
                         )
                         if listType != nil,
@@ -156,11 +158,15 @@ public struct BBBuilder {
                     mergedNodes.lastOrAppend = unwrap(node: textNode, with: mutableText)
                     continue
                 }
-                let attachmentType = attachments[attachmentIndex].type
-                switch attachmentType {
+                
+                switch attachments[attachmentIndex].type {
                 case .file:
                     logger.info("FILE attachment")
-                    let textNode = unwrap(node: node, with: mutableText)
+                    var isAttachmentDelimeter = false
+                    if case let .text(text) = mergedNodes.last, text.string.last != "\n" {
+                        isAttachmentDelimeter = true
+                    }
+                    let textNode = unwrap(node: node, with: mutableText, isAttachmentDelimeter: isAttachmentDelimeter)
                     if !textNode.isEmptyText {
                         mergedNodes.lastOrAppend = textNode
                     } else {
@@ -169,7 +175,7 @@ public struct BBBuilder {
                     continue
 
                 case .image:
-                    break
+                    break // TODO: Move image attachment below here
                 }
 
                 logger.info("IMAGE attachment")
@@ -392,6 +398,10 @@ public struct BBBuilder {
                         .foregroundColor: UIColor(resource: .Labels.teritary)
                     ]))
                 }
+                
+                if isAttachmentDelimeter {
+                    mutableString.insert(NSAttributedString(string: "\n"), at: 0)
+                }
 
                 attachmentString = mutableString
             }

Modules/Tests/BBBuilderTests/BBBuilderTests.swift

@@ -219,6 +219,18 @@ struct BBBuilderTests {
             Issue.record("First node is not text or there's more nodes")
         }
     }
+    
+    @Test func fileAttachmentsWithoutNewlineAreNewlined() async throws {
+        let firstId = 0
+        let secondId = 1
+        let text = String.fileAttachment(id: firstId) + String.fileAttachment(id: secondId)
+        let nodes = BBBuilder.build(text: text, attachments: [.file(id: firstId), .file(id: secondId)])
+        if case let .text(text) = nodes.first, nodes.count == 1 {
+            #expect(text.string.contains("\n"))
+        } else {
+            Issue.record("First node is not text or there's more nodes")
+        }
+    }
 }
 
 // MARK: - Helpers