Develop

Sources/Tsumiji/Attribute+NSAttributedString.swift

@@ -0,0 +1,54 @@
+//
+//  Attribute+NSAttributedString.swift
+//  
+//
+//  Created by rrbox on 2022/12/22.
+//
+
+#if os(macOS)
+import AppKit
+#elseif os(iOS)
+import UIKit
+#endif
+
+extension AttributeContext {
+    func attribute(_ attrString: inout AttributedString) {
+        attrString.foregroundColor = self.foregroundColor
+        attrString.font = Font(name: self.fontName, size: CGFloat(truncating: self.fontSize))
+        attrString.backgroundColor = self.backgroundColor
+
+    }
+}
+
+extension AttributeElement {
+    func modify(_ context: inout AttributeContext) {
+        switch self {
+        case let .fontName(value):
+            context.fontName = value
+        case let .fontSize(value):
+            context.fontSize = value
+        case let .foregroundColor(value):
+            context.foregroundColor = value
+        case let .backgroundColor(value):
+            context.backgroundColor = value
+        }
+    }
+}
+
+extension AttributeLink {
+    func modify(_ context: inout AttributeContext) {
+        switch self {
+        case let .single(element):
+            element.modify(&context)
+        case let .link(previous, element):
+            previous.modify(&context)
+            element.modify(&context)
+        }
+    }
+
+    func createContext() -> AttributeContext {
+        var result = AttributeContext()
+        self.modify(&result)
+        return result
+    }
+}

Sources/Tsumiji/AttributeLink.swift

@@ -0,0 +1,76 @@
+//
+//  Tsumiji.swift
+//
+//
+//  Created by rrbox on 2022/02/09.
+//
+
+#if os(macOS)
+import AppKit
+#elseif os(iOS)
+import UIKit
+#endif
+
+#if os(iOS)
+public typealias Font = UIFont
+public typealias Color = UIColor
+#elseif os(macOS)
+public typealias Font = NSFont
+public typealias Color = NSColor
+#endif
+
+struct AttributeContext {
+    var fontName: String = "HelveticaNeue-UltraLight"
+    var fontSize: NSNumber = NSNumber(value: 32)
+    var foregroundColor: Color = .white
+    var backgroundColor: Color = .clear
+}
+
+enum AttributeElement {
+    case fontName(String)
+    case fontSize(NSNumber)
+    case foregroundColor(Color)
+    case backgroundColor(Color)
+}
+
+indirect enum AttributeLink {
+    case single(AttributeElement)
+    case link(Self, AttributeElement)
+}
+
+public struct Attribute {
+    let body: AttributeLink
+    init(body: AttributeLink) {
+        self.body = body
+    }
+}
+
+public extension Attribute {
+    static func fontName(_ value: String) -> Attribute {
+        .init(body: .single(.fontName(value)))
+    }
+    static func fontSize(_ value: NSNumber) -> Attribute {
+        .init(body: .single(.fontSize(value)))
+    }
+    static func foregroundColor(_ value: Color) -> Attribute {
+        .init(body: .single(.foregroundColor(value)))
+    }
+    static func backgroundColor(_ value: Color) -> Attribute {
+        .init(body: .single(.backgroundColor(value)))
+    }
+}
+
+public extension Attribute {
+    func fontName(_ value: String) -> Attribute {
+        .init(body: .link(self.body, .fontName(value)))
+    }
+    func fontSize(_ value: NSNumber) -> Attribute {
+        .init(body: .link(self.body, .fontSize(value)))
+    }
+    func foregroundColor(_ value: Color) -> Attribute {
+        .init(body: .link(self.body, .foregroundColor(value)))
+    }
+    func backgroundColor(_ value: Color) -> Attribute {
+        .init(body: .link(self.body, .backgroundColor(value)))
+    }
+}

Sources/Tsumiji/Editor.swift

@@ -11,7 +11,7 @@ public struct Editor {
 
     public var product = AttributedString()
 
-    var stack = Stack(attrributeStack: [[:]])
+    var stack = ContextStack()
 
     public init() {}
 
@@ -21,13 +21,15 @@ public struct Editor {
 
     @discardableResult public func text(_ value: String) -> Self {
         var result = self
-        result.product.append(AttributedString(NSAttributedString(string: value, attributes: self.stack.getFirst().toNSAttribute())))
+        var attributedText = AttributedString(value)
+        self.stack.getFirst().attribute(&attributedText)
+        result.product += attributedText
         return result
     }
 
     @discardableResult public func font(_ value: Attribute) -> Self {
         var result = self
-        try! result.stack.add(attr: value)
+        result.stack.add(attr: value)
         return result
     }
 

Sources/Tsumiji/EditorLiteral.swift

@@ -15,23 +15,20 @@ public struct EditorInterpolation: StringInterpolationProtocol {
 
     var product: AttributedString
 
-    var stack = Stack(attrributeStack: [[:]])
+    var stack = ContextStack()
 
     public init(literalCapacity: Int, interpolationCount: Int) {
         self.product = AttributedString()
     }
 
     mutating public func appendLiteral(_ literal: String) {
-        self.product.append(AttributedString(
-            NSAttributedString(
-                string: literal,
-                attributes: self.stack
-                    .getFirst()
-                    .toNSAttribute())))
+        var arrtibutedText = AttributedString(literal)
+        self.stack.getFirst().attribute(&arrtibutedText)
+        self.product += arrtibutedText
     }
 
     mutating public func appendInterpolation(_ font: Attribute) {
-        try! self.stack.add(attr: font)
+        self.stack.add(attr: font)
     }
 
     mutating public func appendInterpolation(_ command: Command) {
@@ -46,12 +43,8 @@ public struct EditorLiteral: ExpressibleByStringLiteral, ExpressibleByStringInte
     public var product: AttributedString
 
     public init(stringLiteral value: String) {
-        self.product = AttributedString(
-            NSAttributedString(
-                string: value,
-                attributes: Stack(attrributeStack: [[:]])
-                    .getFirst()
-                    .toNSAttribute()))
+        self.product = AttributedString(value)
+        ContextStack().getFirst().attribute(&self.product)
     }
 
     public init(stringInterpolation: EditorInterpolation) {

Sources/Tsumiji/Stack.swift

@@ -0,0 +1,37 @@
+//
+//  Stack.swift
+//  
+//
+//  Created by rrbox on 2022/12/22.
+//
+
+struct ContextStack {
+    var attrributeStack: [AttributeContext] {
+        didSet {
+            if self.attrributeStack.count == 0 {
+                self.attrributeStack.append(.init())
+            }
+        }
+    }
+
+    mutating func add(attr: Attribute) {
+        if var previous = self.attrributeStack.first {
+            attr.body.modify(&previous)
+            self.attrributeStack.insert(previous, at: 0)
+        } else {
+            self.attrributeStack.insert(attr.body.createContext(), at: 0)
+        }
+    }
+
+    mutating func remove() {
+        self.attrributeStack.remove(at: 0)
+    }
+
+    func getFirst() -> AttributeContext {
+        self.attrributeStack[0]
+    }
+
+    init() {
+        self.attrributeStack = [AttributeContext()]
+    }
+}

Tests/TsumijiTests/TsumijiTests.swift

@@ -28,15 +28,12 @@ extension Color {
 }
 
 extension Attribute {
-    static let red: Self = [.fontColor: Color.red]
-    static let big: Self = [.fontSize: 50]
-    static let impact: Self = [.fontName: "times"]
-    static let blueBack: Self = [.backgroundColor: Color.blue]
+    static let red: Self = .foregroundColor(.red)
+    static let big: Self = .fontSize(50)
+    static let impact: Self = .fontName("times")
+    static let blueBack: Self = .backgroundColor(.blue)
 
-    static let bigRed: Self = [
-        .fontSize: 50,
-        .fontColor: Color.red
-    ]
+    static let bigRed: Self = .fontSize(50).foregroundColor(.red)
 }
 
 final class TsumijiTests: XCTestCase {