fix: Typename collisions in generated test mocks (#2762)

apollographql · Jan 9, 2023 · 923d4cc · 923d4cc
1 parent e8f30b7
commit 923d4cc
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 48 deletions.
diff --git a/Sources/ApolloCodegenLib/Templates/RenderingHelpers/GraphQLType+Rendered.swift b/Sources/ApolloCodegenLib/Templates/RenderingHelpers/GraphQLType+Rendered.swift
@@ -59,46 +59,12 @@ extension GraphQLType {
     replacingNamedTypeWith newTypeName: String? = nil,
     config: ApolloCodegenConfiguration
   ) -> String {
-
-    lazy var schemaModuleName: String = {
-      !config.output.schemaTypes.isInModule ? "\(config.schemaName.firstUppercased)." : ""
-    }()
-
-    switch self {
-    case let .entity(type as GraphQLNamedType), let .inputObject(type as GraphQLNamedType):
-      let typeName = newTypeName ?? type.testMockFieldTypeName.firstUppercased
-      return TemplateString("\(typeName)\(if: !containedInNonNull, "?")").description
-
-    case let .scalar(type):
-      let typeName = newTypeName ?? type.swiftName.firstUppercased
-
-      return TemplateString(
-        "\(if: !type.isSwiftType, "\(schemaModuleName)")\(typeName)\(if: !containedInNonNull, "?")"
-      ).description
-
-    case let .enum(type as GraphQLNamedType):
-      let typeName = newTypeName ?? type.name.firstUppercased
-      let enumType = "GraphQLEnum<\(schemaModuleName)\(typeName)>"
-
-      return containedInNonNull ? enumType : "\(enumType)?"
-
-    case let .nonNull(ofType):
-      return ofType.renderedAsTestMockField(
-        containedInNonNull: true,
-        replacingNamedTypeWith: newTypeName,
-        config: config
-      )
-
-    case let .list(ofType):
-      let rendered = ofType.renderedAsTestMockField(
-        containedInNonNull: false,
-        replacingNamedTypeWith: newTypeName,
-        config: config
-      )
-      let inner = "[\(rendered)]"
-
-      return containedInNonNull ? inner : "\(inner)?"
-    }
+    renderType(
+      in: .testMockField(),
+      containedInNonNull: containedInNonNull,
+      replacingNamedTypeWith: newTypeName,
+      config: config
+    )
   }
 
   // MARK: Input Value
@@ -183,9 +149,16 @@ extension GraphQLNamedType {
     replacingNamedTypeWith newTypeName: String? = nil,
     config: ApolloCodegenConfiguration
   ) -> String {
-    lazy var typeName = { newTypeName ?? self.swiftName.firstUppercased }()
 
-    lazy var schemaModuleName: String = {
+    let typeName: String = {
+      if case .testMockField = context {
+        return newTypeName ?? testMockFieldTypeName.firstUppercased
+      } else {
+        return newTypeName ?? self.swiftName.firstUppercased
+      }
+    }()
+
+    let schemaModuleName: String = {
       switch self {
       case is GraphQLCompositeType:
         return ""
@@ -195,14 +168,14 @@ extension GraphQLNamedType {
 
       default:
         switch context {
-        case .testMockField, .inputValue:
+        case .inputValue:
           if !config.output.operations.isInModule {
             fallthrough
           } else {
             return ""
           }
 
-        case .selectionSetField:
+        case .selectionSetField, .testMockField:
           return "\(config.schemaName.firstUppercased)."
         }
       }

diff --git a/Tests/ApolloCodegenTests/CodeGeneration/Templates/MockObjectTemplateTests.swift b/Tests/ApolloCodegenTests/CodeGeneration/Templates/MockObjectTemplateTests.swift
@@ -170,7 +170,7 @@ class MockObjectTemplateTests: XCTestCase {
 
     let expected = """
       public struct MockFields {
-        @Field<CustomScalar>("customScalar") public var customScalar
+        @Field<TestSchema.CustomScalar>("customScalar") public var customScalar
         @Field<Cat>("object") public var object
         @Field<[Cat]>("objectList") public var objectList
         @Field<[[Cat]]>("objectNestedList") public var objectNestedList
@@ -207,8 +207,8 @@ class MockObjectTemplateTests: XCTestCase {
 
     let expected = """
       public struct MockFields {
-        @Field<CustomScalar>("customScalar") public var customScalar
-        @Field<GraphQLEnum<EnumType>>("enumType") public var enumType
+        @Field<TestSchema.CustomScalar>("customScalar") public var customScalar
+        @Field<GraphQLEnum<TestSchema.EnumType>>("enumType") public var enumType
         @Field<Cat>("object") public var object
       }
     """
@@ -467,6 +467,7 @@ class MockObjectTemplateTests: XCTestCase {
       "unionList": .mock("unionList", type: .list(.nonNull(Pet))),
       "unionNestedList": .mock("unionNestedList", type: .list(.nonNull(.list(.nonNull(Pet))))),
       "unionOptionalList": .mock("unionOptionalList", type: .list(Pet)),
+      "enumType": .mock("enumType", type: .enum(.mock(name: "enumType"))),
     ]
 
     ir.fieldCollector.add(
@@ -481,7 +482,8 @@ class MockObjectTemplateTests: XCTestCase {
 
     public extension Mock where O == Dog {
       convenience init(
-        customScalar: CustomScalar? = nil,
+        customScalar: TestSchema.CustomScalar? = nil,
+        enumType: GraphQLEnum<TestSchema.EnumType>? = nil,
         interface: AnyMock? = nil,
         interfaceList: [AnyMock]? = nil,
         interfaceNestedList: [[AnyMock]]? = nil,
@@ -499,6 +501,7 @@ class MockObjectTemplateTests: XCTestCase {
       ) {
         self.init()
         self.customScalar = customScalar
+        self.enumType = enumType
         self.interface = interface
         self.interfaceList = interfaceList
         self.interfaceNestedList = interfaceNestedList