Merge pull request #6 from Automattic/bugfixes

Bugfixes

Author: galatanovidiu

includes/Core/RegisterMcpTool.php

@@ -81,8 +81,12 @@ private function get_args_from_rest_api(): void {
 		);
 
 		foreach ( $rest_api['args'] as $arg_name => $arg_schema ) {
+			$type = $arg_schema['type'];
+			if ( is_array( $type ) ) {
+				$type = reset( $type );
+			}
 			$input_schema['properties'][ $arg_name ] = array(
-				'type'        => $arg_schema['type'],
+				'type'        => $type,
 				'description' => $arg_schema['description'],
 			);
 
@@ -120,6 +124,12 @@ private function get_args_from_rest_api(): void {
 			}
 		}
 
+		// Apply modifications if provided in rest_alias['modifications'] .
+		if ( isset( $this->args['rest_alias']['inputSchemaReplacements'] ) ) {
+			$modifications = $this->args['rest_alias']['inputSchemaReplacements'];
+			$input_schema  = $this->apply_modifications( $input_schema, $modifications );
+		}
+
 		// Update the args with the converted schema.
 		$this->args['inputSchema']          = $input_schema;
 		$this->args['callback']             = $rest_api['callback'];
@@ -268,4 +278,36 @@ private function validate_input_schema(): void {
 			}
 		}
 	}
+
+	/**
+	 * Recursively remove all null values from an array.
+	 *
+	 * @param array $array The array to clean.
+	 * @return array The cleaned array.
+	 */
+	private function remove_null_recursive( array $array ): array {
+		foreach ( $array as $key => &$value ) {
+			if ( is_array( $value ) ) {
+				$value = $this->remove_null_recursive( $value );
+			} elseif ( is_null( $value ) ) {
+				unset( $array[ $key ] );
+			}
+		}
+		unset( $value ); // break reference.
+		return $array;
+	}
+
+	/**
+	 * Apply modifications to the input schema.
+	 *
+	 * @param array $input_schema The input schema.
+	 * @param array $modifications The modifications to apply.
+	 * @return array The modified input schema.
+	 */
+	private function apply_modifications( array $input_schema, array $modifications ): array {
+
+		$modifications = array_replace_recursive( $input_schema, $modifications );
+
+		return $this->remove_null_recursive( $modifications );
+	}
 }

includes/Tools/McpPostsTools.php

@@ -51,10 +51,28 @@ public function register_tools(): void {
 				'description' => 'Add a new WordPress post',
 				'type'        => 'create',
 				'rest_alias'  => array(
-					'route'  => '/wp/v2/posts',
-					'method' => 'POST',
+					'route'                   => '/wp/v2/posts',
+					'method'                  => 'POST',
+					'inputSchemaReplacements' => array( // this will replace the defined elements in the default input schema with the new ones.
+						'properties' => array(
+							'title'   => array(
+								'type' => 'string',
+							),
+							'content' => array(
+								'type'        => 'string',
+								'description' => 'The content of the post in a valid Guttenberg block format',
+							),
+							'excerpt' => array(
+								'type' => 'string',
+							),
+						),
+						'required'   => array(
+							'title',
+							'content',
+						),
+					),
 				),
-			)
+			),
 		);
 
 		new RegisterMcpTool(

includes/Tools/McpUsersTools.php

@@ -27,8 +27,16 @@ public function register_tools(): void {
 				'description' => 'Search and filter WordPress users with pagination',
 				'type'        => 'read',
 				'rest_alias'  => array(
-					'route'  => '/wp/v2/users',
-					'method' => 'GET',
+					'route'                   => '/wp/v2/users',
+					'method'                  => 'GET',
+					'inputSchemaReplacements' => array(
+						'properties' => array(
+							'has_published_posts' => array(
+								'items'   => null, // this will remove the array from the schema.
+								'default' => false,
+							),
+						),
+					),
 				),
 			)
 		);