Merge pull request #28 from LiUGraphQL/mixing-of-parts-from-the-DB-schema-and-API-schema

resolve issue #27

Author: keski

graphql-api-generator/generator.py

@@ -94,8 +94,13 @@ def run(schema: GraphQLSchema, config: dict):
             schema = add_enum_filters(schema)
             schema = add_scalar_filters(schema)
             schema = add_type_filters(schema)
+
+        # remove field arguments for edges (should not be in the API schema)
+        schema = remove_field_arguments_for_types(schema)
+
         if config.get('generation').get('query_type_filter'):
             schema = add_object_type_filters(schema)
+
         if config.get('generation').get('query_list_of'):
             schema = add_list_of_types(schema)
             schema = add_list_queries(schema)

graphql-api-generator/resources/schema.graphql

@@ -1,39 +1,5 @@
-"""This comment is bound to the next type"""
-interface Pet {
-    """This comment is bound to the next field"""
-    name: String!
-}
-
-type Toy {
-    name: String
-}
-
-enum Type {
-    K
-    A
-    C
-    B
-}
-
-type Dog implements Pet {
-    toys: [Toy]
-    name: String!
-    race: Race
-    b: String
-    d: String
-    a: String
-    c: String
-}
-
-type Hero {
-    pets: [Pet]
-}
+scalar Date
 
-enum Race {
-    DOBBERMAN
-    Affenpinscher
-    Afghan_Hound
-    Afghan_Shepherd
+type Person {
+    marriedTo(since: Date!): Person
 }
-
-scalar Date

graphql-api-generator/utils/utils.py

@@ -411,7 +411,7 @@ def add_type_filters(schema: GraphQLSchema):
     return schema
 
 
-def add_object_type_filters(schema):
+def add_object_type_filters(schema: GraphQLSchema):
     for _type in schema.type_map.values():
         if not is_schema_defined_type(_type):
             continue
@@ -426,6 +426,15 @@ def add_object_type_filters(schema):
     return schema
 
 
+def remove_field_arguments_for_types(schema: GraphQLSchema):
+    for _type in schema.type_map.values():
+        if not is_schema_defined_type(_type):
+            continue
+        for field_name, field in _type.fields.items():
+            field.args = {}
+    return schema
+
+
 def add_enum_filters(schema: GraphQLSchema):
     """
     Add filter inputs for enums (Hasura-style).