Fix @Attribute type inference for optional properties

Author: colemancda

Sources/CoreModelMacros/Attribute.swift

@@ -21,3 +21,22 @@ public struct AttributeMacro: PeerMacro {
         return []
     }
 }
+
+internal func inferAttributeType(from type: String) -> String? {
+    switch type {
+        case "String": return ".string"
+        case "Data": return ".data"
+        case "Bool": return ".bool"
+        case "Int16": return ".int16"
+        case "Int32": return ".int32"
+        case "Int64": return ".int64"
+        case "Int": return ".int64"
+        case "Float": return ".float"
+        case "Double": return ".double"
+        case "Date": return ".date"
+        case "UUID": return ".uuid"
+        case "URL": return ".url"
+        case "Decimal": return ".decimal"
+        default: return nil
+    }
+}

Sources/CoreModelMacros/Entity.swift

@@ -106,41 +106,23 @@ extension EntityMacro {
 
             let attributes = varDecl.attributes
 
-            let typeName = typeSyntax.description.trimmingCharacters(in: .whitespacesAndNewlines)
+            let rawTypeName = typeSyntax.description.trimmingCharacters(in: .whitespacesAndNewlines)
 
-            let inferredType: String?
-
-            switch typeName {
-            case "String":
-                inferredType = ".string"
-            case "Data":
-                inferredType = ".data"
-            case "Bool":
-                inferredType = ".bool"
-            case "Int16":
-                inferredType = ".int16"
-            case "Int32":
-                inferredType = ".int32"
-            case "Int64":
-                inferredType = ".int64"
-            case "Int":
-                inferredType = ".int64"
-            case "Float":
-                inferredType = ".float"
-            case "Double":
-                inferredType = ".double"
-            case "Date":
-                inferredType = ".date"
-            case "UUID":
-                inferredType = ".uuid"
-            case "URL":
-                inferredType = ".url"
-            case "Decimal":
-                inferredType = ".decimal"
-            default:
-                inferredType = nil
+            // Strip Optional
+            let typeName: String
+            if rawTypeName.hasPrefix("Optional<") {
+                typeName = rawTypeName
+                    .replacingOccurrences(of: "Optional<", with: "")
+                    .dropLast()
+                    .trimmingCharacters(in: .whitespacesAndNewlines)
+            } else if rawTypeName.hasSuffix("?") {
+                typeName = String(rawTypeName.dropLast()).trimmingCharacters(in: .whitespacesAndNewlines)
+            } else {
+                typeName = rawTypeName
             }
 
+            let inferredType = inferAttributeType(from: typeName)
+            
             for attr in attributes.compactMap({ $0.as(AttributeSyntax.self) }) {
                 if attr.attributeName.description == "Attribute" {
                     let type: String