Fixed bug where Size Class names were not correctly added to ExportableImages

Author: Cordt

Sources/ResponsivePublishPlugin/ImageResource.swift

@@ -63,6 +63,10 @@ struct ImageConfiguration {
         self.targetExtension = targetExtension
         self.targetSizes = targetSizes
     }
+    
+    func fileName(for sizeClass: SizeClass) -> String {
+        "\(self.fileName)-\(sizeClass.fileSuffix)"
+    }
 }
 
 struct ExportableImage {
@@ -137,7 +141,7 @@ func rewrites(from source: Path, to target: Path, for config: ImageConfiguration
     config.targetSizes.map { size in
         ImageRewrite(
             source: .init(path: source, fileName: config.fileName, extension: config.extension),
-            target: .init(path: target, fileName: "\(config.fileName)-\(size.fileSuffix)", extension: config.targetExtension),
+            target: .init(path: target, fileName: config.fileName(for: size), extension: config.targetExtension),
             targetSizeClass: size
         )
     }

Sources/ResponsivePublishPlugin/ResponsivePublishPlugin+Environment.swift

@@ -22,10 +22,10 @@ struct Environment {
         return Environment { configs in
             return Parallel<[ExportableImage]> {
                 let images = configs.reduce([ExportableImage]()) { current, config in
-                    current + config.targetSizes.compactMap { size in
-                        guard let image = Image(width: size.upperBound / 2, height: size.upperBound) else { return nil }
+                    current + config.targetSizes.compactMap { sizeClass in
+                        guard let image = Image(width: sizeClass.upperBound / 2, height: sizeClass.upperBound) else { return nil }
                         return ExportableImage(
-                            name: config.fileName,
+                            name: config.fileName(for: sizeClass),
                             extension: .webp,
                             image: image
                         )
@@ -46,7 +46,7 @@ fileprivate func reducedImaged(for configurations: [ImageConfiguration]) -> Para
                 let targetSize = sizeThatFits(for: image.size, within: sizeClass.upperBound)
                 guard let resizedImage = image.resizedTo(width: targetSize.width, height: targetSize.height) else { return nil }
                 return ExportableImage(
-                    name: config.fileName,
+                    name: config.fileName(for: sizeClass),
                     extension: config.targetExtension,
                     image: resizedImage
                 )

Tests/ResponsivePublishPluginTests/ResponsivePublishPluginTests.swift

@@ -179,4 +179,29 @@ final class ResponsivePublishPluginTests: XCTestCase {
 
         XCTAssertEqual(output, expected)
     }
+    
+    func testImagesForSizeClassesAreCreated() throws {
+        try TestWebsite().publish(
+            at: Self.testDirPath,
+            using: [
+                .copyResources(),
+                .installPlugin(
+                    .generateOptimizedImages(
+                        from: resourcesFolderPath.appendingComponent("img"),
+                        at: Path("img-optimized"),
+                        rewriting: Path("css/styles.css")
+                    )
+                )
+            ]
+        )
+        
+        let output = try? outputFolder?
+            .subfolder(at: "img-optimized")
+            .files
+            .names()
+            .sorted()
+        
+        XCTAssertEqual(output?.count, 4)
+        XCTAssertEqual(output, ["background-extra-small.webp", "background-large.webp", "background-normal.webp", "background-small.webp"])
+    }
 }