Update tests to all vars

lib/src/main/java/graphql/nadel/engine/util/CollectionUtil.kt

@@ -44,7 +44,7 @@ inline fun <K, E> Sequence<E>.strictAssociateBy(crossinline keyExtractor: (E) ->
  */
 @JvmName("mapFromPairs")
 fun <K, V> mapFrom(entries: Collection<Pair<K, V>>): Map<K, V> {
-    val map = HashMap<K, V>(entries.size)
+    val map = LinkedHashMap<K, V>(entries.size)
     map.putAll(entries)
     require(map.size == entries.size) {
         @Suppress("SimpleRedundantLet") // For debugging purposes if you want to visit the values
@@ -61,7 +61,7 @@ fun <K, V> mapFrom(entries: Collection<Pair<K, V>>): Map<K, V> {
  */
 @JvmName("mapFromPairs")
 fun <K, V> mapFrom(entries: Sequence<Pair<K, V>>): Map<K, V> {
-    val map = HashMap<K, V>()
+    val map = LinkedHashMap<K, V>()
     var count = 0
     entries.forEach {
         map[it.first] = it.second
@@ -90,7 +90,7 @@ fun <K, V> Collection<Pair<K, V>>.toMapStrictly(): Map<K, V> {
  */
 @JvmName("mapFromEntries")
 fun <K, V> mapFrom(entries: Collection<Map.Entry<K, V>>): Map<K, V> {
-    val map = HashMap<K, V>(entries.size)
+    val map = LinkedHashMap<K, V>(entries.size)
     entries.forEach(map::put)
     require(map.size == entries.size)
     return map
@@ -114,7 +114,7 @@ fun <K, V> MutableMap<K, V>.put(entry: Pair<K, V>) {
  * Inverts the [Map] such that the values are now the keys and the keys are now the values.
  */
 fun <K, V> Map<K, V>.invert(): Map<V, K> {
-    val map = HashMap<V, K>(this.size)
+    val map = LinkedHashMap<V, K>(this.size)
     forEach { (key, value) ->
         map[value] = key
     }

test/src/test/kotlin/graphql/nadel/tests/EngineTests.kt

@@ -50,6 +50,7 @@ private val singleTestToRun = (System.getenv("TEST_NAME") ?: "")
  * NadelExecutionInput.Builder#transformExecutionHints method in your test hook class.
  */
 private val defaultHints = NadelExecutionHints.newHints()
+    .allDocumentVariablesHint { true }
     .build()
 
 private val sep = "-".repeat(50)

test/src/test/kotlin/graphql/nadel/tests/TestFixtureUpdater.kt

@@ -1,12 +1,19 @@
 package graphql.nadel.tests
 
 import com.fasterxml.jackson.module.kotlin.readValue
+import graphql.language.AstPrinter
 import graphql.nadel.tests.yaml.YamlComment.Position.Block
 import graphql.nadel.tests.yaml.YamlComment.Position.End
 import graphql.nadel.tests.yaml.YamlComment.Position.Inline
 import graphql.nadel.tests.yaml.collectComments
 import graphql.nadel.tests.yaml.traverseYaml
 import graphql.nadel.tests.yaml.writeYamlTo
+import graphql.normalized.ExecutableNormalizedOperationFactory.createExecutableNormalizedOperationWithRawVariables
+import graphql.normalized.ExecutableNormalizedOperationToAstCompiler.compileToDocument
+import graphql.schema.idl.RuntimeWiring
+import graphql.schema.idl.SchemaGenerator
+import graphql.schema.idl.SchemaParser
+import graphql.schema.idl.errors.SchemaProblem
 import java.io.File
 
 // For autocomplete navigation
@@ -43,11 +50,68 @@ private fun update(fixturesDir: File) {
         }
 }
 
+private class TestProcessingException(message: String, cause: Throwable) : RuntimeException(message, cause)
+
 fun update(testFixture: TestFixture): TestFixture {
     return testFixture
+        .copy(
+            // serviceCalls = getUpdatedServiceCalls(testFixture),
+        )
+}
+
+private fun getUpdatedServiceCalls(testFixture: TestFixture): List<ServiceCall> {
+    val runtimeWiring = RuntimeWiring.newRuntimeWiring()
+        .wiringFactory(GatewaySchemaWiringFactory())
+        .build()
+
+    val underlyingSchemas = testFixture.underlyingSchema
+        .mapValues { (_, schemaText) ->
+            val typeDefs = SchemaParser().parse(schemaText)
+            try {
+                SchemaGenerator().makeExecutableSchema(typeDefs, runtimeWiring)
+            } catch (e: SchemaProblem) {
+                throw TestProcessingException("Unable to process ${testFixture.name}", e)
+            }
+        }
+
+    return testFixture.serviceCalls
+        .map { call ->
+            try {
+                val underlyingSchema = underlyingSchemas[call.serviceName]
+                    ?: throw IllegalArgumentException("No schema found for ${call.serviceName}")
+
+                val ern = createExecutableNormalizedOperationWithRawVariables(
+                    underlyingSchema,
+                    call.request.document,
+                    call.request.operationName,
+                    call.request.variables,
+                )
+
+                val compileResult = compileToDocument(
+                    underlyingSchema,
+                    ern.operation,
+                    call.request.operationName,
+                    ern.topLevelFields
+                ) { _, _, _ -> true }
+
+                call.copy(
+                    request = call.request.copy(
+                        query = AstPrinter.printAst(compileResult.document),
+                        variables = compileResult.variables,
+                    ),
+                )
+            } catch (e: Exception) {
+                TestProcessingException(
+                    message = "Unable to process service calls for ${testFixture.name}",
+                    cause = e,
+                ).printStackTrace()
+
+                call
+            }
+        }
 }
 
-fun writeOut(fixtureFile: File, testFixture: TestFixture) {
+private fun writeOut(fixtureFile: File, testFixture: TestFixture) {
     val commentsFromOldYaml = collectComments(fixtureFile).toMutableMap()
 
     val rootNodes = traverseYaml(yamlObjectMapper.writeValueAsString(testFixture)) { path, node ->

test/src/test/kotlin/graphql/nadel/tests/hooks/transformer-on-hydration-fields.kt

@@ -64,7 +64,7 @@ class `transformer-on-hydration-fields` : EngineTestHook {
                     field: ExecutableNormalizedField,
                     state: Any,
                 ): NadelTransformFieldResult {
-                    val transformedArgs = mapOf("id" to NormalizedInputValue("String", StringValue("transformed-id")))
+                    val transformedArgs = mapOf("id" to NormalizedInputValue("ID", StringValue("transformed-id")))
                     return transformer.transform(field.children)
                         .let {
                             field.toBuilder()

test/src/test/resources/fixtures/basic/call-with-variables-inside-input-objects.yml

@@ -26,10 +26,11 @@ serviceCalls:
   - serviceName: "MyService"
     request:
       query: |
-        query myQuery {
-          hello(arg: {})
+        query myQuery($v0: Arg) {
+          hello(arg: $v0)
         }
-      variables: { }
+      variables:
+        v0: { }
       operationName: "myQuery"
     # language=JSON
     response: |-

test/src/test/resources/fixtures/chained transforms/ari use case/ari-argument-transform-on-renamed-field.yml

@@ -28,13 +28,14 @@ serviceCalls:
   - serviceName: "service"
     request:
       query: |
-        query {
-          rename__issue__issueById: issueById(id: "57") {
+        query ($v0: ID) {
+          rename__issue__issueById: issueById(id: $v0) {
             __typename__rename__key: __typename
             rename__key__id: id
           }
         }
-      variables: { }
+      variables:
+        v0: "57"
     # language=JSON
     response: |-
       {

test/src/test/resources/fixtures/chained transforms/ari use case/ari-argument-transform.yml

@@ -28,13 +28,14 @@ serviceCalls:
   - serviceName: "service"
     request:
       query: |
-        query {
-          issue(id: "57") {
+        query ($v0: ID) {
+          issue(id: $v0) {
             __typename__rename__key: __typename
             rename__key__id: id
           }
         }
-      variables: { }
+      variables:
+        v0: "57"
     # language=JSON
     response: |-
       {

test/src/test/resources/fixtures/deep renames/deep-rename-inside-batch-hydration-null-object.yml

@@ -89,16 +89,20 @@ serviceCalls:
   - serviceName: "IssueService"
     request:
       query: |
-        query {
-          issuesByIds(id: ["issue-1", "issue-2", "issue-3"]) {
+        query ($v0: [ID!]) {
+          issuesByIds(id: $v0) {
             __typename__deep_rename__name: __typename
             deep_rename__name__detail: detail {
               detailName
             }
             batch_hydration__issue__id: id
           }
         }
-      variables: { }
+      variables:
+        v0:
+          - "issue-1"
+          - "issue-2"
+          - "issue-3"
     # language=JSON
     response: |-
       {

test/src/test/resources/fixtures/deep renames/deep-rename-inside-batch-hydration.yml

@@ -89,16 +89,20 @@ serviceCalls:
   - serviceName: "IssueService"
     request:
       query: |
-        query {
-          issuesByIds(id: ["issue-1", "issue-2", "issue-3"]) {
+        query ($v0: [ID!]) {
+          issuesByIds(id: $v0) {
             __typename__deep_rename__name: __typename
             deep_rename__name__detail: detail {
               detailName
             }
             batch_hydration__issue__id: id
           }
         }
-      variables: { }
+      variables:
+        v0:
+          - "issue-1"
+          - "issue-2"
+          - "issue-3"
     # language=JSON
     response: |-
       {

test/src/test/resources/fixtures/deep renames/deep-rename-inside-hydration.yml

@@ -76,15 +76,16 @@ serviceCalls:
   - serviceName: "IssueService"
     request:
       query: |
-        query {
-          issueById(id: "issue-1") {
+        query ($v0: ID!) {
+          issueById(id: $v0) {
             __typename__deep_rename__name: __typename
             deep_rename__name__detail: detail {
               detailName
             }
           }
         }
-      variables: { }
+      variables:
+        v0: "issue-1"
     # language=JSON
     response: |-
       {

test/src/test/resources/fixtures/deep renames/deep-rename-inside-hydrations.yml

@@ -86,15 +86,16 @@ serviceCalls:
   - serviceName: "IssueService"
     request:
       query: |
-        query {
-          issueById(id: "issue-1") {
+        query ($v0: ID!) {
+          issueById(id: $v0) {
             __typename__deep_rename__name: __typename
             deep_rename__name__detail: detail {
               detailName
             }
           }
         }
-      variables: { }
+      variables:
+        v0: "issue-1"
     # language=JSON
     response: |-
       {
@@ -111,15 +112,16 @@ serviceCalls:
   - serviceName: "IssueService"
     request:
       query: |
-        query {
-          issueById(id: "issue-2") {
+        query ($v0: ID!) {
+          issueById(id: $v0) {
             __typename__deep_rename__name: __typename
             deep_rename__name__detail: detail {
               detailName
             }
           }
         }
-      variables: { }
+      variables:
+        v0: "issue-2"
     # language=JSON
     response: |-
       {
@@ -136,15 +138,16 @@ serviceCalls:
   - serviceName: "IssueService"
     request:
       query: |
-        query {
-          issueById(id: "issue-3") {
+        query ($v0: ID!) {
+          issueById(id: $v0) {
             __typename__deep_rename__name: __typename
             deep_rename__name__detail: detail {
               detailName
             }
           }
         }
-      variables: { }
+      variables:
+        v0: "issue-3"
     # language=JSON
     response: |-
       {

test/src/test/resources/fixtures/deep renames/deep-rename-with-argument-works.yml

@@ -32,15 +32,16 @@ serviceCalls:
   - serviceName: "IssueService"
     request:
       query: |
-        query {
+        query ($v0: ID!) {
           issue {
             __typename__deep_rename__name: __typename
             deep_rename__name__detail: detail {
-              detailName(userId: "USER-01")
+              detailName(userId: $v0)
             }
           }
         }
-      variables: { }
+      variables:
+        v0: "USER-01"
     # language=JSON
     response: |-
       {

test/src/test/resources/fixtures/deep renames/deep-rename-with-more-unions.yml

@@ -1,3 +1,4 @@
+# Pretty sure this test doesn't actually make any sense, we should delete it if so
 name: "deep rename with more unions"
 enabled: true
 overallSchema:

test/src/test/resources/fixtures/deep renames/deep-rename-with-unions.yml

@@ -1,3 +1,4 @@
+# Pretty sure this test doesn't actually make any sense, we should delete it if so
 name: "deep rename with unions"
 enabled: true
 overallSchema:

test/src/test/resources/fixtures/document variable handling/inlined-json-arguments.yml

@@ -31,13 +31,14 @@ serviceCalls:
   - serviceName: "MyService"
     request:
       query: |
-        query myQuery($v0: JSON, $v1: JSON!) {
-          hello(arg: {payload : $v0}, arg1: $v1)
+        query myQuery($v0: InputWithJson, $v1: JSON!) {
+          hello(arg: $v0, arg1: $v1)
         }
       variables:
         v0:
-          name: "Bobert"
-          age: "23"
+          payload:
+            name: "Bobert"
+            age: "23"
         v1:
           interests:
             - "photography"

test/src/test/resources/fixtures/document variable handling/input-object-with-json-field.yml

@@ -33,12 +33,13 @@ serviceCalls:
   - serviceName: "MyService"
     request:
       query: |
-        query myQuery($v0: JSON) {
-          hello(arg: {payload : $v0})
+        query myQuery($v0: InputWithJson) {
+          hello(arg: $v0)
         }
       variables:
         v0:
-          48x48: "file.jpeg"
+          payload:
+            48x48: "file.jpeg"
       operationName: "myQuery"
     # language=JSON
     response: |-