SampleFiles/Tags/Generated/Analytics+GenAllScript.swift

@@ -169,22 +169,19 @@ class AnalyticsManager {
 
     // MARK: - section_one
 
-    func logScreenS1DefOne(title: String) {
+    func logScreenS1DefOne() {
         logScreen(
-            name: "s1 def one \(title)",
-            path: "s1_def_one/\(title)"
+            name: "s1 def one",
+            path: "s1_def_one/"
         )
     }
 
-    func logEventS1DefTwo(title: String, count: String) {
+    func logEventS1DefTwo() {
         logEvent(
             name: "s1 def two",
             action: "test",
             category: "test",
-            params: [
-                "title": title,
-				"count": count
-            ]
+            params: [:]
         )
     }
 

SampleFiles/Tags/sampleTags.yml

@@ -3,13 +3,9 @@ categories:
   - id: section_one
     screens:
       - id: s1_def_one
-        name: s1 def one _TITLE_
-        path: s1_def_one/_TITLE_
-        tags: ios,droid
-        parameters:
-          - name: title
-            type: String
-            replaceIn: name,path
+        name: s1 def one
+        path: s1_def_one/
+        tags: ios
               
     events:
       - id: s1_def_two
@@ -17,11 +13,6 @@ categories:
         action: test
         category: test
         tags: ios
-        parameters:
-          - name: title
-            type: String
-          - name: count
-            type: String
             
   - id: section_two
     screens:

Sources/ResgenSwift/Analytics/Analytics.swift

@@ -32,10 +32,6 @@ struct Analytics: ParsableCommand {
     mutating func run() {
         print("[\(Self.toolName)] Starting analytics generation")
         print("[\(Self.toolName)] Will use inputFile \(options.inputFile) to generate analytics for target: \(options.target)")
-
-        // Check requirements
-        guard checkRequirements() else { return }
-
         print("[\(Self.toolName)] Will generate analytics")
         
         // Check requirements
@@ -67,12 +63,6 @@ struct Analytics: ParsableCommand {
             Analytics.exit(withError: error)
         }
         
-        guard TrackerType.hasValidTarget(in: options.target) else {
-            let error = AnalyticsError.noValidTracker(options.target)
-            print(error.description)
-            Analytics.exit(withError: error)
-        }
-
         // Check if needed to regenerate
         guard GeneratorChecker.shouldGenerate(force: options.forceGeneration,
                                               inputFilePath: options.inputFile,
@@ -84,3 +74,19 @@ struct Analytics: ParsableCommand {
         return true
     }
 }
+
+extension Analytics {
+    enum TargetType: CaseIterable {
+        case matomo
+        case firebase
+        
+        var value: String {
+            switch self {
+            case .matomo:
+                "matomo"
+            case .firebase:
+                "firebase"
+            }
+        }
+    }
+}

Sources/ResgenSwift/Analytics/AnalyticsError.swift

@@ -8,20 +8,16 @@
 import Foundation
 
 enum AnalyticsError: Error {
-    case noValidTracker(String)
     case fileNotExists(String)
     case missingElement(String)
     case invalidParameter(String)
-    case parseFailed(String)
+    
     case writeFile(String, String)
     
     var description: String {
         switch self {
-        case .noValidTracker(let inputTargets):
-            return "error: [\(Analytics.toolName)] '\(inputTargets)' ne contient aucun tracker valid"
-
         case .fileNotExists(let filename):
-            return "error: [\(Analytics.toolName)] File \(filename) does not exists"
+            return "error: [\(Analytics.toolName)] File \(filename) does not exists "
             
         case .missingElement(let element):
             return "error: [\(Analytics.toolName)] Missing \(element) for Matomo"
@@ -29,9 +25,6 @@ enum AnalyticsError: Error {
         case .invalidParameter(let reason):
             return "error: [\(Analytics.toolName)] Invalid parameter \(reason)"
             
-        case .parseFailed(let baseError):
-            return "error: [\(Analytics.toolName)] Parse input file failed: \(baseError)"
-
         case .writeFile(let subErrorDescription, let filename):
             return "error: [\(Analytics.toolName)] An error occured while writing content to \(filename): \(subErrorDescription)"
         }

Sources/ResgenSwift/Analytics/Generator/AnalyticsGenerator.swift

@@ -10,13 +10,13 @@ import ToolCore
 import CoreVideo
 
 class AnalyticsGenerator {
-    static var targets: [TrackerType] = []
+    static var targets: [Analytics.TargetType] = []
     
     static func writeExtensionFiles(sections: [AnalyticsCategory], target: String, tags: [String], staticVar: Bool, extensionName: String, extensionFilePath: String) {
         // Get target type from enum
         let targetsString: [String] = target.components(separatedBy: " ")
                 
-        TrackerType.allCases.forEach { enumTarget in
+        Analytics.TargetType.allCases.forEach { enumTarget in
             if targetsString.contains(enumTarget.value) {
                 targets.append(enumTarget)
             }
@@ -58,7 +58,7 @@ class AnalyticsGenerator {
         
         \(Self.getImport())
         
-        \(Self.getAnalyticsProtocol())
+        \(Self.getAnalytics())
         // MARK: - Manager
         
         class AnalyticsManager {
@@ -91,10 +91,10 @@ class AnalyticsGenerator {
     private static func getImport() -> String {
         var result: [String] = []
         
-        if targets.contains(TrackerType.matomo) {
+        if targets.contains(Analytics.TargetType.matomo) {
             result.append("import MatomoTracker")
         }
-        if targets.contains(TrackerType.firebase) {
+        if targets.contains(Analytics.TargetType.firebase) {
             result.append("import FirebaseAnalytics")
         }
         
@@ -136,13 +136,13 @@ class AnalyticsGenerator {
         var content: [String] = []
         let footer = "    }"
         
-        if targets.contains(TrackerType.matomo) {
+        if targets.contains(Analytics.TargetType.matomo) {
             header = "func configure(siteId: String, url: String) {"
-        } else if targets.contains(TrackerType.firebase) {
+        } else if targets.contains(Analytics.TargetType.firebase) {
             header = "func configure() {"
         }
         
-        if targets.contains(TrackerType.matomo) {
+        if targets.contains(Analytics.TargetType.matomo) {
             content.append("""
                     managers.append(
                         MatomoAnalyticsManager(
@@ -152,7 +152,7 @@ class AnalyticsGenerator {
                     )
             """)
         }
-        if targets.contains(TrackerType.firebase) {
+        if targets.contains(Analytics.TargetType.firebase) {
             content.append("        managers.append(FirebaseAnalyticsManager())")
         }
         
@@ -164,7 +164,7 @@ class AnalyticsGenerator {
             .joined(separator: "\n")
     }
     
-    private static func getAnalyticsProtocol() -> String {
+    private static func getAnalytics() -> String {
         let proto = """
         // MARK: - Protocol
         
@@ -182,12 +182,12 @@ class AnalyticsGenerator {
         
         var result: [String] = [proto]
         
-        if targets.contains(TrackerType.matomo) {
-            result.append(MatomoGenerator.service)
+        if targets.contains(Analytics.TargetType.matomo) {
+            result.append(MatomoGenerator.service.content)
         }
         
-        if targets.contains(TrackerType.firebase) {
-            result.append(FirebaseGenerator.service)
+        if targets.contains(Analytics.TargetType.firebase) {
+            result.append(FirebaseGenerator.service.content)
         }
         
         return result.joined(separator: "\n")

Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift

@@ -8,20 +8,19 @@
 import Foundation
 
 enum FirebaseGenerator {
+    case service
     
-    static var service: String {
+    var content: String {
         [
-            FirebaseGenerator.header,
-            FirebaseGenerator.logScreen,
-            FirebaseGenerator.logEvent,
-            FirebaseGenerator.footer
+            FirebaseGenerator.service.header,
+            FirebaseGenerator.service.logScreen,
+            FirebaseGenerator.service.logEvent,
+            FirebaseGenerator.service.footer
         ]
             .joined(separator: "\n")
     }
     
-    // MARK: - Private vars
-
-    private static var header: String {
+    private var header: String {
         """
         // MARK: - Firebase
 
@@ -29,7 +28,7 @@ enum FirebaseGenerator {
         """
     }
     
-    private static var logScreen: String {
+    private var logScreen: String {
         """
             func logScreen(name: String, path: String) {
                 var parameters = [
@@ -45,7 +44,7 @@ enum FirebaseGenerator {
         """
     }
     
-    private static var logEvent: String {
+    private var logEvent: String {
         """
             func logEvent(
                 name: String,
@@ -72,7 +71,7 @@ enum FirebaseGenerator {
         """
     }
     
-    private static var footer: String {
+    private var footer: String {
         """
         }
         

Sources/ResgenSwift/Analytics/Generator/MatomoGenerator.swift

@@ -8,21 +8,20 @@
 import Foundation
 
 enum MatomoGenerator {
+    case service
     
-    static var service: String {
+    var content: String {
         [
-            MatomoGenerator.header,
-            MatomoGenerator.setup,
-            MatomoGenerator.logScreen,
-            MatomoGenerator.logEvent,
-            MatomoGenerator.footer
+            MatomoGenerator.service.header,
+            MatomoGenerator.service.setup,
+            MatomoGenerator.service.logScreen,
+            MatomoGenerator.service.logEvent,
+            MatomoGenerator.service.footer
         ]
             .joined(separator: "\n")
     }
     
-    // MARK: - Private vars
-
-    private static var header: String {
+    private var header: String {
         """
         // MARK: - Matomo
 
@@ -35,7 +34,7 @@ enum MatomoGenerator {
         """
     }
     
-    private static var setup: String {
+    private var setup: String {
         """
             // MARK: - Init
         
@@ -64,7 +63,7 @@ enum MatomoGenerator {
         """
     }
     
-    private static var logScreen: String {
+    private var logScreen: String {
         """
             func logScreen(name: String, path: String) {
                 guard !tracker.isOptedOut else { return }
@@ -80,7 +79,7 @@ enum MatomoGenerator {
         """
     }
     
-    private static var logEvent: String {
+    private var logEvent: String {
         """
             func logEvent(
                 name: String,
@@ -101,7 +100,7 @@ enum MatomoGenerator {
         """
     }
     
-    private static var footer: String {
+    private var footer: String {
         """
         }
         

Sources/ResgenSwift/Analytics/Model/AnalyticsCategory.swift

@@ -11,14 +11,10 @@ class AnalyticsCategory {
     let id: String // OnBoarding
     var definitions = [AnalyticsDefinition]()
     
-    // MARK: - Init
-
     init(id: String) {
         self.id = id
     }
     
-    // MARK: - Methods
-
     func hasOneOrMoreMatchingTags(tags: [String]) -> Bool {
         let allTags = definitions.flatMap { $0.tags }
         let allTagsSet = Set(allTags)

Sources/ResgenSwift/Analytics/Model/AnalyticsDefinition.swift

@@ -6,7 +6,6 @@
 //
 
 import Foundation
-import ToolCore
 
 class AnalyticsDefinition {
     let id: String
@@ -19,16 +18,12 @@ class AnalyticsDefinition {
     var parameters: [AnalyticsParameter] = []
     var type: TagType
     
-    // MARK: - Init
-
     init(id: String, name: String, type: TagType) {
         self.id = id
         self.name = name
         self.type = type
     }
     
-    // MARK: - Methods
-
     func hasOneOrMoreMatchingTags(inputTags: [String]) -> Bool {
         if Set(inputTags).isDisjoint(with: tags) {
             return false
@@ -36,7 +31,7 @@ class AnalyticsDefinition {
         return true
     }
     
-    // MARK: - Private Methods
+    // MARK: - Methods
     
     private func getFuncName() -> String {
         var pascalCaseTitle: String = ""
@@ -155,3 +150,27 @@ class AnalyticsDefinition {
         """
     }
 }
+
+extension AnalyticsDefinition {
+    enum TagType {
+        case screen
+        case event
+    }
+}
+
+extension String {
+    func replacingFirstOccurrence(of: String, with: String) -> Self {
+        if let range = self.range(of: of) {
+            let tmp = self.replacingOccurrences(
+                of: of,
+                with: with,
+                options: .literal,
+                range: range
+            )
+
+            return tmp
+        }
+        
+        return self
+    }
+}

Sources/ResgenSwift/Analytics/Model/AnalyticsFile.swift

@@ -17,7 +17,9 @@ struct AnalyticsCategoryDTO: Codable {
     var events: [AnalyticsDefinitionEventDTO]?
 }
 
-struct AnalyticsDefinitionScreenDTO: Codable {
+protocol AnalyticsDefinitionDTO: Codable {}
+
+struct AnalyticsDefinitionScreenDTO: AnalyticsDefinitionDTO {
     var id: String
     var name: String
     var tags: String
@@ -27,7 +29,7 @@ struct AnalyticsDefinitionScreenDTO: Codable {
     var path: String?
 }
 
-struct AnalyticsDefinitionEventDTO: Codable {
+struct AnalyticsDefinitionEventDTO: AnalyticsDefinitionDTO {
     var id: String
     var name: String
     var tags: String

Sources/ResgenSwift/Analytics/Model/AnalyticsParameter.swift

@@ -12,8 +12,6 @@ class AnalyticsParameter {
     var type: String
     var replaceIn: [String] = []
     
-    // MARK: - Init
-    
     init(name: String, type: String) {
         self.name = name
         self.type = type

Sources/ResgenSwift/Analytics/Model/TagType.swift

@@ -1,16 +0,0 @@
-//
-//  TagType.swift
-//  
-//
-//  Created by Thibaut Schmitt on 08/12/2023.
-//
-
-import Foundation
-
-extension AnalyticsDefinition {
-    
-    enum TagType {
-        case screen
-        case event
-    }
-}

Sources/ResgenSwift/Analytics/Model/TargetType.swift

@@ -1,29 +0,0 @@
-//
-//  TargetType.swift
-//  
-//
-//  Created by Thibaut Schmitt on 08/12/2023.
-//
-
-import Foundation
-
-enum TrackerType: CaseIterable {
-    case matomo
-    case firebase
-
-    var value: String {
-        switch self {
-        case .matomo:
-            "matomo"
-        case .firebase:
-            "firebase"
-        }
-    }
-
-    static func hasValidTarget(in targets: String) -> Bool {
-        for tracker in Self.allCases where targets.contains(tracker.value) {
-            return true
-        }
-        return false
-    }
-}

Sources/ResgenSwift/Analytics/Parser/AnalyticsFileParser.swift

@@ -15,25 +15,24 @@ class AnalyticsFileParser {
     private static func parseYaml() -> AnalyticsFile {
         guard let data = FileManager().contents(atPath: inputFile) else {
             let error = AnalyticsError.fileNotExists(inputFile)
-            print(error.description)
             Analytics.exit(withError: error)
         }
         
         do {
             let tagFile = try YAMLDecoder().decode(AnalyticsFile.self, from: data)
             return tagFile
-        } catch {
-            let error = AnalyticsError.parseFailed(error.localizedDescription)
-            print(error.description)
+        } catch let error {
             Analytics.exit(withError: error)
         }
     }
     
-    private static func getParameters(from parameters: [AnalyticsParameterDTO]) -> [AnalyticsParameter] {
-        parameters.map { dtoParameter in
+    private static func getParameters(fromData data: [AnalyticsParameterDTO]) -> [AnalyticsParameter] {
+        var parameters: [AnalyticsParameter] = []
+        
+        data.forEach { value in
             // Type
             
-            let type = dtoParameter.type.uppercasedFirst()
+            let type = value.type.uppercasedFirst()
             
             guard 
                 type == "String" ||
@@ -41,22 +40,20 @@ class AnalyticsFileParser {
                 type == "Double" ||
                 type == "Bool"
             else {
-                let error = AnalyticsError.invalidParameter("type of \(dtoParameter.name)")
-                print(error.description)
+                let error = AnalyticsError.invalidParameter("type of \(value.name)")
                 Analytics.exit(withError: error)
             }
             
-            let parameter = AnalyticsParameter(
-                name: dtoParameter.name,
-                type: type
-            )
+            let parameter: AnalyticsParameter = AnalyticsParameter(name: value.name, type: type)
             
-            if let replaceIn = dtoParameter.replaceIn {
+            if let replaceIn = value.replaceIn {
                 parameter.replaceIn = replaceIn.components(separatedBy: ",")
             }
             
-            return parameter
+            parameters.append(parameter)
         }
+        
+        return parameters
     }
 
     private static func getTagDefinition(
@@ -67,24 +64,24 @@ class AnalyticsFileParser {
         comments: String?,
         parameters: [AnalyticsParameterDTO]?
     ) -> AnalyticsDefinition {
-        let definition = AnalyticsDefinition(id: id, name: name, type: type)
-        definition.tags = tags
-            .components(separatedBy: ",")
-            .map { $0.removeLeadingTrailingWhitespace() }
+        let definition: AnalyticsDefinition = AnalyticsDefinition(id: id, name: name, type: type)
+        definition.tags = tags.components(separatedBy: ",")
         
         if let comments = comments {
             definition.comments = comments
         }
         
         if let parameters = parameters {
-            definition.parameters = Self.getParameters(from: parameters)
+            definition.parameters = Self.getParameters(fromData: parameters)
         }
         
         return definition
     }
     
-    private static func getTagDefinitionScreen(from screens: [AnalyticsDefinitionScreenDTO]) -> [AnalyticsDefinition] {
-        screens.map { screen in
+    private static func getTagDefinitionScreen(fromData screens: [AnalyticsDefinitionScreenDTO]) -> [AnalyticsDefinition] {
+        var definitions: [AnalyticsDefinition] = []
+            
+        for screen in screens {
             let definition: AnalyticsDefinition = Self.getTagDefinition(
                 id: screen.id,
                 name: screen.name,
@@ -94,24 +91,27 @@ class AnalyticsFileParser {
                 parameters: screen.parameters
             )
             
-            if target.contains(TrackerType.matomo.value) {
+            if target.contains(Analytics.TargetType.matomo.value) {
                 // Path
                 
                 guard let path = screen.path else {
                     let error = AnalyticsError.missingElement("screen path")
-                    print(error.description)
                     Analytics.exit(withError: error)
                 }
 
                 definition.path = path
             }
             
-            return definition
+            definitions.append(definition)
         }
+        
+        return definitions
     }
     
-    private static func getTagDefinitionEvent(from events: [AnalyticsDefinitionEventDTO]) -> [AnalyticsDefinition] {
-        events.map { event in
+    private static func getTagDefinitionEvent(fromData events: [AnalyticsDefinitionEventDTO]) -> [AnalyticsDefinition] {
+        var definitions: [AnalyticsDefinition] = []
+            
+        for event in events {
             let definition: AnalyticsDefinition = Self.getTagDefinition(
                 id: event.id,
                 name: event.name,
@@ -121,58 +121,53 @@ class AnalyticsFileParser {
                 parameters: event.parameters
             )
             
-            if target.contains(TrackerType.matomo.value) {
+            if target.contains(Analytics.TargetType.matomo.value) {
                 // Category
+                
                 guard let category = event.category else {
                     let error = AnalyticsError.missingElement("event category")
-                    print(error.description)
                     Analytics.exit(withError: error)
                 }
                 
                 definition.category = category
                 
                 // Action
+                
                 guard let action = event.action else {
                     let error = AnalyticsError.missingElement("event action")
-                    print(error.description)
                     Analytics.exit(withError: error)
                 }
                 
                 definition.action = action
             }
             
-            return definition
+            definitions.append(definition)
         }
+        
+        return definitions
     }
     
     static func parse(_ inputFile: String, target: String) -> [AnalyticsCategory] {
         self.inputFile = inputFile
         self.target = target
         
-        let tagFile = Self.parseYaml()
+        let tagFile: AnalyticsFile = Self.parseYaml()
+        var sections: [AnalyticsCategory] = []
         
-        return tagFile
-            .categories
-            .map { categorie in
-                let section: AnalyticsCategory = AnalyticsCategory(id: categorie.id)
+        tagFile.categories.forEach { categorie in
+            let section: AnalyticsCategory = AnalyticsCategory(id: categorie.id)
             
-                if let screens = categorie.screens {
-                    section
-                        .definitions
-                        .append(
-                            contentsOf: Self.getTagDefinitionScreen(from: screens)
-                        )
-                }
-
-                if let events = categorie.events {
-                    section
-                        .definitions
-                        .append(
-                        contentsOf: Self.getTagDefinitionEvent(from: events)
-                    )
-                }
-
-                return section
+            if let screens = categorie.screens {
+                section.definitions.append(contentsOf: Self.getTagDefinitionScreen(fromData: screens))
             }
+            
+            if let events = categorie.events {
+                section.definitions.append(contentsOf: Self.getTagDefinitionEvent(fromData: events))
+            }
+            
+            sections.append(section)
+        }
+        
+        return sections
     }
 }

Sources/ToolCore/StringExtensions.swift

@@ -63,7 +63,7 @@ public extension String {
         replacingOccurrences(of: "~", with: "\(FileManager.default.homeDirectoryForCurrentUser.relativePath)")
     }
     
-    func colorComponent() -> (alpha: String, red: String, green: String, blue: String) {
+    func colorComponent()  -> (alpha: String, red: String, green: String, blue: String) {
         var alpha: String = "FF"
         var red: String
         var green: String
@@ -89,19 +89,4 @@ public extension String {
     func uppercasedFirst() -> String {
         prefix(1).uppercased() + dropFirst()
     }
-
-    func replacingFirstOccurrence(of: String, with: String) -> Self {
-        if let range = self.range(of: of) {
-            let tmp = self.replacingOccurrences(
-                of: of,
-                with: with,
-                options: .literal,
-                range: range
-            )
-
-            return tmp
-        }
-
-        return self
-    }
 }

Tests/ResgenSwiftTests/Analytics/AnalyticsGeneratorTests.swift

@@ -51,7 +51,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
         ]
         
         // When
-        AnalyticsGenerator.targets = [TrackerType.firebase]
+        AnalyticsGenerator.targets = [Analytics.TargetType.firebase]
         let extensionContent = AnalyticsGenerator.getExtensionContent(sections: [sectionOne, sectionTwo, sectionThree],
                                                                  tags: ["ios", "iosonly"],
                                                                  staticVar: false,
@@ -216,7 +216,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
         ]
         
         // When
-        AnalyticsGenerator.targets = [TrackerType.matomo]
+        AnalyticsGenerator.targets = [Analytics.TargetType.matomo]
         let extensionContent = AnalyticsGenerator.getExtensionContent(sections: [sectionOne, sectionTwo, sectionThree],
                                                                  tags: ["ios", "iosonly"],
                                                                  staticVar: false,
@@ -409,7 +409,7 @@ final class AnalyticsGeneratorTests: XCTestCase {
         ]
         
         // When
-        AnalyticsGenerator.targets = [TrackerType.matomo, TrackerType.firebase]
+        AnalyticsGenerator.targets = [Analytics.TargetType.matomo, Analytics.TargetType.firebase]
         let extensionContent = AnalyticsGenerator.getExtensionContent(sections: [sectionOne, sectionTwo, sectionThree],
                                                                  tags: ["ios", "iosonly"],
                                                                  staticVar: false,

Tests/ResgenSwiftTests/Analytics/DiffString.swift

@@ -1,5 +1,5 @@
 //
-//  DiffString.swift
+//  File.swift
 //  
 //
 //  Created by Loris Perret on 06/12/2023.
@@ -7,6 +7,7 @@
 
 import Foundation
 
+
 /// Find first differing character between two strings
 ///
 /// :param: s1 First String