Fix #4: Add code generator #15

jonas · 2018-01-11T11:51:36Z

Ports the Scala code generator from sangria-codegen.

Refs #4

jonas · 2018-01-11T12:17:29Z

I didn't check the whether the naming of settings is consistent with the other plugins.

Also Scalameta now is at version 2.0 so an upgrade might be in order. I still think we can get rid of Scalameta if we use another mean of formatting code as it is generated.

muuki88 · 2018-01-11T18:53:17Z

Awesome :)

I would add my changes once cleaned up to this pull request.

I haven't used scala meta until now. Surely we could write our own
generator, but I don't have any detailed experience or opinion what
is more suitable / better maintainable in the long run.

muuki88 · 2018-01-11T18:54:00Z

src/main/scala/rocks/muki/graphql/GraphQLCodegenPlugin.scala

+  object autoImport {
+    val graphqlCodegenSchema = taskKey[File]("GraphQL schema file")
+    val graphqlCodegenQueries = taskKey[Seq[File]]("GraphQL query documents")
+    val graphqlCodegenPackage =


I may change my settings to Codegen instead of CodeGen

muuki88 · 2018-01-11T18:54:11Z

src/main/scala/rocks/muki/graphql/GraphQLCodegenPlugin.scala

+        }
+
+      result match {
+        case Left(error) => sys.error("Failed to generate code: $error")


Interpolation missing.

muuki88 · 2018-01-11T18:55:14Z

src/main/scala/rocks/muki/graphql/GraphQLCodegenPlugin.scala

+    }
+  )
+
+  def parseIntrospectionSchemaFile(schemaFile: File): Result[Schema[_, _]] =


I'll try to refactor these things into one helper. There's already the SchemaLoader which
I would enhance to match both, code and schema generation, use cases.

muuki88 · 2018-01-11T18:56:14Z

src/main/scala/rocks/muki/graphql/codegen/Builder.scala

+    if (document == Builder.emptyDocumentResult)
+      copy(document = validatedQuery)
+    else
+      copy(document = document.flatMap(doc => validatedQuery.map(doc.merge)))


That puzzled me in the beginning a lot 😄
With this we get the "single module" structure in the output, right?

If we would like to build one module per query, we wouldn't need this?

muuki88 · 2018-01-11T18:57:32Z

src/main/scala/rocks/muki/graphql/codegen/ScalaSourceGenerator.scala

+/**
+  * Generate code using Scalameta.
+  */
+case class ScalametaGenerator(moduleName: Term.Name,


We are not adding comments yet to the generated class. In the future we should do that
so users have a proper scaladoc ( if they use graphql comments).

True, let's create a ticket.

Done in #16

muuki88 · 2018-01-11T18:58:40Z

src/sbt-test/codegen/generate-schema-and-code/build.sbt

+
+val StarWarsDir = file(sys.props("codegen.samples.dir")) / "starwars"
+
+val server = project


this example helped me a lot :) thanks

Ports the Scala code generator from sangria-codegen.

the 'file not exist' output is localized, which causes this test to fail on non-english machines.

muuki88 · 2018-01-13T15:58:29Z

Sorry, I rebased instead of merging from master :(

muuki88 · 2018-02-11T18:20:03Z

Next round :) A couple of things

Upgraded to scalameta 2
Renamed a few things for clarity
Added GraphQLQuery trait generation
Added CodeGenStyle for an easier selection of code generation style

jonas · 2018-02-17T17:31:16Z

This PR is getting big. I'll make a review today.

muuki88 · 2018-02-17T18:30:33Z

Indeed 😅
Digging more and more through your code and understanding things deeper. I'm actually close to getting this feature complete and then clean up even more things.

My deepest respect for figuring all this out ☺️

muuki88 · 2018-02-17T18:35:00Z

And I want to incorporate your code generator along with the new "Apollo Style" generator.

jonas · 2018-02-17T20:03:28Z

project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.4
+sbt.version=1.1.0


1.1.1 was recently released

jonas · 2018-02-17T20:26:34Z

src/main/scala/rocks/muki/graphql/GraphQLQueryPlugin.scala

@@ -17,58 +17,67 @@ object GraphQLQueryPlugin extends AutoPlugin {
      */
    val graphqlValidateQueries: TaskKey[Unit] =
      taskKey[Unit]("validate all queries in the graphql source directory")
+
+    val graphqlQueryDirectory: SettingKey[File] =
+      settingKey[File]("graphql files")


The description seems off.

Good point. Will fix that

jonas · 2018-02-17T20:28:17Z

src/main/scala/rocks/muki/graphql/GraphQLQueryPlugin.scala

-      val schema = Schema.buildFromAst(schemaDocument)
+  // TODO separate these into two auto plugins
+  override def projectSettings: Seq[Setting[_]] =
+    pluginSettings(Compile) ++ pluginSettings(IntegrationTest)


What is the goal of the it settings?

I wasn't sure at this point if the query validation is unit or integration test.
Then I decided to add them both, which is probably not the best idea. I'll remove the
integration test settings. I'll do that in #18

jonas · 2018-02-17T20:28:36Z

src/main/scala/rocks/muki/graphql/GraphQLQueryPlugin.scala

-            Nil
+          val schema = Schema.buildFromAst(schemaDocument)
+
+          log.info(s"Checking graphl files in ${graphqlQueryDirectory.value}")


graphl => graphql

jonas · 2018-02-17T20:44:48Z

test-project/project/build.properties

@@ -1 +1 @@
-sbt.version=1.0.2
+sbt.version=1.1.0


Maybe 1.1.1

jonas · 2018-02-17T20:46:02Z

src/main/scala/rocks/muki/graphql/GraphQLCodegenPlugin.scala

 	}

      result match {
-	case Left(error) => sys.error("Failed to generate code: $error")
+	case Left(error) => sys.error(s"Failed to generate code: $error")


jonas · 2018-02-17T20:51:32Z

test-project/build.sbt

+  scalaVersion := "2.12.4",
+  organization := "rocks.muki",
+  libraryDependencies ++= Seq(
+    "org.sangria-graphql" %% "sangria" % "1.3.2",


It might be useful to expose the sangria version used by the plugin for projects that want to keep them in sync?

jonas · 2018-02-17T20:54:17Z

src/sbt-test/codegen/generate/build.sbt

@@ -17,5 +17,6 @@ TaskKey[Unit]("check") := {
    """.stripMargin.trim

  assert(file.exists)
-  assert(IO.read(file).trim == expected)
+  val generated = IO.read(file).trim
+  assert(generated == expected, s"Generated file:\n$generated")


jonas · 2018-02-17T20:54:58Z

build.sbt

@@ -9,7 +9,7 @@ libraryDependencies ++= Seq(
  "io.circe" %% "circe-core" % circeVersion,
  "io.circe" %% "circe-parser" % circeVersion,
  "org.scalaj" %% "scalaj-http" % "2.3.0",
-  "org.scalameta" %% "scalameta" % "1.8.0",
+  "org.scalameta" %% "scalameta" % "2.1.2",


There's now also 3.x version. But I think that can wait.

jonas · 2018-02-17T21:03:19Z

src/main/scala/rocks/muki/graphql/codegen/ScalaSourceGenerator.scala

+/**
+  * Generate code using Scalameta.
+  */
+case class ScalametaGenerator(moduleName: Term.Name,


True, let's create a ticket.

muuki88 · 2018-03-15T12:47:27Z

@jonas what do you think? Should we merge this and continue improving this in smaller commits :)

jonas · 2018-03-15T20:44:02Z

Yes, please, let's merge already. 😀

…

-- Jonas Fonseca On Mar 15, 2018 08:47, "Nepomuk Seiler" <[email protected]> wrote: @jonas <https://github.com/jonas> what do you think? Should we merge this and continue improving this in smaller commits :) — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#15 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAAg4Q-pGbc1gHGLhG64I5PDORf2M5cMks5temLggaJpZM4RauuN> .

jonas · 2018-03-15T21:26:56Z

🎉

muuki88 · 2018-03-15T21:28:11Z

Yeah 🤩🤩

I'll start documenting ASAP.

jonas requested a review from muuki88 January 11, 2018 12:15

muuki88 reviewed Jan 11, 2018

View reviewed changes

jonas and others added 10 commits January 13, 2018 16:45

Fix #4: Add code generator

0e456ad

Ports the Scala code generator from sangria-codegen.

Fix formatting

ca793c9

Language resilient BuilderSpec

411fc4a

the 'file not exist' output is localized, which causes this test to fail on non-english machines.

Upgrade to sbt 1.1.0

42cc93f

Use sbt.IO and SchemaLoader

1f8a6bb

Refactor GraphQLSchemaPlugin into two separate plugins

8b1b1b0

Use newest feature in the test-project

fb71816

fix autocompletion in graphqlSchema parser

0d89b8b

Fix test-project

8e8b4fa

Scalafmt

ab453e9

muuki88 force-pushed the codegen branch from f95dda5 to ab453e9 Compare January 13, 2018 15:57

muuki88 added 5 commits January 13, 2018 17:12

Fix test by replacing tabs

183d31d

Add newline in generated module and add better assertion output

3c69d2a

Remove tabs from rebase

605c8fa

Add new scala source generator

d048164

Add GraphQLQuery trait generation

5043dd9

muuki88 added 2 commits February 17, 2018 18:05

Generate additional types

b1debde

Add test for input types

b1c1b05

jonas commented Feb 17, 2018

View reviewed changes

jonas mentioned this pull request Feb 17, 2018

Include GraphQL schema comments in generated code #16

Open

Add more documentation

0a16ec1

muuki88 added 3 commits March 10, 2018 15:38

Add apollo codegen style test and codegen style setting

0dfda3f

Fix Sangria code generator and scripted tests

9a58936

Scalafmt formatting

0a4730c

muuki88 merged commit 9f55fb9 into master Mar 15, 2018

jonas deleted the codegen branch March 15, 2018 21:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix #4: Add code generator #15

Fix #4: Add code generator #15

jonas commented Jan 11, 2018

jonas commented Jan 11, 2018

muuki88 commented Jan 11, 2018 •

edited

Loading

muuki88 Jan 11, 2018

muuki88 Jan 11, 2018

muuki88 Jan 11, 2018

muuki88 Jan 11, 2018

muuki88 Jan 11, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

muuki88 Jan 11, 2018

muuki88 commented Jan 13, 2018

muuki88 commented Feb 11, 2018

jonas commented Feb 17, 2018

muuki88 commented Feb 17, 2018

muuki88 commented Feb 17, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

muuki88 Feb 21, 2018

jonas Feb 17, 2018

muuki88 Feb 21, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

jonas Feb 17, 2018

muuki88 commented Mar 15, 2018

jonas commented Mar 15, 2018 via email

jonas commented Mar 15, 2018

muuki88 commented Mar 15, 2018


		val StarWarsDir = file(sys.props("codegen.samples.dir")) / "starwars"

		val server = project

		@@ -1 +1 @@
		sbt.version=1.0.4
		sbt.version=1.1.0

		@@ -1 +1 @@
		sbt.version=1.0.2
		sbt.version=1.1.0

Fix #4: Add code generator #15

Fix #4: Add code generator #15

Conversation

jonas commented Jan 11, 2018

jonas commented Jan 11, 2018

muuki88 commented Jan 11, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

muuki88 commented Jan 13, 2018

muuki88 commented Feb 11, 2018

jonas commented Feb 17, 2018

muuki88 commented Feb 17, 2018

muuki88 commented Feb 17, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

muuki88 commented Mar 15, 2018

jonas commented Mar 15, 2018 via email

jonas commented Mar 15, 2018

muuki88 commented Mar 15, 2018

muuki88 commented Jan 11, 2018 •

edited

Loading