-
Notifications
You must be signed in to change notification settings - Fork 651
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow mapping scalars to simple generic types (#6158)
* Allow mapping scalars to simple generic types * Automatically prefix a few common Kotlin and Java types with their package names
- Loading branch information
Showing
21 changed files
with
615 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...piler/src/main/kotlin/com/apollographql/apollo/compiler/codegen/java/helpers/bestGuess.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package com.apollographql.apollo.compiler.codegen.java.helpers | ||
|
|
||
| import com.squareup.javapoet.ClassName | ||
| import com.squareup.javapoet.ParameterizedTypeName | ||
| import com.squareup.javapoet.TypeName | ||
|
|
||
| /** | ||
| * Best guess a type name. Handles simple generics like `Map<String, Integer>`, but no variance or wildcards. | ||
| */ | ||
| internal fun bestGuess(name: String): TypeName? { | ||
| val className = ClassName.bestGuess(name.substringBefore('<').withPackage()) | ||
| val typeArgs = name.substringAfter('<', "").substringBefore('>', "") | ||
| .split(',') | ||
| .filterNot { it.isEmpty() } | ||
| .map { it.trim() } | ||
| return if (typeArgs.isEmpty()) { | ||
| className | ||
| } else { | ||
| ParameterizedTypeName.get(className, *typeArgs.map { bestGuess(it) }.toTypedArray()) | ||
| } | ||
| } | ||
|
|
||
| private fun String.withPackage(): String { | ||
| return if (this in commonJavaTypes) { | ||
| "java.lang.${this}" | ||
| } else if (this in commonJavaCollectionsTypes) { | ||
| "java.util.${this}" | ||
| } else { | ||
| this | ||
| } | ||
| } | ||
|
|
||
| private val commonJavaTypes = setOf( | ||
| "Boolean", | ||
| "Byte", | ||
| "Character", | ||
| "Double", | ||
| "Float", | ||
| "Integer", | ||
| "Iterable", | ||
| "Long", | ||
| "Short", | ||
| "String", | ||
| ) | ||
|
|
||
| private val commonJavaCollectionsTypes = setOf( | ||
| "Collection", | ||
| "List", | ||
| "Map", | ||
| "Set", | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
63 changes: 63 additions & 0 deletions
63
...ler/src/main/kotlin/com/apollographql/apollo/compiler/codegen/kotlin/helpers/bestGuess.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,63 @@ | ||
| package com.apollographql.apollo.compiler.codegen.kotlin.helpers | ||
|
|
||
| import com.squareup.kotlinpoet.ClassName | ||
| import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy | ||
| import com.squareup.kotlinpoet.TypeName | ||
|
|
||
| /** | ||
| * Best guess a type name. Handles simple generics like `Map<String, Int?>`, but no variance or wildcards. | ||
| * Common types such as `String`, `List`, `Map` are automatically prefixed with `kotlin.` or `kotlin.collections.`. | ||
| */ | ||
| internal fun bestGuess(name: String): TypeName { | ||
| val isNullable = name.endsWith('?') | ||
| val className = ClassName.bestGuess(name.substringBeforeLast('?').substringBefore('<').withPackage()) | ||
| val typeArgs = name.substringAfter('<', "").substringBefore('>', "") | ||
| .split(',') | ||
| .filterNot { it.isEmpty() } | ||
| .map { it.trim() } | ||
| return if (typeArgs.isEmpty()) { | ||
| className | ||
| } else { | ||
| className.parameterizedBy(typeArgs.map { bestGuess(it) }) | ||
| } | ||
| .copy(nullable = isNullable) | ||
| } | ||
|
|
||
| private fun String.withPackage(): String { | ||
| return if (this in commonKotlinTypes) { | ||
| "kotlin.${this}" | ||
| } else if (this in commonKotlinCollectionsTypes) { | ||
| "kotlin.collections.${this}" | ||
| } else { | ||
| this | ||
| } | ||
| } | ||
|
|
||
| private val commonKotlinTypes = setOf( | ||
| "Any", | ||
| "Boolean", | ||
| "Byte", | ||
| "Char", | ||
| "CharSequence", | ||
| "Double", | ||
| "Float", | ||
| "Int", | ||
| "Long", | ||
| "Number", | ||
| "Short", | ||
| "String", | ||
| "UByte", | ||
| "UInt", | ||
| "ULong", | ||
| "Unit", | ||
| "UShort", | ||
| ) | ||
|
|
||
| private val commonKotlinCollectionsTypes = setOf( | ||
| "Array", | ||
| "Collection", | ||
| "Iterable", | ||
| "List", | ||
| "Map", | ||
| "Set", | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,7 @@ query TestQuery { | |
| links | ||
| } | ||
| } | ||
|
|
||
| query ScalarWithGenericType { | ||
| listOfString | ||
| } | ||
Oops, something went wrong.