resolve issue #100 for type and interface (#102)

* checkout from union branch

* add support for unions in graphql-resolver-generator

* add __type name as field to created edges and types

* update changelog

Author: keski

CHANGELOG.md

@@ -1,5 +1,6 @@
 **v0.1.4, to be released on ???**
 * New feature: Add support for unions. See: https://github.com/LiUGraphQL/woo.sh/issues/95
+* New feature: Encode the typename as part of the inserted object. See: https://github.com/LiUGraphQL/woo.sh/issues/100
 
 **v0.1.3, released on August 28, 2020**
 * New feature: Support for multiple *dependent* mutation operations within a single mutation request; https://github.com/LiUGraphQL/woo.sh/issues/52

graphql-api-generator/utils/utils.py

@@ -1216,7 +1216,6 @@ def print_schema_with_directives(schema):
     :return string:
     """
     manual_directives = {
-        'export': 'directive @export(as: String!) on FIELD',
         'required': 'directive @required on FIELD_DEFINITION',
         'key': 'directive @key(fields: [String!]!) on OBJECT | INPUT_OBJECT',
         'distinct': 'directive @distinct on FIELD_DEFINITION | INPUT_FIELD_DEFINITION',

graphql-resolver-generator/generator.py

@@ -41,6 +41,8 @@ def generate(input_file, output_dir, config: dict):
             continue
         if is_interface_type(_type):
             data['interfaces'].append(type_name)
+        if is_union_type(_type):
+            data['unions'].append(type_name)
         if is_edge_type(_type):
             if config.get('generation').get('query_edge_by_id'):
                 data['edge_objects'].append(type_name)

graphql-resolver-generator/resources/resolver.template

@@ -150,12 +150,26 @@ const resolvers = {
     % if interface_name.startswith('_'):
     ${interface_name}: {
         __resolveType: (parent, args, context, info) =>
-            '_' + parent._id.split('/')[0]
+            '_' + parent.__typename
     },
     % else:
     ${interface_name}: {
         __resolveType: (parent, args, context, info) =>
-            parent._id.split('/')[0]
+            parent.__typename
+    },
+    % endif
+% endfor
+
+% for union_name in data['unions']:
+    % if union_name.startswith('_'):
+    ${union_name}: {
+        __resolveType: (parent, args, context, info) =>
+            '_' + union_name.__typename
+    },
+    % else:
+    ${union_name}: {
+        __resolveType: (parent, args, context, info) =>
+            parent.__typename
     },
     % endif
 % endfor

graphql-server/drivers/arangodb/driver.js

@@ -348,6 +348,7 @@ function createEdge(isRoot, ctxt, varOrSourceID, sourceType, sourceField, varOrT
     // define doc
     const doc = annotations;
     doc['_creationDate'] = new Date().valueOf();
+    doc['__typename'] = `_${collectionName}`;
     const docVar = addParameterVar(ctxt, createParamVar(ctxt), doc);
 
     // validate edge
@@ -388,6 +389,7 @@ function create(isRoot, ctxt, data, returnType, info, resVar = null) {
     // get non-object fields, add creation date and add as parameter
     const doc = getScalarsAndEnums(data, returnType);
     doc['_creationDate'] = new Date().valueOf();
+    doc['__typename'] = returnType.name;
     const docVar = addParameterVar(ctxt, createParamVar(ctxt), doc);
 
     // create a new resVar if not defined by the calling function, resVar is the source vertex for all edges
@@ -643,6 +645,7 @@ function update(isRoot, ctxt, varOrID, data, returnType, info, resVar = null) {
     // get non-object fields, add creation date and add as parameter
     let doc = getScalarsAndEnums(data, returnType);
     doc['_lastUpdateDate'] = new Date().valueOf();
+    doc['__typename'] = returnType.name;
     let docVar = addParameterVar(ctxt, createParamVar(ctxt), doc);
 
     // create a new resVar if not defined by the calling function, resVar is the source vertex for all edges