Merge pull request #1 from rudy-on-rails/rudy-on-rails/allow-field-ob…

…ject-declarations-to-not-use-blocks Field objects are allowed to be supplied without declaring blocks
rudy-on-rails · Jan 20, 2021 · 5eea46c · 5eea46c
2 parents b4f3761 + fa91f3b
commit 5eea46c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/core/src/main/kotlin/me/lazmaid/kraph/Kraph.kt b/core/src/main/kotlin/me/lazmaid/kraph/Kraph.kt
@@ -51,7 +51,7 @@ class Kraph(f: Kraph.() -> Unit) {
     open inner class FieldBuilder {
         internal val fields = arrayListOf<Field>()
 
-        fun fieldObject(name: String, alias: String? = null, args: Map<String, Any>? = null, builder: FieldBlock) {
+        fun fieldObject(name: String, alias: String? = null, args: Map<String, Any>? = null, builder: FieldBlock? = null) {
             addField(name, alias, args, builder)
         }
 

diff --git a/core/src/test/kotlin/me/lazmaid/kraph/test/BuilderSpek.kt b/core/src/test/kotlin/me/lazmaid/kraph/test/BuilderSpek.kt
@@ -109,6 +109,21 @@ class BuilderSpek : Spek({
                 }, throws(noFieldInSelectionSetMessageMatcher("test")))
             }
         }
+        given("sample query with object and no supplied field builder") {
+            val query = Kraph {
+                query {
+                    fieldObject("test")
+                }
+            }
+            it("should not throw a NoFieldsInSelectionSetException and build the request correctly") {
+                assertThat(
+                    query.toRequestString(),
+                    equalTo(
+                        "{\"query\": \"query { test }\", \"variables\": null, \"operationName\": null}"
+                    )
+                )
+            }
+        }
         given("sample mutation") {
             val query = Kraph {
                 mutation {