CommandLine support for Swift

Author: swhitty

CommandLine/CommandLine.swift

@@ -61,15 +61,23 @@ extension SwiftDraw.CommandLine {
   }
 
   static func process(with config: Configuration) throws -> Data {
-    guard
-      let svg = SwiftDraw.Image(fileURL: config.input),
-      let data = processImage(svg, with: config) else {
+    guard let data = processImage(config: config) else {
         throw Error.invalid
     }
-    
+
     return data
   }
-  
+
+  static func processImage(config: Configuration) -> Data? {
+    switch config.format {
+    case .swift:
+      let code = Image.cgCodeText(fileURL: config.input)
+      return code?.data(using: .utf8)
+    case .jpeg, .pdf, .png:
+      return SwiftDraw.Image(fileURL: config.input).flatMap { processImage($0, with: config) }
+    }
+  }
+
   static func processImage(_ image: SwiftDraw.Image, with config: Configuration) -> Data? {
     switch config.format {
     case .jpeg:
@@ -78,6 +86,8 @@ extension SwiftDraw.CommandLine {
       return try? Image.pdfData(fileURL: config.input, size: config.size.cgValue)
     case .png:
       return image.pngData(size: config.size.cgValue, scale: config.scale.cgValue)
+    case .swift:
+      preconditionFailure()
     }
   }
 
@@ -87,11 +97,11 @@ extension SwiftDraw.CommandLine {
 swiftdraw, version 0.7.6
 copyright (c) 2021 Simon Whitty
 
-usage: swiftdraw <file.svg> [--format png | pdf | jpeg] [--size wxh] [--scale 1x | 2x | 3x]
+usage: swiftdraw <file.svg> [--format png | pdf | jpeg | swift] [--size wxh] [--scale 1x | 2x | 3x]
 
 <file> svg file to be processed
 
---format  format to output image with png | pdf | jpeg
+--format  format to output image with png | pdf | jpeg | swift
 --size    size of output image e.g. 100x200
 --scale   scale of output image with 1x | 2x | 3x
 """)

SwiftDraw/CommandLine.Configuration.swift

@@ -45,6 +45,7 @@ extension CommandLine {
     case jpeg
     case pdf
     case png
+    case swift
   }
 
   public enum Size: Equatable {
@@ -158,6 +159,8 @@ private extension CommandLine.Format {
       return "pdf"
     case .png:
       return "png"
+    case .swift:
+      return "swift"
     }
   }
 }

SwiftDraw/Image+CGText.swift

@@ -34,15 +34,17 @@ import Foundation
 public extension Image {
 
   static func cgCodeText(named name: String, in bundle: Bundle = Bundle.main) -> String? {
-    guard
-      let url = bundle.url(forResource: name, withExtension: nil),
-      let svg = try? DOM.SVG.parse(fileURL: url) else {
-        return nil
-    }
+    guard let url = bundle.url(forResource: name, withExtension: nil) else { return nil }
+    return cgCodeText(fileURL: url)
+  }
 
-    return cgCodeText(url: url, svg: svg)
+  static func cgCodeText(fileURL: URL) -> String? {
+    guard let svg = try? DOM.SVG.parse(fileURL: fileURL) else {
+      return nil
+    }
+    return cgCodeText(url: fileURL, svg: svg)
   }
-    
+
   private static func cgCodeText(url: URL, svg: DOM.SVG) -> String {
     let layer = LayerTree.Builder(svg: svg).makeLayer()
     let size = LayerTree.Size(svg.width, svg.height)