Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/helpers/input-type-has-matching-output-type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,12 @@ function typesAreEquivalent(
): boolean {
const typeNode = schema.getType(typeName);
const inputNode = schema.getType(inputName);
if (!typeNode?.astNode && !inputNode?.astNode) {

if (
!isObjectType(typeNode) &&
!isInputObjectType(inputNode) &&
typeNode?.astNode?.kind === inputNode?.astNode?.kind
) {
return true;
}
if (
Expand Down
22 changes: 22 additions & 0 deletions test/unit/should_consolidate_input_and_output_types/expected.kt
Original file line number Diff line number Diff line change
Expand Up @@ -106,3 +106,25 @@ data class MySuperSetTypeInput(
val field2: String? = null,
val field3: Int? = null
)

data class MyTypeWithEnums(
val field1: List<Enum1>? = null,
val field2: List<Enum2>? = null
)

enum class Enum1 {
This,
That;

companion object {
fun findByName(name: String, ignoreCase: Boolean = false): Enum1? = values().find { it.name.equals(name, ignoreCase = ignoreCase) }
}
}

enum class Enum2 {
The_Other;

companion object {
fun findByName(name: String, ignoreCase: Boolean = false): Enum2? = values().find { it.name.equals(name, ignoreCase = ignoreCase) }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,22 @@ input MySuperSetTypeInput {
field2: String
field3: Int
}

type MyTypeWithEnums {
field1: [Enum1!]
field2: [Enum2!]
}

input MyTypeWithEnumsInput {
field1: [Enum1!]
field2: [Enum2!]
}

enum Enum1 {
THIS
THAT
}

enum Enum2 {
THE_OTHER
}