From e87f94469a81b80665f2f9abdd23cbb3b19c0fdf Mon Sep 17 00:00:00 2001 From: Pierre Ricadat Date: Sun, 2 Jun 2024 10:04:49 +0900 Subject: [PATCH] Revert "Delete deprecated rendering class (#2261)" This reverts commit 8b0305f0945b05a867fcfc076d43c2da60fe2f80. --- build.sbt | 5 +-- core/src/main/scala/caliban/Rendering.scala | 38 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 4 deletions(-) create mode 100644 core/src/main/scala/caliban/Rendering.scala diff --git a/build.sbt b/build.sbt index 3974a10414..67be987f40 100644 --- a/build.sbt +++ b/build.sbt @@ -774,10 +774,7 @@ lazy val enableMimaSettingsJVM = Def.settings( mimaFailOnProblem := enforceMimaCompatibility, mimaPreviousArtifacts := previousStableVersion.value.map(organization.value %% moduleName.value % _).toSet, - mimaBinaryIssueFilters ++= Seq( - ProblemFilters.exclude[MissingClassProblem]("caliban.Rendering"), - ProblemFilters.exclude[MissingClassProblem]("caliban.Rendering$") - ) + mimaBinaryIssueFilters ++= Seq() ) lazy val enableMimaSettingsJS = diff --git a/core/src/main/scala/caliban/Rendering.scala b/core/src/main/scala/caliban/Rendering.scala new file mode 100644 index 0000000000..741d7e9aab --- /dev/null +++ b/core/src/main/scala/caliban/Rendering.scala @@ -0,0 +1,38 @@ +package caliban + +import caliban.introspection.adt._ +import caliban.introspection.adt.__TypeKind._ +import caliban.parsing.adt.Directive +import caliban.rendering.DocumentRenderer + +@deprecated("Prefer the methods in caliban.rendering.DocumentRenderer instead.", "2.3.1") +object Rendering { + + /** + * Returns a string that renders the provided types into the GraphQL format. + */ + @deprecated("Prefer DocumentRenderer.render() to render a Document.", "2.3.1") + def renderTypes(types: List[__Type]): String = + DocumentRenderer.typesRenderer.render(types.sorted(typeOrdering)) + + @deprecated("Prefer DocumentRenderer.directivesRenderer.render instead", "2.3.1") + def renderSchemaDirectives(directives: List[Directive]): String = + DocumentRenderer.directivesRenderer.render(directives) + + @deprecated("Prefer DocumentRenderer.directiveDefinitionsRenderer.render instead", "2.3.1") + def renderDirectives(directives: List[__Directive]): String = + DocumentRenderer.directiveDefinitionsRenderer.render(directives.map(_.toDirectiveDefinition)) + + @deprecated("Prefer DocumentRenderer.isBuiltinScalar instead", "2.3.1") + private[caliban] def isBuiltinScalar(name: String): Boolean = + DocumentRenderer.isBuiltinScalar(name) + + @deprecated("Prefer DocumentRenderer.descriptionRenderer instead", "2.3.1") + private[caliban] def renderDescription(description: Option[String], newline: Boolean = true): String = + if (newline) DocumentRenderer.descriptionRenderer.render(description) + else DocumentRenderer.descriptionRenderer.renderCompact(description) + + @deprecated("Prefer DocumentRenderer.renderTypeName instead", "2.3.1") + private[caliban] def renderTypeName(fieldType: __Type): String = + DocumentRenderer.renderTypeName(fieldType) +}