Skip to content

Commit

Permalink
use fully-qualified name for Vector in generated code (#1254)
Browse files Browse the repository at this point in the history
This is to avoid name-clashes with types from the graphql schema, i.e.,
if a type is called Vector.

Example:
enum ImageType {
  Raster
  Vector
}
  • Loading branch information
cornerman committed Jan 12, 2022
1 parent 55dab61 commit f2f2fd1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/src/main/scala/caliban/tools/ClientWriter.scala
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ object ClientWriter {
${encoderCases.mkString("\n")}
}

val values: Vector[$enumName] = Vector(${typedef.enumValuesDefinition
val values: scala.collection.immutable.Vector[$enumName] = scala.collection.immutable.Vector(${typedef.enumValuesDefinition
.map(v => safeEnumValue(v.enumValue))
.mkString(", ")})
}
Expand Down
9 changes: 5 additions & 4 deletions tools/src/test/scala/caliban/tools/ClientWriterSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ object Client {
case Origin.BELT => __EnumValue("BELT")
}
val values: Vector[Origin] = Vector(EARTH, MARS, BELT)
val values: scala.collection.immutable.Vector[Origin] = scala.collection.immutable.Vector(EARTH, MARS, BELT)
}
}
Expand Down Expand Up @@ -311,7 +311,7 @@ object Client {
case Origin.BELT => __EnumValue("BELT")
}
val values: Vector[Origin] = Vector(EARTH, MARS, BELT)
val values: scala.collection.immutable.Vector[Origin] = scala.collection.immutable.Vector(EARTH, MARS, BELT)
}
final case class Routes(origin: Origin, destinations: List[com.example.Destination] = Nil)
Expand Down Expand Up @@ -373,7 +373,7 @@ object Client {
case Origin.__Unknown(value) => __EnumValue(value)
}
val values: Vector[Origin] = Vector(EARTH, MARS, BELT)
val values: scala.collection.immutable.Vector[Origin] = scala.collection.immutable.Vector(EARTH, MARS, BELT)
}
}
Expand Down Expand Up @@ -684,7 +684,8 @@ object Client {
case Episode.jedi_1 => __EnumValue("jedi")
}
val values: Vector[Episode] = Vector(NEWHOPE, EMPIRE, JEDI, jedi_1)
val values: scala.collection.immutable.Vector[Episode] =
scala.collection.immutable.Vector(NEWHOPE, EMPIRE, JEDI, jedi_1)
}
}
Expand Down

0 comments on commit f2f2fd1

Please sign in to comment.