Merge pull request #38 from graphql-go/improvements

{executor,extractor}: consolidates executor execute return related types.

Author: chris-ramon

executor/executor.go

@@ -18,11 +18,13 @@ func New() *Executor {
 
 // ExecuteResult is the result of the execute method.
 type ExecuteResult struct {
-	Result string
+	// ImplementationIntrospection is the introspection result of a graphql implementation.
+	ImplementationIntrospection types.ImplementationIntrospection
 }
 
 // ExecuteParams is the params of the execute method.
 type ExecuteParams struct {
+	// Implementation is the implementation parameter.
 	Implementation types.Implementation
 }
 
@@ -32,12 +34,12 @@ func (e *Executor) Execute(params ExecuteParams) (*ExecuteResult, error) {
 		Query: params.Implementation.Introspection.Query,
 	}
 
-	result, err := e.goExecutor.Run(runParams)
+	runResult, err := e.goExecutor.Run(runParams)
 	if err != nil {
 		return nil, err
 	}
 
 	return &ExecuteResult{
-		Result: result.Result,
+		ImplementationIntrospection: runResult.ImplementationIntrospection,
 	}, nil
 }

executor/go.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 
 	"github.com/graphql-go/graphql"
+
+	"graphql-go/compatibility-standard-definitions/types"
 )
 
 // Go handles the go execution of a introspection query.
@@ -46,7 +48,8 @@ type RunParams struct {
 
 // RunResult represents the result of the run method.
 type RunResult struct {
-	Result string
+	// ImplementationIntrospection is the result of an introspection of a graphql implementation.
+	ImplementationIntrospection types.ImplementationIntrospection
 }
 
 // Run runs and returns a given introspection query.
@@ -77,12 +80,22 @@ func (g *Go) Run(params *RunParams) (*RunResult, error) {
 		return nil, joinedErrs
 	}
 
-	result, err := json.Marshal(doResult)
+	doResultData, err := json.Marshal(doResult.Data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to do marshal: %w", err)
 	}
 
+	introspectionResult := &types.IntrospectionQueryResult{}
+
+	if err := json.Unmarshal([]byte(doResultData), introspectionResult); err != nil {
+		return nil, err
+	}
+
+	implementationIntrospection := types.ImplementationIntrospection{
+		QueryResult: *introspectionResult,
+	}
+
 	return &RunResult{
-		Result: string(result),
+		ImplementationIntrospection: implementationIntrospection,
 	}, nil
 }

extractor/extractor.go

@@ -115,13 +115,14 @@ func (e *Extractor) extractImplementation(implementation types.Implementation) (
 		Query: string(introspectionQuery),
 	}
 
-	if _, err := e.executor.Execute(executor.ExecuteParams{
+	executeResult, err := e.executor.Execute(executor.ExecuteParams{
 		Implementation: implementation,
-	}); err != nil {
+	})
+	if err != nil {
 		return nil, fmt.Errorf("failed to execute: %w", err)
 	}
 
-	return &types.ImplementationIntrospection{}, nil
+	return &executeResult.ImplementationIntrospection, nil
 }
 
 // parseSpec parses and returns the introspection result of the graphql specification