Add new Flag to every command to choose if we want to generate static members or not

Sources/ResgenSwift/Images/Generator/XcassetsGenerator.swift

@@ -148,7 +148,7 @@ class XcassetsGenerator {
     // MARK: - Helpers: bypass generation
     
     private func shouldBypassGeneration(for image: ParsedImage, xcassetImagePath: String) -> Bool {
-        guard forceGeneration == false else {
+        if forceGeneration {
             return false
         }
         

Sources/ResgenSwift/Images/Images.swift

@@ -23,16 +23,6 @@ struct Images: ParsableCommand {
     static let toolName = "Images"
     static let defaultExtensionName = "UIImage"
     
-    // MARK: - Properties
-    
-    var extensionFileName: String { "\(options.extensionName)+\(options.extensionSuffix).swift" }
-    var extensionFilePath: String { "\(options.extensionOutputPath)/\(extensionFileName)" }
-    var inputFilenameWithoutExt: String {
-        URL(fileURLWithPath: options.inputFile)
-            .deletingPathExtension()
-            .lastPathComponent
-    }
-    
     // MARK: - Command Options
     
     @OptionGroup var options: ImagesOptions
@@ -54,6 +44,7 @@ struct Images: ParsableCommand {
         let inputFolder = URL(fileURLWithPath: options.inputFile)
             .deletingLastPathComponent()
             .relativePath
+        
         let xcassetsGenerator = XcassetsGenerator(forceGeneration: options.forceExecutionAndGeneration)
         xcassetsGenerator.generateXcassets(inputPath: inputFolder,
                                            imagesToGenerate: imagesToGenerate,
@@ -61,10 +52,10 @@ struct Images: ParsableCommand {
         
         // Generate extension
         ImageExtensionGenerator.writeStringsFiles(images: imagesToGenerate,
-                                                  staticVar: options.extensionName == Self.defaultExtensionName,
-                                                  inputFilename: inputFilenameWithoutExt,
+                                                  staticVar: options.staticMembers,
+                                                  inputFilename: options.inputFilenameWithoutExt,
                                                   extensionName: options.extensionName,
-                                                  extensionFilePath: extensionFilePath)
+                                                  extensionFilePath: options.extensionFilePath)
         
         
         print("[\(Self.toolName)] Images generated")
@@ -90,7 +81,9 @@ struct Images: ParsableCommand {
         _ = Images.getSvgConverterPath()
 
         // Check if needed to regenerate
-        guard GeneratorChecker.shouldGenerate(force: options.forceExecution, inputFilePath: options.inputFile, extensionFilePath: extensionFilePath) else {
+        guard GeneratorChecker.shouldGenerate(force: options.forceExecution,
+                                              inputFilePath: options.inputFile,
+                                              extensionFilePath: options.extensionFilePath) else {
             print("[\(Self.toolName)] Images are already up to date :) ")
             return false
         }

Sources/ResgenSwift/Images/ImagesOptions.swift

@@ -24,18 +24,33 @@ struct ImagesOptions: ParsableArguments {
     @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 UIImage extension. Using default extension name will generate static property.")
     var extensionName: String = Images.defaultExtensionName
     
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Image{extensionSuffix}.swift")
-    var extensionSuffix: String = ""
+    var extensionSuffix: String?
 }
 
+// MARK: - Computed var
 
-/*
- swift run -c release Imagium $FORCE_FLAG "./Images/sampleImages.txt" \
-    --xcassets-path "./Images/imagium.xcassets" \
-    --extension-output-path "./Images/Generated" \
-    --extension-name "UIImage" \
-    --extension-suffix "GenAllScript"
- */
+extension ImagesOptions {
+    var extensionFileName: String {
+        if let extensionSuffix = extensionSuffix {
+            return "\(extensionName)+\(extensionSuffix).swift"
+        }
+        return "\(extensionName).swift"
+    }
+    
+    var extensionFilePath: String {
+        "\(extensionOutputPath)/\(extensionFileName)"
+    }
+    
+    var inputFilenameWithoutExt: String {
+        URL(fileURLWithPath: inputFile)
+            .deletingPathExtension()
+            .lastPathComponent
+    }
+}