allow types to be serialized

Author: chrissm79

src/Commands/CacheCommand.php

@@ -37,7 +37,7 @@ class CacheCommand extends Command
     public function __construct(FileStore $cache)
     {
         parent::__construct();
-
+        
         $this->cache = $cache;
     }
 

src/Schema/GraphQL.php

@@ -11,6 +11,7 @@
 use GraphQL\Type\Definition\InterfaceType;
 use Illuminate\Support\Collection;
 use Illuminate\Database\Eloquent\Model;
+use SuperClosure\SerializableClosure;
 
 use Nuwave\Relay\Support\ValidationError;
 use Nuwave\Relay\Support\Definition\RelayType;
@@ -263,10 +264,12 @@ public function connection($name, $resolve = null, $fresh = false)
     {
         $this->checkType($name);
 
-        if ($resolve && !$resolve instanceof Closure) {
-            $resolve = function ($root, array $args, ResolveInfo $info) use ($resolve) {
-                return $this->resolveConnection($root, $args, $info, $resolve);
-            };
+        if (!is_null($resolve) && !$resolve instanceof Closure) {
+            $connectionResolver = $this->getConnectionResolver();
+
+            $resolve = new SerializableClosure(function ($root, array $args, ResolveInfo $info) use ($resolve, $connectionResolver) {
+                return $connectionResolver->resolve($root, $args, $info, $resolve);
+            });
         }
 
         if (!$fresh && $this->connectionInstances->has($name)) {

src/Support/Definition/EdgeType.php

@@ -46,30 +46,14 @@ public function fields()
     {
         return [
             'node' => [
-                'type' => function () {
-                    if (is_object($this->type)) {
-                        return $this->type;
-                    }
-
-                    return $this->getNodeType($this->type);
-                },
+                'type' => array($this, 'nodeType'),
                 'description' => 'The item at the end of the edge.',
-                'resolve' => function ($edge) {
-                    return $edge;
-                },
+                'resolve' => array($this, 'edge'),
             ],
             'cursor' => [
                 'type' => Type::nonNull(Type::string()),
                 'description' => 'A cursor for use in pagination.',
-                'resolve' => function ($edge) {
-                    if (is_array($edge) && isset($edge['relayCursor'])) {
-                        return $edge['relayCursor'];
-                    } elseif (is_array($edge->attributes)) {
-                        return $edge->attributes['relayCursor'];
-                    }
-
-                    return $edge->relayCursor;
-                },
+                'resolve' => array($this, 'resolveCursor'),
             ]
         ];
     }
@@ -98,6 +82,48 @@ public function toType()
         return new ObjectType($this->toArray());
     }
 
+    /**
+     * Type of node.
+     *
+     * @return mixed
+     */
+    public function nodeType()
+    {
+        if (is_object($this->type)) {
+            return $this->type;
+        }
+
+        return $this->getNodeType($this->type);
+    }
+
+    /**
+     * Resolve node at end of edge.
+     *
+     * @param  mixed $edge
+     * @return mixed
+     */
+    public function resolveNode($edge)
+    {
+        return $edge;
+    }
+
+    /**
+     * Resolve cursor for edge.
+     *
+     * @param  mixed $edge
+     * @return string
+     */
+    public function resolveCursor($edge)
+    {
+        if (is_array($edge) && isset($edge['relayCursor'])) {
+            return $edge['relayCursor'];
+        } elseif (is_array($edge->attributes)) {
+            return $edge->attributes['relayCursor'];
+        }
+
+        return $edge->relayCursor;
+    }
+
     /**
      * Get node at the end of the edge.
      *

src/Support/Definition/GraphQLMutation.php

@@ -7,33 +7,6 @@
 
 class GraphQLMutation extends GraphQLField
 {
-    /**
-     * The validator instance.
-     *
-     * @var \Illuminate\Validation\Factory
-     */
-    protected $validator;
-
-    /**
-     * The container instance of GraphQL.
-     *
-     * @var \Laravel\Lumen\Application|mixed
-     */
-    protected $graphQL;
-
-    /**
-     * GraphQLMutation constructor.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->validator = app('validator');
-
-        $this->graphQL = app('graphql');
-    }
-
     /**
      * Get the validation rules.
      *
@@ -105,7 +78,7 @@ protected function validate(array $args)
         $rules = $this->getRules(...$args);
 
         if (sizeof($rules)) {
-            $validator = $this->validator->make($args['input'], $rules);
+            $validator = app('validator')->make($args['input'], $rules);
 
             if ($validator->fails()) {
                 throw with(new ValidationError('Validation failed', $validator));

src/Support/Definition/GraphQLType.php

@@ -9,24 +9,6 @@
 
 class GraphQLType extends Fluent
 {
-    /**
-     * The container instance of GraphQL.
-     *
-     * @var \Laravel\Lumen\Application|mixed
-     */
-    protected $graphQL;
-
-    /**
-     * GraphQLType constructor.
-     *
-     */
-    public function __construct()
-    {
-        parent::__construct();
-
-        $this->graphQL = app('graphql');
-    }
-
     /**
      * Type fields.
      *

src/Support/Definition/PageInfoType.php

@@ -33,53 +33,89 @@ public function fields()
             'hasNextPage' => [
                 'type' => Type::nonNull(Type::boolean()),
                 'description' => 'When paginating forwards, are there more items?',
-                'resolve' => function ($collection) {
-                    if ($collection instanceof LengthAwarePaginator) {
-                        return $collection->hasMorePages();
-                    }
-
-                    return false;
-                }
+                'resolve' => array($this, 'resolveHasNextPage')
             ],
             'hasPreviousPage' => [
                 'type' => Type::nonNull(Type::boolean()),
                 'description' => 'When paginating backwards, are there more items?',
-                'resolve' => function ($collection) {
-                    if ($collection instanceof LengthAwarePaginator) {
-                        return $collection->currentPage() > 1;
-                    }
-
-                    return false;
-                }
+                'resolve' => array($this, 'resolveHasPreviousPage')
             ],
             'startCursor' => [
                 'type' => Type::string(),
                 'description' => 'When paginating backwards, the cursor to continue.',
-                'resolve' => function ($collection) {
-                    if ($collection instanceof LengthAwarePaginator) {
-                        return $this->encodeGlobalId(
-                            'arrayconnection',
-                            $collection->firstItem() * $collection->currentPage()
-                        );
-                    }
-
-                    return null;
-                }
+                'resolve' => array($this, 'resolveStartCursor')
             ],
             'endCursor' => [
                 'type' => Type::string(),
                 'description' => 'When paginating forwards, the cursor to continue.',
-                'resolve' => function ($collection) {
-                    if ($collection instanceof LengthAwarePaginator) {
-                        return $this->encodeGlobalId(
-                            'arrayconnection',
-                            $collection->lastItem() * $collection->currentPage()
-                        );
-                    }
-
-                    return null;
-                }
+                'resolve' => array($this, 'resolveEndCursor')
             ]
         ];
     }
+
+    /**
+     * Determine if collection has a next page.
+     *
+     * @param  mixed $collection
+     * @return boolean
+     */
+    public function resolveHasNextPage($collection)
+    {
+        if ($collection instanceof LengthAwarePaginator) {
+            return $collection->hasMorePages();
+        }
+
+        return false;
+    }
+
+    /**
+     * Determine if collection has previous page.
+     *
+     * @param  mixed $collection
+     * @return boolean
+     */
+    public function resolveHasPreviousPage($collection)
+    {
+        if ($collection instanceof LengthAwarePaginator) {
+            return $collection->currentPage() > 1;
+        }
+
+        return false;
+    }
+
+    /**
+     * Resolve start cursor for edge.
+     *
+     * @param  mixed $collection
+     * @return string|null
+     */
+    public function startCursor($collection)
+    {
+        if ($collection instanceof LengthAwarePaginator) {
+            return $this->encodeGlobalId(
+                'arrayconnection',
+                $collection->firstItem() * $collection->currentPage()
+            );
+        }
+
+        return null;
+    }
+
+    /**
+     * Resolve end cursor for edge.
+     *
+     * @param  mixed $collection
+     * @return string|null
+     */
+    public function resolveEndCursor($collection)
+    {
+        if ($collection instanceof LengthAwarePaginator) {
+            return $this->encodeGlobalId(
+                'arrayconnection',
+                $collection->lastItem() * $collection->currentPage()
+            );
+        }
+
+        return null;
+    }
 }

src/Support/Definition/RelayConnectionType.php

@@ -67,16 +67,12 @@ protected function baseFields()
             'pageInfo' => [
                 'type' => Type::nonNull(GraphQL::type('pageInfo')),
                 'description' => 'Information to aid in pagination.',
-                'resolve' => function ($collection) {
-                    return $collection;
-                },
+                'resolve' => array($this, 'resolvePageInfo'),
             ],
             'edges' => [
                 'type' => Type::listOf($this->buildEdgeType($this->name, $type)),
                 'description' => 'Information to aid in pagination.',
-                'resolve' => function ($collection) {
-                    return $this->injectCursor($collection);
-                },
+                'resolve' => array($this, 'resolveInjectCursor'),
             ]
         ];
     }
@@ -175,9 +171,7 @@ public function toArray()
             'name' => ucfirst($this->name),
             'description' => 'A connection to a list of items.',
             'fields' => $fields,
-            'resolve' => function ($root, $args, ResolveInfo $info) {
-                return $this->resolve($root, $args, $info, $this->name);
-            }
+            'resolve' => array($this, 'resolve')
         ];
     }
 
@@ -250,4 +244,14 @@ public function type()
     {
         return null;
     }
+
+    public function resolvePageInfo($collection)
+    {
+        return $collection;
+    }
+
+    public function resolveInjectCursor($collection)
+    {
+        return $this->injectCursor($collection);
+    }
 }

src/Support/Definition/RelayType.php

@@ -51,7 +51,9 @@ protected function connections()
      */
     public function getConnections()
     {
-        return collect($this->connections())->transform(function ($edge, $name) {
+        $graphql = app('graphql');
+
+        return collect($this->connections())->transform(function ($edge, $name) use ($graphql) {
             if (!isset($edge['resolve'])) {
                 $edge['resolve'] = function ($root, array $args, ResolveInfo $info) use ($name) {
                     return GraphQL::resolveConnection($root, $args, $info, $name);