2
0
Эх сурвалжийг харах

Fix README example; Style nits;

bjorn 9 жил өмнө
parent
commit
ad54a12199

+ 5 - 5
graphql/execute.lua

@@ -166,7 +166,7 @@ local function completeValue(fieldType, result, subSelections, context)
 
 
   if fieldTypeName == 'List' then
   if fieldTypeName == 'List' then
     if result == cjson.empty_array then return result end
     if result == cjson.empty_array then return result end
-    
+
     local innerType = fieldType.ofType
     local innerType = fieldType.ofType
 
 
     if type(result) ~= 'table' then
     if type(result) ~= 'table' then
@@ -203,6 +203,7 @@ local function getFieldEntry(objectType, object, fields, context)
   local fieldName = firstField.name.value
   local fieldName = firstField.name.value
   local responseKey = getFieldResponseKey(firstField)
   local responseKey = getFieldResponseKey(firstField)
   local fieldType
   local fieldType
+
   if fieldName == '__schema' then
   if fieldName == '__schema' then
     fieldType = introspection.SchemaMetaFieldDef
     fieldType = introspection.SchemaMetaFieldDef
   elseif fieldName == '__type' then
   elseif fieldName == '__type' then
@@ -224,7 +225,7 @@ local function getFieldEntry(objectType, object, fields, context)
 
 
   local arguments = util.map(fieldType.arguments or {}, function(argument, name)
   local arguments = util.map(fieldType.arguments or {}, function(argument, name)
     local supplied = argumentMap[name] and argumentMap[name].value
     local supplied = argumentMap[name] and argumentMap[name].value
-    return supplied and util.coerceValue(argumentMap[name].value, argument.kind, context.variables) or argument.defaultValue
+    return supplied and util.coerceValue(supplied, argument, context.variables) or argument.defaultValue
   end)
   end)
 
 
   local info = {
   local info = {
@@ -240,10 +241,9 @@ local function getFieldEntry(objectType, object, fields, context)
   }
   }
 
 
   local resolvedObject = (fieldType.resolve or defaultResolver)(object, arguments, info)
   local resolvedObject = (fieldType.resolve or defaultResolver)(object, arguments, info)
-
   local subSelections = mergeSelectionSets(fields)
   local subSelections = mergeSelectionSets(fields)
-  local responseValue = completeValue(fieldType.kind, resolvedObject, subSelections, context)
-  return responseValue
+
+  return completeValue(fieldType.kind, resolvedObject, subSelections, context)
 end
 end
 
 
 evaluateSelections = function(objectType, object, selections, context)
 evaluateSelections = function(objectType, object, selections, context)

+ 0 - 2
graphql/introspection.lua

@@ -587,6 +587,4 @@ return {
   SchemaMetaFieldDef = SchemaMetaFieldDef,
   SchemaMetaFieldDef = SchemaMetaFieldDef,
   TypeMetaFieldDef = TypeMetaFieldDef,
   TypeMetaFieldDef = TypeMetaFieldDef,
   TypeNameMetaFieldDef = TypeNameMetaFieldDef
   TypeNameMetaFieldDef = TypeNameMetaFieldDef
-
 }
 }
-