SVG+Hashable

Author: swhitty

SwiftDraw/Renderer.CGText.swift

@@ -37,7 +37,7 @@ struct CGTextTypes: RendererTypes {
   typealias Rect = String
   typealias Color = String
   typealias Gradient = LayerTree.Gradient
-  typealias Mask = [Any]
+  typealias Mask = [AnyHashable]
   typealias Path = [LayerTree.Shape]
   typealias Pattern = String
   typealias Transform = String
@@ -513,7 +513,7 @@ public final class CGTextRenderer: Renderer {
     }
   }
 
-  func setClip(mask: [Any], frame: String) {
+  func setClip(mask: [AnyHashable], frame: String) {
     lines.append("ctx.clip(to: \(frame), mask: \(mask))")
   }
 

SwiftDraw/Renderer.CoreGraphics.swift

@@ -56,7 +56,7 @@ struct CGTypes: RendererTypes {
     typealias Image = CGImage
 }
 
-final class CGTransformingPattern: Equatable {
+struct CGTransformingPattern: Hashable {
 
     let bounds: CGRect
     let contents: [RendererCommand<CGTypes>]
@@ -70,10 +70,6 @@ final class CGTransformingPattern: Equatable {
         let renderer = CGRenderer(context: ctx)
         renderer.perform(contents)
     }
-
-    static func == (lhs: CGTransformingPattern, rhs: CGTransformingPattern) -> Bool {
-        lhs === rhs
-    }
 }
 
 struct CGProvider: RendererTypeProvider {

SwiftDraw/Renderer.LayerTree.swift

@@ -37,7 +37,7 @@ struct LayerTreeTypes: RendererTypes {
   typealias Rect = LayerTree.Rect
   typealias Color = LayerTree.Color
   typealias Gradient = LayerTree.Gradient
-  typealias Mask = [Any]
+  typealias Mask = [AnyHashable]
   typealias Path = [LayerTree.Shape]
   typealias Pattern = LayerTree.Pattern
   typealias Transform = LayerTree.Transform

SwiftDraw/Renderer.swift

@@ -37,7 +37,7 @@ protocol RendererTypes {
     associatedtype Rect: Equatable
     associatedtype Color: Equatable
     associatedtype Gradient: Equatable
-    associatedtype Mask
+    associatedtype Mask: Equatable
     associatedtype Path: Equatable
     associatedtype Pattern: Equatable
     associatedtype Transform: Equatable
@@ -200,3 +200,11 @@ enum RendererCommand<Types: RendererTypes> {
     case pushTransparencyLayer
     case popTransparencyLayer
 }
+
+
+#if canImport(CoreGraphics)
+import CoreGraphics
+
+extension RendererCommand<CGTypes>: Equatable { }
+extension RendererCommand<CGTypes>: Hashable { }
+#endif

SwiftDraw/SVG.swift

@@ -34,7 +34,7 @@ import Foundation
 #if canImport(CoreGraphics)
 import CoreGraphics
 
-public struct SVG {
+public struct SVG: Hashable {
     public let size: CGSize
 
     //An Image is simply an array of CoreGraphics draw commands

SwiftDrawTests/MockRenderer.swift

@@ -102,7 +102,7 @@ final class MockRenderer: Renderer {
     operations.append("setClip")
   }
 
-  func setClip(mask: [Any], frame: LayerTree.Rect) {
+  func setClip(mask: [AnyHashable], frame: LayerTree.Rect) {
     operations.append("setClipMask")
   }