default ColorConverter

Author: swhitty

SwiftDraw/CGTextRenderer+Code.swift

@@ -108,7 +108,7 @@ public extension CGTextRenderer {
 
         let optimizer = LayerTree.CommandOptimizer<CGTextTypes>(options: [.skipRedundantState, .skipInitialSaveState])
         let commands = optimizer.optimizeCommands(
-            generator.renderCommands(for: layer)
+            generator.renderCommands(for: layer, colorConverter: .default)
         )
 
         let renderer = CGTextRenderer(api: api,

SwiftDraw/LayerTree.Color.swift

@@ -158,6 +158,10 @@ struct DefaultColorConverter: ColorConverter {
   }
 }
 
+extension ColorConverter where Self == DefaultColorConverter {
+    static var `default`: DefaultColorConverter { DefaultColorConverter() }
+}
+
 struct LuminanceColorConverter: ColorConverter {
   func createColor(from color: LayerTree.Color) -> LayerTree.Color {
     switch color {
@@ -170,3 +174,7 @@ struct LuminanceColorConverter: ColorConverter {
     }
   }
 }
+
+extension ColorConverter where Self == LuminanceColorConverter {
+    static var luminance: LuminanceColorConverter { LuminanceColorConverter() }
+}

SwiftDraw/LayerTree.CommandGenerator.swift

@@ -52,18 +52,17 @@ extension LayerTree {
             self.options = options
         }
 
-        func renderCommands(for layer: Layer, colorConverter: ColorConverter = DefaultColorConverter()) -> [RendererCommand<P.Types>] {
+        func renderCommands(for layer: Layer, colorConverter: any ColorConverter) -> [RendererCommand<P.Types>] {
+            var commands = [RendererCommand<P.Types>]()
 
             let state = makeCommandState(for: layer, colorConverter: colorConverter)
 
-            guard state.hasContents else { return [] }
+            guard state.hasContents else { return commands }
 
             if state.hasFilters {
                 logUnsupportedFilters(layer.filters)
             }
 
-            var commands = [RendererCommand<P.Types>]()
-
             if state.hasOpacity || state.hasTransform || state.hasClip || state.hasMask {
                 commands.append(.pushState)
             }
@@ -137,7 +136,7 @@ extension LayerTree {
             )
         }
 
-        func renderCommands(for contents: Layer.Contents, colorConverter: ColorConverter) -> [RendererCommand<P.Types>] {
+        func renderCommands(for contents: Layer.Contents, colorConverter: any ColorConverter) -> [RendererCommand<P.Types>] {
             switch makeRenderContents(for: contents, colorConverter: colorConverter) {
             case .simple(let commands):
                 return commands
@@ -379,7 +378,7 @@ extension LayerTree {
             commands.append(.setBlend(mode: copy))
             //commands.append(contentsOf: renderCommands(forClip: layer.clip))
             let drawMask = layer.contents.flatMap{
-                renderCommands(for: $0, colorConverter: LuminanceColorConverter())
+                renderCommands(for: $0, colorConverter: .luminance)
             }
             commands.append(contentsOf: drawMask)
             commands.append(.popTransparencyLayer)

SwiftDraw/SVG.swift

@@ -150,7 +150,7 @@ extension SVG {
 
         let optimizer = LayerTree.CommandOptimizer<CGTypes>()
         commands = optimizer.optimizeCommands(
-            generator.renderCommands(for: layer)
+            generator.renderCommands(for: layer, colorConverter: .default)
         )
     }
 }

SwiftDrawTests/LayerTree.CommandGeneratorTests.swift

@@ -35,7 +35,7 @@ final class LayerTreeCommandGeneratorTests: XCTestCase {
         let svg = try DOM.SVG.parse(fileNamed: "shapes.svg", in: .test)
         let layer = LayerTree.Builder(svg: svg).makeLayer()
         let generator = LayerTree.CommandGenerator(provider: LayerTreeProvider(), size: .zero, options: .default)
-        let commands = generator.renderCommands(for: layer)
+        let commands = generator.renderCommands(for: layer, colorConverter: .default)
 
         XCTAssertEqual(
             commands.count,