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

Package.swift

@@ -40,15 +40,7 @@ let package = Package(
         ),
         
         // Helper targets
-        .target(
-            name: "ToolCore",
-            dependencies: [
-                .product(
-                    name: "ArgumentParser",
-                    package: "swift-argument-parser"
-                )
-            ]
-        ),
+        .target(name: "ToolCore"),
         
         // Test targets
         .testTarget(

README.md

@@ -2,122 +2,64 @@
 
 ResgenSwift is a package, fully written in Swift, to help you automatize ressource update and generation.
 
-> 🧐 For all commands, see samples files in `SampleFiles` and use `resgen-swift help` and `resgen-swift help <subcommand>` for detailed help.
+> 🧐 For all commands, see samples files in `SampleFiles`
 
 ## Fonts
 
 Font generator generates an extension of `UIFont` and `Font` (or custom classes). It also prints content of `UIAppFonts` from your project `.plist`. If project `.plist` is specified, it will update `UIAppFonts` content of all `.plist`.
 
-iOS required to use the **real name** of the font, this name can be different from its filename. To get the **real name**, it uses `fc-scan`. So, be sure that your `$PATH` variable contains path of `fc-scan`.
-
-
-```sh
-USAGE: 
-swift run -c release ResgenSwift fonts [-f] <input-file> --extension-output-path <extension-output-path>  \
- [--static-members <static-members>]  \
- [--visibility <visibility>]  \
- [--extension-name <extension-name>]  \
- [--extension-name-ui-kit <extension-name-ui-kit>] \
- [--extension-suffix <extension-suffix>] \
- [--info-plist-paths <info-plist-paths>]
-
-ARGUMENTS:
-  <input-file>            Input files where fonts ared defined.
-
-OPTIONS:
-  -f, -F                  Should force generation
-  --static-members <static-members>
-                          Tell if it will generate static properties or methods (default: false)
-  --visibility <visibility>
-                          Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal (default: internal)
-  --extension-output-path <extension-output-path>
-                          Path where to generate the extension.
-  --extension-name <extension-name>
-                          Extension name. If not specified, it will generate an Font extension. (default: Font)
-  --extension-name-ui-kit <extension-name-ui-kit>
-                          Extension name. If not specified, no extension will be generated.
-  --extension-suffix <extension-suffix>
-                          Extension suffix. Ex: MyApp, it will generate {extensionName}+FontsMyApp.swift
-  --info-plist-paths <info-plist-paths>
-                          Info.plist paths (array). Will be used to update UIAppFonts content
-  --version               Show the version.
-  -h, --help              Show help information.
-```
+iOS required to use the **real name** of the font, this name can be different from its filename. To get the **real name**, it uses `fc-scan`. So, be sure that the `$PATH` contains path of `fc-scan`.
 
 **Example**
 
 ```sh
-swift run -c release ResgenSwift fonts -f "./Fonts/fonts.txt" \
+swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/fonts.txt" \
  --extension-output-path "./Fonts/Generated" \
- --static-members true \
- --visibility "public" \
  --extension-name "AppFont" \
  --extension-name-ui-kit "UIAppFont" \
  --extension-suffix "GreatApp" \
+ --static-members true \
  --info-plist-paths "./path/one/to/Info.plist ./path/two/to/Info.plist"
 ```
 
+**Parameters**
+
+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 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
+
+
 ## Colors
 
-Colors generator generates colorsets in specified xcassets and an extension of `Color` (or a custom class) associated to those colorsets. If the extension name is not specified, no extension will be generated.
-
+Colors generator generates an extension of `UIColor` (or a custom class) along with colorsets in specified xcassets.
 
 ```sh
-USAGE:
-swift run -c release ResgenSwift colors [-f] <input-file> \
- --style <style> \
- --xcassets-path <xcassets-path> \
- [--static-members <static-members>] \
- [--visibility <visibility>] \
- [--asset-bundle <asset-bundle>] \
- [--extension-output-path <extension-output-path>] \
- [--extension-name <extension-name>] \
- [--extension-name-ui-kit <extension-name-ui-kit>] \
- [--extension-suffix <extension-suffix>]
-
-ARGUMENTS:
-  <input-file>            Input files where colors ared defined.
-
-OPTIONS:
-  -f, -F                  Should force generation
-  --style <style>         Color style to generate: light for light colors only, or all for dark and light colors (values: light, all)
-  --xcassets-path <xcassets-path>
-                          Path of xcassets where to generate colors
-  --static-members <static-members>
-                          Tell if it will generate static properties or not (default: false)
-  --visibility <visibility>
-                          Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal (default: internal)
-  --asset-bundle <asset-bundle>
-                          Bundle where the asset are generated (default: main)
-  --extension-output-path <extension-output-path>
-                          Path where to generate the extension.
-  --extension-name <extension-name>
-                          SwiftUI extension name. If not specified, no extension will be generated.
-  --extension-name-ui-kit <extension-name-ui-kit>
-                          UIKit extension name. If not specified, no extension will be generated.
-  --extension-suffix <extension-suffix>
-                          Extension suffix. Ex: MyApp, it will generate {extensionName}+ColorsMyApp.swift
-  --version               Show the version.
-  -h, --help              Show help information.
-```
-
-
-**Example**
-
-```sh
-swift run -c release ResgenSwift colors -f "./Colors/colors.txt" \
+swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/colors.txt" \
  --style all \
  --xcassets-path "./Colors/colors.xcassets" \
- --static-members true \
- --visibility internal \
- --asset-bundle "main" \
  --extension-output-path "./Colors/Generated/" \
- --extension-name "AppColor \
+ --extension-name "AppColor" \
  --extension-name-ui-kit "UIAppColor" \ 
- --extension-suffix "GreatApp"
+ --extension-suffix "GreatApp" \
+ --static-members true
 ```
 
-> ⚠️ Option `extensionOutputPath` will require an `extensionName` or `extensionNameUIKit` to generate extension files. Passing an `extensionName` or `extensionNameUIKit` without `extensionOutputPath` will not generate any extension file.
+**Parameters**
+
+1. `-f`: force generation
+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 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
+   
  
 ## Strings
 
@@ -126,191 +68,99 @@ Strings command allows to generate `strings` files along with extensions to acce
 ### Twine (not recommended)
 
 ```sh
-USAGE: 
-swift run -c release ResgenSwift strings twine [-f] <input-file> \
- --output-path <output-path> \
- --langs <langs> \
- --default-lang <default-lang> \
- --extension-output-path <extension-output-path>
-
-ARGUMENTS:
-  <input-file>            Input files where strings ared defined.
-
-OPTIONS:
-  -f, -F                  Should force generation
-  --output-path <output-path>
-                          Path where to strings file.
-  --langs <langs>         Langs to generate.
-  --default-lang <default-lang>
-                          Default langs.
-  --extension-output-path <extension-output-path>
-                          Path where to generate the extension.
-  --version               Show the version.
-  -h, --help              Show help information.
-```
-
-**Example**
-
-```sh
-swift run -c release ResgenSwift strings twine -f "./Twine/strings.txt" \
+swift run -c release ResgenSwift strings twine $FORCE_FLAG "./Twine/strings.txt" \
  --output-path "./Twine/Generated" \
  --langs "fr en en-us" \
  --default-lang "en" \
  --extension-output-path "./Twine/Generated"
 ```
  
+ **Parameters**
+
+1. `-f`: force generation
+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
+5. `--extension-output-path`: path where to generate generated extension
+
 ### Stringium (recommended)
 
 ```sh
-USAGE: 
-swift run -c release ResgenSwift strings stringium [-f] <input-file> \
- --output-path <output-path> \
- --langs <langs> \
- --default-lang <default-lang> \
- [--tags <tags>] \
- [--static-members <static-members>] \
- [--xc-strings <xc-strings>] \
- [--visibility <visibility>] \
- [--asset-bundle <asset-bundle>] \
- [--extension-output-path <extension-output-path>] \
- [--extension-name <extension-name>] \
- [--extension-suffix <extension-suffix>]
-      
-ARGUMENTS:
-  <input-file>            Input files where strings are defined.
-
-OPTIONS:
-  -f, -F                  Should force generation
-  --output-path <output-path>
-                          Path where to find the .xcStrings file or the lproj folders.
-  --langs <langs>         Langs to generate.
-  --default-lang <default-lang>
-                          Default langs.
-  --tags <tags>           Tags to generate. (default: ios iosonly iosOnly notranslation)
-  --static-members <static-members>
-                          Generate static properties. False by default (default: false)
-  --xc-strings <xc-strings>
-                          Tell if it will generate xcStrings file or lproj file. True by default (default: true)
-  --visibility <visibility>
-                          Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal (default: internal)
-  --asset-bundle <asset-bundle>
-                          Bundle where the asset are generated (default: main)
-  --extension-output-path <extension-output-path>
-                          Path where to generate the extension.
-  --extension-name <extension-name>
-                          Extension name. If not specified, no extension will be generated.
-  --extension-suffix <extension-suffix>
-                          Extension suffix: {extensionName}+{extensionSuffix}.swift
-  --version               Show the version.
-  -h, --help              Show help information.
-```
-
-
-**Example**
-
-```sh
-swift run -c release ResgenSwift strings stringium -f "./Strings/strings.txt" \
+swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/strings.txt" \
  --output-path "./Strings/Generated" \
  --langs "fr en en-us" \
- --default-lang "en \
- --tags "ios iosonly iosOnly notranslation" \
- --static-members true \
- --xc-strings true \
- --visibility "package" \
- --asset-bundle "module" \
+ --default-lang "en" \
  --extension-output-path "./Strings/Generated" \
- --extension-name "AppString \
- --extension-suffix "GreatApp"
+ --extension-name "AppString" \
+ --extension-suffix "GreatApp" \
+ --xcStrings true
+ --static-members true
 ```
 
-> ⚠️ Option `extensionOutputPath` will require an `extensionName` or `extensionNameUIKit` to generate extension files. Passing an `extensionName` or `extensionNameUIKit` without `extensionOutputPath` will not generate any extension file.
+ **Parameters**
+
+1. `-f`: force generation
+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-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
+
 
 ## Tags
 
 Tags is also a subcommand of `Strings`. Input files are formatted the same way. Tags will generate properties which return exactly what is specified in the input file. It was designed to be used for analytics purpose and to be shared with any other platform to have the same analytics keys.
 
 ```sh
-USAGE: 
-swift run -c release ResgenSwift strings tags [-f] <input-file> \
- --extension-output-path <extension-output-path> \
- [--lang <lang>] \
- [--visibility <visibility>] \
- [--static-members <static-members>] \
- [--extension-name <extension-name>] \
- [--extension-suffix <extension-suffix>]
-
-ARGUMENTS:
-  <input-file>            Input files where tags ared defined.
-
-OPTIONS:
-  -f, -F                  Should force generation
-  --lang <lang>           Lang to generate. ("ium" by default) (default: ium)
-  --visibility <visibility>
-                          Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal (default: internal)
-  --extension-output-path <extension-output-path>
-                          Path where to generate the extension.
-  --static-members <static-members>
-                          Tell if it will generate static properties or not (default: false)
-  --extension-name <extension-name>
-                          Extension name. If not specified, it will generate a Tag extension. (default: Tags)
-  --extension-suffix <extension-suffix>
-                          Extension suffix. Ex: MyApp, it will generate {extensionName}+Tag{extensionSuffix}.swift
-  --version               Show the version.
-  -h, --help              Show help information.
-```
-
-**Example**
-
-```sh
-swift run -c release ResgenSwift strings tags -f "./Tags/tags.txt" \
- --extension-output-path "./Tags/Generated" \
+swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/tags.txt" \
  --lang "ium" \
- --visibility "public" \
- --static-members true \
+ --extension-output-path "./Tags/Generated" \
  --extension-name "AppTags" \
- --extension-suffix "GreatApp"
+ --extension-suffix "GreatApp" \
+ --static-members true
 ```
 
+ **Parameters**
+
+1. `-f`: force generation
+2. Input tags file (must be Twine formatted)
+3. `--lang`: langs to look at in input file
+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: `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 typealias `typealias Tags = String`.
 
+
 ## Analytics
 
 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
-USAGE:
-swift run -c release ResgenSwift analytics [-f] <input-file> \
---target <target> \
---output-file <output-file> \
-[--static-members <static-members>] \
-[--visibility <visibility>]
-
-ARGUMENTS:
-  <input-file>            Input files where tags ared defined.
-
-OPTIONS:
-  -f, -F                  Should force generation
-  --target <target>       Target(s) analytics to generate. ("matomo" | "firebase")
-  --output-file <output-file>
-                          Where to generate the analytics manager (path with filename)
-  --static-members <static-members>
-                          Tell if it will generate static properties or not (default: false)
-  --visibility <visibility>
-                          Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal (default: internal)
-  --version               Show the version.
-  -h, --help              Show help information.
-```
-
-**Example**
-
-```sh
-swift run -c release ResgenSwift analytics -f "./Tags/analytics.yml" \
+swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/analytics.yml" \
  --target "matomo firebase" \
---output-file "./Analytics/Generated/AppAnalytics+GreatApp.swift" \
---static-members false \
---visibility "public"
+ --extension-output-path "./Analytics/Generated" \
+ --extension-name "AppAnalytics" \
+ --extension-suffix "GreatApp" \
+ --static-members true
 ```
  
+ **Parameters**
+
+1. `-f`: force generation
+2. Input tags file (must be YAML formatted)
+3. `--target`: target with you will log UX
+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: `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 typealias `typealias Analytics = String`.
+
 ### YAML
 
 ```
@@ -416,61 +266,28 @@ events:
 
 ## Images
 
-Images generator will generate images assets along with extensions to access those images easily. If the extension name is not specified, no extension will be generated. 
+Images generator will generate images assets along with extensions to access those images easily. 
 
 ```sh
-USAGE: 
-resgen-swift images [-f] [-F] <input-file> \
- --xcassets-path <xcassets-path> \
- [--static-members <static-members>] \
- [--visibility <visibility>] \
- [--asset-bundle <asset-bundle>] \
- [--extension-output-path <extension-output-path>] \
- [--extension-name <extension-name>] \
- [--extension-name-ui-kit <extension-name-ui-kit>] \
- [--extension-suffix <extension-suffix>]
-
-ARGUMENTS:
-  <input-file>            Input files where strings ared defined.
-
-OPTIONS:
-  -f                      Should force script execution
-  -F                      Regenerate all images
-  --xcassets-path <xcassets-path>
-                          Xcassets path where to generate images.
-  --static-members <static-members>
-                          Tell if it will generate static properties or not (default: false)
-  --visibility <visibility>
-                          Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal (default: internal)
-  --asset-bundle <asset-bundle>
-                          Bundle where the asset are generated (default: main)
-  --extension-output-path <extension-output-path>
-                          Path where to generate the extension.
-  --extension-name <extension-name>
-                          SwiftUI extension name. If not specified, no extension will be generated.
-  --extension-name-ui-kit <extension-name-ui-kit>
-                          UIKit extension name. If not specified, no extension will be generated.
-  --extension-suffix <extension-suffix>
-                          Extension suffix. Ex: MyApp, it will generate {extensionName}+Image{extensionSuffix}.swift
-  --version               Show the version.
-  -h, --help              Show help information.
-```
-
-**Example**
-
-```sh
-swift run -c release ResgenSwift images -F "./Images/images.txt" \
+swift run -c release ResgenSwift images $FORCE_FLAG "./Images/images.txt" \
  --xcassets-path "./Images/app.xcassets" \
- --static-members false \
- --visibility "public" \
- --asset-bundle "module" \
  --extension-output-path "./Images/Generated" \
  --extension-name "AppImage" \
  --extension-name-ui-kit "UIAppImage" \ 
- --extension-suffix "GreatApp"
+ --extension-suffix "GreatApp" \
+ --static-members true
 ```
 
-> ⚠️ Option `extensionOutputPath` will require an `extensionName` or `extensionNameUIKit` to generate extension files. Passing an `extensionName` or `extensionNameUIKit` without `extensionOutputPath` will not generate any extension file.
+ **Parameters**
+
+1. `-f`: force generation
+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 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
 
@@ -487,15 +304,13 @@ All parameters can be specified in a configuration file in `Yaml`:
 colors:
 -
   inputFile: String
-  style: String
+  style: [light/all]
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
-  visiblity: String?
-  assetBundle: String?
 
 fonts:
 -
@@ -505,7 +320,6 @@ fonts:
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
-  visiblity: String?
   infoPlistPaths: [String]
   
 images:
@@ -517,8 +331,6 @@ images:
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
-  visiblity: String?
-  assetBundle: String?
 
 strings:
 - 
@@ -530,9 +342,6 @@ strings:
   extensionName: String?
   extensionSuffix: String?
   staticMembers: Bool?
-  visiblity: String?
-  assetBundle: String?
-  xcStrings: Bool?
 
 tags:
 - 
@@ -542,14 +351,14 @@ tags:
   extensionName: String?
   extensionSuffix: String?
   staticMembers: Bool?
-  visiblity: String?
 
 analytics:
 - 
   inputFile: String
   target: String
-  outputFile: String
-  visibility: String?
+  extensionOutputPath: String
+  extensionName: String?
+  extensionSuffix: String?
   staticMembers: Bool?
 ```
 
@@ -564,26 +373,22 @@ Sample for 2 colors configurations:
 colors:
 -
   inputFile: String
-  style: String
+  style: [light/all]
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
-  visiblity: String?
-  assetBundle: String?
 -
   inputFile: String
-  style: String
+  style: [light/all]
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?  
-  visiblity: String?
-  assetBundle: String?
 ...
 ```
 
@@ -627,9 +432,8 @@ architecture:
 ```
 
 This will generate a file named as the architecture classname: `R.swift`. Based on the previous architecture, it will generate:
-
-```swift
-class R: Sendable {
+```
+class R {
     static let images = R2Image()
     static let strings = R2String()
     static let fonts = R2Font()
@@ -637,25 +441,25 @@ class R: Sendable {
     static let uikit = R2UI()
 }
 
-class R2Image: Sendable {}
+class R2Image {}
 
-class R2String: Sendable {}
+class R2String {}
 
-class R2Font: Sendable {}
+class R2Font {}
 
-class R2Image: Sendable {}
+class R2Image {}
 
-class R2UI: Sendable {
+class R2UI {
     let images = R2UIImage()
     let fonts = R2UIFont()
     let images = R2UIImage()
 }
 
-class R2UIImage: Sendable {}
+class R2UIImage {}
 
-class R2UIFont: Sendable {}
+class R2UIFont {}
 
-class R2UIImage: Sendable {}
+class R2UIImage {}
 ```
 
           

SampleFiles/Colors/Generated/ColorYolo+GenAllScript.swift

@@ -1,21 +1,21 @@
-// Generated by ResgenSwift.Color 2.2.0
+// Generated by ResgenSwift.Color 2.1.0
 
 import SwiftUI
 
 extension ColorYolo {
 
     /// Color red is #FF0000 (light) or #FF0000 (dark)"
-    public var red: Color {
+    var red: Color {
         Color("red")
     }
 
     /// Color green_alpha_50 is #A000FF00 (light) or #A000FF00 (dark)"
-    public var green_alpha_50: Color {
+    var green_alpha_50: Color {
         Color("green_alpha_50")
     }
 
     /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
-    public var blue_light_dark: Color {
+    var blue_light_dark: Color {
         Color("blue_light_dark")
     }
 }

SampleFiles/Colors/Generated/UIColorYolo+GenAllScript.swift

@@ -1,21 +1,21 @@
-// Generated by ResgenSwift.Color 2.2.0
+// Generated by ResgenSwift.Color 1.2
 
 import UIKit
 
 extension UIColorYolo {
 
     /// Color red is #FF0000 (light) or #FF0000 (dark)"
-    @objc public var red: UIColor {
+    @objc var red: UIColor {
         UIColor(named: "red")!
     }
 
     /// Color green_alpha_50 is #A000FF00 (light) or #A000FF00 (dark)"
-    @objc public var green_alpha_50: UIColor {
+    @objc var green_alpha_50: UIColor {
         UIColor(named: "green_alpha_50")!
     }
 
     /// Color blue_light_dark is #0000FF (light) or #0000AA (dark)"
-    @objc public var blue_light_dark: UIColor {
+    @objc var blue_light_dark: UIColor {
         UIColor(named: "blue_light_dark")!
     }
 }

SampleFiles/Fonts/Generated/FontYolo+GenAllScript.swift

@@ -1,10 +1,10 @@
-// Generated by ResgenSwift.Fonts 2.2.0
+// Generated by ResgenSwift.Fonts 2.1.0
 
 import SwiftUI
 
 extension FontYolo {
 
-    public enum FontName: String {
+    enum FontName: String {
         case LatoItalic = "Lato-Italic"
         case LatoLightItalic = "Lato-LightItalic"
         case LatoHairline = "Lato-Hairline"
@@ -19,43 +19,43 @@ extension FontYolo {
 
     // MARK: - Getter
 
-    public func LatoItalic(withSize size: CGFloat) -> Font {
+    func LatoItalic(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoItalic.rawValue, size: size)
     }
 
-    public func LatoLightItalic(withSize size: CGFloat) -> Font {
+    func LatoLightItalic(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoLightItalic.rawValue, size: size)
     }
 
-    public func LatoHairline(withSize size: CGFloat) -> Font {
+    func LatoHairline(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoHairline.rawValue, size: size)
     }
 
-    public func LatoBold(withSize size: CGFloat) -> Font {
+    func LatoBold(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoBold.rawValue, size: size)
     }
 
-    public func LatoBlack(withSize size: CGFloat) -> Font {
+    func LatoBlack(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoBlack.rawValue, size: size)
     }
 
-    public func LatoRegular(withSize size: CGFloat) -> Font {
+    func LatoRegular(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoRegular.rawValue, size: size)
     }
 
-    public func LatoBlackItalic(withSize size: CGFloat) -> Font {
+    func LatoBlackItalic(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoBlackItalic.rawValue, size: size)
     }
 
-    public func LatoBoldItalic(withSize size: CGFloat) -> Font {
+    func LatoBoldItalic(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoBoldItalic.rawValue, size: size)
     }
 
-    public func LatoLight(withSize size: CGFloat) -> Font {
+    func LatoLight(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoLight.rawValue, size: size)
     }
 
-    public func LatoHairlineItalic(withSize size: CGFloat) -> Font {
+    func LatoHairlineItalic(withSize size: CGFloat) -> Font {
         Font.custom(FontName.LatoHairlineItalic.rawValue, size: size)
     }
 }

SampleFiles/Fonts/Generated/UIFontYolo+GenAllScript.swift

@@ -1,10 +1,10 @@
-// Generated by ResgenSwift.Fonts 2.2.0
+// Generated by ResgenSwift.Fonts 2.1.0
 
 import UIKit
 
 extension UIFontYolo {
 
-    public enum FontName: String {
+    enum FontName: String {
         case LatoItalic = "Lato-Italic"
         case LatoLightItalic = "Lato-LightItalic"
         case LatoHairline = "Lato-Hairline"
@@ -19,43 +19,43 @@ extension UIFontYolo {
 
     // MARK: - Getter
 
-public func LatoItalic(withSize size: CGFloat) -> UIFont {
+    func LatoItalic(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoItalic.rawValue, size: size)!
     }
 
-public func LatoLightItalic(withSize size: CGFloat) -> UIFont {
+    func LatoLightItalic(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoLightItalic.rawValue, size: size)!
     }
 
-public func LatoHairline(withSize size: CGFloat) -> UIFont {
+    func LatoHairline(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoHairline.rawValue, size: size)!
     }
 
-public func LatoBold(withSize size: CGFloat) -> UIFont {
+    func LatoBold(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoBold.rawValue, size: size)!
     }
 
-public func LatoBlack(withSize size: CGFloat) -> UIFont {
+    func LatoBlack(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoBlack.rawValue, size: size)!
     }
 
-public func LatoRegular(withSize size: CGFloat) -> UIFont {
+    func LatoRegular(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoRegular.rawValue, size: size)!
     }
 
-public func LatoBlackItalic(withSize size: CGFloat) -> UIFont {
+    func LatoBlackItalic(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoBlackItalic.rawValue, size: size)!
     }
 
-public func LatoBoldItalic(withSize size: CGFloat) -> UIFont {
+    func LatoBoldItalic(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoBoldItalic.rawValue, size: size)!
     }
 
-public func LatoLight(withSize size: CGFloat) -> UIFont {
+    func LatoLight(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoLight.rawValue, size: size)!
     }
 
-public func LatoHairlineItalic(withSize size: CGFloat) -> UIFont {
+    func LatoHairlineItalic(withSize size: CGFloat) -> UIFont {
         UIFont(name: FontName.LatoHairlineItalic.rawValue, size: size)!
     }
 }

SampleFiles/Images/Generated/ImageYolo+GenAllScript.swift

@@ -1,31 +1,31 @@
-// Generated by ResgenSwift.Images 2.2.0
+// Generated by ResgenSwift.Images 2.1.0
 // Images from sampleImages
 
 import SwiftUI
 
 extension ImageYolo {
 
-    public var article_notification_pull_detail: Image {
+    var article_notification_pull_detail: Image {
         Image("article_notification_pull_detail")
     }
 
-    public var article_notification_pull: Image {
+    var article_notification_pull: Image {
         Image("article_notification_pull")
     }
 
-    public var new_article: Image {
+    var new_article: Image {
         Image("new_article")
     }
 
-    public var welcome_background: Image {
+    var welcome_background: Image {
         Image("welcome_background")
     }
 
-    public var article_trash: Image {
+    var article_trash: Image {
         Image("article_trash")
     }
 
-    public var ic_close_article: Image {
+    var ic_close_article: Image {
         Image("ic_close_article")
     }
 }

SampleFiles/Images/Generated/UIImageYolo+GenAllScript.swift

@@ -1,31 +1,31 @@
-// Generated by ResgenSwift.Images 2.2.0
+// Generated by ResgenSwift.Images 2.1.0
 // Images from sampleImages
 
 import UIKit
 
 extension UIImageYolo {
 
-    public var article_notification_pull_detail: UIImage {
+    var article_notification_pull_detail: UIImage {
         UIImage(named: "article_notification_pull_detail")!
     }
 
-    public var article_notification_pull: UIImage {
+    var article_notification_pull: UIImage {
         UIImage(named: "article_notification_pull")!
     }
 
-    public var new_article: UIImage {
+    var new_article: UIImage {
         UIImage(named: "new_article")!
     }
 
-    public var welcome_background: UIImage {
+    var welcome_background: UIImage {
         UIImage(named: "welcome_background")!
     }
 
-    public var article_trash: UIImage {
+    var article_trash: UIImage {
         UIImage(named: "article_trash")!
     }
 
-    public var ic_close_article: UIImage {
+    var ic_close_article: UIImage {
         UIImage(named: "ic_close_article")!
     }
 }

SampleFiles/Strings/Generated/String+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Strings.Stringium 2.2.0
+// Generated by ResgenSwift.Strings.Stringium 2.1.0
 
 import UIKit
 
@@ -6,7 +6,7 @@ fileprivate let kStringsFileName = "sampleStrings"
 
 extension String {
 
-    internal enum KeyGenAllScript: String {
+    enum KeyGenAllScript: String {
         case param_lang = "param_lang"
         case generic_back = "generic_back"
         case generic_loading_data = "generic_loading_data"
@@ -14,7 +14,7 @@ extension String {
         case test_equal_symbol = "test_equal_symbol"
         case placeholders_test_one = "placeholders_test_one"
 
-        internal var keyPath: KeyPath<String, String> {
+        var keyPath: KeyPath<String, String> {
             switch self {
             case .param_lang: return \String.param_lang
             case .generic_back: return \String.generic_back
@@ -33,7 +33,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    internal var param_lang: String {
+    var param_lang: String {
         NSLocalizedString("param_lang", tableName: kStringsFileName, bundle: Bundle.main, value: "en", comment: "")
     }
 
@@ -44,17 +44,17 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    internal var generic_back: String {
+    var generic_back: String {
         NSLocalizedString("generic_back", tableName: kStringsFileName, bundle: Bundle.main, value: "Back", comment: "")
     }
 
     /// Translation in en :
-    /// Loading\ndata...
+    /// Loading data...
     ///
     /// Comment :
     /// No comment
-    internal var generic_loading_data: String {
-        NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading\ndata...", comment: "")
+    var generic_loading_data: String {
+        NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading data...", comment: "")
     }
 
     /// Translation in en :
@@ -62,7 +62,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    internal var generic_welcome_firstname_format: String {
+    var generic_welcome_firstname_format: String {
         NSLocalizedString("generic_welcome_firstname_format", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "")
     }
     /// Translation in en :
@@ -70,7 +70,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    internal func generic_welcome_firstname_format(arg0: String) -> String {
+    func generic_welcome_firstname_format(arg0: String) -> String {
         String(format: self.generic_welcome_firstname_format, arg0)
     }
 
@@ -81,7 +81,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    internal var test_equal_symbol: String {
+    var test_equal_symbol: String {
         NSLocalizedString("test_equal_symbol", tableName: kStringsFileName, bundle: Bundle.main, value: "1€ = 1 point !", comment: "")
     }
 
@@ -92,7 +92,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    internal var placeholders_test_one: String {
+    var placeholders_test_one: String {
         NSLocalizedString("placeholders_test_one", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "")
     }
     /// Translation in en :
@@ -100,7 +100,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    internal func placeholders_test_one(arg0: String, arg1: String, arg2: Int) -> String {
+    func placeholders_test_one(arg0: String, arg1: String, arg2: Int) -> String {
         String(format: self.placeholders_test_one, arg0, arg1, arg2)
     }
 }

SampleFiles/Strings/Generated/sampleStrings.xcstrings

@@ -1,150 +0,0 @@
-{
-  "sourceLanguage" : "en",
-  "strings" : {
-    "generic_back" : {
-      "comment" : "",
-      "extractionState" : "manual",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Back"
-          }
-        },
-        "en-us" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Back"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Retour"
-          }
-        }
-      }
-    },
-    "generic_loading_data" : {
-      "comment" : "",
-      "extractionState" : "manual",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Loading\ndata..."
-          }
-        },
-        "en-us" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Loading\ndata..."
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Chargement\ndes données..."
-          }
-        }
-      }
-    },
-    "generic_welcome_firstname_format" : {
-      "comment" : "",
-      "extractionState" : "manual",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Welcome \"%@\" !"
-          }
-        },
-        "en-us" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Welcome \"%@\" !"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Bienvenue \"%@\" !"
-          }
-        }
-      }
-    },
-    "param_lang" : {
-      "comment" : "",
-      "extractionState" : "manual",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "en"
-          }
-        },
-        "en-us" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "en-us"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "fr"
-          }
-        }
-      }
-    },
-    "placeholders_test_one" : {
-      "comment" : "",
-      "extractionState" : "manual",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "You %%: %2$@ %1$@ Age: %3$d"
-          }
-        },
-        "en-us" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "You %%: %2$@ %1$@ Age: %3$d"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Vous %%: %1$@ %2$@ Age: %3$d"
-          }
-        }
-      }
-    },
-    "test_equal_symbol" : {
-      "comment" : "",
-      "extractionState" : "manual",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "1€ = 1 point !"
-          }
-        },
-        "en-us" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "1€ = 1 point !"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "1€ = 1 point !"
-          }
-        }
-      }
-    }
-  },
-  "version" : "1.0"
-}

SampleFiles/Strings/sampleStrings.txt

@@ -14,11 +14,11 @@
         fr = Retour
         en-us = Back
     [generic_loading_data]
-        en = Loading\ndata...
+        en = Loading data...
         tags = droid,ios
         comments =
-        fr = Chargement\ndes données...
-        en-us = Loading\ndata...
+        fr = Chargement des données...
+        en-us = Loading data...
     [generic_welcome_firstname_format]
         en = Welcome "%@" !
         tags = droid,ios

SampleFiles/Tags/Generated/Analytics+GenAllScript.swift

@@ -1,13 +1,11 @@
-// Generated by ResgenSwift.Analytics 2.2.0
+// Generated by ResgenSwift.Analytics 2.1.0
 
-import Foundation
 import MatomoTracker
 import FirebaseAnalytics
 
 // MARK: - Protocol
 
-public protocol AnalyticsManagerProtocol {
-
+protocol AnalyticsManagerProtocol {
     func logScreen(
         name: String,
         path: String,
@@ -90,12 +88,70 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
     }
 }
 
-// MARK: - Firebase
+// MARK: - Matomo
 
-class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
+class MatomoAnalyticsManager: AnalyticsManagerProtocol {
+
+    // MARK: - Properties
+
+    private var tracker: MatomoTracker
+
+    // MARK: - Init
+
+    init(siteId: String, url: String) {
+        debugPrint("[Matomo service] Server URL: \(url)")
+        debugPrint("[Matomo service] Site ID: \(siteId)")
+        tracker = MatomoTracker(
+            siteId: siteId,
+            baseURL: URL(string: url)!
+        )
+
+        #if DEBUG
+            tracker.dispatchInterval = 5
+        #endif
+
+        #if DEBUG
+            tracker.logger = DefaultLogger(minLevel: .verbose)
+        #endif
+
+        debugPrint("[Matomo service] Configured with content base: \(tracker.contentBase?.absoluteString ?? "-")")
+        debugPrint("[Matomo service] Opt out: \(tracker.isOptedOut)")
+    }
 
     // MARK: - Methods
 
+    func logScreen(name: String, path: String) {
+        guard !tracker.isOptedOut else { return }
+        guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
+
+        let urlString = URL(string: "\(trackerUrl)" + "/" + "\(path)" + "iOS")
+        tracker.track(
+            view: [name],
+            url: urlString
+        )
+    }
+
+    func logEvent(
+        name: String,
+        action: String,
+        category: String,
+        params: [String: Any]?
+    ) {
+        guard !tracker.isOptedOut else { return }
+
+        tracker.track(
+            eventWithCategory: category,
+            action: action,
+            name: name,
+            number: nil,
+            url: nil
+        )
+    }
+}
+
+// MARK: - Firebase
+
+class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
     func logScreen(
         name: String,
         path: String,
@@ -162,31 +218,20 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
             parameters: parameters
         )
     }
-
     func setEnable(_ enable: Bool) {
         Analytics.setAnalyticsCollectionEnabled(enable)
     }
 }
 
-// MARK: - Traker Type
-
-public enum TrackerType: CaseIterable {
-
-    case matomo
-    case firebase
-}
-
 // MARK: - Manager
 
-public class AnalyticsManager {
+class AnalyticsManager {
 
-    public static var shared = AnalyticsManager()
-
-    private init() {}
+    static var shared = AnalyticsManager()
 
     // MARK: - Properties
 
-    var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
+    var managers: [TargetType: AnalyticsManagerProtocol] = []
 
     private var isEnabled: Bool {
         if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
@@ -196,9 +241,9 @@ public class AnalyticsManager {
         }
     }
 
-    // MARK: - Enable Methods
+    // MARK: - Methods
 
-    private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
+    private func setAnalytics(enable: Bool) {
         managers.forEach { (key, value) in
             if analytics.contains(where: { type in
                 type == key
@@ -208,15 +253,15 @@ public class AnalyticsManager {
         }
     }
 
-    public func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-        setAnalytics(enable: true, analytics)
+    func enableAnalytics(_ analytics: [TargetType] = TargetType.allCases) {
+        setAnalytics(enable: true)
     }
 
-    public func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-        setAnalytics(enable: false, analytics)
+    func disableAnalytics(_ analytics: [TargetType] = TargetType.allCases) {
+        setAnalytics(enable: false)
     }
 
-    public func configure(siteId: String, url: String) {
+    func configure(siteId: String, url: String) {
         managers[TrackerType.matomo] = MatomoAnalyticsManager(
             siteId: siteId,
             url: url
@@ -224,13 +269,7 @@ public class AnalyticsManager {
         managers[TrackerType.firebase] = FirebaseAnalyticsManager()
     }
 
-    // MARK: - Private Log Methods
-
-    private func logScreen(
-        name: String,
-        path: String,
-        params: [String: Any]?
-    ) {
+    private func logScreen(name: String, path: String) {
         guard isEnabled else { return }
 
         managers.values.forEach { manager in
@@ -262,20 +301,20 @@ public class AnalyticsManager {
 
     // MARK: - section_one
 
-    public func logScreenS1DefOne(title: String) {
-        logScreen(
+    static func logScreenS1DefOne(title: String) {
+        AnalyticsManager.shared.logScreen(
             name: "s1 def one \(title)",
             path: "s1_def_one/\(title)",
             params: nil
         )
     }
 
-    public func logEventS1DefTwo(
+    static func logEventS1DefTwo(
         title: String,
 		count: String,
 		test2: String = "test"
     ) {
-        logEvent(
+        AnalyticsManager.shared.logEvent(
             name: "s1 def two",
             action: "test",
             category: "test",
@@ -290,8 +329,8 @@ public class AnalyticsManager {
 
     // MARK: - section_two
 
-    public func logScreenS2DefOne() {
-        logScreen(
+    static func logScreenS2DefOne() {
+        AnalyticsManager.shared.logScreen(
             name: "s2 def one",
             path: "s2_def_one/",
             params: nil

SampleFiles/Tags/Generated/Tags+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Strings.Tags 2.2.0
+// Generated by ResgenSwift.Strings.Tags 2.1.0
 
 import UIKit
 
@@ -11,7 +11,8 @@ extension Tags {
     ///
     /// Comment :
     /// No comment
-    public var screen_one: String {
+
+    var screen_one: String {
         "Ecran un"
     }
 
@@ -20,7 +21,8 @@ extension Tags {
     ///
     /// Comment :
     /// No comment
-    public var screen_two: String {
+
+    var screen_two: String {
         "Ecran deux"
     }
 }

SampleFiles/genAllRessources.sh

@@ -3,34 +3,34 @@
 FORCE_FLAG="$1"
 
 ## Font
-#swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/sampleFontsAll.txt" \
-# --extension-output-path "./Fonts/Generated" \
-# --extension-name "FontYolo" \
-# --extension-name-ui-kit "UIFontYolo" \
-# --extension-suffix "GenAllScript" \
-# --info-plist-paths "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"
-#
-#echo "\n-------------------------\n"
-#
-### Color
-#swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/sampleColors1.txt" \
-# --style all \
-# --xcassets-path "./Colors/colors.xcassets" \
-# --extension-output-path "./Colors/Generated/" \
-# --extension-name "ColorYolo" \
-# --extension-name-ui-kit "UIhkjhkColorYolo" \
-# --extension-suffix "GenAllScript"
-#
-#echo "\n-------------------------\n"
-#
-### Twine
-#swift run -c release ResgenSwift strings twine $FORCE_FLAG "./Twine/sampleStrings.txt" \
-# --output-path "./Twine/Generated" \
-# --langs "fr en en-us" \
-# --default-lang "en" \
-# --extension-output-path "./Twine/Generated"
-#
-#echo "\n-------------------------\n"
+swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/sampleFontsAll.txt" \
+ --extension-output-path "./Fonts/Generated" \
+ --extension-name "FontYolo" \
+ --extension-name-ui-kit "UIFontYolo" \
+ --extension-suffix "GenAllScript" \
+ --info-plist-paths "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"
+
+echo "\n-------------------------\n"
+
+## Color
+swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/sampleColors1.txt" \
+ --style all \
+ --xcassets-path "./Colors/colors.xcassets" \
+ --extension-output-path "./Colors/Generated/" \
+ --extension-name "ColorYolo" \
+ --extension-name-ui-kit "UIhkjhkColorYolo" \
+ --extension-suffix "GenAllScript"
+
+echo "\n-------------------------\n"
+
+## Twine
+swift run -c release ResgenSwift strings twine $FORCE_FLAG "./Twine/sampleStrings.txt" \
+ --output-path "./Twine/Generated" \
+ --langs "fr en en-us" \
+ --default-lang "en" \
+ --extension-output-path "./Twine/Generated"
+
+echo "\n-------------------------\n"
 
 ## Strings
 swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/sampleStrings.txt" \
@@ -41,31 +41,31 @@ swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/sample
  --extension-name "String" \
  --extension-suffix "GenAllScript"
 
+echo "\n-------------------------\n"
+
+## Tags
+swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/sampleTags.txt" \
+ --lang "ium" \
+ --extension-output-path "./Tags/Generated" \
+ --extension-name "Tags" \
+ --extension-suffix "GenAllScript"
+
 #echo "\n-------------------------\n"
-#
-### Tags
-#swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/sampleTags.txt" \
-# --lang "ium" \
-# --extension-output-path "./Tags/Generated" \
-# --extension-name "Tags" \
-# --extension-suffix "GenAllScript"
-#
-#echo "\n-------------------------\n"
-#
-## Analytics
-#swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \
-# --target "firebase" \
-# --extension-output-path "./Tags/Generated" \
-# --extension-name "Analytics" \
-# --extension-suffix "GenAllScript" \
-# --static-members true
-#
-#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 "ImageYolo" \
-# --extension-name-ui-kit "UIImageYolo" \
-# --extension-suffix "GenAllScript"
+
+# Analytics
+swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \
+ --target "firebase matomo" \
+ --extension-output-path "./Tags/Generated" \
+ --extension-name "Analytics" \
+ --extension-suffix "GenAllScript" \
+ --static-members true
+
+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 "ImageYolo" \
+ --extension-name-ui-kit "UIImageYolo" \
+ --extension-suffix "GenAllScript"

SampleFiles/resgenConfiguration.yml

@@ -37,7 +37,6 @@ strings:
  extensionOutputPath: ./Strings/Generated
  extensionName: String
  extensionSuffix: GenAllScript
-  visibility: public
 
 
 #
@@ -51,7 +50,6 @@ images:
   extensionName: ImageYolo
   extensionNameUIKit: UIImageYolo
   extensionSuffix: GenAllScript
-  visibility: public
 
 
 # 
@@ -66,7 +64,6 @@ colors:
  extensionName: ColorYolo
  extensionNameUIKit: UIColorYolo
  extensionSuffix: GenAllScript
-  visibility: public
 
 
 #
@@ -79,7 +76,6 @@ tags:
   extensionOutputPath: ./Tags/Generated
   extensionName: Tags
   extensionSuffix: GenAllScript
-  visibility: public
 
 
 #
@@ -89,8 +85,9 @@ analytics:
 -
   inputFile: ./Tags/sampleTags.yml
   target: "matomo firebase"
-  outputFile: ./Tags/Generated/Analytics+GenAllScript.swift
-  visibility: public
+  extensionOutputPath: ./Tags/Generated
+  extensionName: Analytics
+  extensionSuffix: GenAllScript
 
 
 #
@@ -104,4 +101,3 @@ fonts:
    extensionNameUIKit: UIFontYolo
    extensionSuffix: GenAllScript
    infoPlistPaths: "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"
-  visibility: public

Sources/ResgenSwift/Analytics/Analytics.swift

@@ -49,9 +49,9 @@ struct Analytics: ParsableCommand {
             sections: sections,
             target: options.target,
             tags: ["ios", "iosonly"],
-            isStatic: options.staticMembers,
-            outputFile: options.outputFile,
-            visibility: options.extensionVisibility
+            staticVar: options.staticMembers,
+            extensionName: options.extensionName,
+            extensionFilePath: options.extensionFilePath
         )
 
         print("[\(Self.toolName)] Analytics generated")
@@ -79,7 +79,7 @@ struct Analytics: ParsableCommand {
         guard GeneratorChecker.shouldGenerate(
             force: options.forceGeneration,
             inputFilePath: options.inputFile,
-            extensionFilePath: options.outputFile
+            extensionFilePath: options.extensionFilePath
         ) else {
             print("[\(Self.toolName)] Analytics are already up to date :) ")
             return false

Sources/ResgenSwift/Analytics/AnalyticsOptions.swift

@@ -7,41 +7,45 @@
 
 import ArgumentParser
 import Foundation
-import ToolCore
+
+// swiftlint:disable no_grouping_extension
 
 struct AnalyticsOptions: ParsableArguments {
 
-    @Flag(
-        name: [.customShort("f"), .customShort("F")],
-        help: "Should force generation"
-    )
+    @Flag(name: [.customShort("f"), .customShort("F")], help: "Should force generation")
     var forceGeneration = false
 
-    @Argument(
-        help: "Input files where tags ared defined.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
+    @Argument(help: "Input files where tags ared defined.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var inputFile: String
 
-    @Option(
-        help: "Target(s) analytics to generate. (\"matomo\" | \"firebase\")",
-        completion: .list(["matotmo", "firebase"])
-    )
+    @Option(help: "Target(s) analytics to generate. (\"matomo\" | \"firebase\")")
     var target: String
 
-    @Option(
-        help: "Where to generate the analytics manager (path with filename)",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
-    var outputFile: String
+    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    var extensionOutputPath: String
 
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
 
-    @Option(
-        name: .customLong("visibility"),
-        help: "Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal",
-        completion: .list(["public", "private", "package", "internal"])
-    )
-    var extensionVisibility: ExtensionVisibility = .internal
+    @Option(help: "Extension name. If not specified, it will generate a Analytics extension.")
+    var extensionName: String = Analytics.defaultExtensionName
+
+    @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Analytics{extensionSuffix}.swift")
+    var extensionSuffix: String?
+}
+
+// MARK: - Computed var
+
+extension AnalyticsOptions {
+
+    var extensionFileName: String {
+        if let extensionSuffix {
+            return "\(extensionName)+\(extensionSuffix).swift"
+        }
+        return "\(extensionName).swift"
+    }
+
+    var extensionFilePath: String {
+        "\(extensionOutputPath)/\(extensionFileName)"
+    }
 }

Sources/ResgenSwift/Analytics/Generator/AnalyticsGenerator.swift

@@ -5,14 +5,11 @@
 //  Created by Loris Perret on 08/12/2023.
 //
 
-// CPD-OFF
-
 import CoreVideo
 import Foundation
 import ToolCore
 
 // Disabled cause it's a pain to handle in generated string
-// swiftlint:disable type_body_length
 
 enum AnalyticsGenerator {
 
@@ -22,9 +19,9 @@ enum AnalyticsGenerator {
         sections: [AnalyticsCategory],
         target: String,
         tags: [String],
-        isStatic: Bool,
-        outputFile: String,
-        visibility: ExtensionVisibility
+        staticVar: Bool,
+        extensionName: String,
+        extensionFilePath: String
     ) {
         // Get target type from enum
         let targetsString: [String] = target.components(separatedBy: " ")
@@ -43,16 +40,16 @@ enum AnalyticsGenerator {
             targets: targets,
             sections: sections,
             tags: tags,
-            isStatic: isStatic,
-            visibility: visibility
+            staticVar: staticVar,
+            extensionName: extensionName
         )
 
         // Write content
-        let outputFilePathURL = URL(fileURLWithPath: outputFile)
+        let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
         do {
-            try extensionFileContent.write(to: outputFilePathURL, atomically: false, encoding: .utf8)
+            try extensionFileContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
         } catch {
-            let error = AnalyticsError.writeFile(outputFile, error.localizedDescription)
+            let error = AnalyticsError.writeFile(extensionFilePath, error.localizedDescription)
             print(error.description)
             Analytics.exit(withError: error)
         }
@@ -64,20 +61,19 @@ enum AnalyticsGenerator {
         targets: [TrackerType],
         sections: [AnalyticsCategory],
         tags: [String],
-        isStatic: Bool,
-        visibility: ExtensionVisibility
+        staticVar: Bool,
+        extensionName: String
     ) -> String {
         [
             getHeader(
                 targets: targets,
-                isStatic: isStatic,
-                visibility: visibility
+                extensionClassname: extensionName,
+                staticVar: staticVar
             ),
             getProperties(
                 sections: sections,
                 tags: tags,
-                isStatic: isStatic,
-                visibility: visibility
+                staticVar: staticVar
             ),
             getFooter()
         ]
@@ -88,60 +84,52 @@ enum AnalyticsGenerator {
 
     private static func getHeader(
         targets: [TrackerType],
-        isStatic: Bool,
-        visibility: ExtensionVisibility
+        extensionClassname: String,
+        staticVar: Bool
     ) -> String {
         """
         // Generated by ResgenSwift.\(Analytics.toolName) \(ResgenSwiftVersion)
         
-        \(Self.getImport(targets: targets))
+        \(Self.getImport())
         
-        \(Self.getAnalyticsProtocol(targets: targets, visibility: visibility))
+        \(Self.getAnalyticsProtocol())
         
-        \(Self.getTrackerTypeEnum(targets: targets, visibility: visibility))
+        \(Self.getTrackerTypeEnum())
         
         // MARK: - Manager
 
-        \(visibility) class AnalyticsManager {
+        class AnalyticsManager {
         
-            \(visibility) static var shared = AnalyticsManager()
-
-            private init() {}
+            static var shared = AnalyticsManager()
 
             // MARK: - Properties
         
             var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
         
-            \(Self.getEnabledContent(visibility: visibility))
+            \(Self.getEnabledContent())
         
-            \(Self.getAnalyticsProperties(targets: targets, visibility: visibility))
+            \(Self.getAnalyticsProperties())
                 
             \(Self.getPrivateLogFunction())
         """
     }
     
-    private static func getTrackerTypeEnum(
-        targets: [TrackerType],
-        visibility: ExtensionVisibility
-    ) -> String {
+    private static func getTrackerTypeEnum() -> String {
         var result: [String] = []
-        targets.forEach { type in
+        TrackerType.allCases.forEach { type in
             result.append("    case \(type)")
         }
         
         return """
         // MARK: - Traker Type
         
-        \(visibility) enum TrackerType: CaseIterable {
-
+        enum TrackerType: CaseIterable {
         \(result.joined(separator: "\n"))
         }
         """
     }
     
-    private static func getEnabledContent(
-        visibility: ExtensionVisibility
-    ) -> String {
+    private static func getEnabledContent() -> String {
         """
         private var isEnabled: Bool {
                 if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
@@ -151,7 +139,7 @@ enum AnalyticsGenerator {
                 }
             }
         
-            // MARK: - Enable Methods
+            // MARK: - Methods
         
             private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
                 managers.forEach { (key, value) in
@@ -163,11 +151,11 @@ enum AnalyticsGenerator {
                 }
             }
         
-            \(visibility) func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+            func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
                 setAnalytics(enable: true, analytics)
             }
         
-            \(visibility) func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+            func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
                 setAnalytics(enable: false, analytics)
             }
         """
@@ -176,12 +164,9 @@ enum AnalyticsGenerator {
     private static func getImport(targets: [TrackerType]) -> String {
         var result: [String] = []
 
-        result.append("import Foundation")
-
         if targets.contains(TrackerType.matomo) {
             result.append("import MatomoTracker")
         }
-
         if targets.contains(TrackerType.firebase) {
             result.append("import FirebaseAnalytics")
         }
@@ -191,8 +176,6 @@ enum AnalyticsGenerator {
 
     private static func getPrivateLogFunction() -> String {
         """
-        // MARK: - Private Log Methods
-
         private func logScreen(
                 name: String,
                 path: String,
@@ -229,18 +212,15 @@ enum AnalyticsGenerator {
         """
     }
 
-    private static func getAnalyticsProperties(
-        targets: [TrackerType],
-        visibility: ExtensionVisibility
-    ) -> String {
+    private static func getAnalyticsProperties(targets: [TrackerType]) -> String {
         var header = ""
         var content: [String] = []
         let footer = "    }"
 
         if targets.contains(TrackerType.matomo) {
-            header = "\(visibility) func configure(siteId: String, url: String) {"
+            header = "func configure(siteId: String, url: String) {"
         } else if targets.contains(TrackerType.firebase) {
-            header = "\(visibility) func configure() {"
+            header = "func configure() {"
         }
 
         if targets.contains(TrackerType.matomo) {
@@ -251,7 +231,6 @@ enum AnalyticsGenerator {
                     )
             """)
         }
-
         if targets.contains(TrackerType.firebase) {
             content.append("        managers[TrackerType.firebase] = FirebaseAnalyticsManager()")
         }
@@ -264,15 +243,11 @@ enum AnalyticsGenerator {
             .joined(separator: "\n")
     }
 
-    private static func getAnalyticsProtocol(
-        targets: [TrackerType],
-        visibility: ExtensionVisibility
-    ) -> String {
+    private static func getAnalyticsProtocol(targets: [TrackerType]) -> String {
         let proto = """
         // MARK: - Protocol
 
-        \(visibility) protocol AnalyticsManagerProtocol {
-
+        protocol AnalyticsManagerProtocol {
             func logScreen(
                 name: String,
                 path: String,
@@ -288,6 +263,7 @@ enum AnalyticsGenerator {
         
             func setEnable(_ enable: Bool)
         }
+
         """
 
         var result: [String] = [proto]
@@ -300,14 +276,13 @@ enum AnalyticsGenerator {
             result.append(FirebaseGenerator.service)
         }
 
-        return result.joined(separator: "\n\n")
+        return result.joined(separator: "\n")
     }
 
     private static func getProperties(
         sections: [AnalyticsCategory],
         tags: [String],
-        isStatic: Bool,
-        visibility: ExtensionVisibility
+        staticVar: Bool
     ) -> String {
         sections
             .compactMap { section in
@@ -322,10 +297,10 @@ enum AnalyticsGenerator {
                         return // Go to next definition
                     }
 
-                    if isStatic {
-                        res += "\n\n\(definition.getStaticProperty(visibility: visibility))"
+                    if staticVar {
+                        res += "\n\n\(definition.getStaticProperty())"
                     } else {
-                        res += "\n\n\(definition.getProperty(visibility: visibility))"
+                        res += "\n\n\(definition.getProperty())"
                     }
                 }
                 return res
@@ -340,5 +315,3 @@ enum AnalyticsGenerator {
         """
     }
 }
-
-// CPD-ON

Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift

@@ -13,11 +13,11 @@ enum FirebaseGenerator {
 
     static var service: String {
         [
-            Self.header,
-            Self.logScreen,
-            Self.logEvent,
-            Self.enable,
-            Self.footer
+            FirebaseGenerator.header,
+            FirebaseGenerator.logScreen,
+            FirebaseGenerator.logEvent,
+            FirebaseGenerator.enable,
+            FirebaseGenerator.footer
         ]
             .joined(separator: "\n")
     }
@@ -29,9 +29,6 @@ enum FirebaseGenerator {
         // MARK: - Firebase
 
         class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
-
-            // MARK: - Methods
-
         """
     }
 
@@ -108,7 +105,6 @@ enum FirebaseGenerator {
                     parameters: parameters
                 )
             }
-
         """
     }
     
@@ -123,6 +119,7 @@ enum FirebaseGenerator {
     private static var footer: String {
         """
         }
+
         """
     }
 }

Sources/ResgenSwift/Analytics/Generator/MatomoGenerator.swift

@@ -5,20 +5,18 @@
 //  Created by Loris Perret on 05/12/2023.
 //
 
-// CPD-OFF
-
 import Foundation
 
 enum MatomoGenerator {
 
     static var service: String {
         [
-            Self.header,
-            Self.setup,
-            Self.logScreen,
-            Self.logEvent,
-            Self.enable,
-            Self.footer
+            MatomoGenerator.header,
+            MatomoGenerator.setup,
+            MatomoGenerator.logScreen,
+            MatomoGenerator.logEvent,
+            MatomoGenerator.enable,
+            MatomoGenerator.footer
         ]
             .joined(separator: "\n")
     }
@@ -117,8 +115,7 @@ enum MatomoGenerator {
     private static var footer: String {
         """
         }
+
         """
     }
 }
-
-// CPD-ON

Sources/ResgenSwift/Analytics/Model/AnalyticsDefinition.swift

@@ -60,10 +60,8 @@ class AnalyticsDefinition {
             switch parameter.type {
             case .bool:
                 defaultValue = "\(parameter.defaultValue.lowercased())"
-
             case .int, .double:
                 defaultValue = "\(parameter.defaultValue)"
-
             case .string:
                 defaultValue = "\"\(parameter.defaultValue)\""
             }
@@ -92,13 +90,9 @@ class AnalyticsDefinition {
             for rep in parameter.replaceIn {
                 switch rep {
                 case "name": name = name.replacingFirstOccurrence(of: "_\(parameter.name.uppercased())_", with: "\\(\(parameter.name))")
-
                 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:
                     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))")
@@ -123,10 +117,8 @@ class AnalyticsDefinition {
                 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)\"")
                 }
@@ -169,19 +161,19 @@ class AnalyticsDefinition {
 
     // MARK: - Raw strings
 
-    func getProperty(visibility: ExtensionVisibility) -> String {
+    func getProperty() -> String {
         replaceIn()
         return """
-            \(visibility) func \(getFuncName())\(getParameters()) {
+            func \(getFuncName())\(getParameters()) {
                 \(getlogFunction())
             }
         """
     }
 
-    func getStaticProperty(visibility: ExtensionVisibility) -> String {
+    func getStaticProperty() -> String {
         replaceIn()
         return """
-            \(visibility) static func \(getFuncName())\(getParameters()) {
+            static func \(getFuncName())\(getParameters()) {
                 AnalyticsManager.shared.\(getlogFunction())
             }
         """

Sources/ResgenSwift/Analytics/Model/ParameterType.swift

@@ -8,7 +8,6 @@
 import Foundation
 
 enum ParameterType: String {
-
     case string = "String"
     case int = "Int"
     case double = "Double"

Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift

@@ -78,21 +78,18 @@ class AnalyticsFileParser {
                     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
             }
@@ -150,7 +147,7 @@ class AnalyticsFileParser {
         }
 
         if let parameters {
-            definition.parameters = Self.getParameters(from: parameters)
+            definition.parameters = getParameters(from: parameters)
         }
 
         return definition

Sources/ResgenSwift/Colors/Colors.swift

@@ -21,6 +21,8 @@ struct Colors: ParsableCommand {
     // MARK: - Static
 
     static let toolName = "Color"
+    static let defaultExtensionName = "Color"
+    static let defaultExtensionNameUIKit = "UIColor"
     static let assetsColorsFolderName = "Colors"
 
     // MARK: - Command options
@@ -55,32 +57,22 @@ struct Colors: ParsableCommand {
         // -> Time: 3.4505380392074585 seconds
 
         // Generate extension
-        if let extensionName = options.extensionName,
-           let extensionFilePath = options.extensionFilePath {
         ColorExtensionGenerator.writeExtensionFile(
             colors: parsedColors,
-                isStatic: options.staticMembers,
-                extensionName: extensionName,
-                extensionFilePath: extensionFilePath,
-                isSwiftUI: true,
-                visibility: options.extensionVisibility,
-                assetBundle: options.assetBundle
+            staticVar: options.staticMembers,
+            extensionName: options.extensionName,
+            extensionFilePath: options.extensionFilePath,
+            isSwiftUI: true
         )
-        }
 
         // Generate extension
-        if let extensionNameUIKit = options.extensionNameUIKit,
-           let extensionFilePathUIKit = options.extensionFilePathUIKit {
         ColorExtensionGenerator.writeExtensionFile(
             colors: parsedColors,
-                isStatic: options.staticMembers,
-                extensionName: extensionNameUIKit,
-                extensionFilePath: extensionFilePathUIKit,
-                isSwiftUI: false,
-                visibility: options.extensionVisibility,
-                assetBundle: options.assetBundle
+            staticVar: options.staticMembers,
+            extensionName: options.extensionNameUIKit,
+            extensionFilePath: options.extensionFilePathUIKit,
+            isSwiftUI: false
         )
-        }
 
         print("[\(Self.toolName)] Colors generated")
     }
@@ -104,40 +96,18 @@ struct Colors: ParsableCommand {
             Self.exit(withError: error)
         }
 
-        // Extension for UIKit and SwiftUI should have different name (if both are defined)
-        if let extensionName = options.extensionName,
-           let extensionNameUIKit = options.extensionNameUIKit {
-            guard extensionName != extensionNameUIKit else {
-                let error = ColorsToolError.extensionNamesCollision(extensionName)
+        // Extension for UIKit and SwiftUI should have different name
+        guard options.extensionName != options.extensionNameUIKit else {
+            let error = ColorsToolError.extensionNamesCollision(options.extensionName)
             print(error.description)
             Self.exit(withError: error)
         }
-        }
-
-        // If an extension need to be generated, ensure extensionOutputPath is defined
-        if options.extensionName != nil ||
-            options.extensionNameUIKit != nil {
-            guard let extensionOutputPath = options.extensionOutputPath,
-                  extensionOutputPath.isEmpty == false else {
-                let error = ColorsToolError.missingExtensionPath
-                print(error.description)
-                Self.exit(withError: error)
-            }
-        }
 
         // Check if needed to regenerate
-        let fileToCompareToInput: String = {
-            // If there is no extension file to compare
-            // Then check the xcassets file instead
-            if let extensionFilePath = options.extensionFilePath {
-                return extensionFilePath
-            }
-            return options.xcassetsPath
-        }()
         guard GeneratorChecker.shouldGenerate(
             force: options.forceGeneration,
             inputFilePath: options.inputFile,
-            extensionFilePath: fileToCompareToInput
+            extensionFilePath: options.extensionFilePath
         ) else {
             print("[\(Self.toolName)] Colors are already up to date :) ")
             return false

Sources/ResgenSwift/Colors/ColorsToolError.swift

@@ -17,12 +17,11 @@ enum ColorsToolError: Error {
     case fileNotExists(String)
     case badColorDefinition(String, String)
     case deleteExistingColors(String)
-    case missingExtensionPath
 
     var description: String {
         switch self {
         case .extensionNamesCollision(let extensionName):
-            return "error: [\(Colors.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
+            return "error: [\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
 
         case .badFormat(let info):
             return "error: [\(Colors.toolName)] Bad line format: \(info). Accepted format are: colorName=\"#RGB/#ARGB\"; colorName \"#RGB/#ARGB\"; colorName \"#RGB/#ARGB\" \"#RGB/#ARGB\""
@@ -44,9 +43,6 @@ enum ColorsToolError: Error {
 
         case .deleteExistingColors(let assetsFolder):
             return "error: [\(Colors.toolName)] An error occured while deleting colors folder `\(assetsFolder)`"
-
-        case .missingExtensionPath:
-            return "error: [\(Colors.toolName)] Extension need to be generated but no `extensionOutputPath` is provided"
         }
     }
 }

Sources/ResgenSwift/Colors/ColorsToolOptions.swift

@@ -5,63 +5,36 @@
 //  Created by Thibaut Schmitt on 17/01/2022.
 //
 
-// CPD-OFF
-
 import ArgumentParser
 import Foundation
-import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
 struct ColorsToolOptions: ParsableArguments {
 
-    @Flag(
-        name: [.customShort("f"), .customShort("F")],
-        help: "Should force generation"
-    )
+    @Flag(name: [.customShort("f"), .customShort("F")], help: "Should force generation")
     var forceGeneration = false
 
-    @Argument(
-        help: "Input files where colors ared defined.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
+    @Argument(help: "Input files where colors ared defined.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var inputFile: String
 
     @Option(help: "Color style to generate: light for light colors only, or all for dark and light colors")
     var style: ColorStyle
 
-    @Option(
-        help: "Path of xcassets where to generate colors",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
+    @Option(help: "Path of xcassets where to generate colors", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var xcassetsPath: String
 
+    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    var extensionOutputPath: String
+
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
 
-    @Option(
-        name: .customLong("visibility"),
-        help: "Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal",
-        completion: .list(["public", "private", "package", "internal"])
-    )
-    var extensionVisibility: ExtensionVisibility = .internal
+    @Option(help: "Extension name. If not specified, it will generate an Color extension.")
+    var extensionName: String = Colors.defaultExtensionName
 
-    @Option(
-        help: "Bundle where the asset are generated"
-    )
-    var assetBundle: AssetBundle = .main
-
-    @Option(
-        help: "Path where to generate the extension.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
-    var extensionOutputPath: String?
-
-    @Option(help: "SwiftUI extension name. If not specified, no extension will be generated.")
-    var extensionName: String?
-
-    @Option(help: "UIKit extension name. If not specified, no extension will be generated.")
-    var extensionNameUIKit: String?
+    @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?
@@ -73,35 +46,27 @@ extension ColorsToolOptions {
 
     // MARK: - SwiftUI
 
-    var extensionFileName: String? {
-        guard let extensionName else { return nil }
-
+    var extensionFileName: String {
         if let extensionSuffix {
             return "\(extensionName)+\(extensionSuffix).swift"
         }
         return "\(extensionName).swift"
     }
 
-    var extensionFilePath: String? {
-        guard let extensionOutputPath, let extensionFileName else { return nil }
-
-        return "\(extensionOutputPath)/\(extensionFileName)"
+    var extensionFilePath: String {
+        "\(extensionOutputPath)/\(extensionFileName)"
     }
 
     // MARK: - UIKit
 
-    var extensionFileNameUIKit: String? {
-        guard let extensionNameUIKit else { return nil }
-
+    var extensionFileNameUIKit: String {
         if let extensionSuffix {
             return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
         return "\(extensionNameUIKit).swift"
     }
 
-    var extensionFilePathUIKit: String? {
-        guard let extensionOutputPath, let extensionFileNameUIKit else { return nil }
-
-        return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
+    var extensionFilePathUIKit: String {
+        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
+    }
 }
-}// CPD-ON

Sources/ResgenSwift/Colors/Generator/ColorExtensionGenerator.swift

@@ -17,21 +17,17 @@ struct ColorExtensionGenerator {
 
     static func writeExtensionFile(
         colors: [ParsedColor],
-        isStatic: Bool,
+        staticVar: Bool,
         extensionName: String,
         extensionFilePath: String,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        isSwiftUI: Bool
     ) {
         // Create extension content
         let extensionContent = Self.getExtensionContent(
             colors: colors,
-            isStatic: isStatic,
+            staticVar: staticVar,
             extensionName: extensionName,
-            isSwiftUI: isSwiftUI,
-            visibility: visibility,
-            assetBundle: assetBundle
+            isSwiftUI: isSwiftUI
         )
 
         // Write content
@@ -47,24 +43,13 @@ struct ColorExtensionGenerator {
 
     static func getExtensionContent(
         colors: [ParsedColor],
-        isStatic: Bool,
+        staticVar: Bool,
         extensionName: String,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        isSwiftUI: Bool
     ) -> String {
         [
-            Self.getHeader(
-                extensionClassname: extensionName,
-                isSwiftUI: isSwiftUI
-            ),
-            Self.getProperties(
-                for: colors,
-                withIsStatic: isStatic,
-                isSwiftUI: isSwiftUI,
-                visibility: visibility,
-                assetBundle: assetBundle
-            ),
+            Self.getHeader(extensionClassname: extensionName, isSwiftUI: isSwiftUI),
+            Self.getProperties(for: colors, withStaticVar: staticVar, isSwiftUI: isSwiftUI),
             Self.getFooter()
         ]
             .joined(separator: "\n")
@@ -89,18 +74,11 @@ struct ColorExtensionGenerator {
 
     private static func getProperties(
         for colors: [ParsedColor],
-        withIsStatic isStatic: Bool,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        withStaticVar staticVar: Bool,
+        isSwiftUI: Bool
     ) -> String {
         colors.map {
-            $0.getColorProperty(
-                isStatic: isStatic,
-                isSwiftUI: isSwiftUI,
-                visibility: visibility,
-                assetBundle: assetBundle
-            )
+            $0.getColorProperty(isStatic: staticVar, isSwiftUI: isSwiftUI)
         }
         .joined(separator: "\n\n")
     }

Sources/ResgenSwift/Colors/Model/ParsedColor.swift

@@ -6,19 +6,14 @@
 //
 
 import Foundation
-import ToolCore
 
 struct ParsedColor {
 
-    // MARK: - Properties
-
     let name: String
     let light: String
     let dark: String
 
-    // MARK: - Contents.json
-
-    /// Generate Contents.json content
+    // Generate Contents.json content
     func contentsJSON() -> String {
         let lightARGB = light.colorComponent()
         let darkARGB = dark.colorComponent()
@@ -78,26 +73,21 @@ struct ParsedColor {
         """
     }
 
-    // MARK: - Property
+    // MARK: - UIKit
 
-    func getColorProperty(
-        isStatic: Bool,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
-    ) -> String {
+    func getColorProperty(isStatic: Bool, isSwiftUI: Bool) -> String {
         if isSwiftUI {
             return """
                 /// Color \(name) is \(light) (light) or \(dark) (dark)"
-                \(visibility) \(isStatic ? "static " : "")var \(name): Color {
-                    Color("\(name)", bundle: Bundle.\(assetBundle))
+                \(isStatic ? "static " : "")var \(name): Color {
+                    Color("\(name)")
                 }
             """
         }
         return """
             /// Color \(name) is \(light) (light) or \(dark) (dark)"
-            \(isStatic ? "" : "@objc ")\(visibility) \(isStatic ? "static " : "")var \(name): UIColor {
-                UIColor(named: "\(name)", in: Bundle.\(assetBundle), compatibleWith: nil)!
+            \(isStatic ? "static " : "@objc ")var \(name): UIColor {
+                UIColor(named: "\(name)")!
             }
         """
     }

Sources/ResgenSwift/Fonts/FontOptions.swift

@@ -7,7 +7,6 @@
 
 import ArgumentParser
 import Foundation
-import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
@@ -19,27 +18,20 @@ struct FontsOptions: ParsableArguments {
     @Argument(help: "Input files where fonts ared defined.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var inputFile: String
 
-    @Option(help: "Tell if it will generate static properties or methods")
-    var staticMembers: Bool = false
-
-    @Option(
-        name: .customLong("visibility"),
-        help: "Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal",
-        completion: .list(["public", "private", "package", "internal"])
-    )
-    var extensionVisibility: ExtensionVisibility = .internal
-
     @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var extensionOutputPath: String
 
+    @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 Font extension.")
     var extensionName: String = Fonts.defaultExtensionName
 
-    @Option(help: "Extension name. If not specified, no extension will be generated.")
-    var extensionNameUIKit: String?
+    @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?
+    var extensionSuffix: String = ""
 
     @Option(name: .customLong("info-plist-paths"), help: "Info.plist paths (array). Will be used to update UIAppFonts content")
     fileprivate var infoPlistPathsRaw: String = ""
@@ -52,7 +44,7 @@ extension FontsOptions {
     // MARK: - SwiftUI
 
     var extensionFileName: String {
-        if let extensionSuffix {
+        if extensionSuffix.isEmpty == false {
             return "\(extensionName)+\(extensionSuffix).swift"
         }
         return "\(extensionName).swift"
@@ -64,19 +56,15 @@ extension FontsOptions {
 
     // MARK: - UIKit
 
-    var extensionFileNameUIKit: String? {
-        guard let extensionNameUIKit else { return nil }
-
-        if let extensionSuffix {
+    var extensionFileNameUIKit: String {
+        if extensionSuffix.isEmpty == false {
             return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
         return "\(extensionNameUIKit).swift"
     }
 
-    var extensionFilePathUIKit: String? {
-        guard let extensionFileNameUIKit else { return nil }
-
-        return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
+    var extensionFilePathUIKit: String {
+        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
 
     // MARK: - 

Sources/ResgenSwift/Fonts/Fonts.swift

@@ -22,6 +22,7 @@ struct Fonts: ParsableCommand {
 
     static let toolName = "Fonts"
     static let defaultExtensionName = "Font"
+    static let defaultExtensionNameUIKit = "UIFont"
 
     // MARK: - Command Options
 
@@ -54,33 +55,22 @@ struct Fonts: ParsableCommand {
         // Generate extension
         FontExtensionGenerator.writeExtensionFile(
             fontsNames: fontsNames,
-            isStatic: options.staticMembers,
+            staticVar: options.staticMembers,
             extensionName: options.extensionName,
             extensionFilePath: options.extensionFilePath,
-            isSwiftUI: true,
-            visibility: options.extensionVisibility
+            isSwiftUI: true
         )
 
-        if let extensionNameUIKit = options.extensionNameUIKit,
-           let extensionFilePathUIKit = options.extensionFilePathUIKit {
         FontExtensionGenerator.writeExtensionFile(
             fontsNames: fontsNames,
-                isStatic: options.staticMembers,
-                extensionName: extensionNameUIKit,
-                extensionFilePath: extensionFilePathUIKit,
-                isSwiftUI: false,
-                visibility: options.extensionVisibility
+            staticVar: options.staticMembers,
+            extensionName: options.extensionNameUIKit,
+            extensionFilePath: options.extensionFilePathUIKit,
+            isSwiftUI: false
         )
-        }
 
-        if options.infoPlistPaths.isEmpty == false {
-            let plistUpdateFontsData = FontPlistGenerator.generatePlistUIAppsFontContent(
-                for: fontsNames,
-                infoPlistPaths: options.infoPlistPaths
-            )
         print("Info.plist has been updated with:")
-            print(plistUpdateFontsData)
-        }
+        print("\(FontPlistGenerator.generatePlistUIAppsFontContent(for: fontsNames, infoPlistPaths: options.infoPlistPaths))")
 
         print("[\(Self.toolName)] Fonts generated")
     }

Sources/ResgenSwift/Fonts/FontsToolError.swift

@@ -14,7 +14,6 @@ enum FontsToolError: Error {
     case inputFolderNotFound(String)
     case fileNotExists(String)
     case writeExtension(String, String)
-    case missingExtensionPath
 
     var description: String {
         switch self {
@@ -32,9 +31,6 @@ enum FontsToolError: Error {
 
         case let .writeExtension(filename, info):
             return "error: [\(Fonts.toolName)] An error occured while writing extension in \(filename): \(info)"
-
-        case .missingExtensionPath:
-            return "error: [\(Fonts.toolName)] Extension need to be generated but no `extensionOutputPath` is provided"
         }
     }
 }

Sources/ResgenSwift/Fonts/Generator/FontToolContentGenerator.swift

@@ -10,11 +10,8 @@ import ToolCore
 
 enum FontExtensionGenerator {
 
-    private static func getFontNameEnum(
-        fontsNames: [FontName],
-        visibility: ExtensionVisibility
-    ) -> String {
-        var enumDefinition = "    \(visibility) enum FontName: String {\n"
+    private static func getFontNameEnum(fontsNames: [FontName]) -> String {
+        var enumDefinition = "    enum FontName: String {\n"
 
         fontsNames.forEach {
             enumDefinition += "        case \($0.fontNameSanitize) = \"\($0.postscriptName)\"\n"
@@ -26,19 +23,17 @@ enum FontExtensionGenerator {
 
     static func writeExtensionFile(
         fontsNames: [FontName],
-        isStatic: Bool,
+        staticVar: Bool,
         extensionName: String,
         extensionFilePath: String,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility
+        isSwiftUI: Bool
     ) {
         // Create extension content
         let extensionContent = Self.getExtensionContent(
             fontsNames: fontsNames,
-            isStatic: isStatic,
+            staticVar: staticVar,
             extensionName: extensionName,
-            isSwiftUI: isSwiftUI,
-            visibility: visibility
+            isSwiftUI: isSwiftUI
         )
 
         // Write content
@@ -54,35 +49,20 @@ enum FontExtensionGenerator {
 
     static func getExtensionContent(
         fontsNames: [FontName],
-        isStatic: Bool,
+        staticVar: Bool,
         extensionName: String,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility
+        isSwiftUI: Bool
     ) -> String {
         [
-            Self.getHeader(
-                extensionClassname: extensionName,
-                isSwiftUI: isSwiftUI
-            ),
-            Self.getFontNameEnum(
-                fontsNames: fontsNames,
-                visibility: visibility
-            ),
-            Self.getFontMethods(
-                fontsNames: fontsNames,
-                isStatic: isStatic,
-                isSwiftUI: isSwiftUI,
-                visibility: visibility
-            ),
+            Self.getHeader(extensionClassname: extensionName, isSwiftUI: isSwiftUI),
+            Self.getFontNameEnum(fontsNames: fontsNames),
+            Self.getFontMethods(fontsNames: fontsNames, staticVar: staticVar, isSwiftUI: isSwiftUI),
             Self.getFooter()
         ]
             .joined(separator: "\n")
     }
 
-    private static func getHeader(
-        extensionClassname: String,
-        isSwiftUI: Bool
-    ) -> String {
+    private static func getHeader(extensionClassname: String, isSwiftUI: Bool) -> String {
         """
         // Generated by ResgenSwift.\(Fonts.toolName) \(ResgenSwiftVersion)
 
@@ -92,22 +72,13 @@ enum FontExtensionGenerator {
         """
     }
 
-    private static func getFontMethods(
-        fontsNames: [FontName],
-        isStatic: Bool,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility
-    ) -> String {
+    private static func getFontMethods(fontsNames: [FontName], staticVar: Bool, isSwiftUI: Bool) -> String {
         let pragma = "    // MARK: - Getter"
 
         var propertiesOrMethods: [String] = fontsNames
             .unique()
             .map {
-                $0.getProperty(
-                    isStatic: isStatic,
-                    isSwiftUI: isSwiftUI,
-                    visibility: visibility
-                )
+                $0.getProperty(isStatic: staticVar, isSwiftUI: isSwiftUI)
             }
 
         propertiesOrMethods.insert(pragma, at: 0)

Sources/ResgenSwift/Fonts/Model/FontName.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
@@ -23,43 +22,33 @@ extension FontName {
         postscriptName.removeCharacters(from: "[]+-_")
     }
 
-    func getProperty(
-        isStatic: Bool,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility
-    ) -> String {
-        switch (isSwiftUI, isStatic) {
-        case (true, true):
-            // SwiftUI, Static => let
-            """
-                \(visibility) static let \(fontNameSanitize): ((_ size: CGFloat) -> Font) = { size in
+    func getProperty(isStatic: Bool, isSwiftUI: Bool) -> String {
+        if isSwiftUI {
+            if isStatic {
+                return """
+                    static let \(fontNameSanitize): ((_ size: CGFloat) -> Font) = { size in
                         Font.custom(FontName.\(fontNameSanitize).rawValue, size: size)
                     }
                 """
-
-        case (true, false):
-            // SwiftUI, Not Static => func
-            """
-                \(visibility) func \(fontNameSanitize)(withSize size: CGFloat) -> Font {
+            }
+            return """
+                func \(fontNameSanitize)(withSize size: CGFloat) -> Font {
                     Font.custom(FontName.\(fontNameSanitize).rawValue, size: size)
                 }
             """
-
-        case (false, true):
-            // UIKit, Static => let
-            """
-                \(visibility) static let \(fontNameSanitize): ((_ size: CGFloat) -> UIFont) = { size in
+        }
+        // UIKit
+        if isStatic {
+            return """
+                static let \(fontNameSanitize): ((_ size: CGFloat) -> UIFont) = { size in
                     UIFont(name: FontName.\(fontNameSanitize).rawValue, size: size)!
                 }
             """
-
-        case (false, false):
-            // UIKit, Not Static => func
-            """
-            \(visibility) func \(fontNameSanitize)(withSize size: CGFloat) -> UIFont {
+        }
+        return """
+            func \(fontNameSanitize)(withSize size: CGFloat) -> UIFont {
                 UIFont(name: FontName.\(fontNameSanitize).rawValue, size: size)!
             }
         """
     }
 }
-}

Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift

@@ -86,21 +86,31 @@ struct AnalyticsConfiguration: Codable, CustomDebugStringConvertible {
 
     let inputFile: String
     let target: String
-    let outputFile: String
-    let visibility: String?
-    let staticMembers: Bool?
+    let extensionOutputPath: String
+    let extensionName: String?
+    let extensionSuffix: String?
+    private let staticMembers: Bool?
+
+    var staticMembersOptions: Bool {
+        if let staticMembers {
+            return staticMembers
+        }
+        return false
+    }
 
     internal init(
         inputFile: String,
         target: String,
-        outputFile: String,
-        visibility: String?,
+        extensionOutputPath: String,
+        extensionName: String?,
+        extensionSuffix: String?,
         staticMembers: Bool?
     ) {
         self.inputFile = inputFile
         self.target = target
-        self.outputFile = outputFile
-        self.visibility = visibility
+        self.extensionOutputPath = extensionOutputPath
+        self.extensionName = extensionName
+        self.extensionSuffix = extensionSuffix
         self.staticMembers = staticMembers
     }
 
@@ -109,9 +119,9 @@ struct AnalyticsConfiguration: Codable, CustomDebugStringConvertible {
         Analytics configuration:
             - Input file: \(inputFile)
             - Target: \(target)
-            - Output file: \(outputFile)
-            - Visiblity: \(visibility ?? "default")
-            - Static members: \(staticMembers != nil ? "\(String(describing: staticMembers))" : "default")
+            - Extension output path: \(extensionOutputPath)
+            - Extension name: \(extensionName ?? "-")
+            - Extension suffix: \(extensionSuffix ?? "-")
         """
     }
 }
@@ -121,24 +131,27 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
     let inputFile: String
     let style: String
     let xcassetsPath: String
-    let extensionOutputPath: String?
+    let extensionOutputPath: String
     let extensionName: String?
     let extensionNameUIKit: String?
     let extensionSuffix: String?
-    let visibility: String?
-    let assetBundle: String?
-    let staticMembers: Bool?
+    private let staticMembers: Bool?
+
+    var staticMembersOptions: Bool {
+        if let staticMembers {
+            return staticMembers
+        }
+        return false
+    }
 
     internal init(
         inputFile: String,
         style: String,
         xcassetsPath: String,
-        extensionOutputPath: String?,
+        extensionOutputPath: String,
         extensionName: String?,
         extensionNameUIKit: String?,
         extensionSuffix: String?,
-        visibility: String?,
-        assetBundle: String?,
         staticMembers: Bool?
     ) {
         self.inputFile = inputFile
@@ -148,8 +161,6 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionName = extensionName
         self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
-        self.visibility = visibility
-        self.assetBundle = assetBundle
         self.staticMembers = staticMembers
     }
 
@@ -159,13 +170,10 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
             - Input file: \(inputFile)
             - Style: \(style)
             - Xcassets path: \(xcassetsPath)
-            - Extension output path: \(extensionOutputPath ?? "-")
+            - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
             - Extension name UIKit: \(extensionNameUIKit ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
-            - Visiblity: \(visibility ?? "default")
-            - Asset Bundle: \(assetBundle ?? "default")
-            - Static members: \(staticMembers != nil ? "\(String(describing: staticMembers))" : "default")
         """
     }
 }
@@ -173,22 +181,27 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
 struct FontsConfiguration: Codable, CustomDebugStringConvertible {
 
     let inputFile: String
-    let extensionOutputPath: String?
+    let extensionOutputPath: String
     let extensionName: String?
     let extensionNameUIKit: String?
     let extensionSuffix: String?
     let infoPlistPaths: String?
-    let visibility: String?
-    let staticMembers: Bool?
+    private let staticMembers: Bool?
+
+    var staticMembersOptions: Bool {
+        if let staticMembers {
+            return staticMembers
+        }
+        return false
+    }
 
     internal init(
         inputFile: String,
-        extensionOutputPath: String?,
+        extensionOutputPath: String,
         extensionName: String?,
         extensionNameUIKit: String?,
         extensionSuffix: String?,
         infoPlistPaths: String?,
-        visibility: String?,
         staticMembers: Bool?
     ) {
         self.inputFile = inputFile
@@ -197,7 +210,6 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
         self.infoPlistPaths = infoPlistPaths
-        self.visibility = visibility
         self.staticMembers = staticMembers
     }
 
@@ -205,13 +217,11 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
         """
         Fonts configuration:
             - Input file: \(inputFile)
-            - Extension output path: \(extensionOutputPath ?? "-")
+            - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
             - Extension name UIKit: \(extensionNameUIKit ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
             - InfoPlistPaths: \(infoPlistPaths ?? "-")
-            - Visiblity: \(visibility ?? "default")
-            - Static members: \(staticMembers != nil ? "\(String(describing: staticMembers))" : "default")
         """
     }
 }
@@ -220,23 +230,26 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
 
     let inputFile: String
     let xcassetsPath: String
-    let extensionOutputPath: String?
+    let extensionOutputPath: String
     let extensionName: String?
     let extensionNameUIKit: String?
     let extensionSuffix: String?
-    let visibility: String?
-    let assetBundle: String?
-    let staticMembers: Bool?
+    private let staticMembers: Bool?
+
+    var staticMembersOptions: Bool {
+        if let staticMembers {
+            return staticMembers
+        }
+        return false
+    }
 
     internal init(
         inputFile: String,
         xcassetsPath: String,
-        extensionOutputPath: String?,
+        extensionOutputPath: String,
         extensionName: String?,
         extensionNameUIKit: String?,
         extensionSuffix: String?,
-        visibility: String?,
-        assetBundle: String?,
         staticMembers: Bool?
     ) {
         self.inputFile = inputFile
@@ -245,8 +258,6 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionName = extensionName
         self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
-        self.visibility = visibility
-        self.assetBundle = assetBundle
         self.staticMembers = staticMembers
     }
 
@@ -255,13 +266,10 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
         Images configuration:
             - Input file: \(inputFile)
             - Xcassets path: \(xcassetsPath)
-            - Extension output path: \(extensionOutputPath ?? "-")
+            - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
             - Extension name UIKit: \(extensionNameUIKit ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
-            - Visiblity: \(visibility ?? "default")
-            - Asset Bundle: \(assetBundle ?? "default")
-            - Static members: \(staticMembers != nil ? "\(String(describing: staticMembers))" : "default")
         """
     }
 }
@@ -272,24 +280,34 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible {
     let outputPath: String
     let langs: String
     let defaultLang: String
-    let extensionOutputPath: String?
+    let extensionOutputPath: String
     let extensionName: String?
     let extensionSuffix: String?
-    let visibility: String?
-    let assetBundle: String?
-    let staticMembers: Bool?
-    let xcStrings: Bool?
+    private let staticMembers: Bool?
+    private let xcStrings: Bool?
+
+    var staticMembersOptions: Bool {
+        if let staticMembers {
+            return staticMembers
+        }
+        return false
+    }
+
+    var xcStringsOptions: Bool {
+        if let xcStrings {
+            return xcStrings
+        }
+        return false
+    }
 
     internal init(
         inputFile: String,
         outputPath: String,
         langs: String,
         defaultLang: String,
-        extensionOutputPath: String?,
+        extensionOutputPath: String,
         extensionName: String?,
         extensionSuffix: String?,
-        visibility: String?,
-        assetBundle: String?,
         staticMembers: Bool?,
         xcStrings: Bool?
     ) {
@@ -300,8 +318,6 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionOutputPath = extensionOutputPath
         self.extensionName = extensionName
         self.extensionSuffix = extensionSuffix
-        self.visibility = visibility
-        self.assetBundle = assetBundle
         self.staticMembers = staticMembers
         self.xcStrings = xcStrings
     }
@@ -313,13 +329,9 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible {
             - Output path: \(outputPath)
             - Langs: \(langs)
             - Default lang: \(defaultLang)
-            - Extension output path: \(extensionOutputPath ?? "-")
+            - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
-            - Visiblity: \(visibility ?? "default")
-            - Asset Bundle: \(assetBundle ?? "default")
-            - Static members: \(staticMembers != nil ? "\(String(describing: staticMembers))" : "default")
-            - XC Strings: \(xcStrings != nil ? "\(String(describing: xcStrings))" : "default")
         """
     }
 }
@@ -331,8 +343,14 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
     let extensionOutputPath: String
     let extensionName: String?
     let extensionSuffix: String?
-    let visibility: String?
-    let staticMembers: Bool?
+    private let staticMembers: Bool?
+
+    var staticMembersOptions: Bool {
+        if let staticMembers {
+            return staticMembers
+        }
+        return false
+    }
 
     internal init(
         inputFile: String,
@@ -340,7 +358,6 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
         extensionOutputPath: String,
         extensionName: String?,
         extensionSuffix: String?,
-        visibility: String?,
         staticMembers: Bool?
     ) {
         self.inputFile = inputFile
@@ -348,7 +365,6 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionOutputPath = extensionOutputPath
         self.extensionName = extensionName
         self.extensionSuffix = extensionSuffix
-        self.visibility = visibility
         self.staticMembers = staticMembers
     }
 
@@ -360,8 +376,6 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
             - Extension output path: \(extensionOutputPath)
             - Extension name: \(extensionName ?? "-")
             - Extension suffix: \(extensionSuffix ?? "-")
-            - Visiblity: \(visibility ?? "default")
-            - Static members: \(staticMembers != nil ? "\(String(describing: staticMembers))" : "default")
         """
     }
 }

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

@@ -10,11 +10,6 @@ import Foundation
 extension AnalyticsConfiguration: Runnable {
 
     func run(projectDirectory: String, force: Bool) {
-        let args = getArguments(projectDirectory: projectDirectory, force: force)
-        Analytics.main(args)
-    }
-
-    func getArguments(projectDirectory: String, force: Bool) -> [String] {
         var args = [String]()
 
         if force {
@@ -25,23 +20,25 @@ extension AnalyticsConfiguration: Runnable {
             inputFile.prependIfRelativePath(projectDirectory),
             "--target",
             target,
-            "--output-file",
-            outputFile.prependIfRelativePath(projectDirectory)
+            "--extension-output-path",
+            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            "--static-members",
+            "\(staticMembersOptions)"
         ]
 
-        // Add optional parameters
-        [
-            ("--visibility", visibility),
-            ("--static-members", staticMembers?.description)
-        ].forEach { argumentName, argumentValue in
-            if let argumentValue {
+        if let extensionName {
             args += [
-                    argumentName,
-                    argumentValue
+                "--extension-name",
+                extensionName
             ]
         }
+        if let extensionSuffix {
+            args += [
+                "--extension-suffix",
+                extensionSuffix
+            ]
         }
 
-        return args
+        Analytics.main(args)
     }
 }

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

@@ -26,25 +26,30 @@ extension ColorsConfiguration: Runnable {
             "--style",
             style,
             "--xcassets-path",
-            xcassetsPath.prependIfRelativePath(projectDirectory)
+            xcassetsPath.prependIfRelativePath(projectDirectory),
+            "--extension-output-path",
+            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            "--static-members",
+            "\(staticMembersOptions)"
         ]
 
-        // Add optional parameters
-        [
-            ("--extension-output-path", extensionOutputPath?.prependIfRelativePath(projectDirectory)),
-            ("--extension-name", extensionName),
-            ("--extension-name-ui-kit", extensionNameUIKit),
-            ("--extension-suffix", extensionSuffix),
-            ("--visibility", visibility),
-            ("--asset-bundle", assetBundle),
-            ("--static-members", staticMembers?.description)
-        ].forEach { argumentName, argumentValue in
-            if let argumentValue {
+        if let extensionName {
             args += [
-                    argumentName,
-                    argumentValue
+                "--extension-name",
+                extensionName
             ]
         }
+        if let extensionNameUIKit {
+            args += [
+                "--extension-name-ui-kit",
+                extensionNameUIKit
+            ]
+        }
+        if let extensionSuffix {
+            args += [
+                "--extension-suffix",
+                extensionSuffix
+            ]
         }
 
         return args

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

@@ -22,27 +22,33 @@ extension FontsConfiguration: Runnable {
         }
 
         args += [
-            inputFile.prependIfRelativePath(projectDirectory)
+            inputFile.prependIfRelativePath(projectDirectory),
+            "--extension-output-path",
+            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            "--static-members",
+            "\(staticMembersOptions)"
         ]
 
-        // Add optional parameters
-        [
-            ("--extension-output-path", extensionOutputPath?.prependIfRelativePath(projectDirectory)),
-            ("--extension-name", extensionName),
-            ("--extension-name-ui-kit", extensionNameUIKit),
-            ("--extension-suffix", extensionSuffix),
-            ("--visibility", visibility),
-            ("--static-members", staticMembers?.description)
-        ].forEach { argumentName, argumentValue in
-            if let argumentValue {
+        if let extensionName {
             args += [
-                    argumentName,
-                    argumentValue
+                "--extension-name",
+                extensionName
             ]
         }
+        if let extensionNameUIKit {
+            args += [
+                "--extension-name-ui-kit",
+                extensionNameUIKit
+            ]
+        }
+
+        if let extensionSuffix {
+            args += [
+                "--extension-suffix",
+                extensionSuffix
+            ]
         }
 
-        // Add infoPlist paths
         if let infoPlistPaths {
             let adjustedPlistPaths = infoPlistPaths
                 .split(separator: " ")

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

@@ -24,25 +24,32 @@ extension ImagesConfiguration: Runnable {
         args += [
             inputFile.prependIfRelativePath(projectDirectory),
             "--xcassets-path",
-            xcassetsPath.prependIfRelativePath(projectDirectory)
+            xcassetsPath.prependIfRelativePath(projectDirectory),
+            "--extension-output-path",
+            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            "--static-members",
+            "\(staticMembersOptions)"
         ]
 
-        // Add optional parameters
-        [
-            ("--extension-output-path", extensionOutputPath?.prependIfRelativePath(projectDirectory)),
-            ("--extension-name", extensionName),
-            ("--extension-name-ui-kit", extensionNameUIKit),
-            ("--extension-suffix", extensionSuffix),
-            ("--visibility", visibility),
-            ("--asset-bundle", assetBundle),
-            ("--static-members", staticMembers?.description)
-        ].forEach { argumentName, argumentValue in
-            if let argumentValue {
+        if let extensionName {
             args += [
-                    argumentName,
-                    argumentValue
+                "--extension-name",
+                extensionName
             ]
         }
+
+        if let extensionNameUIKit {
+            args += [
+                "--extension-name-ui-kit",
+                extensionNameUIKit
+            ]
+        }
+
+        if let extensionSuffix {
+            args += [
+                "--extension-suffix",
+                extensionSuffix
+            ]
         }
 
         return args

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

@@ -10,11 +10,6 @@ import Foundation
 extension StringsConfiguration: Runnable {
 
     func run(projectDirectory: String, force: Bool) {
-        let args = getArguments(projectDirectory: projectDirectory, force: force)
-        Stringium.main(args)
-    }
-
-    func getArguments(projectDirectory: String, force: Bool) -> [String] {
         var args = [String]()
 
         if force {
@@ -28,27 +23,29 @@ extension StringsConfiguration: Runnable {
             "--langs",
             langs,
             "--default-lang",
-            defaultLang
+            defaultLang,
+            "--extension-output-path",
+            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            "--static-members",
+            "\(staticMembersOptions)",
+            "--xc-strings",
+            "\(xcStringsOptions)"
         ]
 
-        // Add optional parameters
-        [
-            ("--extension-output-path", extensionOutputPath?.prependIfRelativePath(projectDirectory)),
-            ("--extension-name", extensionName),
-            ("--extension-suffix", extensionSuffix),
-            ("--visibility", visibility),
-            ("--asset-bundle", assetBundle),
-            ("--xc-strings", staticMembers?.description),
-            ("--static-members", xcStrings?.description)
-        ].forEach { argumentName, argumentValue in
-            if let argumentValue {
+        if let extensionName {
             args += [
-                    argumentName,
-                    argumentValue
+                "--extension-name",
+                extensionName
             ]
         }
+
+        if let extensionSuffix {
+            args += [
+                "--extension-suffix",
+                extensionSuffix
+            ]
         }
 
-        return args
+        Stringium.main(args)
     }
 }

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

@@ -10,11 +10,6 @@ import Foundation
 extension TagsConfiguration: Runnable {
 
     func run(projectDirectory: String, force: Bool) {
-        let args = getArguments(projectDirectory: projectDirectory, force: force)
-        Tags.main(args)
-    }
-
-    func getArguments(projectDirectory: String, force: Bool) -> [String] {
         var args = [String]()
 
         if force {
@@ -26,24 +21,24 @@ extension TagsConfiguration: Runnable {
             "--lang",
             lang,
             "--extension-output-path",
-            extensionOutputPath.prependIfRelativePath(projectDirectory)
+            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            "--static-members",
+            "\(staticMembersOptions)"
         ]
 
-        // Add optional parameters
-        [
-            ("--extension-name", extensionName),
-            ("--extension-suffix", extensionSuffix),
-            ("--visibility", visibility),
-            ("--static-members", staticMembers?.description)
-        ].forEach { argumentName, argumentValue in
-            if let argumentValue {
+        if let extensionName {
             args += [
-                    argumentName,
-                    argumentValue
+                "--extension-name",
+                extensionName
             ]
         }
+        if let extensionSuffix {
+            args += [
+                "--extension-suffix",
+                extensionSuffix
+            ]
         }
 
-        return args
+        Tags.main(args)
     }
 }

Sources/ResgenSwift/Images/Generator/ImageExtensionGenerator.swift

@@ -14,23 +14,19 @@ enum ImageExtensionGenerator {
 
     static func generateExtensionFile(
         images: [ParsedImage],
-        isStatic: Bool,
+        staticVar: Bool,
         inputFilename: String,
         extensionName: String,
         extensionFilePath: String,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        isSwiftUI: Bool
     ) {
         // Create extension conten1t
         let extensionContent = Self.getExtensionContent(
             images: images,
-            isStatic: isStatic,
+            staticVar: staticVar,
             extensionName: extensionName,
             inputFilename: inputFilename,
-            isSwiftUI: isSwiftUI,
-            visibility: visibility,
-            assetBundle: assetBundle
+            isSwiftUI: isSwiftUI
         )
 
         // Write content
@@ -46,26 +42,14 @@ enum ImageExtensionGenerator {
 
     static func getExtensionContent(
         images: [ParsedImage],
-        isStatic: Bool,
+        staticVar: Bool,
         extensionName: String,
         inputFilename: String,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        isSwiftUI: Bool
     ) -> String {
         [
-            Self.getHeader(
-                inputFilename: inputFilename,
-                extensionClassname: extensionName,
-                isSwiftUI: isSwiftUI
-            ),
-            Self.getProperties(
-                images: images,
-                isStatic: isStatic,
-                isSwiftUI: isSwiftUI,
-                visibility: visibility,
-                assetBundle: assetBundle
-            ),
+            Self.getHeader(inputFilename: inputFilename, extensionClassname: extensionName, isSwiftUI: isSwiftUI),
+            Self.getProperties(images: images, staticVar: staticVar, isSwiftUI: isSwiftUI),
             Self.getFooter()
         ]
             .joined(separator: "\n")
@@ -88,21 +72,11 @@ enum ImageExtensionGenerator {
 
     private static func getProperties(
         images: [ParsedImage],
-        isStatic: Bool,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        staticVar: Bool,
+        isSwiftUI: Bool
     ) -> String {
         images
-            .map { parsedImage in
-                let property = parsedImage.getImageProperty(
-                    isStatic: isStatic,
-                    isSwiftUI: isSwiftUI,
-                    visibility: visibility,
-                    assetBundle: assetBundle
-                )
-                return "\n\(property)"
-            }
+            .map { "\n\($0.getImageProperty(isStatic: staticVar, isSwiftUI: isSwiftUI))" }
             .joined(separator: "\n")
     }
 

Sources/ResgenSwift/Images/Images.swift

@@ -21,6 +21,8 @@ struct Images: ParsableCommand {
     // MARK: - Static
 
     static let toolName = "Images"
+    static let defaultExtensionName = "Image"
+    static let defaultExtensionNameUIKit = "UIImage"
 
     // MARK: - Command Options
 
@@ -53,33 +55,23 @@ struct Images: ParsableCommand {
         )
 
         // Generate extension
-        if let extensionName = options.extensionName,
-           let extensionFilePath = options.extensionFilePath {
         ImageExtensionGenerator.generateExtensionFile(
             images: imagesToGenerate,
-                isStatic: options.staticMembers,
+            staticVar: options.staticMembers,
             inputFilename: options.inputFilenameWithoutExt,
-                extensionName: extensionName,
-                extensionFilePath: extensionFilePath,
-                isSwiftUI: true,
-                visibility: options.extensionVisibility,
-                assetBundle: options.assetBundle
+            extensionName: options.extensionName,
+            extensionFilePath: options.extensionFilePath,
+            isSwiftUI: true
         )
-        }
 
-        if let extensionNameUIKit = options.extensionNameUIKit,
-           let extensionFilePathUIKit = options.extensionFilePathUIKit {
         ImageExtensionGenerator.generateExtensionFile(
             images: imagesToGenerate,
-                isStatic: options.staticMembers,
+            staticVar: options.staticMembers,
             inputFilename: options.inputFilenameWithoutExt,
-                extensionName: extensionNameUIKit,
-                extensionFilePath: extensionFilePathUIKit,
-                isSwiftUI: false,
-                visibility: options.extensionVisibility,
-                assetBundle: options.assetBundle
+            extensionName: options.extensionNameUIKit,
+            extensionFilePath: options.extensionFilePathUIKit,
+            isSwiftUI: false
         )
-        }
 
         print("[\(Self.toolName)] Images generated")
     }
@@ -104,39 +96,17 @@ struct Images: ParsableCommand {
         _ = Self.getSvgConverterPath()
 
         // Extension for UIKit and SwiftUI should have different name
-        if let extensionName = options.extensionName,
-           let extensionNameUIKit = options.extensionNameUIKit {
-            guard extensionName != extensionNameUIKit else {
-                let error = ImagesError.extensionNamesCollision(extensionName)
+        guard options.extensionName != options.extensionNameUIKit else {
+            let error = ImagesError.extensionNamesCollision(options.extensionName)
             print(error.description)
             Self.exit(withError: error)
         }
-        }
-
-        // If an extension need to be generated, ensure extensionOutputPath is defined
-        if options.extensionName != nil ||
-            options.extensionNameUIKit != nil {
-            guard let extensionOutputPath = options.extensionOutputPath,
-                    extensionOutputPath.isEmpty == false else {
-                let error = ImagesError.missingExtensionPath
-                print(error.description)
-                Self.exit(withError: error)
-            }
-        }
 
         // Check if needed to regenerate
-        let fileToCompareToInput: String = {
-            // If there is no extension file to compare
-            // Then check the xcassets file instead
-            if let extensionFilePath = options.extensionFilePath {
-                return extensionFilePath
-            }
-            return options.xcassetsPath
-        }()
         guard GeneratorChecker.shouldGenerate(
             force: options.forceExecution,
             inputFilePath: options.inputFile,
-            extensionFilePath: fileToCompareToInput
+            extensionFilePath: options.extensionFilePath
         ) else {
             print("[\(Self.toolName)] Images are already up to date :) ")
             return false

Sources/ResgenSwift/Images/ImagesError.swift

@@ -18,13 +18,12 @@ enum ImagesError: Error {
     case magickConvertNotFound
     case writeFile(String, String)
     case createAssetFolder(String)
-    case missingExtensionPath
     case unknown(String)
 
     var description: String {
         switch self {
         case .extensionNamesCollision(let extensionName):
-            return "error: [\(Images.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
+            return "error: [\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
 
         case .inputFolderNotFound(let inputFolder):
             return "error: [\(Images.toolName)] Input folder not found: \(inputFolder)"
@@ -48,10 +47,7 @@ enum ImagesError: Error {
             return "error: [\(Images.toolName)] An error occured while writing content to \(filename): \(subErrorDescription)"
 
         case .createAssetFolder(let folder):
-            return "error: [\(Images.toolName)] An error occured while creating folder `\(folder)`"
-
-        case .missingExtensionPath:
-            return "error: [\(Images.toolName)] Extension need to be generated but no `extensionOutputPath` is provided"
+            return "error: [\(Colors.toolName)] An error occured while creating folder `\(folder)`"
 
         case .unknown(let errorDescription):
             return "error: [\(Images.toolName)] Unknown error: \(errorDescription)"

Sources/ResgenSwift/Images/ImagesOptions.swift

@@ -5,70 +5,36 @@
 //  Created by Thibaut Schmitt on 24/01/2022.
 //
 
-// CPD-OFF
-
 import ArgumentParser
 import Foundation
-import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
 struct ImagesOptions: ParsableArguments {
 
-    @Flag(
-        name: .customShort("f"),
-        help: "Should force script execution"
-    )
+    @Flag(name: .customShort("f"), help: "Should force script execution")
     var forceExecution = false
 
-    @Flag(
-        name: .customShort("F"),
-        help: "Regenerate all images"
-    )
+    @Flag(name: .customShort("F"), help: "Regenerate all images")
     var forceExecutionAndGeneration = false
 
-    @Argument(
-        help: "Input files where strings ared defined.",
-        completion: .file(),
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
+    @Argument(help: "Input files where strings ared defined.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var inputFile: String
 
-    @Option(
-        help: "Xcassets path where to generate images.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
+    @Option(help: "Xcassets path where to generate images.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var xcassetsPath: String
 
-    @Option(
-        help: "Tell if it will generate static properties or not",
-        completion: .list(["true", "false"])
-    )
+    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    var extensionOutputPath: String
+
+    @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
 
-    @Option(
-        name: .customLong("visibility"),
-        help: "Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal",
-        completion: .list(["public", "private", "package", "internal"])
-    )
-    var extensionVisibility: ExtensionVisibility = .internal
+    @Option(help: "Extension name. If not specified, it will generate an Image extension.")
+    var extensionName: String = Images.defaultExtensionName
 
-    @Option(
-        help: "Bundle where the asset are generated"
-    )
-    var assetBundle: AssetBundle = .main
-
-    @Option(
-        help: "Path where to generate the extension.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
-    var extensionOutputPath: String?
-
-    @Option(help: "SwiftUI extension name. If not specified, no extension will be generated.")
-    var extensionName: String?
-
-    @Option(help: "UIKit extension name. If not specified, no extension will be generated.")
-    var extensionNameUIKit: String?
+    @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?
@@ -80,36 +46,28 @@ extension ImagesOptions {
 
     // MARK: - SwiftUI
 
-    var extensionFileName: String? {
-        guard let extensionName else { return nil }
-
+    var extensionFileName: String {
         if let extensionSuffix {
             return "\(extensionName)+\(extensionSuffix).swift"
         }
         return "\(extensionName).swift"
     }
 
-    var extensionFilePath: String? {
-        guard let extensionOutputPath, let extensionFileName else { return nil }
-
-        return "\(extensionOutputPath)/\(extensionFileName)"
+    var extensionFilePath: String {
+        "\(extensionOutputPath)/\(extensionFileName)"
     }
 
     // MARK: - UIKit
 
-    var extensionFileNameUIKit: String? {
-        guard let extensionNameUIKit else { return nil }
-
+    var extensionFileNameUIKit: String {
         if let extensionSuffix {
             return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
         return "\(extensionNameUIKit).swift"
     }
 
-    var extensionFilePathUIKit: String? {
-        guard let extensionOutputPath, let extensionFileNameUIKit else { return nil }
-
-        return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
+    var extensionFilePathUIKit: String {
+        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
 
     // MARK: -
@@ -120,5 +78,3 @@ extension ImagesOptions {
             .lastPathComponent
     }
 }
-
-// CPD-ON

Sources/ResgenSwift/Images/Model/ParsedImage.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import ToolCore
 
 enum ImageExtension: String {
 
@@ -130,22 +129,17 @@ struct ParsedImage {
 
     // MARK: - Extension property
 
-    func getImageProperty(
-        isStatic: Bool,
-        isSwiftUI: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
-    ) -> String {
+    func getImageProperty(isStatic: Bool, isSwiftUI: Bool) -> String {
         if isSwiftUI {
             return """
-                \(visibility) \(isStatic ? "static " : "")var \(name): Image {
-                    Image("\(name)", bundle: Bundle.\(assetBundle))
+                \(isStatic ? "static " : "")var \(name): Image {
+                    Image("\(name)")
                 }
             """
         }
         return """
-            \(visibility) \(isStatic ? "static " : "")var \(name): UIImage {
-                UIImage(named: "\(name)", in: Bundle.\(assetBundle), with: nil)!
+            \(isStatic ? "static " : "")var \(name): UIImage {
+                UIImage(named: "\(name)")!
             }
         """
     }

Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift

@@ -19,7 +19,8 @@ enum StringsFileGenerator {
         langs: [String],
         defaultLang: String,
         tags: [String],
-        lprojPathFormat: String
+        outputPath: String,
+        inputFilenameWithoutExt: String
     ) {
 
         var stringsFilesContent = [String: String]()
@@ -36,7 +37,7 @@ enum StringsFileGenerator {
         langs.forEach { lang in
             guard let fileContent = stringsFilesContent[lang] else { return }
 
-            let stringsFilePath = String(format: lprojPathFormat, lang)
+            let stringsFilePath = "\(outputPath)/\(lang).lproj/\(inputFilenameWithoutExt).strings"
             let stringsFilePathURL = URL(fileURLWithPath: stringsFilePath)
             do {
                 try fileContent.write(to: stringsFilePathURL, atomically: false, encoding: .utf8)
@@ -53,7 +54,8 @@ enum StringsFileGenerator {
         langs: [String],
         defaultLang: String,
         tags: [String],
-        xcStringsFilePath: String
+        outputPath: String,
+        inputFilenameWithoutExt: String
     ) {
 
         let fileContent: String = Self.generateXcStringsFileContent(
@@ -63,11 +65,12 @@ enum StringsFileGenerator {
             sections: sections
         )
 
-        let stringsFilePathURL = URL(fileURLWithPath: xcStringsFilePath)
+        let stringsFilePath = "\(outputPath)/\(inputFilenameWithoutExt).xcstrings"
+        let stringsFilePathURL = URL(fileURLWithPath: stringsFilePath)
         do {
             try fileContent.write(to: stringsFilePathURL, atomically: false, encoding: .utf8)
         } catch {
-            let error = StringiumError.writeFile(error.localizedDescription, xcStringsFilePath)
+            let error = StringiumError.writeFile(error.localizedDescription, stringsFilePath)
             print(error.description)
             Stringium.exit(withError: error)
         }
@@ -133,17 +136,15 @@ enum StringsFileGenerator {
         tags inputTags: [String],
         sections: [Section]
     ) -> String {
-        generateXcStringsFileContentFromRootObject(
-            rootObject: generateRootObject(
+        let rootObject = generateRootObject(
             langs: langs,
             defaultLang: defaultLang,
             tags: inputTags,
             sections: sections
         )
-        )
-        // Remove unwanted \ generated when transforming object to json
-        .replacingOccurrences(of: "\\\\", with: "\\")
-        .replacingOccurrences(of: "\\\"", with: "\"")
+        let file = generateXcStringsFileContentFromRootObject(rootObject: rootObject)
+
+        return file
     }
 
     static func generateXcStringsFileContentFromRootObject(rootObject: Root) -> String {
@@ -198,10 +199,7 @@ enum StringsFileGenerator {
                                 let localization = XCStringLocalization(
                                     lang: lang,
                                     content: XCStringLocalizationLangContent(
-                                        stringUnit: DefaultStringUnit(
-                                            state: "translated",
-                                            value: value
-                                        )
+                                        stringUnit: DefaultStringUnit(state: "translated", value: value)
                                     )
                                 )
                                 localizationTab.append(localization)
@@ -213,13 +211,10 @@ enum StringsFileGenerator {
                             let localization = XCStringLocalization(
                                 lang: lang,
                                 content: XCStringLocalizationLangContent(
-                                    stringUnit: DefaultStringUnit(
-                                        state: "translated",
-                                        value: value
+                                    stringUnit: DefaultStringUnit(state: "translated", value: value)
                                 )
                             )
-                            )
-                            print("VALUE: \(value)")
+
                             localizationTab.append(localization)
                         }
                     }
@@ -255,25 +250,21 @@ enum StringsFileGenerator {
         sections: [Section],
         defaultLang lang: String,
         tags: [String],
-        isStatic: Bool,
+        staticVar: Bool,
         inputFilename: String,
         extensionName: String,
         extensionFilePath: String,
-        extensionSuffix: String,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        extensionSuffix: String
     ) {
         // Get extension content
         let extensionFileContent = Self.getExtensionContent(
             sections: sections,
             defaultLang: lang,
             tags: tags,
-            isStatic: isStatic,
+            staticVar: staticVar,
             inputFilename: inputFilename,
             extensionName: extensionName,
-            extensionSuffix: extensionSuffix,
-            visibility: visibility,
-            assetBundle: assetBundle
+            extensionSuffix: extensionSuffix
         )
 
         // Write content
@@ -293,12 +284,10 @@ enum StringsFileGenerator {
         sections: [Section],
         defaultLang lang: String,
         tags: [String],
-        isStatic: Bool,
+        staticVar: Bool,
         inputFilename: String,
         extensionName: String,
-        extensionSuffix: String,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
+        extensionSuffix: String
     ) -> String {
         [
             Self.getHeader(
@@ -309,16 +298,13 @@ enum StringsFileGenerator {
                 sections: sections,
                 tags: tags,
                 extensionClassname: extensionName,
-                extensionSuffix: extensionSuffix,
-                visibility: visibility
+                extensionSuffix: extensionSuffix
             ),
             Self.getProperties(
                 sections: sections,
                 defaultLang: lang,
                 tags: tags,
-                isStatic: isStatic,
-                visibility: visibility,
-                assetBundle: assetBundle
+                staticVar: staticVar
             ),
             Self.getFooter()
         ]
@@ -343,10 +329,9 @@ enum StringsFileGenerator {
         sections: [Section],
         tags: [String],
         extensionClassname: String,
-        extensionSuffix: String,
-        visibility: ExtensionVisibility
+        extensionSuffix: String
     ) -> String {
-        var enumDefinition = "\n    \(visibility) enum Key\(extensionSuffix.uppercasedFirst()): String {\n"
+        var enumDefinition = "\n    enum Key\(extensionSuffix.uppercasedFirst()): String {\n"
 
         // Enum
         sections.forEach { section in
@@ -365,7 +350,7 @@ enum StringsFileGenerator {
 
         // KeyPath accessors
         enumDefinition += "\n"
-        enumDefinition += "        \(visibility) var keyPath: KeyPath<\(extensionClassname), String> {\n"
+        enumDefinition += "        var keyPath: KeyPath<\(extensionClassname), String> {\n"
         enumDefinition += "            switch self {\n"
         sections.forEach { section in
             // Check that at least one string will be generated
@@ -387,14 +372,7 @@ enum StringsFileGenerator {
         return enumDefinition
     }
 
-    private static func getProperties(
-        sections: [Section],
-        defaultLang lang: String,
-        tags: [String],
-        isStatic: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
-    ) -> String {
+    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 {
@@ -407,14 +385,10 @@ enum StringsFileGenerator {
                     return nil // Go to next definition
                 }
 
-                let property = definition.getNSLocalizedStringProperty(
-                    forLang: lang,
-                    isStatic: isStatic,
-                    visibility: visibility,
-                    assetBundle: assetBundle
-                )
-
-                return "\n\(property)"
+                if staticVar {
+                    return "\n\(definition.getNSLocalizedStringStaticProperty(forLang: lang))"
+                }
+                return "\n\(definition.getNSLocalizedStringProperty(forLang: lang))"
             }
             .joined(separator: "\n")
             return res

Sources/ResgenSwift/Strings/Generator/TagsGenerator.swift

@@ -15,19 +15,17 @@ enum TagsGenerator {
         sections: [Section],
         lang: String,
         tags: [String],
-        isStatic: Bool,
+        staticVar: Bool,
         extensionName: String,
-        extensionFilePath: String,
-        visibility: ExtensionVisibility
+        extensionFilePath: String
     ) {
         // Get extension content
         let extensionFileContent = Self.getExtensionContent(
             sections: sections,
             lang: lang,
             tags: tags,
-            isStatic: isStatic,
-            extensionName: extensionName,
-            visibility: visibility
+            staticVar: staticVar,
+            extensionName: extensionName
         )
 
         // Write content
@@ -47,21 +45,19 @@ enum TagsGenerator {
         sections: [Section],
         lang: String,
         tags: [String],
-        isStatic: Bool,
-        extensionName: String,
-        visibility: ExtensionVisibility
+        staticVar: Bool,
+        extensionName: String
     ) -> String {
         [
             Self.getHeader(
                 extensionClassname: extensionName,
-                isStatic: isStatic
+                staticVar: staticVar
             ),
             Self.getProperties(
                 sections: sections,
                 lang: lang,
                 tags: tags,
-                isStatic: isStatic,
-                visibility: visibility
+                staticVar: staticVar
             ),
             Self.getFooter()
         ]
@@ -70,11 +66,11 @@ enum TagsGenerator {
 
     // MARK: - Extension part
 
-    private static func getHeader(extensionClassname: String, isStatic: Bool) -> String {
+    private static func getHeader(extensionClassname: String, staticVar: Bool) -> String {
         """
         // Generated by ResgenSwift.Strings.\(Tags.toolName) \(ResgenSwiftVersion)
 
-        \(isStatic ? "typelias Tags = String\n\n" : "")import UIKit
+        \(staticVar ? "typelias Tags = String\n\n" : "")import UIKit
 
         extension \(extensionClassname) {
         """
@@ -84,8 +80,7 @@ enum TagsGenerator {
         sections: [Section],
         lang: String,
         tags: [String],
-        isStatic: Bool,
-        visibility: ExtensionVisibility
+        staticVar: Bool
     ) -> String {
         sections
             .compactMap { section in
@@ -100,12 +95,11 @@ enum TagsGenerator {
                         return // Go to next definition
                     }
 
-                    let property = definition.getProperty(
-                        forLang: lang,
-                        visibility: visibility,
-                        isStatic: isStatic
-                    )
-                    res += "\n\n\(property)"
+                    if staticVar {
+                        res += "\n\n\(definition.getStaticProperty(forLang: lang))"
+                    } else {
+                        res += "\n\n\(definition.getProperty(forLang: lang))"
+                    }
                 }
                 return res
             }

Sources/ResgenSwift/Strings/Model/Definition.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import ToolCore
 
 // swiftlint:disable force_unwrapping
 
@@ -100,22 +99,15 @@ class Definition {
         return (inputParameters: inputParameters, translationArguments: translationArguments)
     }
 
-    private func getBaseProperty(
-        lang: String,
-        translation: String,
-        isStatic: Bool,
-        comment: String?,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
-    ) -> String {
+    private func getBaseProperty(lang: String, translation: String, isStatic: Bool, comment: String?) -> String {
         """
             /// Translation in \(lang) :
             /// \(translation)
             ///
             /// Comment :
             /// \(comment?.isEmpty == false ? comment! : "No comment")
-            \(visibility) \(isStatic ? "static " : "")var \(name): String {
-                NSLocalizedString("\(name)", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "\(translation)", comment: "\(comment ?? "")")
+            \(isStatic ? "static " : "")var \(name): String {
+                NSLocalizedString("\(name)", tableName: kStringsFileName, bundle: Bundle.main, value: "\(translation)", comment: "\(comment ?? "")")
             }
         """
     }
@@ -126,8 +118,7 @@ class Definition {
         isStatic: Bool,
         inputParameters: [String],
         translationArguments: [String],
-        comment: String?,
-        visibility: ExtensionVisibility
+        comment: String?
     ) -> String {
         """
 
@@ -136,18 +127,13 @@ class Definition {
             ///
             /// Comment :
             /// \(comment?.isEmpty == false ? comment! : "No comment")
-            \(visibility) \(isStatic ? "static " : "")func \(name)(\(inputParameters.joined(separator: ", "))) -> String {
+            \(isStatic ? "static " : "")func \(name)(\(inputParameters.joined(separator: ", "))) -> String {
                 String(format: \(isStatic ? "Self" : "self").\(name), \(translationArguments.joined(separator: ", ")))
             }
         """
     }
 
-    func getNSLocalizedStringProperty(
-        forLang lang: String,
-        isStatic: Bool,
-        visibility: ExtensionVisibility,
-        assetBundle: AssetBundle
-    ) -> String {
+    func getNSLocalizedStringProperty(forLang lang: String) -> String {
         guard let translation = translations[lang] else {
             let error = StringiumError.langNotDefined(lang, name, reference != nil)
             print(error.description)
@@ -158,10 +144,8 @@ class Definition {
         let property = getBaseProperty(
             lang: lang,
             translation: translation,
-            isStatic: isStatic,
-            comment: self.comment,
-            visibility: visibility,
-            assetBundle: assetBundle
+            isStatic: false,
+            comment: self.comment
         )
 
         // Generate method
@@ -170,11 +154,41 @@ class Definition {
             method = getBaseMethod(
                 lang: lang,
                 translation: translation,
-                isStatic: isStatic,
+                isStatic: false,
                 inputParameters: parameters.inputParameters,
                 translationArguments: parameters.translationArguments,
-                comment: self.comment,
-                visibility: visibility
+                comment: self.comment
+            )
+        }
+
+        return property + method
+    }
+
+    func getNSLocalizedStringStaticProperty(forLang lang: String) -> String {
+        guard let translation = translations[lang] else {
+            let error = StringiumError.langNotDefined(lang, name, reference != nil)
+            print(error.description)
+            Stringium.exit(withError: error)
+        }
+
+        // Generate property
+        let property = getBaseProperty(
+            lang: lang,
+            translation: translation,
+            isStatic: true,
+            comment: self.comment
+        )
+
+        // Generate method
+        var method = ""
+        if let parameters = self.getStringParameters(input: translation) {
+            method = getBaseMethod(
+                lang: lang,
+                translation: translation,
+                isStatic: true,
+                inputParameters: parameters.inputParameters,
+                translationArguments: parameters.translationArguments,
+                comment: self.comment
             )
         }
 
@@ -183,11 +197,7 @@ class Definition {
 
     // MARK: - Raw strings
 
-    func getProperty(
-        forLang lang: String,
-        visibility: ExtensionVisibility,
-        isStatic: Bool
-    ) -> String {
+    func getProperty(forLang lang: String) -> String {
         guard let translation = translations[lang] else {
             let error = StringiumError.langNotDefined(lang, name, reference != nil)
             print(error.description)
@@ -200,7 +210,27 @@ class Definition {
             ///
             /// Comment :
             /// \(comment?.isEmpty == false ? comment! : "No comment")
-            \(visibility) \(isStatic ? "static " : "")var \(name): String {
+
+            var \(name): String {
+                "\(translation)"
+            }
+        """
+    }
+
+    func getStaticProperty(forLang lang: String) -> String {
+        guard let translation = translations[lang] else {
+            let error = StringiumError.langNotDefined(lang, name, reference != nil)
+            print(error.description)
+            Stringium.exit(withError: error)
+        }
+
+        return """
+            /// Translation in \(lang) :
+            /// \(translation)
+            ///
+            /// Comment :
+            /// \(comment?.isEmpty == false ? comment! : "No comment")
+            static var \(name): String {
                 "\(translation)"
             }
         """

Sources/ResgenSwift/Strings/Stringium/Stringium.swift

@@ -21,6 +21,7 @@ struct Stringium: ParsableCommand {
     // MARK: - Static
 
     static let toolName = "Stringium"
+    static let defaultExtensionName = "String"
     static let noTranslationTag: String = "notranslation"
 
     // MARK: - Command options
@@ -48,7 +49,8 @@ struct Stringium: ParsableCommand {
                 langs: options.langs,
                 defaultLang: options.defaultLang,
                 tags: options.tags,
-                lprojPathFormat: options.lprojPathFormat
+                outputPath: options.stringsFileOutputPath,
+                inputFilenameWithoutExt: options.inputFilenameWithoutExt
             )
         } else {
             StringsFileGenerator.writeXcStringsFiles(
@@ -56,27 +58,22 @@ struct Stringium: ParsableCommand {
                 langs: options.langs,
                 defaultLang: options.defaultLang,
                 tags: options.tags,
-                xcStringsFilePath: options.xcStringsFilePath
+                outputPath: options.stringsFileOutputPath,
+                inputFilenameWithoutExt: options.inputFilenameWithoutExt
             )
         }
 
         // Generate extension
-        if let extensionName = options.extensionName,
-            let extensionFilePath = options.extensionFilePath {
-            print("Will generate extensions")
         StringsFileGenerator.writeExtensionFiles(
             sections: sections,
             defaultLang: options.defaultLang,
             tags: options.tags,
-                isStatic: options.staticMembers,
+            staticVar: options.staticMembers,
             inputFilename: options.inputFilenameWithoutExt,
-                extensionName: extensionName,
-                extensionFilePath: extensionFilePath,
-                extensionSuffix: options.extensionSuffix ?? "",
-                visibility: options.extensionVisibility,
-                assetBundle: options.assetBundle
+            extensionName: options.extensionName,
+            extensionFilePath: options.extensionFilePath,
+            extensionSuffix: options.extensionSuffix
         )
-        }
 
         print("[\(Self.toolName)] Strings generated")
     }
@@ -107,18 +104,10 @@ struct Stringium: ParsableCommand {
         }
 
         // Check if needed to regenerate
-        let fileToCompareToInput: String = {
-            // If there is no extension file to compare
-            // Then check the xcassets file instead
-            if options.xcStrings {
-                return options.xcStringsFilePath
-            }
-            return String(format: options.lprojPathFormat, options.defaultLang)
-        }()
         guard GeneratorChecker.shouldGenerate(
             force: options.forceGeneration,
             inputFilePath: options.inputFile,
-            extensionFilePath: fileToCompareToInput
+            extensionFilePath: options.extensionFilePath
         ) else {
             print("[\(Self.toolName)] Strings are already up to date :) ")
             return false

Sources/ResgenSwift/Strings/Stringium/StringiumOptions.swift

@@ -7,7 +7,6 @@
 
 import ArgumentParser
 import Foundation
-import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
@@ -16,63 +15,35 @@ struct StringiumOptions: ParsableArguments {
     @Flag(name: [.customShort("f"), .customShort("F")], help: "Should force generation")
     var forceGeneration = false
 
-    @Argument(
-        help: "Input files where strings are 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 find the .xcStrings file or the lproj folders.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
+    @Option(name: .customLong("output-path"), help: "Path where to strings file.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     fileprivate var outputPathRaw: String
 
-    @Option(
-        name: .customLong("langs"),
-        help: "Langs to generate."
-    )
+    @Option(name: .customLong("langs"), help: "Langs to generate.")
     fileprivate var langsRaw: String
 
     @Option(help: "Default langs.")
     var defaultLang: String
 
-    @Option(
-        name: .customLong("tags"),
-        help: "Tags to generate."
-    )
+    @Option(name: .customLong("tags"), help: "Tags to generate.")
     fileprivate var tagsRaw: String = "ios iosonly iosOnly notranslation"
 
-    @Option(help: "Generate static properties. False by default")
+    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    var extensionOutputPath: String
+
+    @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
 
-    @Option(help: "Tell if it will generate xcStrings file or lproj file. True by default")
-    var xcStrings: Bool = true
+    @Option(help: "Tell if it will generate xcStrings file or not")
+    var xcStrings: Bool = false
 
-    @Option(
-        name: .customLong("visibility"),
-        help: "Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal",
-        completion: .list(["public", "private", "package", "internal"])
-    )
-    var extensionVisibility: ExtensionVisibility = .internal
-
-    @Option(
-        help: "Bundle where the asset are generated"
-    )
-    var assetBundle: AssetBundle = .main
-
-    @Option(
-        help: "Path where to generate the extension.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
-    var extensionOutputPath: String?
-
-    @Option(help: "Extension name. If not specified, no extension will be generated.")
-    var extensionName: String?
+    @Option(help: "Extension name. If not specified, it will generate an String extension.")
+    var extensionName: String = Stringium.defaultExtensionName
 
     @Option(help: "Extension suffix: {extensionName}+{extensionSuffix}.swift")
-    var extensionSuffix: String?
+    var extensionSuffix: String
 }
 
 // MARK: - Private var getter
@@ -104,21 +75,12 @@ extension StringiumOptions {
 
 extension StringiumOptions {
 
-    private var extensionFileName: String? {
-        if let extensionName {
-            if let extensionSuffix {
-                return "\(extensionName)+\(extensionSuffix).swift"
-            }
-            return "\(extensionName).swift"
-        }
-        return nil
+    var extensionFileName: String {
+        "\(extensionName)+\(extensionSuffix).swift"
     }
 
-    var extensionFilePath: String? {
-        if let extensionOutputPath, let extensionFileName {
-            return "\(extensionOutputPath)/\(extensionFileName)"
-        }
-        return nil
+    var extensionFilePath: String {
+        "\(extensionOutputPath)/\(extensionFileName)"
     }
 
     var inputFilenameWithoutExt: String {
@@ -126,12 +88,4 @@ extension StringiumOptions {
             .deletingPathExtension()
             .lastPathComponent
     }
-
-    var xcStringsFilePath: String {
-        "\(stringsFileOutputPath)/\(inputFilenameWithoutExt).xcstrings"
-    }
-
-    var lprojPathFormat: String {
-        "\(stringsFileOutputPath)/%@.lproj/\(inputFilenameWithoutExt).strings"
-    }
 }

Sources/ResgenSwift/Strings/Tag/Tags.swift

@@ -47,10 +47,9 @@ struct Tags: ParsableCommand {
             sections: sections,
             lang: options.lang,
             tags: ["ios", "iosonly", Self.noTranslationTag],
-            isStatic: options.staticMembers,
+            staticVar: options.staticMembers,
             extensionName: options.extensionName,
-            extensionFilePath: options.extensionFilePath,
-            visibility: options.extensionVisibility
+            extensionFilePath: options.extensionFilePath
         )
 
         print("[\(Self.toolName)] Tags generated")

Sources/ResgenSwift/Strings/Tag/TagsOptions.swift

@@ -7,7 +7,6 @@
 
 import ArgumentParser
 import Foundation
-import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
@@ -22,17 +21,7 @@ struct TagsOptions: ParsableArguments {
     @Option(help: "Lang to generate. (\"ium\" by default)")
     var lang: String = "ium"
 
-    @Option(
-        name: .customLong("visibility"),
-        help: "Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal",
-        completion: .list(["public", "private", "package", "internal"])
-    )
-    var extensionVisibility: ExtensionVisibility = .internal
-
-    @Option(
-        help: "Path where to generate the extension.",
-        transform: { $0.replaceTiltWithHomeDirectoryPath() }
-    )
+    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var extensionOutputPath: String
 
     @Option(help: "Tell if it will generate static properties or not")

Sources/ToolCore/AssetBundle.swift

@@ -1,26 +0,0 @@
-//
-//  AssetBundle.swift
-//  ResgenSwift
-//
-//  Created by Thibaut Schmitt on 21/07/2025.
-//
-
-import ArgumentParser
-
-package enum AssetBundle: String, CustomStringConvertible, ExpressibleByArgument {
-
-    case main
-    case module
-
-    // MARK: - CustomStringConvertible
-
-    package var description: String {
-        switch self {
-        case .main:
-            "main"
-
-        case .module:
-            "module"
-        }
-    }
-}

Sources/ToolCore/ExtensionVisibility.swift

@@ -1,34 +0,0 @@
-//
-//  ExtensionVisibility.swift
-//  ResgenSwift
-//
-//  Created by Thibaut Schmitt on 17/07/2025.
-//
-
-import ArgumentParser
-
-package enum ExtensionVisibility: String, CustomStringConvertible, ExpressibleByArgument {
-
-    case `public`
-    case `private`
-    case `internal`
-    case `package`
-
-    // MARK: - CustomStringConvertible
-
-    package var description: String {
-        switch self {
-        case .public:
-            "public"
-
-        case .private:
-            "private"
-
-        case .internal:
-            "internal"
-
-        case .package:
-            "package"
-        }
-    }
-}

Sources/ToolCore/Version.swift

@@ -9,4 +9,4 @@ import Foundation
 
 // swiftlint:disable prefixed_toplevel_constant identifier_name
 
-public let ResgenSwiftVersion = "2.2.0"
+public let ResgenSwiftVersion = "2.1.0"

Tests/ResgenSwiftTests/Analytics/AnalyticsDefinitionTests.swift

@@ -55,15 +55,14 @@ final class AnalyticsDefinitionTests: XCTestCase {
         definition.path = "ecran_un/"
         
         // When
-        let propertyScreen = definition.getProperty(visibility: .internal)
+        let propertyScreen = definition.getProperty()
         
         // Expect
         let expectScreen = """
-            internal func logScreenDefinitionName() {
+            func logScreenDefinitionName() {
                 logScreen(
                     name: "Ecran un",
-                    path: "ecran_un/",
-                    params: nil
+                    path: "ecran_un/"
                 )
             }
         """
@@ -76,16 +75,16 @@ final class AnalyticsDefinitionTests: XCTestCase {
         let definition = AnalyticsDefinition(id: "definition_name", name: "Ecran un", type: .event)
         
         // When
-        let propertyEvent = definition.getProperty(visibility: .public)
+        let propertyEvent = definition.getProperty()
         
         // Expect
         let expectEvent = """
-            public func logEventDefinitionName() {
+            func logEventDefinitionName() {
                 logEvent(
                     name: "Ecran un",
                     action: "",
                     category: "",
-                    params: nil
+                    params: [:]
                 )
             }
         """
@@ -99,15 +98,14 @@ final class AnalyticsDefinitionTests: XCTestCase {
         definition.path = "ecran_un/"
         
         // When
-        let propertyScreen = definition.getStaticProperty(visibility: .private)
+        let propertyScreen = definition.getStaticProperty()
         
         // Expect
         let expectScreen = """
-            private static func logScreenDefinitionName() {
-                AnalyticsManager.shared.logScreen(
+            static func logScreenDefinitionName() {
+                logScreen(
                     name: "Ecran un",
-                    path: "ecran_un/",
-                    params: nil
+                    path: "ecran_un/"
                 )
             }
         """
@@ -120,16 +118,16 @@ final class AnalyticsDefinitionTests: XCTestCase {
         let definition = AnalyticsDefinition(id: "definition_name", name: "Ecran un", type: .event)
         
         // When
-        let propertyEvent = definition.getStaticProperty(visibility: .package)
+        let propertyEvent = definition.getStaticProperty()
         
         // Expect
         let expectEvent = """
-            package static func logEventDefinitionName() {
-                AnalyticsManager.shared.logEvent(
+            static func logEventDefinitionName() {
+                logEvent(
                     name: "Ecran un",
                     action: "",
                     category: "",
-                    params: nil
+                    params: [:]
                 )
             }
         """

Tests/ResgenSwiftTests/Analytics/AnalyticsGeneratorTests.swift

@@ -32,182 +32,6 @@ final class AnalyticsGeneratorTests: XCTestCase {
         return definition
     }
     
-    private func protocolString(visibility: ExtensionVisibility) -> String {
-        """
-        // MARK: - Protocol
-        
-        \(visibility) protocol AnalyticsManagerProtocol {
-        
-            func logScreen(
-                name: String,
-                path: String,
-                params: [String: Any]?
-            )
-        
-            func logEvent(
-                name: String,
-                action: String,
-                category: String,
-                params: [String: Any]?
-            )
-        
-            func setEnable(_ enable: Bool)
-        }
-        """
-    }
-
-    private func firebaseString() -> String {
-        """
-        // MARK: - Firebase
-
-        class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
-
-            // MARK: - Methods
-
-            func logScreen(
-                name: String,
-                path: String,
-                params: [String: Any]?
-            ) {
-                var parameters = [
-                    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
-                )
-            }
-        
-            func logEvent(
-                name: String,
-                action: String,
-                category: String,
-                params: [String: Any]?
-            ) {
-                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 {
-                    for (newKey, newValue) in supplementaryParameters {
-                        if parameters.contains(where: { (key: String, value: NSObject) in
-                            key == newKey
-                        }) {
-                            continue
-                        }
-
-                        parameters[newKey] = newValue as? NSObject
-                    }
-                }
-
-                Analytics.logEvent(
-                    AnalyticsEventSelectContent,
-                    parameters: parameters
-                )
-            }
-
-            func setEnable(_ enable: Bool) {
-                Analytics.setAnalyticsCollectionEnabled(enable)
-            }
-        }
-        """
-    }
-
-    private func matomoString() -> String {
-        """
-        // MARK: - Matomo
-
-        class MatomoAnalyticsManager: AnalyticsManagerProtocol {
-
-            // MARK: - Properties
-
-            private var tracker: MatomoTracker
-
-            // MARK: - Init
-
-            init(siteId: String, url: String) {
-                debugPrint("[Matomo service] Server URL: \\(url)")
-                debugPrint("[Matomo service] Site ID: \\(siteId)")
-                tracker = MatomoTracker(
-                    siteId: siteId,
-                    baseURL: URL(string: url)!
-                )
-
-                #if DEBUG
-                    tracker.dispatchInterval = 5
-                #endif
-
-                #if DEBUG
-                    tracker.logger = DefaultLogger(minLevel: .verbose)
-                #endif
-
-                debugPrint("[Matomo service] Configured with content base: \\(tracker.contentBase?.absoluteString ?? "-")")
-                debugPrint("[Matomo service] Opt out: \\(tracker.isOptedOut)")
-            }
-
-            // MARK: - Methods
-
-            func logScreen(
-                name: String,
-                path: String,
-                params: [String: Any]?
-            ) {
-                guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
-
-                let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)" + "iOS")
-                tracker.track(
-                    view: [name],
-                    url: urlString
-                )
-            }
-
-            func logEvent(
-                name: String,
-                action: String,
-                category: String,
-                params: [String: Any]?
-            ) {
-                tracker.track(
-                    eventWithCategory: category,
-                    action: action,
-                    name: name,
-                    number: nil,
-                    url: nil
-                )
-            }
-
-            func setEnable(_ enable: Bool) {
-                tracker.isOptedOut = !enable
-            }
-        }
-        """
-    }
-
     func testGeneratedExtensionContentFirebase() {
         // Given
         let sectionOne = AnalyticsCategory(id: "section_one")
@@ -233,87 +57,101 @@ final class AnalyticsGeneratorTests: XCTestCase {
             targets: [TrackerType.firebase],
             sections: [sectionOne, sectionTwo, sectionThree],
             tags: ["ios", "iosonly"],
-            isStatic: false,
-            visibility: .public
+            staticVar: false,
+            extensionName: "GenAnalytics"
         )
 
         // Expect Analytics
         let expect = """
         // Generated by ResgenSwift.Analytics \(ResgenSwiftVersion)
 
-        import Foundation
         import FirebaseAnalytics
 
-        \(protocolString(visibility: .public))
+        // MARK: - Protocol
 
-        \(firebaseString())
+        protocol AnalyticsManagerProtocol {
 
-        // MARK: - Traker Type
+            func logScreen(name: String, path: String)
+            func logEvent(
+                name: String,
+                action: String,
+                category: String,
+                params: [String: Any]?
+            )
+        }
 
-        public enum TrackerType: CaseIterable {
+        // MARK: - Firebase
 
-            case firebase
+        class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
+
+            func logScreen(name: String, path: String) {
+                var parameters = [
+                    AnalyticsParameterScreenName: name as NSObject
+                ]
+
+                Analytics.logEvent(
+                    AnalyticsEventScreenView,
+                    parameters: parameters
+                )
+            }
+
+            func logEvent(
+                name: String,
+                action: String,
+                category: String,
+                params: [String: Any]?
+            ) {
+                var parameters: [String:NSObject] = [
+                    "action": action as NSObject,
+                    "category": category 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(
+                    name.replacingOccurrences(of: [" "], with: "_"),
+                    parameters: parameters
+                )
+            }
         }
 
         // MARK: - Manager
 
-        public class AnalyticsManager {
+        class AnalyticsManager {
 
-            public static var shared = AnalyticsManager()
-
-            private init() {}
+            static var shared = AnalyticsManager()
 
             // MARK: - Properties
 
-            var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
+            var managers: [AnalyticsManagerProtocol] = []
 
-            private var isEnabled: Bool {
-                if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
-                    false
-                } else {
-                    true
-                }
+            private var isEnabled: Bool = true
+
+            // MARK: - Methods
+
+            func setAnalyticsEnabled(_ enable: Bool) {
+                isEnabled = enable
             }
 
-            // MARK: - Enable Methods
-
-            private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
-                managers.forEach { (key, value) in
-                    if analytics.contains(where: { type in
-                        type == key
-                    }) {
-                        value.setEnable(enable)
-                    }
-                }
+            func configure() {
+                managers.append(FirebaseAnalyticsManager())
             }
 
-            public func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-                setAnalytics(enable: true, analytics)
-            }
-
-            public func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-                setAnalytics(enable: false, analytics)
-            }
-
-            public func configure() {
-                managers[TrackerType.firebase] = FirebaseAnalyticsManager()
-            }
-
-            // MARK: - Private Log Methods
-
-            private func logScreen(
-                name: String,
-                path: String,
-                params: [String: Any]?
-            ) {
+            private func logScreen(name: String, path: String) {
                 guard isEnabled else { return }
 
-                managers.values.forEach { manager in
-                    manager.logScreen(
-                        name: name,
-                        path: path,
-                        params: params
-                    )
+                managers.forEach { manager in
+                    manager.logScreen(name: name, path: path)
                 }
             }
 
@@ -325,7 +163,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
             ) {
                 guard isEnabled else { return }
 
-                managers.values.forEach { manager in
+                managers.forEach { manager in
                     manager.logEvent(
                         name: name,
                         action: action,
@@ -337,30 +175,28 @@ final class AnalyticsGeneratorTests: XCTestCase {
 
             // MARK: - section_one
 
-            public func logScreenS1DefOne() {
+            func logScreenS1DefOne() {
                 logScreen(
                     name: "s1 def one",
-                    path: "",
-                    params: nil
+                    path: ""
                 )
             }
 
-            public func logEventS1DefTwo() {
+            func logEventS1DefTwo() {
                 logEvent(
                     name: "s1 def two",
                     action: "",
                     category: "",
-                    params: nil
+                    params: [:]
                 )
             }
 
             // MARK: - section_two
 
-            public func logScreenS2DefOne() {
+            func logScreenS2DefOne() {
                 logScreen(
                     name: "s2 def one",
-                    path: "",
-                    params: nil
+                    path: ""
                 )
             }
         }
@@ -398,89 +234,121 @@ final class AnalyticsGeneratorTests: XCTestCase {
             targets: [TrackerType.matomo],
             sections: [sectionOne, sectionTwo, sectionThree],
             tags: ["ios", "iosonly"],
-            isStatic: false,
-            visibility: .package
+            staticVar: false,
+            extensionName: "GenAnalytics"
         )
         // Expect Analytics
         let expect = """
         // Generated by ResgenSwift.Analytics \(ResgenSwiftVersion)
 
-        import Foundation
         import MatomoTracker
 
-        \(protocolString(visibility: .package))
+        // MARK: - Protocol
 
-        \(matomoString())
+        protocol AnalyticsManagerProtocol {
 
-        // MARK: - Traker Type
+            func logScreen(name: String, path: String)
+            func logEvent(
+                name: String,
+                action: String,
+                category: String,
+                params: [String: Any]?
+            )
+        }
 
-        package enum TrackerType: CaseIterable {
+        // MARK: - Matomo
 
-            case matomo
+        class MatomoAnalyticsManager: AnalyticsManagerProtocol {
+
+            // MARK: - Properties
+
+            private var tracker: MatomoTracker
+
+            // MARK: - Init
+
+            init(siteId: String, url: String) {
+                debugPrint("[Matomo service] Server URL: \\(url)")
+                debugPrint("[Matomo service] Site ID: \\(siteId)")
+                tracker = MatomoTracker(
+                    siteId: siteId,
+                    baseURL: URL(string: url)!
+                )
+
+                #if DEBUG
+                    tracker.dispatchInterval = 5
+                #endif
+
+                #if DEBUG
+                    tracker.logger = DefaultLogger(minLevel: .verbose)
+                #endif
+
+                debugPrint("[Matomo service] Configured with content base: \\(tracker.contentBase?.absoluteString ?? "-")")
+                debugPrint("[Matomo service] Opt out: \\(tracker.isOptedOut)")
+            }
+
+            // MARK: - Methods
+
+            func logScreen(name: String, path: String) {
+                guard !tracker.isOptedOut else { return }
+                guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
+        
+                let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)" + "iOS")
+                tracker.track(
+                    view: [name],
+                    url: urlString
+                )
+            }
+
+            func logEvent(
+                name: String,
+                action: String,
+                category: String,
+                params: [String: Any]?
+            ) {
+                guard !tracker.isOptedOut else { return }
+
+                tracker.track(
+                    eventWithCategory: category,
+                    action: action,
+                    name: name,
+                    number: nil,
+                    url: nil
+                )
+            }
         }
 
         // MARK: - Manager
 
-        package class AnalyticsManager {
+        class AnalyticsManager {
 
-            package static var shared = AnalyticsManager()
-
-            private init() {}
+            static var shared = AnalyticsManager()
 
             // MARK: - Properties
 
-            var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
+            var managers: [AnalyticsManagerProtocol] = []
 
-            private var isEnabled: Bool {
-                if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
-                    false
-                } else {
-                    true
-                }
+            private var isEnabled: Bool = true
+
+            // MARK: - Methods
+
+            func setAnalyticsEnabled(_ enable: Bool) { 
+                isEnabled = enable
             }
 
-            // MARK: - Enable Methods
-
-            private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
-                managers.forEach { (key, value) in
-                    if analytics.contains(where: { type in
-                        type == key
-                    }) {
-                        value.setEnable(enable)
-                    }
-                }
-            }
-
-            package func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-                setAnalytics(enable: true, analytics)
-            }
-
-            package func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-                setAnalytics(enable: false, analytics)
-            }
-
-            package func configure(siteId: String, url: String) {
-                managers[TrackerType.matomo] = MatomoAnalyticsManager(
+            func configure(siteId: String, url: String) {
+                managers.append(
+                    MatomoAnalyticsManager(
                         siteId: siteId,
                         url: url
                     )
+                )
             }
 
-            // MARK: - Private Log Methods
-
-            private func logScreen(
-                name: String,
-                path: String,
-                params: [String: Any]?
-            ) {
+            private func logScreen(name: String, path: String) {
                 guard isEnabled else { return }
 
-                managers.values.forEach { manager in
-                    manager.logScreen(
-                        name: name,
-                        path: path,
-                        params: params
-                    )
+                managers.forEach { manager in
+                    manager.logScreen(name: name, path: path)
                 }
             }
 
@@ -492,7 +360,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
             ) {
                 guard isEnabled else { return }
 
-                managers.values.forEach { manager in
+                managers.forEach { manager in
                     manager.logEvent(
                         name: name,
                         action: action,
@@ -504,30 +372,28 @@ final class AnalyticsGeneratorTests: XCTestCase {
 
             // MARK: - section_one
 
-            package func logScreenS1DefOne() {
+            func logScreenS1DefOne() {
                 logScreen(
                     name: "s1 def one",
-                    path: "s1_def_one/",
-                    params: nil
+                    path: "s1_def_one/"
                 )
             }
 
-            package func logEventS1DefTwo() {
+            func logEventS1DefTwo() {
                 logEvent(
                     name: "s1 def two",
                     action: "test",
                     category: "test",
-                    params: nil
+                    params: [:]
                 )
             }
 
             // MARK: - section_two
 
-            package func logScreenS2DefOne() {
+            func logScreenS2DefOne() {
                 logScreen(
                     name: "s2 def one",
-                    path: "s2_def_one/",
-                    params: nil
+                    path: "s2_def_one/"
                 )
             }
         }
@@ -565,95 +431,168 @@ final class AnalyticsGeneratorTests: XCTestCase {
             targets: [TrackerType.matomo, TrackerType.firebase],
             sections: [sectionOne, sectionTwo, sectionThree],
             tags: ["ios", "iosonly"],
-            isStatic: false,
-            visibility: .internal
+            staticVar: false,
+            extensionName: "GenAnalytics"
         )
 
         // Expect Analytics
         let expect = """
         // Generated by ResgenSwift.Analytics \(ResgenSwiftVersion)
 
-        import Foundation
         import MatomoTracker
         import FirebaseAnalytics
 
-        \(protocolString(visibility: .internal))
+        // MARK: - Protocol
 
-        \(matomoString())
+        protocol AnalyticsManagerProtocol {
 
-        \(firebaseString())
+            func logScreen(name: String, path: String)
+            func logEvent(
+                name: String,
+                action: String,
+                category: String,
+                params: [String: Any]?
+            )
+        }
 
-        // MARK: - Traker Type
+        // MARK: - Matomo
 
-        internal enum TrackerType: CaseIterable {
+        class MatomoAnalyticsManager: AnalyticsManagerProtocol {
 
-            case matomo
-            case firebase
+            // MARK: - Properties
+
+            private var tracker: MatomoTracker
+
+            // MARK: - Init
+
+            init(siteId: String, url: String) {
+                debugPrint("[Matomo service] Server URL: \\(url)")
+                debugPrint("[Matomo service] Site ID: \\(siteId)")
+                tracker = MatomoTracker(
+                    siteId: siteId,
+                    baseURL: URL(string: url)!
+                )
+
+                #if DEBUG
+                    tracker.dispatchInterval = 5
+                #endif
+
+                #if DEBUG
+                    tracker.logger = DefaultLogger(minLevel: .verbose)
+                #endif
+
+                debugPrint("[Matomo service] Configured with content base: \\(tracker.contentBase?.absoluteString ?? "-")")
+                debugPrint("[Matomo service] Opt out: \\(tracker.isOptedOut)")
+            }
+
+            // MARK: - Methods
+
+            func logScreen(name: String, path: String) {
+                guard !tracker.isOptedOut else { return }
+                guard let trackerUrl = tracker.contentBase?.absoluteString else { return }
+
+                let urlString = URL(string: "\\(trackerUrl)" + "/" + "\\(path)" + "iOS")
+                tracker.track(
+                    view: [name],
+                    url: urlString
+                )
+            }
+
+            func logEvent(
+                name: String,
+                action: String,
+                category: String,
+                params: [String: Any]?
+            ) {
+                guard !tracker.isOptedOut else { return }
+
+                tracker.track(
+                    eventWithCategory: category,
+                    action: action,
+                    name: name,
+                    number: nil,
+                    url: nil
+                )
+            }
+        }
+
+        // MARK: - Firebase
+
+        class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
+            func logScreen(name: String, path: String) {
+                var parameters = [
+                    AnalyticsParameterScreenName: name as NSObject
+                ]
+
+                Analytics.logEvent(
+                    AnalyticsEventScreenView,
+                    parameters: parameters
+                )
+            }
+
+            func logEvent(
+                name: String,
+                action: String,
+                category: String,
+                params: [String: Any]?
+            ) {
+                var parameters: [String:NSObject] = [
+                    "action": action as NSObject,
+                    "category": category 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(
+                    name.replacingOccurrences(of: [" "], with: "_"),
+                    parameters: parameters
+                )
+            }
         }
 
         // MARK: - Manager
 
-        internal class AnalyticsManager {
+        class AnalyticsManager {
 
-            internal static var shared = AnalyticsManager()
-
-            private init() {}
+            static var shared = AnalyticsManager()
 
             // MARK: - Properties
 
-            var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
+            var managers: [AnalyticsManagerProtocol] = []
 
-            private var isEnabled: Bool {
-                if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
-                    false
-                } else {
-                    true
-                }
+            private var isEnabled: Bool = true
+
+            // MARK: - Methods
+
+            func setAnalyticsEnabled(_ enable: Bool) {
+                isEnabled = enable
             }
 
-            // MARK: - Enable Methods
-
-            private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
-                managers.forEach { (key, value) in
-                    if analytics.contains(where: { type in
-                        type == key
-                    }) {
-                        value.setEnable(enable)
-                    }
-                }
-            }
-
-            internal func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-                setAnalytics(enable: true, analytics)
-            }
-
-            internal func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
-                setAnalytics(enable: false, analytics)
-            }
-
-            internal func configure(siteId: String, url: String) {
-                managers[TrackerType.matomo] = MatomoAnalyticsManager(
+            func configure(siteId: String, url: String) {
+                managers.append(
+                    MatomoAnalyticsManager(
                         siteId: siteId,
                         url: url
                     )
-                managers[TrackerType.firebase] = FirebaseAnalyticsManager()
+                )
+                managers.append(FirebaseAnalyticsManager())
             }
 
-            // MARK: - Private Log Methods
-
-            private func logScreen(
-                name: String,
-                path: String,
-                params: [String: Any]?
-            ) {
+            private func logScreen(name: String, path: String) {
                 guard isEnabled else { return }
         
-                managers.values.forEach { manager in
-                    manager.logScreen(
-                        name: name,
-                        path: path,
-                        params: params
-                    )
+                managers.forEach { manager in
+                    manager.logScreen(name: name, path: path)
                 }
             }
 
@@ -665,7 +604,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
             ) {
                 guard isEnabled else { return }
 
-                managers.values.forEach { manager in
+                managers.forEach { manager in
                     manager.logEvent(
                         name: name,
                         action: action,
@@ -677,30 +616,28 @@ final class AnalyticsGeneratorTests: XCTestCase {
 
             // MARK: - section_one
 
-            internal func logScreenS1DefOne() {
+            func logScreenS1DefOne() {
                 logScreen(
                     name: "s1 def one",
-                    path: "s1_def_one/",
-                    params: nil
+                    path: "s1_def_one/"
                 )
             }
 
-            internal func logEventS1DefTwo() {
+            func logEventS1DefTwo() {
                 logEvent(
                     name: "s1 def two",
                     action: "test",
                     category: "test",
-                    params: nil
+                    params: [:]
                 )
             }
 
             // MARK: - section_two
 
-            internal func logScreenS2DefOne() {
+            func logScreenS2DefOne() {
                 logScreen(
                     name: "s2 def one",
-                    path: "s2_def_one/",
-                    params: nil
+                    path: "s2_def_one/"
                 )
             }
         }

Tests/ResgenSwiftTests/Colors/ColorExtensionGeneratorTests.swift

@@ -21,14 +21,10 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ColorExtensionGenerator.getExtensionContent(
-            colors: colors,
-            isStatic: false,
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: false,
                                                                            extensionName: "GenColors",
-            isSwiftUI: false,
-            visibility: .public,
-            assetBundle: .main
-        )
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -39,13 +35,13 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         extension GenColors {
         
             /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
-            @objc public var colorOne: UIColor {
-                UIColor(named: "colorOne", in: Bundle.main, compatibleWith: nil)!
+            @objc var colorOne: UIColor {
+                UIColor(named: "colorOne")!
             }
         
             /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
-            @objc public var colorTwo: UIColor {
-                UIColor(named: "colorTwo", in: Bundle.main, compatibleWith: nil)!
+            @objc var colorTwo: UIColor {
+                UIColor(named: "colorTwo")!
             }
         }
         """
@@ -53,7 +49,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func test_uiKit_GeneratedExtensionContentForIsStatic() {
+    func test_uiKit_GeneratedExtensionContentForStaticVar() {
         // Given
         let colors = [
             ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@@ -61,14 +57,10 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ColorExtensionGenerator.getExtensionContent(
-            colors: colors,
-            isStatic: true,
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: true,
                                                                            extensionName: "GenColor",
-            isSwiftUI: false,
-            visibility: .public,
-            assetBundle: .module
-        )
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -79,13 +71,13 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         extension GenColor {
         
             /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
-            public static var colorOne: UIColor {
-                UIColor(named: "colorOne", in: Bundle.module, compatibleWith: nil)!
+            static var colorOne: UIColor {
+                UIColor(named: "colorOne")!
             }
         
             /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
-            public static var colorTwo: UIColor {
-                UIColor(named: "colorTwo", in: Bundle.module, compatibleWith: nil)!
+            static var colorTwo: UIColor {
+                UIColor(named: "colorTwo")!
             }
         }
         """
@@ -101,14 +93,10 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ColorExtensionGenerator.getExtensionContent(
-            colors: colors,
-            isStatic: false,
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: false,
                                                                            extensionName: "GenColors",
-            isSwiftUI: true,
-            visibility: .package,
-            assetBundle: .main
-        )
+                                                                           isSwiftUI: true)
         
         // Expect
         let expect = """
@@ -119,13 +107,13 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         extension GenColors {
         
             /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
-            package var colorOne: Color {
-                Color("colorOne", bundle: Bundle.main)
+            var colorOne: Color {
+                Color("colorOne")
             }
         
             /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
-            package var colorTwo: Color {
-                Color("colorTwo", bundle: Bundle.main)
+             var colorTwo: Color {
+                Color("colorTwo")
             }
         }
         """
@@ -133,7 +121,7 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func test_swiftUI_GeneratedExtensionContentForIsStatic() {
+    func test_swiftUI_GeneratedExtensionContentForStaticVar() {
         // Given
         let colors = [
             ParsedColor(name: "colorOne", light: "#FF00FF", dark: "#00FF00"),
@@ -141,14 +129,10 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ColorExtensionGenerator.getExtensionContent(
-            colors: colors,
-            isStatic: true,
+        let extensionContent = ColorExtensionGenerator.getExtensionContent(colors: colors,
+                                                                           staticVar: true,
                                                                            extensionName: "GenColor",
-            isSwiftUI: true,
-            visibility: .internal,
-            assetBundle: .module
-        )
+                                                                           isSwiftUI: true)
         
         // Expect
         let expect = """
@@ -159,13 +143,13 @@ final class ColorExtensionGeneratorTests: XCTestCase {
         extension GenColor {
         
             /// Color colorOne is #FF00FF (light) or #00FF00 (dark)"
-            internal static var colorOne: Color {
-                Color("colorOne", bundle: Bundle.module)
+            static var colorOne: Color {
+                Color("colorOne")
             }
         
             /// Color colorTwo is #F0F0F0 (light) or #0F0F0F (dark)"
-            internal static var colorTwo: Color {
-                Color("colorTwo", bundle: Bundle.module)
+            static var colorTwo: Color {
+                Color("colorTwo")
             }
         }
         """

Tests/ResgenSwiftTests/Colors/ParsedColorTests.swift

@@ -17,18 +17,13 @@ final class ParsedColorTests: XCTestCase {
         let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
         
         // When
-        let property = color.getColorProperty(
-            isStatic: false,
-            isSwiftUI: false,
-            visibility: .public,
-            assetBundle: .main
-        )
+        let property = color.getColorProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
         /// Color red is #FF0000 (light) or #0000FF (dark)"
-        @objc public var red: UIColor {
-            UIColor(named: "red", in: Bundle.main, compatibleWith: nil)!
+        @objc var red: UIColor {
+            UIColor(named: "red")!
         }
         """
             
@@ -40,18 +35,13 @@ final class ParsedColorTests: XCTestCase {
         let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
         
         // When
-        let property = color.getColorProperty(
-            isStatic: true,
-            isSwiftUI: false,
-            visibility: .private,
-            assetBundle: .module
-        )
+        let property = color.getColorProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
             /// Color red is #FF0000 (light) or #0000FF (dark)"
-            private static var red: UIColor {
-                UIColor(named: "red", in: Bundle.module, compatibleWith: nil)!
+            static var red: UIColor {
+                UIColor(named: "red")!
             }
         """
         
@@ -63,18 +53,13 @@ final class ParsedColorTests: XCTestCase {
         let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
         
         // When
-        let property = color.getColorProperty(
-            isStatic: false,
-            isSwiftUI: true,
-            visibility: .package,
-            assetBundle: .main
-        )
+        let property = color.getColorProperty(isStatic: false, isSwiftUI: true)
         
         // Expect
         let expect = """
         /// Color red is #FF0000 (light) or #0000FF (dark)"
-        package var red: Color {
-            Color("red", bundle: Bundle.main)
+        var red: Color {
+            Color("red")
         }
         """
             
@@ -86,18 +71,13 @@ final class ParsedColorTests: XCTestCase {
         let color = ParsedColor(name: "red", light: "#FF0000", dark: "#0000FF")
         
         // When
-        let property = color.getColorProperty(
-            isStatic: true,
-            isSwiftUI: true,
-            visibility: .internal,
-            assetBundle: .module
-        )
+        let property = color.getColorProperty(isStatic: true, isSwiftUI: true)
         
         // Expect
         let expect = """
             /// Color red is #FF0000 (light) or #0000FF (dark)"
-            internal static var red: Color {
-                Color("red", bundle: Bundle.module)
+            static var red: Color {
+                Color("red")
             }
         """
         

Tests/ResgenSwiftTests/Fonts/FontExtensionGeneratorTests.swift

@@ -21,13 +21,10 @@ final class FontExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = FontExtensionGenerator.getExtensionContent(
-            fontsNames: fontNames,
-            isStatic: false,
+        let extensionContent = FontExtensionGenerator.getExtensionContent(fontsNames: fontNames,
+                                                                          staticVar: false,
                                                                           extensionName: "GenFonts",
-            isSwiftUI: false,
-            visibility: .public
-        )
+                                                                          isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -37,18 +34,18 @@ final class FontExtensionGeneratorTests: XCTestCase {
 
         extension GenFonts {
         
-            public enum FontName: String {
+            enum FontName: String {
                 case CircularStdRegular = "CircularStd-Regular"
                 case CircularStdBold = "CircularStd-Bold"
             }
         
             // MARK: - Getter
         
-            public func CircularStdRegular(withSize size: CGFloat) -> UIFont {
+            func CircularStdRegular(withSize size: CGFloat) -> UIFont {
                 UIFont(name: FontName.CircularStdRegular.rawValue, size: size)!
             }
         
-            public func CircularStdBold(withSize size: CGFloat) -> UIFont {
+            func CircularStdBold(withSize size: CGFloat) -> UIFont {
                 UIFont(name: FontName.CircularStdBold.rawValue, size: size)!
             }
         
@@ -67,13 +64,10 @@ final class FontExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = FontExtensionGenerator.getExtensionContent(
-            fontsNames: fontNames,
-            isStatic: false,
+        let extensionContent = FontExtensionGenerator.getExtensionContent(fontsNames: fontNames,
+                                                                          staticVar: false,
                                                                           extensionName: "GenFonts",
-            isSwiftUI: true,
-            visibility: .package
-        )
+                                                                          isSwiftUI: true)
         
         // Expect
         let expect = """
@@ -83,18 +77,18 @@ final class FontExtensionGeneratorTests: XCTestCase {
 
         extension GenFonts {
         
-            package enum FontName: String {
+            enum FontName: String {
                 case CircularStdRegular = "CircularStd-Regular"
                 case CircularStdBold = "CircularStd-Bold"
             }
         
             // MARK: - Getter
         
-            package func CircularStdRegular(withSize size: CGFloat) -> Font {
+            func CircularStdRegular(withSize size: CGFloat) -> Font {
                 Font.custom(FontName.CircularStdRegular.rawValue, size: size)
             }
         
-            package func CircularStdBold(withSize size: CGFloat) -> Font {
+            func CircularStdBold(withSize size: CGFloat) -> Font {
                 Font.custom(FontName.CircularStdBold.rawValue, size: size)
             }
         

Tests/ResgenSwiftTests/Fonts/FontNameTests.swift

@@ -21,15 +21,11 @@ final class FontNameTests: XCTestCase {
         )
 
         // When
-        let property = fontName.getProperty(
-            isStatic: true,
-            isSwiftUI: false,
-            visibility: .internal
-        )
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
-         internal static let CircularStdBold: ((_ size: CGFloat) -> UIFont) = { size in
+         static let CircularStdBold: ((_ size: CGFloat) -> UIFont) = { size in
              UIFont(name: FontName.CircularStdBold.rawValue, size: size)!
          }
         """
@@ -46,15 +42,11 @@ final class FontNameTests: XCTestCase {
         )
         
         // When
-        let property = fontName.getProperty(
-            isStatic: true,
-            isSwiftUI: false,
-            visibility: .package
-        )
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
-         package static let CircularStdBoldUnderline: ((_ size: CGFloat) -> UIFont) = { size in
+         static let CircularStdBoldUnderline: ((_ size: CGFloat) -> UIFont) = { size in
              UIFont(name: FontName.CircularStdBoldUnderline.rawValue, size: size)!
          }
         """
@@ -71,15 +63,11 @@ final class FontNameTests: XCTestCase {
         )
 
         // When
-        let property = fontName.getProperty(
-            isStatic: false,
-            isSwiftUI: false,
-            visibility: .private
-        )
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
-         private func CircularStdBold(withSize size: CGFloat) -> UIFont {
+         func CircularStdBold(withSize size: CGFloat) -> UIFont {
              UIFont(name: FontName.CircularStdBold.rawValue, size: size)!
          }
         """
@@ -96,15 +84,11 @@ final class FontNameTests: XCTestCase {
         )
 
         // When
-        let property = fontName.getProperty(
-            isStatic: false,
-            isSwiftUI: false,
-            visibility: .public
-        )
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
-        public func CircularStdBoldUnderline(withSize size: CGFloat) -> UIFont {
+        func CircularStdBoldUnderline(withSize size: CGFloat) -> UIFont {
             UIFont(name: FontName.CircularStdBoldUnderline.rawValue, size: size)!
         }
         """
@@ -121,15 +105,11 @@ final class FontNameTests: XCTestCase {
         )
 
         // When
-        let property = fontName.getProperty(
-            isStatic: true,
-            isSwiftUI: true,
-            visibility: .public
-        )
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: true)
         
         // Expect
         let expect = """
-         public static let CircularStdBold: ((_ size: CGFloat) -> Font) = { size in
+         static let CircularStdBold: ((_ size: CGFloat) -> Font) = { size in
              Font.custom(FontName.CircularStdBold.rawValue, size: size)
          }
         """
@@ -146,15 +126,11 @@ final class FontNameTests: XCTestCase {
         )
 
         // When
-        let property = fontName.getProperty(
-            isStatic: true,
-            isSwiftUI: true,
-            visibility: .package
-        )
+        let property = fontName.getProperty(isStatic: true, isSwiftUI: true)
         
         // Expect
         let expect = """
-         package static let CircularStdBoldUnderline: ((_ size: CGFloat) -> Font) = { size in
+         static let CircularStdBoldUnderline: ((_ size: CGFloat) -> Font) = { size in
              Font.custom(FontName.CircularStdBoldUnderline.rawValue, size: size)
          }
         """
@@ -171,15 +147,11 @@ final class FontNameTests: XCTestCase {
         )
 
         // When
-        let property = fontName.getProperty(
-            isStatic: false,
-            isSwiftUI: true,
-            visibility: .package
-        )
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: true)
         
         // Expect
         let expect = """
-         package func CircularStdBold(withSize size: CGFloat) -> Font {
+         func CircularStdBold(withSize size: CGFloat) -> Font {
              Font.custom(FontName.CircularStdBold.rawValue, size: size)
          }
         """
@@ -196,15 +168,11 @@ final class FontNameTests: XCTestCase {
         )
 
         // When
-        let property = fontName.getProperty(
-            isStatic: false,
-            isSwiftUI: true,
-            visibility: .internal
-        )
+        let property = fontName.getProperty(isStatic: false, isSwiftUI: true)
         
         // Expect
         let expect = """
-        internal func CircularStdBoldUnderline(withSize size: CGFloat) -> Font {
+        func CircularStdBoldUnderline(withSize size: CGFloat) -> Font {
             Font.custom(FontName.CircularStdBoldUnderline.rawValue, size: size)
         }
         """

Tests/ResgenSwiftTests/Generate/AnalyticsConfigurationTests.swift

@@ -1,76 +0,0 @@
-//
-//  AnalyticsConfigurationTests.swift
-//  ResgenSwift
-//
-//  Created by Thibaut Schmitt on 18/07/2025.
-//
-
-import Foundation
-@testable import ResgenSwift
-import XCTest
-
-final class AnalyticsConfigurationTests: XCTestCase {
-
-    let projectDirectory = "projectDirectory/"
-    
-    func test_argsGeneration_requiredArgs() {
-        // Given
-        let testingConfiguration = AnalyticsConfiguration(
-            inputFile: "path/to/tags.yml",
-            target: "matomo firebase",
-            outputFile: "Analytics/Generated/AnalyticsManager.swift",
-            visibility: nil,
-            staticMembers: nil
-        )
-
-        // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: false
-        )
-                
-        // Expect
-        let expectedArguments = [
-            "projectDirectory/path/to/tags.yml",
-            "--target",
-            "matomo firebase",
-            "--output-file",
-            "projectDirectory/Analytics/Generated/AnalyticsManager.swift",
-        ]
-
-        XCTAssertEqual(arguments, expectedArguments)
-    }
-    
-    func test_argsGeneration_allArguments() {
-        // Given
-        let testingConfiguration = AnalyticsConfiguration(
-            inputFile: "path/to/tags.yml",
-            target: "matomo firebase",
-            outputFile: "Analytics/Generated/AnalyticsManager.swift",
-            visibility: "public",
-            staticMembers: false
-        )
-
-        // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: true
-        )
-
-        // Expect
-        let expectedArguments = [
-            "-f",
-            "projectDirectory/path/to/tags.yml",
-            "--target",
-            "matomo firebase",
-            "--output-file",
-            "projectDirectory/Analytics/Generated/AnalyticsManager.swift",
-            "--visibility",
-            "public",
-            "--static-members",
-            "false"
-        ]
-
-        XCTAssertEqual(arguments, expectedArguments)
-    }
-}

Tests/ResgenSwiftTests/Generate/ColorsConfigurationTests.swift

@@ -16,23 +16,16 @@ final class ColorsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_requiredArgs() {
         // Given
-        let testingConfiguration = ColorsConfiguration(
-            inputFile: "path/to/colors.txt",
+        let testingConfiguration = ColorsConfiguration(inputFile: "path/to/colors.txt",
                                                        style: ColorStyle.all.rawValue,
                                                        xcassetsPath: "path/to/assets.xcassets",
-            extensionOutputPath: nil,
+                                                       extensionOutputPath: "Colors/Generated",
                                                        extensionName: nil,
                                                        extensionNameUIKit: nil,
                                                        extensionSuffix: nil,
-            visibility: nil,
-            assetBundle: nil,
-            staticMembers: false
-        )
+                                                       staticMembers: false)
         // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: false
-        )
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: false)
                 
         // Expect
         let expectedArguments = [
@@ -41,6 +34,8 @@ final class ColorsConfigurationTests: XCTestCase {
             "all",
             "--xcassets-path",
             "projectDirectory/path/to/assets.xcassets",
+            "--extension-output-path",
+            "projectDirectory/Colors/Generated",
             "--static-members",
             "false"
         ]
@@ -50,23 +45,16 @@ final class ColorsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_allArguments() {
         // Given
-        let testingConfiguration = ColorsConfiguration(
-            inputFile: "path/to/colors.txt",
+        let testingConfiguration = ColorsConfiguration(inputFile: "path/to/colors.txt",
                                                        style: ColorStyle.all.rawValue,
                                                        xcassetsPath: "path/to/assets.xcassets",
                                                        extensionOutputPath: "Colors/Generated",
                                                        extensionName: "AppUIColor",
                                                        extensionNameUIKit: "AppColor",
                                                        extensionSuffix: "Testing",
-            visibility: "public",
-            assetBundle: "module",
-            staticMembers: false
-        )
+                                                       staticMembers: false)
         // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: true
-        )
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
                 
         // Expect
         let expectedArguments = [
@@ -78,18 +66,14 @@ final class ColorsConfigurationTests: XCTestCase {
             "projectDirectory/path/to/assets.xcassets",
             "--extension-output-path",
             "projectDirectory/Colors/Generated",
+            "--static-members",
+            "false",
             "--extension-name",
             "AppUIColor",
             "--extension-name-ui-kit",
             "AppColor",
             "--extension-suffix",
             "Testing",
-            "--visibility",
-            "public",
-            "--asset-bundle",
-            "module",
-            "--static-members",
-            "false"
         ]
         
         XCTAssertEqual(arguments, expectedArguments)

Tests/ResgenSwiftTests/Generate/FontsConfigurationTests.swift

@@ -16,25 +16,23 @@ final class FontsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_requiredArgs() {
         // Given
-        let testingConfiguration = FontsConfiguration(
-            inputFile: "path/to/fonts.txt",
-            extensionOutputPath: nil,
+        let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
+                                                      extensionOutputPath: "Fonts/Generated",
                                                       extensionName: nil,
                                                       extensionNameUIKit: nil,
                                                       extensionSuffix: nil,
                                                       infoPlistPaths: nil,
-            visibility: nil,
-            staticMembers: nil
-        )
+                                                      staticMembers: nil)
         // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: false
-        )
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: false)
                 
         // Expect
         let expectedArguments = [
-            "projectDirectory/path/to/fonts.txt"
+            "projectDirectory/path/to/fonts.txt",
+            "--extension-output-path",
+            "projectDirectory/Fonts/Generated",
+            "--static-members",
+            "false"
         ]
         
         XCTAssertEqual(arguments, expectedArguments)
@@ -42,21 +40,15 @@ final class FontsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_allArguments() {
         // Given
-        let testingConfiguration = FontsConfiguration(
-            inputFile: "path/to/fonts.txt",
+        let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
                                                       extensionOutputPath: "Fonts/Generated",
                                                       extensionName: "AppUIFont",
                                                       extensionNameUIKit: "AppFont",
                                                       extensionSuffix: "Testing",
                                                       infoPlistPaths: "path/to/plist1.plist path/to/plist2.plist",
-            visibility: "package",
-            staticMembers: true
-        )
+                                                      staticMembers: true)
         // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: true
-        )
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
                 
         // Expect
         let expectedArguments = [
@@ -64,16 +56,14 @@ final class FontsConfigurationTests: XCTestCase {
             "projectDirectory/path/to/fonts.txt",
             "--extension-output-path",
             "projectDirectory/Fonts/Generated",
+            "--static-members",
+            "true",
             "--extension-name",
             "AppUIFont",
             "--extension-name-ui-kit",
             "AppFont",
             "--extension-suffix",
             "Testing",
-            "--visibility",
-            "package",
-            "--static-members",
-            "true",
             "--info-plist-paths",
             "projectDirectory/path/to/plist1.plist projectDirectory/path/to/plist2.plist"
         ]

Tests/ResgenSwiftTests/Generate/ImagesConfigurationTests.swift

@@ -16,29 +16,26 @@ final class ImagesConfigurationTests: XCTestCase {
     
     func test_argsGeneration_requiredArgs() {
         // Given
-        let testingConfiguration = ImagesConfiguration(
-            inputFile: "path/to/images.txt",
+        let testingConfiguration = ImagesConfiguration(inputFile: "path/to/images.txt",
                                                        xcassetsPath: "path/to/assets.xcassets",
-            extensionOutputPath: nil,
+                                                       extensionOutputPath: "Images/Generated",
                                                        extensionName: nil,
                                                        extensionNameUIKit: nil,
                                                        extensionSuffix: nil,
-            visibility: nil,
-            assetBundle: nil,
-            staticMembers: nil
-        )
+                                                       staticMembers: nil)
         
         // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: false
-        )
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: false)
                 
         // Expect
         let expectedArguments = [
             "projectDirectory/path/to/images.txt",
             "--xcassets-path",
-            "projectDirectory/path/to/assets.xcassets"
+            "projectDirectory/path/to/assets.xcassets",
+            "--extension-output-path",
+            "projectDirectory/Images/Generated",
+            "--static-members",
+            "false"
         ]
         
         XCTAssertEqual(arguments, expectedArguments)
@@ -46,23 +43,16 @@ final class ImagesConfigurationTests: XCTestCase {
     
     func test_argsGeneration_allArguments() {
         // Given
-        let testingConfiguration = ImagesConfiguration(
-            inputFile: "path/to/images.txt",
+        let testingConfiguration = ImagesConfiguration(inputFile: "path/to/images.txt",
                                                        xcassetsPath: "path/to/assets.xcassets",
                                                        extensionOutputPath: "Images/Generated",
                                                        extensionName: "AppUIImage",
                                                        extensionNameUIKit: "AppImage",
                                                        extensionSuffix: "Testing",
-            visibility: "private",
-            assetBundle: "module",
-            staticMembers: true
-        )
+                                                       staticMembers: true)
         
         // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: true
-        )
+        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
 
         // Expect
         let expectedArguments = [
@@ -72,18 +62,14 @@ final class ImagesConfigurationTests: XCTestCase {
             "projectDirectory/path/to/assets.xcassets",
             "--extension-output-path",
             "projectDirectory/Images/Generated",
+            "--static-members",
+            "true",
             "--extension-name",
             "AppUIImage",
             "--extension-name-ui-kit",
             "AppImage",
             "--extension-suffix",
             "Testing",
-            "--visibility",
-            "private",
-            "--asset-bundle",
-            "module",
-            "--static-members",
-            "true"
         ]
 
         XCTAssertEqual(arguments, expectedArguments)

Tests/ResgenSwiftTests/Generate/StringsConfigurationTests.swift

@@ -1,102 +0,0 @@
-//
-//  StringsConfigurationTests.swift
-//  ResgenSwift
-//
-//  Created by Thibaut Schmitt on 18/07/2025.
-//
-
-import Foundation
-@testable import ResgenSwift
-import XCTest
-
-final class StringsConfigurationTests: XCTestCase {
-
-    let projectDirectory = "projectDirectory/"
-    
-    func test_argsGeneration_requiredArgs() {
-        // Given
-        let testingConfiguration = StringsConfiguration(
-            inputFile: "path/to/strings.txt",
-            outputPath: "Strings/Generated",
-            langs: "fr en en-us",
-            defaultLang: "en",
-            extensionOutputPath: nil, // Strings/Generated
-            extensionName: nil, // String
-            extensionSuffix: nil, // Testing
-            visibility: nil, // "internal"
-            assetBundle: nil, // .main
-            staticMembers: nil, // true
-            xcStrings: nil // true
-        )
-
-        // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: false
-        )
-                
-        // Expect
-        let expectedArguments = [
-            "projectDirectory/path/to/strings.txt",
-            "--output-path",
-            "projectDirectory/Strings/Generated",
-            "--langs",
-            "fr en en-us",
-            "--default-lang",
-            "en"
-        ]
-
-        XCTAssertEqual(arguments, expectedArguments)
-    }
-    
-    func test_argsGeneration_allArguments() {
-        // Given
-        let testingConfiguration = StringsConfiguration(
-            inputFile: "path/to/strings.txt",
-            outputPath: "Strings/Generated",
-            langs: "fr en en-us",
-            defaultLang: "en",
-            extensionOutputPath: "Strings/Generated",
-            extensionName: "AppString",
-            extensionSuffix: "Testing",
-            visibility: "internal",
-            assetBundle: "module",
-            staticMembers: true,
-            xcStrings: true
-        )
-
-        // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: true
-        )
-
-        // Expect
-        let expectedArguments = [
-            "-f",
-            "projectDirectory/path/to/strings.txt",
-            "--output-path",
-            "projectDirectory/Strings/Generated",
-            "--langs",
-            "fr en en-us",
-            "--default-lang",
-            "en",
-            "--extension-output-path",
-            "projectDirectory/Strings/Generated",
-            "--extension-name",
-            "AppString",
-            "--extension-suffix",
-            "Testing",
-            "--visibility",
-            "internal",
-            "--asset-bundle",
-            "module",
-            "--xc-strings",
-            "true",
-            "--static-members",
-            "true"
-        ]
-
-        XCTAssertEqual(arguments, expectedArguments)
-    }
-}

Tests/ResgenSwiftTests/Generate/TagsConfigurationTests.swift

@@ -1,84 +0,0 @@
-//
-//  TagsConfigurationTests.swift
-//  ResgenSwift
-//
-//  Created by Thibaut Schmitt on 18/07/2025.
-//
-
-import Foundation
-@testable import ResgenSwift
-import XCTest
-
-final class TagsConfigurationTests: XCTestCase {
-
-    let projectDirectory = "projectDirectory/"
-    
-    func test_argsGeneration_requiredArgs() {
-        // Given
-        let testingConfiguration = TagsConfiguration(
-            inputFile: "path/to/tags.txt",
-            lang: "ium",
-            extensionOutputPath: "Tags/Generated",
-            extensionName: nil,
-            extensionSuffix: nil,
-            visibility: nil,
-            staticMembers: nil
-        )
-
-        // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: false
-        )
-                
-        // Expect
-        let expectedArguments = [
-            "projectDirectory/path/to/tags.txt",
-            "--lang",
-            "ium",
-            "--extension-output-path",
-            "projectDirectory/Tags/Generated"
-        ]
-
-        XCTAssertEqual(arguments, expectedArguments)
-    }
-    
-    func test_argsGeneration_allArguments() {
-        // Given
-        let testingConfiguration = TagsConfiguration(
-            inputFile: "path/to/tags.txt",
-            lang: "ium",
-            extensionOutputPath: "Tags/Generated",
-            extensionName: "AppTag",
-            extensionSuffix: "Testing",
-            visibility: "private",
-            staticMembers: true
-        )
-
-        // When
-        let arguments = testingConfiguration.getArguments(
-            projectDirectory: projectDirectory,
-            force: true
-        )
-
-        // Expect
-        let expectedArguments = [
-            "-f",
-            "projectDirectory/path/to/tags.txt",
-            "--lang",
-            "ium",
-            "--extension-output-path",
-            "projectDirectory/Tags/Generated",
-            "--extension-name",
-            "AppTag",
-            "--extension-suffix",
-            "Testing",
-            "--visibility",
-            "private",
-            "--static-members",
-            "true"
-        ]
-
-        XCTAssertEqual(arguments, expectedArguments)
-    }
-}

Tests/ResgenSwiftTests/Images/ImageExtensionGeneratorTests.swift

@@ -21,15 +21,11 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ImageExtensionGenerator.getExtensionContent(
-            images: images,
-            isStatic: false,
+        let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
+                                                                           staticVar: false,
                                                                            extensionName: "GenImages",
                                                                            inputFilename: "myInputFilename",
-            isSwiftUI: false,
-            visibility: .public,
-            assetBundle: .main
-        )
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -40,12 +36,12 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         
         extension GenImages {
         
-            public var image_one: UIImage {
-                UIImage(named: "image_one", in: Bundle.main, with: nil)!
+            var image_one: UIImage {
+                UIImage(named: "image_one")!
             }
         
-            public var image_two: UIImage {
-                UIImage(named: "image_two", in: Bundle.main, with: nil)!
+            var image_two: UIImage {
+                UIImage(named: "image_two")!
             }
         }
         """
@@ -53,7 +49,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func test_uiKit_GeneratedExtensionContentForIsStatic() {
+    func test_uiKit_GeneratedExtensionContentForStaticVar() {
         // Given
         let images = [
             ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
@@ -61,15 +57,11 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ImageExtensionGenerator.getExtensionContent(
-            images: images,
-            isStatic: true,
+        let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
+                                                                           staticVar: true,
                                                                            extensionName: "GenImages",
                                                                            inputFilename: "myInputFilename",
-            isSwiftUI: false,
-            visibility: .internal,
-            assetBundle: .module
-        )
+                                                                           isSwiftUI: false)
         
         // Expect
         let expect = """
@@ -80,12 +72,12 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         
         extension GenImages {
         
-            internal static var image_one: UIImage {
-                UIImage(named: "image_one", in: Bundle.module, with: nil)!
+            static var image_one: UIImage {
+                UIImage(named: "image_one")!
             }
         
-            internal static var image_two: UIImage {
-                UIImage(named: "image_two", in: Bundle.module, with: nil)!
+            static var image_two: UIImage {
+                UIImage(named: "image_two")!
             }
         }
         """
@@ -101,15 +93,11 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ImageExtensionGenerator.getExtensionContent(
-            images: images,
-            isStatic: false,
+        let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
+                                                                           staticVar: false,
                                                                            extensionName: "GenImages",
                                                                            inputFilename: "myInputFilename",
-            isSwiftUI: true,
-            visibility: .public,
-            assetBundle: .main
-        )
+                                                                           isSwiftUI: true)
         
         // Expect
         let expect = """
@@ -120,12 +108,12 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         
         extension GenImages {
         
-            public var image_one: Image {
-                Image("image_one", bundle: Bundle.main)
+            var image_one: Image {
+                Image("image_one")
             }
         
-            public var image_two: Image {
-                Image("image_two", bundle: Bundle.main)
+            var image_two: Image {
+                Image("image_two")
             }
         }
         """
@@ -133,7 +121,7 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
     
-    func test_swiftUI_GeneratedExtensionContentForIsStatic() {
+    func test_swiftUI_GeneratedExtensionContentForStaticVar() {
         // Given
         let images = [
             ParsedImage(name: "image_one", tags: "id", width: 10, height: 10),
@@ -141,15 +129,11 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = ImageExtensionGenerator.getExtensionContent(
-            images: images,
-            isStatic: true,
+        let extensionContent = ImageExtensionGenerator.getExtensionContent(images: images,
+                                                                           staticVar: true,
                                                                            extensionName: "GenImages",
                                                                            inputFilename: "myInputFilename",
-            isSwiftUI: true,
-            visibility: .package,
-            assetBundle: .module
-        )
+                                                                           isSwiftUI: true)
         
         // Expect
         let expect = """
@@ -160,12 +144,12 @@ final class ImageExtensionGeneratorTests: XCTestCase {
         
         extension GenImages {
         
-            package static var image_one: Image {
-                Image("image_one", bundle: Bundle.module)
+            static var image_one: Image {
+                Image("image_one")
             }
         
-            package static var image_two: Image {
-                Image("image_two", bundle: Bundle.module)
+            static var image_two: Image {
+                Image("image_two")
             }
         }
         """

Tests/ResgenSwiftTests/Images/ParsedImageTests.swift

@@ -37,25 +37,18 @@ final class ParsedImageTests: XCTestCase {
     func test_uiKit_GeneratedProperty() {
         // Given
         let imageName = "the_name"
-        let parsedImage = ParsedImage(
-            name: imageName,
+        let parsedImage = ParsedImage(name: imageName,
                                       tags: "id",
                                       width: 10,
-            height: 10
-        )
+                                      height: 10)
         
         // When
-        let property = parsedImage.getImageProperty(
-            isStatic: false,
-            isSwiftUI: false,
-            visibility: .public,
-            assetBundle: .main
-        )
+        let property = parsedImage.getImageProperty(isStatic: false, isSwiftUI: false)
         
         // Expect
         let expect = """
-        public var \(imageName): UIImage {
-            UIImage(named: "\(imageName)", in: Bundle.main, with: nil)!
+        var \(imageName): UIImage {
+            UIImage(named: "\(imageName)")!
         }
         """
         
@@ -65,25 +58,18 @@ final class ParsedImageTests: XCTestCase {
     func test_uiKit_GeneratedStaticProperty() {
         // Given
         let imageName = "the_name"
-        let parsedImage = ParsedImage(
-            name: imageName,
+        let parsedImage = ParsedImage(name: imageName,
                                       tags: "id",
                                       width: 10,
-            height: 10
-        )
+                                      height: 10)
         
         // When
-        let property = parsedImage.getImageProperty(
-            isStatic: true,
-            isSwiftUI: false,
-            visibility: .internal,
-            assetBundle: .module
-        )
+        let property = parsedImage.getImageProperty(isStatic: true, isSwiftUI: false)
         
         // Expect
         let expect = """
-        internal static var \(imageName): UIImage {
-            UIImage(named: "\(imageName)", in: Bundle.module, with: nil)!
+        static var \(imageName): UIImage {
+            UIImage(named: "\(imageName)")!
         }
         """
         
@@ -93,25 +79,18 @@ final class ParsedImageTests: XCTestCase {
     func test_swiftUI_GeneratedProperty() {
         // Given
         let imageName = "the_name"
-        let parsedImage = ParsedImage(
-            name: imageName,
+        let parsedImage = ParsedImage(name: imageName,
                                       tags: "id",
                                       width: 10,
-            height: 10
-        )
+                                      height: 10)
         
         // When
-        let property = parsedImage.getImageProperty(
-            isStatic: false,
-            isSwiftUI: true,
-            visibility: .private,
-            assetBundle: .main
-        )
+        let property = parsedImage.getImageProperty(isStatic: false, isSwiftUI: true)
         
         // Expect
         let expect = """
-        private var \(imageName): Image {
-            Image("\(imageName)", bundle: Bundle.main)
+        var \(imageName): Image {
+            Image("\(imageName)")
         }
         """
         
@@ -121,25 +100,18 @@ final class ParsedImageTests: XCTestCase {
     func test_swiftUI_GeneratedStaticProperty() {
         // Given
         let imageName = "the_name"
-        let parsedImage = ParsedImage(
-            name: imageName,
+        let parsedImage = ParsedImage(name: imageName,
                                       tags: "id",
                                       width: 10,
-            height: 10
-        )
+                                      height: 10)
         
         // When
-        let property = parsedImage.getImageProperty(
-            isStatic: true,
-            isSwiftUI: true,
-            visibility: .package,
-            assetBundle: .module
-        )
+        let property = parsedImage.getImageProperty(isStatic: true, isSwiftUI: true)
         
         // Expect
         let expect = """
-        package static var \(imageName): Image {
-            Image("\(imageName)", bundle: Bundle.module)
+        static var \(imageName): Image {
+            Image("\(imageName)")
         }
         """
         
@@ -149,12 +121,10 @@ final class ParsedImageTests: XCTestCase {
     func testAssetContentJson() {
         // Given
         let imageName = "the_name"
-        let parsedImage = ParsedImage(
-            name: imageName,
+        let parsedImage = ParsedImage(name: imageName,
                                       tags: "id",
                                       width: 10,
-            height: 10
-        )
+                                      height: 10)
         
         // When
         let property = parsedImage.generateImageContent(isVector: false)

Tests/ResgenSwiftTests/Strings/DefinitionTests.swift

@@ -8,10 +8,10 @@
 // CPD-OFF
 
 import Foundation
-@testable import ResgenSwift
-import ToolCore
 import XCTest
 
+@testable import ResgenSwift
+
 final class DefinitionTests: XCTestCase {
  
     // MARK: - Match line
@@ -94,24 +94,9 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
-        let propertyEn = definition.getNSLocalizedStringProperty(
-            forLang: "en",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
-        let propertyEnUs = definition.getNSLocalizedStringProperty(
-            forLang: "en-us",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
                 
         // Expect
         let expectFr = """
@@ -120,7 +105,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "This is a comment")
         }
         """
@@ -131,7 +116,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "This is a comment")
         }
         """
@@ -142,7 +127,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "This is a comment")
         }
         """
@@ -164,24 +149,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: false,
-            visibility: .private,
-            assetBundle: .main
-        )
-        let propertyEn = definition.getNSLocalizedStringProperty(
-            forLang: "en",
-            isStatic: false,
-            visibility: .private,
-            assetBundle: .main
-        )
-        let propertyEnUs = definition.getNSLocalizedStringProperty(
-            forLang: "en-us",
-            isStatic: false,
-            visibility: .private,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -190,7 +160,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        private var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -201,7 +171,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        private var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -212,7 +182,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        private var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -233,24 +203,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
-        let propertyEn = definition.getNSLocalizedStringProperty(
-            forLang: "en",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
-        let propertyEnUs = definition.getNSLocalizedStringProperty(
-            forLang: "en-us",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -259,7 +214,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -270,7 +225,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -281,7 +236,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -291,7 +246,7 @@ final class DefinitionTests: XCTestCase {
         XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
     }
 
-    // MARK: - getNSLocalizedStringProperty - static
+    // MARK: - getNSLocalizedStringStaticProperty
 
     func testGeneratedNSLocalizedStringStaticProperty() {
         // Given
@@ -305,24 +260,9 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: true,
-            visibility: .public,
-            assetBundle: .main
-        )
-        let propertyEn = definition.getNSLocalizedStringProperty(
-            forLang: "en",
-            isStatic: true,
-            visibility: .public,
-            assetBundle: .main
-        )
-        let propertyEnUs = definition.getNSLocalizedStringProperty(
-            forLang: "en-us",
-            isStatic: true,
-            visibility: .public,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
                 
         // Expect
         let expectFr = """
@@ -331,7 +271,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "This is a comment")
         }
         """
@@ -342,7 +282,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "This is a comment")
         }
         """
@@ -353,7 +293,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "This is a comment")
         }
         """
@@ -375,24 +315,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: true,
-            visibility: .internal,
-            assetBundle: .main
-        )
-        let propertyEn = definition.getNSLocalizedStringProperty(
-            forLang: "en",
-            isStatic: true,
-            visibility: .internal,
-            assetBundle: .main
-        )
-        let propertyEnUs = definition.getNSLocalizedStringProperty(
-            forLang: "en-us",
-            isStatic: true,
-            visibility: .internal,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -401,7 +326,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        internal static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -412,7 +337,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        internal static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -423,7 +348,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        internal static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -444,24 +369,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: true,
-            visibility: .internal,
-            assetBundle: .main
-        )
-        let propertyEn = definition.getNSLocalizedStringProperty(
-            forLang: "en",
-            isStatic: true,
-            visibility: .internal,
-            assetBundle: .main
-        )
-        let propertyEnUs = definition.getNSLocalizedStringProperty(
-            forLang: "en-us",
-            isStatic: true,
-            visibility: .internal,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -470,7 +380,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        internal static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -481,7 +391,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        internal static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -492,7 +402,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        internal static var definition_name: String {
+        static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -512,12 +422,7 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: false,
-            visibility: .internal,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
         
         // Expect
         let expectFr = """
@@ -526,7 +431,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        internal var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "This is a comment")
         }
         
@@ -535,7 +440,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        internal func definition_name(arg0: String) -> String {
+        func definition_name(arg0: String) -> String {
             String(format: self.definition_name, arg0)
         }
         """
@@ -553,12 +458,7 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: false,
-            visibility: .private,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
         
         // Expect
         let expectFr = """
@@ -567,7 +467,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        private var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" ! Your age is %d :) Your weight is %f ;-)", comment: "This is a comment")
         }
         
@@ -576,7 +476,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        private func definition_name(arg0: String, arg1: Int, arg2: Double) -> String {
+        func definition_name(arg0: String, arg1: Int, arg2: Double) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
         """
@@ -595,18 +495,8 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(
-            forLang: "fr",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
-        let propertyEn = definition.getNSLocalizedStringProperty(
-            forLang: "en",
-            isStatic: false,
-            visibility: .public,
-            assetBundle: .main
-        )
+        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
         
         let expectFr = """
         /// Translation in fr :
@@ -614,7 +504,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Vous %%: %1$@ %2$@ Age: %3$d", comment: "This is a comment")
         }
         
@@ -623,7 +513,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
+        func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
         """
@@ -634,7 +524,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public var definition_name: String {
+        var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "This is a comment")
         }
         
@@ -643,7 +533,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        public func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
+        func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
         """
@@ -666,21 +556,9 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getProperty(
-            forLang: "fr",
-            visibility: .public,
-            isStatic: false
-        )
-        let propertyEn = definition.getProperty(
-            forLang: "en",
-            visibility: .public,
-            isStatic: false
-        )
-        let propertyEnUs = definition.getProperty(
-            forLang: "en-us",
-            visibility: .public,
-            isStatic: false
-        )
+        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyEn = definition.getProperty(forLang: "en")
+        let propertyEnUs = definition.getProperty(forLang: "en-us")
         
         // Expect
         let expectFr = """
@@ -689,7 +567,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            public var definition_name: String {
+            var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -700,7 +578,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            public var definition_name: String {
+            var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -711,7 +589,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            public var definition_name: String {
+            var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -733,21 +611,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getProperty(
-            forLang: "fr",
-            visibility: .package,
-            isStatic: false
-        )
-        let propertyEn = definition.getProperty(
-            forLang: "en",
-            visibility: .package,
-            isStatic: false
-        )
-        let propertyEnUs = definition.getProperty(
-            forLang: "en-us",
-            visibility: .package,
-            isStatic: false
-        )
+        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyEn = definition.getProperty(forLang: "en")
+        let propertyEnUs = definition.getProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -756,7 +622,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            package var definition_name: String {
+            var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -767,7 +633,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            package var definition_name: String {
+            var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -778,7 +644,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            package var definition_name: String {
+            var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -799,21 +665,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getProperty(
-            forLang: "fr",
-            visibility: .private,
-            isStatic: false
-        )
-        let propertyEn = definition.getProperty(
-            forLang: "en",
-            visibility: .private,
-            isStatic: false
-        )
-        let propertyEnUs = definition.getProperty(
-            forLang: "en-us",
-            visibility: .private,
-            isStatic: false
-        )
+        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyEn = definition.getProperty(forLang: "en")
+        let propertyEnUs = definition.getProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -822,7 +676,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            private var definition_name: String {
+            var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -833,7 +687,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            private var definition_name: String {
+            var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -844,7 +698,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            private var definition_name: String {
+            var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -868,21 +722,9 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getProperty(
-            forLang: "fr",
-            visibility: .internal,
-            isStatic: true
-        )
-        let propertyEn = definition.getProperty(
-            forLang: "en",
-            visibility: .internal,
-            isStatic: true
-        )
-        let propertyEnUs = definition.getProperty(
-            forLang: "en-us",
-            visibility: .internal,
-            isStatic: true
-        )
+        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyEn = definition.getStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
         
         // Expect
         let expectFr = """
@@ -891,7 +733,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -902,7 +744,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -913,7 +755,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -935,21 +777,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getProperty(
-            forLang: "fr",
-            visibility: .internal,
-            isStatic: true
-        )
-        let propertyEn = definition.getProperty(
-            forLang: "en",
-            visibility: .internal,
-            isStatic: true
-        )
-        let propertyEnUs = definition.getProperty(
-            forLang: "en-us",
-            visibility: .internal,
-            isStatic: true
-        )
+        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyEn = definition.getStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -958,7 +788,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -969,7 +799,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -980,7 +810,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -1001,21 +831,9 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getProperty(
-            forLang: "fr",
-            visibility: .internal,
-            isStatic: true
-        )
-        let propertyEn = definition.getProperty(
-            forLang: "en",
-            visibility: .internal,
-            isStatic: true
-        )
-        let propertyEnUs = definition.getProperty(
-            forLang: "en-us",
-            visibility: .internal,
-            isStatic: true
-        )
+        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyEn = definition.getStaticProperty(forLang: "en")
+        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
 
         // Expect
         let expectFr = """
@@ -1024,7 +842,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -1035,7 +853,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -1046,7 +864,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            internal static var definition_name: String {
+            static var definition_name: String {
                 "This is the english us translation"
             }
         """

Tests/ResgenSwiftTests/Strings/StringFileGeneratorTests/Expectation/StringsFileGenerator+R2ExtensionsExpectation.swift

@@ -11,7 +11,7 @@ import ToolCore
 extension StringsFileGeneratorTests {
 
     static func getExtensionContentExpectation(
-        isStatic: Bool,
+        staticVar: Bool,
         s1DefOneFr: String = "Section Un - Definition Un",
         s1DefOneComment: String = "",
         s1DefTwoFr: String = "Section Un - Definition Deux",
@@ -20,8 +20,6 @@ extension StringsFileGeneratorTests {
         s2DefOneComment: String = "",
         s2DefTwoFr: String = "Section Deux - Definition Deux",
         s2DefTwoComment: String = "",
-        visibility: ExtensionVisibility = .internal,
-        assetBundle: AssetBundle = .main
     ) -> String {
             """
         // Generated by ResgenSwift.Strings.Stringium \(ResgenSwiftVersion)
@@ -32,13 +30,13 @@ extension StringsFileGeneratorTests {
         
         extension GenStrings {
         
-            \(visibility) enum KeyStrings: String {
+            enum KeyStrings: String {
                 case s1_def_one = "s1_def_one"
                 case s1_def_two = "s1_def_two"
                 case s2_def_one = "s2_def_one"
                 case s2_def_two = "s2_def_two"
         
-                \(visibility) var keyPath: KeyPath<GenStrings, String> {
+                var keyPath: KeyPath<GenStrings, String> {
                     switch self {
                     case .s1_def_one: return \\GenStrings.s1_def_one
                     case .s1_def_two: return \\GenStrings.s1_def_two
@@ -55,8 +53,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s1DefOneComment.isEmpty ? "No comment" : s1DefOneComment)
-            \(visibility) \(isStatic ? "static " : "")var s1_def_one: String {
-                NSLocalizedString("s1_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Un", comment: "\(s1DefOneComment)")
+            \(staticVar ? "static " : "")var s1_def_one: String {
+                NSLocalizedString("s1_def_one", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Un - Definition Un", comment: "\(s1DefOneComment)")
             }
         
             /// Translation in fr :
@@ -64,8 +62,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s1DefTwoComment.isEmpty ? "No comment" : s1DefTwoComment)
-            \(visibility) \(isStatic ? "static " : "")var s1_def_two: String {
-                NSLocalizedString("s1_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Deux", comment: "\(s1DefTwoComment)")
+            \(staticVar ? "static " : "")var s1_def_two: String {
+                NSLocalizedString("s1_def_two", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Un - Definition Deux", comment: "\(s1DefTwoComment)")
             }
         
             // MARK: - section_two
@@ -75,8 +73,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s2DefOneComment.isEmpty ? "No comment" : s2DefOneComment)
-            \(visibility) \(isStatic ? "static " : "")var s2_def_one: String {
-                NSLocalizedString("s2_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Un", comment: "\(s2DefOneComment)")
+            \(staticVar ? "static " : "")var s2_def_one: String {
+                NSLocalizedString("s2_def_one", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Deux - Definition Un", comment: "\(s2DefOneComment)")
             }
         
             /// Translation in fr :
@@ -84,8 +82,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s2DefTwoComment.isEmpty ? "No comment" : s2DefTwoComment)
-            \(visibility) \(isStatic ? "static " : "")var s2_def_two: String {
-                NSLocalizedString("s2_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Deux", comment: "\(s2DefTwoComment)")
+            \(staticVar ? "static " : "")var s2_def_two: String {
+                NSLocalizedString("s2_def_two", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Deux - Definition Deux", comment: "\(s2DefTwoComment)")
             }
         }
         """

Tests/ResgenSwiftTests/Strings/StringFileGeneratorTests/StringsFileGeneratorTests.swift

@@ -373,21 +373,17 @@ final class StringsFileGeneratorTests: XCTestCase {
         let sectionTwo = Section.Mock.getSectionTwo()
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(
-            sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
                                                                         defaultLang: "fr",
                                                                         tags: ["ios", "iosonly", "notranslation"],
-            isStatic: false,
+                                                                        staticVar: false,
                                                                         inputFilename: "myInputFilename",
                                                                         extensionName: "GenStrings",
-            extensionSuffix: "strings",
-            visibility: .internal,
-            assetBundle: .main
-        )
+                                                                        extensionSuffix: "strings")
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            isStatic: false
+            staticVar: false
         )
 
         if extensionContent != expect {
@@ -408,26 +404,21 @@ final class StringsFileGeneratorTests: XCTestCase {
         )
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(
-            sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
                                                                         defaultLang: "fr",
                                                                         tags: ["ios", "iosonly", "notranslation"],
-            isStatic: false,
+                                                                        staticVar: false,
                                                                         inputFilename: "myInputFilename",
                                                                         extensionName: "GenStrings",
-            extensionSuffix: "strings",
-            visibility: .public,
-            assetBundle: .main
-        )
+                                                                        extensionSuffix: "strings")
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            isStatic: false,
+            staticVar: false,
             s1DefOneComment: "This is a comment",
             s1DefTwoComment: "This is a comment",
             s2DefOneComment: "This is a comment",
             s2DefTwoComment: "This is a comment",
-            visibility: .public
         )
 
         if extensionContent != expect {
@@ -437,29 +428,23 @@ final class StringsFileGeneratorTests: XCTestCase {
     }
 
     // MARK: - Extension Content Static
-    func testGeneratedExtensionContentWithIsStatic() {
+    func testGeneratedExtensionContentWithStaticVar() {
         // Given
         let sectionOne = Section.Mock.getSectionOne()
         let sectionTwo = Section.Mock.getSectionTwo()
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(
-            sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
                                                                         defaultLang: "fr",
                                                                         tags: ["ios", "iosonly", "notranslation"],
-            isStatic: true,
+                                                                        staticVar: true,
                                                                         inputFilename: "myInputFilename",
                                                                         extensionName: "GenStrings",
-            extensionSuffix: "strings",
-            visibility: .package,
-            assetBundle: .module
-        )
+                                                                        extensionSuffix: "strings")
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            isStatic: true,
-            visibility: .package,
-            assetBundle: .module
+            staticVar: true
         )
 
         if extensionContent != expect {
@@ -468,7 +453,7 @@ final class StringsFileGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
 
-    func testGeneratedExtensionContentWithIsStaticWithComment() {
+    func testGeneratedExtensionContentWithStaticVarWithComment() {
         // Given
         let sectionOne = Section.Mock.getSectionOne(
             defOneComment: "This is a comment",
@@ -480,27 +465,21 @@ final class StringsFileGeneratorTests: XCTestCase {
         )
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(
-            sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
                                                                         defaultLang: "fr",
                                                                         tags: ["ios", "iosonly", "notranslation"],
-            isStatic: true,
+                                                                        staticVar: true,
                                                                         inputFilename: "myInputFilename",
                                                                         extensionName: "GenStrings",
-            extensionSuffix: "strings",
-            visibility: .internal,
-            assetBundle: .module
-        )
+                                                                        extensionSuffix: "strings")
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            isStatic: true,
+            staticVar: true,
             s1DefOneComment: "This is a comment",
             s1DefTwoComment: "This is a comment",
             s2DefOneComment: "This is a comment",
             s2DefTwoComment: "This is a comment",
-            visibility: .internal,
-            assetBundle: .module
         )
 
         if extensionContent != expect {

Tests/ResgenSwiftTests/Strings/TagsGeneratorTests.swift

@@ -13,11 +13,7 @@ import ToolCore
 
 final class TagsGeneratorTests: XCTestCase {
     
-    private func getDefinition(
-        name: String,
-        lang: String,
-        tags: [String]
-    ) -> Definition {
+    private func getDefinition(name: String, lang: String, tags: [String]) -> Definition {
         let definition = Definition(name: name)
         definition.tags = tags
         definition.translations = [lang: "Some translation"]
@@ -45,15 +41,11 @@ final class TagsGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = TagsGenerator.getExtensionContent(
-            sections: [sectionOne, sectionTwo, sectionThree],
+        let extensionContent = TagsGenerator.getExtensionContent(sections: [sectionOne, sectionTwo, sectionThree],
                                                                  lang: "ium",
                                                                  tags: ["ios", "iosonly"],
-            isStatic: false,
-            extensionName: "GenTags",
-            visibility: .public
-        )
-
+                                                                 staticVar: false,
+                                                                 extensionName: "GenTags")
         // Expect Tags
         let expect = """
         // Generated by ResgenSwift.Strings.Tags \(ResgenSwiftVersion)
@@ -68,7 +60,7 @@ final class TagsGeneratorTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            public var s1_def_one: String {
+            var s1_def_one: String {
                 "Some translation"
             }
         
@@ -77,7 +69,7 @@ final class TagsGeneratorTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            public var s1_def_two: String {
+            var s1_def_two: String {
                 "Some translation"
             }
         
@@ -88,7 +80,7 @@ final class TagsGeneratorTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            public var s2_def_one: String {
+            var s2_def_one: String {
                 "Some translation"
             }
         }