From 723f516bdf1ca7e4abf8c006c72085650a865757 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Wed, 10 Dec 2025 03:30:36 +0000
Subject: [PATCH 1/4] Add more edge case testing

---
 features/block-binding.feature          | 45 ++++++++++++++++++
 features/block-pattern-category.feature | 28 +++++++++++
 features/block-pattern.feature          | 34 +++++++++++++
 features/block-style.feature            | 60 +++++++++++++++++++++++
 features/block-synced-pattern.feature   | 63 +++++++++++++++++++++++++
 features/block-template.feature         | 56 ++++++++++++++++++++++
 features/block-type.feature             | 51 ++++++++++++++++++++
 src/Block_Synced_Pattern_Command.php    | 28 +++++++++++
 src/Block_Template_Command.php          | 36 +++++++++++---
 src/Block_Type_Command.php              |  8 ++++
 10 files changed, 402 insertions(+), 7 deletions(-)

diff --git a/features/block-binding.feature b/features/block-binding.feature
index 41a7858..d9a2d4f 100644
--- a/features/block-binding.feature
+++ b/features/block-binding.feature
@@ -1,5 +1,16 @@
 Feature: Block binding commands
 
+  @less-than-wp-6.5
+  Scenario: Block binding commands not available on WP < 6.5
+    Given a WP install
+
+    When I try `wp block binding list`
+    Then STDERR should contain:
+      """
+      is not a registered wp command
+      """
+    And the return code should be 1
+
   @require-wp-6.5
   Scenario: List block binding sources
     Given a WP install
@@ -36,3 +47,37 @@ Feature: Block binding commands
       not registered
       """
     And the return code should be 1
+
+  @require-wp-6.5
+  Scenario: List binding sources in various formats
+    Given a WP install
+
+    When I run `wp block binding list --format=table`
+    Then STDOUT should be a table containing rows:
+      | name           |
+      | core/post-meta |
+
+    When I run `wp block binding list --format=yaml`
+    Then STDOUT should contain:
+      """
+      name: core/post-meta
+      """
+
+    When I run `wp block binding list --format=csv`
+    Then STDOUT should contain:
+      """
+      name,
+      """
+
+  @require-wp-6.5
+  Scenario: Get binding source field values
+    Given a WP install
+
+    When I run `wp block binding get core/post-meta --field=name`
+    Then STDOUT should be:
+      """
+      core/post-meta
+      """
+
+    When I run `wp block binding get core/post-meta --field=label`
+    Then STDOUT should not be empty
diff --git a/features/block-pattern-category.feature b/features/block-pattern-category.feature
index e10a872..7f7e884 100644
--- a/features/block-pattern-category.feature
+++ b/features/block-pattern-category.feature
@@ -40,3 +40,31 @@ Feature: Block pattern category commands
       not registered
       """
     And the return code should be 1
+
+  @require-wp-5.5
+  Scenario: List pattern categories in various formats
+    Given a WP install
+
+    When I run `wp block pattern-category list --format=table`
+    Then STDOUT should be a table containing rows:
+      | name |
+      | text |
+
+    When I run `wp block pattern-category list --format=csv`
+    Then STDOUT should contain:
+      """
+      name,
+      """
+
+    When I run `wp block pattern-category list --format=yaml`
+    Then STDOUT should contain:
+      """
+      name: text
+      """
+
+  @require-wp-5.5
+  Scenario: Get pattern category label field
+    Given a WP install
+
+    When I run `wp block pattern-category get text --field=label`
+    Then STDOUT should not be empty
diff --git a/features/block-pattern.feature b/features/block-pattern.feature
index 83fd1f7..b03daff 100644
--- a/features/block-pattern.feature
+++ b/features/block-pattern.feature
@@ -62,3 +62,37 @@ Feature: Block pattern commands
       not registered
       """
     And the return code should be 1
+
+  @require-wp-5.5
+  Scenario: Search patterns with no matches returns empty
+    Given a WP install
+
+    When I run `wp block pattern list --search=xyznonexistent123 --format=count`
+    Then STDOUT should be:
+      """
+      0
+      """
+
+  @require-wp-5.5
+  Scenario: Get pattern content field
+    Given a WP install
+
+    When I run `wp block pattern list --field=name`
+    Then STDOUT should not be empty
+    And save STDOUT '%s' as {PATTERN_NAME}
+
+    When I run `wp block pattern get {PATTERN_NAME} --field=content`
+    Then STDOUT should contain:
+      """
+      <!-- wp:
+      """
+
+  @require-wp-5.5
+  Scenario: Filter by non-existent category returns empty
+    Given a WP install
+
+    When I run `wp block pattern list --category=nonexistent --format=count`
+    Then STDOUT should be:
+      """
+      0
+      """
diff --git a/features/block-style.feature b/features/block-style.feature
index 22b8e1b..38563a3 100644
--- a/features/block-style.feature
+++ b/features/block-style.feature
@@ -93,3 +93,63 @@ Feature: Block style commands
       """
       0
       """
+
+  @require-wp-5.3
+  Scenario: List styles for block with no registered styles
+    Given a WP install
+
+    # core/html typically has no styles registered
+    When I run `wp block style list --block=core/html --format=count`
+    Then STDOUT should be:
+      """
+      0
+      """
+
+  @require-wp-5.3
+  Scenario: List block styles in various formats
+    Given a WP install
+    # Create theme with style to ensure we have data
+    And a wp-content/themes/format-test-theme/style.css file:
+      """
+      /*
+      Theme Name: Format Test Theme
+      */
+      """
+    And a wp-content/themes/format-test-theme/index.php file:
+      """
+      <?php
+      """
+    And a wp-content/themes/format-test-theme/functions.php file:
+      """
+      <?php
+      add_action( 'init', function() {
+          register_block_style( 'core/paragraph', array(
+              'name'  => 'format-test-style',
+              'label' => 'Format Test Style',
+          ) );
+      } );
+      """
+
+    When I run `wp theme activate format-test-theme`
+    Then STDOUT should contain:
+      """
+      Success:
+      """
+
+    When I run `wp block style list --block=core/paragraph --format=ids`
+    Then STDOUT should contain:
+      """
+      format-test-style
+      """
+
+    When I run `wp block style list --block=core/paragraph --format=yaml`
+    Then STDOUT should contain:
+      """
+      name: format-test-style
+      """
+
+    When I run `wp block style list --block=core/paragraph --format=csv`
+    Then STDOUT should contain:
+      """
+      name,
+      """
diff --git a/features/block-synced-pattern.feature b/features/block-synced-pattern.feature
index f1e025c..de4000f 100644
--- a/features/block-synced-pattern.feature
+++ b/features/block-synced-pattern.feature
@@ -240,3 +240,66 @@ Feature: Synced pattern (wp_block) CRUD commands
       """
       not found
       """
+
+  @require-wp-5.0
+  Scenario: Update non-existent synced pattern fails
+    Given a WP install
+
+    When I try `wp block synced-pattern update 999999 --title="Updated"`
+    Then STDERR should contain:
+      """
+      not found
+      """
+    And the return code should be 1
+
+  @require-wp-5.0
+  Scenario: Create synced pattern without content fails
+    Given a WP install
+
+    When I try `wp block synced-pattern create --title="No Content"`
+    Then STDERR should contain:
+      """
+      content is required
+      """
+    And the return code should be 1
+
+  @require-wp-5.0
+  Scenario: Create synced pattern with malformed content shows warning
+    Given a WP install
+
+    When I run `wp block synced-pattern create --title="Malformed Pattern" --content='<!-- wp:paragraph' --porcelain`
+    Then STDERR should contain:
+      """
+      Warning: Content does not appear to contain valid blocks.
+      """
+    And STDOUT should be a number
+
+  @require-wp-5.0
+  Scenario: List synced patterns in various formats
+    Given a WP install
+    When I run `wp block synced-pattern create --title="Format Test" --content='<!-- wp:paragraph --><p>X</p><!-- /wp:paragraph -->' --porcelain`
+    Then save STDOUT as {PATTERN_ID}
+
+    When I run `wp block synced-pattern list --format=table`
+    Then STDOUT should be a table containing rows:
+      | ID           |
+      | {PATTERN_ID} |
+
+    When I run `wp block synced-pattern list --format=csv`
+    Then STDOUT should contain:
+      """
+      ID,
+      """
+
+    When I run `wp block synced-pattern list --format=yaml`
+    Then STDOUT should contain:
+      """
+      post_title: Format Test
+      """
+
+    # Cleanup
+    When I run `wp block synced-pattern delete {PATTERN_ID} --force`
+    Then STDOUT should contain:
+      """
+      Deleted
+      """
diff --git a/features/block-template.feature b/features/block-template.feature
index b01478a..9f91aec 100644
--- a/features/block-template.feature
+++ b/features/block-template.feature
@@ -126,3 +126,59 @@ Feature: Block template commands
       not found
       """
     And the return code should be 1
+
+  @require-wp-5.9
+  Scenario: Export template to file
+    Given a WP install
+    And I try `wp theme install twentytwentyfour --activate`
+
+    When I run `wp block template list --field=id`
+    Then STDOUT should not be empty
+    And save STDOUT '%s' as {TEMPLATE_ID}
+
+    When I run `wp block template export {TEMPLATE_ID} --file=exported-template.html`
+    Then STDOUT should contain:
+      """
+      Success:
+      """
+    And the exported-template.html file should contain:
+      """
+      <!-- wp:
+      """
+
+  @require-wp-5.9
+  Scenario: List templates with classic theme returns empty
+    Given a WP install
+    # Default theme is usually a classic theme in test environment
+    # If twentytwentyone is available, use it as a classic theme example
+
+    When I run `wp block template list --format=count`
+    # Classic themes may return 0 templates
+    Then STDOUT should be a number
+
+  @require-wp-5.9
+  Scenario: Filter template parts by invalid area returns empty
+    Given a WP install
+    And I try `wp theme install twentytwentyfour --activate`
+
+    When I run `wp block template list --type=wp_template_part --area=nonexistent --format=count`
+    Then STDOUT should be:
+      """
+      0
+      """
+
+  @require-wp-5.9
+  Scenario: Export template creates subdirectories
+    Given a WP install
+    And I try `wp theme install twentytwentyfour --activate`
+
+    When I run `wp block template list --field=id`
+    Then STDOUT should not be empty
+    And save STDOUT '%s' as {TEMPLATE_ID}
+
+    When I run `wp block template export {TEMPLATE_ID} --file=subdir/nested/template.html`
+    Then STDOUT should contain:
+      """
+      Success: Exported template to 'subdir/nested/template.html'.
+      """
+    And the subdir/nested/template.html file should exist
diff --git a/features/block-type.feature b/features/block-type.feature
index 5ffc8fc..a661eb3 100644
--- a/features/block-type.feature
+++ b/features/block-type.feature
@@ -110,3 +110,54 @@ Feature: Block type commands
       not registered
       """
     And the return code should be 1
+
+  @require-wp-5.0
+  Scenario: Filter by non-existent namespace returns empty
+    Given a WP install
+
+    When I run `wp block type list --namespace=nonexistent --format=count`
+    Then STDOUT should be:
+      """
+      0
+      """
+
+  @require-wp-5.0
+  Scenario: List block types in various formats
+    Given a WP install
+
+    When I run `wp block type list --format=table`
+    Then STDOUT should be a table containing rows:
+      | name           |
+      | core/paragraph |
+
+    When I run `wp block type list --format=csv`
+    Then STDOUT should contain:
+      """
+      name,
+      """
+
+    When I run `wp block type list --format=yaml`
+    Then STDOUT should contain:
+      """
+      name: core/paragraph
+      """
+
+  @require-wp-5.0
+  Scenario: List block types with custom fields
+    Given a WP install
+
+    When I run `wp block type list --fields=name,category --format=table`
+    Then STDOUT should be a table containing rows:
+      | name           | category |
+      | core/paragraph | text     |
+
+  @require-wp-5.0
+  Scenario: Error when using both --dynamic and --static flags
+    Given a WP install
+
+    When I try `wp block type list --dynamic --static`
+    Then STDERR should contain:
+      """
+      --dynamic and --static are mutually exclusive
+      """
+    And the return code should be 1
diff --git a/src/Block_Synced_Pattern_Command.php b/src/Block_Synced_Pattern_Command.php
index 0517efe..7583ad5 100644
--- a/src/Block_Synced_Pattern_Command.php
+++ b/src/Block_Synced_Pattern_Command.php
@@ -294,6 +294,13 @@ public function create( $args, $assoc_args ) {
 			WP_CLI::error( 'Pattern title is required. Use --title=<title>.' );
 		}
 
+		if ( empty( $content ) ) {
+			WP_CLI::error( 'Pattern content is required. Use --content=<content> or provide a file.' );
+		}
+
+		// Warn if content doesn't appear to contain valid blocks.
+		$this->validate_block_content( $content );
+
 		$post_data = [
 			'post_type'    => 'wp_block',
 			'post_title'   => $assoc_args['title'],
@@ -524,4 +531,25 @@ private function read_from_file_or_stdin( $file ) {
 	private function get_formatter( &$assoc_args ) {
 		return new Formatter( $assoc_args, $this->fields, 'synced-pattern' );
 	}
+
+	/**
+	 * Validates block content and warns if it appears malformed.
+	 *
+	 * @param string $content Block content to validate.
+	 */
+	private function validate_block_content( $content ) {
+		$blocks = parse_blocks( $content );
+
+		// Filter out empty/null blocks (freeform content).
+		$valid_blocks = array_filter(
+			$blocks,
+			function ( $block ) {
+				return ! empty( $block['blockName'] );
+			}
+		);
+
+		if ( empty( $valid_blocks ) ) {
+			WP_CLI::warning( 'Content does not appear to contain valid blocks. The pattern will be created with the provided content.' );
+		}
+	}
 }
diff --git a/src/Block_Template_Command.php b/src/Block_Template_Command.php
index 015c592..ba1e0f1 100644
--- a/src/Block_Template_Command.php
+++ b/src/Block_Template_Command.php
@@ -279,8 +279,11 @@ public function get( $args, $assoc_args ) {
 	 *   - wp_template_part
 	 * ---
 	 *
+	 * [--file=<file>]
+	 * : File path to export to. Parent directories will be created if needed.
+	 *
 	 * [--dir=<directory>]
-	 * : Directory to export to. Defaults to current directory.
+	 * : Directory to export to. Defaults to current directory. Creates directory if needed.
 	 *
 	 * [--stdout]
 	 * : Output to stdout instead of file.
@@ -296,6 +299,9 @@ public function get( $args, $assoc_args ) {
 	 *     # Export to specific directory
 	 *     $ wp block template export twentytwentyfour//single --dir=./templates/
 	 *
+	 *     # Export to specific file path
+	 *     $ wp block template export twentytwentyfour//single --file=exports/templates/single.html
+	 *
 	 * @param array $args       Positional arguments.
 	 * @param array $assoc_args Associative arguments.
 	 */
@@ -314,14 +320,30 @@ public function export( $args, $assoc_args ) {
 			return;
 		}
 
-		$dir = isset( $assoc_args['dir'] ) ? rtrim( $assoc_args['dir'], '/' ) : '.';
+		// Handle --file option for direct file path.
+		if ( ! empty( $assoc_args['file'] ) ) {
+			$filepath = $assoc_args['file'];
+			$dir      = dirname( $filepath );
 
-		if ( ! is_dir( $dir ) ) {
-			WP_CLI::error( "Directory '{$dir}' does not exist." );
-		}
+			// Create parent directories if needed.
+			if ( ! empty( $dir ) && '.' !== $dir && ! is_dir( $dir ) ) {
+				if ( ! wp_mkdir_p( $dir ) ) {
+					WP_CLI::error( "Could not create directory '{$dir}'." );
+				}
+			}
+		} else {
+			$dir = isset( $assoc_args['dir'] ) ? rtrim( $assoc_args['dir'], '/' ) : '.';
+
+			// Create directory if needed.
+			if ( ! is_dir( $dir ) ) {
+				if ( ! wp_mkdir_p( $dir ) ) {
+					WP_CLI::error( "Could not create directory '{$dir}'." );
+				}
+			}
 
-		$filename = $template->slug . '.html';
-		$filepath = $dir . '/' . $filename;
+			$filename = $template->slug . '.html';
+			$filepath = $dir . '/' . $filename;
+		}
 
 		$result = file_put_contents( $filepath, $content );
 
diff --git a/src/Block_Type_Command.php b/src/Block_Type_Command.php
index 29f54ca..1a38d79 100644
--- a/src/Block_Type_Command.php
+++ b/src/Block_Type_Command.php
@@ -124,6 +124,14 @@ class Block_Type_Command extends WP_CLI_Command {
 	 * @param array $assoc_args Associative arguments.
 	 */
 	public function list_( $args, $assoc_args ) {
+		// Validate mutually exclusive flags.
+		$dynamic = isset( $assoc_args['dynamic'] );
+		$static  = isset( $assoc_args['static'] );
+
+		if ( $dynamic && $static ) {
+			WP_CLI::error( '--dynamic and --static are mutually exclusive.' );
+		}
+
 		$registry    = WP_Block_Type_Registry::get_instance();
 		$block_types = $registry->get_all_registered();
 

From b5997d25bc7ceaa9d7032fe6602b7a2aee8d2485 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Wed, 10 Dec 2025 04:11:48 +0000
Subject: [PATCH 2/4] Make --dir and --file in block template command mutually
 exclsuive

---
 features/block-template.feature | 16 ++++++++++++++++
 src/Block_Template_Command.php  |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/features/block-template.feature b/features/block-template.feature
index 9f91aec..7943a0c 100644
--- a/features/block-template.feature
+++ b/features/block-template.feature
@@ -182,3 +182,19 @@ Feature: Block template commands
       Success: Exported template to 'subdir/nested/template.html'.
       """
     And the subdir/nested/template.html file should exist
+
+  @require-wp-5.9
+  Scenario: Export fails when both --file and --dir are provided
+    Given a WP install
+    And I try `wp theme install twentytwentyfour --activate`
+
+    When I run `wp block template list --field=id`
+    Then STDOUT should not be empty
+    And save STDOUT '%s' as {TEMPLATE_ID}
+
+    When I try `wp block template export {TEMPLATE_ID} --file=template.html --dir=./exports`
+    Then STDERR should contain:
+      """
+      The --file and --dir options are mutually exclusive.
+      """
+    And the return code should be 1
diff --git a/src/Block_Template_Command.php b/src/Block_Template_Command.php
index ba1e0f1..120376c 100644
--- a/src/Block_Template_Command.php
+++ b/src/Block_Template_Command.php
@@ -306,6 +306,11 @@ public function get( $args, $assoc_args ) {
 	 * @param array $assoc_args Associative arguments.
 	 */
 	public function export( $args, $assoc_args ) {
+		// Check for mutually exclusive options.
+		if ( ! empty( $assoc_args['file'] ) && ! empty( $assoc_args['dir'] ) ) {
+			WP_CLI::error( 'The --file and --dir options are mutually exclusive.' );
+		}
+
 		$type     = isset( $assoc_args['type'] ) ? $assoc_args['type'] : 'wp_template';
 		$template = get_block_template( $args[0], $type );
 

From c384e7db225cf9f0c4bd5d0ba986940fe2ad62f7 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Wed, 10 Dec 2025 05:05:51 +0000
Subject: [PATCH 3/4] Improve tests

---
 features/block-binding.feature          | 2 +-
 features/block-pattern-category.feature | 2 +-
 features/block-style.feature            | 2 +-
 features/block-synced-pattern.feature   | 5 +++--
 features/block-type.feature             | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/features/block-binding.feature b/features/block-binding.feature
index d9a2d4f..45808dd 100644
--- a/features/block-binding.feature
+++ b/features/block-binding.feature
@@ -52,7 +52,7 @@ Feature: Block binding commands
   Scenario: List binding sources in various formats
     Given a WP install
 
-    When I run `wp block binding list --format=table`
+    When I run `wp block binding list --fields=name --format=table`
     Then STDOUT should be a table containing rows:
       | name           |
       | core/post-meta |
diff --git a/features/block-pattern-category.feature b/features/block-pattern-category.feature
index 7f7e884..3bb75e0 100644
--- a/features/block-pattern-category.feature
+++ b/features/block-pattern-category.feature
@@ -45,7 +45,7 @@ Feature: Block pattern category commands
   Scenario: List pattern categories in various formats
     Given a WP install
 
-    When I run `wp block pattern-category list --format=table`
+    When I run `wp block pattern-category list --fields=name --format=table`
     Then STDOUT should be a table containing rows:
       | name |
       | text |
diff --git a/features/block-style.feature b/features/block-style.feature
index 38563a3..928a24a 100644
--- a/features/block-style.feature
+++ b/features/block-style.feature
@@ -136,7 +136,7 @@ Feature: Block style commands
       Success:
       """
 
-    When I run `wp block style list --block=core/paragraph --format=ids`
+    When I run `wp block style list --block=core/paragraph --field=name`
     Then STDOUT should contain:
       """
       format-test-style
diff --git a/features/block-synced-pattern.feature b/features/block-synced-pattern.feature
index de4000f..28040df 100644
--- a/features/block-synced-pattern.feature
+++ b/features/block-synced-pattern.feature
@@ -267,12 +267,13 @@ Feature: Synced pattern (wp_block) CRUD commands
   Scenario: Create synced pattern with malformed content shows warning
     Given a WP install
 
-    When I run `wp block synced-pattern create --title="Malformed Pattern" --content='<!-- wp:paragraph' --porcelain`
+    When I try `wp block synced-pattern create --title="Malformed Pattern" --content='<!-- wp:paragraph' --porcelain`
     Then STDERR should contain:
       """
       Warning: Content does not appear to contain valid blocks.
       """
     And STDOUT should be a number
+    And the return code should be 0
 
   @require-wp-5.0
   Scenario: List synced patterns in various formats
@@ -280,7 +281,7 @@ Feature: Synced pattern (wp_block) CRUD commands
     When I run `wp block synced-pattern create --title="Format Test" --content='<!-- wp:paragraph --><p>X</p><!-- /wp:paragraph -->' --porcelain`
     Then save STDOUT as {PATTERN_ID}
 
-    When I run `wp block synced-pattern list --format=table`
+    When I run `wp block synced-pattern list --fields=ID --format=table`
     Then STDOUT should be a table containing rows:
       | ID           |
       | {PATTERN_ID} |
diff --git a/features/block-type.feature b/features/block-type.feature
index a661eb3..6d7ff52 100644
--- a/features/block-type.feature
+++ b/features/block-type.feature
@@ -125,7 +125,7 @@ Feature: Block type commands
   Scenario: List block types in various formats
     Given a WP install
 
-    When I run `wp block type list --format=table`
+    When I run `wp block type list --fields=name --format=table`
     Then STDOUT should be a table containing rows:
       | name           |
       | core/paragraph |

From a7e9371531e086bd43c7197e8a0f2ffcf4d08943 Mon Sep 17 00:00:00 2001
From: Alain Schlesser <alain.schlesser@gmail.com>
Date: Wed, 10 Dec 2025 10:15:55 +0000
Subject: [PATCH 4/4] Fix expected version mismatch string

---
 features/block-binding.feature | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/features/block-binding.feature b/features/block-binding.feature
index 45808dd..f8294c7 100644
--- a/features/block-binding.feature
+++ b/features/block-binding.feature
@@ -7,7 +7,7 @@ Feature: Block binding commands
     When I try `wp block binding list`
     Then STDERR should contain:
       """
-      is not a registered wp command
+      Requires WordPress 6.5 or greater.
       """
     And the return code should be 1