Add som units tests (split some code to made some part testable)

Sources/ResgenSwift/Colors/Colors.swift

@@ -108,16 +108,3 @@ struct Colors: ParsableCommand {
         }
     }
 }
-
-/*
- Command samples:
- 
- 1. UIColor extension without suffix
- swift run -c release ColorToolCore -f ./SampleFiles/Colors/sampleColors1.txt --style all --xcassets-path "./SampleFiles/Colors/colors.xcassets" --extension-output-path "./SampleFiles/Colors/Generated/" --extension-name "UIColor"
- 
- 2. UIColor extension with custom suffix
- swift run -c release ColorToolCore -f ./SampleFiles/Colors/sampleColors1.txt --style all --xcassets-path "./SampleFiles/Colors/colors.xcassets" --extension-output-path "./SampleFiles/Colors/Generated/" --extension-name "UIColor" --extension-suffix "SampleApp"
- 
- 3. Custom extension with only light theme colors (R2Color)
- swift run -c release ColorToolCore -f ./SampleFiles/Colors/sampleColors1.txt --style light --xcassets-path "./SampleFiles/Colors/colors.xcassets" --extension-output-path "./SampleFiles/Colors/Generated/" --extension-name "R2Color"
- */

Sources/ResgenSwift/Colors/Generator/ColorExtensionGenerator.swift

@@ -15,12 +15,9 @@ struct ColorExtensionGenerator {
     
     static func writeExtensionFile(colors: [ParsedColor], staticVar: Bool, extensionName: String, extensionFilePath: String) {
         // Create extension content
-        let extensionContent = [
-            Self.getHeader(extensionClassname: extensionName),
-            Self.getProperties(for: colors, withStaticVar: staticVar),
-            Self.getFooter()
-        ]
-            .joined(separator: "\n")
+        let extensionContent = Self.getExtensionContent(colors: colors,
+                                                        staticVar: staticVar,
+                                                        extensionName: extensionName)
         
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@@ -33,6 +30,15 @@ struct ColorExtensionGenerator {
         }
     }
     
+    static func getExtensionContent(colors: [ParsedColor], staticVar: Bool, extensionName: String) -> String {
+        [
+            Self.getHeader(extensionClassname: extensionName),
+            Self.getProperties(for: colors, withStaticVar: staticVar),
+            Self.getFooter()
+        ]
+            .joined(separator: "\n")
+    }
+    
     private static func getHeader(extensionClassname: String) -> String {
         """
         // Generated by ResgenSwift.\(Colors.toolName) \(ResgenSwiftVersion)

Sources/ResgenSwift/Colors/Parser/ColorFileParser.swift

@@ -14,37 +14,43 @@ class ColorFileParser {
         let colorsByLines = inputFileContent.components(separatedBy: CharacterSet.newlines)
         
         // Iterate on each line of input file
-        return colorsByLines.enumerated().compactMap { lineNumber, colorLine in
-            // 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
-            
-            guard colorLineCleanedUp.hasPrefix("#") == false, colorLineCleanedUp.isEmpty == false else {
-                // debugPrint("[\(Colors.toolName)] ⚠️  BadFormat or empty line (line number: \(lineNumber + 1)). Skip this line")
-                return nil
-            }
-            
-            let colorContent = colorLineCleanedUp.split(separator: " ")
-            
-            guard colorContent.count >= 2 else {
-                let error = ColorsToolError.badFormat(colorLine)
-                print(error.localizedDescription)
-                Colors.exit(withError: error)
-            }
-            
-            switch colorStyle {
-            case .light:
-                return ParsedColor(name: String(colorContent[0]), light: String(colorContent[1]), dark: String(colorContent[1]))
+        return parseLines(lines: colorsByLines, colorStyle: colorStyle)
+    }
+    
+    static func parseLines(lines: [String], colorStyle: ColorStyle) -> [ParsedColor] {
+        lines
+            .enumerated()
+            .compactMap { lineNumber, colorLine in
+                // 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
                 
-            case .all:
-                if colorContent.count == 3 {
-                    return ParsedColor(name: String(colorContent[0]), light: String(colorContent[1]), dark: String(colorContent[2]))
+                guard colorLineCleanedUp.hasPrefix("#") == false, colorLineCleanedUp.isEmpty == false else {
+                    // debugPrint("[\(Colors.toolName)] ⚠️  BadFormat or empty line (line number: \(lineNumber + 1)). Skip this line")
+                    return nil
+                }
+                
+                let colorContent = colorLineCleanedUp.split(separator: " ")
+                
+                guard colorContent.count >= 2 else {
+                    let error = ColorsToolError.badFormat(colorLine)
+                    print(error.localizedDescription)
+                    Colors.exit(withError: error)
+                }
+                
+                switch colorStyle {
+                case .light:
+                    return ParsedColor(name: String(colorContent[0]), light: String(colorContent[1]), dark: String(colorContent[1]))
+                    
+                case .all:
+                    if colorContent.count == 3 {
+                        return ParsedColor(name: String(colorContent[0]), light: String(colorContent[1]), dark: String(colorContent[2]))
+                    }
+                    return ParsedColor(name: String(colorContent[0]), light: String(colorContent[1]), dark: String(colorContent[1]))
                 }
-                return ParsedColor(name: String(colorContent[0]), light: String(colorContent[1]), dark: String(colorContent[1]))
             }
-        }
     }
 }

Sources/ResgenSwift/Fonts/Generator/FontPlistGenerator.swift

@@ -15,7 +15,7 @@ class FontPlistGenerator {
             .forEach {
                 plistData += "\t\t<string>\($0)</string>\n"
             }
-        plistData += "\t</array>\n*/"
+        plistData += "\t</array>"
         
         return plistData
     }

Sources/ResgenSwift/Fonts/Generator/FontToolContentGenerator.swift

@@ -12,13 +12,9 @@ class FontExtensionGenerator {
     
     static func writeExtensionFile(fontsNames: [String], staticVar: Bool, extensionName: String, extensionFilePath: String) {
         // Create extension content
-        let extensionContent = [
-            Self.getHeader(extensionClassname: extensionName),
-            Self.getFontNameEnum(fontsNames: fontsNames),
-            Self.getFontMethods(fontsNames: fontsNames, staticVar: staticVar),
-            Self.getFooter()
-        ]
-            .joined(separator: "\n")
+        let extensionContent = Self.getExtensionContent(fontsNames: fontsNames,
+                                                        staticVar: staticVar,
+                                                        extensionName: extensionName)
         
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@@ -31,6 +27,16 @@ class FontExtensionGenerator {
         }
     }
     
+    static func getExtensionContent(fontsNames: [String], staticVar: Bool, extensionName: String) -> String {
+        [
+            Self.getHeader(extensionClassname: extensionName),
+            Self.getFontNameEnum(fontsNames: fontsNames),
+            Self.getFontMethods(fontsNames: fontsNames, staticVar: staticVar),
+            Self.getFooter()
+        ]
+            .joined(separator: "\n")
+    }
+    
     private static func getHeader(extensionClassname: String) -> String {
         """
         // Generated by ResgenSwift.\(Fonts.toolName) \(ResgenSwiftVersion)
@@ -45,7 +51,7 @@ class FontExtensionGenerator {
         var enumDefinition = "    enum FontName: String {\n"
         
         fontsNames.forEach {
-            enumDefinition += "        case \($0.removeCharacters(from: "[]+-_")) = \"\($0)\"\n"
+            enumDefinition += "        case \($0.fontNameSanitize) = \"\($0)\"\n"
         }
         enumDefinition += "    }\n"
         

Sources/ResgenSwift/Images/Generator/ImageExtensionGenerator.swift

@@ -9,38 +9,20 @@ import ToolCore
 import Foundation
 
 class ImageExtensionGenerator {
-  
-    // MARK: - Extension files
-    
-    static func writeStringsFiles(images: [ParsedImage], staticVar: Bool, inputFilename: String, extensionName: String, extensionFilePath: String) {
-        // Get header/footer
-        let extensionHeader = Self.getHeader(inputFilename: inputFilename, extensionClassname: extensionName)
-        let extensionFooter = Self.getFooter()
-        
-        // Create content
-        let extensionContent: String = {
-            var content = ""
-            images.forEach { img in
-                if staticVar {
-                    content += "\n\(img.getStaticImageProperty())"
-                } else {
-                    content += "\n\(img.getImageProperty())"
-                }
-                content += "\n "
-            }
-            return content
-        }()
-        
-        // Generate extension
-        Self.generateExtensionFile(extensionFilePath: extensionFilePath, extensionHeader, extensionContent, extensionFooter)
-    }
     
     // MARK: - pragm
     
-    private static func generateExtensionFile(extensionFilePath: String, _ args: String...) {
-        // Create extension content
-        let extensionContent = args.joined(separator: "\n")
-
+    static func generateExtensionFile(images: [ParsedImage],
+                                      staticVar: Bool,
+                                      inputFilename: String,
+                                      extensionName: String,
+                                      extensionFilePath: String) {
+        // Create extension conten1t
+        let extensionContent = Self.getExtensionContent(images: images,
+                                                        staticVar: staticVar,
+                                                        extensionName: extensionName,
+                                                        inputFilename: inputFilename)
+        
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
@@ -52,9 +34,22 @@ class ImageExtensionGenerator {
         }
     }
     
+    // MARK: - Extension content
+    
+    static func getExtensionContent(images: [ParsedImage], staticVar: Bool, extensionName: String, inputFilename: String) -> String {
+        [
+            Self.getHeader(inputFilename: inputFilename, extensionClassname: extensionName),
+            Self.getProperties(images: images, staticVar: staticVar),
+            Self.getFooter()
+        ]
+            .joined(separator: "\n")
+    }
+    
+    // MARK: - Extension part
+    
     private static func getHeader(inputFilename: String, extensionClassname: String) -> String {
         """
-        // Generated by ResgenSwift.Imagium \(ResgenSwiftVersion)
+        // Generated by ResgenSwift.\(Images.toolName) \(ResgenSwiftVersion)
         // Images from \(inputFilename)
         
         import UIKit
@@ -63,13 +58,20 @@ class ImageExtensionGenerator {
         """
     }
     
+    private static func getProperties(images: [ParsedImage], staticVar: Bool) -> String {
+        if staticVar {
+            return images
+                .map { "\n\($0.getStaticImageProperty())" }
+                .joined(separator: "\n")
+        }
+        return images
+            .map { "\n\($0.getImageProperty())" }
+            .joined(separator: "\n")
+    }
+    
     private static func getFooter() -> String {
         """
         }
         """
     }
 }
-
-//@objc var onboarding_foreground3: UIImage {
-//        return UIImage(named: "onboarding_foreground3")!
-//    }

Sources/ResgenSwift/Images/Images.swift

@@ -52,11 +52,11 @@ struct Images: ParsableCommand {
                                            xcassetsPath: options.xcassetsPath)
         
         // Generate extension
-        ImageExtensionGenerator.writeStringsFiles(images: imagesToGenerate,
-                                                  staticVar: options.staticMembers,
-                                                  inputFilename: options.inputFilenameWithoutExt,
-                                                  extensionName: options.extensionName,
-                                                  extensionFilePath: options.extensionFilePath)
+        ImageExtensionGenerator.generateExtensionFile(images: imagesToGenerate,
+                                                      staticVar: options.staticMembers,
+                                                      inputFilename: options.inputFilenameWithoutExt,
+                                                      extensionName: options.extensionName,
+                                                      extensionFilePath: options.extensionFilePath)
         
         
         print("[\(Self.toolName)] Images generated")

Sources/ResgenSwift/Images/Parser/ImageFileParser.swift

@@ -13,10 +13,13 @@ class ImageFileParser {
         let inputFileContent = try! String(contentsOfFile: inputFile, encoding: .utf8)
         let stringsByLines = inputFileContent.components(separatedBy: .newlines)
         
+        return Self.parseLines(stringsByLines, platform: platform)
+    }
+    
+    static func parseLines(_ lines: [String], platform: PlatormTag) -> [ParsedImage] {
         var imagesToGenerate = [ParsedImage]()
         
-        // Parse file
-        stringsByLines.forEach {
+        lines.forEach {
             guard $0.removeLeadingTrailingWhitespace().isEmpty == false, $0.first != "#" else {
                 return
             }

Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift

@@ -37,7 +37,7 @@ class StringsFileGenerator {
         }
     }
     
-    private static func generateStringsFileContent(lang: String, defaultLang: String, tags inputTags: [String], sections: [Section]) -> String {
+    static func generateStringsFileContent(lang: String, defaultLang: String, tags inputTags: [String], sections: [Section]) -> String {
         var stringsFileContent = """
         /**
          * Apple Strings File
@@ -87,36 +87,13 @@ class StringsFileGenerator {
     // MARK: - Extension file
     
     static func writeExtensionFiles(sections: [Section], defaultLang lang: String, tags: [String], staticVar: Bool, inputFilename: String, extensionName: String, extensionFilePath: String) {
-        let extensionHeader = Self.getHeader(stringsFilename: inputFilename, extensionClassname: extensionName)
-        let extensionFooter = Self.getFooter()
-        
-        let extensionContent: String = {
-            var content = ""
-            sections.forEach { section in
-                // Check that at least one string will be generated
-                guard section.hasOneOrMoreMatchingTags(tags: tags) else {
-                    return // Go to next section
-                }
-                
-                content += "\n    // MARK: - \(section.name)"
-                section.definitions.forEach { definition in
-                    guard definition.hasOneOrMoreMatchingTags(inputTags: tags) == true else {
-                        return // Go to next definition
-                    }
-                    
-                    if staticVar {
-                        content += "\n\n\(definition.getNSLocalizedStringStaticProperty(forLang: lang))"
-                    } else {
-                        content += "\n\n\(definition.getNSLocalizedStringProperty(forLang: lang))"
-                    }
-                }
-                content += "\n"
-            }
-            return content
-        }()
-        
-        // Create extension content
-        let extensionFileContent = [extensionHeader, extensionContent, extensionFooter].joined(separator: "\n")
+        // Get extension content
+        let extensionFileContent = Self.getExtensionContent(sections: sections,
+                                                            defaultLang: lang,
+                                                            tags: tags,
+                                                            staticVar: staticVar,
+                                                            inputFilename: inputFilename,
+                                                            extensionName: extensionName)
         
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@@ -129,6 +106,19 @@ class StringsFileGenerator {
         }
     }
     
+    // MARK: - Extension content
+    
+    static func getExtensionContent(sections: [Section], defaultLang lang: String, tags: [String], staticVar: Bool, inputFilename: String, extensionName: String) -> String {
+        [
+            Self.getHeader(stringsFilename: inputFilename, extensionClassname: extensionName),
+            Self.getProperties(sections: sections, defaultLang: lang, tags: tags, staticVar: staticVar),
+            Self.getFooter()
+        ]
+            .joined(separator: "\n")
+    }
+    
+    // MARK: - Extension part
+    
     private static func getHeader(stringsFilename: String, extensionClassname: String) -> String {
         """
         // Generated by ResgenSwift.Strings.\(Stringium.toolName) \(ResgenSwiftVersion)
@@ -141,6 +131,30 @@ class StringsFileGenerator {
         """
     }
     
+    private static func getProperties(sections: [Section], defaultLang lang: String, tags: [String], staticVar: Bool) -> String {
+        sections.compactMap { section in
+            // Check that at least one string will be generated
+            guard section.hasOneOrMoreMatchingTags(tags: tags) else {
+                return nil // Go to next section
+            }
+            
+            var res = "\n    // MARK: - \(section.name)\n"
+            res += section.definitions.compactMap { definition in
+                guard definition.hasOneOrMoreMatchingTags(inputTags: tags) == true else {
+                    return nil // Go to next definition
+                }
+                
+                if staticVar {
+                    return "\n\(definition.getNSLocalizedStringStaticProperty(forLang: lang))"
+                }
+                return "\n\(definition.getNSLocalizedStringProperty(forLang: lang))"
+            }
+            .joined(separator: "\n")
+            return res
+        }
+        .joined(separator: "\n")
+    }
+    
     private static func getFooter() -> String {
         """
         }

Sources/ResgenSwift/Strings/Generator/TagsGenerator.swift

@@ -11,32 +11,12 @@ import CoreVideo
 
 class TagsGenerator {
     static func writeExtensionFiles(sections: [Section], lang: String, tags: [String], staticVar: Bool, extensionName: String, extensionFilePath: String) {
-        let extensionHeader = Self.getHeader(extensionClassname: extensionName, staticVar: staticVar)
-        let extensionFooter = Self.getFooter()
-        
-        let extensionContent: String = {
-            var content = ""
-            sections.forEach { section in
-                // Check that at least one string will be generated
-                guard section.hasOneOrMoreMatchingTags(tags: tags) else {
-                    return // Go to next section
-                }
-                
-                content += "\n    // MARK: - \(section.name)"
-                section.definitions.forEach { definition in
-                    if staticVar {
-                        content += "\n\n\(definition.getStaticProperty(forLang: lang))"
-                    } else {
-                        content += "\n\n\(definition.getProperty(forLang: lang))"
-                    }
-                }
-                content += "\n"
-            }
-            return content
-        }()
-        
-        // Create extension content
-        let extensionFileContent = [extensionHeader, extensionContent, extensionFooter].joined(separator: "\n")
+        // Get extension content
+        let extensionFileContent = Self.getExtensionContent(sections: sections,
+                                                            lang: lang,
+                                                            tags: tags,
+                                                            staticVar: staticVar,
+                                                            extensionName: extensionName)
         
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
@@ -49,9 +29,22 @@ class TagsGenerator {
         }
     }
     
+    // MARK: - Extension content
+    
+    static func getExtensionContent(sections: [Section], lang: String, tags: [String], staticVar: Bool, extensionName: String) -> String {
+        [
+            Self.getHeader(extensionClassname: extensionName, staticVar: staticVar),
+            Self.getProperties(sections: sections, lang: lang, tags: tags, staticVar: staticVar),
+            Self.getFooter()
+        ]
+            .joined(separator: "\n")
+    }
+    
+    // MARK: - Extension part
+    
     private static func getHeader(extensionClassname: String, staticVar: Bool) -> String {
         """
-        // Generated by ResgenSwift.Strings.Tags \(ResgenSwiftVersion)
+        // Generated by ResgenSwift.Strings.\(Tags.toolName) \(ResgenSwiftVersion)
         
         \(staticVar ? "typelias Tags = String\n\n" : "")import UIKit
         
@@ -59,6 +52,31 @@ class TagsGenerator {
         """
     }
     
+    private static func getProperties(sections: [Section], lang: String, tags: [String], staticVar: Bool) -> String {
+        sections
+            .compactMap { section in
+                // Check that at least one string will be generated
+                guard section.hasOneOrMoreMatchingTags(tags: tags) else {
+                    return nil// Go to next section
+                }
+                
+                var res = "\n    // MARK: - \(section.name)"
+                section.definitions.forEach { definition in
+                    guard definition.hasOneOrMoreMatchingTags(inputTags: tags) == true else {
+                        return // Go to next definition
+                    }
+                    
+                    if staticVar {
+                        res += "\n\n\(definition.getStaticProperty(forLang: lang))"
+                    } else {
+                        res += "\n\n\(definition.getProperty(forLang: lang))"
+                    }
+                }
+                return res
+            }
+            .joined(separator: "\n")
+    }
+    
     private static func getFooter() -> String {
         """
         }