print: add spaces inside input object

Cito · Cito · commit b52a24015b74 · 2022-09-23T23:21:50.000+02:00
Replicates graphql/graphql-js@5ccf579
diff --git a/src/graphql/language/printer.py b/src/graphql/language/printer.py
@@ -169,7 +169,7 @@ def leave_list_value(node: PrintedNode, *_args: Any) -> str:
 
     @staticmethod
     def leave_object_value(node: PrintedNode, *_args: Any) -> str:
-        return f"{{{join(node.fields, ', ')}}}"
+        return f"{{ {join(node.fields, ', ')} }}"
 
     @staticmethod
     def leave_object_field(node: PrintedNode, *_args: Any) -> str:
diff --git a/tests/language/test_printer.py b/tests/language/test_printer.py
@@ -60,11 +60,12 @@ def correctly_prints_mutation_operation_with_artifacts():
 
     def prints_query_with_variable_directives():
         query_ast_with_variable_directive = parse(
-            "query ($foo: TestType = {a: 123}" " @testDirective(if: true) @test) { id }"
+            "query ($foo: TestType = { a: 123 }"
+            " @testDirective(if: true) @test) { id }"
         )
         assert print_ast(query_ast_with_variable_directive) == dedent(
             """
-            query ($foo: TestType = {a: 123} @testDirective(if: true) @test) {
+            query ($foo: TestType = { a: 123 } @testDirective(if: true) @test) {
               id
             }
             """
@@ -185,9 +186,9 @@ def prints_kitchen_sink_without_altering_ast(kitchen_sink_query):  # noqa: F811
               foo(
                 size: $size
                 bar: $b
-                obj: {key: "value", block: """
+                obj: { key: "value", block: """
                 block string uses \"""
-                """}
+                """ }
               )
             }
 
diff --git a/tests/language/test_schema_printer.py b/tests/language/test_schema_printer.py
@@ -56,7 +56,7 @@ def prints_kitchen_sink_without_altering_ast(kitchen_sink_sdl):  # noqa: F811
               three(argument: InputType, other: String): Int
               four(argument: String = "string"): String
               five(argument: [String] = ["string", "string"]): String
-              six(argument: InputType = {key: "value"}): Type
+              six(argument: InputType = { key: "value" }): Type
               seven(argument: Int = null): Type
             }
 
diff --git a/tests/type/test_custom_scalars.py b/tests/type/test_custom_scalars.py
@@ -186,7 +186,7 @@ def parse_literal():
     def parse_literal_with_errors():
         source = """
             query Money($amount: String!, $currency: Float!) {
-              toEuros(money: {amount: $amount, currency: $currency})
+              toEuros(money: { amount: $amount, currency: $currency })
             }
             """
 
@@ -197,7 +197,7 @@ def parse_literal_with_errors():
             [
                 {
                     "message": "Argument 'money' has invalid value"
-                    " {amount: $amount, currency: $currency}.",
+                    " { amount: $amount, currency: $currency }.",
                     "locations": [(3, 30)],
                 },
             ],
diff --git a/tests/type/test_introspection.py b/tests/type/test_introspection.py
@@ -1079,7 +1079,7 @@ def introspects_any_default_value():
             """
             input InputObjectWithDefaultValues {
               a: String = "Emoji: \\u{1F600}"
-              b: Complex = {x: ["abc"], y: 123}
+              b: Complex = { x: ["abc"], y: 123 }
             }
 
             input Complex {
@@ -1109,7 +1109,7 @@ def introspects_any_default_value():
                 "__type": {
                     "inputFields": [
                         {"name": "a", "defaultValue": '"Emoji: \U0001f600"'},
-                        {"name": "b", "defaultValue": '{x: ["abc"], y: 123}'},
+                        {"name": "b", "defaultValue": '{ x: ["abc"], y: 123 }'},
                     ]
                 }
             },
diff --git a/tests/type/test_scalars.py b/tests/type/test_scalars.py
@@ -93,7 +93,7 @@ def _parse_literal_raises(s: str, message: str):
             )
             _parse_literal_raises("[1]", "Int cannot represent non-integer value: [1]")
             _parse_literal_raises(
-                "{value: 1}", "Int cannot represent non-integer value: {value: 1}"
+                "{value: 1}", "Int cannot represent non-integer value: { value: 1 }"
             )
             _parse_literal_raises(
                 "ENUM_VALUE", "Int cannot represent non-integer value: ENUM_VALUE"
@@ -246,7 +246,8 @@ def _parse_literal_raises(s: str, message: str):
                 "[0.1]", "Float cannot represent non numeric value: [0.1]"
             )
             _parse_literal_raises(
-                "{value: 0.1}", "Float cannot represent non numeric value: {value: 0.1}"
+                "{value: 0.1}",
+                "Float cannot represent non numeric value: { value: 0.1 }",
             )
             _parse_literal_raises(
                 "ENUM_VALUE", "Float cannot represent non numeric value: ENUM_VALUE"
@@ -357,7 +358,7 @@ def _parse_literal_raises(s: str, message: str):
             )
             _parse_literal_raises(
                 '{value: "foo"}',
-                'String cannot represent a non string value: {value: "foo"}',
+                'String cannot represent a non string value: { value: "foo" }',
             )
             _parse_literal_raises(
                 "ENUM_VALUE", "String cannot represent a non string value: ENUM_VALUE"
@@ -488,11 +489,11 @@ def _parse_literal_raises(s: str, message: str):
             )
             _parse_literal_raises(
                 "{value: false}",
-                "Boolean cannot represent a non boolean value: {value: false}",
+                "Boolean cannot represent a non boolean value: { value: false }",
             )
             _parse_literal_raises(
                 "{value: False}",
-                "Boolean cannot represent a non boolean value: {value: False}",
+                "Boolean cannot represent a non boolean value: { value: False }",
             )
             _parse_literal_raises(
                 "ENUM_VALUE", "Boolean cannot represent a non boolean value: ENUM_VALUE"
@@ -614,9 +615,9 @@ def _parse_literal_raises(s: str, message: str):
                 '["1"]', 'ID cannot represent a non-string and non-integer value: ["1"]'
             )
             _parse_literal_raises(
-                '{value: "1"}',
+                '{ value: "1" }',
                 "ID cannot represent a non-string and non-integer value:"
-                ' {value: "1"}',
+                ' { value: "1" }',
             )
             _parse_literal_raises(
                 "ENUM_VALUE",
diff --git a/tests/utilities/test_build_client_schema.py b/tests/utilities/test_build_client_schema.py
@@ -459,7 +459,7 @@ def builds_a_schema_with_field_arguments_with_default_values():
             type Query {
               defaultInt(intArg: Int = 30): String
               defaultList(listArg: [Int] = [1, 2, 3]): String
-              defaultObject(objArg: Geo = {lat: 37.485, lon: -122.148}): String
+              defaultObject(objArg: Geo = { lat: 37.485, lon: -122.148 }): String
               defaultNull(intArg: Int = null): String
               noDefault(intArg: Int): String
             }
diff --git a/tests/utilities/test_find_breaking_changes.py b/tests/utilities/test_find_breaking_changes.py
@@ -986,8 +986,8 @@ def should_detect_if_a_default_value_changed_on_an_argument():
             (
                 DangerousChangeType.ARG_DEFAULT_VALUE_CHANGE,
                 "Type1.field1 arg complexObject has changed defaultValue"
-                " from {innerInputArray: [{arrayField: [1, 2, 3]}]}"
-                " to {innerInputArray: [{arrayField: [3, 2, 1]}]}.",
+                " from { innerInputArray: [{ arrayField: [1, 2, 3] }] }"
+                " to { innerInputArray: [{ arrayField: [3, 2, 1] }] }.",
             ),
         ]
 
diff --git a/tests/utilities/test_sort_value_node.py b/tests/utilities/test_sort_value_node.py
@@ -21,13 +21,13 @@ def do_not_change_non_object_values():
         )
 
     def sort_input_object_fields():
-        _expect_sorted_value("{ b: 2, a: 1 }", "{a: 1, b: 2}")
-        _expect_sorted_value("{ a: { c: 3, b: 2 } }", "{a: {b: 2, c: 3}}")
+        _expect_sorted_value("{ b: 2, a: 1 }", "{ a: 1, b: 2 }")
+        _expect_sorted_value("{ a: { c: 3, b: 2 } }", "{ a: { b: 2, c: 3 } }")
         _expect_sorted_value(
             "[{ b: 2, a: 1 }, { d: 4, c: 3}]",
-            "[{a: 1, b: 2}, {c: 3, d: 4}]",
+            "[{ a: 1, b: 2 }, { c: 3, d: 4 }]",
         )
         _expect_sorted_value(
             "{ b: { g: 7, f: 6 }, c: 3 , a: { d: 4, e: 5 } }",
-            "{a: {d: 4, e: 5}, b: {f: 6, g: 7}, c: 3}",
+            "{ a: { d: 4, e: 5 }, b: { f: 6, g: 7 }, c: 3 }",
         )

Original file line number	Diff line number	Diff line change
`@@ -60,11 +60,12 @@ def correctly_prints_mutation_operation_with_artifacts():`
`60`	`60`
`61`	`61`	`def prints_query_with_variable_directives():`
`62`	`62`	`query_ast_with_variable_directive = parse(`
`63`		`- "query ($foo: TestType = {a: 123}" " @testDirective(if: true) @test) { id }"`
	`63`	`+ "query ($foo: TestType = { a: 123 }"`
	`64`	`+ " @testDirective(if: true) @test) { id }"`
`64`	`65`	`)`
`65`	`66`	`assert print_ast(query_ast_with_variable_directive) == dedent(`
`66`	`67`	`"""`
`67`		`- query ($foo: TestType = {a: 123} @testDirective(if: true) @test) {`
	`68`	`+ query ($foo: TestType = { a: 123 } @testDirective(if: true) @test) {`
`68`	`69`	`id`
`69`	`70`	`}`
`70`	`71`	`"""`
`@@ -185,9 +186,9 @@ def prints_kitchen_sink_without_altering_ast(kitchen_sink_query): # noqa: F811`
`185`	`186`	`foo(`
`186`	`187`	`size: $size`
`187`	`188`	`bar: $b`
`188`		`- obj: {key: "value", block: """`
	`189`	`+ obj: { key: "value", block: """`
`189`	`190`	`block string uses \"""`
`190`		`- """}`
	`191`	`+ """ }`
`191`	`192`	`)`
`192`	`193`	`}`
`193`	`194`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ def prints_kitchen_sink_without_altering_ast(kitchen_sink_sdl): # noqa: F811`
`56`	`56`	`three(argument: InputType, other: String): Int`
`57`	`57`	`four(argument: String = "string"): String`
`58`	`58`	`five(argument: [String] = ["string", "string"]): String`
`59`		`- six(argument: InputType = {key: "value"}): Type`
	`59`	`+ six(argument: InputType = { key: "value" }): Type`
`60`	`60`	`seven(argument: Int = null): Type`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ def parse_literal():`
`186`	`186`	`def parse_literal_with_errors():`
`187`	`187`	`source = """`
`188`	`188`	`query Money($amount: String!, $currency: Float!) {`
`189`		`- toEuros(money: {amount: $amount, currency: $currency})`
	`189`	`+ toEuros(money: { amount: $amount, currency: $currency })`
`190`	`190`	`}`
`191`	`191`	`"""`
`192`	`192`
`@@ -197,7 +197,7 @@ def parse_literal_with_errors():`
`197`	`197`	`[`
`198`	`198`	`{`
`199`	`199`	`"message": "Argument 'money' has invalid value"`
`200`		`- " {amount: $amount, currency: $currency}.",`
	`200`	`+ " { amount: $amount, currency: $currency }.",`
`201`	`201`	`"locations": [(3, 30)],`
`202`	`202`	`},`
`203`	`203`	`],`
Original file line number	Diff line number	Diff line change
`@@ -1079,7 +1079,7 @@ def introspects_any_default_value():`
`1079`	`1079`	`"""`
`1080`	`1080`	`input InputObjectWithDefaultValues {`
`1081`	`1081`	`a: String = "Emoji: \\u{1F600}"`
`1082`		`- b: Complex = {x: ["abc"], y: 123}`
	`1082`	`+ b: Complex = { x: ["abc"], y: 123 }`
`1083`	`1083`	`}`
`1084`	`1084`
`1085`	`1085`	`input Complex {`
`@@ -1109,7 +1109,7 @@ def introspects_any_default_value():`
`1109`	`1109`	`"__type": {`
`1110`	`1110`	`"inputFields": [`
`1111`	`1111`	`{"name": "a", "defaultValue": '"Emoji: \U0001f600"'},`
`1112`		`- {"name": "b", "defaultValue": '{x: ["abc"], y: 123}'},`
	`1112`	`+ {"name": "b", "defaultValue": '{ x: ["abc"], y: 123 }'},`
`1113`	`1113`	`]`
`1114`	`1114`	`}`
`1115`	`1115`	`},`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ def _parse_literal_raises(s: str, message: str):`
`93`	`93`	`)`
`94`	`94`	`_parse_literal_raises("[1]", "Int cannot represent non-integer value: [1]")`
`95`	`95`	`_parse_literal_raises(`
`96`		`- "{value: 1}", "Int cannot represent non-integer value: {value: 1}"`
	`96`	`+ "{value: 1}", "Int cannot represent non-integer value: { value: 1 }"`
`97`	`97`	`)`
`98`	`98`	`_parse_literal_raises(`
`99`	`99`	`"ENUM_VALUE", "Int cannot represent non-integer value: ENUM_VALUE"`
`@@ -246,7 +246,8 @@ def _parse_literal_raises(s: str, message: str):`
`246`	`246`	`"[0.1]", "Float cannot represent non numeric value: [0.1]"`
`247`	`247`	`)`
`248`	`248`	`_parse_literal_raises(`
`249`		`- "{value: 0.1}", "Float cannot represent non numeric value: {value: 0.1}"`
	`249`	`+ "{value: 0.1}",`
	`250`	`+ "Float cannot represent non numeric value: { value: 0.1 }",`
`250`	`251`	`)`
`251`	`252`	`_parse_literal_raises(`
`252`	`253`	`"ENUM_VALUE", "Float cannot represent non numeric value: ENUM_VALUE"`
`@@ -357,7 +358,7 @@ def _parse_literal_raises(s: str, message: str):`
`357`	`358`	`)`
`358`	`359`	`_parse_literal_raises(`
`359`	`360`	`'{value: "foo"}',`
`360`		`- 'String cannot represent a non string value: {value: "foo"}',`
	`361`	`+ 'String cannot represent a non string value: { value: "foo" }',`
`361`	`362`	`)`
`362`	`363`	`_parse_literal_raises(`
`363`	`364`	`"ENUM_VALUE", "String cannot represent a non string value: ENUM_VALUE"`
`@@ -488,11 +489,11 @@ def _parse_literal_raises(s: str, message: str):`
`488`	`489`	`)`
`489`	`490`	`_parse_literal_raises(`
`490`	`491`	`"{value: false}",`
`491`		`- "Boolean cannot represent a non boolean value: {value: false}",`
	`492`	`+ "Boolean cannot represent a non boolean value: { value: false }",`
`492`	`493`	`)`
`493`	`494`	`_parse_literal_raises(`
`494`	`495`	`"{value: False}",`
`495`		`- "Boolean cannot represent a non boolean value: {value: False}",`
	`496`	`+ "Boolean cannot represent a non boolean value: { value: False }",`
`496`	`497`	`)`
`497`	`498`	`_parse_literal_raises(`
`498`	`499`	`"ENUM_VALUE", "Boolean cannot represent a non boolean value: ENUM_VALUE"`
`@@ -614,9 +615,9 @@ def _parse_literal_raises(s: str, message: str):`
`614`	`615`	`'["1"]', 'ID cannot represent a non-string and non-integer value: ["1"]'`
`615`	`616`	`)`
`616`	`617`	`_parse_literal_raises(`
`617`		`- '{value: "1"}',`
	`618`	`+ '{ value: "1" }',`
`618`	`619`	`"ID cannot represent a non-string and non-integer value:"`
`619`		`- ' {value: "1"}',`
	`620`	`+ ' { value: "1" }',`
`620`	`621`	`)`
`621`	`622`	`_parse_literal_raises(`
`622`	`623`	`"ENUM_VALUE",`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ def builds_a_schema_with_field_arguments_with_default_values():`
`459`	`459`	`type Query {`
`460`	`460`	`defaultInt(intArg: Int = 30): String`
`461`	`461`	`defaultList(listArg: [Int] = [1, 2, 3]): String`
`462`		`- defaultObject(objArg: Geo = {lat: 37.485, lon: -122.148}): String`
	`462`	`+ defaultObject(objArg: Geo = { lat: 37.485, lon: -122.148 }): String`
`463`	`463`	`defaultNull(intArg: Int = null): String`
`464`	`464`	`noDefault(intArg: Int): String`
`465`	`465`	`}`
Original file line number	Diff line number	Diff line change
`@@ -986,8 +986,8 @@ def should_detect_if_a_default_value_changed_on_an_argument():`
`986`	`986`	`(`
`987`	`987`	`DangerousChangeType.ARG_DEFAULT_VALUE_CHANGE,`
`988`	`988`	`"Type1.field1 arg complexObject has changed defaultValue"`
`989`		`- " from {innerInputArray: [{arrayField: [1, 2, 3]}]}"`
`990`		`- " to {innerInputArray: [{arrayField: [3, 2, 1]}]}.",`
	`989`	`+ " from { innerInputArray: [{ arrayField: [1, 2, 3] }] }"`
	`990`	`+ " to { innerInputArray: [{ arrayField: [3, 2, 1] }] }.",`
`991`	`991`	`),`
`992`	`992`	`]`
`993`	`993`
Original file line number	Diff line number	Diff line change
`@@ -21,13 +21,13 @@ def do_not_change_non_object_values():`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`def sort_input_object_fields():`
`24`		`- _expect_sorted_value("{ b: 2, a: 1 }", "{a: 1, b: 2}")`
`25`		`- _expect_sorted_value("{ a: { c: 3, b: 2 } }", "{a: {b: 2, c: 3}}")`
	`24`	`+ _expect_sorted_value("{ b: 2, a: 1 }", "{ a: 1, b: 2 }")`
	`25`	`+ _expect_sorted_value("{ a: { c: 3, b: 2 } }", "{ a: { b: 2, c: 3 } }")`
`26`	`26`	`_expect_sorted_value(`
`27`	`27`	`"[{ b: 2, a: 1 }, { d: 4, c: 3}]",`
`28`		`- "[{a: 1, b: 2}, {c: 3, d: 4}]",`
	`28`	`+ "[{ a: 1, b: 2 }, { c: 3, d: 4 }]",`
`29`	`29`	`)`
`30`	`30`	`_expect_sorted_value(`
`31`	`31`	`"{ b: { g: 7, f: 6 }, c: 3 , a: { d: 4, e: 5 } }",`
`32`		`- "{a: {d: 4, e: 5}, b: {f: 6, g: 7}, c: 3}",`
	`32`	`+ "{ a: { d: 4, e: 5 }, b: { f: 6, g: 7 }, c: 3 }",`
`33`	`33`	`)`