Adding --hideUnsupportedFilters

Author: swhitty

CommandLine/CommandLine.swift

@@ -71,10 +71,10 @@ extension SwiftDraw.CommandLine {
     static func processImage(config: Configuration) -> Data? {
         switch config.format {
         case .swift:
-            let code = CGTextRenderer.render(fileURL: config.input, size: config.size.renderSize)
+            let code = CGTextRenderer.render(fileURL: config.input, size: config.size.renderSize, options: config.options)
             return code?.data(using: .utf8)
         case .jpeg, .pdf, .png:
-            return SwiftDraw.Image(fileURL: config.input).flatMap { processImage($0, with: config) }
+            return SwiftDraw.Image(fileURL: config.input, options: config.options).flatMap { processImage($0, with: config) }
         }
     }
 

SwiftDraw/CGTextRenderer+Code.swift

@@ -35,12 +35,12 @@ public extension CGTextRenderer {
 
     typealias Size = (width: Int, height: Int)
 
-    static func render(named name: String, in bundle: Bundle = Bundle.main, size: Size? = nil) -> String? {
+    static func render(named name: String, in bundle: Bundle = Bundle.main, size: Size? = nil, options: Image.Options) -> String? {
         guard let url = bundle.url(forResource: name, withExtension: nil) else { return nil }
-        return render(fileURL: url, size: size)
+        return render(fileURL: url, size: size, options: options)
     }
 
-    static func render(fileURL: URL, size: Size? = nil) -> String? {
+    static func render(fileURL: URL, size: Size? = nil, options: Image.Options) -> String? {
         guard let svg = try? DOM.SVG.parse(fileURL: fileURL) else {
             return nil
         }
@@ -54,13 +54,13 @@ public extension CGTextRenderer {
             .capitalized
             .replacingOccurrences(of: " ", with: "")
 
-        return cgCodeText(name: identifier, svg: svg, size: size)
+        return cgCodeText(name: identifier, svg: svg, size: size, options: options)
     }
 
-    static func render(data: Data) throws -> String {
+    static func render(data: Data, options: Image.Options) throws -> String {
         let svg = try DOM.SVG.parse(data: data)
         let size = makeSize(svg: svg, size: nil)
-        return cgCodeText(name: "Image", svg: svg, size: size)
+        return cgCodeText(name: "Image", svg: svg, size: size, options: options)
     }
 
     static func renderPath(from svgPath: String) throws -> String {
@@ -76,11 +76,12 @@ public extension CGTextRenderer {
         return LayerTree.Size(LayerTree.Float(size.width), LayerTree.Float(size.height))
     }
 
-    private static func cgCodeText(name: String, svg: DOM.SVG, size: LayerTree.Size) -> String {
+    private static func cgCodeText(name: String, svg: DOM.SVG, size: LayerTree.Size, options: Image.Options) -> String {
         let layer = LayerTree.Builder(svg: svg).makeLayer()
         let commandSize = LayerTree.Size(svg.width, svg.height)
         let generator = LayerTree.CommandGenerator(provider: CGTextProvider(),
-                                                   size: commandSize)
+                                                   size: commandSize,
+                                                   options: options)
 
         let optimizer = LayerTree.CommandOptimizer<CGTextTypes>(options: [.skipRedundantState, .skipInitialSaveState])
         let commands = optimizer.optimizeCommands(

SwiftDraw/CommandLine.Arguments.swift

@@ -33,53 +33,62 @@ import Foundation
 
 extension CommandLine {
 
-  enum Modifier: String {
-    case format
-    case output
-    case size
-    case scale
+    enum Modifier: String {
+        case format
+        case output
+        case size
+        case scale
+        case hideUnsupportedFilters
 
-    static func parse(from string: String) -> Modifier? {
-      guard string.hasPrefix("--") else {
-        return nil
-      }
-
-      return Modifier(rawValue: String(string.dropFirst(2)))
+        var hasValue: Bool {
+            self != .hideUnsupportedFilters
+        }
     }
-  }
 
-  static func parseModifiers(from args: [String]) throws -> [Modifier: String] {
-    var args = args
-    var modifiers = [Modifier: String]()
-    while let pair = args.takePair() {
-      if let modifier = Modifier.parse(from: pair.0), modifiers.keys.contains(modifier) == false  {
-        modifiers[modifier] = pair.1
-      } else {
-        throw Error.invalid
-      }
-    }
+    static func parseModifiers(from args: [String]) throws -> [Modifier: String?] {
+        var args = args
+        var modifiers = [Modifier: String?]()
+        while let pair = try args.takeModifier() {
+            if modifiers.keys.contains(pair.0) == false  {
+                modifiers[pair.0] = pair.1
+            } else {
+                throw Error.invalid
+            }
+        }
 
-    guard args.isEmpty else {
-      throw CommandLine.Error.invalid
-    }
+        guard args.isEmpty else {
+            throw CommandLine.Error.invalid
+        }
 
-    return modifiers
-  }
+        return modifiers
+    }
 
-  public enum Error: Swift.Error {
-    case invalid
-  }
+    public enum Error: Swift.Error {
+        case invalid
+    }
 }
 
 private extension Array where Element == String {
 
-  mutating func takePair() -> (String, String)? {
-    guard count > 1 else {
-      return nil
-    }
+    mutating func takeModifier() throws -> (CommandLine.Modifier, String?)? {
+        guard !isEmpty else {
+            return nil
+        }
 
-    let pair = (self[0], self[1])
-    removeFirst(2)
-    return pair
-  }
+        guard self[0].hasPrefix("--"),
+              let modifier = CommandLine.Modifier(rawValue: String(self[0].dropFirst(2))) else {
+            throw CommandLine.Error.invalid
+        }
+
+        if modifier.hasValue {
+            guard count > 1 else {
+                throw CommandLine.Error.invalid
+            }
+            defer { removeFirst(2) }
+            return (modifier, self[1])
+        } else {
+            removeFirst(1)
+            return (modifier, nil)
+        }
+    }
 }