RES-32 Ajouter la possibilité désactiver des traqueurs spécifiques

Reviewed-on: #12
Reviewed-by: Thibaut Schmitt <t.schmitt@openium.fr>

CHANGELOG.md

@@ -13,7 +13,7 @@
 - Update plist `UIAppFonts` when generated fonts (use plistBuddy)
 	- New parameter: `infoPlistPaths`
 - Generate SwiftUI extensions for colors, fonts and images
-	- New parameter: `extensionNameSwiftUI`
+	- New parameter: `extensionNameUIKit`
 - Adding Makefile to install, unsintall and create man page.
 
 ## Fixes

Jenkinsfile

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

Package.resolved

@@ -5,8 +5,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-argument-parser",
       "state" : {
-        "revision" : "9f39744e025c7d377987f30b03770805dcb0bcd1",
-        "version" : "1.1.4"
+        "revision" : "8f4d2753f0e4778c76d5f05ad16c74f707390531",
+        "version" : "1.2.3"
+      }
+    },
+    {
+      "identity" : "swiftlintplugin",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/lukepistrol/SwiftLintPlugin",
+      "state" : {
+        "revision" : "5a65f4074975f811da666dfe31a19850950b1ea4",
+        "version" : "0.56.2"
       }
     },
     {
@@ -14,8 +23,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/jpsim/Yams.git",
       "state" : {
-        "revision" : "01835dc202670b5bb90d07f3eae41867e9ed29f6",
-        "version" : "5.0.1"
+        "revision" : "0d9ee7ea8c4ebd4a489ad7a73d5c6cad55d6fed3",
+        "version" : "5.0.6"
       }
     }
   ],

Package.swift

@@ -9,7 +9,8 @@ let package = Package(
     dependencies: [
         // Dependencies declare other packages that this package depends on.
         .package(url: "https://github.com/apple/swift-argument-parser", from: "1.0.0"),
-        .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.1")
+        .package(url: "https://github.com/jpsim/Yams.git", from: "5.0.1"),
+        .package(url: "https://github.com/lukepistrol/SwiftLintPlugin", exact: "0.56.2"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
@@ -20,6 +21,9 @@ let package = Package(
                 "ToolCore",
                 .product(name: "ArgumentParser", package: "swift-argument-parser"),
                 "Yams"
+            ],
+            plugins: [
+                .plugin(name: "SwiftLint", package: "SwiftLintPlugin")
             ]
         ),
         

README.md

@@ -16,7 +16,7 @@ iOS required to use the **real name** of the font, this name can be different fr
 swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/fonts.txt" \
  --extension-output-path "./Fonts/Generated" \
  --extension-name "AppFont" \
- --extension-name-swift-ui "SUIAppFont" \
+ --extension-name-ui-kit "UIAppFont" \
  --extension-suffix "GreatApp" \
  --static-members true \
  --info-plist-paths "./path/one/to/Info.plist ./path/two/to/Info.plist"
@@ -27,8 +27,8 @@ swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/fonts.txt" \
 1. `-f`: force generation
 2. Font input folder, it will search for every `.ttf` and `.otf` files specified in `fonts.txt`
 3. `--extension-output-path`: path where to generate generated extension
-4. `--extension-name` *(optional)* : name of the class to add UIKit getters
-5. `--extension-name-swift-ui` *(optional)* : name of the class to add SwiftUI getters
+4. `--extension-name` *(optional)* : name of the class to add SwiftUI getters
+5. `--extension-name-ui-kit` *(optional)* : name of the class to add UIKit getters
 6. `--extension-suffix` *(optional)* : additional text which is added to the filename (ex: `AppFont+GreatApp.swift`)
 7. `--static-members` *(optional)*: generate static properties or not
 8. `--info-plist-paths` *(optional)*: array of `.plist`, you can specify multiple `Info.plist` for multiple targets
@@ -44,7 +44,7 @@ swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/colors.txt" \
  --xcassets-path "./Colors/colors.xcassets" \
  --extension-output-path "./Colors/Generated/" \
  --extension-name "AppColor" \
- --extension-name-swift-ui "SUIAppColor" \ 
+ --extension-name-ui-kit "UIAppColor" \ 
  --extension-suffix "GreatApp" \
  --static-members true
 ```
@@ -55,8 +55,8 @@ swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/colors.txt" \
 2. Input colors file
 3. `--style` can be `all` or `light`
 4. `--extension-output-path`: path where to generate generated extension
-5. `--extension-name` *(optional)* : name of the class to add UIKit getters
-6. `--extension-name-swift-ui` *(optional)* : name of the class to add SwiftUI getters
+5. `--extension-name` *(optional)* : name of the class to add SwiftUI getters
+6. `--extension-name-ui-kit` *(optional)* : name of the class to add UIKit getters
 7. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppColor+GreatApp.swift`)
 8. `--static-members` *(optional)*: generate static properties or not
    
@@ -81,7 +81,7 @@ swift run -c release ResgenSwift strings twine $FORCE_FLAG "./Twine/strings.txt"
 2. Input translations file (must be Twine formatted)
 3. `--langs`: langs to generate (string with space between each lang)
 4. `--default-lang`: default lang that will be in `Base.lproj`. It must be in `langs` as well
-4. `--extension-output-path`: path where to generate generated extension
+5. `--extension-output-path`: path where to generate generated extension
 
 ### Stringium (recommended)
 
@@ -93,6 +93,7 @@ swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/string
  --extension-output-path "./Strings/Generated" \
  --extension-name "AppString" \
  --extension-suffix "GreatApp" \
+ --xcStrings true
  --static-members true
 ```
 
@@ -105,6 +106,7 @@ swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/string
 4. `--extension-output-path`: path where to generate generated extension
 5. `--extension-name` *(optional)* : name of class to add the extension
 6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppString+GreatApp.swift`)
+6. `--xcStrings`*(optional)* : generate string catalog
 7. `--static-members` *(optional)*: generate static properties or not
 
 
@@ -131,7 +133,7 @@ swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/tags.txt" \
 6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppTags+GreatApp.swift`)
 7. `--static-members` *(optional)*: generate static properties or not
 
-> ⚠️ If extension name is not set or is `Tags`, it will generate the following typaloas  `typealias Tags = String`.
+> ⚠️ If extension name is not set or is `Tags`, it will generate the following typealias `typealias Tags = String`.
 
 
 ## Analytics
@@ -139,7 +141,7 @@ swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/tags.txt" \
 Analytics will generate all you need to analyze UX with Matomo or Firebase Analytics. Input files are formatted in YAML. This command will generate a manager for each target and an AnalyticsManager. This is this one you will need to use. And it will generate a method for all tags you have declared in the YAML file. Next, you will need to use the `configure()` method of AnalyticsManager and if you want to use matomo to set up the `siteId` and the `url` of the site.
 
 ```sh
-swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/tags.txt" \
+swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/analytics.yml" \
  --target "matomo firebase" \
  --extension-output-path "./Analytics/Generated" \
  --extension-name "AppAnalytics" \
@@ -157,7 +159,7 @@ swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/tags.txt" \
 6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppAnalytics+GreatApp.swift`)
 7. `--static-members` *(optional)*: generate static properties or not
 
-> ⚠️ If extension name is not set or is `Analytics`, it will generate the following typaloas  `typealias Analytics = String`.
+> ⚠️ If extension name is not set or is `Analytics`, it will generate the following typealias `typealias Analytics = String`.
 
 ### YAML
 
@@ -184,30 +186,94 @@ swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/tags.txt" \
 7. `comments` *(optional)*
 8. `parameters` *(optional)*
 
- **Parameters**
+**Parameters**
 
 You can use parameters in generate methods. 
 
 1. `name`: name of the parameter
 2. `type`: type of the parameter (Int, String, Bool, Double)
+3. `value`: value of the parameter
+4. `defaultValue`: defaultValue of the parameter
 3. `replaceIn` *(optional)*
 
+**Value**
+
+If you want to send another parameter with a static value. For example, you want to send to which screen the event is triggered. 
+You can add the parameter 'screenName' for example and its 'value' is 'Home'. With this, you do not need to specify the value in the function call.
+
+**DefaultValue**
+
+If you want ta add a parameter in the call of the function but you want to make it optionnal with a default value you need to use this property.
+
+Example:  
+```
+events:
+  id: id_of_tag
+  name: _TITLE_
+  tags: ios,droid
+  parameters:
+    - name: title
+      type: String
+      defaultValue: someTitle
+```
+
+The generated method will be:  
+```
+logIdOfTag(title: String = "someTitle")
+```
+
 **Replace in**
 
 This is section is equivalent of `%s | %d | %f | %@`. You can put the content of the parameter in *name*, *path*, *action*, *category*.
-You need to put `_` + `NAME OF THE PARAMETER` + `_` in the target and which target you want in the value of `replaceIn`. (name need to be in uppercase)
+You need to put `_` + `NAME OF THE PARAMETER` + `_` in the target and which target you want in the value of `replaceIn`. (name need to be in uppercase).
+You can't use `value`and `replaceIn`in thge same time.
 
+Example:  
+```
+events:
+  id: id_of_tag
+  name: _TITLE_
+  tags: ios,droid
+  parameters:
+    - name: title
+      type: String
+      replaceIn: name
+```
+
+In this sample, we want to add the parameter `title` in the field `name`. So, we need to place `_TITLE_` in the field `name`.
+
+The generated method will be:  
+```
+logIdOfTag(title: String)
+```
+
+You can also want to replace a parameter in an other parameter. You can do this with the `replaceIn` property. The condition is that the parameter which will use the `replaceIn`need to have the `value`property
+
+Example:  
+```
+events:
+  id: id_of_tag
+  name: title
+  tags: ios,droid
+  parameters:
+    - name: something
+      type: String
+      value: test _TEXT_
+    - name: text
+      type: String
+      replaceIn: something
+```
 
 ## Images
 
-Images generator will generate images assets along with extensions to access those images easily.
+Images generator will generate images assets along with extensions to access those images easily. 
 
 ```sh
 swift run -c release ResgenSwift images $FORCE_FLAG "./Images/images.txt" \
  --xcassets-path "./Images/app.xcassets" \
  --extension-output-path "./Images/Generated" \
  --extension-name "AppImage" \
- --extension-name-swift-ui "SUIAppImage" \ 
+ --extension-name-ui-kit "UIAppImage" \ 
  --extension-suffix "GreatApp" \
  --static-members true
 ```
@@ -218,11 +284,12 @@ swift run -c release ResgenSwift images $FORCE_FLAG "./Images/images.txt" \
 2. Input images definitions file
 3. `--xcassets-path`: xcasset path where to generate imagesets
 4. `--extension-output-path`: path where to generate generated extension
-5. `--extension-name` *(optional)* : name of the class to add UIKit getters
-6. `--extension-name-swift-ui` *(optional)* : name of the class to add SwiftUI getters
+5. `--extension-name` *(optional)* : name of the class to add SwiftUI getters
+6. `--extension-name-ui-kit` *(optional)* : name of the class to add UIKit getters
 6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppImage+GreatApp.swift`)
 7. `--static-members` *(optional)*: generate static properties or not
 
+> ⚠️ Svg images will be copied in the assets and rendered as "Original", however if those images are not rendered correctly you can force the png generation by adding the key word "png" like this: id arrow_back 15 ? png
 
 ## All at once
 
@@ -241,7 +308,7 @@ colors:
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
-  extensionNameSwiftUI: String?
+  extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
 
@@ -250,7 +317,7 @@ fonts:
   inputFile: String
   extensionOutputPath: String
   extensionName: String?
-  extensionNameSwiftUI: String?
+  extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
   infoPlistPaths: [String]
@@ -261,7 +328,7 @@ images:
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
-  extensionNameSwiftUI: String?
+  extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
 
@@ -284,6 +351,15 @@ tags:
   extensionName: String?
   extensionSuffix: String?
   staticMembers: Bool?
+
+analytics:
+- 
+  inputFile: String
+  target: String
+  extensionOutputPath: String
+  extensionName: String?
+  extensionSuffix: String?
+  staticMembers: Bool?
 ```
 
 ### Multiple configurations
@@ -301,7 +377,7 @@ colors:
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
-  extensionNameSwiftUI: String?
+  extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
 -
@@ -310,7 +386,7 @@ colors:
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
-  extensionNameSwiftUI: String?
+  extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?  
 ...

SampleFiles/Tags/Generated/Analytics+GenAllScript.swift

@@ -6,13 +6,20 @@ import FirebaseAnalytics
 // MARK: - Protocol
 
 protocol AnalyticsManagerProtocol {
-    func logScreen(name: String, path: String)
+    func logScreen(
+        name: String,
+        path: String,
+        params: [String: Any]?
+    )
+
     func logEvent(
         name: String,
         action: String,
         category: String,
         params: [String: Any]?
     )
+
+    func setEnable(_ enable: Bool)
 }
 
 // MARK: - Matomo
@@ -47,8 +54,11 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
     
     // MARK: - Methods
 
-    func logScreen(name: String, path: String) {
-        guard !tracker.isOptedOut else { return }
+    func logScreen(
+        name: String,
+        path: String,
+        params: [String: Any]?
+    ) {
         guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
 
         let urlString = URL(string: "\(trackerUrl)" + "/" + "\(path)" + "iOS")
@@ -64,8 +74,6 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
         category: String,
         params: [String: Any]?
     ) {
-        guard !tracker.isOptedOut else { return }
-
         tracker.track(
             eventWithCategory: category,
             action: action,
@@ -74,16 +82,40 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
             url: nil
         )
     }
+
+    func setEnable(_ enable: Bool) {
+        tracker.isOptedOut = !enable
+    }
 }
 
 // MARK: - Firebase
 
 class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
-    func logScreen(name: String, path: String) {
+    func logScreen(
+        name: String,
+        path: String,
+        params: [String: Any]?
+    ) {
         var parameters = [
-            AnalyticsParameterScreenName: name
+            AnalyticsParameterScreenName: name as NSObject
         ]
 
+        if path.isEmpty == false {
+            parameters["path"] = path + "/iOS" as NSObject
+        }
+
+        if let supplementaryParameters = params {
+            for (newKey, newValue) in supplementaryParameters {
+                if parameters.contains(where: { (key: String, value: NSObject) in
+                    key == newKey
+                }) {
+                    continue
+                }
+                
+                parameters[newKey] = newValue as? NSObject
+            }
+        }
+
         Analytics.logEvent(
             AnalyticsEventScreenView,
             parameters: parameters
@@ -96,22 +128,38 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
         category: String,
         params: [String: Any]?
     ) {
-        var parameters: [String:Any] = [
-            "action": action,
-            "category": category,
+        var parameters: [String:NSObject] = [
+            AnalyticsParameterItemName: name.replacingOccurrences(of: " ", with: "_") as NSObject
         ]
 
+        if category.isEmpty == false {
+            parameters["AnalyticsParameterItemCategory"] = category as NSObject
+        }
+        
+        if action.isEmpty == false {
+            parameters["action"] = action as NSObject
+        }
+        
         if let supplementaryParameters = params {
-            parameters.merge(supplementaryParameters) { (origin, new) -> Any in
-                return origin
+            for (newKey, newValue) in supplementaryParameters {
+                if parameters.contains(where: { (key: String, value: NSObject) in
+                    key == newKey
+                }) {
+                    continue
+                }
+                
+                parameters[newKey] = newValue as? NSObject
             }
         }
         
         Analytics.logEvent(
-            name,
+            AnalyticsEventSelectContent,
             parameters: parameters
         )
     }
+    func setEnable(_ enable: Bool) {
+        Analytics.setAnalyticsCollectionEnabled(enable)
+    }
 }
 
 // MARK: - Manager
@@ -121,31 +169,57 @@ class AnalyticsManager {
     
     // MARK: - Properties
 
-    var managers: [AnalyticsManagerProtocol] = []
+    var managers: [TargetType: AnalyticsManagerProtocol] = []
 
-    private var isEnabled: Bool = true
+    private var isEnabled: Bool {
+        if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
+            false
+        } else {
+            true
+        }
+    }
 
     // MARK: - Methods
 
-    func setAnalyticsEnabled(_ enable: Bool) {
-        isEnabled = enable
+    private func setAnalytics(enable: Bool) {
+        managers.forEach { (key, value) in
+            if analytics.contains(where: { type in
+                type == key
+            }) {
+                value.setEnable(enable)
+            }
+        }
+    }
+
+    func enableAnalytics(_ analytics: [TargetType] = TargetType.allCases) {
+        setAnalytics(enable: true)
+    }
+
+    func disableAnalytics(_ analytics: [TargetType] = TargetType.allCases) {
+        setAnalytics(enable: false)
     }
 
     func configure(siteId: String, url: String) {
-        managers.append(
-            MatomoAnalyticsManager(
-                siteId: siteId,
-                url: url
-            )
+        managers[TrackerType.matomo] = MatomoAnalyticsManager(
+            siteId: siteId,
+            url: url
         )
-        managers.append(FirebaseAnalyticsManager())
+        managers[TrackerType.firebase] = FirebaseAnalyticsManager()
     }
         
-    private func logScreen(name: String, path: String) {
+    private func logScreen(
+        name: String,
+        path: String,
+        params: [String: Any]?
+    ) {
         guard isEnabled else { return }
 
-        managers.forEach { manager in
-            manager.logScreen(name: name, path: path)
+        managers.values.forEach { manager in
+            manager.logScreen(
+                name: name,
+                path: path,
+                params: params
+            )
         }
     }
     
@@ -157,7 +231,7 @@ class AnalyticsManager {
     ) {
         guard isEnabled else { return }
 
-        managers.forEach { manager in
+        managers.values.forEach { manager in
             manager.logEvent(
                 name: name,
                 action: action,
@@ -169,31 +243,39 @@ class AnalyticsManager {
 
     // MARK: - section_one
 
-    func logScreenS1DefOne(title: String) {
-        logScreen(
+    static func logScreenS1DefOne(title: String) {
+        AnalyticsManager.shared.logScreen(
             name: "s1 def one \(title)",
-            path: "s1_def_one/\(title)"
+            path: "s1_def_one/\(title)",
+            params: nil
         )
     }
 
-    func logEventS1DefTwo(title: String, count: String) {
-        logEvent(
+    static func logEventS1DefTwo(
+        title: String,
+		count: String,
+		test2: String = "test"
+    ) {
+        AnalyticsManager.shared.logEvent(
             name: "s1 def two",
             action: "test",
             category: "test",
             params: [
                 "title": title,
-				"count": count
+				"count": count,
+				"test": "test",
+				"test2": test2
             ]
         )
     }
 
     // MARK: - section_two
 
-    func logScreenS2DefOne() {
-        logScreen(
+    static func logScreenS2DefOne() {
+        AnalyticsManager.shared.logScreen(
             name: "s2 def one",
-            path: "s2_def_one/"
+            path: "s2_def_one/",
+            params: nil
         )
     }
 }

SampleFiles/Tags/sampleTags.yml

@@ -22,6 +22,12 @@ categories:
             type: String
           - name: count
             type: String
+          - name: test
+            type: String
+            value: test
+          - name: test2
+            type: String
+            defaultValue: test
             
   - id: section_two
     screens:

SampleFiles/genAllRessources.sh

@@ -5,8 +5,8 @@ FORCE_FLAG="$1"
 ## Font
 #swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/sampleFontsAll.txt" \
 # --extension-output-path "./Fonts/Generated" \
-# --extension-name "UIFontYolo" \
-# --extension-name-swift-ui "FontYolo" \
+# --extension-name "FontYolo" \
+# --extension-name-ui-kit "UIFontYolo" \
 # --extension-suffix "GenAllScript" \
 # --info-plist-paths "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"
 #
@@ -17,8 +17,8 @@ FORCE_FLAG="$1"
 # --style all \
 # --xcassets-path "./Colors/colors.xcassets" \
 # --extension-output-path "./Colors/Generated/" \
-# --extension-name "UIColorYolo" \
-# --extension-name-swift-ui "ColorYolo" \
+# --extension-name "ColorYolo" \
+# --extension-name-ui-kit "UIhkjhkColorYolo" \
 # --extension-suffix "GenAllScript"
 #
 #echo "\n-------------------------\n"
@@ -49,22 +49,23 @@ FORCE_FLAG="$1"
 # --extension-output-path "./Tags/Generated" \
 # --extension-name "Tags" \
 # --extension-suffix "GenAllScript"
-#
-echo "\n-------------------------\n"
+
+#echo "\n-------------------------\n"
 
 # Analytics
 swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \
- --target "matomo firebase" \
+ --target "firebase matomo" \
  --extension-output-path "./Tags/Generated" \
  --extension-name "Analytics" \
- --extension-suffix "GenAllScript"
+ --extension-suffix "GenAllScript" \
+ --static-members true
 
-echo "\n-------------------------\n"
+#echo "\n-------------------------\n"
 #
 ## Images
 #swift run -c release ResgenSwift images $FORCE_FLAG "./Images/sampleImages.txt" \
 # --xcassets-path "./Images/imagium.xcassets" \
 # --extension-output-path "./Images/Generated" \
-# --extension-name "UIImage" \
-# --extension-name-swift-ui "ImageYolo" \
+# --extension-name "ImageYolo" \
+# --extension-name-ui-kit "UIImageYolo" \
 # --extension-suffix "GenAllScript"

SampleFiles/resgenConfiguration.yml

@@ -47,8 +47,8 @@ images:
   inputFile: ./Images/sampleImages.txt
   xcassetsPath: ./Images/imagium.xcassets
   extensionOutputPath: ./Images/Generated
-  extensionName: UIImage
-  extensionNameSwiftUI: ImageYolo
+  extensionName: ImageYolo
+  extensionNameUIKit: UIImageYolo
   extensionSuffix: GenAllScript
 
 
@@ -61,8 +61,8 @@ colors:
  style: all
  xcassetsPath: ./Colors/colors.xcassets
  extensionOutputPath: ./Colors/Generated/
- extensionName: UIColorYolo
- extensionNameSwiftUI: ColorYolo
+ extensionName: ColorYolo
+ extensionNameUIKit: UIColorYolo
  extensionSuffix: GenAllScript
 
 
@@ -97,7 +97,7 @@ fonts:
 -
    inputFile: ./Fonts/sampleFontsAll.txt
    extensionOutputPath: ./Fonts/Generated
-   extensionName: UIFontYolo
-   extensionNameSwiftUI: FontYolo
+   extensionName: FontYolo
+   extensionNameUIKit: UIFontYolo
    extensionSuffix: GenAllScript
    infoPlistPaths: "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"

Sources/ResgenSwift/Analytics/Analytics.swift

@@ -18,7 +18,6 @@ struct Analytics: ParsableCommand {
         version: ResgenSwiftVersion
     )
     
-    
     // MARK: - Static
     
     static let toolName = "Analytics"

Sources/ResgenSwift/Analytics/Generator/AnalyticsGenerator.swift

@@ -32,7 +32,7 @@ class AnalyticsGenerator {
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
             try extensionFileContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = AnalyticsError.writeFile(extensionFilePath, error.localizedDescription)
             print(error.description)
             Analytics.exit(withError: error)
@@ -59,14 +59,18 @@ class AnalyticsGenerator {
         \(Self.getImport())
         
         \(Self.getAnalyticsProtocol())
+        
+        \(Self.getTrackerTypeEnum())
+        
         // MARK: - Manager
         
         class AnalyticsManager {
+        
             static var shared = AnalyticsManager()
             
             // MARK: - Properties
         
-            var managers: [AnalyticsManagerProtocol] = []
+            var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
         
             \(Self.getEnabledContent())
         
@@ -76,14 +80,49 @@ class AnalyticsGenerator {
         """
     }
     
+    private static func getTrackerTypeEnum() -> String {
+        var result: [String] = []
+        TrackerType.allCases.forEach { type in
+            result.append("    case \(type)")
+        }
+        
+        return """
+        // MARK: - Traker Type
+        
+        enum TrackerType: CaseIterable {
+        \(result.joined(separator: "\n"))
+        }
+        """
+    }
+    
     private static func getEnabledContent() -> String {
         """
-        private var isEnabled: Bool = true
+        private var isEnabled: Bool {
+                if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
+                    false
+                } else {
+                    true
+                }
+            }
         
             // MARK: - Methods
         
-            func setAnalyticsEnabled(_ enable: Bool) {
-                isEnabled = enable
+            private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
+                managers.forEach { (key, value) in
+                    if analytics.contains(where: { type in
+                        type == key
+                    }) {
+                        value.setEnable(enable)
+                    }
+                }
+            }
+        
+            func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+                setAnalytics(enable: true, analytics)
+            }
+        
+            func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+                setAnalytics(enable: false, analytics)
             }
         """
     }
@@ -103,11 +142,19 @@ class AnalyticsGenerator {
     
     private static func getPrivateLogFunction() -> String {
         """
-        private func logScreen(name: String, path: String) {
+        private func logScreen(
+                name: String,
+                path: String,
+                params: [String: Any]?
+            ) {
                 guard isEnabled else { return }
         
-                managers.forEach { manager in
-                    manager.logScreen(name: name, path: path)
+                managers.values.forEach { manager in
+                    manager.logScreen(
+                        name: name,
+                        path: path,
+                        params: params
+                    )
                 }
             }
             
@@ -119,7 +166,7 @@ class AnalyticsGenerator {
             ) {
                 guard isEnabled else { return }
         
-                managers.forEach { manager in
+                managers.values.forEach { manager in
                     manager.logEvent(
                         name: name,
                         action: action,
@@ -144,16 +191,14 @@ class AnalyticsGenerator {
         
         if targets.contains(TrackerType.matomo) {
             content.append("""
-                    managers.append(
-                        MatomoAnalyticsManager(
-                            siteId: siteId,
-                            url: url
-                        )
+                    managers[TrackerType.matomo] = MatomoAnalyticsManager(
+                        siteId: siteId,
+                        url: url
                     )
             """)
         }
         if targets.contains(TrackerType.firebase) {
-            content.append("        managers.append(FirebaseAnalyticsManager())")
+            content.append("        managers[TrackerType.firebase] = FirebaseAnalyticsManager()")
         }
         
         return [
@@ -169,13 +214,20 @@ class AnalyticsGenerator {
         // MARK: - Protocol
         
         protocol AnalyticsManagerProtocol {
-            func logScreen(name: String, path: String)
+            func logScreen(
+                name: String,
+                path: String,
+                params: [String: Any]?
+            )
+        
             func logEvent(
                 name: String,
                 action: String,
                 category: String,
                 params: [String: Any]?
             )
+        
+            func setEnable(_ enable: Bool)
         }
         
         """

Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift

@@ -14,6 +14,7 @@ enum FirebaseGenerator {
             FirebaseGenerator.header,
             FirebaseGenerator.logScreen,
             FirebaseGenerator.logEvent,
+            FirebaseGenerator.enable,
             FirebaseGenerator.footer
         ]
             .joined(separator: "\n")
@@ -31,11 +32,31 @@ enum FirebaseGenerator {
     
     private static var logScreen: String {
         """
-            func logScreen(name: String, path: String) {
+            func logScreen(
+                name: String,
+                path: String,
+                params: [String: Any]?
+            ) {
                 var parameters = [
-                    AnalyticsParameterScreenName: name
+                    AnalyticsParameterScreenName: name as NSObject
                 ]
         
+                if path.isEmpty == false {
+                    parameters["path"] = path + "/iOS" as NSObject
+                }
+        
+                if let supplementaryParameters = params {
+                    for (newKey, newValue) in supplementaryParameters {
+                        if parameters.contains(where: { (key: String, value: NSObject) in
+                            key == newKey
+                        }) {
+                            continue
+                        }
+                        
+                        parameters[newKey] = newValue as? NSObject
+                    }
+                }
+        
                 Analytics.logEvent(
                     AnalyticsEventScreenView,
                     parameters: parameters
@@ -53,25 +74,46 @@ enum FirebaseGenerator {
                 category: String,
                 params: [String: Any]?
             ) {
-                var parameters: [String:Any] = [
-                    "action": action,
-                    "category": category,
+                var parameters: [String:NSObject] = [
+                    AnalyticsParameterItemName: name.replacingOccurrences(of: " ", with: "_") as NSObject
                 ]
         
+                if category.isEmpty == false {
+                    parameters["AnalyticsParameterItemCategory"] = category as NSObject
+                }
+                
+                if action.isEmpty == false {
+                    parameters["action"] = action as NSObject
+                }
+                
                 if let supplementaryParameters = params {
-                    parameters.merge(supplementaryParameters) { (origin, new) -> Any in
-                        return origin
+                    for (newKey, newValue) in supplementaryParameters {
+                        if parameters.contains(where: { (key: String, value: NSObject) in
+                            key == newKey
+                        }) {
+                            continue
+                        }
+                        
+                        parameters[newKey] = newValue as? NSObject
                     }
                 }
                 
                 Analytics.logEvent(
-                    name,
+                    AnalyticsEventSelectContent,
                     parameters: parameters
                 )
             }
         """
     }
     
+    private static var enable: String {
+        """
+            func setEnable(_ enable: Bool) {
+                Analytics.setAnalyticsCollectionEnabled(enable)
+            }
+        """
+    }
+    
     private static var footer: String {
         """
         }

Sources/ResgenSwift/Analytics/Generator/MatomoGenerator.swift

@@ -15,6 +15,7 @@ enum MatomoGenerator {
             MatomoGenerator.setup,
             MatomoGenerator.logScreen,
             MatomoGenerator.logEvent,
+            MatomoGenerator.enable,
             MatomoGenerator.footer
         ]
             .joined(separator: "\n")
@@ -66,8 +67,11 @@ enum MatomoGenerator {
     
     private static var logScreen: String {
         """
-            func logScreen(name: String, path: String) {
-                guard !tracker.isOptedOut else { return }
+            func logScreen(
+                name: String,
+                path: String,
+                params: [String: Any]?
+            ) {
                 guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
         
                 let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)" + "iOS")
@@ -88,8 +92,6 @@ enum MatomoGenerator {
                 category: String,
                 params: [String: Any]?
             ) {
-                guard !tracker.isOptedOut else { return }
-        
                 tracker.track(
                     eventWithCategory: category,
                     action: action,
@@ -98,6 +100,15 @@ enum MatomoGenerator {
                     url: nil
                 )
             }
+        
+        """
+    }
+    
+    private static var enable: String {
+        """
+            func setEnable(_ enable: Bool) {
+                tracker.isOptedOut = !enable
+            }
         """
     }
     

Sources/ResgenSwift/Analytics/Model/AnalyticsDefinition.swift

@@ -30,7 +30,7 @@ class AnalyticsDefinition {
     // MARK: - Methods
 
     func hasOneOrMoreMatchingTags(inputTags: [String]) -> Bool {
-        if Set(inputTags).intersection(Set(self.tags)).isEmpty {
+        if Set(inputTags).isDisjoint(with: tags) {
             return false
         }
         return true
@@ -48,17 +48,23 @@ class AnalyticsDefinition {
     }
     
     private func getParameters() -> String {
-        var params = parameters
         var result: String
         
-        if type == .screen {
-            params = params.filter{ param in
-                !param.replaceIn.isEmpty
+        let paramsString = parameters.compactMap { parameter -> String? in
+            guard parameter.value.isEmpty else { return nil }
+            
+            let defaultValue: String
+            switch parameter.type {
+            case .bool:
+                defaultValue = "\(parameter.defaultValue.lowercased())"
+            case .int, .double:
+                defaultValue = "\(parameter.defaultValue)"
+            case .string:
+                defaultValue = "\"\(parameter.defaultValue)\""
             }
-        }
-        
-        let paramsString = params.map { parameter in
-            "\(parameter.name): \(parameter.type)"
+            
+            let defaultValueString = parameter.defaultValue.isEmpty ? "" : " = \(defaultValue)"
+            return "\(parameter.name): \(parameter.type.rawValue)\(defaultValueString)"
         }
         
         if paramsString.count > 2 {
@@ -76,7 +82,7 @@ class AnalyticsDefinition {
         return result
     }
     
-    private func replaceIn(){
+    private func replaceIn() {
         for parameter in parameters {
             for rep in parameter.replaceIn {
                 switch rep {
@@ -84,7 +90,10 @@ class AnalyticsDefinition {
                 case "path": path = path.replacingFirstOccurrence(of: "_\(parameter.name.uppercased())_", with: "\\(\(parameter.name))")
                 case "category": category = category.replacingFirstOccurrence(of: "_\(parameter.name.uppercased())_", with: "\\(\(parameter.name))")
                 case "action": action = action.replacingFirstOccurrence(of: "_\(parameter.name.uppercased())_", with: "\\(\(parameter.name))")
-                default: break
+                default:
+                    if let param = parameters.first(where: { $0.name == rep }), param.value.isEmpty == false {
+                        param.value = param.value.replacingFirstOccurrence(of: "_\(parameter.name.uppercased())_", with: "\\(\(parameter.name))")
+                    }
                 }
             }
         }
@@ -99,7 +108,18 @@ class AnalyticsDefinition {
         }
         
         supplementaryParams.forEach { param in
-            params.append("\"\(param.name)\": \(param.name)")
+            if param.value.isEmpty {
+                params.append("\"\(param.name)\": \(param.name)")
+            } else {
+                switch param.type {
+                case .bool:
+                    params.append("\"\(param.name)\": \(param.value.lowercased())")
+                case .int, .double:
+                    params.append("\"\(param.name)\": \(param.value)")
+                case .string:
+                    params.append("\"\(param.name)\": \"\(param.value)\"")
+                }
+            }
         }
 
         if params.count > 1 {
@@ -113,14 +133,15 @@ class AnalyticsDefinition {
             [\(params.joined(separator: ", "))]
             """
         } else {
-            result = "[:]"
+            result = "nil"
         }
         
         if type == .screen {
             return """
             logScreen(
                         name: "\(name)",
-                        path: "\(path)"
+                        path: "\(path)",
+                        params: \(result)
                     )
             """
         } else {
@@ -150,7 +171,7 @@ class AnalyticsDefinition {
         replaceIn()
         return """
             static func \(getFuncName())\(getParameters()) {
-                \(getlogFunction())
+                AnalyticsManager.shared.\(getlogFunction())
             }
         """
     }

Sources/ResgenSwift/Analytics/Model/AnalyticsFile.swift

@@ -41,5 +41,7 @@ struct AnalyticsDefinitionEventDTO: Codable {
 struct AnalyticsParameterDTO: Codable {
     var name: String
     var type: String
+    var value: String?
+    var defaultValue: String?
     var replaceIn: String?
 }

Sources/ResgenSwift/Analytics/Model/AnalyticsParameter.swift

@@ -9,13 +9,17 @@ import Foundation
 
 class AnalyticsParameter {
     var name: String
-    var type: String
+    var type: ParameterType
+    var value: String
+    var defaultValue: String
     var replaceIn: [String] = []
     
     // MARK: - Init
     
-    init(name: String, type: String) {
+    init(name: String, type: ParameterType, value: String, defaultValue: String) {
         self.name = name
         self.type = type
+        self.value = value
+        self.defaultValue = defaultValue
     }
 }

Sources/ResgenSwift/Analytics/Model/ParameterType.swift

@@ -0,0 +1,15 @@
+//
+//  File.swift
+//  
+//
+//  Created by Loris Perret on 17/07/2024.
+//
+
+import Foundation
+
+enum ParameterType: String {
+    case string = "String"
+    case int = "Int"
+    case double = "Double"
+    case bool = "Bool"
+}

Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift

@@ -30,25 +30,58 @@ class AnalyticsFileParser {
     }
 
     private static func getParameters(from parameters: [AnalyticsParameterDTO]) -> [AnalyticsParameter] {
-        parameters.map { dtoParameter in
+        func verify(value: String?, for type: ParameterType) {
+            guard let value, value.isEmpty == false else { return }
+            
+            switch type {
+            case .int:
+                if Int(value) == nil {
+                    let error = AnalyticsError.invalidParameter("type of \(value) is not \(type)")
+                    print(error.description)
+                    Analytics.exit(withError: error)
+                }
+            case .bool:
+                if Bool(value.lowercased()) == nil {
+                    let error = AnalyticsError.invalidParameter("type of \(value) is not \(type)")
+                    print(error.description)
+                    Analytics.exit(withError: error)
+                }
+            case .double:
+                if Double(value) == nil {
+                    let error = AnalyticsError.invalidParameter("type of \(value) is not \(type)")
+                    print(error.description)
+                    Analytics.exit(withError: error)
+                }
+            case .string:
+                break
+            }
+        }
+        
+        return parameters.map { dtoParameter in
             // Type
             
             let type = dtoParameter.type.uppercasedFirst()
 
-            guard 
-                type == "String" ||
-                type == "Int" ||
-                type == "Double" ||
-                type == "Bool"
-            else {
+            guard let typeEnum = ParameterType(rawValue: type) else {
                 let error = AnalyticsError.invalidParameter("type of \(dtoParameter.name)")
                 print(error.description)
                 Analytics.exit(withError: error)
             }
+            
+            if dtoParameter.value != nil, dtoParameter.replaceIn != nil {
+                let error = AnalyticsError.invalidParameter("you can't set 'value' and 'replaceIn' for \(dtoParameter.name)")
+                print(error.description)
+                Analytics.exit(withError: error)
+            }
+            
+            verify(value: dtoParameter.value, for: typeEnum)
+            verify(value: dtoParameter.defaultValue, for: typeEnum)
 
             let parameter = AnalyticsParameter(
                 name: dtoParameter.name,
-                type: type
+                type: typeEnum,
+                value: dtoParameter.value ?? "",
+                defaultValue: dtoParameter.defaultValue ?? ""
             )
 
             if let replaceIn = dtoParameter.replaceIn {
@@ -103,6 +136,8 @@ class AnalyticsFileParser {
                     Analytics.exit(withError: error)
                 }
 
+                definition.path = path
+            } else if let path = screen.path {
                 definition.path = path
             }
 
@@ -139,6 +174,14 @@ class AnalyticsFileParser {
                 }
 
                 definition.action = action
+            } else {
+                if let category = event.category {
+                    definition.category = category
+                }
+                
+                if let action = event.action {
+                    definition.action = action
+                }
             }
 
             return definition

Sources/ResgenSwift/Colors/Colors.swift

@@ -21,8 +21,8 @@ struct Colors: ParsableCommand {
     // MARK: - Static
     
     static let toolName = "Color"
-    static let defaultExtensionName = "UIColor"
-    static let defaultExtensionNameSUI = "Color"
+    static let defaultExtensionName = "Color"
+    static let defaultExtensionNameUIKit = "UIColor"
     static let assetsColorsFolderName = "Colors"
     
     // MARK: - Command options
@@ -57,14 +57,14 @@ struct Colors: ParsableCommand {
                                                    staticVar: options.staticMembers,
                                                    extensionName: options.extensionName,
                                                    extensionFilePath: options.extensionFilePath,
-                                                   isSwiftUI: false)
+                                                   isSwiftUI: true)
         
         // Generate extension
         ColorExtensionGenerator.writeExtensionFile(colors: parsedColors,
                                                    staticVar: options.staticMembers,
-                                                   extensionName: options.extensionNameSwiftUI,
-                                                   extensionFilePath: options.extensionFilePathSwiftUI,
-                                                   isSwiftUI: true)
+                                                   extensionName: options.extensionNameUIKit,
+                                                   extensionFilePath: options.extensionFilePathUIKit,
+                                                   isSwiftUI: false)
         
         print("[\(Self.toolName)] Colors generated")
     }
@@ -89,7 +89,7 @@ struct Colors: ParsableCommand {
         }
         
         // Extension for UIKit and SwiftUI should have different name
-        guard options.extensionName != options.extensionNameSwiftUI else {
+        guard options.extensionName != options.extensionNameUIKit else {
             let error = ColorsToolError.extensionNamesCollision(options.extensionName)
             print(error.description)
             Colors.exit(withError: error)

Sources/ResgenSwift/Colors/ColorsToolOptions.swift

@@ -27,11 +27,11 @@ struct ColorsToolOptions: ParsableArguments {
     @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.")
+    @Option(help: "Extension name. If not specified, it will generate an Color extension.")
     var extensionName: String = Colors.defaultExtensionName
     
-    @Option(help: "SwiftUI Extension name. If not specified, it will generate an Color extension.")
-    var extensionNameSwiftUI: String = Colors.defaultExtensionNameSUI
+    @Option(help: "SwiftUI Extension name. If not specified, it will generate an UIColor extension.")
+    var extensionNameUIKit: String = Colors.defaultExtensionNameUIKit
     
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+ColorsMyApp.swift")
     var extensionSuffix: String?
@@ -41,7 +41,7 @@ struct ColorsToolOptions: ParsableArguments {
 
 extension ColorsToolOptions {
     
-    // MARK: - UIKit
+    // MARK: - SwiftUI
     
     var extensionFileName: String {
         if let extensionSuffix = extensionSuffix {
@@ -54,16 +54,16 @@ extension ColorsToolOptions {
         "\(extensionOutputPath)/\(extensionFileName)"
     }
     
-    // MARK: - SwiftUI
+    // MARK: - UIKit
     
-    var extensionFileNameSwiftUI: String {
+    var extensionFileNameUIKit: String {
         if let extensionSuffix = extensionSuffix {
-            return "\(extensionNameSwiftUI)+\(extensionSuffix).swift"
+            return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
-        return "\(extensionNameSwiftUI).swift"
+        return "\(extensionNameUIKit).swift"
     }
     
-    var extensionFilePathSwiftUI: String {
-        "\(extensionOutputPath)/\(extensionFileNameSwiftUI)"
+    var extensionFilePathUIKit: String {
+        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
 }

Sources/ResgenSwift/Colors/Generator/ColorExtensionGenerator.swift

@@ -30,7 +30,7 @@ struct ColorExtensionGenerator {
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
             try extensionContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = ColorsToolError.writeExtension(extensionFilePath, error.localizedDescription)
             print(error.description)
             Colors.exit(withError: error)

Sources/ResgenSwift/Colors/Generator/ColorXcassetHelper.swift

@@ -38,7 +38,7 @@ struct ColorXcassetHelper {
         let contentsJsonPathURL = URL(fileURLWithPath: contentsJsonPath)
         do {
             try color.contentsJSON().write(to: contentsJsonPathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = ColorsToolError.writeAsset(error.localizedDescription)
             print(error.description)
             Colors.exit(withError: error)

Sources/ResgenSwift/Fonts/FontOptions.swift

@@ -21,11 +21,11 @@ struct FontsOptions: ParsableArguments {
     @Option(help: "Tell if it will generate static properties or methods")
     var staticMembers: Bool = false
     
-    @Option(help: "Extension name. If not specified, it will generate an UIFont extension.")
+    @Option(help: "Extension name. If not specified, it will generate an Font extension.")
     var extensionName: String = Fonts.defaultExtensionName
     
-    @Option(help: "Extension name. If not specified, it will generate an Font extension.")
-    var extensionNameSwiftUI: String = Fonts.defaultExtensionNameSUI
+    @Option(help: "Extension name. If not specified, it will generate an UIFont extension.")
+    var extensionNameUIKit: String = Fonts.defaultExtensionNameUIKit
     
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+FontsMyApp.swift")
     var extensionSuffix: String = ""
@@ -38,7 +38,7 @@ struct FontsOptions: ParsableArguments {
 
 extension FontsOptions {
     
-    // MARK: - UIKit
+    // MARK: - SwiftUI
     
     var extensionFileName: String {
         if extensionSuffix.isEmpty == false {
@@ -51,17 +51,17 @@ extension FontsOptions {
         "\(extensionOutputPath)/\(extensionFileName)"
     }
     
-    // MARK: - SwiftUI
+    // MARK: - UIKit
     
-    var extensionFileNameSwiftUI: String {
+    var extensionFileNameUIKit: String {
         if extensionSuffix.isEmpty == false {
-            return "\(extensionNameSwiftUI)+\(extensionSuffix).swift"
+            return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
-        return "\(extensionNameSwiftUI).swift"
+        return "\(extensionNameUIKit).swift"
     }
     
-    var extensionFilePathSwiftUI: String {
-        "\(extensionOutputPath)/\(extensionFileNameSwiftUI)"
+    var extensionFilePathUIKit: String {
+        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
 
     // MARK: - 

Sources/ResgenSwift/Fonts/Fonts.swift

@@ -21,8 +21,8 @@ struct Fonts: ParsableCommand {
     // MARK: - Static
     
     static let toolName = "Fonts"
-    static let defaultExtensionName = "UIFont"
-    static let defaultExtensionNameSUI = "Font"
+    static let defaultExtensionName = "Font"
+    static let defaultExtensionNameUIKit = "UIFont"
     
     // MARK: - Command Options
     
@@ -52,13 +52,13 @@ struct Fonts: ParsableCommand {
                                                   staticVar: options.staticMembers,
                                                   extensionName: options.extensionName,
                                                   extensionFilePath: options.extensionFilePath,
-                                                  isSwiftUI: false)
+                                                  isSwiftUI: true)
         
         FontExtensionGenerator.writeExtensionFile(fontsNames: fontsNames,
                                                   staticVar: options.staticMembers,
-                                                  extensionName: options.extensionNameSwiftUI,
-                                                  extensionFilePath: options.extensionFilePathSwiftUI,
-                                                  isSwiftUI: true)
+                                                  extensionName: options.extensionNameUIKit,
+                                                  extensionFilePath: options.extensionFilePathUIKit,
+                                                  isSwiftUI: false)
         
         print("Info.plist has been updated with:")
         print("\(FontPlistGenerator.generatePlistUIAppsFontContent(for: fontsNames, infoPlistPaths: options.infoPlistPaths))")
@@ -79,7 +79,7 @@ struct Fonts: ParsableCommand {
         }
         
         // Extension for UIKit and SwiftUI should have different name
-        guard options.extensionName != options.extensionNameSwiftUI else {
+        guard options.extensionName != options.extensionNameUIKit else {
             let error = FontsToolError.extensionNamesCollision(options.extensionName)
             print(error.description)
             Fonts.exit(withError: error)

Sources/ResgenSwift/Fonts/Generator/FontToolContentGenerator.swift

@@ -36,7 +36,7 @@ class FontExtensionGenerator {
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
             try extensionContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = FontsToolError.writeExtension(extensionFilePath, error.localizedDescription)
             print(error.description)
             Fonts.exit(withError: error)

Sources/ResgenSwift/Generate/GenerateError.swift

@@ -9,7 +9,7 @@ import Foundation
 
 enum GenerateError: Error {
     case fileNotExists(String)
-    case invalidConfigurationFile(String)
+    case invalidConfigurationFile(String, String)
     case commandError([String], String)
     case writeFile(String, String)
     
@@ -18,8 +18,8 @@ enum GenerateError: Error {
         case .fileNotExists(let filename):
             return "error: [\(Generate.toolName)] File \(filename) does not exists"
     
-        case .invalidConfigurationFile(let filename):
-            return "error: [\(Generate.toolName)] File \(filename) is not a valid configuration file"
+        case .invalidConfigurationFile(let filename, let underneathErrorDescription):
+            return "error: [\(Generate.toolName)] File \(filename) is not a valid configuration file. Underneath error: \(underneathErrorDescription)"
             
         case .commandError(let command, let terminationStatus):
             let readableCommand = command

Sources/ResgenSwift/Generate/GenerateOptions.swift

@@ -5,8 +5,6 @@
 //  Created by Thibaut Schmitt on 30/08/2022.
 //
 
-import Foundation
-
 import Foundation
 import ArgumentParser
 

Sources/ResgenSwift/Generate/Generator/ArchitectureGenerator.swift

@@ -30,7 +30,7 @@ struct ArchitectureGenerator {
         let architectureFilePathURL = URL(fileURLWithPath: "\(filePath)/\(filename)")
         do {
             try architectureContent.write(to: architectureFilePathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = GenerateError.writeFile(filename, error.localizedDescription)
             print(error.description)
             Generate.exit(withError: error)

Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift

@@ -127,7 +127,7 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
     let xcassetsPath: String
     let extensionOutputPath: String
     let extensionName: String?
-    let extensionNameSwiftUI: String?
+    let extensionNameUIKit: String?
     let extensionSuffix: String?
     private let staticMembers: Bool?
     
@@ -143,7 +143,7 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
                   xcassetsPath: String,
                   extensionOutputPath: String,
                   extensionName: String?,
-                  extensionNameSwiftUI: String?,
+                  extensionNameUIKit: String?,
                   extensionSuffix: String?,
                   staticMembers: Bool?) {
         self.inputFile = inputFile
@@ -151,7 +151,7 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
         self.xcassetsPath = xcassetsPath
         self.extensionOutputPath = extensionOutputPath
         self.extensionName = extensionName
-        self.extensionNameSwiftUI = extensionNameSwiftUI
+        self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
         self.staticMembers = staticMembers
     }
@@ -164,7 +164,7 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
             - Xcassets path: \(xcassetsPath)
             - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
-            - Extension name SwiftUI: \(extensionNameSwiftUI ?? "-")
+            - Extension name UIKit: \(extensionNameUIKit ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
         """
     }
@@ -174,7 +174,7 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
     let inputFile: String
     let extensionOutputPath: String
     let extensionName: String?
-    let extensionNameSwiftUI: String?
+    let extensionNameUIKit: String?
     let extensionSuffix: String?
     let infoPlistPaths: String?
     private let staticMembers: Bool?
@@ -189,14 +189,14 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
     internal init(inputFile: String,
                   extensionOutputPath: String,
                   extensionName: String?,
-                  extensionNameSwiftUI: String?,
+                  extensionNameUIKit: String?,
                   extensionSuffix: String?,
                   infoPlistPaths: String?,
                   staticMembers: Bool?) {
         self.inputFile = inputFile
         self.extensionOutputPath = extensionOutputPath
         self.extensionName = extensionName
-        self.extensionNameSwiftUI = extensionNameSwiftUI
+        self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
         self.infoPlistPaths = infoPlistPaths
         self.staticMembers = staticMembers
@@ -208,7 +208,7 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
             - Input file: \(inputFile)
             - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
-            - Extension name SwiftUI: \(extensionNameSwiftUI ?? "-")
+            - Extension name UIKit: \(extensionNameUIKit ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
             - InfoPlistPaths: \(infoPlistPaths ?? "-")
         """
@@ -220,7 +220,7 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
     let xcassetsPath: String
     let extensionOutputPath: String
     let extensionName: String?
-    let extensionNameSwiftUI: String?
+    let extensionNameUIKit: String?
     let extensionSuffix: String?
     private let staticMembers: Bool?
     
@@ -235,14 +235,14 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
                   xcassetsPath: String,
                   extensionOutputPath: String,
                   extensionName: String?,
-                  extensionNameSwiftUI: String?,
+                  extensionNameUIKit: String?,
                   extensionSuffix: String?,
                   staticMembers: Bool?) {
         self.inputFile = inputFile
         self.xcassetsPath = xcassetsPath
         self.extensionOutputPath = extensionOutputPath
         self.extensionName = extensionName
-        self.extensionNameSwiftUI = extensionNameSwiftUI
+        self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
         self.staticMembers = staticMembers
     }
@@ -254,7 +254,7 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
             - Xcassets path: \(xcassetsPath)
             - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
-            - Extension name SwiftUI: \(extensionNameSwiftUI ?? "-")
+            - Extension name UIKit: \(extensionNameUIKit ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
         """
     }
@@ -269,14 +269,22 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible {
     let extensionName: String?
     let extensionSuffix: String?
     private let staticMembers: Bool?
-    
+    private let xcStrings: Bool?
+
     var staticMembersOptions: Bool {
         if let staticMembers = staticMembers {
             return staticMembers
         }
         return false
     }
-    
+
+    var xcStringsOptions: Bool {
+        if let xcStrings = xcStrings {
+            return xcStrings
+        }
+        return false
+    }
+
     internal init(inputFile: String,
                   outputPath: String,
                   langs: String,
@@ -284,7 +292,8 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible {
                   extensionOutputPath: String,
                   extensionName: String?,
                   extensionSuffix: String?,
-                  staticMembers: Bool?) {
+                  staticMembers: Bool?,
+                  xcStrings: Bool?) {
         self.inputFile = inputFile
         self.outputPath = outputPath
         self.langs = langs
@@ -293,6 +302,7 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionName = extensionName
         self.extensionSuffix = extensionSuffix
         self.staticMembers = staticMembers
+        self.xcStrings = xcStrings
     }
     
     var debugDescription: String {

Sources/ResgenSwift/Generate/Parser/ConfigurationFileParser.swift

@@ -16,12 +16,15 @@ class ConfigurationFileParser {
             Generate.exit(withError: error)
         }
         
-        guard let configuration = try? YAMLDecoder().decode(ConfigurationFile.self, from: data) else {
-            let error = GenerateError.invalidConfigurationFile(configurationFile)
+        do {
+            return try YAMLDecoder().decode(ConfigurationFile.self, from: data)
+        } catch {
+            let error = GenerateError.invalidConfigurationFile(
+                configurationFile,
+                error.localizedDescription.description
+            )
             print(error.description)
             Generate.exit(withError: error)
         }
-        
-        return configuration
     }
 }

Sources/ResgenSwift/Generate/Runnable/ColorsConfiguration+Runnable.swift

@@ -38,10 +38,10 @@ extension ColorsConfiguration: Runnable {
                 extensionName
             ]
         }
-        if let extensionNameSwiftUI = extensionNameSwiftUI {
+        if let extensionNameUIKit = extensionNameUIKit {
             args += [
-                "--extension-name-swift-ui",
-                extensionNameSwiftUI
+                "--extension-name-ui-kit",
+                extensionNameUIKit
             ]
         }
         if let extensionSuffix = extensionSuffix {

Sources/ResgenSwift/Generate/Runnable/FontsConfiguration+Runnable.swift

@@ -34,10 +34,10 @@ extension FontsConfiguration: Runnable {
                 extensionName
             ]
         }
-        if let extensionNameSwiftUI = extensionNameSwiftUI {
+        if let extensionNameUIKit = extensionNameUIKit {
             args += [
-                "--extension-name-swift-ui",
-                extensionNameSwiftUI
+                "--extension-name-ui-kit",
+                extensionNameUIKit
             ]
         }
         

Sources/ResgenSwift/Generate/Runnable/ImagesConfiguration+Runnable.swift

@@ -36,10 +36,10 @@ extension ImagesConfiguration: Runnable {
                 extensionName
             ]
         }
-        if let extensionNameSwiftUI = extensionNameSwiftUI {
+        if let extensionNameUIKit = extensionNameUIKit {
             args += [
-                "--extension-name-swift-ui",
-                extensionNameSwiftUI
+                "--extension-name-ui-kit",
+                extensionNameUIKit
             ]
         }
         if let extensionSuffix = extensionSuffix {

Sources/ResgenSwift/Generate/Runnable/Runnable.swift

@@ -10,4 +10,3 @@ import Foundation
 protocol Runnable {
     func run(projectDirectory: String, force: Bool)
 }
-

Sources/ResgenSwift/Generate/Runnable/StringsConfiguration+Runnable.swift

@@ -14,7 +14,7 @@ extension StringsConfiguration: Runnable {
         if force {
             args += ["-f"]
         }
-        
+
         args += [
             inputFile.prependIfRelativePath(projectDirectory),
             "--output-path",
@@ -26,7 +26,9 @@ extension StringsConfiguration: Runnable {
             "--extension-output-path",
             extensionOutputPath.prependIfRelativePath(projectDirectory),
             "--static-members",
-            "\(staticMembersOptions)"
+            "\(staticMembersOptions)",
+            "--xc-strings",
+            "\(xcStringsOptions)"
         ]
         
         if let extensionName = extensionName {

Sources/ResgenSwift/Images/Extensions/FileManagerExtensions.swift

@@ -18,7 +18,7 @@ extension FileManager {
         
         for case let fileURL as URL in enumerator {
             do {
-                let fileAttributes = try fileURL.resourceValues(forKeys:[.isRegularFileKey])
+                let fileAttributes = try fileURL.resourceValues(forKeys: [.isRegularFileKey])
                 if fileAttributes.isRegularFile! {
                     files.append(fileURL.relativePath)
                 }
@@ -41,7 +41,7 @@ extension FileManager {
         
         for case let fileURL as URL in enumerator {
             do {
-                let fileAttributes = try fileURL.resourceValues(forKeys:[.isDirectoryKey])
+                let fileAttributes = try fileURL.resourceValues(forKeys: [.isDirectoryKey])
                 if fileAttributes.isDirectory! && fileURL.lastPathComponent.hasSuffix(".imageset") {
                     files.append(fileURL.lastPathComponent)
                 }

Sources/ResgenSwift/Images/Generator/ImageExtensionGenerator.swift

@@ -29,7 +29,7 @@ class ImageExtensionGenerator {
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
             try extensionContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = ImagesError.writeFile(extensionFilePath, error.localizedDescription)
             print(error.description)
             Images.exit(withError: error)

Sources/ResgenSwift/Images/Generator/XcassetsGenerator.swift

@@ -8,10 +8,13 @@
 import Foundation
 import ToolCore
 
+enum OutputImageExtension: String {
+    case png
+    case svg
+}
+
 class XcassetsGenerator {
-    
-    static let outputImageExtension = "png"
-    
+
     let forceGeneration: Bool
     
     // MARK: - Init
@@ -60,13 +63,20 @@ class XcassetsGenerator {
             generatedAssetsPaths.append(imagesetName)
             
             // Generate output images path
-            let output1x = "\(imagesetPath)/\(parsedImage.name).\(XcassetsGenerator.outputImageExtension)"
-            let output2x = "\(imagesetPath)/\(parsedImage.name)@2x.\(XcassetsGenerator.outputImageExtension)"
-            let output3x = "\(imagesetPath)/\(parsedImage.name)@3x.\(XcassetsGenerator.outputImageExtension)"
-            
+            let output1x = "\(imagesetPath)/\(parsedImage.name).\(OutputImageExtension.png.rawValue)"
+            let output2x = "\(imagesetPath)/\(parsedImage.name)@2x.\(OutputImageExtension.png.rawValue)"
+            let output3x = "\(imagesetPath)/\(parsedImage.name)@3x.\(OutputImageExtension.png.rawValue)"
+
             // Check if we need to convert image
-            guard self.shouldGenerate(inputImagePath: imageData.path, xcassetImagePath: output1x) else {
-                //print("\(parsedImage.name) -> Not regenerating")
+
+            var needToGenerateForSvg = false
+
+            if imageData.ext == "svg" && !parsedImage.imageExtensions.contains(.png) {
+                needToGenerateForSvg = true
+            }
+
+            guard self.shouldGenerate(inputImagePath: imageData.path, xcassetImagePath: output1x, needToGenerateForSvg: needToGenerateForSvg) else {
+                print("\(parsedImage.name) -> Not regenerating")
                 return
             }
             
@@ -80,29 +90,55 @@ class XcassetsGenerator {
                     print(error.description)
                     Images.exit(withError: error)
                 }
+            } else {
+                do {
+                    let documentsDirectory = try fileManager.contentsOfDirectory(atPath: imagesetPath)
+                    for filePath in documentsDirectory {
+                        try fileManager.removeItem(atPath: "\(imagesetPath)/\(filePath)")
+                    }
+                } catch {
+                    print("Error deleting previous assets")
+                }
             }
-            
-            // Convert image
+
             let convertArguments = parsedImage.convertArguments
+
             if imageData.ext == "svg" {
-                // /usr/local/bin/rsvg-convert path/to/image.png -w 200 -h 300 -o path/to/output.png
-                // /usr/local/bin/rsvg-convert path/to/image.png -w 200 -o path/to/output.png
-                // /usr/local/bin/rsvg-convert path/to/image.png -h 300 -o path/to/output.png
-                var command1x = ["\(svgConverter)", "\(imageData.path)"]
-                var command2x = ["\(svgConverter)", "\(imageData.path)"]
-                var command3x = ["\(svgConverter)", "\(imageData.path)"]
-                
-                self.addConvertArgument(command: &command1x, convertArgument: convertArguments.x1)
-                self.addConvertArgument(command: &command2x, convertArgument: convertArguments.x2)
-                self.addConvertArgument(command: &command3x, convertArgument: convertArguments.x3)
-                
-                command1x.append(contentsOf: ["-o", output1x])
-                command2x.append(contentsOf: ["-o", output2x])
-                command3x.append(contentsOf: ["-o", output3x])
-                
-                Shell.shell(command1x)
-                Shell.shell(command2x)
-                Shell.shell(command3x)
+                if parsedImage.imageExtensions.contains(.png) {
+
+                    // /usr/local/bin/rsvg-convert path/to/image.png -w 200 -h 300 -o path/to/output.png
+                    // /usr/local/bin/rsvg-convert path/to/image.png -w 200 -o path/to/output.png
+                    // /usr/local/bin/rsvg-convert path/to/image.png -h 300 -o path/to/output.png
+                    var command1x = ["\(svgConverter)", "\(imageData.path)"]
+                    var command2x = ["\(svgConverter)", "\(imageData.path)"]
+                    var command3x = ["\(svgConverter)", "\(imageData.path)"]
+
+                    self.addConvertArgument(command: &command1x, convertArgument: convertArguments.x1)
+                    self.addConvertArgument(command: &command2x, convertArgument: convertArguments.x2)
+                    self.addConvertArgument(command: &command3x, convertArgument: convertArguments.x3)
+
+                    command1x.append(contentsOf: ["-o", output1x])
+                    command2x.append(contentsOf: ["-o", output2x])
+                    command3x.append(contentsOf: ["-o", output3x])
+
+                    Shell.shell(command1x)
+                    Shell.shell(command2x)
+                    Shell.shell(command3x)
+
+                } else {
+
+                    let output = "\(imagesetPath)/\(parsedImage.name).\(OutputImageExtension.svg.rawValue)"
+                    let tempURL = URL(fileURLWithPath: output)
+
+                    do {
+                        if FileManager.default.fileExists(atPath: tempURL.path) {
+                            try FileManager.default.removeItem(atPath: tempURL.path)
+                        }
+                        try FileManager.default.copyItem(atPath: imageData.path, toPath: tempURL.path)
+                    } catch {
+                        print(error.localizedDescription)
+                    }
+                }
             } else {
                 // convert path/to/image.png -resize 200x300 path/to/output.png
                 // convert path/to/image.png -resize 200x path/to/output.png
@@ -119,7 +155,7 @@ class XcassetsGenerator {
             }
             
             // Write Content.json
-            let imagesetContentJson = parsedImage.contentJson
+            guard let imagesetContentJson = parsedImage.generateContentJson(isVector: imageData.ext == "svg") else { return }
             let contentJsonFilePath = "\(imagesetPath)/Contents.json"
             
             let contentJsonFilePathURL = URL(fileURLWithPath: contentJsonFilePath)
@@ -161,8 +197,8 @@ class XcassetsGenerator {
     
     // MARK: - Helpers: bypass generation
     
-    private func shouldGenerate(inputImagePath: String, xcassetImagePath: String) -> Bool {
-        if forceGeneration {
+    private func shouldGenerate(inputImagePath: String, xcassetImagePath: String, needToGenerateForSvg: Bool) -> Bool {
+        if forceGeneration || needToGenerateForSvg {
             return true
         }
         

Sources/ResgenSwift/Images/Images.swift

@@ -21,8 +21,8 @@ struct Images: ParsableCommand {
     // MARK: - Static
     
     static let toolName = "Images"
-    static let defaultExtensionName = "UIImage"
-    static let defaultExtensionNameSUI = "Image"
+    static let defaultExtensionName = "Image"
+    static let defaultExtensionNameUIKit = "UIImage"
     
     // MARK: - Command Options
     
@@ -58,14 +58,14 @@ struct Images: ParsableCommand {
                                                       inputFilename: options.inputFilenameWithoutExt,
                                                       extensionName: options.extensionName,
                                                       extensionFilePath: options.extensionFilePath,
-                                                      isSwiftUI: false)
+                                                      isSwiftUI: true)
         
         ImageExtensionGenerator.generateExtensionFile(images: imagesToGenerate,
                                                       staticVar: options.staticMembers,
                                                       inputFilename: options.inputFilenameWithoutExt,
-                                                      extensionName: options.extensionNameSwiftUI,
-                                                      extensionFilePath: options.extensionFilePathSwiftUI,
-                                                      isSwiftUI: true)
+                                                      extensionName: options.extensionNameUIKit,
+                                                      extensionFilePath: options.extensionFilePathUIKit,
+                                                      isSwiftUI: false)
         
         print("[\(Self.toolName)] Images generated")
     }
@@ -90,7 +90,7 @@ struct Images: ParsableCommand {
         _ = Images.getSvgConverterPath()
 
         // Extension for UIKit and SwiftUI should have different name
-        guard options.extensionName != options.extensionNameSwiftUI else {
+        guard options.extensionName != options.extensionNameUIKit else {
             let error = ImagesError.extensionNamesCollision(options.extensionName)
             print(error.description)
             Images.exit(withError: error)

Sources/ResgenSwift/Images/ImagesOptions.swift

@@ -27,11 +27,11 @@ struct ImagesOptions: ParsableArguments {
     @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.")
+    @Option(help: "Extension name. If not specified, it will generate an Image extension.")
     var extensionName: String = Images.defaultExtensionName
     
-    @Option(help: "Extension name. If not specified, it will generate an Image extension.")
-    var extensionNameSwiftUI: String = Images.defaultExtensionNameSUI
+    @Option(help: "Extension name. If not specified, it will generate an UIImage extension.")
+    var extensionNameUIKit: String = Images.defaultExtensionNameUIKit
     
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Image{extensionSuffix}.swift")
     var extensionSuffix: String?
@@ -41,7 +41,7 @@ struct ImagesOptions: ParsableArguments {
 
 extension ImagesOptions {
     
-    // MARK: - UIKit
+    // MARK: - SwiftUI
     
     var extensionFileName: String {
         if let extensionSuffix = extensionSuffix {
@@ -54,17 +54,17 @@ extension ImagesOptions {
         "\(extensionOutputPath)/\(extensionFileName)"
     }
     
-    // MARK: - SwiftUI
+    // MARK: - UIKit
     
-    var extensionFileNameSwiftUI: String {
+    var extensionFileNameUIKit: String {
         if let extensionSuffix = extensionSuffix {
-            return "\(extensionNameSwiftUI)+\(extensionSuffix).swift"
+            return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
-        return "\(extensionNameSwiftUI).swift"
+        return "\(extensionNameUIKit).swift"
     }
     
-    var extensionFilePathSwiftUI: String {
-        "\(extensionOutputPath)/\(extensionFileNameSwiftUI)"
+    var extensionFilePathUIKit: String {
+        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
     
     // MARK: -

Sources/ResgenSwift/Images/Model/ImageContent.swift

@@ -0,0 +1,76 @@
+//
+//  ImageContent.swift
+//
+//
+//  Created by Quentin Bandera on 19/04/2024.
+//
+
+import Foundation
+
+enum TemplateRenderingIntent: String, Codable {
+    case template
+    case original
+}
+
+struct AssetContent: Codable, Equatable {
+    let images: [AssetImageDescription]
+    let info: AssetInfo
+    let properties: AssetProperties?
+
+    init(
+        images: [AssetImageDescription],
+        info: AssetInfo,
+        properties: AssetProperties? = nil
+    ) {
+        self.images = images
+        self.info = info
+        self.properties = properties
+    }
+
+    static func == (lhs: AssetContent, rhs: AssetContent) -> Bool {
+        guard lhs.images.count == rhs.images.count else { return false }
+        let lhsImages = lhs.images.sorted(by: { $0.filename < $1.filename })
+        let rhsImages = rhs.images.sorted(by: { $0.filename < $1.filename })
+
+        return lhsImages == rhsImages
+    }
+}
+
+struct AssetImageDescription: Codable, Equatable {
+    let idiom: String
+    let scale: String?
+    let filename: String
+
+    init(
+        idiom: String,
+        scale: String? = nil,
+        filename: String
+    ) {
+        self.idiom = idiom
+        self.scale = scale
+        self.filename = filename
+    }
+}
+
+struct AssetInfo: Codable, Equatable {
+    let version: Int
+    let author: String
+}
+
+struct AssetProperties: Codable, Equatable {
+    let preservesVectorRepresentation: Bool
+    let templateRenderingIntent: TemplateRenderingIntent?
+
+    init(
+        preservesVectorRepresentation: Bool,
+        templateRenderingIntent: TemplateRenderingIntent? = nil
+    ) {
+        self.preservesVectorRepresentation = preservesVectorRepresentation
+        self.templateRenderingIntent = templateRenderingIntent
+    }
+
+    enum CodingKeys: String, CodingKey {
+        case preservesVectorRepresentation = "preserves-vector-representation"
+        case templateRenderingIntent = "template-rendering-intent"
+    }
+}

Sources/ResgenSwift/Images/Model/ParsedImage.swift

@@ -7,12 +7,31 @@
 
 import Foundation
 
+enum ImageExtension: String {
+    case png
+}
+
 struct ParsedImage {
     let name: String
     let tags: String
     let width: Int
     let height: Int
-    
+    let imageExtensions: [ImageExtension]
+
+    init(
+        name: String,
+        tags: String,
+        width: Int,
+        height: Int,
+        imageExtensions: [ImageExtension] = []
+    ) {
+        self.name = name
+        self.tags = tags
+        self.width = width
+        self.height = height
+        self.imageExtensions = imageExtensions
+    }
+
     // MARK: - Convert
     
     var convertArguments: (x1: ConvertArgument, x2: ConvertArgument, x3: ConvertArgument) {
@@ -42,34 +61,69 @@ struct ParsedImage {
     
     // MARK: - Assets
     
-    var contentJson: String {
-        """
-        {
-          "images" : [
-            {
-              "idiom" : "universal",
-              "scale" : "1x",
-              "filename" : "\(name).\(XcassetsGenerator.outputImageExtension)"
-            },
-            {
-              "idiom" : "universal",
-              "scale" : "2x",
-              "filename" : "\(name)@2x.\(XcassetsGenerator.outputImageExtension)"
-            },
-            {
-              "idiom" : "universal",
-              "scale" : "3x",
-              "filename" : "\(name)@3x.\(XcassetsGenerator.outputImageExtension)"
-            }
-          ],
-          "info" : {
-            "version" : 1,
-            "author" : "ResgenSwift-Imagium"
-          }
+    func generateContentJson(isVector: Bool) -> String? {
+        let encoder = JSONEncoder()
+        encoder.outputFormatting = .prettyPrinted
+
+        let imageContent = generateImageContent(isVector: isVector)
+
+        guard let data = try? encoder.encode(imageContent) else {
+            let error = ImagesError.writeFile("Contents.json", "Error encoding json file")
+            print(error.description)
+            Images.exit(withError: error)
         }
-        """
+
+        return String(data: data, encoding: .utf8)
     }
-    
+
+    func generateImageContent(isVector: Bool) -> AssetContent {
+
+        if !imageExtensions.contains(.png) && isVector {
+            //Generate svg
+            return AssetContent(
+                images: [
+                    AssetImageDescription(
+                        idiom: "universal",
+                        filename: "\(name).\(OutputImageExtension.svg.rawValue)"
+                    )
+                ],
+                info: AssetInfo(
+                    version: 1,
+                    author: "ResgenSwift-Imagium"
+                ),
+                properties: AssetProperties(
+                    preservesVectorRepresentation: true,
+                    templateRenderingIntent: .original
+                )
+            )
+        } else {
+            //Generate png
+            return AssetContent(
+                images: [
+                    AssetImageDescription(
+                        idiom: "universal",
+                        scale: "1x",
+                        filename: "\(name).\(OutputImageExtension.png.rawValue)"
+                    ),
+                    AssetImageDescription(
+                        idiom: "universal",
+                        scale: "2x",
+                        filename: "\(name)@2x.\(OutputImageExtension.png.rawValue)"
+                    ),
+                    AssetImageDescription(
+                        idiom: "universal",
+                        scale: "3x",
+                        filename: "\(name)@3x.\(OutputImageExtension.png.rawValue)"
+                    )
+                ],
+                info: AssetInfo(
+                    version: 1,
+                    author: "ResgenSwift-Imagium"
+                )
+            )
+        }
+    }
+
     // MARK: - Extension property
     
     func getImageProperty(isStatic: Bool, isSwiftUI: Bool) -> String {

Sources/ResgenSwift/Images/Parser/ImageFileParser.swift

@@ -38,11 +38,21 @@ class ImageFileParser {
                 }
                 return Int(splittedLine[3])!
             }()
-            
-            let image = ParsedImage(name: String(splittedLine[1]), tags: String(splittedLine[0]), width: width, height: height)
+
+            var imageExtensions: [ImageExtension] = []
+
+            splittedLine.forEach { stringExtension in
+                if let imageExtension = ImageExtension(rawValue: String(stringExtension)) {
+                    imageExtensions.append(imageExtension)
+                }
+            }
+
+            let image = ParsedImage(name: String(splittedLine[1]), tags: String(splittedLine[0]), width: width, height: height, imageExtensions: imageExtensions)
             imagesToGenerate.append(image)
         }
-        
+
+        print(imagesToGenerate)
+
         return imagesToGenerate.filter {
             $0.tags.contains(platform.rawValue)
         }

Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift

@@ -1,6 +1,6 @@
 //
 //  StringsFileGenerator.swift
-//  
+//
 //
 //  Created by Thibaut Schmitt on 04/01/2022.
 //
@@ -9,15 +9,16 @@ import Foundation
 import ToolCore
 
 class StringsFileGenerator {
-    
+
     // MARK: - Strings Files
-    
+
     static func writeStringsFiles(sections: [Section],
                                   langs: [String],
                                   defaultLang: String,
                                   tags: [String],
                                   outputPath: String,
                                   inputFilenameWithoutExt: String) {
+
         var stringsFilesContent = [String: String]()
         for lang in langs {
             stringsFilesContent[lang] = Self.generateStringsFileContent(lang: lang,
@@ -25,23 +26,48 @@ class StringsFileGenerator {
                                                                         tags: tags,
                                                                         sections: sections)
         }
-        
+
         // Write strings file content
         langs.forEach { lang in
             guard let fileContent = stringsFilesContent[lang] else { return }
-            
+
             let stringsFilePath = "\(outputPath)/\(lang).lproj/\(inputFilenameWithoutExt).strings"
             let stringsFilePathURL = URL(fileURLWithPath: stringsFilePath)
             do {
                 try fileContent.write(to: stringsFilePathURL, atomically: false, encoding: .utf8)
-            } catch (let error) {
+            } catch let error {
                 let error = StringiumError.writeFile(error.localizedDescription, stringsFilePath)
                 print(error.description)
                 Stringium.exit(withError: error)
             }
         }
     }
-    
+
+    static func writeXcStringsFiles(sections: [Section],
+                                    langs: [String],
+                                    defaultLang: String,
+                                    tags: [String],
+                                    outputPath: String,
+                                    inputFilenameWithoutExt: String) {
+
+        let fileContent: String = Self.generateXcStringsFileContent(
+            langs: langs,
+            defaultLang: defaultLang,
+            tags: tags,
+            sections: sections
+        )
+
+        let stringsFilePath = "\(outputPath)/\(inputFilenameWithoutExt).xcstrings"
+        let stringsFilePathURL = URL(fileURLWithPath: stringsFilePath)
+        do {
+            try fileContent.write(to: stringsFilePathURL, atomically: false, encoding: .utf8)
+        } catch let error {
+            let error = StringiumError.writeFile(error.localizedDescription, stringsFilePath)
+            print(error.description)
+            Stringium.exit(withError: error)
+        }
+    }
+
     static func generateStringsFileContent(lang: String,
                                            defaultLang: String,
                                            tags inputTags: [String],
@@ -53,13 +79,13 @@ class StringsFileGenerator {
          * Language: \(lang)
          */\n
         """
-        
+
         sections.forEach { section in
             // Check that at least one string will be generated
             guard section.hasOneOrMoreMatchingTags(tags: inputTags) else {
                 return // Go to next section
             }
-            
+
             stringsFileContent += "\n/********** \(section.name) **********/\n\n"
             section.definitions.forEach { definition in
                 var skipDefinition = false // Set to true if not matching tag
@@ -69,16 +95,16 @@ class StringsFileGenerator {
                         skipDefinition = true
                         return nil
                     }
-                    
+
                     // If tags contains `noTranslationTag` => get default lang
                     if definition.tags.contains(Stringium.noTranslationTag) {
                         return definition.translations[defaultLang]
                     }
-                    
+
                     // Else: get specific lang
                     return definition.translations[lang]
                 }()
-                
+
                 if let translation = translationOpt {
                     stringsFileContent += "\"\(definition.name)\" = \"\(translation)\";\n\n"
                 } else if skipDefinition == false {
@@ -88,12 +114,123 @@ class StringsFileGenerator {
                 }
             }
         }
-        
+
         return stringsFileContent
     }
-    
+
+    // MARK: - XcStrings Generation
+
+    static func generateXcStringsFileContent(langs: [String],
+                                             defaultLang: String,
+                                             tags inputTags: [String],
+                                             sections: [Section]) -> String {
+        let rootObject = generateRootObject(langs: langs, defaultLang: defaultLang, tags: inputTags, sections: sections)
+        let file = generateXcStringsFileContentFromRootObject(rootObject: rootObject)
+
+        return file
+    }
+
+    static func generateXcStringsFileContentFromRootObject(rootObject: Root) -> String {
+        do {
+            let encoder = JSONEncoder()
+            encoder.outputFormatting = [.prettyPrinted]
+
+            let json = try encoder.encode(rootObject)
+
+            if let jsonString = String(data: json, encoding: .utf8) {
+                return jsonString
+            }
+
+        } catch {
+            debugPrint("Failed to encode: \(error)")
+        }
+
+        return ""
+    }
+
+    static func generateRootObject(langs: [String],
+                                   defaultLang: String,
+                                   tags inputTags: [String],
+                                   sections: [Section]) -> Root {
+
+        var xcStringDefinitionTab: [XCStringDefinition] = []
+
+        sections.forEach { section in
+            // Check that at least one string will be generated
+            guard section.hasOneOrMoreMatchingTags(tags: inputTags) else {
+                return // Go to next section
+            }
+
+            section.definitions.forEach { definition in
+                var skipDefinition = false
+                var isNoTranslation = false
+
+                var localizationTab: [XCStringLocalization] = []
+
+                if definition.hasOneOrMoreMatchingTags(inputTags: inputTags) == false {
+                    skipDefinition = true
+                }
+
+                if definition.tags.contains(Stringium.noTranslationTag) {
+                    isNoTranslation = true
+                }
+
+                if !skipDefinition {
+                    if isNoTranslation {
+                        // Search for langs in yaml
+                        for lang in langs {
+                            if let value = definition.translations[defaultLang], !value.isEmpty {
+                                let localization = XCStringLocalization(
+                                    lang: lang,
+                                    content: XCStringLocalizationLangContent(
+                                        stringUnit: DefaultStringUnit(state: "translated", value: value)
+                                    )
+                                )
+                                localizationTab.append(localization)
+                            }
+                        }
+                    } else {
+                        // Search for langs in twine
+                        for (lang, value) in definition.translations where !value.isEmpty {
+
+                            let localization = XCStringLocalization(
+                                lang: lang,
+                                content: XCStringLocalizationLangContent(
+                                    stringUnit: DefaultStringUnit(state: "translated", value: value)
+                                )
+                            )
+
+                            localizationTab.append(localization)
+                        }
+                    }
+
+                    let xcStringDefinition = XCStringDefinition(
+                        title: definition.name,
+                        content: XCStringDefinitionContent(
+                            comment: definition.comment,
+                            extractionState: "manual",
+                            localizations: XCStringLocalizationContainer(
+                                localizations: localizationTab
+                            )
+                        )
+                    )
+
+                    xcStringDefinitionTab.append(xcStringDefinition)
+                }
+            }
+        }
+
+        let xcStringContainer = XCStringDefinitionContainer(strings: xcStringDefinitionTab)
+        
+        return Root(
+            sourceLanguage: defaultLang,
+            strings: xcStringContainer,
+            version: "1.0"
+        )
+    }
+
     // MARK: - Extension file
-    
+
     static func writeExtensionFiles(sections: [Section],
                                     defaultLang lang: String,
                                     tags: [String],
@@ -110,20 +247,20 @@ class StringsFileGenerator {
                                                             inputFilename: inputFilename,
                                                             extensionName: extensionName,
                                                             extensionSuffix: extensionSuffix)
-        
+
         // Write content
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
             try extensionFileContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = StringiumError.writeFile(extensionFilePath, error.localizedDescription)
             print(error.description)
             Stringium.exit(withError: error)
         }
     }
-    
+
     // MARK: - Extension content
-    
+
     static func getExtensionContent(sections: [Section],
                                     defaultLang lang: String,
                                     tags: [String],
@@ -139,31 +276,31 @@ class StringsFileGenerator {
         ]
             .joined(separator: "\n")
     }
-    
+
     // MARK: - Extension part
-    
+
     private static func getHeader(stringsFilename: String, extensionClassname: String) -> String {
         """
         // Generated by ResgenSwift.Strings.\(Stringium.toolName) \(ResgenSwiftVersion)
-        
+
         import UIKit
-        
+
         fileprivate let kStringsFileName = "\(stringsFilename)"
-        
+
         extension \(extensionClassname) {
         """
     }
-    
+
     private static func getEnumKey(sections: [Section], tags: [String], extensionClassname: String, extensionSuffix: String) -> String {
         var enumDefinition = "\n    enum Key\(extensionSuffix.uppercasedFirst()): String {\n"
-        
+
         // Enum
         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
@@ -172,7 +309,7 @@ class StringsFileGenerator {
                 enumDefinition += "        case \(definition.name) = \"\(definition.name)\"\n"
             }
         }
-        
+
         // KeyPath accessors
         enumDefinition += "\n"
         enumDefinition += "        var keyPath: KeyPath<\(extensionClassname), String> {\n"
@@ -182,7 +319,7 @@ class StringsFileGenerator {
             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
@@ -194,23 +331,23 @@ class StringsFileGenerator {
         enumDefinition += "            }\n" // Switch
         enumDefinition += "        }\n" // var keyPath
         enumDefinition += "    }" // Enum
-        
+
         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
             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))"
                 }
@@ -221,11 +358,11 @@ class StringsFileGenerator {
         }
         .joined(separator: "\n")
     }
-    
+
     private static func getFooter() -> String {
         """
         }
-        
+
         """
     }
 }

Sources/ResgenSwift/Strings/Generator/TagsGenerator.swift

@@ -22,7 +22,7 @@ class TagsGenerator {
         let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
             try extensionFileContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
-        } catch (let error) {
+        } catch let error {
             let error = StringiumError.writeFile(extensionFilePath, error.localizedDescription)
             print(error.description)
             Stringium.exit(withError: error)

Sources/ResgenSwift/Strings/Model/Definition.swift

@@ -37,7 +37,7 @@ class Definition {
     }
     
     func hasOneOrMoreMatchingTags(inputTags: [String]) -> Bool {
-        if Set(inputTags).intersection(Set(self.tags)).isEmpty {
+        if Set(inputTags).isDisjoint(with: tags) {
             return false
         }
         return true
@@ -84,22 +84,29 @@ class Definition {
         return (inputParameters: inputParameters, translationArguments: translationArguments)
     }
     
-    private func getBaseProperty(lang: String, translation: String, isStatic: Bool) -> String {
+    private func getBaseProperty(lang: String, translation: String, isStatic: Bool, comment: String?) -> String {
         """
             /// Translation in \(lang) :
             /// \(translation)
+            ///
+            /// Comment :
+            /// \(comment?.isEmpty == false ? comment! : "No comment")
             \(isStatic ? "static ": "")var \(name): String {
-                NSLocalizedString("\(name)", tableName: kStringsFileName, bundle: Bundle.main, value: "\(translation)", comment: "")
+                NSLocalizedString("\(name)", tableName: kStringsFileName, bundle: Bundle.main, value: "\(translation)", comment: "\(comment ?? "")")
             }
         """
+
     }
     
-    private func getBaseMethod(lang: String, translation: String, isStatic: Bool, inputParameters: [String], translationArguments: [String]) -> String {
+    private func getBaseMethod(lang: String, translation: String, isStatic: Bool, inputParameters: [String], translationArguments: [String], comment: String?) -> String {
+
         """
-            
-        
+
             /// Translation in \(lang) :
             /// \(translation)
+            ///
+            /// Comment :
+            /// \(comment?.isEmpty == false ? comment! : "No comment")
             \(isStatic ? "static ": "")func \(name)(\(inputParameters.joined(separator: ", "))) -> String {
                 String(format: \(isStatic ? "Self" : "self").\(name), \(translationArguments.joined(separator: ", ")))
             }
@@ -114,8 +121,13 @@ class Definition {
         }
 
         // Generate property
-        let property = getBaseProperty(lang: lang, translation: translation, isStatic: false)
-        
+        let property = getBaseProperty(
+            lang: lang,
+            translation: translation,
+            isStatic: false,
+            comment: self.comment
+        )
+
         // Generate method
         var method = ""
         if let parameters = self.getStringParameters(input: translation) {
@@ -123,7 +135,8 @@ class Definition {
                                    translation: translation,
                                    isStatic: false,
                                    inputParameters: parameters.inputParameters,
-                                   translationArguments: parameters.translationArguments)
+                                   translationArguments: parameters.translationArguments,
+                                   comment: self.comment)
         }
         
         return property + method
@@ -137,7 +150,12 @@ class Definition {
         }
         
         // Generate property
-        let property = getBaseProperty(lang: lang, translation: translation, isStatic: true)
+        let property = getBaseProperty(
+            lang: lang,
+            translation: translation,
+            isStatic: true,
+            comment: self.comment
+        )
         
         // Generate method
         var method = ""
@@ -146,7 +164,8 @@ class Definition {
                                    translation: translation,
                                    isStatic: true,
                                    inputParameters: parameters.inputParameters,
-                                   translationArguments: parameters.translationArguments)
+                                   translationArguments: parameters.translationArguments,
+                                   comment: self.comment)
         }
         
         return property + method
@@ -160,10 +179,14 @@ class Definition {
             print(error.description)
             Stringium.exit(withError: error)
         }
-        
+
         return """
             /// Translation in \(lang) :
             /// \(translation)
+            ///
+            /// Comment :
+            /// \(comment?.isEmpty == false ? comment! : "No comment")
+
             var \(name): String {
                 "\(translation)"
             }
@@ -180,6 +203,9 @@ class Definition {
         return """
             /// Translation in \(lang) :
             /// \(translation)
+            ///
+            /// Comment :
+            /// \(comment?.isEmpty == false ? comment! : "No comment")
             static var \(name): String {
                 "\(translation)"
             }

Sources/ResgenSwift/Strings/Model/XcString.swift

@@ -0,0 +1,109 @@
+//
+//  XcString.swift
+//
+//
+//  Created by Quentin Bandera on 12/04/2024.
+//
+
+import SwiftUI
+
+struct DynamicKey: CodingKey {
+    var intValue: Int?
+    init?(intValue: Int) {
+        self.intValue = intValue
+        self.stringValue = "\(intValue)"
+    }
+
+    var stringValue: String
+    init?(stringValue: String) {
+        self.stringValue = stringValue
+    }
+}
+
+struct Root: Codable, Equatable {
+    let sourceLanguage: String
+    let strings: XCStringDefinitionContainer
+    let version: String
+}
+
+struct XCStringDefinitionContainer: Codable, Equatable {
+    let strings: [XCStringDefinition]
+
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: DynamicKey.self)
+
+        for str in strings {
+            if let codingKey = DynamicKey(stringValue: str.title) {
+                try container.encode(str.content, forKey: codingKey)
+            }
+        }
+    }
+
+    static func == (lhs: XCStringDefinitionContainer, rhs: XCStringDefinitionContainer) -> Bool {
+        return lhs.strings.sorted(by: {
+            $0.title < $1.title
+        }) == rhs.strings.sorted(by: { $0.title < $1.title })
+    }
+}
+
+struct XCStringDefinition: Codable, Equatable {
+    let title: String // json key -> custom encoding methods
+    let content: XCStringDefinitionContent
+}
+
+struct XCStringDefinitionContent: Codable, Equatable {
+    let comment: String?
+    let extractionState: String
+    var localizations: XCStringLocalizationContainer
+
+    init(comment: String? = nil, extractionState: String, localizations: XCStringLocalizationContainer) {
+        self.comment = comment
+        self.extractionState = extractionState
+        self.localizations = localizations
+    }
+}
+
+struct XCStringLocalizationContainer: Codable, Equatable {
+    let localizations: [XCStringLocalization]
+
+    func encode(to encoder: Encoder) throws {
+        var container = encoder.container(keyedBy: DynamicKey.self)
+
+        for loca in localizations {
+            if let codingKey = DynamicKey(stringValue: loca.lang) {
+                try container.encode(loca.content, forKey: codingKey)
+            }
+        }
+    }
+
+    static func == (lhs: XCStringLocalizationContainer, rhs: XCStringLocalizationContainer) -> Bool {
+        return lhs.localizations.count == rhs.localizations.count && lhs.localizations.sorted(by: { $0.lang < $1.lang }) == rhs.localizations.sorted(by: { $0.lang < $1.lang })
+    }
+}
+
+struct XCStringLocalization: Codable, Equatable {
+    let lang: String // json key -> custom encoding method
+    let content: XCStringLocalizationLangContent
+}
+
+struct XCStringLocalizationLangContent: Codable, Equatable {
+    let stringUnit: DefaultStringUnit
+}
+
+//enum VarationOrStringUnit: Encodable {
+//    case variations([Varation])
+//    case stringUnit: (DefaultStringUnit)
+//
+//    func encode(to encoder: any Encoder) throws {
+//        if let varations {
+//
+//        } else if let  {
+//
+//        }
+//    }
+//}
+
+struct DefaultStringUnit: Codable, Equatable {
+    let state: String
+    let value: String
+}

Sources/ResgenSwift/Strings/Stringium/Stringium.swift

@@ -43,13 +43,26 @@ struct Stringium: ParsableCommand {
         let sections = TwineFileParser.parse(options.inputFile)
         
         // Generate strings files
-        StringsFileGenerator.writeStringsFiles(sections: sections,
-                                               langs: options.langs,
-                                               defaultLang: options.defaultLang,
-                                               tags: options.tags,
-                                               outputPath: options.stringsFileOutputPath,
-                                               inputFilenameWithoutExt: options.inputFilenameWithoutExt)
-        
+        print(options.xcStrings)
+        if !options.xcStrings {
+            print("[\(Self.toolName)] Will generate strings")
+
+            StringsFileGenerator.writeStringsFiles(sections: sections,
+                                                   langs: options.langs,
+                                                   defaultLang: options.defaultLang,
+                                                   tags: options.tags,
+                                                   outputPath: options.stringsFileOutputPath,
+                                                   inputFilenameWithoutExt: options.inputFilenameWithoutExt)
+        } else {
+            print("[\(Self.toolName)] Will generate xcStrings")
+            StringsFileGenerator.writeXcStringsFiles(sections: sections,
+                                                     langs: options.langs,
+                                                     defaultLang: options.defaultLang,
+                                                     tags: options.tags,
+                                                     outputPath: options.stringsFileOutputPath,
+                                                     inputFilenameWithoutExt: options.inputFilenameWithoutExt)
+        }
+
         // Generate extension
         StringsFileGenerator.writeExtensionFiles(sections: sections,
                                                  defaultLang: options.defaultLang,
@@ -59,7 +72,7 @@ struct Stringium: ParsableCommand {
                                                  extensionName: options.extensionName,
                                                  extensionFilePath: options.extensionFilePath,
                                                  extensionSuffix: options.extensionSuffix)
-        
+
         print("[\(Self.toolName)] Strings generated")
     }
     

Sources/ResgenSwift/Strings/Stringium/StringiumOptions.swift

@@ -11,8 +11,8 @@ import ArgumentParser
 struct StringiumOptions: ParsableArguments {
     @Flag(name: [.customShort("f"), .customShort("F")], help: "Should force generation")
     var forceGeneration = false
-    
-    @Argument(help: "Input files where strings ared defined.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+
+    @Argument(help: "Input files where strings are defined.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var inputFile: String
     
     @Option(name: .customLong("output-path"), help: "Path where to strings file.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
@@ -32,7 +32,10 @@ struct StringiumOptions: ParsableArguments {
     
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
-    
+
+    @Option(help: "Tell if it will generate xcStrings file or not")
+    var xcStrings: Bool = false
+
     @Option(help: "Extension name. If not specified, it will generate an String extension.")
     var extensionName: String = Stringium.defaultExtensionName
     

Sources/ResgenSwift/Strings/Strings.swift

@@ -27,4 +27,3 @@ struct Strings: ParsableCommand {
 }
 
 //Strings.main()
-

Sources/ResgenSwift/Strings/Tag/Tags.swift

@@ -18,7 +18,6 @@ struct Tags: ParsableCommand {
         version: ResgenSwiftVersion
     )
     
-    
     // MARK: - Static
     
     static let toolName = "Tags"

Tests/ResgenSwiftTests/Colors/ParsedColorTests.swift

@@ -91,7 +91,7 @@ final class ParsedColorTests: XCTestCase {
         // When
         let contentJson = color.contentsJSON()
         guard let data = contentJson.data(using: .utf8),
-        let parsedJson = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
+              let parsedJson = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
             XCTFail("Cannot convert `contentJSON` string to Data")
             return
         }

Tests/ResgenSwiftTests/Generate/ColorsConfigurationTests.swift

@@ -21,7 +21,7 @@ final class ColorsConfigurationTests: XCTestCase {
                                                        xcassetsPath: "path/to/assets.xcassets",
                                                        extensionOutputPath: "Colors/Generated",
                                                        extensionName: nil,
-                                                       extensionNameSwiftUI: nil,
+                                                       extensionNameUIKit: nil,
                                                        extensionSuffix: nil,
                                                        staticMembers: false)
         // When
@@ -50,7 +50,7 @@ final class ColorsConfigurationTests: XCTestCase {
                                                        xcassetsPath: "path/to/assets.xcassets",
                                                        extensionOutputPath: "Colors/Generated",
                                                        extensionName: "AppUIColor",
-                                                       extensionNameSwiftUI: "AppColor",
+                                                       extensionNameUIKit: "AppColor",
                                                        extensionSuffix: "Testing",
                                                        staticMembers: false)
         // When
@@ -70,7 +70,7 @@ final class ColorsConfigurationTests: XCTestCase {
             "false",
             "--extension-name",
             "AppUIColor",
-            "--extension-name-swift-ui",
+            "--extension-name-ui-kit",
             "AppColor",
             "--extension-suffix",
             "Testing",

Tests/ResgenSwiftTests/Generate/FontsConfigurationTests.swift

@@ -19,7 +19,7 @@ final class FontsConfigurationTests: XCTestCase {
         let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
                                                       extensionOutputPath: "Fonts/Generated",
                                                       extensionName: nil,
-                                                      extensionNameSwiftUI: nil,
+                                                      extensionNameUIKit: nil,
                                                       extensionSuffix: nil,
                                                       infoPlistPaths: nil,
                                                       staticMembers: nil)
@@ -43,7 +43,7 @@ final class FontsConfigurationTests: XCTestCase {
         let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
                                                       extensionOutputPath: "Fonts/Generated",
                                                       extensionName: "AppUIFont",
-                                                      extensionNameSwiftUI: "AppFont",
+                                                      extensionNameUIKit: "AppFont",
                                                       extensionSuffix: "Testing",
                                                       infoPlistPaths: "path/to/plist1.plist path/to/plist2.plist",
                                                       staticMembers: true)
@@ -60,7 +60,7 @@ final class FontsConfigurationTests: XCTestCase {
             "true",
             "--extension-name",
             "AppUIFont",
-            "--extension-name-swift-ui",
+            "--extension-name-ui-kit",
             "AppFont",
             "--extension-suffix",
             "Testing",

Tests/ResgenSwiftTests/Generate/ImagesConfigurationTests.swift

@@ -20,7 +20,7 @@ final class ImagesConfigurationTests: XCTestCase {
                                                        xcassetsPath: "path/to/assets.xcassets",
                                                        extensionOutputPath: "Images/Generated",
                                                        extensionName: nil,
-                                                       extensionNameSwiftUI: nil,
+                                                       extensionNameUIKit: nil,
                                                        extensionSuffix: nil,
                                                        staticMembers: nil)
         
@@ -47,7 +47,7 @@ final class ImagesConfigurationTests: XCTestCase {
                                                        xcassetsPath: "path/to/assets.xcassets",
                                                        extensionOutputPath: "Images/Generated",
                                                        extensionName: "AppUIImage",
-                                                       extensionNameSwiftUI: "AppImage",
+                                                       extensionNameUIKit: "AppImage",
                                                        extensionSuffix: "Testing",
                                                        staticMembers: true)
         
@@ -66,7 +66,7 @@ final class ImagesConfigurationTests: XCTestCase {
             "true",
             "--extension-name",
             "AppUIImage",
-            "--extension-name-swift-ui",
+            "--extension-name-ui-kit",
             "AppImage",
             "--extension-suffix",
             "Testing",

Tests/ResgenSwiftTests/Images/ImageFileParserTests.swift

@@ -17,8 +17,8 @@ class ImageFileParserTests: XCTestCase {
         #
         # SMAAS Support
         #
-        id image_one 25 ?
-        di image_two ? 50
+        id image_one 25 ? png
+        di image_two ? 50 webp png
         d image_three 25 ?
         d image_four 75 ?
         """
@@ -38,13 +38,15 @@ class ImageFileParserTests: XCTestCase {
         XCTAssertEqual(firstImage!.tags, "id")
         XCTAssertEqual(firstImage!.width, 25)
         XCTAssertEqual(firstImage!.height, -1)
-        
+        XCTAssertEqual(firstImage!.imageExtensions, [.png])
+
         let secondImage = parsedImages.first {
             $0.name == "image_two"
         }
         XCTAssertEqual(secondImage!.name, "image_two")
         XCTAssertEqual(secondImage!.tags, "di")
         XCTAssertEqual(secondImage!.width, -1)
-        XCTAssertEqual(secondImage!.height, 50)        
+        XCTAssertEqual(secondImage!.height, 50)     
+        XCTAssertEqual(firstImage!.imageExtensions, [.png])
     }
 }

Tests/ResgenSwiftTests/Images/ParsedImageTests.swift

@@ -127,35 +127,77 @@ final class ParsedImageTests: XCTestCase {
                                       height: 10)
         
         // When
-        let property = parsedImage.contentJson
-        
+        let property = parsedImage.generateImageContent(isVector: false)
+
         // Expect
-        let expect = """
-        {
-          "images" : [
-            {
-              "idiom" : "universal",
-              "scale" : "1x",
-              "filename" : "\(imageName).\(XcassetsGenerator.outputImageExtension)"
-            },
-            {
-              "idiom" : "universal",
-              "scale" : "2x",
-              "filename" : "\(imageName)@2x.\(XcassetsGenerator.outputImageExtension)"
-            },
-            {
-              "idiom" : "universal",
-              "scale" : "3x",
-              "filename" : "\(imageName)@3x.\(XcassetsGenerator.outputImageExtension)"
-            }
-          ],
-          "info" : {
-            "version" : 1,
-            "author" : "ResgenSwift-Imagium"
-          }
-        }
-        """
-        
-        XCTAssertEqual(property.adaptForXCTest(), expect.adaptForXCTest())
+        let expect = AssetContent(
+            images: [
+                AssetImageDescription(
+                    idiom: "universal",
+                    scale: "1x",
+                    filename: "\(parsedImage.name).\(OutputImageExtension.png.rawValue)"
+                ),
+                AssetImageDescription(
+                    idiom: "universal",
+                    scale: "2x",
+                    filename: "\(parsedImage.name)@2x.\(OutputImageExtension.png.rawValue)"
+                ),
+                AssetImageDescription(
+                    idiom: "universal",
+                    scale: "3x",
+                    filename: "\(parsedImage.name)@3x.\(OutputImageExtension.png.rawValue)"
+                )
+            ],
+            info: AssetInfo(
+                version: 1,
+                author: "ResgenSwift-Imagium"
+            )
+        )
+
+        XCTAssertEqual(property, expect)
+    }
+
+    func testAssetPng() {
+        // Given
+        let imageName = "the_name"
+        let parsedImage = ParsedImage(name: imageName,
+                                      tags: "id",
+                                      width: 10,
+                                      height: 10,
+                                      imageExtensions: [.png])
+
+        // When
+        let property = parsedImage.generateImageContent(isVector: false)
+
+        // Expect
+
+        let expect = AssetContent(
+            images: [
+                AssetImageDescription(
+                    idiom: "universal",
+                    scale: "1x",
+                    filename: "\(parsedImage.name).\(OutputImageExtension.png.rawValue)"
+                ),
+                AssetImageDescription(
+                    idiom: "universal",
+                    scale: "2x",
+                    filename: "\(parsedImage.name)@2x.\(OutputImageExtension.png.rawValue)"
+                ),
+                AssetImageDescription(
+                    idiom: "universal",
+                    scale: "3x",
+                    filename: "\(parsedImage.name)@3x.\(OutputImageExtension.png.rawValue)"
+                )
+            ],
+            info: AssetInfo(
+                version: 1,
+                author: "ResgenSwift-Imagium"
+            )
+        )
+
+        debugPrint(property)
+        debugPrint(expect)
+
+        XCTAssertEqual(property, expect)
     }
 }

Tests/ResgenSwiftTests/Strings/DefinitionTests.swift

@@ -100,24 +100,33 @@ final class DefinitionTests: XCTestCase {
         let expectFr = """
         /// Translation in fr :
         /// C'est la traduction francaise
+        ///
+        /// Comment :
+        /// This is a comment
         var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "This is a comment")
         }
         """
         
         let expectEn = """
         /// Translation in en :
         /// This is the english translation
+        ///
+        /// Comment :
+        /// This is a comment
         var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "This is a comment")
         }
         """
         
         let expectEnUs = """
         /// Translation in en-us :
         /// This is the english us translation
+        ///
+        /// Comment :
+        /// This is a comment
         var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "This is a comment")
         }
         """
         
@@ -125,7 +134,118 @@ final class DefinitionTests: XCTestCase {
         XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
         XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
     }
-    
+
+    func testGeneratedNSLocalizedStringPropertyWithEmptyComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.comment = ""
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+        /// Translation in fr :
+        /// C'est la traduction francaise
+        ///
+        /// Comment :
+        /// No comment
+        var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
+        }
+        """
+
+        let expectEn = """
+        /// Translation in en :
+        /// This is the english translation
+        ///
+        /// Comment :
+        /// No comment
+        var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
+        }
+        """
+
+        let expectEnUs = """
+        /// Translation in en-us :
+        /// This is the english us translation
+        ///
+        /// Comment :
+        /// No comment
+        var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
+        }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
+
+    func testGeneratedNSLocalizedStringPropertyWithNoComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+        /// Translation in fr :
+        /// C'est la traduction francaise
+        ///
+        /// Comment :
+        /// No comment
+        var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
+        }
+        """
+
+        let expectEn = """
+        /// Translation in en :
+        /// This is the english translation
+        ///
+        /// Comment :
+        /// No comment
+        var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
+        }
+        """
+
+        let expectEnUs = """
+        /// Translation in en-us :
+        /// This is the english us translation
+        ///
+        /// Comment :
+        /// No comment
+        var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
+        }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
+
+    // MARK: - getNSLocalizedStringStaticProperty
+
     func testGeneratedNSLocalizedStringStaticProperty() {
         // Given
         let definition = Definition(name: "definition_name")
@@ -146,24 +266,33 @@ final class DefinitionTests: XCTestCase {
         let expectFr = """
         /// Translation in fr :
         /// C'est la traduction francaise
+        ///
+        /// Comment :
+        /// This is a comment
         static var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "This is a comment")
         }
         """
         
         let expectEn = """
         /// Translation in en :
         /// This is the english translation
+        ///
+        /// Comment :
+        /// This is a comment
         static var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "This is a comment")
         }
         """
         
         let expectEnUs = """
         /// Translation in en-us :
         /// This is the english us translation
+        ///
+        /// Comment :
+        /// This is a comment
         static var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "This is a comment")
         }
         """
         
@@ -171,7 +300,116 @@ final class DefinitionTests: XCTestCase {
         XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
         XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
     }
-    
+
+    func testGeneratedNSLocalizedStringStaticPropertyWithEmptyComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.comment = ""
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+        /// Translation in fr :
+        /// C'est la traduction francaise
+        ///
+        /// Comment :
+        /// No comment
+        static var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
+        }
+        """
+
+        let expectEn = """
+        /// Translation in en :
+        /// This is the english translation
+        ///
+        /// Comment :
+        /// No comment
+        static var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
+        }
+        """
+
+        let expectEnUs = """
+        /// Translation in en-us :
+        /// This is the english us translation
+        ///
+        /// Comment :
+        /// No comment
+        static var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
+        }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
+
+    func testGeneratedNSLocalizedStringStaticPropertyWithNoComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+        /// Translation in fr :
+        /// C'est la traduction francaise
+        ///
+        /// Comment :
+        /// No comment
+        static var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
+        }
+        """
+
+        let expectEn = """
+        /// Translation in en :
+        /// This is the english translation
+        ///
+        /// Comment :
+        /// No comment
+        static var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
+        }
+        """
+
+        let expectEnUs = """
+        /// Translation in en-us :
+        /// This is the english us translation
+        ///
+        /// Comment :
+        /// No comment
+        static var definition_name: String {
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
+        }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
+
     func testGeneratedNSLocalizedStringPropertyWithOneArgument() {
         // Given
         let definition = Definition(name: "definition_name")
@@ -188,17 +426,23 @@ final class DefinitionTests: XCTestCase {
         let expectFr = """
         /// Translation in fr :
         /// Welcome "%@" !
+        ///
+        /// Comment :
+        /// This is a comment
         var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "This is a comment")
         }
         
         /// Translation in fr :
         /// Welcome "%@" !
+        ///
+        /// Comment :
+        /// This is a comment
         func definition_name(arg0: String) -> String {
             String(format: self.definition_name, arg0)
         }
         """
-    
+        
         XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
     }
     
@@ -218,12 +462,18 @@ final class DefinitionTests: XCTestCase {
         let expectFr = """
         /// Translation in fr :
         /// Welcome "%@" ! Your age is %d :) Your weight is %f ;-)
+        ///
+        /// Comment :
+        /// This is a comment
         var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" ! Your age is %d :) Your weight is %f ;-)", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" ! Your age is %d :) Your weight is %f ;-)", comment: "This is a comment")
         }
         
         /// Translation in fr :
         /// Welcome "%@" ! Your age is %d :) Your weight is %f ;-)
+        ///
+        /// Comment :
+        /// This is a comment
         func definition_name(arg0: String, arg1: Int, arg2: Double) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
@@ -249,12 +499,18 @@ final class DefinitionTests: XCTestCase {
         let expectFr = """
         /// Translation in fr :
         /// Vous %%: %1$@ %2$@ Age: %3$d
+        ///
+        /// Comment :
+        /// This is a comment
         var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Vous %%: %1$@ %2$@ Age: %3$d", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Vous %%: %1$@ %2$@ Age: %3$d", comment: "This is a comment")
         }
         
         /// Translation in fr :
         /// Vous %%: %1$@ %2$@ Age: %3$d
+        ///
+        /// Comment :
+        /// This is a comment
         func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
@@ -263,12 +519,18 @@ final class DefinitionTests: XCTestCase {
         let expectEn = """
         /// Translation in en :
         /// You %%: %2$@ %1$@ Age: %3$d
+        ///
+        /// Comment :
+        /// This is a comment
         var definition_name: String {
-            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "")
+            NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "This is a comment")
         }
         
         /// Translation in en :
         /// You %%: %2$@ %1$@ Age: %3$d
+        ///
+        /// Comment :
+        /// This is a comment
         func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
@@ -300,6 +562,9 @@ final class DefinitionTests: XCTestCase {
         let expectFr = """
             /// Translation in fr :
             /// C'est la traduction francaise
+            ///
+            /// Comment :
+            /// This is a comment
             var definition_name: String {
                 "C'est la traduction francaise"
             }
@@ -308,6 +573,9 @@ final class DefinitionTests: XCTestCase {
         let expectEn = """
             /// Translation in en :
             /// This is the english translation
+            ///
+            /// Comment :
+            /// This is a comment
             var definition_name: String {
                 "This is the english translation"
             }
@@ -316,6 +584,9 @@ final class DefinitionTests: XCTestCase {
         let expectEnUs = """
             /// Translation in en-us :
             /// This is the english us translation
+            ///
+            /// Comment :
+            /// This is a comment
             var definition_name: String {
                 "This is the english us translation"
             }
@@ -325,7 +596,118 @@ final class DefinitionTests: XCTestCase {
         XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
         XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
     }
-    
+
+    func testGeneratedRawPropertyWithEmptyComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.comment = ""
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyEn = definition.getProperty(forLang: "en")
+        let propertyEnUs = definition.getProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+            /// Translation in fr :
+            /// C'est la traduction francaise
+            ///
+            /// Comment :
+            /// No comment
+            var definition_name: String {
+                "C'est la traduction francaise"
+            }
+        """
+
+        let expectEn = """
+            /// Translation in en :
+            /// This is the english translation
+            ///
+            /// Comment :
+            /// No comment
+            var definition_name: String {
+                "This is the english translation"
+            }
+        """
+
+        let expectEnUs = """
+            /// Translation in en-us :
+            /// This is the english us translation
+            ///
+            /// Comment :
+            /// No comment
+            var definition_name: String {
+                "This is the english us translation"
+            }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
+
+    func testGeneratedRawPropertyWithNoComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyEn = definition.getProperty(forLang: "en")
+        let propertyEnUs = definition.getProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+            /// Translation in fr :
+            /// C'est la traduction francaise
+            ///
+            /// Comment :
+            /// No comment
+            var definition_name: String {
+                "C'est la traduction francaise"
+            }
+        """
+
+        let expectEn = """
+            /// Translation in en :
+            /// This is the english translation
+            ///
+            /// Comment :
+            /// No comment
+            var definition_name: String {
+                "This is the english translation"
+            }
+        """
+
+        let expectEnUs = """
+            /// Translation in en-us :
+            /// This is the english us translation
+            ///
+            /// Comment :
+            /// No comment
+            var definition_name: String {
+                "This is the english us translation"
+            }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
+
+    // MARK: - Raw static properties
+
     func testGeneratedRawStaticProperty() {
         // Given
         let definition = Definition(name: "definition_name")
@@ -346,6 +728,9 @@ final class DefinitionTests: XCTestCase {
         let expectFr = """
             /// Translation in fr :
             /// C'est la traduction francaise
+            ///
+            /// Comment :
+            /// This is a comment
             static var definition_name: String {
                 "C'est la traduction francaise"
             }
@@ -354,7 +739,10 @@ final class DefinitionTests: XCTestCase {
         let expectEn = """
             /// Translation in en :
             /// This is the english translation
-                        static var definition_name: String {
+            ///
+            /// Comment :
+            /// This is a comment
+            static var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -362,6 +750,9 @@ final class DefinitionTests: XCTestCase {
         let expectEnUs = """
             /// Translation in en-us :
             /// This is the english us translation
+            ///
+            /// Comment :
+            /// This is a comment
             static var definition_name: String {
                 "This is the english us translation"
             }
@@ -371,4 +762,113 @@ final class DefinitionTests: XCTestCase {
         XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
         XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
     }
+
+    func testGeneratedRawStaticPropertyWithEmptyComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.comment = ""
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyEn = definition.getStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+            /// Translation in fr :
+            /// C'est la traduction francaise
+            ///
+            /// Comment :
+            /// No comment
+            static var definition_name: String {
+                "C'est la traduction francaise"
+            }
+        """
+
+        let expectEn = """
+            /// Translation in en :
+            /// This is the english translation
+            ///
+            /// Comment :
+            /// No comment
+            static var definition_name: String {
+                "This is the english translation"
+            }
+        """
+
+        let expectEnUs = """
+            /// Translation in en-us :
+            /// This is the english us translation
+            ///
+            /// Comment :
+            /// No comment
+            static var definition_name: String {
+                "This is the english us translation"
+            }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
+
+    func testGeneratedRawStaticPropertyWithNoComment() {
+        // Given
+        let definition = Definition(name: "definition_name")
+        definition.tags = ["ios","iosonly","notranslation"]
+        definition.translations = [
+            "fr": "C'est la traduction francaise",
+            "en": "This is the english translation",
+            "en-us": "This is the english us translation"
+        ]
+
+        // When
+        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyEn = definition.getStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
+
+        // Expect
+        let expectFr = """
+            /// Translation in fr :
+            /// C'est la traduction francaise
+            ///
+            /// Comment :
+            /// No comment
+            static var definition_name: String {
+                "C'est la traduction francaise"
+            }
+        """
+
+        let expectEn = """
+            /// Translation in en :
+            /// This is the english translation
+            ///
+            /// Comment :
+            /// No comment
+            static var definition_name: String {
+                "This is the english translation"
+            }
+        """
+
+        let expectEnUs = """
+            /// Translation in en-us :
+            /// This is the english us translation
+            ///
+            /// Comment :
+            /// No comment
+            static var definition_name: String {
+                "This is the english us translation"
+            }
+        """
+
+        XCTAssertEqual(propertyFr.adaptForXCTest(), expectFr.adaptForXCTest())
+        XCTAssertEqual(propertyEn.adaptForXCTest(), expectEn.adaptForXCTest())
+        XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
+    }
 }

script/swiftlint.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+
+# Go to git repo root level
+cd $(git rev-parse --show-toplevel)
+
+if [[ "$BUILD_DIR" == *"IBDesignables"* ]] || [[ "$BUILD_DIR" == *"Previews"* ]] ; then
+    echo "not linting for IBDesignables/SwiftUI Previews builds";
+    exit 0
+fi
+
+SWIFT_LINT=$(which swiftlint)
+
+if [[ -z $SWIFT_LINT ]] ; then
+    echo "warning: SwiftLint not installed, please download it from https://github.com/realm/SwiftLint"
+    exit 0
+fi
+    
+if [[ $RUN_CLANG_STATIC_ANALYZER == "YES" ]] ; then
+    time $SWIFT_LINT
+else
+    COUNT=0
+
+    ##### Check for modified git files #####
+    FILES=$(git diff --name-only | grep -iv "^carthage" | grep -iv "^pods" | grep -iv "^vendor" | grep -v "R2" | grep ".swift$")
+    if [ ! -z "$FILES" ]; then
+        while read FILE_PATH; do
+            export SCRIPT_INPUT_FILE_$COUNT=$FILE_PATH
+            COUNT=$((COUNT + 1))
+        done <<< "$FILES"
+    fi
+
+    ##### Check for modified files in unstaged/Staged area #####
+    FILES=$(git diff --name-only --cached --diff-filter=d | grep -iv "^carthage" | grep -iv "^pods" | grep -iv "^vendor" | grep -v "R2" | grep ".swift$")
+    if [ ! -z "$FILES" ]; then
+        while read FILE_PATH; do
+            export SCRIPT_INPUT_FILE_$COUNT=$FILE_PATH
+            COUNT=$((COUNT + 1))
+        done <<< "$FILES"
+    fi
+
+    ##### Make the count avilable as global variable #####
+    export SCRIPT_INPUT_FILE_COUNT=$COUNT
+    env | grep SCRIPT_INPUT_FILE_
+
+    if [[ COUNT -ne 0 ]] ; then
+        time $SWIFT_LINT --use-script-input-files
+    fi
+fi