feat: Define ImageRenderer and separate build logic and render logic …

…in generating image.
fummicc1 · Oct 16, 2024 · f9fc8e7 · f9fc8e7
1 parent c4a3acd
commit f9fc8e7
Show file tree

Hide file tree

Showing 6 changed files with 188 additions and 274 deletions.
diff --git a/...ImageApp/Csv2ImageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...ImageApp/Csv2ImageApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Sources/Csv2ImgCore/Csv.swift b/Sources/Csv2ImgCore/Csv.swift
@@ -507,45 +507,32 @@ extension Csv {
         }
         if let maker = maker as? ImageMaker {
             if let fontSize = fontSize {
-                maker.set(
-                    fontSize: fontSize
-                )
+                maker.set(fontSize: fontSize)
             }
-            let exportable: any CsvExportable = try await withCheckedThrowingContinuation {
+            let image: CGImage = try await withCheckedThrowingContinuation {
                 continuation in
                 queue.async { [weak self] in
                     guard let self = self else {
-                        continuation.resume(
-                            throwing: Csv.Error.underlying(
-                                nil
-                            )
-                        )
+                        continuation.resume(throwing: Csv.Error.underlying(nil))
                         return
                     }
                     Task {
                         do {
-                            let img = try maker.make(
+                            let image = try maker.make(
                                 columns: await self.columns,
                                 rows: await self.rows
                             ) { progress in
                                 self.progressSubject.value = progress
                             }
-                            continuation.resume(
-                                returning: img
-                            )
+                            continuation.resume(returning: image)
                         } catch {
-                            continuation.resume(
-                                throwing: Csv.Error.underlying(
-                                    error
-                                )
-                            )
+                            continuation.resume(throwing: Csv.Error.underlying(error))
                         }
                     }
                 }
             }
-            return AnyCsvExportable(
-                exportable
-            )
+
+            return AnyCsvExportable(image)
         } else if let maker = maker as? PdfMaker {
             if let fontSize = fontSize {
                 maker.set(

diff --git a/Sources/Csv2ImgCore/CsvError.swift b/Sources/Csv2ImgCore/CsvError.swift
@@ -34,6 +34,8 @@ extension Csv {
         case emptyData
         /// Csv denied execution because it is generating another contents.
         case workInProgress
+        /// Failed to render image from `CsvImageRepresentation`.
+        case failedToRenderImage
         case underlying(
             Swift.Error?
         )

diff --git a/Sources/Csv2ImgCore/CsvImageRepresentation.swift b/Sources/Csv2ImgCore/CsvImageRepresentation.swift
@@ -0,0 +1,22 @@
+import CoreGraphics
+import Foundation
+
+public struct CsvImageRepresentation: Equatable {
+    let width: Int
+    let height: Int
+    let backgroundColor: CGColor
+    let fontSize: CGFloat
+    let columns: [ColumnRepresentation]
+    let rows: [RowRepresentation]
+
+    struct ColumnRepresentation: Equatable {
+        let name: String
+        let style: Csv.Column.Style
+        let frame: CGRect
+    }
+
+    struct RowRepresentation: Equatable {
+        let values: [String]
+        let frames: [CGRect]
+    }
+}