fix: Ensure correct EditorBlock.type field resolution (#316)

.changeset/thin-donuts-float.md

@@ -0,0 +1,5 @@
+---
+"@wpengine/wp-graphql-content-blocks": patch
+---
+
+fix: Ensure correct `EditorBlock.type` field resolution.

includes/Type/InterfaceType/EditorBlockInterface.php

@@ -141,6 +141,9 @@ public static function register_type(): void {
 					'type'                    => [
 						'type'        => 'String',
 						'description' => __( 'The (GraphQL) type of the block', 'wp-graphql-content-blocks' ),
+						'resolve'     => static function ( $block ) {
+							return WPGraphQLHelpers::get_type_name_for_block( $block['blockName'] ?? null );
+						},
 					],
 				],
 				'resolveType'     => static function ( $block ) {

tests/unit/BlockQueriesTest.php

@@ -56,6 +56,7 @@ public function test_retrieve_non_flatten_editor_blocks() {
 					databaseId
 					editorBlocks(flat: false) {
 						name
+						type
 					}
 				}
 			}
@@ -70,6 +71,7 @@ public function test_retrieve_non_flatten_editor_blocks() {
 		// There should be only one block using that query when not using flat: true
 		$this->assertEquals( 1, count( $node['editorBlocks'] ) );
 		$this->assertEquals( 'core/columns', $node['editorBlocks'][0]['name'] );
+		$this->assertEquals( 'CoreColumns', $node['editorBlocks'][0]['type'] );
 	}
 
 	public function test_retrieve_flatten_editor_blocks() {
@@ -79,8 +81,9 @@ public function test_retrieve_flatten_editor_blocks() {
 				nodes {
 					databaseId
 					editorBlocks(flat: true) {
-							name
-							parentClientId
+						name
+						parentClientId
+						type
 					}
 				}
 			}
@@ -97,18 +100,23 @@ public function test_retrieve_flatten_editor_blocks() {
 		$this->assertEquals( 5, count( $node['editorBlocks'] ) );
 
 		$this->assertEquals( 'core/columns', $node['editorBlocks'][0]['name'] );
+		$this->assertEquals( 'CoreColumns', $node['editorBlocks'][0]['type'] );
 		$this->assertNull( $node['editorBlocks'][0]['parentClientId'] );
 
 		$this->assertEquals( 'core/column', $node['editorBlocks'][1]['name'] );
+		$this->assertEquals( 'CoreColumn', $node['editorBlocks'][1]['type'] );
 		$this->assertNotNull( $node['editorBlocks'][1]['parentClientId'] );
 
 		$this->assertEquals( 'core/paragraph', $node['editorBlocks'][2]['name'] );
+		$this->assertEquals( 'CoreParagraph', $node['editorBlocks'][2]['type'] );
 		$this->assertNotNull( $node['editorBlocks'][2]['parentClientId'] );
 
 		$this->assertEquals( 'core/column', $node['editorBlocks'][3]['name'] );
+		$this->assertEquals( 'CoreColumn', $node['editorBlocks'][3]['type'] );
 		$this->assertNotNull( $node['editorBlocks'][3]['parentClientId'] );
 
 		$this->assertEquals( 'core/paragraph', $node['editorBlocks'][4]['name'] );
+		$this->assertEquals( 'CoreParagraph', $node['editorBlocks'][4]['type'] );
 		$this->assertNotNull( $node['editorBlocks'][4]['parentClientId'] );
 	}
 }

tests/unit/BlockSupportsAnchorTest.php

@@ -112,6 +112,7 @@ public function test_register_anchor_query_field() {
 				nodes {
 					editorBlocks {
 						name
+						type
 						... on BlockWithSupportsAnchor {
 							anchor
 						}
@@ -124,15 +125,19 @@ public function test_register_anchor_query_field() {
 
 		$this->assertEquals( 4, count( $node['editorBlocks'] ) );
 		$this->assertEquals( 'core/paragraph', $node['editorBlocks'][0]['name'] );
+		$this->assertEquals( 'CoreParagraph', $node['editorBlocks'][0]['type'] );
 		$this->assertEquals( 'example', $node['editorBlocks'][0]['anchor'] );
 
 		$this->assertEquals( 'core/paragraph', $node['editorBlocks'][1]['name'] );
+		$this->assertEquals( 'CoreParagraph', $node['editorBlocks'][1]['type'] );
 		$this->assertNull( $node['editorBlocks'][1]['anchor'] );
 
 		$this->assertEquals( 'core/group', $node['editorBlocks'][2]['name'] );
+		$this->assertEquals( 'CoreGroup', $node['editorBlocks'][2]['type'] );
 		$this->assertNull( $node['editorBlocks'][2]['anchor'] );
 
 		$this->assertEquals( 'core/paragraph', $node['editorBlocks'][3]['name'] );
+		$this->assertEquals( 'CoreParagraph', $node['editorBlocks'][3]['type'] );
 		$this->assertEquals( 'example-inner', $node['editorBlocks'][3]['anchor'] );
 	}
 }

tests/unit/CoreCodeTest.php

@@ -80,6 +80,7 @@ className
 						... on BlockWithSupportsAnchor {
 							anchor
 						}
+						type
 						...CoreCodeBlockFragment
 					}
 				}
@@ -140,6 +141,7 @@ public function test_retrieve_core_code_attributes() {
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/code', $block['name'], 'The block name should be core/code' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
+		$this->assertEquals( 'CoreCode', $block['type'], 'The block type should be CoreCode' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 
 		$attributes = $block['attributes'];
@@ -204,6 +206,7 @@ public function test_retrieve_core_code_with_custom_styles() {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/code', $block['name'], 'The block name should be core/code' );
+		$this->assertEquals( 'CoreCode', $block['type'], 'The block type should be CoreCode' );
 
 		$attributes = $block['attributes'];
 		$this->assertEquals(
@@ -281,6 +284,7 @@ public function test_retrieve_core_code_with_gradient_and_additional_attributes(
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/code', $block['name'], 'The block name should be core/code' );
+		$this->assertEquals( 'CoreCode', $block['type'], 'The block type should be CoreCode' );
 
 		$attributes = $block['attributes'];
 		$this->assertEquals(

tests/unit/CoreHeadingTest.php

@@ -80,6 +80,7 @@ className
 						name
 						parentClientId
 						renderedHtml
+						type
 						... on BlockWithSupportsAnchor {
 							anchor
 						}
@@ -141,6 +142,7 @@ public function test_retrieve_core_heading_attributes() {
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/heading', $block['name'], 'The block name should be core/heading' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
+		$this->assertEquals( 'CoreHeading', $block['type'], 'The block type should be CoreHeading' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 
 		$attributes = $block['attributes'];

tests/unit/CoreImageTest.php

@@ -86,9 +86,10 @@ className
 						innerBlocks {
 							name
 						}
+						name
 						parentClientId
 						renderedHtml
-						name
+						type
 						...CoreImageBlockFragment
 					}
 				}
@@ -140,6 +141,7 @@ public function test_retrieve_core_image_fields_attributes(): void {
 		$this->assertEquals( $this->post_id, $node['databaseId'] );
 		$this->assertEquals( 1, count( $node['editorBlocks'] ) );
 		$this->assertEquals( 'core/image', $node['editorBlocks'][0]['name'] );
+		$this->assertEquals( 'CoreImage', $node['editorBlocks'][0]['type'] );
 
 		$this->assertArrayNotHasKey( 'errors', $actual, 'There should not be any errors' );
 		$this->assertArrayHasKey( 'data', $actual, 'The data key should be present' );
@@ -157,6 +159,7 @@ public function test_retrieve_core_image_fields_attributes(): void {
 		$this->assertNotEmpty( $block['cssClassNames'], 'The cssClassNames should be present' );
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/image', $block['name'], 'The block name should be core/image' );
+		$this->assertEquals( 'CoreImage', $block['type'], 'The block type should be CoreImage' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 		$this->assertEquals(

tests/unit/CoreListTest.php

@@ -85,6 +85,7 @@ className
 							name
 							parentClientId
 							renderedHtml
+							type
 							... on CoreListItem {
 								...CoreListItemBlockFragment
 							}
@@ -93,6 +94,7 @@ className
 						name
 						parentClientId
 						renderedHtml
+						type
 						...CoreListBlockFragment
 					}
 				}
@@ -149,6 +151,7 @@ public function test_retrieve_core_list_fields_and_attributes(): void {
 		$this->assertNotEmpty( $block['cssClassNames'], 'The cssClassNames should be present' );
 
 		$this->assertEquals( 'core/list', $block['name'], 'The block name should be core/list' );
+		$this->assertEquals( 'CoreList', $block['type'], 'The block type should be CoreList' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 
@@ -184,6 +187,7 @@ public function test_retrieve_core_list_fields_and_attributes(): void {
 		$this->assertEmpty( $block['innerBlocks'][0]['cssClassNames'], 'The cssClassNames should be present' );
 		$this->assertNotEmpty( $block['innerBlocks'][0]['clientId'], 'The clientId should be present' );
 		$this->assertEquals( 'core/list-item', $block['innerBlocks'][0]['name'], 'The block name should be core/list-item' );
+		$this->assertEquals( 'CoreListItem', $block['innerBlocks'][0]['type'], 'The block type should be CoreListItem' );
 		$this->assertNotEmpty( $block['innerBlocks'][0]['renderedHtml'], 'The renderedHtml should be present' );
 
 		$this->assertEquals(
@@ -250,6 +254,7 @@ public function test_retrieve_core_list_attributes_typography_and_lock(): void {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/list', $block['name'], 'The block name should be core/list' );
+		$this->assertEquals( 'CoreList', $block['type'], 'The block type should be CoreList' );
 
 		$this->assertEquals(
 			[
@@ -318,6 +323,7 @@ public function test_retrieve_core_list_attributes_ordered_and_reversed(): void
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/list', $block['name'], 'The block name should be core/list' );
+		$this->assertEquals( 'CoreList', $block['type'], 'The block type should be CoreList' );
 
 		$this->assertEquals(
 			[
@@ -383,6 +389,7 @@ public function test_retrieve_core_list_attributes_start_and_styles(): void {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/list', $block['name'], 'The block name should be core/list' );
+		$this->assertEquals( 'CoreList', $block['type'], 'The block type should be CoreList' );
 
 		$this->assertEquals(
 			[
@@ -653,6 +660,7 @@ className
 					editorBlocks( flat: false ) {
 						clientId
 						name
+						type
 						parentClientId
 						innerBlocks {
 							... on CoreListItem {

tests/unit/CoreParagraphTest.php

@@ -80,6 +80,7 @@ className
 						name
 						parentClientId
 						renderedHtml
+						type
 						... on BlockWithSupportsAnchor {
 							anchor
 						}
@@ -141,6 +142,7 @@ public function test_retrieve_core_paragraph_attributes() {
 
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/paragraph', $block['name'], 'The block name should be core/paragraph' );
+		$this->assertEquals( 'CoreParagraph', $block['type'], 'The block type should be CoreParagraph' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 
@@ -210,6 +212,7 @@ public function test_retrieve_core_paragraph_with_drop_cap_and_custom_styles() {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/paragraph', $block['name'], 'The block name should be core/paragraph' );
+		$this->assertEquals( 'CoreParagraph', $block['type'], 'The block type should be CoreParagraph' );
 
 		$attributes = $block['attributes'];
 		$this->assertEquals(
@@ -293,6 +296,7 @@ public function test_retrieve_core_paragraph_with_direction_and_gradient() {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/paragraph', $block['name'], 'The block name should be core/paragraph' );
+		$this->assertEquals( 'CoreParagraph', $block['type'], 'The block type should be CoreParagraph' );
 
 		$attributes = $block['attributes'];
 		$this->assertEquals(
@@ -360,6 +364,7 @@ public function test_retrieve_core_paragraph_with_additional_attributes() {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/paragraph', $block['name'], 'The block name should be core/paragraph' );
+		$this->assertEquals( 'CoreParagraph', $block['type'], 'The block type should be CoreParagraph' );
 
 		$attributes = $block['attributes'];
 		$this->assertEquals(

tests/unit/CorePreformattedTest.php

@@ -75,6 +75,7 @@ className
 						name
 						parentClientId
 						renderedHtml
+						type
 						... on BlockWithSupportsAnchor {
 							anchor
 						}
@@ -138,6 +139,7 @@ public function test_retrieve_core_preformatted_attributes() {
 
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/preformatted', $block['name'], 'The block name should be core/preformatted' );
+		$this->assertEquals( 'CorePreformatted', $block['type'], 'The block type should be CorePreformatted' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 
@@ -203,6 +205,7 @@ public function test_retrieve_core_preformatted_with_custom_styles() {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/preformatted', $block['name'], 'The block name should be core/preformatted' );
+		$this->assertEquals( 'CorePreformatted', $block['type'], 'The block type should be CorePreformatted' );
 
 		$attributes = $block['attributes'];
 		$this->assertEquals(
@@ -278,6 +281,7 @@ public function test_retrieve_core_preformatted_with_lock() {
 		$block = $actual['data']['post']['editorBlocks'][0];
 
 		$this->assertEquals( 'core/preformatted', $block['name'], 'The block name should be core/preformatted' );
+		$this->assertEquals( 'CorePreformatted', $block['type'], 'The block type should be CorePreformatted' );
 
 		$attributes = $block['attributes'];
 		$this->assertEquals(

tests/unit/CoreQuoteTest.php

@@ -73,6 +73,7 @@ className
 						isDynamic
 						name
 						parentClientId
+						type
 						renderedHtml
 						...CoreQuoteBlockFragment
 					}
@@ -126,6 +127,7 @@ public function test_retrieve_core_quote_fields_and_attributes(): void {
 
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/quote', $block['name'], 'The block name should be core/quote' );
+		$this->assertEquals( 'CoreQuote', $block['type'], 'The block type should be CoreQuote' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 
@@ -201,6 +203,7 @@ public function test_retrieve_core_quote_additional_attributes(): void {
 		$this->assertEquals( 'core/paragraph', $block['innerBlocks'][0]['name'], 'The inner block name should be core/paragraph' );
 
 		$this->assertEquals( 'core/quote', $block['name'], 'The block name should be core/quote' );
+		$this->assertEquals( 'CoreQuote', $block['type'], 'The block type should be CoreQuote' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 

tests/unit/CoreSeparatorTest.php

@@ -64,6 +64,7 @@ className
 						name
 						parentClientId
 						renderedHtml
+						type
 						...CoreSeparatorBlockFragment
 					}
 				}
@@ -111,6 +112,7 @@ public function test_retrieve_core_separator_attribute_fields(): void {
 		$this->assertNotEmpty( $block['cssClassNames'], 'There should be cssClassNames' );
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/separator', $block['name'], 'The block name should be core/separator' );
+		$this->assertEquals( 'CoreSeparator', $block['type'], 'The block type should be CoreSeparator' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 
@@ -175,6 +177,7 @@ public function test_retrieve_core_separator_attributes(): void {
 		$this->assertEquals( $this->post_id, $actual['data']['post']['databaseId'], 'The post ID should match' );
 		$this->assertEquals( 1, count( $actual['data']['post']['editorBlocks'] ) );
 		$this->assertEquals( 'core/separator', $actual['data']['post']['editorBlocks'][0]['name'], 'The block name should be core/separator' );
+		$this->assertEquals( 'CoreSeparator', $actual['data']['post']['editorBlocks'][0]['type'], 'The block type should be CoreSeparator' );
 
 		// Verify the attributes.
 		$this->assertEquals(

tests/unit/CoreTableTest.php

@@ -85,6 +85,7 @@ className
 						name
 						parentClientId
 						renderedHtml
+						type
 						... on BlockWithSupportsAnchor {
 							anchor
 						}
@@ -145,6 +146,7 @@ public function test_retrieve_core_table_attribute_fields() {
 
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/table', $block['name'], 'The block name should be core/table' );
+		$this->assertEquals( 'CoreTable', $block['type'], 'The block type should be CoreTable' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );
 

tests/unit/CoreVideoTest.php

@@ -71,6 +71,7 @@ className
 						}
 						parentClientId
 						renderedHtml
+						type
 						...CoreVideoBlockFragment
 					}
 				}
@@ -137,6 +138,7 @@ public function test_retrieve_core_video_attributes(): void {
 		$this->assertNotEmpty( $block['cssClassNames'], 'The cssClassNames should be present' );
 		$this->assertEmpty( $block['innerBlocks'], 'There should be no inner blocks' );
 		$this->assertEquals( 'core/video', $block['name'], 'The block name should be core/video' );
+		$this->assertEquals( 'CoreVideo', $block['type'], 'The block type should be CoreVideo' );
 		$this->assertEmpty( $block['parentClientId'], 'There should be no parentClientId' );
 		$this->assertNotEmpty( $block['renderedHtml'], 'The renderedHtml should be present' );