Merge pull request API-Skeletons#85 from TomHAnderson/feature/types-c…

…onnection-node-2 Feature/types connection node 2
TomHAnderson · Mar 27, 2024 · da88b5d · da88b5d
2 parents 3924e91 + 0dbd3b2
commit da88b5d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This library **does not** try to redefine how the excellent library [webonyx/gra
 
 Please read the [detailed documentation](https://doctrine-orm-graphql.apiskeletons.dev/en/latest/).
 
-For an example implementation post to `https://graphql.lcdb.org/`
+For an example implementation see `https://graphql.lcdb.org/`
 
 For an example application see [https://github.com/lcdborg/graphql.lcdb.org](https://github.com/lcdborg/graphql.lcdb.org)
 

diff --git a/src/Driver.php b/src/Driver.php
@@ -24,7 +24,7 @@ public function connection(string $id): ObjectType
         $objectType = $this->type($id);
 
         return $this->get(Type\TypeManager::class)
-            ->build(Type\Connection::class, 'Connection_' . $objectType->name, $objectType);
+            ->build(Type\Connection::class, $objectType->name, $objectType);
     }
 
     /**

diff --git a/src/Filter/FilterFactory.php b/src/Filter/FilterFactory.php
@@ -25,6 +25,7 @@
 use function in_array;
 use function md5;
 use function serialize;
+use function ucwords;
 
 use const SORT_REGULAR;
 
@@ -53,7 +54,7 @@ public function get(
         array|null $associationMetadata = null,
     ): GraphQLInputObjectType {
         $typeName = $owningEntity ?
-            'Filter_' . $owningEntity->getTypeName() . '_' . $associationName
+            'Filter_' . $owningEntity->getTypeName() . '_' . ucwords($associationName)
             : 'Filter_' . $targetEntity->getTypeName();
 
         if ($this->typeManager->has($typeName)) {

diff --git a/src/Type/Connection.php b/src/Type/Connection.php
@@ -24,7 +24,7 @@ public function __construct(AbstractContainer $container, string $typeName, arra
         $objectType = $params[0];
 
         $configuration = [
-            'name' => $typeName,
+            'name' => 'Connection_' . $typeName,
             'description' => 'Connection for ' . $typeName,
             'fields' => [
                 'edges' => Type::listOf($container

diff --git a/src/Type/Entity/Entity.php b/src/Type/Entity/Entity.php
@@ -28,6 +28,7 @@
 use function assert;
 use function in_array;
 use function ksort;
+use function ucwords;
 
 use const SORT_REGULAR;
 
@@ -202,12 +203,12 @@ protected function addAssociations(array &$fields): void
             $targetEntity             = $associationMetadata['targetEntity'];
             $fields[$associationName] = function () use ($targetEntity, $associationName) {
                 $entity    = $this->entityTypeManager->get($targetEntity);
-                $shortName = $this->getTypeName() . '_' . $associationName;
+                $shortName = $this->getTypeName() . '_' . ucwords($associationName);
 
                 return [
                     'type' => $this->typeManager->build(
                         Connection::class,
-                        'Connection_' . $shortName,
+                        $shortName,
                         $entity->getObjectType(),
                     ),
                     'args' => [

diff --git a/test/Feature/Type/TypeManagerTest.php b/test/Feature/Type/TypeManagerTest.php
@@ -18,8 +18,8 @@ public function testBuild(): void
         $typeManager = $driver->get(TypeManager::class);
 
         $objectType = $driver->type(Artist::class);
-        $connection = $typeManager->build(Connection::class, $objectType->name . '_Connection', $objectType);
-        $this->assertEquals($objectType->name . '_Connection', $connection->name);
+        $connection = $typeManager->build(Connection::class, $objectType->name, $objectType);
+        $this->assertEquals('Connection_' . $objectType->name, $connection->name);
     }
 
     public function testBuildTwiceReturnsSameType(): void
@@ -28,8 +28,8 @@ public function testBuildTwiceReturnsSameType(): void
         $typeManager = $driver->get(TypeManager::class);
 
         $objectType  = $driver->type(Artist::class);
-        $connection1 = $typeManager->build(Connection::class, $objectType->name . '_Connection', $objectType);
-        $connection2 = $typeManager->build(Connection::class, $objectType->name . '_Connection', $objectType);
+        $connection1 = $typeManager->build(Connection::class, $objectType->name, $objectType);
+        $connection2 = $typeManager->build(Connection::class, $objectType->name, $objectType);
 
         $this->assertSame($connection1, $connection2);
     }