Merge pull request #141 from evo-company/fix-enum-as-arg-and-scalar-d…

…efault Fix custom scalar introspection defaultValue. Fix enum opt validation
evo-company · Oct 20, 2023 · 299cd89 · 299cd89
2 parents 1dddc14 + bd4468f
commit 299cd89
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 6 deletions.
diff --git a/hiku/introspection/graphql.py b/hiku/introspection/graphql.py
@@ -567,8 +567,8 @@ def input_value_info(
                     scalar = schema.query_graph.scalars_map[
                         option.type_info.type_name
                     ]
-                    default = serialize(
-                        option.type, option.default, scalar.serialize
+                    default = json.dumps(
+                        serialize(option.type, option.default, scalar.serialize)
                     )
                 else:
                     default = json.dumps(option.default)

diff --git a/hiku/validate/query.py b/hiku/validate/query.py
@@ -13,6 +13,7 @@
     SequenceMeta,
     RecordMeta,
     TypeRefMeta,
+    EnumRefMeta,
     GenericMeta,
     AnyMeta,
     BooleanMeta,
@@ -250,6 +251,10 @@ def visit_typeref(self, type_: TypeRefMeta) -> None:
     def visit_scalar(self, type_: ScalarMeta) -> None:
         pass
 
+    # TODO: add enum validation errors
+    def visit_enumref(self, type_: EnumRefMeta) -> None:
+        pass
+
 
 class _ValidateOptions(GraphVisitor):
     """

diff --git a/tests/test_enum.py b/tests/test_enum.py
@@ -11,6 +11,7 @@
 from hiku.utils import listify
 from hiku.readers.graphql import read
 from hiku.validate.graph import GraphValidationError
+from hiku.validate.query import validate
 
 
 def execute(graph, query):
@@ -260,14 +261,20 @@ def get_field(fname, id_):
         ]),
     ], enums=[enum])
 
-    result = execute(graph, read("query GetUser { user { id status } }"))
+    query = "query GetUser { user { id status } }"
+
+    assert validate(graph, read(query)) == []
+
+    result = execute(graph, read(query))
     assert result == {
         'user': {
             'id': 1,
             'status': 'ACTIVE'
         }
     }
 
+
+
 @pytest.mark.parametrize("enum", [
     Enum.from_builtin(Status, 'UserStatus'),
     Enum('UserStatus', ['ACTIVE', 'DELETED']),

diff --git a/tests/test_introspection_graphql.py b/tests/test_introspection_graphql.py
@@ -607,14 +607,48 @@ def serialize(cls, value: int) -> str:
         ),
         _type('Query', 'OBJECT', fields=[
             _field('user', _obj('User'), args=[
-                _ival('uid', _non_null(_scalar('UserId')), defaultValue='uid1'),
-                _ival('uidMany', _seq_of(_scalar('UserId')), defaultValue=['uid1']),
-                _ival('uidMaybe', _scalar('UserId'), defaultValue=None),
+                _ival('uid', _non_null(_scalar('UserId')), defaultValue='"uid1"'),
+                _ival('uidMany', _seq_of(_scalar('UserId')), defaultValue='["uid1"]'),
+                _ival('uidMaybe', _scalar('UserId'), defaultValue="null"),
             ]),
         ], ),
         _type('UserId', 'SCALAR'),
     ]) == introspect(graph)
 
+
+def test_custom_int_scalar():
+    class UserIdInt(Scalar):
+        @classmethod
+        def parse(cls, value: int) -> int:
+            return int(value)
+
+        @classmethod
+        def serialize(cls, value: int) -> int:
+            return int(value)
+
+    graph = Graph([
+        Root([
+            Field(
+                'userId',
+                UserIdInt,
+                _noop,
+                options=[
+                    Option('uid', UserIdInt, default=1),
+                ]
+            ),
+        ]),
+    ], scalars=[UserIdInt])
+
+    assert _schema([
+        _type('Query', 'OBJECT', fields=[
+            _field('userId', _non_null(_scalar('UserIdInt')), args=[
+                _ival('uid', _non_null(_scalar('UserIdInt')), defaultValue='1'),
+            ]),
+        ], ),
+        _type('UserIdInt', 'SCALAR'),
+    ]) == introspect(graph)
+
+
 @pytest.mark.parametrize('name, expected', [
     ('YesNo', {'kind': 'SCALAR'}),
     ('XXX', None),