Optional generation of Images extension. Make extensionOutputPath optional for Images and Colors cause it's not needed if no extensionName are provided

Sources/ResgenSwift/Images/Images.swift

@@ -21,8 +21,6 @@ struct Images: ParsableCommand {
     // MARK: - Static
 
     static let toolName = "Images"
-    static let defaultExtensionName = "Image"
-    static let defaultExtensionNameUIKit = "UIImage"
 
     // MARK: - Command Options
 
@@ -55,23 +53,29 @@ struct Images: ParsableCommand {
         )
 
         // Generate extension
-        ImageExtensionGenerator.generateExtensionFile(
-            images: imagesToGenerate,
-            staticVar: options.staticMembers,
-            inputFilename: options.inputFilenameWithoutExt,
-            extensionName: options.extensionName,
-            extensionFilePath: options.extensionFilePath,
-            isSwiftUI: true
-        )
+        if let extensionName = options.extensionName,
+           let extensionFilePath = options.extensionFilePath {
+            ImageExtensionGenerator.generateExtensionFile(
+                images: imagesToGenerate,
+                staticVar: options.staticMembers,
+                inputFilename: options.inputFilenameWithoutExt,
+                extensionName: extensionName,
+                extensionFilePath: extensionFilePath,
+                isSwiftUI: true
+            )
+        }
 
-        ImageExtensionGenerator.generateExtensionFile(
-            images: imagesToGenerate,
-            staticVar: options.staticMembers,
-            inputFilename: options.inputFilenameWithoutExt,
-            extensionName: options.extensionNameUIKit,
-            extensionFilePath: options.extensionFilePathUIKit,
-            isSwiftUI: false
-        )
+        if let extensionNameUIKit = options.extensionNameUIKit,
+           let extensionFilePathUIKit = options.extensionFilePathUIKit {
+            ImageExtensionGenerator.generateExtensionFile(
+                images: imagesToGenerate,
+                staticVar: options.staticMembers,
+                inputFilename: options.inputFilenameWithoutExt,
+                extensionName: extensionNameUIKit,
+                extensionFilePath: extensionFilePathUIKit,
+                isSwiftUI: false
+            )
+        }
 
         print("[\(Self.toolName)] Images generated")
     }
@@ -96,17 +100,39 @@ struct Images: ParsableCommand {
         _ = Self.getSvgConverterPath()
 
         // Extension for UIKit and SwiftUI should have different name
-        guard options.extensionName != options.extensionNameUIKit else {
-            let error = ImagesError.extensionNamesCollision(options.extensionName)
-            print(error.description)
-            Self.exit(withError: error)
+        if let extensionName = options.extensionName,
+           let extensionNameUIKit = options.extensionNameUIKit {
+            guard extensionName != extensionNameUIKit else {
+                let error = ImagesError.extensionNamesCollision(extensionName)
+                print(error.description)
+                Self.exit(withError: error)
+            }
+        }
+
+        // If an extension need to be generated, ensure extensionOutputPath is defined
+        if options.extensionName != nil ||
+            options.extensionNameUIKit != nil {
+            guard let extensionOutputPath = options.extensionOutputPath,
+                    extensionOutputPath.isEmpty == false else {
+                let error = ImagesError.missingExtensionPath
+                print(error.description)
+                Self.exit(withError: error)
+            }
         }
 
         // Check if needed to regenerate
+        let fileToCompareToInput: String = {
+            // If there is no extension file to compare
+            // Then check the xcassets file instead
+            if let extensionFilePath = options.extensionFilePath {
+                return extensionFilePath
+            }
+            return options.xcassetsPath
+        }()
         guard GeneratorChecker.shouldGenerate(
             force: options.forceExecution,
             inputFilePath: options.inputFile,
-            extensionFilePath: options.extensionFilePath
+            extensionFilePath: fileToCompareToInput
         ) else {
             print("[\(Self.toolName)] Images are already up to date :) ")
             return false

Sources/ResgenSwift/Images/ImagesError.swift

@@ -18,6 +18,7 @@ enum ImagesError: Error {
     case magickConvertNotFound
     case writeFile(String, String)
     case createAssetFolder(String)
+    case missingExtensionPath
     case unknown(String)
 
     var description: String {
@@ -49,6 +50,9 @@ enum ImagesError: Error {
         case .createAssetFolder(let folder):
             return "error: [\(Colors.toolName)] An error occured while creating folder `\(folder)`"
 
+        case .missingExtensionPath:
+            return "error: [\(Colors.toolName)] Extension need to be generated but no `extensionOutputPath` is provided"
+
         case .unknown(let errorDescription):
             return "error: [\(Images.toolName)] Unknown error: \(errorDescription)"
         }

Sources/ResgenSwift/Images/ImagesOptions.swift

@@ -24,17 +24,17 @@ struct ImagesOptions: ParsableArguments {
     @Option(help: "Xcassets path where to generate images.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var xcassetsPath: String
 
-    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
-    var extensionOutputPath: String
-
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
 
-    @Option(help: "Extension name. If not specified, it will generate an Image extension.")
-    var extensionName: String = Images.defaultExtensionName
+    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    var extensionOutputPath: String?
 
-    @Option(help: "Extension name. If not specified, it will generate an UIImage extension.")
-    var extensionNameUIKit: String = Images.defaultExtensionNameUIKit
+    @Option(help: "Extension name. If not specified, no extension will be generated.")
+    var extensionName: String?
+
+    @Option(help: "Extension name. If not specified, no extension will be generated.")
+    var extensionNameUIKit: String?
 
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Image{extensionSuffix}.swift")
     var extensionSuffix: String?
@@ -46,28 +46,36 @@ extension ImagesOptions {
 
     // MARK: - SwiftUI
 
-    var extensionFileName: String {
+    var extensionFileName: String? {
+        guard let extensionName else { return nil }
+
         if let extensionSuffix {
             return "\(extensionName)+\(extensionSuffix).swift"
         }
         return "\(extensionName).swift"
     }
 
-    var extensionFilePath: String {
-        "\(extensionOutputPath)/\(extensionFileName)"
+    var extensionFilePath: String? {
+        guard let extensionOutputPath, let extensionFileName else { return nil }
+
+        return "\(extensionOutputPath)/\(extensionFileName)"
     }
 
     // MARK: - UIKit
 
-    var extensionFileNameUIKit: String {
+    var extensionFileNameUIKit: String? {
+        guard let extensionNameUIKit else { return nil }
+
         if let extensionSuffix {
             return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
         return "\(extensionNameUIKit).swift"
     }
 
-    var extensionFilePathUIKit: String {
-        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
+    var extensionFilePathUIKit: String? {
+        guard let extensionOutputPath, let extensionFileNameUIKit else { return nil }
+
+        return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
 
     // MARK: -