Improved transform parameter handling.

Author: Jayden Smith

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.0.4 - 2020-10-14
+### Changed
+- Improved transform parameter handling
+
 ## 1.0.3 - 2020-10-14
 ### Fixed
 - Fixed mode parameter not being respected

composer.json

@@ -2,7 +2,7 @@
     "name": "tasdev-au/craft-graphql-srcset",
     "description": "Adds the @srcset GraphQL directive for generating a comma-separated list of image transforms.",
     "type": "craft-plugin",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "keywords": [
         "craft",
         "cms",

src/gql/arguments/SrcSet.php

@@ -41,7 +41,7 @@ public static function getArguments(): array
             'mode' => [
                 'name' => 'mode',
                 'type' => Type::string(),
-                'description' => 'The mode to use for the generated transform'
+                'description' => 'The mode to use for the generated transform.'
             ],
             'position' => [
                 'name' => 'position',
@@ -66,7 +66,7 @@ public static function getArguments(): array
             'immediately' => [
                 'name' => 'immediately',
                 'type' => Type::boolean(),
-                'description' => 'Whether the transforms should be generated immediately or only when the image is requested used the generated URL'
+                'description' => 'Whether the transform should be generated immediately or only when the image is requested used the generated URL'
             ],
         ];
     }

src/gql/directives/SrcSet.php

@@ -99,24 +99,14 @@ public static function apply($source, $value, array $arguments, ResolveInfo $res
         $transforms = [];
         foreach ($widths as $width) {
             if ($width <= $imageWidth) {
-                $transforms[] = [
-                    'width' => $width,
-                    'height' => isset($arguments['ratio']) ? round($width * floatval($arguments['ratio'])) : null,
-                    'mode' => isset($arguments['mode']) ? $arguments['mode'] : null,
-                    'format' => isset($arguments['format']) ? $arguments['format'] : null,
-                ];
+                $transforms[] = static::_generateTransform($width, $arguments);
             }
         }
 
         $lastWidth = end($widths);
         $lastTransform = end($transforms);
         if (!$lastTransform || ($lastTransform['width'] < $imageWidth && $imageWidth < $lastWidth)) {
-            $transforms[] = [
-                'width' => $imageWidth,
-                'height' => isset($arguments['ratio']) ? round($imageWidth * floatval($arguments['ratio'])) : null,
-                'mode' => isset($arguments['mode']) ? $arguments['mode'] : null,
-                'format' => isset($arguments['format']) ? $arguments['format'] : null,
-            ];
+            $transforms[] = static::_generateTransform($imageWidth, $arguments);
         }
 
         $urls = [];
@@ -127,4 +117,31 @@ public static function apply($source, $value, array $arguments, ResolveInfo $res
 
         return implode(', ', $urls);
     }
+
+    private static function _generateTransform($width, $arguments)
+    {
+        $transform = [
+            'width' => $width,
+            'height' => isset($arguments['ratio']) ? round($width * floatval($arguments['ratio'])) : null,
+            'format' => isset($arguments['format']) ? $arguments['format'] : null,
+        ];
+
+        if (isset($arguments['mode'])) {
+            $transform['mode'] = $arguments['mode'];
+        }
+
+        if (isset($arguments['position'])) {
+            $transform['position'] = $arguments['position'];
+        }
+
+        if (isset($arguments['interlace'])) {
+            $transform['interlace'] = $arguments['interlace'];
+        }
+
+        if (isset($arguments['quality'])) {
+            $transform['quality'] = $arguments['quality'];
+        }
+
+        return $transform;
+    }
 }