New attempt with the Type system and Schema definition

Author: Håkan Rosenhorn

src/main/scala/se/uprise/graphql/execution/Executor.scala

@@ -2,7 +2,7 @@ package se.uprise.graphql.execution
 
 import org.antlr.v4.runtime.ParserRuleContext
 import se.uprise.graphql.error.{GraphQLError, GraphQLFormattedError}
-import se.uprise.graphql.types.{GraphQLObjectType, GraphQLSchema}
+import se.uprise.graphql.types._
 import se.uprise.parser.GraphQlParser
 import se.uprise.parser.GraphQlParser._
 import scala.collection.JavaConversions._
@@ -75,20 +75,21 @@ object Executor {
  * for "read" mode.
  */
  // FIXME: Better type than Any
+ // FIXME: Support for futures
  def executeFields(exeContext: ExecutionContext,
- parentType: GraphQLObjectType,
+ parentType: Class[_ <: GraphQLObjectType],
  source: Any,
  fields: Map[String, List[SelectionContext]]): Any = {
 
+ val finalResults = fields.keys.reduceLeft((results, responseName) => {
+ val fieldASTs = fields(responseName)
+ val result = resolveField(exeContext, parentType, source, fieldASTs)
+ ""
+ })
 
-// fields.keys.reduceLeft((results, responseName) => {
-// val fieldASTs = fields(responseName)
-// val result = resolveField(exeContext, parentType, source, fieldASTs)
-// })
-
+ finalResults
  //selectionSet.selection().foldLeft(fields)((result, selection) =>
  true
-
  }
 
  /**
@@ -99,20 +100,46 @@ object Executor {
  */
  // FIXME: Better return type
  def resolveField(exeContext: ExecutionContext,
- parentType: GraphQLObjectType,
+ parentType: Class[_ <: GraphQLObjectType],
  source: Any,
  fieldASTs: List[SelectionContext]): Any = {
+ val fieldAST = fieldASTs.head
+ val fieldDef = getFieldDef(exeContext.schema, parentType, fieldAST)
+
+
  //parentType.
 
  }
 
+ /**
+ * This method looks up the field on the given type defintion.
+ * It has special casing for the two introspection fields, __schema
+ * and __typename. __typename is special because it can always be
+ * queried as a field, even in situations where no other fields
+ * are allowed, like on a Union. __schema could get automatically
+ * added to the query type, but that would require mutating type
+ * definitions, which would cause issues.
+ */
+
+ def getFieldDef(schema: GraphQLSchema,
+ parentType: Class[_ <: GraphQLObjectType],
+ fieldAST: SelectionContext): GraphQLOutputType = {
+ val name = fieldAST.field().fieldName().NAME().getText
+
+ //FIXME: Implement support for the introspection
+
+ //parentType.getFields(name)
+ // FIXME
+ null
+ }
+
 
  /**
  * Given a selectionSet, adds all of the fields in that selection to
  * the passed in map of fields, and returns it at the end.
  */
  def collectFields(exeContext: ExecutionContext,
- typ: GraphQLObjectType,
+ typ: Class[_ <: GraphQLObjectType],
  selectionSet: SelectionSetContext,
  fields: Map[String, List[SelectionContext]] = Map.empty,
  visitedFragmentNames: Map[String, Boolean] = Map.empty): Map[String, List[SelectionContext]] = {
@@ -173,7 +200,7 @@ object Executor {
  // FIXME: Implement properly
  def doesFragmentConditionMatch(exeContext: ExecutionContext,
  fragment: ParserRuleContext,
- typ: GraphQLObjectType): Boolean = {
+ typ: Class[_ <: GraphQLObjectType]): Boolean = {
  return true
  }
 
@@ -203,7 +230,7 @@ object Executor {
  * Extracts the root type of the operation from the schema.
  */
  def getOperationRootType(schema: GraphQLSchema,
- operation: OperationDefinitionContext): GraphQLObjectType = {
+ operation: OperationDefinitionContext): Class[_ <: GraphQLObjectType] = {
  operation.operationType().getText match {
  case "query" => schema.query
  case "mutation" => schema.mutation match {

src/main/scala/se/uprise/graphql/types/GraphQLEnumType.scala

@@ -1,5 +1,3 @@
 package se.uprise.graphql.types
 
-trait GraphQLEnumType extends GraphQLOutputType with GraphQLMetadata {
- protected def enum(name: String, value: Any, description: String = null, deprecationReason: String = null) = {}
-}
+trait GraphQLEnumType extends GraphQLOutputType

src/main/scala/se/uprise/graphql/types/GraphQLFieldDefinition.scala

@@ -1,3 +1,14 @@
 package se.uprise.graphql.types
 
-trait GraphQLInputType
+/**
+ * These types may be used as input types for arguments and directives.
+ */
+trait GraphQLInputType extends GraphQLType
+
+/*
+ GraphQLScalarType |
+ GraphQLEnumType |
+ GraphQLInputObjectType |
+ GraphQLList |
+ GraphQLNonNull;
+ */

src/main/scala/se/uprise/graphql/types/GraphQLInputType.scala

@@ -1,8 +1,4 @@
 package se.uprise.graphql.types
 
-trait GraphQLInterfaceType extends GraphQLObjectType with GraphQLMetadata with GraphQLFields {
- def resolveType(value: Any): Class[_ <: GraphQLObjectType] = {
- // FIXME: Try default resolve with getTypeOf
- null
- }
-}
+trait GraphQLInterfaceType extends GraphQLOutputType {
+}

src/main/scala/se/uprise/graphql/types/GraphQLInterfaceType.scala

@@ -1,3 +1,5 @@
 package se.uprise.graphql.types
 
-class GraphQLList[T <: GraphQLOutputType] extends GraphQLOutputType
+class GraphQLList[T <: GraphQLType](input: List[T]) extends GraphQLOutputType with GraphQLInputType {
+
+}

src/main/scala/se/uprise/graphql/types/GraphQLList.scala

@@ -1,3 +1,3 @@
 package se.uprise.graphql.types
 
-class GraphQLNonNull[T <: GraphQLOutputType] extends GraphQLOutputType
+trait GraphQLNonNull extends GraphQLOutputType

src/main/scala/se/uprise/graphql/types/GraphQLNonNull.scala

@@ -1,5 +1,5 @@
 package se.uprise.graphql.types
 
-trait GraphQLObjectType extends GraphQLOutputType with GraphQLMetadata with GraphQLFields {
- def interfaces: List[Class[_ <: GraphQLInterfaceType]] = List()
+trait GraphQLObjectType extends GraphQLOutputType {
+
 }

src/main/scala/se/uprise/graphql/types/GraphQLObjectType.scala

@@ -1,6 +1,15 @@
 package se.uprise.graphql.types
 
 /**
- * Created by Håkan Rosenhorn on 2015-07-09.
+ * These types may be used as output types as the result of fields.
  */
-trait GraphQLOutputType
+trait GraphQLOutputType extends GraphQLType
+/*
+ GraphQLScalarType |
+ GraphQLObjectType |
+ GraphQLInterfaceType |
+ GraphQLUnionType |
+ GraphQLEnumType |
+ GraphQLList |
+ GraphQLNonNull;
+ */

src/main/scala/se/uprise/graphql/types/GraphQLOutputType.scala

@@ -1,35 +1,10 @@
 package se.uprise.graphql.types
 
-trait GraphQLScalarType extends GraphQLOutputType {
+trait GraphQLScalarType extends GraphQLOutputType with GraphQLInputType {
  val name: String = ""
  val description: String = ""
- def coerce(value: String): Boolean = true
- def coerceLiteral(value: String): String = "Todo"
 }
 
-class GraphQLString extends GraphQLScalarType {
+case class GraphQLString(value: String) extends GraphQLScalarType {
  override val name: String = "String"
-}
-
-class GraphQLBoolean extends GraphQLScalarType {
- override val name: String = "Boolean"
-}
-
-class GraphQLID extends GraphQLScalarType {
- override val name: String = "ID"
-}
-
-class GraphQLFloat extends GraphQLScalarType {
- override val name: String = "Float"
-}
-
-// Integers are only safe when between -(2^53 - 1) and 2^53 - 1 due to being
-// encoded in JavaScript and represented in JSON as double-precision floating
-// point numbers, as specified by IEEE 754.
-
-class GraphQLInt extends GraphQLScalarType {
- override val name: String = "Int"
-
- val MAX_INT = 9007199254740991L
- val MIN_INT = -9007199254740991L
-}
+}