TASK: Added top level GraphQLTools helper functions based on apollo docs

t3n · Nov 22, 2018 · 0d9444d · 0d9444d
2 parents 01d8e41 + c4ef693
commit 0d9444d
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 38 deletions.
diff --git a/src/GraphQLTools.php b/src/GraphQLTools.php
@@ -6,7 +6,10 @@
 
 use GraphQL\Language\AST\DocumentNode;
 use GraphQL\Type\Schema;
+use GraphQLTools\Generate\AddResolveFunctionsToSchema;
+use GraphQLTools\Generate\AddSchemaLevelResolveFunction;
 use GraphQLTools\Generate\BuildSchemaFromTypeDefinitions;
+use GraphQLTools\Stitching\DelegateToSchema;
 use GraphQLTools\Stitching\MergeSchemas;
 use GraphQLTools\Transforms\Transform;
 use GraphQLTools\Transforms\TransformSchema;
@@ -21,6 +24,34 @@ public static function makeExecutableSchema(array $options) : Schema
         return MakeExecutableSchema::invoke($options);
     }
 
+    /**
+     * @param Schema|mixed[] $options
+     * @param mixed[]|null   $legacyInputResolvers
+     * @param mixed[]|null   $legacyInputValidationOptions
+     */
+    public static function addResolveFunctionsToSchema(
+        $options,
+        $legacyInputResolvers = null,
+        ?array $legacyInputValidationOptions = null
+    ) : Schema {
+        return AddResolveFunctionsToSchema::invoke($options, $legacyInputResolvers, $legacyInputValidationOptions);
+    }
+
+    public static function addSchemaLevelResolveFunction(Schema $schema, callable $resolveFn) : void
+    {
+        AddSchemaLevelResolveFunction::invoke($schema, $resolveFn);
+    }
+
+    /**
+     * @param mixed[] $options
+     *
+     * @return mixed
+     */
+    public static function delegateToSchema(array $options)
+    {
+        return DelegateToSchema::invoke($options);
+    }
+
     /**
      * @param mixed[] $options
      */

diff --git a/src/SchemaVisitor.php b/src/SchemaVisitor.php
@@ -260,7 +260,7 @@ static function (EnumValueDefinition $value) use ($callMethod, $newEnum) {
         $visitFields = static function ($type) use ($callMethod) : void {
             $fields = $type->getFields();
             static::updateEachKey($fields, static function (FieldDefinition $field) use ($callMethod, $type) {
-                $newField =  $callMethod('visitFieldDefinition', $field, ['objectType' => $type]);
+                $newField = $callMethod('visitFieldDefinition', $field, ['objectType' => $type]);
 
                 if ($newField instanceof FieldDefinition) {
                     static::updateEachKey(
@@ -385,7 +385,7 @@ public static function healSchema(Schema $schema) : Schema
                 foreach ($type->getFields() as $field) {
                     Utils::forceSet($field, 'type', $healType($field->getType()));
                 }
-            // phpcs:ignore
+                // phpcs:ignore
             } elseif ($type instanceof ScalarType) {
                 // nothing to do
             } elseif ($type instanceof UnionType) {

diff --git a/tests/DelegateToSchemaTest.php b/tests/DelegateToSchemaTest.php
@@ -6,7 +6,6 @@
 
 use GraphQL\GraphQL;
 use GraphQLTools\GraphQLTools;
-use GraphQLTools\Stitching\DelegateToSchema;
 use PHPUnit\Framework\TestCase;
 
 class DelegateToSchemaTest extends TestCase
@@ -51,7 +50,7 @@ protected static function proxyResolvers(string $spec) : array
                     'fragment' => '... on Booking { propertyId }',
                     'resolve' => static function ($booking, $args, $context, $info) use ($spec) {
                         $delegateFn = $spec === 'standalone' ? static function (...$args) {
-                            return DelegateToSchema::invoke(...$args);
+                            return GraphQLTools::delegateToSchema(...$args);
                         } : static function (...$args) use ($info) {
                             return $info->mergeInfo->delegateToSchema(...$args);
                         };

diff --git a/tests/MockingTest.php b/tests/MockingTest.php
@@ -10,7 +10,6 @@
 use GraphQL\GraphQL;
 use GraphQL\Type\Definition\ResolveInfo;
 use GraphQL\Type\Definition\Type;
-use GraphQLTools\Generate\AddResolveFunctionsToSchema;
 use GraphQLTools\GraphQLTools;
 use GraphQLTools\Mock;
 use GraphQLTools\SimpleLogger;
@@ -255,7 +254,7 @@ public function testMockServerIsAbleToPreserveResolversOfAPrebuiltSchema() : voi
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]
@@ -379,7 +378,7 @@ public function testDoesNotMaskResolveTypeFunctionsIfYouTellItNotTo() : void
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]
@@ -427,7 +426,7 @@ public function testCanMockEnum() : void
     public function testCanMockUnions() : void
     {
         $jsSchema = GraphQLTools::buildSchemaFromTypeDefinitions($this->shorthand);
-        AddResolveFunctionsToSchema::invoke($jsSchema, $this->resolveFunctions);
+        GraphQLTools::addResolveFunctionsToSchema($jsSchema, $this->resolveFunctions);
         $mockMap = [
             'Int' => static function () {
                 return 10;
@@ -491,7 +490,7 @@ public function testCanMockUnions() : void
     public function testCanMockInterfacesByDefault() : void
     {
         $jsSchema = GraphQLTools::buildSchemaFromTypeDefinitions($this->shorthand);
-        AddResolveFunctionsToSchema::invoke($jsSchema, $this->resolveFunctions);
+        GraphQLTools::addResolveFunctionsToSchema($jsSchema, $this->resolveFunctions);
         $mockMap = [
             'Int' => static function () {
                 return 10;
@@ -562,7 +561,7 @@ public function testCanMockInterfacesByDefault() : void
     public function testCanSupportExplicitInterfaceMock() : void
     {
         $jsSchema = GraphQLTools::buildSchemaFromTypeDefinitions($this->shorthand);
-        AddResolveFunctionsToSchema::invoke($jsSchema, $this->resolveFunctions);
+        GraphQLTools::addResolveFunctionsToSchema($jsSchema, $this->resolveFunctions);
         $spy     = 0;
         $mockMap = [
             'Bird' => static function ($root, $args) {
@@ -620,7 +619,7 @@ public function testCanSupportExplicitInterfaceMock() : void
     public function testCanSupportExplicitUnionTypeMock() : void
     {
         $jsSchema = GraphQLTools::buildSchemaFromTypeDefinitions($this->shorthand);
-        AddResolveFunctionsToSchema::invoke($jsSchema, $this->resolveFunctions);
+        GraphQLTools::addResolveFunctionsToSchema($jsSchema, $this->resolveFunctions);
         $spy     = 0;
         $mockMap = [
 
@@ -679,7 +678,7 @@ public function testCanSupportExplicitUnionTypeMock() : void
     public function testThrowsAnErrorWhenTypenameIsNotReturnedWithinAnExplicitInterfaceMock() : void
     {
         $jsSchema = GraphQLTools::buildSchemaFromTypeDefinitions($this->shorthand);
-        AddResolveFunctionsToSchema::invoke($jsSchema, $this->resolveFunctions);
+        GraphQLTools::addResolveFunctionsToSchema($jsSchema, $this->resolveFunctions);
         $mockMap = [
 
             'Bird' => static function ($root, $args) {
@@ -752,7 +751,7 @@ public function testThrowsAnErrorInResolveIfMockTypeIsNotDefinedAndResolverFaile
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]
@@ -798,7 +797,7 @@ public function testCanPreserveScalarResolvers() : void
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]
@@ -1084,7 +1083,7 @@ public function testDoesNotMaskResolveFunctionsIfYouTellItNotTo() : void
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]
@@ -1171,7 +1170,7 @@ public function testLetsYouMockAndResolveNonLeafTypesConcurrently() : void
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]
@@ -1229,7 +1228,7 @@ public function testLetsYouMockAndResolveNonLeafTypesConcurrentlySupportPromises
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]
@@ -1465,7 +1464,7 @@ public function testLetYouResolveNullWithMockingAndPreservingResolvers() : void
             ],
         ];
 
-        AddResolveFunctionsToSchema::invoke(
+        GraphQLTools::addResolveFunctionsToSchema(
             $jsSchema,
             $resolvers,
             ['requireResolversForResolveType' => false]

diff --git a/tests/SchemaGeneratorTest.php b/tests/SchemaGeneratorTest.php
@@ -14,7 +14,6 @@
 use GraphQL\Type\Definition\CustomScalarType;
 use GraphQL\Type\Definition\EnumType;
 use GraphQL\Type\Definition\ScalarType;
-use GraphQLTools\Generate\AddSchemaLevelResolveFunction;
 use GraphQLTools\Generate\AttachConnectorsToContext;
 use GraphQLTools\Generate\ChainResolvers;
 use GraphQLTools\Generate\ConcatenateTypeDefs;
@@ -2029,7 +2028,7 @@ public function testActuallyRuns() : void
             return ['species' => 'ROOT'];
         };
 
-        AddSchemaLevelResolveFunction::invoke($jsSchema, $rootResolver);
+        GraphQLTools::addSchemaLevelResolveFunction($jsSchema, $rootResolver);
 
         $query = '{
             species(name: "strix")
@@ -2053,7 +2052,7 @@ public function testCanWrapFieldsThatDoNotHaveAResolverDefined() : void
             return ['stuff' => 'stuff'];
         };
 
-        AddSchemaLevelResolveFunction::invoke($jsSchema, $rootResolver);
+        GraphQLTools::addSchemaLevelResolveFunction($jsSchema, $rootResolver);
         $query = '{
             stuff
         }';
@@ -2104,7 +2103,7 @@ public function testRunsOnlyOncePerQuery() : void
             return ['stuff' => 'EEE', 'species' => 'EEE'];
         };
 
-        AddSchemaLevelResolveFunction::invoke($jsSchema, $rootResolver);
+        GraphQLTools::addSchemaLevelResolveFunction($jsSchema, $rootResolver);
         $query = '{
             species(name: "strix")
             stuff
@@ -2139,7 +2138,7 @@ public function testCanAttachThingsToContext() : void
             $ctx->usecontext = 'ABC';
         };
 
-        AddSchemaLevelResolveFunction::invoke($jsSchema, $rootResolver);
+        GraphQLTools::addSchemaLevelResolveFunction($jsSchema, $rootResolver);
         $query    = '{
             usecontext
         }';
@@ -2304,7 +2303,7 @@ public function testDoesNotInterfereWithSchemaLevelResolveFunction() : void
             ];
         };
 
-        AddSchemaLevelResolveFunction::invoke($jsSchema, $rootResolver);
+        GraphQLTools::addSchemaLevelResolveFunction($jsSchema, $rootResolver);
         AttachConnectorsToContext::invoke($jsSchema, TestHelper::getTestConnectors());
 
         $query = '

diff --git a/tests/TransformsTest/FilterTypeTest.php b/tests/TransformsTest/FilterTypeTest.php
@@ -6,9 +6,9 @@
 
 use GraphQL\GraphQL;
 use GraphQL\Type\Schema;
+use GraphQLTools\GraphQLTools;
 use GraphQLTools\Tests\TestingSchemas;
 use GraphQLTools\Transforms\FilterTypes;
-use GraphQLTools\Transforms\TransformSchema;
 use PHPUnit\Framework\TestCase;
 use function in_array;
 
@@ -31,7 +31,7 @@ static function ($type) use ($typeNames) {
         ),
         ];
 
-        $this->schema = TransformSchema::invoke(TestingSchemas::bookingSchema(), $transforms);
+        $this->schema = GraphQLTools::transformSchema(TestingSchemas::bookingSchema(), $transforms);
     }
 
     /**

diff --git a/tests/TransformsTest/NamespaceTest.php b/tests/TransformsTest/NamespaceTest.php
@@ -6,9 +6,9 @@
 
 use GraphQL\GraphQL;
 use GraphQL\Type\Schema;
+use GraphQLTools\GraphQLTools;
 use GraphQLTools\Tests\TestingSchemas;
 use GraphQLTools\Transforms\RenameTypes;
-use GraphQLTools\Transforms\TransformSchema;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -27,7 +27,7 @@ public function setUp() : void
         }),
         ];
 
-        $this->schema = TransformSchema::invoke(TestingSchemas::propertySchema(), $transforms);
+        $this->schema = GraphQLTools::transformSchema(TestingSchemas::propertySchema(), $transforms);
     }
 
     /**

diff --git a/tests/TransformsTest/RenameTypeTest.php b/tests/TransformsTest/RenameTypeTest.php
@@ -6,9 +6,9 @@
 
 use GraphQL\GraphQL;
 use GraphQL\Type\Schema;
+use GraphQLTools\GraphQLTools;
 use GraphQLTools\Tests\TestingSchemas;
 use GraphQLTools\Transforms\RenameTypes;
-use GraphQLTools\Transforms\TransformSchema;
 use PHPUnit\Framework\TestCase;
 
 /**
@@ -38,7 +38,7 @@ static function ($name) {
         ),
         ];
 
-        $this->schema = TransformSchema::invoke(TestingSchemas::propertySchema(), $transforms);
+        $this->schema = GraphQLTools::transformSchema(TestingSchemas::propertySchema(), $transforms);
     }
 
     /**

diff --git a/tests/TransformsTest/ReplacesFieldWithFragmentsTest.php b/tests/TransformsTest/ReplacesFieldWithFragmentsTest.php
@@ -7,7 +7,6 @@
 use GraphQL\GraphQL;
 use GraphQL\Type\Schema;
 use GraphQLTools\GraphQLTools;
-use GraphQLTools\Stitching\DelegateToSchema;
 use GraphQLTools\Transforms\ReplaceFieldWithFragment;
 use PHPUnit\Framework\TestCase;
 
@@ -70,7 +69,7 @@ public function setUp() : void
                 'Query' => [
                     'userById' => function ($parent, $args, $context, $info) {
                         $id = $args['id'];
-                        return DelegateToSchema::invoke([
+                        return GraphQLTools::delegateToSchema([
                             'schema' => $this->subSchema,
                             'operation' => 'query',
                             'fieldName' => 'userById',

diff --git a/tests/TransformsTest/TreeOperationsTest.php b/tests/TransformsTest/TreeOperationsTest.php
@@ -9,7 +9,6 @@
 use GraphQL\Language\AST\NameNode;
 use GraphQL\Type\Schema;
 use GraphQLTools\GraphQLTools;
-use GraphQLTools\Stitching\DelegateToSchema;
 use GraphQLTools\Transforms\ExtractField;
 use GraphQLTools\Transforms\WrapQuery;
 use PHPUnit\Framework\TestCase;
@@ -135,7 +134,7 @@ public function setUp() : void
                 'Query' => [
                     'addressByUser' => function ($parent, $args, $context, $info) {
                         $id = $args['id'];
-                        return DelegateToSchema::invoke([
+                        return GraphQLTools::delegateToSchema([
                             'schema' => $this->subSchema,
                             'operation' => 'query',
                             'fieldName' => 'userById',
@@ -168,7 +167,7 @@ static function ($result) {
                 'Mutation' => [
                     'setUserAndAddress' => function ($parent, $args, $context, $info) {
                         $input         = $args['input'];
-                        $addressResult = DelegateToSchema::invoke([
+                        $addressResult = GraphQLTools::delegateToSchema([
                             'schema' => $this->subSchema,
                             'operation' => 'mutation',
                             'fieldName' => 'setAddress',
@@ -191,7 +190,7 @@ static function ($result) {
                             ],
                         ]);
 
-                        $userResult = DelegateToSchema::invoke([
+                        $userResult = GraphQLTools::delegateToSchema([
                             'schema' => $this->subSchema,
                             'operation' => 'mutation',
                             'fieldName' => 'setUser',

diff --git a/tests/TransformsTest/WrapQueryTest.php b/tests/TransformsTest/WrapQueryTest.php
@@ -12,7 +12,6 @@
 use GraphQL\Language\AST\SelectionSetNode;
 use GraphQL\Type\Schema;
 use GraphQLTools\GraphQLTools;
-use GraphQLTools\Stitching\DelegateToSchema;
 use GraphQLTools\Transforms\WrapQuery;
 use PHPUnit\Framework\TestCase;
 use function array_map;
@@ -77,7 +76,7 @@ public function setUp() : void
                 'Query' => [
                     'addressByUser' => function ($parent, $args, $context, $info) {
                         $id = $args['id'];
-                        return DelegateToSchema::invoke([
+                        return GraphQLTools::delegateToSchema([
                             'schema' => $this->subSchema,
                             'operation' => 'query',
                             'fieldName' => 'userById',