wip

Sources/CliDoc2/Modifiers/ColorModifier.swift

@@ -0,0 +1,24 @@
+import Rainbow
+
+public extension TextNode {
+  @inlinable
+  func color(_ color: NamedColor) -> some TextNode {
+    modifier(ColorModifier(color: color))
+  }
+}
+
+@usableFromInline
+struct ColorModifier<Content: TextNode>: NodeModifier {
+  @usableFromInline
+  let color: NamedColor
+
+  @usableFromInline
+  init(color: NamedColor) {
+    self.color = color
+  }
+
+  @usableFromInline
+  func render(content: Content) -> some TextNode {
+    content.render().applyingColor(color)
+  }
+}

Sources/CliDoc2/Modifiers/LabelStyleModifier.swift

@@ -1,31 +1,16 @@
 import Rainbow
 
 public extension TextNode {
-
-  @inlinable
-  func labelStyle(color: NamedColor? = nil, styles: Style...) -> some TextNode {
-    labelStyle(color: color, styles: styles)
-  }
-
-  @inlinable
-  func labelStyle(color: NamedColor? = nil, styles: [Style]) -> some TextNode {
+  func labelStyle<C: TextNode>(color: NamedColor? = nil, styles: [Style] = []) -> some TextNode where Self == Label<C> {
     modifier(LabelStyle(color: color, styles: styles))
   }
-}
 
-public extension ModifiedNode where Self: TextNode {
-  @inlinable
-  func labelStyle<M: NodeModifier>(
-    color: NamedColor? = nil, styles: Style...
-  ) -> some TextNode where
-    Modifier.Body == Content,
-    M.Content == Modifier.Body
-  {
-    apply(LabelStyle<Content>(color: color, styles: styles))
+  func labelStyle<C: TextNode>(color: NamedColor? = nil, styles: Style...) -> some TextNode where Self == Label<C> {
+    labelStyle(color: color, styles: styles)
   }
 }
 
-public struct LabelStyle<Content: TextNode>: NodeModifier {
+public struct LabelStyle<C: TextNode>: NodeModifier {
   @usableFromInline
   let color: NamedColor?
 
@@ -39,50 +24,12 @@ public struct LabelStyle<Content: TextNode>: NodeModifier {
   }
 
   @inlinable
-  public func render(content: Content) -> some TextNode {
-    print("Handling node: \(type(of: content))")
-    return handleNode(content)
-  }
-
-  @TextBuilder
-  @usableFromInline
-  func handleNode<N: TextNode>(_ content: N) -> some TextNode {
-    if let label = content as? Label {
-      handleLabel(label)
-    } else if let container = content as? NodeContainer {
-      handleContainer(container)
-    } else if let group = content as? Group {
-      handleGroup(group)
-    } else {
-      content
-    }
-  }
-
-  @usableFromInline
-  func handleLabel(_ label: Label) -> Label {
-    var label = label
+  public func render(content: Label<C>) -> some TextNode {
+    var label: any TextNode = content.content
+    label = label.style(styles)
     if let color {
-      label.node = label.node.color(color)
+      label = label.color(color)
     }
-    label.node = label.node.style(styles)
-    return label
-  }
-
-  @usableFromInline
-  func handleContainer(_ container: NodeContainer) -> NodeContainer {
-    var container = container
-    for (idx, node) in container.nodes.enumerated() {
-      container.nodes[idx] = handleNode(node)
-    }
-    return container
-  }
-
-  @usableFromInline
-  func handleGroup(_ group: Group) -> Group {
-    var group = group
-    for (idx, node) in group.content.enumerated() {
-      group.content[idx] = handleNode(node)
-    }
-    return group
+    return Label { label.eraseToAnyTextNode() }
   }
 }

Sources/CliDoc2/Modifiers/StyleModifier.swift

@@ -0,0 +1,32 @@
+import Rainbow
+
+public extension TextNode {
+  @inlinable
+  func style(_ styles: Style...) -> some TextNode {
+    modifier(StyleModifier(styles: styles))
+  }
+
+  @inlinable
+  func style(_ styles: [Style]) -> some TextNode {
+    modifier(StyleModifier(styles: styles))
+  }
+}
+
+@usableFromInline
+struct StyleModifier<Content: TextNode>: NodeModifier {
+
+  @usableFromInline
+  let styles: [Style]
+
+  @usableFromInline
+  init(styles: [Style]) {
+    self.styles = styles
+  }
+
+  @usableFromInline
+  func render(content: Content) -> some TextNode {
+    styles.reduce(content.render()) {
+      $0.applyingStyle($1)
+    }
+  }
+}