use the generated name in all the places.

Author: mattpolzin

Sources/JSONAPISwiftGen/Swift Generators/StructureSwiftGen.swift

@@ -8,10 +8,6 @@
 import Foundation
 import OpenAPIKit
 
-fileprivate let collidingNames = [
-    "Metadata"
-]
-
 /// Given some JSON Schema, attempt to generate Swift code for
 /// a `struct` that is capable of parsing data adhering to the schema.
 public struct StructureSwiftGen: JSONSchemaSwiftGenerator {
@@ -36,7 +32,7 @@ public struct StructureSwiftGen: JSONSchemaSwiftGenerator {
         rootConformances: [String]? = nil
     ) throws {
         let typeName: String
-        if collidingNames.contains(swiftTypeName) {
+        if reservedTypeNames.contains(swiftTypeName) {
             typeName = "Gen" + swiftTypeName
         } else {
             typeName = swiftTypeName
@@ -49,15 +45,15 @@ public struct StructureSwiftGen: JSONSchemaSwiftGenerator {
         case .object(_, let context):
             decls = [
                 try StructureSwiftGen.structure(
-                    named: swiftTypeName,
+                    named: typeName,
                     forObject: context,
                     cascadingConformances: cascadingConformances,
                     rootConformances: rootConformances
                 )
             ]
         case .one(of: let schemas, core: _):
             let poly = try StructureSwiftGen.structure(
-                named: swiftTypeName,
+                named: typeName,
                 forOneOf: schemas,
                 cascadingConformances: cascadingConformances,
                 rootConformances: rootConformances

Sources/JSONAPISwiftGen/SwiftGen.swift

@@ -9,6 +9,14 @@ import Foundation
 import OpenAPIKit
 import JSONAPI
 
+/// A relatively ad-hoc list of names that if used for generated types in the
+/// wrong context could result in code ambiguity.
+internal let reservedTypeNames = [
+    "Metadata",
+    "Attributes",
+    "Relationships"
+]
+
 public protocol SwiftGenerator: SwiftCodeRepresentable {
     var decls: [Decl] { get }
 }