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

Sources/ResgenSwift/Colors/Colors.swift

@@ -24,19 +24,6 @@ struct Colors: ParsableCommand {
     static let defaultExtensionName = "UIColor"
     static let assetsColorsFolderName = "Colors"
     
-    // MARK: - Properties
-    
-    var extensionFileName: String {
-        if options.extensionSuffix.isEmpty == false {
-            return "\(options.extensionName)+\(options.extensionSuffix).swift"
-        }
-        return "\(options.extensionName).swift"
-    }
-    var extensionFilePath: String { "\(options.extensionOutputPath)/\(extensionFileName)" }
-    var generateStaticVariable: Bool {
-        options.extensionName == Self.defaultExtensionName
-    }
-    
     // MARK: - Command options
     
     @OptionGroup var options: ColorsToolOptions
@@ -65,9 +52,9 @@ struct Colors: ParsableCommand {
         
         // Generate extension
         ColorExtensionGenerator.writeExtensionFile(colors: parsedColors,
-                                                   staticVar: generateStaticVariable,
+                                                   staticVar: options.staticMembers,
                                                    extensionName: options.extensionName,
-                                                   extensionFilePath: extensionFilePath)
+                                                   extensionFilePath: options.extensionFilePath)
         
         print("[\(Self.toolName)] Colors generated")
     }
@@ -92,7 +79,9 @@ struct Colors: ParsableCommand {
         }
         
         // Check if needed to regenerate
-        guard GeneratorChecker.shouldGenerate(force: options.forceGeneration, inputFilePath: options.inputFile, extensionFilePath: extensionFilePath) else {
+        guard GeneratorChecker.shouldGenerate(force: options.forceGeneration,
+                                              inputFilePath: options.inputFile,
+                                              extensionFilePath: options.extensionFilePath) else {
             print("[\(Self.toolName)] Colors are already up to date :) ")
             return false
         }

Sources/ResgenSwift/Colors/ColorsToolOptions.swift

@@ -24,15 +24,31 @@ struct ColorsToolOptions: 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 UIColor extension. Using default extension name will generate static property.")
     var extensionName: String = Colors.defaultExtensionName
     
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+ColorsMyApp.swift")
-    var extensionSuffix: String = ""
+    var extensionSuffix: String?
 }
 
+// MARK: - Computed var
+
 extension ColorsToolOptions {
     var colorStyle: ColorStyle {
         ColorStyle(rawValue: style) ?? .all
     }
+    
+    var extensionFileName: String {
+        if let extensionSuffix = extensionSuffix {
+            return "\(extensionName)+\(extensionSuffix).swift"
+        }
+        return "\(extensionName).swift"
+    }
+    
+    var extensionFilePath: String {
+        "\(extensionOutputPath)/\(extensionFileName)"
+    }
 }

Sources/ResgenSwift/Colors/Parser/ColorFileParser.swift

@@ -18,6 +18,7 @@ class ColorFileParser {
             // Required format:
             // colorName="#RGB/#ARGB", colorName "#RGB/#ARGB", colorName "#RGB/#ARGB" "#RGB/#ARGB"
             let colorLineCleanedUp = colorLine
+                .removeLeadingWhitespace()
                 .removeTrailingWhitespace()
                 .replacingOccurrences(of: "=", with: "") // Keep compat with current file format