Implement ast_from_value and tests. Also, move utils to their own files, as we are getting circular imports as introspection imports ast_from_value.

Author: jhgg

graphql/core/execution/base.py

@@ -15,7 +15,7 @@
     TypeMetaFieldDef,
     TypeNameMetaFieldDef,
 )
-from ..utils import type_from_ast
+from ..utils.type_from_ast import type_from_ast
 from .values import get_argument_values, get_variable_values
 
 Undefined = object()

graphql/core/execution/executor.py

@@ -8,7 +8,7 @@
 from ..language.source import Source
 from ..type import GraphQLEnumType, GraphQLInterfaceType, GraphQLList, GraphQLNonNull, GraphQLObjectType, \
     GraphQLScalarType, GraphQLUnionType
-from ..utils import is_nullish
+from ..utils.is_nullish import is_nullish
 from ..validation import validate
 from .base import ExecutionContext, ExecutionResult, ResolveInfo, Undefined, collect_fields, default_resolve_fn, \
     get_argument_values, get_field_def, get_operation_root_type

graphql/core/execution/values.py

@@ -11,7 +11,8 @@
     GraphQLScalarType,
     is_input_type
 )
-from ..utils import is_nullish, type_from_ast
+from ..utils.is_nullish import is_nullish
+from ..utils.type_from_ast import type_from_ast
 
 __all__ = ['get_variable_values', 'get_argument_values']
 

graphql/core/language/kinds.py

@@ -0,0 +1,53 @@
+# Name
+
+NAME = 'Name'
+
+# Document
+
+DOCUMENT = 'Document'
+OPERATION_DEFINITION = 'OperationDefinition'
+VARIABLE_DEFINITION = 'VariableDefinition'
+VARIABLE = 'Variable'
+SELECTION_SET = 'SelectionSet'
+FIELD = 'Field'
+ARGUMENT = 'Argument'
+
+# Fragments
+
+FRAGMENT_SPREAD = 'FragmentSpread'
+INLINE_FRAGMENT = 'InlineFragment'
+FRAGMENT_DEFINITION = 'FragmentDefinition'
+
+# Values
+
+INT = 'IntValue'
+FLOAT = 'FloatValue'
+STRING = 'StringValue'
+BOOLEAN = 'BooleanValue'
+ENUM = 'EnumValue'
+LIST = 'ListValue'
+OBJECT = 'ObjectValue'
+OBJECT_FIELD = 'ObjectField'
+
+# Directives
+
+DIRECTIVE = 'Directive'
+
+# Types
+
+NAMED_TYPE = 'NamedType'
+LIST_TYPE = 'ListType'
+NON_NULL_TYPE = 'NonNullType'
+
+# Type Definitions
+
+OBJECT_TYPE_DEFINITION = 'ObjectTypeDefinition'
+FIELD_DEFINITION = 'FieldDefinition'
+INPUT_VALUE_DEFINITION = 'InputValueDefinition'
+INTERFACE_TYPE_DEFINITION = 'InterfaceTypeDefinition'
+UNION_TYPE_DEFINITION = 'UnionTypeDefinition'
+SCALAR_TYPE_DEFINITION = 'ScalarTypeDefinition'
+ENUM_TYPE_DEFINITION = 'EnumTypeDefinition'
+ENUM_VALUE_DEFINITION = 'EnumValueDefinition'
+INPUT_OBJECT_TYPE_DEFINITION = 'InputObjectTypeDefinition'
+TYPE_EXTENSION_DEFINITION = 'TypeExtensionDefinition'

graphql/core/language/lexer.py

@@ -143,7 +143,7 @@ def read_token(source, from_position):
 
     if code == 46:  # .
         if char_code_at(body, position + 1) == 46 and \
-                char_code_at(body, position + 2) == 46:
+                        char_code_at(body, position + 2) == 46:
             return Token(TokenKind.SPREAD, position, position + 3)
     elif 65 <= code <= 90 or code == 95 or 97 <= code <= 122:
         # A-Z, _, a-z
@@ -167,11 +167,11 @@ def position_after_whitespace(body, start_position):
     while position < body_length:
         code = char_code_at(body, position)
         if code in (
-            32,  # space
-            44,  # comma
-            160,  # '\xa0'
-            0x2028,  # line separator
-            0x2029,  # paragraph separator
+                32,  # space
+                44,  # comma
+                160,  # '\xa0'
+                0x2028,  # line separator
+                0x2029,  # paragraph separator
         ) or (code > 8 and code < 14):  # whitespace
             position += 1
         elif code == 35:  # #, skip comments

graphql/core/type/introspection.py

@@ -1,4 +1,3 @@
-import json
 from .definition import (
     GraphQLArgument,
     GraphQLEnumType,
@@ -12,6 +11,8 @@
     GraphQLScalarType,
     GraphQLUnionType,
 )
+from ..language.printer import print_ast
+from ..utils.ast_from_value import ast_from_value
 from .scalars import GraphQLBoolean, GraphQLString
 
 __Schema = GraphQLObjectType(
@@ -186,7 +187,7 @@ def input_fields(type, *_):
         type=GraphQLString,
         resolver=lambda input_val, *_:
             None if input_val.default_value is None
-            else json.dumps(input_val.default_value)
+            else print_ast(ast_from_value(input_val.default_value, input_val))
     )
 })
 

graphql/core/utils/__init__.py

@@ -0,0 +1,70 @@
+import json
+import re
+import sys
+from ..language import ast
+from ..compat import str_type
+from ..type.definition import (
+    GraphQLEnumType,
+    GraphQLInputObjectType,
+    GraphQLList,
+    GraphQLNonNull,
+)
+from ..type.scalars import GraphQLFloat
+from .is_nullish import is_nullish
+
+
+def ast_from_value(value, type=None):
+    if isinstance(type, GraphQLNonNull):
+        return ast_from_value(value, type.of_type)
+
+    if is_nullish(value):
+        return None
+
+    if isinstance(value, list):
+        item_type = type.of_type if isinstance(type, GraphQLList) else None
+        return ast.ListValue([ast_from_value(item, item_type) for item in value])
+
+    elif isinstance(type, GraphQLList):
+        return ast_from_value(value, type.of_type)
+
+    if isinstance(value, bool):
+        return ast.BooleanValue(value)
+
+    if isinstance(value, (int, float)):
+        string_num = str(value)
+        int_value = int(value)
+        is_int_value = string_num.isdigit()
+
+        if is_int_value or (int_value == value and value < sys.maxsize):
+            if type == GraphQLFloat:
+                return ast.FloatValue(str(float(value)))
+
+            return ast.IntValue(str(int(value)))
+
+        return ast.FloatValue(string_num)
+
+    if isinstance(value, str_type):
+        if isinstance(type, GraphQLEnumType) and re.match(r'^[_a-zA-Z][_a-zA-Z0-9]*$', value):
+            return ast.EnumValue(value)
+
+        return ast.StringValue(json.dumps(value)[1:-1])
+
+    assert isinstance(value, dict)
+
+    fields = []
+    is_graph_ql_input_object_type = isinstance(type, GraphQLInputObjectType)
+
+    for field_name, field_value in value.items():
+        field_type = None
+        if is_graph_ql_input_object_type:
+            field_def = type.get_fields().get(field_name)
+            field_type = field_def and field_def.type
+
+        field_value = ast_from_value(field_value, field_type)
+        if field_value:
+            fields.append(ast.ObjectField(
+                ast.Name(field_name),
+                field_value
+            ))
+
+    return ast.ObjectValue(fields)

graphql/core/utils/ast_from_value.py

@@ -0,0 +1,26 @@
+from ..type.definition import (
+    GraphQLInterfaceType,
+    GraphQLObjectType,
+    GraphQLUnionType,
+)
+from ..type.introspection import SchemaMetaFieldDef, TypeMetaFieldDef, TypeNameMetaFieldDef
+
+
+def get_field_def(schema, parent_type, field_ast):
+    """Not exactly the same as the executor's definition of get_field_def, in this
+    statically evaluated environment we do not always have an Object type,
+    and need to handle Interface and Union types."""
+    name = field_ast.name.value
+    if name == SchemaMetaFieldDef.name and schema.get_query_type() == parent_type:
+        return SchemaMetaFieldDef
+    elif name == TypeMetaFieldDef.name and schema.get_query_type() == parent_type:
+        return TypeMetaFieldDef
+    elif name == TypeNameMetaFieldDef.name and \
+            isinstance(parent_type, (
+                GraphQLObjectType,
+                GraphQLInterfaceType,
+                GraphQLUnionType,
+            )):
+        return TypeNameMetaFieldDef
+    elif isinstance(parent_type, (GraphQLObjectType, GraphQLInterfaceType)):
+        return parent_type.get_fields().get(name)

graphql/core/utils/get_field_def.py

@@ -0,0 +1,2 @@
+def is_nullish(value):
+    return value is None or value != value