Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ let package = Package(
.library(name: "TextBuilder", targets: ["TextBuilder"]),
],
targets: [
.target(name: "TextBuilder"),
.target(name: "TextBuilder", dependencies: [
.product(name: "Builders", package: "swift-builders"),
]),
.testTarget(
name: "TextBuilderTests",
dependencies: [
Expand All @@ -31,4 +33,5 @@ let package = Package(

package.dependencies = [
.package(name: "SnapshotTesting", url: "https://github.com/pointfreeco/swift-snapshot-testing", from: "1.8.2"),
.package(name: "swift-builders", url: "https://github.com/davdroman/swift-builders", from: "0.1.0"),
]
4 changes: 0 additions & 4 deletions Sources/TextBuilder/TextBuilder.swift
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,4 @@ public struct TextBuilder<Separator: TextBuilderSeparator> {
public static func buildFinalResult(_ texts: [Text]) -> Text {
texts.joined(separator: Text(Separator.separator))
}

public static func buildFinalResult(_ texts: [Text]) -> [Text] {
texts
}
}
2 changes: 0 additions & 2 deletions Sources/TextBuilder/TextBuilderSeparator.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import Foundation

public protocol TextBuilderSeparator {
associatedtype Separator: StringProtocol
static var separator: Separator { get }
Expand Down
13 changes: 7 additions & 6 deletions Sources/TextBuilder/TextExtensions.swift
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Builders
import SwiftUI

extension StringProtocol {
public var text: Text { Text(self) }
}

extension Sequence where Element == Text {

/// Returns a new `Text` by concatenating the elements of the sequence,
///
/// The following example shows how an array of `Text` views can be joined to a
Expand All @@ -30,16 +30,17 @@ extension Sequence where Element == Text {
}
}

extension Text {
public typealias TextArrayBuilder = ArrayBuilder<Text>

extension Text {
/// Creates a combined text view based on the given `content` by inserting
/// `separator` text views between each received text component.
///
/// - Parameters:
/// - separator: The text to use as a separator between received text components.
/// By default there is no separator.
/// - content: A text builder that creates text components.
public init(separator: Text = Text(""), @BasicTextBuilder content: () -> [Text]) {
/// - content: A text array builder that creates text components.
public init(separator: Text = Text(""), @TextArrayBuilder content: () -> [Text]) {
self = content().joined(separator: separator)
}

Expand All @@ -48,8 +49,8 @@ extension Text {
///
/// - Parameters:
/// - separator: The string to use as a separator between received text components.
/// - content: A text builder that creates text components.
public init<Separator: StringProtocol>(separator: Separator, @BasicTextBuilder content: () -> [Text]) {
/// - content: A text array builder that creates text components.
public init<Separator: StringProtocol>(separator: Separator, @TextArrayBuilder content: () -> [Text]) {
self.init(separator: Text(separator), content: content)
}
}
18 changes: 9 additions & 9 deletions Tests/TextBuilderTests/TextExtensionsTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -24,31 +24,31 @@ final class TextExtensionsTests: XCTestCase {

func testInit_noSeparator() {
assertTextSnapshot(
Text(content: basicTextBuilderText)
Text(content: textArrayBuilderText)
)
assertTextSnapshot(
Text(separator: Text(""), content: basicTextBuilderText)
Text(separator: Text(""), content: textArrayBuilderText)
)
assertTextSnapshot(
Text(separator: "", content: basicTextBuilderText)
Text(separator: "", content: textArrayBuilderText)
)
}

func testInit_spaceSeparator() {
assertTextSnapshot(
Text(separator: Text(" "), content: basicTextBuilderText)
Text(separator: Text(" "), content: textArrayBuilderText)
)
assertTextSnapshot(
Text(separator: " ", content: basicTextBuilderText)
Text(separator: " ", content: textArrayBuilderText)
)
}

func testInit_newlineSeparator() {
assertTextSnapshot(
Text(separator: Text("\n"), content: basicTextBuilderText)
Text(separator: Text("\n"), content: textArrayBuilderText)
)
assertTextSnapshot(
Text(separator: "\n", content: basicTextBuilderText)
Text(separator: "\n", content: textArrayBuilderText)
)
}
}
Expand All @@ -63,8 +63,8 @@ private extension TextExtensionsTests {
]
}

@BasicTextBuilder
func basicTextBuilderText() -> [Text] {
@TextArrayBuilder
func textArrayBuilderText() -> [Text] {
Text("Lorem").underline().foregroundColor(.blue)
Text("ipsum dolor")
Text("sit").bold()
Expand Down