GQL: Simplify the ItemValue type

The "content" field only added an unnecessary level of nesting with no
benefit.

Change-Id: I69fd9ac2250b47e70e63961bdd133d208d9f0ef9

Author: jakobw

repo/WikibaseRepo.datatypes.php

@@ -494,30 +494,32 @@
 				return new ObjectType( [
 					'name' => 'ItemValue',
 					'fields' => [
-						'content' => [
-							'type' => Type::nonNull( new ObjectType( [
-								'name' => 'ValueItem',
-								'fields' => [
-									'id' => [
-										'type' => Type::nonNull( Type::string() ),
-										'resolve' => fn( EntityIdValue $content ) => $content->getEntityId()->getSerialization(),
-									],
-									'label' => [
-										'type' => Type::string(),
-										'args' => [
-											'languageCode' => Type::nonNull( $languageCodeType ),
-										],
-										'resolve' => function( EntityIdValue $value, array $args ) use( $itemLabelsResolver ) {
-											/** @var ItemId $itemId */
-											$itemId = $value->getEntityId();
-											'@phan-var ItemId $itemId';
+						'id' => [
+							'type' => Type::nonNull( Type::string() ),
+							'resolve' => function( Statement|PropertyValuePair $valueProvider ) {
+								/** @var EntityIdValue $idValue */
+								$idValue = $valueProvider->value->content;
+								'@phan-var EntityIdValue $idValue';
 
-											return $itemLabelsResolver->resolve( $itemId, $args['languageCode'] );
-										},
-									],
-								],
-							] ) ),
-							'resolve' => fn( Statement|PropertyValuePair $valueProvider ) => $valueProvider->value->content,
+								return $idValue->getEntityId()->getSerialization();
+							},
+						],
+						'label' => [
+							'type' => Type::string(),
+							'args' => [
+								'languageCode' => Type::nonNull( $languageCodeType ),
+							],
+							'resolve' => function( Statement|PropertyValuePair $valueProvider, array $args ) use( $itemLabelsResolver ) {
+								/** @var EntityIdValue $idValue */
+								$idValue = $valueProvider->value->content;
+								'@phan-var EntityIdValue $idValue';
+
+								/** @var ItemId $itemId */
+								$itemId = $idValue->getEntityId();
+								'@phan-var ItemId $itemId';
+
+								return $itemLabelsResolver->resolve( $itemId, $args['languageCode'] );
+							},
 						],
 					],
 				] );

repo/domains/reuse/src/Infrastructure/GraphQL/schema.graphql

@@ -57,10 +57,6 @@ type StringValue {
 }
 
 type ItemValue {
-  content: ValueItem!
-}
-
-type ValueItem {
   id: String!
   label(languageCode: LanguageCode!): String
 }

repo/domains/reuse/tests/phpunit/Infrastructure/GraphQL/GraphQLServiceTest.php

@@ -344,7 +344,7 @@ public function queryProvider(): Generator {
 					valueType
 				}
 				$statementWithItemValuePropertyId: statements(propertyId: \"$statementWithItemValuePropertyId\") {
-					value { ...on ItemValue { content { id } } }
+					value { ...on ItemValue { id } }
 					valueType
 				}
 			} }",
@@ -361,9 +361,7 @@ public function queryProvider(): Generator {
 						],
 						$statementWithItemValuePropertyId => [
 							[
-								'value' => [
-									'content' => [ 'id' => $itemValueItemId ],
-								],
+								'value' => [ 'id' => $itemValueItemId ],
 								'valueType' => 'value',
 							],
 						],
@@ -461,13 +459,13 @@ public function queryProvider(): Generator {
 				statements(propertyId: \"{$statementWithItemValuePropertyId}\") {
 					value {
 						... on ItemValue {
-							content { label(languageCode: \"en\") }
+							label(languageCode: \"en\")
 						}
 					}
 					qualifiers(propertyId: \"{$statementWithItemValueQualifierPropertyId}\") {
 						value {
 							... on ItemValue {
-								content { label(languageCode: \"en\") }
+								label(languageCode: \"en\")
 							}
 						}
 					}
@@ -479,16 +477,12 @@ public function queryProvider(): Generator {
 						'statements' => [
 							[
 								'value' => [
-									'content' => [
-										'label' => self::$statementValueItem->getLabels()->getByLanguage( 'en' )->getText(),
-									],
+									'label' => self::$statementValueItem->getLabels()->getByLanguage( 'en' )->getText(),
 								],
 								'qualifiers' => [
 									[
 										'value' => [
-											'content' => [
-												'label' => self::$qualifierValueItem->getLabels()->getByLanguage( 'en' )->getText(),
-											],
+											'label' => self::$qualifierValueItem->getLabels()->getByLanguage( 'en' )->getText(),
 										],
 									],
 								],