fix: Edit for NSObject in Firebase

SampleFiles/Tags/Generated/Analytics+GenAllScript.swift

@@ -81,7 +81,7 @@ class MatomoAnalyticsManager: AnalyticsManagerProtocol {
 class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
     func logScreen(name: String, path: String) {
         var parameters = [
-            AnalyticsParameterScreenName: name
+            AnalyticsParameterScreenName: name as NSObject
         ]
 
         Analytics.logEvent(
@@ -96,19 +96,25 @@ class FirebaseAnalyticsManager: AnalyticsManagerProtocol {
         category: String,
         params: [String: Any]?
     ) {
-        var parameters: [String:Any] = [
-            "action": action,
-            "category": category,
+        var parameters: [String:NSObject] = [
+            "action": action as NSObject,
+            "category": category as NSObject,
         ]
         
         if let supplementaryParameters = params {
-            parameters.merge(supplementaryParameters) { (origin, new) -> Any in
-                return origin
+            for (newKey, newValue) in supplementaryParameters {
+                if parameters.contains(where: { (key: String, value: NSObject) in
+                    key == newKey
+                }) {
+                    continue
+                }
+                
+                parameters[newKey] = newValue as? NSObject
             }
         }
         
         Analytics.logEvent(
-            name,
+            name.replacingOccurrences(of: [" "], with: "_"),
             parameters: parameters
         )
     }

SampleFiles/genAllRessources.sh

@@ -52,19 +52,19 @@ FORCE_FLAG="$1"
 
 #echo "\n-------------------------\n"
 
-## Analytics
-#swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \
-# --target "matomo firebase" \
-# --extension-output-path "./Tags/Generated" \
-# --extension-name "Analytics" \
-# --extension-suffix "GenAllScript"
+# Analytics
+swift run -c release ResgenSwift analytics $FORCE_FLAG "./Tags/sampleTags.yml" \
+ --target "matomo firebase" \
+ --extension-output-path "./Tags/Generated" \
+ --extension-name "Analytics" \
+ --extension-suffix "GenAllScript"
 
 #echo "\n-------------------------\n"
 #
-# Images
-swift run -c release ResgenSwift images $FORCE_FLAG "./Images/sampleImages.txt" \
- --xcassets-path "./Images/imagium.xcassets" \
- --extension-output-path "./Images/Generated" \
- --extension-name "ImageYolo" \
- --extension-name-ui-kit "UIImageYolo" \
- --extension-suffix "GenAllScript"
+## Images
+#swift run -c release ResgenSwift images $FORCE_FLAG "./Images/sampleImages.txt" \
+# --xcassets-path "./Images/imagium.xcassets" \
+# --extension-output-path "./Images/Generated" \
+# --extension-name "ImageYolo" \
+# --extension-name-ui-kit "UIImageYolo" \
+# --extension-suffix "GenAllScript"

Sources/ResgenSwift/Analytics/Generator/FirebaseGenerator.swift

@@ -33,7 +33,7 @@ enum FirebaseGenerator {
         """
             func logScreen(name: String, path: String) {
                 var parameters = [
-                    AnalyticsParameterScreenName: name
+                    AnalyticsParameterScreenName: name as NSObject
                 ]
         
                 Analytics.logEvent(
@@ -53,19 +53,25 @@ enum FirebaseGenerator {
                 category: String,
                 params: [String: Any]?
             ) {
-                var parameters: [String:Any] = [
-                    "action": action,
-                    "category": category,
+                var parameters: [String:NSObject] = [
+                    "action": action as NSObject,
+                    "category": category as NSObject,
                 ]
                 
                 if let supplementaryParameters = params {
-                    parameters.merge(supplementaryParameters) { (origin, new) -> Any in
-                        return origin
+                    for (newKey, newValue) in supplementaryParameters {
+                        if parameters.contains(where: { (key: String, value: NSObject) in
+                            key == newKey
+                        }) {
+                            continue
+                        }
+                        
+                        parameters[newKey] = newValue as? NSObject
                     }
                 }
                 
                 Analytics.logEvent(
-                    name,
+                    name.replacingOccurrences(of: [" "], with: "_"),
                     parameters: parameters
                 )
             }