feat(RES-58): Add new parameter "bundle" (#19)

Add bundle parameter to define if resource should be load from Bundle.main (app) or Bundle.module (SPM package)

Reviewed-on: #19

Package.swift

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

README.md

@@ -2,64 +2,122 @@
 
 ResgenSwift is a package, fully written in Swift, to help you automatize ressource update and generation.
 
-> 🧐 For all commands, see samples files in `SampleFiles`
+> 🧐 For all commands, see samples files in `SampleFiles` and use `resgen-swift help` and `resgen-swift help <subcommand>` for detailed help.
 
 ## 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 the `$PATH` contains path of `fc-scan`.
+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.
+```
 
 **Example**
 
 ```sh
-swift run -c release ResgenSwift fonts $FORCE_FLAG "./Fonts/fonts.txt" \
+swift run -c release ResgenSwift fonts -f "./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" 
- --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.
 
+
 ```sh
-swift run -c release ResgenSwift colors $FORCE_FLAG "./Colors/colors.txt" \
+USAGE:
- --style all \
+swift run -c release ResgenSwift colors [-f] <input-file> \
- --xcassets-path "./Colors/colors.xcassets" \
+ --style <style> \
- --extension-output-path "./Colors/Generated/" \
+ --xcassets-path <xcassets-path> \
- --extension-name "AppColor" \
+ [--static-members <static-members>] \
- --extension-name-ui-kit "UIAppColor" \ 
+ [--visibility <visibility>] \
- --extension-suffix "GreatApp" \
+ [--asset-bundle <asset-bundle>] \
- --static-members true
+ [--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.
 ```
 
-**Parameters**
 
-1. `-f`: force generation
+**Example**
-2. Input colors file
+
-3. `--style` can be `all` or `light`
+```sh
-4. `--extension-output-path`: path where to generate generated extension
+swift run -c release ResgenSwift colors -f "./Colors/colors.txt" \
-5. `--extension-name` *(optional)* : name of the class to add SwiftUI getters
+ --style all \
-6. `--extension-name-ui-kit` *(optional)* : name of the class to add UIKit getters
+ --xcassets-path "./Colors/colors.xcassets" \
-7. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppColor+GreatApp.swift`)
+ --static-members true \
-8. `--static-members` *(optional)*: generate static properties or not
+ --visibility internal \
-   
+ --asset-bundle "main" \
+ --extension-output-path "./Colors/Generated/" \
+ --extension-name "AppColor \
+ --extension-name-ui-kit "UIAppColor" \
+ --extension-suffix "GreatApp"
+```
+
+> ⚠️ 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.
  
 ## Strings
 
@@ -68,98 +126,190 @@ Strings command allows to generate `strings` files along with extensions to acce
 ### Twine (not recommended)
 
 ```sh
-swift run -c release ResgenSwift strings twine $FORCE_FLAG "./Twine/strings.txt" \
+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" \
  --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
-swift run -c release ResgenSwift strings stringium $FORCE_FLAG "./Strings/strings.txt" \
+USAGE: 
- --output-path "./Strings/Generated" \
+swift run -c release ResgenSwift strings stringium [-f] <input-file> \
- --langs "fr en en-us" \
+ --output-path <output-path> \
- --default-lang "en" \
+ --langs <langs> \
- --extension-output-path "./Strings/Generated" \
+ --default-lang <default-lang> \
- --extension-name "AppString" \
+ [--tags <tags>] \
- --extension-suffix "GreatApp" \
+ [--static-members <static-members>] \
- --xcStrings true
+ [--xc-strings <xc-strings>] \
- --static-members true
+ [--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.
 ```
 
- **Parameters**
 
-1. `-f`: force generation
+**Example**
-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
 
+```sh
+swift run -c release ResgenSwift strings stringium -f "./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" \
+ --extension-output-path "./Strings/Generated" \
+ --extension-name "AppString \
+ --extension-suffix "GreatApp"
+```
+
+> ⚠️ 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.
 
 ## 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
-swift run -c release ResgenSwift strings tags $FORCE_FLAG "./Tags/tags.txt" \
+USAGE: 
- --lang "ium" \
+swift run -c release ResgenSwift strings tags [-f] <input-file> \
- --extension-output-path "./Tags/Generated" \
+ --extension-output-path <extension-output-path> \
- --extension-name "AppTags" \
+ [--lang <lang>] \
- --extension-suffix "GreatApp" \
+ [--visibility <visibility>] \
- --static-members true
+ [--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.
 ```
 
- **Parameters**
+**Example**
 
-1. `-f`: force generation
+```sh
-2. Input tags file (must be Twine formatted)
+swift run -c release ResgenSwift strings tags -f "./Tags/tags.txt" \
-3. `--lang`: langs to look at in input file
+ --extension-output-path "./Tags/Generated" \
-4. `--extension-output-path`: path where to generate generated extension
+ --lang "ium" \
-5. `--extension-name` *(optional)* : name of class to add the extension
+ --visibility "public" \
-6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppTags+GreatApp.swift`)
+ --static-members true \
-7. `--static-members` *(optional)*: generate static properties or not
+ --extension-name "AppTags" \
+ --extension-suffix "GreatApp"
+```
 
 > ⚠️ 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
-swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/analytics.yml" \
+USAGE:
- --target "matomo firebase" \
+swift run -c release ResgenSwift analytics [-f] <input-file> \
- --extension-output-path "./Analytics/Generated" \
+--target <target> \
- --extension-name "AppAnalytics" \
+--output-file <output-file> \
- --extension-suffix "GreatApp" \
+[--static-members <static-members>] \
- --static-members true
+[--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.
 ```
- 
- **Parameters**
 
-1. `-f`: force generation
+**Example**
-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`.
+```sh
+swift run -c release ResgenSwift analytics -f "./Tags/analytics.yml" \
+--target "matomo firebase" \
+--output-file "./Analytics/Generated/AppAnalytics+GreatApp.swift" \
+--static-members false \
+--visibility "public"
+```
 
 ### YAML
 
@@ -266,28 +416,61 @@ events:
 
 ## Images
 
-Images generator will generate images assets along with extensions to access those images easily. 
+Images generator will generate images assets along with extensions to access those images easily. If the extension name is not specified, no extension will be generated. 
 
 ```sh
-swift run -c release ResgenSwift images $FORCE_FLAG "./Images/images.txt" \
+USAGE: 
- --xcassets-path "./Images/app.xcassets" \
+resgen-swift images [-f] [-F] <input-file> \
- --extension-output-path "./Images/Generated" \
+ --xcassets-path <xcassets-path> \
- --extension-name "AppImage" \
+ [--static-members <static-members>] \
- --extension-name-ui-kit "UIAppImage" \ 
+ [--visibility <visibility>] \
- --extension-suffix "GreatApp" \
+ [--asset-bundle <asset-bundle>] \
- --static-members true
+ [--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.
 ```
 
- **Parameters**
+**Example**
 
-1. `-f`: force generation
+```sh
-2. Input images definitions file
+swift run -c release ResgenSwift images -F "./Images/images.txt" \
-3. `--xcassets-path`: xcasset path where to generate imagesets
+ --xcassets-path "./Images/app.xcassets" \
-4. `--extension-output-path`: path where to generate generated extension
+ --static-members false \
-5. `--extension-name` *(optional)* : name of the class to add SwiftUI getters
+ --visibility "public" \
-6. `--extension-name-ui-kit` *(optional)* : name of the class to add UIKit getters
+ --asset-bundle "module" \
-6. `--extension-suffix` *(optional)* : additional text which is added to filename (ex: `AppImage+GreatApp.swift`)
+ --extension-output-path "./Images/Generated" \
-7. `--static-members` *(optional)*: generate static properties or not
+ --extension-name "AppImage" \
+ --extension-name-ui-kit "UIAppImage" \
+ --extension-suffix "GreatApp"
+```
+
+> ⚠️ 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.
 
 > ⚠️ 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
 
@@ -304,13 +487,15 @@ All parameters can be specified in a configuration file in `Yaml`:
 colors:
 -
   inputFile: String
-  style: [light/all]
+  style: String
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
+  visiblity: String?
+  assetBundle: String?
 
 fonts:
 -
@@ -320,6 +505,7 @@ fonts:
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
+  visiblity: String?
   infoPlistPaths: [String]
   
 images:
@@ -331,6 +517,8 @@ images:
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
+  visiblity: String?
+  assetBundle: String?
 
 strings:
 - 
@@ -342,6 +530,9 @@ strings:
   extensionName: String?
   extensionSuffix: String?
   staticMembers: Bool?
+  visiblity: String?
+  assetBundle: String?
+  xcStrings: Bool?
 
 tags:
 - 
@@ -351,14 +542,14 @@ tags:
   extensionName: String?
   extensionSuffix: String?
   staticMembers: Bool?
+  visiblity: String?
 
 analytics:
 - 
   inputFile: String
   target: String
-  extensionOutputPath: String
+  outputFile: String
-  extensionName: String?
+  visibility: String?
-  extensionSuffix: String?
   staticMembers: Bool?
 ```
 
@@ -373,22 +564,26 @@ Sample for 2 colors configurations:
 colors:
 -
   inputFile: String
-  style: [light/all]
+  style: String
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
   extensionNameUIKit: String?
   extensionSuffix: String?
   staticMembers: Bool?
+  visiblity: String?
+  assetBundle: String?
 -
   inputFile: String
-  style: [light/all]
+  style: String
   xcassetsPath: String
   extensionOutputPath: String
   extensionName: String?
   extensionNameUIKit: String?
   extensionSuffix: String?
-  staticMembers: Bool?  
+  staticMembers: Bool?
+  visiblity: String?
+  assetBundle: String?
 ...
 ```
 
@@ -432,8 +627,9 @@ architecture:
 ```
 
 This will generate a file named as the architecture classname: `R.swift`. Based on the previous architecture, it will generate:
-```
+
-class R {
+```swift
+class R: Sendable {
     static let images = R2Image()
     static let strings = R2String()
     static let fonts = R2Font()
@@ -441,25 +637,25 @@ class R {
     static let uikit = R2UI()
 }
 
-class R2Image {}
+class R2Image: Sendable {}
 
-class R2String {}
+class R2String: Sendable {}
 
-class R2Font {}
+class R2Font: Sendable {}
 
-class R2Image {}
+class R2Image: Sendable {}
 
-class R2UI {
+class R2UI: Sendable {
     let images = R2UIImage()
     let fonts = R2UIFont()
     let images = R2UIImage()
 }
 
-class R2UIImage {}
+class R2UIImage: Sendable {}
 
-class R2UIFont {}
+class R2UIFont: Sendable {}
 
-class R2UIImage {}
+class R2UIImage: Sendable {}
 ```
 
           

SampleFiles/Colors/Generated/ColorYolo+GenAllScript.swift

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

SampleFiles/Colors/Generated/UIColorYolo+GenAllScript.swift

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

SampleFiles/Colors/colors.xcassets/Colors/Contents.json

@@ -1,6 +0,0 @@
-{
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}

SampleFiles/Fonts/Generated/FontYolo+GenAllScript.swift

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

SampleFiles/Images/Generated/ImageYolo+GenAllScript.swift

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

SampleFiles/Images/Generated/UIImageYolo+GenAllScript.swift

@@ -1,31 +1,31 @@
-// Generated by ResgenSwift.Images 2.1.0
+// Generated by ResgenSwift.Images 2.2.0
 // Images from sampleImages
 
 import UIKit
 
 extension UIImageYolo {
 
-    var article_notification_pull_detail: UIImage {
+    public var article_notification_pull_detail: UIImage {
         UIImage(named: "article_notification_pull_detail")!
     }
 
-    var article_notification_pull: UIImage {
+    public var article_notification_pull: UIImage {
         UIImage(named: "article_notification_pull")!
     }
 
-    var new_article: UIImage {
+    public var new_article: UIImage {
         UIImage(named: "new_article")!
     }
 
-    var welcome_background: UIImage {
+    public var welcome_background: UIImage {
         UIImage(named: "welcome_background")!
     }
 
-    var article_trash: UIImage {
+    public var article_trash: UIImage {
         UIImage(named: "article_trash")!
     }
 
-    var ic_close_article: UIImage {
+    public 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.1.0
+// Generated by ResgenSwift.Strings.Stringium 2.2.0
 
 import UIKit
 
@@ -6,7 +6,7 @@ fileprivate let kStringsFileName = "sampleStrings"
 
 extension String {
 
-    enum KeyGenAllScript: String {
+    public 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"
 
-        var keyPath: KeyPath<String, String> {
+        public 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
-    var param_lang: String {
+    public var param_lang: String {
         NSLocalizedString("param_lang", tableName: kStringsFileName, bundle: Bundle.main, value: "en", comment: "")
     }
 
@@ -44,7 +44,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    var generic_back: String {
+    public var generic_back: String {
         NSLocalizedString("generic_back", tableName: kStringsFileName, bundle: Bundle.main, value: "Back", comment: "")
     }
 
@@ -53,7 +53,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    var generic_loading_data: String {
+    public var generic_loading_data: String {
         NSLocalizedString("generic_loading_data", tableName: kStringsFileName, bundle: Bundle.main, value: "Loading data...", comment: "")
     }
 
@@ -62,7 +62,7 @@ extension String {
     ///
     /// Comment :
     /// No comment
-    var generic_welcome_firstname_format: String {
+    public 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
-    func generic_welcome_firstname_format(arg0: String) -> String {
+    public 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
-    var test_equal_symbol: String {
+    public 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
-    var placeholders_test_one: String {
+    public 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
-    func placeholders_test_one(arg0: String, arg1: String, arg2: Int) -> String {
+    public 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

@@ -0,0 +1,150 @@
+{
+  "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 data..."
+          }
+        },
+        "en-us" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Loading data..."
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Chargement des 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/Tags/Generated/Analytics+GenAllScript.swift

@@ -1,4 +1,4 @@
-// Generated by ResgenSwift.Analytics 2.1.0
+// Generated by ResgenSwift.Analytics 2.2.0
 
 import Foundation
 import MatomoTracker
@@ -6,7 +6,8 @@ import FirebaseAnalytics
 
 // MARK: - Protocol
 
-protocol AnalyticsManagerProtocol {
+public protocol AnalyticsManagerProtocol {
+
     func logScreen(
         name: String,
         path: String,
@@ -92,6 +93,9 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
 // MARK: - Firebase
 
 class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
+
+    // MARK: - Methods
+
     func logScreen(
         name: String,
         path: String,
@@ -112,7 +116,7 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
                 }) {
                     continue
                 }
-                
+
                 parameters[newKey] = newValue as? NSObject
             }
         }
@@ -136,11 +140,11 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
         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
@@ -158,24 +162,25 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
             parameters: parameters
         )
     }
+
     func setEnable(_ enable: Bool) {
         Analytics.setAnalyticsCollectionEnabled(enable)
     }
 }
 
-
 // MARK: - Traker Type
 
-enum TrackerType: CaseIterable {
+public enum TrackerType: CaseIterable {
+
     case matomo
     case firebase
 }
 
 // MARK: - Manager
 
-class AnalyticsManager {
+public class AnalyticsManager {
 
-    static var shared = AnalyticsManager()
+    public static var shared = AnalyticsManager()
 
     private init() {}
 
@@ -191,7 +196,7 @@ class AnalyticsManager {
         }
     }
 
-    // MARK: - Methods
+    // MARK: - Enable Methods
 
     private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
         managers.forEach { (key, value) in
@@ -203,22 +208,24 @@ class AnalyticsManager {
         }
     }
 
-    func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+    public func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
         setAnalytics(enable: true, analytics)
     }
 
-    func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+    public func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
         setAnalytics(enable: false, analytics)
     }
 
-    func configure(siteId: String, url: String) {
+    public func configure(siteId: String, url: String) {
         managers[TrackerType.matomo] = MatomoAnalyticsManager(
             siteId: siteId,
             url: url
         )
         managers[TrackerType.firebase] = FirebaseAnalyticsManager()
     }
-        
+
+    // MARK: - Private Log Methods
+
     private func logScreen(
         name: String,
         path: String,
@@ -255,7 +262,7 @@ class AnalyticsManager {
 
     // MARK: - section_one
 
-    func logScreenS1DefOne(title: String) {
+    public func logScreenS1DefOne(title: String) {
         logScreen(
             name: "s1 def one \(title)",
             path: "s1_def_one/\(title)",
@@ -263,7 +270,7 @@ class AnalyticsManager {
         )
     }
 
-    func logEventS1DefTwo(
+    public func logEventS1DefTwo(
         title: String,
 		count: String,
 		test2: String = "test"
@@ -283,7 +290,7 @@ class AnalyticsManager {
 
     // MARK: - section_two
 
-    func logScreenS2DefOne() {
+    public func logScreenS2DefOne() {
         logScreen(
             name: "s2 def one",
             path: "s2_def_one/",

SampleFiles/Tags/Generated/Tags+GenAllScript.swift

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

SampleFiles/genAllRessources.sh

@@ -54,7 +54,7 @@ echo "\n-------------------------\n"
 
 # Analytics
 swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \
- --target "firebase matomo" \
+ --target "firebase" \
  --extension-output-path "./Tags/Generated" \
  --extension-name "Analytics" \
  --extension-suffix "GenAllScript" \

SampleFiles/resgenConfiguration.yml

@@ -30,13 +30,14 @@ architecture:
 #
 strings:
 -
- inputFile: ./Strings/sampleStrings.txt
+  inputFile: ./Strings/sampleStrings.txt
- outputPath: ./Strings/Generated
+  outputPath: ./Strings/Generated
- langs: "fr en en-us"
+  langs: "fr en en-us"
- defaultLang: en
+  defaultLang: en
- extensionOutputPath: ./Strings/Generated
+  extensionOutputPath: ./Strings/Generated
- extensionName: String
+  extensionName: String
- extensionSuffix: GenAllScript
+  extensionSuffix: GenAllScript
+  visibility: public
 
 
 #
@@ -50,6 +51,7 @@ images:
   extensionName: ImageYolo
   extensionNameUIKit: UIImageYolo
   extensionSuffix: GenAllScript
+  visibility: public
 
 
 # 
@@ -57,13 +59,14 @@ images:
 #
 colors:
 -
- inputFile: ./Colors/sampleColors1.txt
+  inputFile: ./Colors/sampleColors1.txt
- style: all
+  style: all
- xcassetsPath: ./Colors/colors.xcassets
+  xcassetsPath: ./Colors/colors.xcassets
- extensionOutputPath: ./Colors/Generated/
+  extensionOutputPath: ./Colors/Generated/
- extensionName: ColorYolo
+  extensionName: ColorYolo
- extensionNameUIKit: UIColorYolo
+  extensionNameUIKit: UIColorYolo
- extensionSuffix: GenAllScript
+  extensionSuffix: GenAllScript
+  visibility: public
 
 
 #
@@ -76,6 +79,7 @@ tags:
   extensionOutputPath: ./Tags/Generated
   extensionName: Tags
   extensionSuffix: GenAllScript
+  visibility: public
 
 
 #
@@ -85,9 +89,8 @@ analytics:
 -
   inputFile: ./Tags/sampleTags.yml
   target: "matomo firebase"
-  extensionOutputPath: ./Tags/Generated
+  outputFile: ./Tags/Generated/Analytics+GenAllScript.swift
-  extensionName: Analytics
+  visibility: public
-  extensionSuffix: GenAllScript
 
 
 #
@@ -95,9 +98,10 @@ analytics:
 #
 fonts:
 -
-   inputFile: ./Fonts/sampleFontsAll.txt
+  inputFile: ./Fonts/sampleFontsAll.txt
-   extensionOutputPath: ./Fonts/Generated
+  extensionOutputPath: ./Fonts/Generated
-   extensionName: FontYolo
+  extensionName: FontYolo
-   extensionNameUIKit: UIFontYolo
+  extensionNameUIKit: UIFontYolo
-   extensionSuffix: GenAllScript
+  extensionSuffix: GenAllScript
-   infoPlistPaths: "./Fonts/Generated/test.plist ./Fonts/Generated/test2.plist"
+  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"],
-            staticVar: options.staticMembers,
+            isStatic: options.staticMembers,
-            extensionName: options.extensionName,
+            outputFile: options.outputFile,
-            extensionFilePath: options.extensionFilePath
+            visibility: options.extensionVisibility
         )
 
         print("[\(Self.toolName)] Analytics generated")
@@ -79,7 +79,7 @@ struct Analytics: ParsableCommand {
         guard GeneratorChecker.shouldGenerate(
             force: options.forceGeneration,
             inputFilePath: options.inputFile,
-            extensionFilePath: options.extensionFilePath
+            extensionFilePath: options.outputFile
         ) else {
             print("[\(Self.toolName)] Analytics are already up to date :) ")
             return false

Sources/ResgenSwift/Analytics/AnalyticsOptions.swift

@@ -7,45 +7,41 @@
 
 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\")")
+    @Option(
+        help: "Target(s) analytics to generate. (\"matomo\" | \"firebase\")",
+        completion: .list(["matotmo", "firebase"])
+    )
     var target: String
 
-    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    @Option(
-    var extensionOutputPath: String
+        help: "Where to generate the analytics manager (path with filename)",
+        transform: { $0.replaceTiltWithHomeDirectoryPath() }
+    )
+    var outputFile: String
 
     @Option(help: "Tell if it will generate static properties or not")
     var staticMembers: Bool = false
 
-    @Option(help: "Extension name. If not specified, it will generate a Analytics extension.")
+    @Option(
-    var extensionName: String = Analytics.defaultExtensionName
+        name: .customLong("visibility"),
-
+        help: "Visibility of extension and properties. Possibles values: public, private, package, internal. Default is internal",
-    @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+Analytics{extensionSuffix}.swift")
+        completion: .list(["public", "private", "package", "internal"])
-    var extensionSuffix: String?
+    )
-}
+    var extensionVisibility: ExtensionVisibility = .internal
-
-// 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,11 +5,14 @@
 //  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 {
 
@@ -19,9 +22,9 @@ enum AnalyticsGenerator {
         sections: [AnalyticsCategory],
         target: String,
         tags: [String],
-        staticVar: Bool,
+        isStatic: Bool,
-        extensionName: String,
+        outputFile: String,
-        extensionFilePath: String
+        visibility: ExtensionVisibility
     ) {
         // Get target type from enum
         let targetsString: [String] = target.components(separatedBy: " ")
@@ -40,16 +43,16 @@ enum AnalyticsGenerator {
             targets: targets,
             sections: sections,
             tags: tags,
-            staticVar: staticVar,
+            isStatic: isStatic,
-            extensionName: extensionName
+            visibility: visibility
         )
 
         // Write content
-        let extensionFilePathURL = URL(fileURLWithPath: extensionFilePath)
+        let outputFilePathURL = URL(fileURLWithPath: outputFile)
         do {
-            try extensionFileContent.write(to: extensionFilePathURL, atomically: false, encoding: .utf8)
+            try extensionFileContent.write(to: outputFilePathURL, atomically: false, encoding: .utf8)
         } catch {
-            let error = AnalyticsError.writeFile(extensionFilePath, error.localizedDescription)
+            let error = AnalyticsError.writeFile(outputFile, error.localizedDescription)
             print(error.description)
             Analytics.exit(withError: error)
         }
@@ -61,19 +64,20 @@ enum AnalyticsGenerator {
         targets: [TrackerType],
         sections: [AnalyticsCategory],
         tags: [String],
-        staticVar: Bool,
+        isStatic: Bool,
-        extensionName: String
+        visibility: ExtensionVisibility
     ) -> String {
         [
             getHeader(
                 targets: targets,
-                extensionClassname: extensionName,
+                isStatic: isStatic,
-                staticVar: staticVar
+                visibility: visibility
             ),
             getProperties(
                 sections: sections,
                 tags: tags,
-                staticVar: staticVar
+                isStatic: isStatic,
+                visibility: visibility
             ),
             getFooter()
         ]
@@ -84,54 +88,60 @@ enum AnalyticsGenerator {
 
     private static func getHeader(
         targets: [TrackerType],
-        extensionClassname: String,
+        isStatic: Bool,
-        staticVar: Bool
+        visibility: ExtensionVisibility
     ) -> String {
         """
         // Generated by ResgenSwift.\(Analytics.toolName) \(ResgenSwiftVersion)
-        
+
         \(Self.getImport(targets: targets))
-        
+
-        \(Self.getAnalyticsProtocol(targets: targets))
+        \(Self.getAnalyticsProtocol(targets: targets, visibility: visibility))
-        
+
-        \(Self.getTrackerTypeEnum())
+        \(Self.getTrackerTypeEnum(targets: targets, visibility: visibility))
-        
+
         // MARK: - Manager
 
-        class AnalyticsManager {
+        \(visibility) class AnalyticsManager {
-        
+
-            static var shared = AnalyticsManager()
+            \(visibility) static var shared = AnalyticsManager()
-        
+
             private init() {}
 
             // MARK: - Properties
-        
+
             var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
-        
+
-            \(Self.getEnabledContent())
+            \(Self.getEnabledContent(visibility: visibility))
-        
+
-            \(Self.getAnalyticsProperties(targets: targets))
+            \(Self.getAnalyticsProperties(targets: targets, visibility: visibility))
-                
+
             \(Self.getPrivateLogFunction())
         """
     }
-    
+
-    private static func getTrackerTypeEnum() -> String {
+    private static func getTrackerTypeEnum(
+        targets: [TrackerType],
+        visibility: ExtensionVisibility
+    ) -> String {
         var result: [String] = []
-        TrackerType.allCases.forEach { type in
+        targets.forEach { type in
             result.append("    case \(type)")
         }
-        
+
         return """
         // MARK: - Traker Type
-        
+
-        enum TrackerType: CaseIterable {
+        \(visibility) enum TrackerType: CaseIterable {
+
         \(result.joined(separator: "\n"))
         }
         """
     }
-    
+
-    private static func getEnabledContent() -> String {
+    private static func getEnabledContent(
+        visibility: ExtensionVisibility
+    ) -> String {
         """
         private var isEnabled: Bool {
                 if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
@@ -140,9 +150,9 @@ enum AnalyticsGenerator {
                     true
                 }
             }
-        
+
-            // MARK: - Methods
+            // MARK: - Enable Methods
-        
+
             private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
                 managers.forEach { (key, value) in
                     if analytics.contains(where: { type in
@@ -152,12 +162,12 @@ enum AnalyticsGenerator {
                     }
                 }
             }
-        
+
-            func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+            \(visibility) func enableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
                 setAnalytics(enable: true, analytics)
             }
-        
+
-            func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
+            \(visibility) func disableAnalytics(_ analytics: [TrackerType] = TrackerType.allCases) {
                 setAnalytics(enable: false, analytics)
             }
         """
@@ -171,6 +181,7 @@ enum AnalyticsGenerator {
         if targets.contains(TrackerType.matomo) {
             result.append("import MatomoTracker")
         }
+
         if targets.contains(TrackerType.firebase) {
             result.append("import FirebaseAnalytics")
         }
@@ -180,13 +191,15 @@ enum AnalyticsGenerator {
 
     private static func getPrivateLogFunction() -> String {
         """
-        private func logScreen(
+        // MARK: - Private Log Methods
+
+            private func logScreen(
                 name: String,
                 path: String,
                 params: [String: Any]?
             ) {
                 guard isEnabled else { return }
-        
+
                 managers.values.forEach { manager in
                     manager.logScreen(
                         name: name,
@@ -203,7 +216,7 @@ enum AnalyticsGenerator {
                 params: [String: Any]?
             ) {
                 guard isEnabled else { return }
-        
+
                 managers.values.forEach { manager in
                     manager.logEvent(
                         name: name,
@@ -216,15 +229,18 @@ enum AnalyticsGenerator {
         """
     }
 
-    private static func getAnalyticsProperties(targets: [TrackerType]) -> String {
+    private static func getAnalyticsProperties(
+        targets: [TrackerType],
+        visibility: ExtensionVisibility
+    ) -> String {
         var header = ""
         var content: [String] = []
         let footer = "    }"
 
         if targets.contains(TrackerType.matomo) {
-            header = "func configure(siteId: String, url: String) {"
+            header = "\(visibility) func configure(siteId: String, url: String) {"
         } else if targets.contains(TrackerType.firebase) {
-            header = "func configure() {"
+            header = "\(visibility) func configure() {"
         }
 
         if targets.contains(TrackerType.matomo) {
@@ -235,6 +251,7 @@ enum AnalyticsGenerator {
                     )
             """)
         }
+
         if targets.contains(TrackerType.firebase) {
             content.append("        managers[TrackerType.firebase] = FirebaseAnalyticsManager()")
         }
@@ -247,27 +264,30 @@ enum AnalyticsGenerator {
             .joined(separator: "\n")
     }
 
-    private static func getAnalyticsProtocol(targets: [TrackerType]) -> String {
+    private static func getAnalyticsProtocol(
+        targets: [TrackerType],
+        visibility: ExtensionVisibility
+    ) -> String {
         let proto = """
         // MARK: - Protocol
 
-        protocol AnalyticsManagerProtocol {
+        \(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)
         }
-
         """
 
         var result: [String] = [proto]
@@ -280,13 +300,14 @@ enum AnalyticsGenerator {
             result.append(FirebaseGenerator.service)
         }
 
-        return result.joined(separator: "\n")
+        return result.joined(separator: "\n\n")
     }
 
     private static func getProperties(
         sections: [AnalyticsCategory],
         tags: [String],
-        staticVar: Bool
+        isStatic: Bool,
+        visibility: ExtensionVisibility
     ) -> String {
         sections
             .compactMap { section in
@@ -301,10 +322,10 @@ enum AnalyticsGenerator {
                         return // Go to next definition
                     }
 
-                    if staticVar {
+                    if isStatic {
-                        res += "\n\n\(definition.getStaticProperty())"
+                        res += "\n\n\(definition.getStaticProperty(visibility: visibility))"
                     } else {
-                        res += "\n\n\(definition.getProperty())"
+                        res += "\n\n\(definition.getProperty(visibility: visibility))"
                     }
                 }
                 return res
@@ -319,3 +340,5 @@ enum AnalyticsGenerator {
         """
     }
 }
+
+// CPD-ON

Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift

@@ -13,11 +13,11 @@ enum FirebaseGenerator {
 
     static var service: String {
         [
-            FirebaseGenerator.header,
+            Self.header,
-            FirebaseGenerator.logScreen,
+            Self.logScreen,
-            FirebaseGenerator.logEvent,
+            Self.logEvent,
-            FirebaseGenerator.enable,
+            Self.enable,
-            FirebaseGenerator.footer
+            Self.footer
         ]
             .joined(separator: "\n")
     }
@@ -29,6 +29,9 @@ enum FirebaseGenerator {
         // MARK: - Firebase
 
         class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
+
+            // MARK: - Methods
+
         """
     }
 
@@ -42,11 +45,11 @@ enum FirebaseGenerator {
                 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
@@ -54,11 +57,11 @@ enum FirebaseGenerator {
                         }) {
                             continue
                         }
-                        
+
                         parameters[newKey] = newValue as? NSObject
                     }
                 }
-        
+
                 Analytics.logEvent(
                     AnalyticsEventScreenView,
                     parameters: parameters
@@ -79,15 +82,15 @@ enum FirebaseGenerator {
                 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
@@ -105,9 +108,10 @@ enum FirebaseGenerator {
                     parameters: parameters
                 )
             }
+
         """
     }
-    
+
     private static var enable: String {
         """
             func setEnable(_ enable: Bool) {
@@ -115,11 +119,10 @@ enum FirebaseGenerator {
             }
         """
     }
-    
+
     private static var footer: String {
         """
         }
-
         """
     }
 }

Sources/ResgenSwift/Analytics/Generator/MatomoGenerator.swift

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

Sources/ResgenSwift/Analytics/Model/AnalyticsDefinition.swift

@@ -52,20 +52,22 @@ class AnalyticsDefinition {
 
     private func getParameters() -> String {
         var result: String
-        
+
         let paramsString = parameters.compactMap { parameter -> String? in
             guard parameter.value.isEmpty else { return nil }
-            
+
             let defaultValue: String
             switch parameter.type {
             case .bool:
                 defaultValue = "\(parameter.defaultValue.lowercased())"
+
             case .int, .double:
                 defaultValue = "\(parameter.defaultValue)"
+
             case .string:
                 defaultValue = "\"\(parameter.defaultValue)\""
             }
-            
+
             let defaultValueString = parameter.defaultValue.isEmpty ? "" : " = \(defaultValue)"
             return "\(parameter.name): \(parameter.type.rawValue)\(defaultValueString)"
         }
@@ -90,9 +92,13 @@ 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))")
@@ -117,8 +123,10 @@ 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)\"")
                 }
@@ -161,19 +169,19 @@ class AnalyticsDefinition {
 
     // MARK: - Raw strings
 
-    func getProperty() -> String {
+    func getProperty(visibility: ExtensionVisibility) -> String {
         replaceIn()
         return """
-            func \(getFuncName())\(getParameters()) {
+            \(visibility) func \(getFuncName())\(getParameters()) {
                 \(getlogFunction())
             }
         """
     }
 
-    func getStaticProperty() -> String {
+    func getStaticProperty(visibility: ExtensionVisibility) -> String {
         replaceIn()
         return """
-            static func \(getFuncName())\(getParameters()) {
+            \(visibility) static func \(getFuncName())\(getParameters()) {
                 AnalyticsManager.shared.\(getlogFunction())
             }
         """

Sources/ResgenSwift/Analytics/Model/AnalyticsParameter.swift

@@ -18,7 +18,7 @@ class AnalyticsParameter {
     var replaceIn: [String] = []
 
     // MARK: - Init
-    
+
     init(name: String, type: ParameterType, value: String, defaultValue: String) {
         self.name = name
         self.type = type

Sources/ResgenSwift/Analytics/Model/ParameterType.swift

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

Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift

@@ -70,7 +70,7 @@ class AnalyticsFileParser {
     private static func getParameters(from parameters: [AnalyticsParameterDTO]) -> [AnalyticsParameter] {
         func verify(value: String?, for type: ParameterType) {
             guard let value, value.isEmpty == false else { return }
-            
+
             switch type {
             case .int:
                 if Int(value) == nil {
@@ -78,23 +78,26 @@ 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
             }
         }
-        
+
         return parameters.map { dtoParameter in
             // Type
             let type = dtoParameter.type.uppercasedFirst()
@@ -104,13 +107,13 @@ class AnalyticsFileParser {
                 print(error.description)
                 Analytics.exit(withError: error)
             }
-            
+
             if dtoParameter.value != nil, dtoParameter.replaceIn != nil {
                 let error = AnalyticsError.invalidParameter("you can't set 'value' and 'replaceIn' for \(dtoParameter.name)")
                 print(error.description)
                 Analytics.exit(withError: error)
             }
-            
+
             verify(value: dtoParameter.value, for: typeEnum)
             verify(value: dtoParameter.defaultValue, for: typeEnum)
 
@@ -147,7 +150,7 @@ class AnalyticsFileParser {
         }
 
         if let parameters {
-            definition.parameters = AnalyticsFileParser.getParameters(from: parameters)
+            definition.parameters = Self.getParameters(from: parameters)
         }
 
         return definition
@@ -215,7 +218,7 @@ class AnalyticsFileParser {
                 if let category = event.category {
                     definition.category = category
                 }
-                
+
                 if let action = event.action {
                     definition.action = action
                 }

Sources/ResgenSwift/Colors/Colors.swift

@@ -59,10 +59,12 @@ struct Colors: ParsableCommand {
            let extensionFilePath = options.extensionFilePath {
             ColorExtensionGenerator.writeExtensionFile(
                 colors: parsedColors,
-                staticVar: options.staticMembers,
+                isStatic: options.staticMembers,
                 extensionName: extensionName,
                 extensionFilePath: extensionFilePath,
-                isSwiftUI: true
+                isSwiftUI: true,
+                visibility: options.extensionVisibility,
+                assetBundle: options.assetBundle
             )
         }
 
@@ -71,10 +73,12 @@ struct Colors: ParsableCommand {
            let extensionFilePathUIKit = options.extensionFilePathUIKit {
             ColorExtensionGenerator.writeExtensionFile(
                 colors: parsedColors,
-                staticVar: options.staticMembers,
+                isStatic: options.staticMembers,
                 extensionName: extensionNameUIKit,
                 extensionFilePath: extensionFilePathUIKit,
-                isSwiftUI: false
+                isSwiftUI: false,
+                visibility: options.extensionVisibility,
+                assetBundle: options.assetBundle
             )
         }
 
@@ -110,6 +114,17 @@ struct Colors: ParsableCommand {
             }
         }
 
+        // 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

Sources/ResgenSwift/Colors/ColorsToolError.swift

@@ -17,11 +17,12 @@ 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: [\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
+            return "error: [\(Colors.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\""
@@ -43,6 +44,9 @@ 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,35 +5,62 @@
 //  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(help: "Extension name. If not specified, no extension will be generated.")
+    @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: "SwiftUI extension name. If not specified, no extension will be generated.")
     var extensionName: String?
 
-    @Option(help: "SwiftUI Extension name. If not specified, no extension will be generated.")
+    @Option(help: "UIKit extension name. If not specified, no extension will be generated.")
     var extensionNameUIKit: String?
 
     @Option(help: "Extension suffix. Ex: MyApp, it will generate {extensionName}+ColorsMyApp.swift")
@@ -56,7 +83,7 @@ extension ColorsToolOptions {
     }
 
     var extensionFilePath: String? {
-        guard let extensionFileName else { return nil }
+        guard let extensionOutputPath, let extensionFileName else { return nil }
 
         return "\(extensionOutputPath)/\(extensionFileName)"
     }
@@ -73,8 +100,8 @@ extension ColorsToolOptions {
     }
 
     var extensionFilePathUIKit: String? {
-        guard let extensionFileNameUIKit else { return nil }
+        guard let extensionOutputPath, let extensionFileNameUIKit else { return nil }
 
         return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
-}
+}// CPD-ON

Sources/ResgenSwift/Colors/Generator/ColorExtensionGenerator.swift

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

Sources/ResgenSwift/Colors/Model/ParsedColor.swift

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

Sources/ResgenSwift/Fonts/FontOptions.swift

@@ -7,6 +7,7 @@
 
 import ArgumentParser
 import Foundation
+import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
@@ -18,20 +19,27 @@ struct FontsOptions: ParsableArguments {
     @Argument(help: "Input files where fonts ared defined.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
     var inputFile: 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 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: "Extension name. If not specified, it will generate an Font extension.")
     var extensionName: String = Fonts.defaultExtensionName
 
-    @Option(help: "Extension name. If not specified, it will generate an UIFont extension.")
+    @Option(help: "Extension name. If not specified, no extension will be generated.")
-    var extensionNameUIKit: String = Fonts.defaultExtensionNameUIKit
+    var extensionNameUIKit: String?
 
     @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 = ""
@@ -44,7 +52,7 @@ extension FontsOptions {
     // MARK: - SwiftUI
 
     var extensionFileName: String {
-        if extensionSuffix.isEmpty == false {
+        if let extensionSuffix {
             return "\(extensionName)+\(extensionSuffix).swift"
         }
         return "\(extensionName).swift"
@@ -56,15 +64,19 @@ extension FontsOptions {
 
     // MARK: - UIKit
 
-    var extensionFileNameUIKit: String {
+    var extensionFileNameUIKit: String? {
-        if extensionSuffix.isEmpty == false {
+        guard let extensionNameUIKit else { return nil }
+
+        if let extensionSuffix {
             return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
         return "\(extensionNameUIKit).swift"
     }
 
-    var extensionFilePathUIKit: String {
+    var extensionFilePathUIKit: String? {
-        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
+        guard let extensionFileNameUIKit else { return nil }
+
+        return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
 
     // MARK: - 

Sources/ResgenSwift/Fonts/Fonts.swift

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

Sources/ResgenSwift/Fonts/FontsToolError.swift

@@ -14,6 +14,7 @@ enum FontsToolError: Error {
     case inputFolderNotFound(String)
     case fileNotExists(String)
     case writeExtension(String, String)
+    case missingExtensionPath
 
     var description: String {
         switch self {
@@ -31,6 +32,9 @@ 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,8 +10,11 @@ import ToolCore
 
 enum FontExtensionGenerator {
 
-    private static func getFontNameEnum(fontsNames: [FontName]) -> String {
+    private static func getFontNameEnum(
-        var enumDefinition = "    enum FontName: String {\n"
+        fontsNames: [FontName],
+        visibility: ExtensionVisibility
+    ) -> String {
+        var enumDefinition = "    \(visibility) enum FontName: String {\n"
 
         fontsNames.forEach {
             enumDefinition += "        case \($0.fontNameSanitize) = \"\($0.postscriptName)\"\n"
@@ -23,17 +26,19 @@ enum FontExtensionGenerator {
 
     static func writeExtensionFile(
         fontsNames: [FontName],
-        staticVar: Bool,
+        isStatic: Bool,
         extensionName: String,
         extensionFilePath: String,
-        isSwiftUI: Bool
+        isSwiftUI: Bool,
+        visibility: ExtensionVisibility
     ) {
         // Create extension content
         let extensionContent = Self.getExtensionContent(
             fontsNames: fontsNames,
-            staticVar: staticVar,
+            isStatic: isStatic,
             extensionName: extensionName,
-            isSwiftUI: isSwiftUI
+            isSwiftUI: isSwiftUI,
+            visibility: visibility
         )
 
         // Write content
@@ -49,20 +54,35 @@ enum FontExtensionGenerator {
 
     static func getExtensionContent(
         fontsNames: [FontName],
-        staticVar: Bool,
+        isStatic: Bool,
         extensionName: String,
-        isSwiftUI: Bool
+        isSwiftUI: Bool,
+        visibility: ExtensionVisibility
     ) -> String {
         [
-            Self.getHeader(extensionClassname: extensionName, isSwiftUI: isSwiftUI),
+            Self.getHeader(
-            Self.getFontNameEnum(fontsNames: fontsNames),
+                extensionClassname: extensionName,
-            Self.getFontMethods(fontsNames: fontsNames, staticVar: staticVar, isSwiftUI: isSwiftUI),
+                isSwiftUI: isSwiftUI
+            ),
+            Self.getFontNameEnum(
+                fontsNames: fontsNames,
+                visibility: visibility
+            ),
+            Self.getFontMethods(
+                fontsNames: fontsNames,
+                isStatic: isStatic,
+                isSwiftUI: isSwiftUI,
+                visibility: visibility
+            ),
             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)
 
@@ -72,13 +92,22 @@ enum FontExtensionGenerator {
         """
     }
 
-    private static func getFontMethods(fontsNames: [FontName], staticVar: Bool, isSwiftUI: Bool) -> String {
+    private static func getFontMethods(
+        fontsNames: [FontName],
+        isStatic: Bool,
+        isSwiftUI: Bool,
+        visibility: ExtensionVisibility
+    ) -> String {
         let pragma = "    // MARK: - Getter"
 
         var propertiesOrMethods: [String] = fontsNames
             .unique()
             .map {
-                $0.getProperty(isStatic: staticVar, isSwiftUI: isSwiftUI)
+                $0.getProperty(
+                    isStatic: isStatic,
+                    isSwiftUI: isSwiftUI,
+                    visibility: visibility
+                )
             }
 
         propertiesOrMethods.insert(pragma, at: 0)

Sources/ResgenSwift/Fonts/Model/FontName.swift

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

Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift

@@ -86,31 +86,21 @@ struct AnalyticsConfiguration: Codable, CustomDebugStringConvertible {
 
     let inputFile: String
     let target: String
-    let extensionOutputPath: String
+    let outputFile: String
-    let extensionName: String?
+    let visibility: String?
-    let extensionSuffix: String?
+    let staticMembers: Bool?
-    private let staticMembers: Bool?
-
-    var staticMembersOptions: Bool {
-        if let staticMembers {
-            return staticMembers
-        }
-        return false
-    }
 
     internal init(
         inputFile: String,
         target: String,
-        extensionOutputPath: String,
+        outputFile: String,
-        extensionName: String?,
+        visibility: String?,
-        extensionSuffix: String?,
         staticMembers: Bool?
     ) {
         self.inputFile = inputFile
         self.target = target
-        self.extensionOutputPath = extensionOutputPath
+        self.outputFile = outputFile
-        self.extensionName = extensionName
+        self.visibility = visibility
-        self.extensionSuffix = extensionSuffix
         self.staticMembers = staticMembers
     }
 
@@ -119,9 +109,9 @@ struct AnalyticsConfiguration: Codable, CustomDebugStringConvertible {
         Analytics configuration:
             - Input file: \(inputFile)
             - Target: \(target)
-            - Extension output path: \(extensionOutputPath)
+            - Output file: \(outputFile)
-            - Extension name: \(extensionName ?? "-")
+            - Visiblity: \(visibility ?? "default")
-            - Extension suffix: \(extensionSuffix ?? "-")
+            - Static members: \(staticMembers != nil ? "\(String(describing: staticMembers))" : "default")
         """
     }
 }
@@ -131,27 +121,24 @@ 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?
-    private let staticMembers: Bool?
+    let visibility: String?
-
+    let assetBundle: String?
-    var staticMembersOptions: Bool {
+    let staticMembers: 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
@@ -161,6 +148,8 @@ struct ColorsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionName = extensionName
         self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
+        self.visibility = visibility
+        self.assetBundle = assetBundle
         self.staticMembers = staticMembers
     }
 
@@ -170,10 +159,13 @@ 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")
         """
     }
 }
@@ -181,27 +173,22 @@ 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?
-    private let staticMembers: Bool?
+    let visibility: String?
-
+    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
@@ -210,6 +197,7 @@ struct FontsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
         self.infoPlistPaths = infoPlistPaths
+        self.visibility = visibility
         self.staticMembers = staticMembers
     }
 
@@ -217,11 +205,13 @@ 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")
         """
     }
 }
@@ -230,26 +220,23 @@ 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?
-    private let staticMembers: Bool?
+    let visibility: String?
-
+    let assetBundle: String?
-    var staticMembersOptions: Bool {
+    let staticMembers: 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
@@ -258,6 +245,8 @@ struct ImagesConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionName = extensionName
         self.extensionNameUIKit = extensionNameUIKit
         self.extensionSuffix = extensionSuffix
+        self.visibility = visibility
+        self.assetBundle = assetBundle
         self.staticMembers = staticMembers
     }
 
@@ -266,10 +255,13 @@ 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")
         """
     }
 }
@@ -280,34 +272,24 @@ 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?
-    private let staticMembers: Bool?
+    let visibility: String?
-    private let xcStrings: Bool?
+    let assetBundle: String?
-
+    let staticMembers: Bool?
-    var staticMembersOptions: Bool {
+    let xcStrings: 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?
     ) {
@@ -318,6 +300,8 @@ 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
     }
@@ -329,9 +313,13 @@ 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")
         """
     }
 }
@@ -343,14 +331,8 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
     let extensionOutputPath: String
     let extensionName: String?
     let extensionSuffix: String?
-    private let staticMembers: Bool?
+    let visibility: String?
-
+    let staticMembers: Bool?
-    var staticMembersOptions: Bool {
-        if let staticMembers {
-            return staticMembers
-        }
-        return false
-    }
 
     internal init(
         inputFile: String,
@@ -358,6 +340,7 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
         extensionOutputPath: String,
         extensionName: String?,
         extensionSuffix: String?,
+        visibility: String?,
         staticMembers: Bool?
     ) {
         self.inputFile = inputFile
@@ -365,6 +348,7 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible {
         self.extensionOutputPath = extensionOutputPath
         self.extensionName = extensionName
         self.extensionSuffix = extensionSuffix
+        self.visibility = visibility
         self.staticMembers = staticMembers
     }
 
@@ -376,6 +360,8 @@ 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,6 +10,11 @@ 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 {
@@ -20,25 +25,23 @@ extension AnalyticsConfiguration: Runnable {
             inputFile.prependIfRelativePath(projectDirectory),
             "--target",
             target,
-            "--extension-output-path",
+            "--output-file",
-            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            outputFile.prependIfRelativePath(projectDirectory)
-            "--static-members",
-            "\(staticMembersOptions)"
         ]
 
-        if let extensionName {
+        // Add optional parameters
-            args += [
+        [
-                "--extension-name",
+            ("--visibility", visibility),
-                extensionName
+            ("--static-members", staticMembers?.description)
-            ]
+        ].forEach { argumentName, argumentValue in
-        }
+            if let argumentValue {
-        if let extensionSuffix {
+                args += [
-            args += [
+                    argumentName,
-                "--extension-suffix",
+                    argumentValue
-                extensionSuffix
+                ]
-            ]
+            }
         }
 
-        Analytics.main(args)
+        return args
     }
 }

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

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

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

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

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

@@ -10,6 +10,11 @@ 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 {
@@ -23,29 +28,27 @@ extension StringsConfiguration: Runnable {
             "--langs",
             langs,
             "--default-lang",
-            defaultLang,
+            defaultLang
-            "--extension-output-path",
-            extensionOutputPath.prependIfRelativePath(projectDirectory),
-            "--static-members",
-            "\(staticMembersOptions)",
-            "--xc-strings",
-            "\(xcStringsOptions)"
         ]
 
-        if let extensionName {
+        // Add optional parameters
-            args += [
+        [
-                "--extension-name",
+            ("--extension-output-path", extensionOutputPath?.prependIfRelativePath(projectDirectory)),
-                extensionName
+            ("--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 {
+                args += [
+                    argumentName,
+                    argumentValue
+                ]
+            }
         }
 
-        if let extensionSuffix {
+        return args
-            args += [
-                "--extension-suffix",
-                extensionSuffix
-            ]
-        }
-
-        Stringium.main(args)
     }
 }

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

@@ -10,6 +10,11 @@ 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 {
@@ -21,24 +26,24 @@ extension TagsConfiguration: Runnable {
             "--lang",
             lang,
             "--extension-output-path",
-            extensionOutputPath.prependIfRelativePath(projectDirectory),
+            extensionOutputPath.prependIfRelativePath(projectDirectory)
-            "--static-members",
-            "\(staticMembersOptions)"
         ]
 
-        if let extensionName {
+        // Add optional parameters
-            args += [
+        [
-                "--extension-name",
+            ("--extension-name", extensionName),
-                extensionName
+            ("--extension-suffix", extensionSuffix),
-            ]
+            ("--visibility", visibility),
-        }
+            ("--static-members", staticMembers?.description)
-        if let extensionSuffix {
+        ].forEach { argumentName, argumentValue in
-            args += [
+            if let argumentValue {
-                "--extension-suffix",
+                args += [
-                extensionSuffix
+                    argumentName,
-            ]
+                    argumentValue
+                ]
+            }
         }
 
-        Tags.main(args)
+        return args
     }
 }

Sources/ResgenSwift/Images/Generator/ImageExtensionGenerator.swift

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

Sources/ResgenSwift/Images/Images.swift

@@ -21,8 +21,6 @@ struct Images: ParsableCommand {
     // MARK: - Static
 
     static let toolName = "Images"
-    static let defaultExtensionName = "Image"
-    static let defaultExtensionNameUIKit = "UIImage"
 
     // MARK: - Command Options
 
@@ -55,23 +53,33 @@ struct Images: ParsableCommand {
         )
 
         // Generate extension
-        ImageExtensionGenerator.generateExtensionFile(
+        if let extensionName = options.extensionName,
-            images: imagesToGenerate,
+           let extensionFilePath = options.extensionFilePath {
-            staticVar: options.staticMembers,
+            ImageExtensionGenerator.generateExtensionFile(
-            inputFilename: options.inputFilenameWithoutExt,
+                images: imagesToGenerate,
-            extensionName: options.extensionName,
+                isStatic: options.staticMembers,
-            extensionFilePath: options.extensionFilePath,
+                inputFilename: options.inputFilenameWithoutExt,
-            isSwiftUI: true
+                extensionName: extensionName,
-        )
+                extensionFilePath: extensionFilePath,
+                isSwiftUI: true,
+                visibility: options.extensionVisibility,
+                assetBundle: options.assetBundle
+            )
+        }
 
-        ImageExtensionGenerator.generateExtensionFile(
+        if let extensionNameUIKit = options.extensionNameUIKit,
-            images: imagesToGenerate,
+           let extensionFilePathUIKit = options.extensionFilePathUIKit {
-            staticVar: options.staticMembers,
+            ImageExtensionGenerator.generateExtensionFile(
-            inputFilename: options.inputFilenameWithoutExt,
+                images: imagesToGenerate,
-            extensionName: options.extensionNameUIKit,
+                isStatic: options.staticMembers,
-            extensionFilePath: options.extensionFilePathUIKit,
+                inputFilename: options.inputFilenameWithoutExt,
-            isSwiftUI: false
+                extensionName: extensionNameUIKit,
-        )
+                extensionFilePath: extensionFilePathUIKit,
+                isSwiftUI: false,
+                visibility: options.extensionVisibility,
+                assetBundle: options.assetBundle
+            )
+        }
 
         print("[\(Self.toolName)] Images generated")
     }
@@ -96,17 +104,39 @@ struct Images: ParsableCommand {
         _ = Self.getSvgConverterPath()
 
         // Extension for UIKit and SwiftUI should have different name
-        guard options.extensionName != options.extensionNameUIKit else {
+        if let extensionName = options.extensionName,
-            let error = ImagesError.extensionNamesCollision(options.extensionName)
+           let extensionNameUIKit = options.extensionNameUIKit {
-            print(error.description)
+            guard extensionName != extensionNameUIKit else {
-            Self.exit(withError: error)
+                let error = ImagesError.extensionNamesCollision(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: options.extensionFilePath
+            extensionFilePath: fileToCompareToInput
         ) else {
             print("[\(Self.toolName)] Images are already up to date :) ")
             return false

Sources/ResgenSwift/Images/ImagesError.swift

@@ -18,12 +18,13 @@ 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: [\(Fonts.toolName)] Error on extension names, extension name and SwiftUI extension name should be different (\(extensionName) is used on both)"
+            return "error: [\(Images.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)"
@@ -47,7 +48,10 @@ enum ImagesError: Error {
             return "error: [\(Images.toolName)] An error occured while writing content to \(filename): \(subErrorDescription)"
 
         case .createAssetFolder(let folder):
-            return "error: [\(Colors.toolName)] An error occured while creating folder `\(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"
 
         case .unknown(let errorDescription):
             return "error: [\(Images.toolName)] Unknown error: \(errorDescription)"

Sources/ResgenSwift/Images/ImagesOptions.swift

@@ -5,36 +5,70 @@
 //  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.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    @Argument(
+        help: "Input files where strings ared defined.",
+        completion: .file(),
+        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: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    @Option(
-    var extensionOutputPath: String
+        help: "Tell if it will generate static properties or not",
-
+        completion: .list(["true", "false"])
-    @Option(help: "Tell if it will generate static properties or not")
+    )
     var staticMembers: Bool = false
 
-    @Option(help: "Extension name. If not specified, it will generate an Image extension.")
+    @Option(
-    var extensionName: String = Images.defaultExtensionName
+        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 UIImage extension.")
+    @Option(
-    var extensionNameUIKit: String = Images.defaultExtensionNameUIKit
+        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 suffix. Ex: MyApp, it will generate {extensionName}+Image{extensionSuffix}.swift")
     var extensionSuffix: String?
@@ -46,28 +80,36 @@ extension ImagesOptions {
 
     // MARK: - SwiftUI
 
-    var extensionFileName: String {
+    var extensionFileName: String? {
+        guard let extensionName else { return nil }
+
         if let extensionSuffix {
             return "\(extensionName)+\(extensionSuffix).swift"
         }
         return "\(extensionName).swift"
     }
 
-    var extensionFilePath: String {
+    var extensionFilePath: String? {
-        "\(extensionOutputPath)/\(extensionFileName)"
+        guard let extensionOutputPath, let extensionFileName else { return nil }
+
+        return "\(extensionOutputPath)/\(extensionFileName)"
     }
 
     // MARK: - UIKit
 
-    var extensionFileNameUIKit: String {
+    var extensionFileNameUIKit: String? {
+        guard let extensionNameUIKit else { return nil }
+
         if let extensionSuffix {
             return "\(extensionNameUIKit)+\(extensionSuffix).swift"
         }
         return "\(extensionNameUIKit).swift"
     }
 
-    var extensionFilePathUIKit: String {
+    var extensionFilePathUIKit: String? {
-        "\(extensionOutputPath)/\(extensionFileNameUIKit)"
+        guard let extensionOutputPath, let extensionFileNameUIKit else { return nil }
+
+        return "\(extensionOutputPath)/\(extensionFileNameUIKit)"
     }
 
     // MARK: -
@@ -78,3 +120,5 @@ extension ImagesOptions {
             .lastPathComponent
     }
 }
+
+// CPD-ON

Sources/ResgenSwift/Images/Model/ParsedImage.swift

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

Sources/ResgenSwift/Strings/Generator/StringsFileGenerator.swift

@@ -19,8 +19,7 @@ enum StringsFileGenerator {
         langs: [String],
         defaultLang: String,
         tags: [String],
-        outputPath: String,
+        lprojPathFormat: String
-        inputFilenameWithoutExt: String
     ) {
 
         var stringsFilesContent = [String: String]()
@@ -37,7 +36,7 @@ enum StringsFileGenerator {
         langs.forEach { lang in
             guard let fileContent = stringsFilesContent[lang] else { return }
 
-            let stringsFilePath = "\(outputPath)/\(lang).lproj/\(inputFilenameWithoutExt).strings"
+            let stringsFilePath = String(format: lprojPathFormat, lang)
             let stringsFilePathURL = URL(fileURLWithPath: stringsFilePath)
             do {
                 try fileContent.write(to: stringsFilePathURL, atomically: false, encoding: .utf8)
@@ -54,8 +53,7 @@ enum StringsFileGenerator {
         langs: [String],
         defaultLang: String,
         tags: [String],
-        outputPath: String,
+        xcStringsFilePath: String
-        inputFilenameWithoutExt: String
     ) {
 
         let fileContent: String = Self.generateXcStringsFileContent(
@@ -65,12 +63,11 @@ enum StringsFileGenerator {
             sections: sections
         )
 
-        let stringsFilePath = "\(outputPath)/\(inputFilenameWithoutExt).xcstrings"
+        let stringsFilePathURL = URL(fileURLWithPath: xcStringsFilePath)
-        let stringsFilePathURL = URL(fileURLWithPath: stringsFilePath)
         do {
             try fileContent.write(to: stringsFilePathURL, atomically: false, encoding: .utf8)
         } catch {
-            let error = StringiumError.writeFile(error.localizedDescription, stringsFilePath)
+            let error = StringiumError.writeFile(error.localizedDescription, xcStringsFilePath)
             print(error.description)
             Stringium.exit(withError: error)
         }
@@ -250,21 +247,25 @@ enum StringsFileGenerator {
         sections: [Section],
         defaultLang lang: String,
         tags: [String],
-        staticVar: Bool,
+        isStatic: Bool,
         inputFilename: String,
         extensionName: String,
         extensionFilePath: String,
-        extensionSuffix: String
+        extensionSuffix: String,
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
     ) {
         // Get extension content
         let extensionFileContent = Self.getExtensionContent(
             sections: sections,
             defaultLang: lang,
             tags: tags,
-            staticVar: staticVar,
+            isStatic: isStatic,
             inputFilename: inputFilename,
             extensionName: extensionName,
-            extensionSuffix: extensionSuffix
+            extensionSuffix: extensionSuffix,
+            visibility: visibility,
+            assetBundle: assetBundle
         )
 
         // Write content
@@ -284,10 +285,12 @@ enum StringsFileGenerator {
         sections: [Section],
         defaultLang lang: String,
         tags: [String],
-        staticVar: Bool,
+        isStatic: Bool,
         inputFilename: String,
         extensionName: String,
-        extensionSuffix: String
+        extensionSuffix: String,
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
     ) -> String {
         [
             Self.getHeader(
@@ -298,13 +301,16 @@ enum StringsFileGenerator {
                 sections: sections,
                 tags: tags,
                 extensionClassname: extensionName,
-                extensionSuffix: extensionSuffix
+                extensionSuffix: extensionSuffix,
+                visibility: visibility
             ),
             Self.getProperties(
                 sections: sections,
                 defaultLang: lang,
                 tags: tags,
-                staticVar: staticVar
+                isStatic: isStatic,
+                visibility: visibility,
+                assetBundle: assetBundle
             ),
             Self.getFooter()
         ]
@@ -329,9 +335,10 @@ enum StringsFileGenerator {
         sections: [Section],
         tags: [String],
         extensionClassname: String,
-        extensionSuffix: String
+        extensionSuffix: String,
+        visibility: ExtensionVisibility
     ) -> String {
-        var enumDefinition = "\n    enum Key\(extensionSuffix.uppercasedFirst()): String {\n"
+        var enumDefinition = "\n    \(visibility) enum Key\(extensionSuffix.uppercasedFirst()): String {\n"
 
         // Enum
         sections.forEach { section in
@@ -350,7 +357,7 @@ enum StringsFileGenerator {
 
         // KeyPath accessors
         enumDefinition += "\n"
-        enumDefinition += "        var keyPath: KeyPath<\(extensionClassname), String> {\n"
+        enumDefinition += "        \(visibility) var keyPath: KeyPath<\(extensionClassname), String> {\n"
         enumDefinition += "            switch self {\n"
         sections.forEach { section in
             // Check that at least one string will be generated
@@ -372,7 +379,14 @@ enum StringsFileGenerator {
         return enumDefinition
     }
 
-    private static func getProperties(sections: [Section], defaultLang lang: String, tags: [String], staticVar: Bool) -> String {
+    private static func getProperties(
+        sections: [Section],
+        defaultLang lang: String,
+        tags: [String],
+        isStatic: Bool,
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
+    ) -> String {
         sections.compactMap { section in
             // Check that at least one string will be generated
             guard section.hasOneOrMoreMatchingTags(tags: tags) else {
@@ -385,10 +399,14 @@ enum StringsFileGenerator {
                     return nil // Go to next definition
                 }
 
-                if staticVar {
+                let property = definition.getNSLocalizedStringProperty(
-                    return "\n\(definition.getNSLocalizedStringStaticProperty(forLang: lang))"
+                    forLang: lang,
-                }
+                    isStatic: isStatic,
-                return "\n\(definition.getNSLocalizedStringProperty(forLang: lang))"
+                    visibility: visibility,
+                    assetBundle: assetBundle
+                )
+
+                return "\n\(property)"
             }
             .joined(separator: "\n")
             return res

Sources/ResgenSwift/Strings/Generator/TagsGenerator.swift

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

Sources/ResgenSwift/Strings/Model/Definition.swift

@@ -6,6 +6,7 @@
 //
 
 import Foundation
+import ToolCore
 
 // swiftlint:disable force_unwrapping
 
@@ -99,15 +100,22 @@ class Definition {
         return (inputParameters: inputParameters, translationArguments: translationArguments)
     }
 
-    private func getBaseProperty(lang: String, translation: String, isStatic: Bool, comment: String?) -> String {
+    private func getBaseProperty(
+        lang: String,
+        translation: String,
+        isStatic: Bool,
+        comment: String?,
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
+    ) -> String {
         """
             /// Translation in \(lang) :
             /// \(translation)
             ///
             /// Comment :
             /// \(comment?.isEmpty == false ? comment! : "No comment")
-            \(isStatic ? "static " : "")var \(name): String {
+            \(visibility) \(isStatic ? "static " : "")var \(name): String {
-                NSLocalizedString("\(name)", tableName: kStringsFileName, bundle: Bundle.main, value: "\(translation)", comment: "\(comment ?? "")")
+                NSLocalizedString("\(name)", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "\(translation)", comment: "\(comment ?? "")")
             }
         """
     }
@@ -118,7 +126,8 @@ class Definition {
         isStatic: Bool,
         inputParameters: [String],
         translationArguments: [String],
-        comment: String?
+        comment: String?,
+        visibility: ExtensionVisibility
     ) -> String {
         """
 
@@ -127,13 +136,18 @@ class Definition {
             ///
             /// Comment :
             /// \(comment?.isEmpty == false ? comment! : "No comment")
-            \(isStatic ? "static " : "")func \(name)(\(inputParameters.joined(separator: ", "))) -> String {
+            \(visibility) \(isStatic ? "static " : "")func \(name)(\(inputParameters.joined(separator: ", "))) -> String {
                 String(format: \(isStatic ? "Self" : "self").\(name), \(translationArguments.joined(separator: ", ")))
             }
         """
     }
 
-    func getNSLocalizedStringProperty(forLang lang: String) -> String {
+    func getNSLocalizedStringProperty(
+        forLang lang: String,
+        isStatic: Bool,
+        visibility: ExtensionVisibility,
+        assetBundle: AssetBundle
+    ) -> String {
         guard let translation = translations[lang] else {
             let error = StringiumError.langNotDefined(lang, name, reference != nil)
             print(error.description)
@@ -144,8 +158,10 @@ class Definition {
         let property = getBaseProperty(
             lang: lang,
             translation: translation,
-            isStatic: false,
+            isStatic: isStatic,
-            comment: self.comment
+            comment: self.comment,
+            visibility: visibility,
+            assetBundle: assetBundle
         )
 
         // Generate method
@@ -154,41 +170,11 @@ class Definition {
             method = getBaseMethod(
                 lang: lang,
                 translation: translation,
-                isStatic: false,
+                isStatic: isStatic,
                 inputParameters: parameters.inputParameters,
                 translationArguments: parameters.translationArguments,
-                comment: self.comment
+                comment: self.comment,
-            )
+                visibility: visibility
-        }
-
-        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
             )
         }
 
@@ -197,7 +183,11 @@ class Definition {
 
     // MARK: - Raw strings
 
-    func getProperty(forLang lang: String) -> String {
+    func getProperty(
+        forLang lang: String,
+        visibility: ExtensionVisibility,
+        isStatic: Bool
+    ) -> String {
         guard let translation = translations[lang] else {
             let error = StringiumError.langNotDefined(lang, name, reference != nil)
             print(error.description)
@@ -210,27 +200,7 @@ 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,7 +21,6 @@ struct Stringium: ParsableCommand {
     // MARK: - Static
 
     static let toolName = "Stringium"
-    static let defaultExtensionName = "String"
     static let noTranslationTag: String = "notranslation"
 
     // MARK: - Command options
@@ -49,8 +48,7 @@ struct Stringium: ParsableCommand {
                 langs: options.langs,
                 defaultLang: options.defaultLang,
                 tags: options.tags,
-                outputPath: options.stringsFileOutputPath,
+                lprojPathFormat: options.lprojPathFormat
-                inputFilenameWithoutExt: options.inputFilenameWithoutExt
             )
         } else {
             StringsFileGenerator.writeXcStringsFiles(
@@ -58,22 +56,27 @@ struct Stringium: ParsableCommand {
                 langs: options.langs,
                 defaultLang: options.defaultLang,
                 tags: options.tags,
-                outputPath: options.stringsFileOutputPath,
+                xcStringsFilePath: options.xcStringsFilePath
-                inputFilenameWithoutExt: options.inputFilenameWithoutExt
             )
         }
 
         // Generate extension
-        StringsFileGenerator.writeExtensionFiles(
+        if let extensionName = options.extensionName,
-            sections: sections,
+            let extensionFilePath = options.extensionFilePath {
-            defaultLang: options.defaultLang,
+            print("Will generate extensions")
-            tags: options.tags,
+            StringsFileGenerator.writeExtensionFiles(
-            staticVar: options.staticMembers,
+                sections: sections,
-            inputFilename: options.inputFilenameWithoutExt,
+                defaultLang: options.defaultLang,
-            extensionName: options.extensionName,
+                tags: options.tags,
-            extensionFilePath: options.extensionFilePath,
+                isStatic: options.staticMembers,
-            extensionSuffix: options.extensionSuffix
+                inputFilename: options.inputFilenameWithoutExt,
-        )
+                extensionName: extensionName,
+                extensionFilePath: extensionFilePath,
+                extensionSuffix: options.extensionSuffix ?? "",
+                visibility: options.extensionVisibility,
+                assetBundle: options.assetBundle
+            )
+        }
 
         print("[\(Self.toolName)] Strings generated")
     }
@@ -104,10 +107,18 @@ 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: options.extensionFilePath
+            extensionFilePath: fileToCompareToInput
         ) else {
             print("[\(Self.toolName)] Strings are already up to date :) ")
             return false

Sources/ResgenSwift/Strings/Stringium/StringiumOptions.swift

@@ -7,6 +7,7 @@
 
 import ArgumentParser
 import Foundation
+import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
@@ -15,35 +16,63 @@ 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 strings file.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    @Option(
+        name: .customLong("output-path"),
+        help: "Path where to find the .xcStrings file or the lproj folders.",
+        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: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    @Option(help: "Generate static properties. False by default")
-    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 not")
+    @Option(help: "Tell if it will generate xcStrings file or lproj file. True by default")
-    var xcStrings: Bool = false
+    var xcStrings: Bool = true
 
-    @Option(help: "Extension name. If not specified, it will generate an String extension.")
+    @Option(
-    var extensionName: String = Stringium.defaultExtensionName
+        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 suffix: {extensionName}+{extensionSuffix}.swift")
-    var extensionSuffix: String
+    var extensionSuffix: String?
 }
 
 // MARK: - Private var getter
@@ -75,12 +104,21 @@ extension StringiumOptions {
 
 extension StringiumOptions {
 
-    var extensionFileName: String {
+    private var extensionFileName: String? {
-        "\(extensionName)+\(extensionSuffix).swift"
+        if let extensionName {
+            if let extensionSuffix {
+                return "\(extensionName)+\(extensionSuffix).swift"
+            }
+            return "\(extensionName).swift"
+        }
+        return nil
     }
 
-    var extensionFilePath: String {
+    var extensionFilePath: String? {
-        "\(extensionOutputPath)/\(extensionFileName)"
+        if let extensionOutputPath, let extensionFileName {
+            return "\(extensionOutputPath)/\(extensionFileName)"
+        }
+        return nil
     }
 
     var inputFilenameWithoutExt: String {
@@ -88,4 +126,12 @@ extension StringiumOptions {
             .deletingPathExtension()
             .lastPathComponent
     }
+
+    var xcStringsFilePath: String {
+        "\(stringsFileOutputPath)/\(inputFilenameWithoutExt).xcstrings"
+    }
+
+    var lprojPathFormat: String {
+        "\(stringsFileOutputPath)/%@.lproj/\(inputFilenameWithoutExt).strings"
+    }
 }

Sources/ResgenSwift/Strings/Tag/Tags.swift

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

Sources/ResgenSwift/Strings/Tag/TagsOptions.swift

@@ -7,6 +7,7 @@
 
 import ArgumentParser
 import Foundation
+import ToolCore
 
 // swiftlint:disable no_grouping_extension
 
@@ -21,7 +22,17 @@ struct TagsOptions: ParsableArguments {
     @Option(help: "Lang to generate. (\"ium\" by default)")
     var lang: String = "ium"
 
-    @Option(help: "Path where to generate the extension.", transform: { $0.replaceTiltWithHomeDirectoryPath() })
+    @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 not")

Sources/ToolCore/AssetBundle.swift

@@ -0,0 +1,26 @@
+//
+//  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

@@ -0,0 +1,34 @@
+//
+//  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.1.0"
+public let ResgenSwiftVersion = "2.2.0"

Tests/ResgenSwiftTests/Analytics/AnalyticsDefinitionTests.swift

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

Tests/ResgenSwiftTests/Analytics/AnalyticsGeneratorTests.swift

@@ -1,6 +1,6 @@
 //
 //  AnalyticsGeneratorTests.swift
-//  
+//
 //
 //  Created by Thibaut Schmitt on 06/09/2022.
 //
@@ -14,7 +14,7 @@ import ToolCore
 @testable import ResgenSwift
 
 final class AnalyticsGeneratorTests: XCTestCase {
-    
+
     private func getAnalyticsDefinition(
         id: String,
         path: String = "",
@@ -31,7 +31,183 @@ final class AnalyticsGeneratorTests: XCTestCase {
         definition.category = category
         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")
@@ -39,119 +215,105 @@ final class AnalyticsGeneratorTests: XCTestCase {
             getAnalyticsDefinition(id: "s1_def_one", name: "s1 def one", type: .screen, tags: ["ios", "iosonly"]),
             getAnalyticsDefinition(id: "s1_def_two", name: "s1 def two", type: .event, tags: ["ios", "iosonly"]),
         ]
-        
+
         let sectionTwo = AnalyticsCategory(id: "section_two")
         sectionTwo.definitions = [
             getAnalyticsDefinition(id: "s2_def_one", name: "s2 def one", type: .screen, tags: ["ios","iosonly"]),
             getAnalyticsDefinition(id: "s2_def_two", name: "s2 def two", type: .event, tags: ["droid","droidonly"]),
         ]
-        
+
         let sectionThree = AnalyticsCategory(id: "section_three")
         sectionThree.definitions = [
             getAnalyticsDefinition(id: "s3_def_one", name: "s3 def one", type: .screen, tags: ["droid","droidonly"]),
             getAnalyticsDefinition(id: "s3_def_two", name: "s3 def two", type: .event, tags: ["droid","droidonly"]),
         ]
-        
+
         // When
         let extensionContent = AnalyticsGenerator.getExtensionContent(
             targets: [TrackerType.firebase],
             sections: [sectionOne, sectionTwo, sectionThree],
             tags: ["ios", "iosonly"],
-            staticVar: false,
+            isStatic: false,
-            extensionName: "GenAnalytics"
+            visibility: .public
         )
 
         // Expect Analytics
         let expect = """
         // Generated by ResgenSwift.Analytics \(ResgenSwiftVersion)
 
+        import Foundation
         import FirebaseAnalytics
 
-        // MARK: - Protocol
+        \(protocolString(visibility: .public))
 
-        protocol AnalyticsManagerProtocol {
+        \(firebaseString())
 
-            func logScreen(name: String, path: String)
+        // MARK: - Traker Type
-            func logEvent(
-                name: String,
-                action: String,
-                category: String,
-                params: [String: Any]?
-            )
-        }
 
-        // MARK: - Firebase
+        public enum TrackerType: CaseIterable {
 
-        class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
+            case firebase
-
-            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
 
-        class AnalyticsManager {
+        public class AnalyticsManager {
 
-            static var shared = AnalyticsManager()
+            public static var shared = AnalyticsManager()
+
+            private init() {}
 
             // MARK: - Properties
 
-            var managers: [AnalyticsManagerProtocol] = []
+            var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
 
-            private var isEnabled: Bool = true
+            private var isEnabled: Bool {
-
+                if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
-            // MARK: - Methods
+                    false
-
+                } else {
-            func setAnalyticsEnabled(_ enable: Bool) {
+                    true
-                isEnabled = enable
+                }
             }
 
-            func configure() {
+            // MARK: - Enable Methods
-                managers.append(FirebaseAnalyticsManager())
+
+            private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
+                managers.forEach { (key, value) in
+                    if analytics.contains(where: { type in
+                        type == key
+                    }) {
+                        value.setEnable(enable)
+                    }
+                }
             }
 
-            private func logScreen(name: String, path: String) {
+            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]?
+            ) {
                 guard isEnabled else { return }
 
-                managers.forEach { manager in
+                managers.values.forEach { manager in
-                    manager.logScreen(name: name, path: path)
+                    manager.logScreen(
+                        name: name,
+                        path: path,
+                        params: params
+                    )
                 }
             }
 
@@ -163,7 +325,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
             ) {
                 guard isEnabled else { return }
 
-                managers.forEach { manager in
+                managers.values.forEach { manager in
                     manager.logEvent(
                         name: name,
                         action: action,
@@ -175,40 +337,42 @@ final class AnalyticsGeneratorTests: XCTestCase {
 
             // MARK: - section_one
 
-            func logScreenS1DefOne() {
+            public func logScreenS1DefOne() {
                 logScreen(
                     name: "s1 def one",
-                    path: ""
+                    path: "",
+                    params: nil
                 )
             }
 
-            func logEventS1DefTwo() {
+            public func logEventS1DefTwo() {
                 logEvent(
                     name: "s1 def two",
                     action: "",
                     category: "",
-                    params: [:]
+                    params: nil
                 )
             }
 
             // MARK: - section_two
 
-            func logScreenS2DefOne() {
+            public func logScreenS2DefOne() {
                 logScreen(
                     name: "s2 def one",
-                    path: ""
+                    path: "",
+                    params: nil
                 )
             }
         }
-        
+
         """
-        
+
         if extensionContent != expect {
             print(prettyFirstDifferenceBetweenStrings(s1: extensionContent, s2: expect))
         }
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
-    
+
     func testGeneratedExtensionContentMatomo() {
         // Given
         let sectionOne = AnalyticsCategory(id: "section_one")
@@ -216,139 +380,107 @@ final class AnalyticsGeneratorTests: XCTestCase {
             getAnalyticsDefinition(id: "s1_def_one", path: "s1_def_one/", name: "s1 def one", type: .screen, tags: ["ios", "iosonly"]),
             getAnalyticsDefinition(id: "s1_def_two", action: "test", category: "test", name: "s1 def two", type: .event, tags: ["ios", "iosonly"]),
         ]
-        
+
         let sectionTwo = AnalyticsCategory(id: "section_two")
         sectionTwo.definitions = [
             getAnalyticsDefinition(id: "s2_def_one", path: "s2_def_one/", name: "s2 def one", type: .screen, tags: ["ios","iosonly"]),
             getAnalyticsDefinition(id: "s2_def_two", action: "test", category: "test", name: "s2 def two", type: .event, tags: ["droid","droidonly"]),
         ]
-        
+
         let sectionThree = AnalyticsCategory(id: "section_three")
         sectionThree.definitions = [
             getAnalyticsDefinition(id: "s3_def_one", path: "s3_def_one/", name: "s3 def one", type: .screen, tags: ["droid","droidonly"]),
             getAnalyticsDefinition(id: "s3_def_two", action: "test", category: "test", name: "s3 def two", type: .event, tags: ["droid","droidonly"]),
         ]
-        
+
         // When
         let extensionContent = AnalyticsGenerator.getExtensionContent(
             targets: [TrackerType.matomo],
             sections: [sectionOne, sectionTwo, sectionThree],
             tags: ["ios", "iosonly"],
-            staticVar: false,
+            isStatic: false,
-            extensionName: "GenAnalytics"
+            visibility: .package
         )
         // Expect Analytics
         let expect = """
         // Generated by ResgenSwift.Analytics \(ResgenSwiftVersion)
 
+        import Foundation
         import MatomoTracker
 
-        // MARK: - Protocol
+        \(protocolString(visibility: .package))
 
-        protocol AnalyticsManagerProtocol {
+        \(matomoString())
 
-            func logScreen(name: String, path: String)
+        // MARK: - Traker Type
-            func logEvent(
-                name: String,
-                action: String,
-                category: String,
-                params: [String: Any]?
-            )
-        }
 
-        // MARK: - Matomo
+        package enum TrackerType: CaseIterable {
 
-        class MatomoAnalyticsManager: AnalyticsManagerProtocol {
+            case matomo
-
-            // 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
 
-        class AnalyticsManager {
+        package class AnalyticsManager {
 
-            static var shared = AnalyticsManager()
+            package static var shared = AnalyticsManager()
+
+            private init() {}
 
             // MARK: - Properties
 
-            var managers: [AnalyticsManagerProtocol] = []
+            var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
 
-            private var isEnabled: Bool = true
+            private var isEnabled: Bool {
-
+                if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
-            // MARK: - Methods
+                    false
-
+                } else {
-            func setAnalyticsEnabled(_ enable: Bool) { 
+                    true
-                isEnabled = enable
+                }
             }
 
-            func configure(siteId: String, url: String) {
+            // MARK: - Enable Methods
-                managers.append(
+
-                    MatomoAnalyticsManager(
+            private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
-                        siteId: siteId,
+                managers.forEach { (key, value) in
-                        url: url
+                    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(
+                    siteId: siteId,
+                    url: url
                 )
             }
 
-            private func logScreen(name: String, path: String) {
+            // MARK: - Private Log Methods
+
+            private func logScreen(
+                name: String,
+                path: String,
+                params: [String: Any]?
+            ) {
                 guard isEnabled else { return }
 
-                managers.forEach { manager in
+                managers.values.forEach { manager in
-                    manager.logScreen(name: name, path: path)
+                    manager.logScreen(
+                        name: name,
+                        path: path,
+                        params: params
+                    )
                 }
             }
 
@@ -360,7 +492,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
             ) {
                 guard isEnabled else { return }
 
-                managers.forEach { manager in
+                managers.values.forEach { manager in
                     manager.logEvent(
                         name: name,
                         action: action,
@@ -372,40 +504,42 @@ final class AnalyticsGeneratorTests: XCTestCase {
 
             // MARK: - section_one
 
-            func logScreenS1DefOne() {
+            package func logScreenS1DefOne() {
                 logScreen(
                     name: "s1 def one",
-                    path: "s1_def_one/"
+                    path: "s1_def_one/",
+                    params: nil
                 )
             }
 
-            func logEventS1DefTwo() {
+            package func logEventS1DefTwo() {
                 logEvent(
                     name: "s1 def two",
                     action: "test",
                     category: "test",
-                    params: [:]
+                    params: nil
                 )
             }
 
             // MARK: - section_two
 
-            func logScreenS2DefOne() {
+            package func logScreenS2DefOne() {
                 logScreen(
                     name: "s2 def one",
-                    path: "s2_def_one/"
+                    path: "s2_def_one/",
+                    params: nil
                 )
             }
         }
 
         """
-        
+
         if extensionContent != expect {
             print(prettyFirstDifferenceBetweenStrings(s1: extensionContent, s2: expect))
         }
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
-    
+
     func testGeneratedExtensionContentMatomoAndFirebase() {
         // Given
         let sectionOne = AnalyticsCategory(id: "section_one")
@@ -413,186 +547,113 @@ final class AnalyticsGeneratorTests: XCTestCase {
             getAnalyticsDefinition(id: "s1_def_one", path: "s1_def_one/", name: "s1 def one", type: .screen, tags: ["ios", "iosonly"]),
             getAnalyticsDefinition(id: "s1_def_two", action: "test", category: "test", name: "s1 def two", type: .event, tags: ["ios", "iosonly"]),
         ]
-        
+
         let sectionTwo = AnalyticsCategory(id: "section_two")
         sectionTwo.definitions = [
             getAnalyticsDefinition(id: "s2_def_one", path: "s2_def_one/", name: "s2 def one", type: .screen, tags: ["ios","iosonly"]),
             getAnalyticsDefinition(id: "s2_def_two", action: "test", category: "test", name: "s2 def two", type: .event, tags: ["droid","droidonly"]),
         ]
-        
+
         let sectionThree = AnalyticsCategory(id: "section_three")
         sectionThree.definitions = [
             getAnalyticsDefinition(id: "s3_def_one", path: "s3_def_one/", name: "s3 def one", type: .screen, tags: ["droid","droidonly"]),
             getAnalyticsDefinition(id: "s3_def_two", action: "test", category: "test", name: "s3 def two", type: .event, tags: ["droid","droidonly"]),
         ]
-        
+
         // When
         let extensionContent = AnalyticsGenerator.getExtensionContent(
             targets: [TrackerType.matomo, TrackerType.firebase],
             sections: [sectionOne, sectionTwo, sectionThree],
             tags: ["ios", "iosonly"],
-            staticVar: false,
+            isStatic: false,
-            extensionName: "GenAnalytics"
+            visibility: .internal
         )
 
         // Expect Analytics
         let expect = """
         // Generated by ResgenSwift.Analytics \(ResgenSwiftVersion)
 
+        import Foundation
         import MatomoTracker
         import FirebaseAnalytics
 
-        // MARK: - Protocol
+        \(protocolString(visibility: .internal))
 
-        protocol AnalyticsManagerProtocol {
+        \(matomoString())
 
-            func logScreen(name: String, path: String)
+        \(firebaseString())
-            func logEvent(
-                name: String,
-                action: String,
-                category: String,
-                params: [String: Any]?
-            )
-        }
 
-        // MARK: - Matomo
+        // MARK: - Traker Type
 
-        class MatomoAnalyticsManager: AnalyticsManagerProtocol {
+        internal enum TrackerType: CaseIterable {
 
-            // MARK: - Properties
+            case matomo
-
+            case firebase
-            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
 
-        class AnalyticsManager {
+        internal class AnalyticsManager {
 
-            static var shared = AnalyticsManager()
+            internal static var shared = AnalyticsManager()
+
+            private init() {}
 
             // MARK: - Properties
 
-            var managers: [AnalyticsManagerProtocol] = []
+            var managers: [TrackerType: AnalyticsManagerProtocol] = [:]
 
-            private var isEnabled: Bool = true
+            private var isEnabled: Bool {
-
+                if ProcessInfo.processInfo.environment["XCODE_RUNNING_FOR_PREVIEWS"] == "1" {
-            // MARK: - Methods
+                    false
-
+                } else {
-            func setAnalyticsEnabled(_ enable: Bool) {
+                    true
-                isEnabled = enable
+                }
             }
 
-            func configure(siteId: String, url: String) {
+            // MARK: - Enable Methods
-                managers.append(
+
-                    MatomoAnalyticsManager(
+            private func setAnalytics(enable: Bool, _ analytics: [TrackerType]) {
-                        siteId: siteId,
+                managers.forEach { (key, value) in
-                        url: url
+                    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(
+                    siteId: siteId,
+                    url: url
                 )
-                managers.append(FirebaseAnalyticsManager())
+                managers[TrackerType.firebase] = FirebaseAnalyticsManager()
             }
 
-            private func logScreen(name: String, path: String) {
+            // MARK: - Private Log Methods
+
+            private func logScreen(
+                name: String,
+                path: String,
+                params: [String: Any]?
+            ) {
                 guard isEnabled else { return }
-        
+
-                managers.forEach { manager in
+                managers.values.forEach { manager in
-                    manager.logScreen(name: name, path: path)
+                    manager.logScreen(
+                        name: name,
+                        path: path,
+                        params: params
+                    )
                 }
             }
 
@@ -604,7 +665,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
             ) {
                 guard isEnabled else { return }
 
-                managers.forEach { manager in
+                managers.values.forEach { manager in
                     manager.logEvent(
                         name: name,
                         action: action,
@@ -616,34 +677,36 @@ final class AnalyticsGeneratorTests: XCTestCase {
 
             // MARK: - section_one
 
-            func logScreenS1DefOne() {
+            internal func logScreenS1DefOne() {
                 logScreen(
                     name: "s1 def one",
-                    path: "s1_def_one/"
+                    path: "s1_def_one/",
+                    params: nil
                 )
             }
 
-            func logEventS1DefTwo() {
+            internal func logEventS1DefTwo() {
                 logEvent(
                     name: "s1 def two",
                     action: "test",
                     category: "test",
-                    params: [:]
+                    params: nil
                 )
             }
 
             // MARK: - section_two
 
-            func logScreenS2DefOne() {
+            internal func logScreenS2DefOne() {
                 logScreen(
                     name: "s2 def one",
-                    path: "s2_def_one/"
+                    path: "s2_def_one/",
+                    params: nil
                 )
             }
         }
 
         """
-        
+
         if extensionContent != expect {
             print(prettyFirstDifferenceBetweenStrings(s1: extensionContent, s2: expect))
         }

Tests/ResgenSwiftTests/Colors/ColorExtensionGeneratorTests.swift

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

Tests/ResgenSwiftTests/Colors/ParsedColorTests.swift

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

Tests/ResgenSwiftTests/Fonts/FontExtensionGeneratorTests.swift

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

Tests/ResgenSwiftTests/Fonts/FontNameTests.swift

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

Tests/ResgenSwiftTests/Generate/AnalyticsConfigurationTests.swift

@@ -0,0 +1,76 @@
+//
+//  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,16 +16,23 @@ final class ColorsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_requiredArgs() {
         // Given
-        let testingConfiguration = ColorsConfiguration(inputFile: "path/to/colors.txt",
+        let testingConfiguration = ColorsConfiguration(
-                                                       style: ColorStyle.all.rawValue,
+            inputFile: "path/to/colors.txt",
-                                                       xcassetsPath: "path/to/assets.xcassets",
+            style: ColorStyle.all.rawValue,
-                                                       extensionOutputPath: "Colors/Generated",
+            xcassetsPath: "path/to/assets.xcassets",
-                                                       extensionName: nil,
+            extensionOutputPath: nil,
-                                                       extensionNameUIKit: nil,
+            extensionName: nil,
-                                                       extensionSuffix: nil,
+            extensionNameUIKit: nil,
-                                                       staticMembers: false)
+            extensionSuffix: nil,
+            visibility: nil,
+            assetBundle: nil,
+            staticMembers: false
+        )
         // When
-        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: false)
+        let arguments = testingConfiguration.getArguments(
+            projectDirectory: projectDirectory,
+            force: false
+        )
                 
         // Expect
         let expectedArguments = [
@@ -34,8 +41,6 @@ final class ColorsConfigurationTests: XCTestCase {
             "all",
             "--xcassets-path",
             "projectDirectory/path/to/assets.xcassets",
-            "--extension-output-path",
-            "projectDirectory/Colors/Generated",
             "--static-members",
             "false"
         ]
@@ -45,16 +50,23 @@ final class ColorsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_allArguments() {
         // Given
-        let testingConfiguration = ColorsConfiguration(inputFile: "path/to/colors.txt",
+        let testingConfiguration = ColorsConfiguration(
-                                                       style: ColorStyle.all.rawValue,
+            inputFile: "path/to/colors.txt",
-                                                       xcassetsPath: "path/to/assets.xcassets",
+            style: ColorStyle.all.rawValue,
-                                                       extensionOutputPath: "Colors/Generated",
+            xcassetsPath: "path/to/assets.xcassets",
-                                                       extensionName: "AppUIColor",
+            extensionOutputPath: "Colors/Generated",
-                                                       extensionNameUIKit: "AppColor",
+            extensionName: "AppUIColor",
-                                                       extensionSuffix: "Testing",
+            extensionNameUIKit: "AppColor",
-                                                       staticMembers: false)
+            extensionSuffix: "Testing",
+            visibility: "public",
+            assetBundle: "module",
+            staticMembers: false
+        )
         // When
-        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
+        let arguments = testingConfiguration.getArguments(
+            projectDirectory: projectDirectory,
+            force: true
+        )
                 
         // Expect
         let expectedArguments = [
@@ -66,14 +78,18 @@ 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,23 +16,25 @@ final class FontsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_requiredArgs() {
         // Given
-        let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
+        let testingConfiguration = FontsConfiguration(
-                                                      extensionOutputPath: "Fonts/Generated",
+            inputFile: "path/to/fonts.txt",
-                                                      extensionName: nil,
+            extensionOutputPath: nil,
-                                                      extensionNameUIKit: nil,
+            extensionName: nil,
-                                                      extensionSuffix: nil,
+            extensionNameUIKit: nil,
-                                                      infoPlistPaths: nil,
+            extensionSuffix: nil,
-                                                      staticMembers: nil)
+            infoPlistPaths: nil,
+            visibility: 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)
@@ -40,15 +42,21 @@ final class FontsConfigurationTests: XCTestCase {
     
     func test_argsGeneration_allArguments() {
         // Given
-        let testingConfiguration = FontsConfiguration(inputFile: "path/to/fonts.txt",
+        let testingConfiguration = FontsConfiguration(
-                                                      extensionOutputPath: "Fonts/Generated",
+            inputFile: "path/to/fonts.txt",
-                                                      extensionName: "AppUIFont",
+            extensionOutputPath: "Fonts/Generated",
-                                                      extensionNameUIKit: "AppFont",
+            extensionName: "AppUIFont",
-                                                      extensionSuffix: "Testing",
+            extensionNameUIKit: "AppFont",
-                                                      infoPlistPaths: "path/to/plist1.plist path/to/plist2.plist",
+            extensionSuffix: "Testing",
-                                                      staticMembers: true)
+            infoPlistPaths: "path/to/plist1.plist path/to/plist2.plist",
+            visibility: "package",
+            staticMembers: true
+        )
         // When
-        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
+        let arguments = testingConfiguration.getArguments(
+            projectDirectory: projectDirectory,
+            force: true
+        )
                 
         // Expect
         let expectedArguments = [
@@ -56,14 +64,16 @@ 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,26 +16,29 @@ final class ImagesConfigurationTests: XCTestCase {
     
     func test_argsGeneration_requiredArgs() {
         // Given
-        let testingConfiguration = ImagesConfiguration(inputFile: "path/to/images.txt",
+        let testingConfiguration = ImagesConfiguration(
-                                                       xcassetsPath: "path/to/assets.xcassets",
+            inputFile: "path/to/images.txt",
-                                                       extensionOutputPath: "Images/Generated",
+            xcassetsPath: "path/to/assets.xcassets",
-                                                       extensionName: nil,
+            extensionOutputPath: nil,
-                                                       extensionNameUIKit: nil,
+            extensionName: nil,
-                                                       extensionSuffix: nil,
+            extensionNameUIKit: nil,
-                                                       staticMembers: nil)
+            extensionSuffix: nil,
+            visibility: nil,
+            assetBundle: 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)
@@ -43,16 +46,23 @@ final class ImagesConfigurationTests: XCTestCase {
     
     func test_argsGeneration_allArguments() {
         // Given
-        let testingConfiguration = ImagesConfiguration(inputFile: "path/to/images.txt",
+        let testingConfiguration = ImagesConfiguration(
-                                                       xcassetsPath: "path/to/assets.xcassets",
+            inputFile: "path/to/images.txt",
-                                                       extensionOutputPath: "Images/Generated",
+            xcassetsPath: "path/to/assets.xcassets",
-                                                       extensionName: "AppUIImage",
+            extensionOutputPath: "Images/Generated",
-                                                       extensionNameUIKit: "AppImage",
+            extensionName: "AppUIImage",
-                                                       extensionSuffix: "Testing",
+            extensionNameUIKit: "AppImage",
-                                                       staticMembers: true)
+            extensionSuffix: "Testing",
+            visibility: "private",
+            assetBundle: "module",
+            staticMembers: true
+        )
         
         // When
-        let arguments = testingConfiguration.getArguments(projectDirectory: projectDirectory, force: true)
+        let arguments = testingConfiguration.getArguments(
+            projectDirectory: projectDirectory,
+            force: true
+        )
 
         // Expect
         let expectedArguments = [
@@ -62,14 +72,18 @@ 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

@@ -0,0 +1,102 @@
+//
+//  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

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

Tests/ResgenSwiftTests/Images/ParsedImageTests.swift

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

Tests/ResgenSwiftTests/Strings/DefinitionTests.swift

@@ -8,9 +8,9 @@
 // CPD-OFF
 
 import Foundation
-import XCTest
-
 @testable import ResgenSwift
+import ToolCore
+import XCTest
 
 final class DefinitionTests: XCTestCase {
  
@@ -94,9 +94,24 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
+            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
+        )
                 
         // Expect
         let expectFr = """
@@ -105,7 +120,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "This is a comment")
         }
         """
@@ -116,7 +131,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "This is a comment")
         }
         """
@@ -127,7 +142,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "This is a comment")
         }
         """
@@ -149,9 +164,24 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -160,7 +190,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        var definition_name: String {
+        private var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -171,7 +201,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        var definition_name: String {
+        private var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -182,7 +212,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        var definition_name: String {
+        private var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -203,9 +233,24 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getNSLocalizedStringProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -214,7 +259,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -225,7 +270,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -236,7 +281,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -246,7 +291,7 @@ final class DefinitionTests: XCTestCase {
         XCTAssertEqual(propertyEnUs.adaptForXCTest(), expectEnUs.adaptForXCTest())
     }
 
-    // MARK: - getNSLocalizedStringStaticProperty
+    // MARK: - getNSLocalizedStringProperty - static
 
     func testGeneratedNSLocalizedStringStaticProperty() {
         // Given
@@ -260,10 +305,25 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
+            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
+        )
+
         // Expect
         let expectFr = """
         /// Translation in fr :
@@ -271,7 +331,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        static var definition_name: String {
+        public static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "This is a comment")
         }
         """
@@ -282,7 +342,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        static var definition_name: String {
+        public static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "This is a comment")
         }
         """
@@ -293,7 +353,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        static var definition_name: String {
+        public 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")
         }
         """
@@ -315,9 +375,24 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -326,7 +401,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        static var definition_name: String {
+        internal static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -337,7 +412,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        static var definition_name: String {
+        internal static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -348,7 +423,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        static var definition_name: String {
+        internal static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -369,9 +444,24 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getNSLocalizedStringStaticProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        let propertyEn = definition.getNSLocalizedStringStaticProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getNSLocalizedStringStaticProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -380,7 +470,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        static var definition_name: String {
+        internal static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "C'est la traduction francaise", comment: "")
         }
         """
@@ -391,7 +481,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        static var definition_name: String {
+        internal static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english translation", comment: "")
         }
         """
@@ -402,7 +492,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// No comment
-        static var definition_name: String {
+        internal static var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "This is the english us translation", comment: "")
         }
         """
@@ -422,8 +512,13 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        
+            forLang: "fr",
+            isStatic: false,
+            visibility: .internal,
+            assetBundle: .main
+        )
+
         // Expect
         let expectFr = """
         /// Translation in fr :
@@ -431,7 +526,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        var definition_name: String {
+        internal var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Welcome \"%@\" !", comment: "This is a comment")
         }
         
@@ -440,7 +535,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        func definition_name(arg0: String) -> String {
+        internal func definition_name(arg0: String) -> String {
             String(format: self.definition_name, arg0)
         }
         """
@@ -458,8 +553,13 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        
+            forLang: "fr",
+            isStatic: false,
+            visibility: .private,
+            assetBundle: .main
+        )
+
         // Expect
         let expectFr = """
         /// Translation in fr :
@@ -467,7 +567,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        var definition_name: String {
+        private 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")
         }
         
@@ -476,7 +576,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        func definition_name(arg0: String, arg1: Int, arg2: Double) -> String {
+        private func definition_name(arg0: String, arg1: Int, arg2: Double) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
         """
@@ -495,16 +595,26 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getNSLocalizedStringProperty(forLang: "fr")
+        let propertyFr = definition.getNSLocalizedStringProperty(
-        let propertyEn = definition.getNSLocalizedStringProperty(forLang: "en")
+            forLang: "fr",
-        
+            isStatic: false,
+            visibility: .public,
+            assetBundle: .main
+        )
+        let propertyEn = definition.getNSLocalizedStringProperty(
+            forLang: "en",
+            isStatic: false,
+            visibility: .public,
+            assetBundle: .main
+        )
+
         let expectFr = """
         /// Translation in fr :
         /// Vous %%: %1$@ %2$@ Age: %3$d
         ///
         /// Comment :
         /// This is a comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "Vous %%: %1$@ %2$@ Age: %3$d", comment: "This is a comment")
         }
         
@@ -513,7 +623,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
+        public func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
         """
@@ -524,7 +634,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        var definition_name: String {
+        public var definition_name: String {
             NSLocalizedString("definition_name", tableName: kStringsFileName, bundle: Bundle.main, value: "You %%: %2$@ %1$@ Age: %3$d", comment: "This is a comment")
         }
         
@@ -533,7 +643,7 @@ final class DefinitionTests: XCTestCase {
         ///
         /// Comment :
         /// This is a comment
-        func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
+        public func definition_name(arg0: String, arg1: String, arg2: Int) -> String {
             String(format: self.definition_name, arg0, arg1, arg2)
         }
         """
@@ -556,10 +666,22 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyFr = definition.getProperty(
-        let propertyEn = definition.getProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getProperty(forLang: "en-us")
+            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
+        )
+
         // Expect
         let expectFr = """
             /// Translation in fr :
@@ -567,7 +689,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            var definition_name: String {
+            public var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -578,7 +700,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            var definition_name: String {
+            public var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -589,7 +711,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            var definition_name: String {
+            public var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -611,9 +733,21 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyFr = definition.getProperty(
-        let propertyEn = definition.getProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -622,7 +756,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var definition_name: String {
+            package var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -633,7 +767,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var definition_name: String {
+            package var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -644,7 +778,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var definition_name: String {
+            package var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -665,9 +799,21 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getProperty(forLang: "fr")
+        let propertyFr = definition.getProperty(
-        let propertyEn = definition.getProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -676,7 +822,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var definition_name: String {
+            private var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -687,7 +833,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var definition_name: String {
+            private var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -698,7 +844,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var definition_name: String {
+            private var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -722,10 +868,22 @@ final class DefinitionTests: XCTestCase {
         ]
         
         // When
-        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyFr = definition.getProperty(
-        let propertyEn = definition.getStaticProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
+            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
+        )
+
         // Expect
         let expectFr = """
             /// Translation in fr :
@@ -733,7 +891,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -744,7 +902,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -755,7 +913,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// This is a comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -777,9 +935,21 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyFr = definition.getProperty(
-        let propertyEn = definition.getStaticProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -788,7 +958,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -799,7 +969,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -810,7 +980,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "This is the english us translation"
             }
         """
@@ -831,9 +1001,21 @@ final class DefinitionTests: XCTestCase {
         ]
 
         // When
-        let propertyFr = definition.getStaticProperty(forLang: "fr")
+        let propertyFr = definition.getProperty(
-        let propertyEn = definition.getStaticProperty(forLang: "en")
+            forLang: "fr",
-        let propertyEnUs = definition.getStaticProperty(forLang: "en-us")
+            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
+        )
 
         // Expect
         let expectFr = """
@@ -842,7 +1024,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "C'est la traduction francaise"
             }
         """
@@ -853,7 +1035,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            static var definition_name: String {
+            internal static var definition_name: String {
                 "This is the english translation"
             }
         """
@@ -864,7 +1046,7 @@ final class DefinitionTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            static var definition_name: String {
+            internal 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(
-        staticVar: Bool,
+        isStatic: Bool,
         s1DefOneFr: String = "Section Un - Definition Un",
         s1DefOneComment: String = "",
         s1DefTwoFr: String = "Section Un - Definition Deux",
@@ -20,6 +20,8 @@ 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)
@@ -30,13 +32,13 @@ extension StringsFileGeneratorTests {
         
         extension GenStrings {
         
-            enum KeyStrings: String {
+            \(visibility) 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"
         
-                var keyPath: KeyPath<GenStrings, String> {
+                \(visibility) 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
@@ -53,8 +55,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s1DefOneComment.isEmpty ? "No comment" : s1DefOneComment)
-            \(staticVar ? "static " : "")var s1_def_one: String {
+            \(visibility) \(isStatic ? "static " : "")var s1_def_one: String {
-                NSLocalizedString("s1_def_one", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Un - Definition Un", comment: "\(s1DefOneComment)")
+                NSLocalizedString("s1_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Un", comment: "\(s1DefOneComment)")
             }
         
             /// Translation in fr :
@@ -62,8 +64,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s1DefTwoComment.isEmpty ? "No comment" : s1DefTwoComment)
-            \(staticVar ? "static " : "")var s1_def_two: String {
+            \(visibility) \(isStatic ? "static " : "")var s1_def_two: String {
-                NSLocalizedString("s1_def_two", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Un - Definition Deux", comment: "\(s1DefTwoComment)")
+                NSLocalizedString("s1_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Un - Definition Deux", comment: "\(s1DefTwoComment)")
             }
         
             // MARK: - section_two
@@ -73,8 +75,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s2DefOneComment.isEmpty ? "No comment" : s2DefOneComment)
-            \(staticVar ? "static " : "")var s2_def_one: String {
+            \(visibility) \(isStatic ? "static " : "")var s2_def_one: String {
-                NSLocalizedString("s2_def_one", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Deux - Definition Un", comment: "\(s2DefOneComment)")
+                NSLocalizedString("s2_def_one", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Un", comment: "\(s2DefOneComment)")
             }
         
             /// Translation in fr :
@@ -82,8 +84,8 @@ extension StringsFileGeneratorTests {
             ///
             /// Comment :
             /// \(s2DefTwoComment.isEmpty ? "No comment" : s2DefTwoComment)
-            \(staticVar ? "static " : "")var s2_def_two: String {
+            \(visibility) \(isStatic ? "static " : "")var s2_def_two: String {
-                NSLocalizedString("s2_def_two", tableName: kStringsFileName, bundle: Bundle.main, value: "Section Deux - Definition Deux", comment: "\(s2DefTwoComment)")
+                NSLocalizedString("s2_def_two", tableName: kStringsFileName, bundle: Bundle.\(assetBundle), value: "Section Deux - Definition Deux", comment: "\(s2DefTwoComment)")
             }
         }
         """

Tests/ResgenSwiftTests/Strings/StringFileGeneratorTests/StringsFileGeneratorTests.swift

@@ -373,17 +373,21 @@ final class StringsFileGeneratorTests: XCTestCase {
         let sectionTwo = Section.Mock.getSectionTwo()
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(
-                                                                        defaultLang: "fr",
+            sections: [sectionOne, sectionTwo],
-                                                                        tags: ["ios", "iosonly", "notranslation"],
+            defaultLang: "fr",
-                                                                        staticVar: false,
+            tags: ["ios", "iosonly", "notranslation"],
-                                                                        inputFilename: "myInputFilename",
+            isStatic: false,
-                                                                        extensionName: "GenStrings",
+            inputFilename: "myInputFilename",
-                                                                        extensionSuffix: "strings")
+            extensionName: "GenStrings",
+            extensionSuffix: "strings",
+            visibility: .internal,
+            assetBundle: .main
+        )
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            staticVar: false
+            isStatic: false
         )
 
         if extensionContent != expect {
@@ -404,21 +408,26 @@ final class StringsFileGeneratorTests: XCTestCase {
         )
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(
-                                                                        defaultLang: "fr",
+            sections: [sectionOne, sectionTwo],
-                                                                        tags: ["ios", "iosonly", "notranslation"],
+            defaultLang: "fr",
-                                                                        staticVar: false,
+            tags: ["ios", "iosonly", "notranslation"],
-                                                                        inputFilename: "myInputFilename",
+            isStatic: false,
-                                                                        extensionName: "GenStrings",
+            inputFilename: "myInputFilename",
-                                                                        extensionSuffix: "strings")
+            extensionName: "GenStrings",
+            extensionSuffix: "strings",
+            visibility: .public,
+            assetBundle: .main
+        )
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            staticVar: false,
+            isStatic: 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 {
@@ -428,23 +437,29 @@ final class StringsFileGeneratorTests: XCTestCase {
     }
 
     // MARK: - Extension Content Static
-    func testGeneratedExtensionContentWithStaticVar() {
+    func testGeneratedExtensionContentWithIsStatic() {
         // Given
         let sectionOne = Section.Mock.getSectionOne()
         let sectionTwo = Section.Mock.getSectionTwo()
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(
-                                                                        defaultLang: "fr",
+            sections: [sectionOne, sectionTwo],
-                                                                        tags: ["ios", "iosonly", "notranslation"],
+            defaultLang: "fr",
-                                                                        staticVar: true,
+            tags: ["ios", "iosonly", "notranslation"],
-                                                                        inputFilename: "myInputFilename",
+            isStatic: true,
-                                                                        extensionName: "GenStrings",
+            inputFilename: "myInputFilename",
-                                                                        extensionSuffix: "strings")
+            extensionName: "GenStrings",
+            extensionSuffix: "strings",
+            visibility: .package,
+            assetBundle: .module
+        )
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            staticVar: true
+            isStatic: true,
+            visibility: .package,
+            assetBundle: .module
         )
 
         if extensionContent != expect {
@@ -453,7 +468,7 @@ final class StringsFileGeneratorTests: XCTestCase {
         XCTAssertEqual(extensionContent.adaptForXCTest(), expect.adaptForXCTest())
     }
 
-    func testGeneratedExtensionContentWithStaticVarWithComment() {
+    func testGeneratedExtensionContentWithIsStaticWithComment() {
         // Given
         let sectionOne = Section.Mock.getSectionOne(
             defOneComment: "This is a comment",
@@ -465,21 +480,27 @@ final class StringsFileGeneratorTests: XCTestCase {
         )
 
         // When
-        let extensionContent = StringsFileGenerator.getExtensionContent(sections: [sectionOne, sectionTwo],
+        let extensionContent = StringsFileGenerator.getExtensionContent(
-                                                                        defaultLang: "fr",
+            sections: [sectionOne, sectionTwo],
-                                                                        tags: ["ios", "iosonly", "notranslation"],
+            defaultLang: "fr",
-                                                                        staticVar: true,
+            tags: ["ios", "iosonly", "notranslation"],
-                                                                        inputFilename: "myInputFilename",
+            isStatic: true,
-                                                                        extensionName: "GenStrings",
+            inputFilename: "myInputFilename",
-                                                                        extensionSuffix: "strings")
+            extensionName: "GenStrings",
+            extensionSuffix: "strings",
+            visibility: .internal,
+            assetBundle: .module
+        )
 
         // Expect
         let expect = Self.getExtensionContentExpectation(
-            staticVar: true,
+            isStatic: 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,7 +13,11 @@ 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"]
@@ -41,11 +45,15 @@ final class TagsGeneratorTests: XCTestCase {
         ]
         
         // When
-        let extensionContent = TagsGenerator.getExtensionContent(sections: [sectionOne, sectionTwo, sectionThree],
+        let extensionContent = TagsGenerator.getExtensionContent(
-                                                                 lang: "ium",
+            sections: [sectionOne, sectionTwo, sectionThree],
-                                                                 tags: ["ios", "iosonly"],
+            lang: "ium",
-                                                                 staticVar: false,
+            tags: ["ios", "iosonly"],
-                                                                 extensionName: "GenTags")
+            isStatic: false,
+            extensionName: "GenTags",
+            visibility: .public
+        )
+
         // Expect Tags
         let expect = """
         // Generated by ResgenSwift.Strings.Tags \(ResgenSwiftVersion)
@@ -60,7 +68,7 @@ final class TagsGeneratorTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var s1_def_one: String {
+            public var s1_def_one: String {
                 "Some translation"
             }
         
@@ -69,7 +77,7 @@ final class TagsGeneratorTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var s1_def_two: String {
+            public var s1_def_two: String {
                 "Some translation"
             }
         
@@ -80,7 +88,7 @@ final class TagsGeneratorTests: XCTestCase {
             ///
             /// Comment :
             /// No comment
-            var s2_def_one: String {
+            public var s2_def_one: String {
                 "Some translation"
             }
         }