Deduplicate typeFromAST code

Author: Totktonada

graphql/core/query_util.lua

@@ -7,10 +7,10 @@ local query_util = {}
 function query_util.typeFromAST(node, schema)
   local innerType
   if node.kind == 'listType' then
-    innerType = query_util.typeFromAST(node.type)
+    innerType = query_util.typeFromAST(node.type, schema)
     return innerType and types.list(innerType)
   elseif node.kind == 'nonNullType' then
-    innerType = query_util.typeFromAST(node.type)
+    innerType = query_util.typeFromAST(node.type, schema)
     return innerType and types.nonNull(innerType)
   else
     assert(node.kind == 'namedType', 'Variable must be a named type')

graphql/core/rules.lua

@@ -3,6 +3,7 @@ local types = require(path .. '.types')
 local util = require(path .. '.util')
 local schema = require(path .. '.schema')
 local introspection = require(path .. '.introspection')
+local query_util = require(path .. '.query_util')
 
 local function getParentField(context, name, count)
   if introspection.fieldMap[name] then return introspection.fieldMap[name] end
@@ -490,21 +491,8 @@ function rules.variableUsageAllowed(node, context)
           local variableDefinition = variableMap[variableName]
           local hasDefault = variableDefinition.defaultValue ~= nil
 
-          local function typeFromAST(variable)
-            local innerType
-            if variable.kind == 'listType' then
-              innerType = typeFromAST(variable.type)
-              return innerType and types.list(innerType)
-            elseif variable.kind == 'nonNullType' then
-              innerType = typeFromAST(variable.type)
-              return innerType and types.nonNull(innerType)
-            else
-              assert(variable.kind == 'namedType', 'Variable must be a named type')
-              return context.schema:getType(variable.name.value)
-            end
-          end
-
-          local variableType = typeFromAST(variableDefinition.type)
+          local variableType = query_util.typeFromAST(variableDefinition.type,
+            context.schema)
 
           if hasDefault and variableType.__type ~= 'NonNull' then
             variableType = types.nonNull(variableType)