Fix Swift codegen: optional chaining, reserved keywords, redundant public

lib/evva/swift_generator.rb

@@ -11,6 +11,7 @@ class SwiftGenerator
     TAB_SIZE = "    " # \t -> 4 spaces
 
     NATIVE_TYPES = %w[Int String Double Float Bool Date].freeze
+    SWIFT_KEYWORDS = %w[default].freeze
 
     def initialize(swift_public: false)
       @swift_public_modifier = swift_public ? "public " : ""
@@ -64,6 +65,7 @@ def people_properties(people_bundle, _file_name, _enums_file_name, _destinations
             property_name: p.property_name,
             type: type,
             is_special_property: special_property?(type),
+            is_optional: type.end_with?("?"),
             destinations: p.destinations.map { |p| camelize(p) },
           }
         end
@@ -136,6 +138,7 @@ def camelize(term)
       string = string.sub(/^(?:#{@acronym_regex}(?=\b|[A-Z_])|\w)/) { |match| match.downcase }
       string.gsub!(/(?:_|(\/))([a-z\d]*)/i) { "#{$1}#{$2.capitalize}" }
       string.gsub!("/".freeze, "::".freeze)
+      string = "`#{string}`" if SWIFT_KEYWORDS.include?(string)
       string
     end
   end

lib/evva/templates/swift/destinations.swift

@@ -1,4 +1,4 @@
-<%= @swift_public_modifier %>enum Destination {
+enum Destination {
 	<%- destinations.each do |d| -%>
 	case <%= d %>
 	<%- end -%>

lib/evva/templates/swift/people_properties.swift

@@ -40,7 +40,7 @@ enum Property {
 		<%- properties.each_with_index do |p, index| -%>
 		case let .<%= p[:case_name] %>(value):
 			return PropertyData(type: .<%= p[:case_name] %>,
-								value: value<% if p[:is_special_property] %>.rawValue<% end %>)
+								value: value<% if p[:is_special_property] %><%= "?" if p[:is_optional] %>.rawValue<% end %>)
 			<%- unless index == properties.count - 1 -%>
 
 			<%- end -%>

spec/lib/evva/swift_generator_spec.rb

@@ -113,6 +113,7 @@
     let(:enums) { [
       Evva::AnalyticsEnum.new("CourseProfileSource", ["course_discovery", "synced_courses"]),
       Evva::AnalyticsEnum.new("PremiumFrom", ["Course Profile", "Round Setup"]),
+      Evva::AnalyticsEnum.new("PreAuthenticationScreenType", ["default", "self_improvement"]),
     ] }
 
     let(:expected) {
@@ -131,6 +132,11 @@
         case courseProfile = "Course Profile"
         case roundSetup = "Round Setup"
     }
+
+    enum PreAuthenticationScreenType: String {
+        case `default` = "default"
+        case selfImprovement = "self_improvement"
+    }
 }
 Swift
     }
@@ -144,6 +150,7 @@
     let(:people_bundle) { [
       Evva::AnalyticsProperty.new("rounds_with_wear", "String", ["firebase"]),
       Evva::AnalyticsProperty.new("wear_platform", "WearableAppPlatform", ["firebase", "custom destination"]),
+      Evva::AnalyticsProperty.new("reverse_trial_type", "ReverseTrialType?", ["firebase"]),
       Evva::AnalyticsProperty.new("number_of_times_it_happened", "Long", []),
     ] }
 
@@ -173,6 +180,7 @@
     enum PropertyType: String {
         case roundsWithWear = "rounds_with_wear"
         case wearPlatform = "wear_platform"
+        case reverseTrialType = "reverse_trial_type"
         case numberOfTimesItHappened = "number_of_times_it_happened"
 
         var name: String { return rawValue }
@@ -181,6 +189,7 @@
             switch self {
             case .roundsWithWear: return [.firebase]
             case .wearPlatform: return [.firebase, .customDestination]
+            case .reverseTrialType: return [.firebase]
             case .numberOfTimesItHappened: return []
             }
         }
@@ -189,6 +198,7 @@
     enum Property {
         case roundsWithWear(String)
         case wearPlatform(WearableAppPlatform)
+        case reverseTrialType(ReverseTrialType?)
         case numberOfTimesItHappened(Int)
 
         var data: PropertyData {
@@ -201,6 +211,10 @@
                 return PropertyData(type: .wearPlatform,
                                     value: value.rawValue)
 
+            case let .reverseTrialType(value):
+                return PropertyData(type: .reverseTrialType,
+                                    value: value?.rawValue)
+
             case let .numberOfTimesItHappened(value):
                 return PropertyData(type: .numberOfTimesItHappened,
                                     value: value)
@@ -249,7 +263,7 @@
 import Foundation
 
 public extension Analytics {
-    public enum Destination {
+    enum Destination {
         case firebase
         case whateverYouWantReally
     }