Fix architecture generation and add enum key of each string in R2String

Jenkinsfile

@@ -1,6 +1,6 @@
 library "openiumpipeline"
 
-env.DEVELOPER_DIR="/Applications/Xcode_13.3.0.app/Contents/Developer"
+env.DEVELOPER_DIR= "/Applications/Xcode-14.3.0.app/Contents/Developer"
 //env.SIMULATOR_DEVICE_TYPES="iPad--7th-generation-"
 env.IS_PACKAGE_SWIFT=1
 env.TARGETS_MACOS=1

SampleFiles/Colors/Generated/ColorYolo+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Color 1.0
+// Generated by ResgenSwift.Color 1.2
 
 import SwiftUI
 

SampleFiles/Colors/Generated/UIColorYolo+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Color 1.0
+// Generated by ResgenSwift.Color 1.2
 
 import UIKit
 

SampleFiles/Fonts/Generated/FontYolo+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Fonts 1.0
+// Generated by ResgenSwift.Fonts 1.2
 
 import SwiftUI
 

SampleFiles/Fonts/Generated/UIFontYolo+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Fonts 1.0
+// Generated by ResgenSwift.Fonts 1.2
 
 import UIKit
 

SampleFiles/Images/Generated/ImageYolo+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Images 1.0
+// Generated by ResgenSwift.Images 1.2
 // Images from sampleImages
 
 import SwiftUI

SampleFiles/Images/Generated/UIImage+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Images 1.0
+// Generated by ResgenSwift.Images 1.2
 // Images from sampleImages
 
 import UIKit

SampleFiles/Strings/Generated/String+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Strings.Stringium 1.0
+// Generated by ResgenSwift.Strings.Stringium 1.2
 
 import UIKit
 
@@ -6,6 +6,15 @@ fileprivate let kStringsFileName = "sampleStrings"
 
 extension String {
 
+    enum Key: String {
+        case param_lang = "param_lang"
+        case generic_back = "generic_back"
+        case generic_loading_data = "generic_loading_data"
+        case generic_welcome_firstname_format = "generic_welcome_firstname_format"
+        case test_equal_symbol = "test_equal_symbol"
+        case placeholders_test_one = "placeholders_test_one"
+    }
+
     // MARK: - Webservice
 
     /// Translation in en :

SampleFiles/Strings/Generated/en-us.lproj/sampleStrings.strings

@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by ResgenSwift 1.0
+ * Generated by ResgenSwift 1.2
  * Language: en-us
  */
 

SampleFiles/Strings/Generated/en.lproj/sampleStrings.strings

@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by ResgenSwift 1.0
+ * Generated by ResgenSwift 1.2
  * Language: en
  */
 

SampleFiles/Strings/Generated/fr.lproj/sampleStrings.strings

@@ -1,6 +1,6 @@
 /**
  * Apple Strings File
- * Generated by ResgenSwift 1.0
+ * Generated by ResgenSwift 1.2
  * Language: fr
  */
 

SampleFiles/Tags/Generated/Tags+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Strings.Tags 1.0
+// Generated by ResgenSwift.Strings.Tags 1.2
 
 import UIKit
 

Sources/ResgenSwift/Generate/Generate.swift

@@ -42,7 +42,8 @@ struct Generate: ParsableCommand {
         print()
         
         if let architecture = configuration.architecture {
-            ArchitectureGenerator.writeArchitecture(architecture)
+            ArchitectureGenerator.writeArchitecture(architecture,
+                                                    projectDirectory: options.projectDirectory)
         }
         
         // Execute commands

Sources/ResgenSwift/Generate/Generator/ArchitectureGenerator.swift

@@ -9,7 +9,7 @@ import ToolCore
 import Foundation
 
 struct ArchitectureGenerator {
-    static func writeArchitecture(_ architecture: ConfigurationArchitecture) {
+    static func writeArchitecture(_ architecture: ConfigurationArchitecture, projectDirectory: String) {
         // Create extension content
         let architectureContent = [
             "// Generated by ResgenSwift.\(Generate.toolName) \(ResgenSwiftVersion)",
@@ -18,7 +18,7 @@ struct ArchitectureGenerator {
             .joined(separator: "\n\n")
         
         let filename = "\(architecture.classname).swift"
-        guard let filePath = architecture.path else {
+        guard let filePath = architecture.path?.prependIfRelativePath(projectDirectory) else {
             let error = GenerateError.writeFile(filename, "Path of file is not defined.")
             print(error.description)
             Generate.exit(withError: error)

Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift

@@ -111,6 +111,7 @@ class StringsFileGenerator {
     static func getExtensionContent(sections: [Section], defaultLang lang: String, tags: [String], staticVar: Bool, inputFilename: String, extensionName: String) -> String {
         [
             Self.getHeader(stringsFilename: inputFilename, extensionClassname: extensionName),
+            Self.getEnumKey(sections: sections, tags: tags),
             Self.getProperties(sections: sections, defaultLang: lang, tags: tags, staticVar: staticVar),
             Self.getFooter()
         ]
@@ -131,6 +132,29 @@ class StringsFileGenerator {
         """
     }
     
+    private static func getEnumKey(sections: [Section], tags: [String]) -> String {
+        var enumDefinition = "\n    enum Key: String {\n"
+        
+        sections.forEach { section in
+            // Check that at least one string will be generated
+            guard section.hasOneOrMoreMatchingTags(tags: tags) else {
+                return // Go to next section
+            }
+            
+            section.definitions.forEach { definition in
+                guard definition.hasOneOrMoreMatchingTags(inputTags: tags) == true else {
+                    return // Go to next definition
+                }
+                debugPrint("Found definition")
+                enumDefinition += "        case \(definition.name) = \"\(definition.name)\"\n"
+            }
+        }
+        
+        enumDefinition += "    }"
+        
+        return enumDefinition
+    }
+    
     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