style fixes during review 2

Author: SudoBobo

Makefile

@@ -8,6 +8,7 @@ lint:
 		test/testdata/*.lua \
 		test/common/*.test.lua test/common/lua/*.lua \
 		test/extra/*.test.lua \
+		test/*.lua \
 		--no-redefined --no-unused-args
 
 .PHONY: test

graphql/core/execute.lua

@@ -70,7 +70,7 @@ end
 
 local evaluateSelections
 
-local function completeValue(fieldType, result, subSelections, context)
+local function completeValue(fieldType, result, subSelections, context, resolvedType)
   local fieldTypeName = fieldType.__type
 
   if fieldTypeName == 'NonNull' then
@@ -111,7 +111,12 @@ local function completeValue(fieldType, result, subSelections, context)
     local fields = evaluateSelections(fieldType, result, subSelections, context)
     return next(fields) and fields or context.schema.__emptyObject
   elseif fieldTypeName == 'Interface' or fieldTypeName == 'Union' then
-    local objectType = fieldType.resolveType(result)
+
+    local objectType = resolvedType or fieldType.resolveType(result)
+    if objectType.__type == 'NonNull' then
+      objectType = objectType.ofType
+    end
+
     return evaluateSelections(objectType, result, subSelections, context)
   end
 
@@ -151,10 +156,10 @@ local function getFieldEntry(objectType, object, fields, context)
     qcontext = context.qcontext
   }
 
-  local resolvedObject = (fieldType.resolve or defaultResolver)(object, arguments, info)
+  local resolvedObject, resolvedType = (fieldType.resolve or defaultResolver)(object, arguments, info)
   local subSelections = query_util.mergeSelectionSets(fields)
 
-  return completeValue(fieldType.kind, resolvedObject, subSelections, context)
+  return completeValue(fieldType.kind, resolvedObject, subSelections, context, resolvedType)
 end
 
 evaluateSelections = function(objectType, object, selections, context)

graphql/core/rules.lua

@@ -326,7 +326,9 @@ function rules.fragmentSpreadIsPossible(node, context)
     local kind = kind
     -- Graphql-lua does not this check correctly in the case of NonNull
     -- wrapped fragment types. Next line fixes that
-    if kind.__type == 'NonNull' then kind = kind.ofType end
+    if kind.__type == 'NonNull' then
+      kind = kind.ofType
+    end
     return fragmentTypes[kind]
   end)
 

graphql/core/types.lua

@@ -155,7 +155,9 @@ end
 function types.union(config)
   assert(type(config.name) == 'string', 'type name must be provided as a string')
   assert(type(config.types) == 'table', 'types table must be provided')
-  assert(type(config.resolveType) == 'function', 'must provide resolveType as a function')
+  if config.resolveType then
+    assert(type(config.resolveType) == 'function', 'must provide resolveType as a function')
+  end
 
   local instance = {
     __type = 'Union',

graphql/tarantool_graphql.lua

@@ -300,17 +300,17 @@ local parent_args_values = function(parent, connection_parts)
     local destination_args_values = {}
     for _, part in ipairs(connection_parts) do
         assert(type(part.source_field) == 'string',
-        'part.source_field must be a string, got ' ..
-        type(part.destination_field))
+            'part.source_field must be a string, got ' ..
+            type(part.destination_field))
         assert(type(part.destination_field) == 'string',
-        'part.destination_field must be a string, got ' ..
-        type(part.destination_field))
+            'part.destination_field must be a string, got ' ..
+            type(part.destination_field))
 
         destination_args_names[#destination_args_names + 1] =
-        part.destination_field
+            part.destination_field
         local value = parent[part.source_field]
         destination_args_values[#destination_args_values + 1] =
-        value
+            value
     end
 
     return destination_args_names, destination_args_values
@@ -475,8 +475,6 @@ local convert_union_connection = function(state, connection, collection_name)
     local collection_to_arguments = {}
     local collection_to_list_arguments = {}
 
-    local determinant_to_variant = {}
-
     for _, v in ipairs(c.variants) do
         assert(v.determinant, 'each variant should have a determinant')
             assert(type(v.determinant) == 'table', 'variant\'s determinant ' ..
@@ -493,13 +491,12 @@ local convert_union_connection = function(state, connection, collection_name)
             ('destination_type (named %s) must not be nil'):format(
                 v.destination_collection))
 
-        determinant_to_variant[v.determinant] = v
-
-
         local v_args = args_from_destination_collection(state,
             v.destination_collection, c.type)
         destination_type = specify_destination_type(destination_type, c.type)
 
+
+
         local v_list_args = state.list_arguments[v.destination_collection]
 
         union_types[#union_types + 1] = destination_type
@@ -508,30 +505,21 @@ local convert_union_connection = function(state, connection, collection_name)
         collection_to_list_arguments[v.destination_collection] = v_list_args
     end
 
-
-    local resolveType = function(result)
-        for _, v in pairs(c.variants) do
-            local dest_collection =
-                state.nullable_collection_types[v.destination_collection]
-            if utils.do_have_keys(result, utils.get_keys(dest_collection.fields)) then
-                return dest_collection
-            end
-        end
-    end
-
     local determinant_keys = utils.get_keys(c.variants[1].determinant)
 
-    local resolve_variant = function(parent)
+    local resolve_variant = function (parent)
         assert(utils.do_have_keys(parent, determinant_keys),
             ('Parent object of union object doesn\'t have determinant ' ..
             'fields which are necessary to determine which resolving ' ..
             'variant should be used. Union parent object:\n"%s"\n' ..
             'Determinant keys:\n"%s"'):
             format(yaml.encode(parent), yaml.encode(determinant_keys)))
 
+        local variant_num
         local resulting_variant
-        for determinant, variant in pairs(determinant_to_variant) do
-            local is_match = utils.is_subtable(parent, determinant)
+        for i, variant in ipairs(c.variants) do
+            variant_num = i
+            local is_match = utils.is_subtable(parent, variant.determinant)
 
             if is_match then
                 resulting_variant = variant
@@ -541,16 +529,19 @@ local convert_union_connection = function(state, connection, collection_name)
 
         assert(resulting_variant, ('Variant resolving failed.'..
             'Parent object: "%s"\n'):format(yaml.encode(parent)))
-        return resulting_variant
+        return resulting_variant, variant_num
     end
 
     local field = {
         name = c.name,
-        kind = types.union({name = c.name, types = union_types,
-                            resolveType = resolveType}),
+        kind = types.union({
+            name = c.name,
+            types = union_types,
+        }),
         arguments =  nil,
         resolve = function(parent, args_instance, info)
-            local v = resolve_variant(parent)
+            local v, variant_num = resolve_variant(parent)
+            local destination_type = union_types[variant_num]
             local destination_collection =
                 state.nullable_collection_types[v.destination_collection]
             local destination_args_names, destination_args_values =
@@ -571,7 +562,7 @@ local convert_union_connection = function(state, connection, collection_name)
                             'collection "%s"'):format(json.encode(parent),
                                 tostring(collection_name)))
                     end
-                    return c.type == '1:N' and {} or nil
+                    return c.type == '1:N' and {} or nil, destination_type
             end
 
             local from = {
@@ -605,9 +596,9 @@ local convert_union_connection = function(state, connection, collection_name)
                 -- situation above
                 assert(#objs == 1, 'expect one matching object, got ' ..
                     tostring(#objs))
-                return objs[1]
+                return objs[1], destination_type
             else -- c.type == '1:N'
-                return objs
+                return objs, destination_type
             end
         end
     }

graphql/utils.lua

@@ -13,8 +13,6 @@ function utils.show_trace(func, ...)
         function(err)
             log.info('ERROR: ' .. tostring(err))
             log.info(debug.traceback())
-            print('ERROR: ' .. tostring(err))
-            print(debug.traceback())
         end
     ))
 end