feat(OPTR-37950): add string/int decoding resilience (#17)

Author: ToineHulshof

tools/EVA.SDK.Generator.V2/Commands/Generate/Outputs/swift/Resources/Mocks.swift

@@ -87,7 +87,6 @@ extension Dictionary where Value == ProductDetailsWrapper {
     }
 }
 
-
 struct ProductDetails: Codable {}
 
 public enum Maybe<Wrapped> {
@@ -105,4 +104,47 @@ extension Maybe: ExpressibleByNilLiteral {
     public init(nilLiteral: ()) {
         self = .null
     }
-}
+}
+
+protocol Wrapper {
+    associatedtype Unwrapped
+    var unwrapped: Unwrapped { get }
+}
+
+struct StringWrapper: Codable, Hashable, Wrapper {
+    var unwrapped: String
+}
+
+struct IntWrapper: Codable, Hashable, Wrapper {
+    var unwrapped: Int
+}
+
+extension Array: Wrapper where Element: Wrapper {
+    var unwrapped: [Element.Unwrapped] {
+        []
+    }
+}
+
+extension Maybe: Wrapper where Wrapped: Wrapper {
+    var unwrapped: Maybe<Wrapped.Unwrapped> {
+        .null
+    }
+}
+
+extension Dictionary: Wrapper where Value: Wrapper {
+    var unwrapped: [Key: Value.Unwrapped] {
+        [:]
+    }
+}
+
+extension EVACorePageConfig: Wrapper where T: Wrapper {
+    var unwrapped: EVACorePageConfig<T.Unwrapped> {
+        .init(Filter: Filter?.unwrapped, Limit: Limit, SortDirection: SortDirection, SortProperty: SortProperty, Start: Start)
+    }
+}
+
+extension EVACorePageTokenConfig: Wrapper where T: Wrapper {
+    var unwrapped: EVACorePageTokenConfig<T.Unwrapped> {
+        .init(Filter: Filter?.unwrapped, Limit: Limit)
+    }
+}

tools/EVA.SDK.Generator.V2/Commands/Generate/Outputs/swift/SwiftOutput.cs

@@ -2,6 +2,7 @@
 using EVA.SDK.Generator.V2.Commands.Generate.Transforms;
 using EVA.SDK.Generator.V2.Helpers;
 using Microsoft.Extensions.Logging;
+using System.Text.RegularExpressions;
 
 namespace EVA.SDK.Generator.V2.Commands.Generate.Outputs.swift;
 
@@ -457,15 +458,33 @@ private static void WriteDecodeInit(TypeSpecification type, IndentedStringBuilde
         {
           var typeName = GetPropTypeName(value, key, typeContext, ctx);
           var typeNameNotNullable = GetPropTypeName(value, key, typeContext, ctx, true);
-          typeNameNotNullable = typeNameNotNullable.Replace("ProductDetails", "ProductDetailsWrapper");
-          typeName = typeName.Replace("ProductDetails", "ProductDetailsWrapper");
 
-          var containsProductDetails = typeNameNotNullable.Contains("ProductDetails");
+          var postfix = string.Empty;
+          var containsProductDetails = false;
+          var isOptional = value.Type.Nullable || value.Deprecated != null || value.Skippable;
+
+          foreach (var t in new string[] { "ProductDetails", "String", "Int" })
+          {
+            var before = typeNameNotNullable;
+            typeNameNotNullable = Regex.Replace(typeNameNotNullable, $@"\b{t}\b",$"{t}Wrapper");
+            typeName = Regex.Replace(typeName, $@"\b{t}\b",$"{t}Wrapper");
+            typeNameNotNullable = Regex.Replace(typeNameNotNullable, $"{t}Wrapper:",$"{t}:");
+            typeName = Regex.Replace(typeName, $"{t}Wrapper:",$"{t}:");
+
+            if (before != typeNameNotNullable)
+            {
+              if (t == "ProductDetails")
+              {
+                containsProductDetails = true;
+              }
+              var property = t == "ProductDetails" ? "productDetails" : "unwrapped";
+              postfix = (isOptional ? "?" : "") + "." + property;
+            }
+          }
+
           // Check if we have a conflicting property defined that will "claim" our typename
           // This is usually the case for props name Date or Data
           var typePrefix = (type.Properties.ContainsKey(typeNameNotNullable) && !containsProductDetails) ? "Foundation." : string.Empty;
-          var isOptional = value.Type.Nullable || value.Deprecated != null || value.Skippable;
-          var postfix = containsProductDetails ? ((isOptional ? "?" : "") + ".productDetails") : string.Empty;
 
           if (isOptional)
           {
@@ -582,6 +601,8 @@ private static void WriteNonFlagsEnum(TypeSpecification type, string typename, I
           output.WriteLine("default: self = .undocumented(codingKey.intValue ?? -1, codingKey.stringValue)");
         }
       }
+
+      WriteIntRawValueInit(output);
     }
 
     output.WriteLine("}");
@@ -608,11 +629,25 @@ private static void WriteFlagsEnum(TypeSpecification type, string typename, Inde
         if (value == 0) continue;
         output.WriteLine($"public static let {name} = {typename}(rawValue: {value})");
       }
+
+      WriteIntRawValueInit(output);
     }
 
     output.WriteLine("}");
   }
 
+  private static void WriteIntRawValueInit(IndentedStringBuilder output)
+  {
+      output.WriteLine();
+      output.WriteLine("public init(from decoder: any Decoder) throws");
+      using (output.BracedIndentation)
+      {
+        output.WriteLine("let container = try decoder.singleValueContainer()");
+        output.WriteLine("let rawValue = try container.decode(IntWrapper.self).unwrapped");
+        output.WriteLine("self.init(rawValue: rawValue)");
+      }
+  }
+
   private static string GetPropTypeName(PropertySpecification ps, string name, string? typeContext, OutputContext<SwiftOptions> ctx, bool forceNotNullable = false, bool forceNullable = false)
   {
     var n = OptionalSuffix(ps.Type, forceNotNullable, forceNullable, ps.Skippable);