From 446ca57da79cf0556b1e9cfb66d7208a026b3a34 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 2 Mar 2023 11:20:31 +0100
Subject: [PATCH 01/38] SSR: Add wp-show attribute directive processor

---
 phpunit/directives/attributes/wp-show.php | 64 +++++++++++++++++++++++
 src/directives/attributes/wp-show.php     | 27 ++++++++++
 wp-directives.php                         |  2 +
 3 files changed, 93 insertions(+)
 create mode 100644 phpunit/directives/attributes/wp-show.php
 create mode 100644 src/directives/attributes/wp-show.php

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
new file mode 100644
index 00000000..3a550212
--- /dev/null
+++ b/phpunit/directives/attributes/wp-show.php
@@ -0,0 +1,64 @@
+<?php
+/**
+ * wp-show tag directive test.
+ */
+
+ require_once __DIR__ . '/../../../src/directives/attributes/wp-show.php';
+
+ require_once __DIR__ . '/../../../src/directives/class-wp-directive-context.php';
+ require_once __DIR__ . '/../../../src/directives/class-wp-directive-processor.php';
+ 
+ require_once __DIR__ . '/../../../src/directives/wp-html.php';
+
+/**
+ * Tests for the wp-show tag directive.
+ *
+ * @group  directives
+ * @covers process_wp_show
+ */
+class Tests_Directives_WpShow extends WP_UnitTestCase {
+	public function test_directive_leaves_content_unchanged_if_when_is_true() {
+		$markup = <<<EOF
+			<div wp-show="context.myblock.open">
+				I should be shown!
+			</div>
+EOF;
+		$tags = new WP_Directive_Processor( $markup );
+		$tags->next_tag();
+
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => true ) ) );
+		$context        = clone $context_before;
+		process_wp_show( $tags, $context );
+
+		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		process_wp_show( $tags, $context );
+
+		$this->assertSame( $markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'wp-show directive changed context' );
+	}
+
+	public function test_directive_wraps_content_in_template_if_when_is_false() {
+		$markup = <<<EOF
+			<div wp-show="context.myblock.open">
+				I should be shown!
+			</div>
+EOF;
+		$tags = new WP_Directive_Processor( $markup );
+		$tags->next_tag();
+
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => false ) ) );
+		$context        = clone $context_before;
+		process_wp_show( $tags, $context );
+
+		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		process_wp_show( $tags, $context );
+
+		$updated_markup = <<<EOF
+			<div wp-show="context.myblock.open"><template>
+				I should be shown!
+			</template></div>
+EOF;
+		$this->assertSame( $updated_markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'wp-show directive changed context' );
+	}
+}
diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
new file mode 100644
index 00000000..89ed6126
--- /dev/null
+++ b/src/directives/attributes/wp-show.php
@@ -0,0 +1,27 @@
+<?php
+
+require_once __DIR__ . '/../utils.php';
+
+function process_wp_show( $tags, $context ) {
+	if ( ! $tags->is_tag_closer() ) { // TODO: Exclude void and self-closing!
+		set_bookmark_for_directive( $tags, 'wp-show' );
+		return;
+	}
+
+	$end = 'wp-show-closer';
+	$tags->set_bookmark( 'wp-show-closer' );
+	$start = seek_bookmark_for_directive( $tags, 'wp-show' );
+
+	$value = $tags->get_attribute( 'wp-show' );
+	if ( null !== $value ) {
+		$show = evaluate( $value, $context->get_context() );
+
+		if ( ! $show ) {
+			$content = $tags->get_content_inside_bookmarks( $start, $end );
+			$tags->set_content_inside_bookmarks( $start, $end, '<template>' . $content . '</template>' );
+		}
+	}
+	$tags->seek( $end );
+	$tags->release_bookmark( $start );
+	$tags->release_bookmark( $end );
+}
diff --git a/wp-directives.php b/wp-directives.php
index 9ca9fdac..16599a14 100644
--- a/wp-directives.php
+++ b/wp-directives.php
@@ -47,6 +47,7 @@ function () {
 require_once __DIR__ . '/src/directives/attributes/wp-context.php';
 require_once __DIR__ . '/src/directives/attributes/wp-class.php';
 require_once __DIR__ . '/src/directives/attributes/wp-html.php';
+require_once __DIR__ . '/src/directives/attributes/wp-show.php';
 require_once __DIR__ . '/src/directives/attributes/wp-style.php';
 require_once __DIR__ . '/src/directives/attributes/wp-text.php';
 
@@ -261,6 +262,7 @@ function process_directives_in_block( $block_content ) {
 		'data-wp-bind'    => 'process_wp_bind',
 		'data-wp-class'   => 'process_wp_class',
 		'data-wp-html'    => 'process_wp_html',
+		'data-wp-show'    => 'process_wp_show',
 		'data-wp-style'   => 'process_wp_style',
 		'data-wp-text'    => 'process_wp_text',
 	);

From 8a66bacf624cf3ec6c7e83fb318bfa1b3bd1fd57 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 9 Mar 2023 14:56:04 +0100
Subject: [PATCH 02/38] Simplify implementation of wp-show

---
 src/directives/attributes/wp-show.php | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
index 89ed6126..f9a93f84 100644
--- a/src/directives/attributes/wp-show.php
+++ b/src/directives/attributes/wp-show.php
@@ -3,25 +3,18 @@
 require_once __DIR__ . '/../utils.php';
 
 function process_wp_show( $tags, $context ) {
-	if ( ! $tags->is_tag_closer() ) { // TODO: Exclude void and self-closing!
-		set_bookmark_for_directive( $tags, 'wp-show' );
+	if ( $tags->is_tag_closer() ) {
 		return;
 	}
 
-	$end = 'wp-show-closer';
-	$tags->set_bookmark( 'wp-show-closer' );
-	$start = seek_bookmark_for_directive( $tags, 'wp-show' );
-
 	$value = $tags->get_attribute( 'wp-show' );
-	if ( null !== $value ) {
-		$show = evaluate( $value, $context->get_context() );
+	if ( null === $value ) {
+		return;
+	}
 
-		if ( ! $show ) {
-			$content = $tags->get_content_inside_bookmarks( $start, $end );
-			$tags->set_content_inside_bookmarks( $start, $end, '<template>' . $content . '</template>' );
-		}
+	$show = evaluate( $value, $context->get_context() );
+	if ( ! $show ) {
+		$content = $tags->get_inner_html();
+		$tags->set_inner_html( '<template>' . $content . '</template>' );
 	}
-	$tags->seek( $end );
-	$tags->release_bookmark( $start );
-	$tags->release_bookmark( $end );
 }

From bc4adf3175fa9284e1e60494a6294f047fc8e41a Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Wed, 15 Mar 2023 17:12:36 +0100
Subject: [PATCH 03/38] Implement basic wrap_in_tag method()

---
 phpunit/directives/wp-directive-processor.php |  8 ++++++
 .../class-wp-directive-processor.php          | 26 +++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/phpunit/directives/wp-directive-processor.php b/phpunit/directives/wp-directive-processor.php
index e24e247c..9c0a3526 100644
--- a/phpunit/directives/wp-directive-processor.php
+++ b/phpunit/directives/wp-directive-processor.php
@@ -125,4 +125,12 @@ public function test_set_inner_html_invalidates_bookmarks_that_point_to_replaced
 		$successful_seek = $tags->seek( 'replaced' );
 		$this->assertFalse( $successful_seek );
 	}
+
+	public function test_wrap_in_tag_wraps_tag_correctly() {
+		$tags = new WP_Directive_Processor( self::HTML );
+
+		$tags->next_tag( 'section' );
+		$tags->wrap_in_tag( 'TEMPLATE' );
+		$this->assertSame( '<div>outside</div><template><section><div><img>inside</div></section></template>', $tags->get_updated_html() );
+	}
 }
diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index b6a2e046..408c40c1 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -131,6 +131,32 @@ public function get_balanced_tag_bookmarks() {
 		return array( $start_name, $end_name );
 	}
 
+	public function wrap_in_tag( $tag ) {
+		$tag = strtolower( $tag ); // TODO: Allow passing in tags with attributes, e.g. <template id="abc">?
+
+		$this->get_updated_html(); // Apply potential previous updates.
+
+		$bookmarks = $this->get_balanced_tag_bookmarks();
+		if ( ! $bookmarks ) {
+			return false;
+		}
+		list( $start_name, $end_name ) = $bookmarks;
+
+		$start = $this->bookmarks[ $start_name ]->start;
+		$end   = $this->bookmarks[ $end_name ]->end + 1;
+
+		$this->seek( $start_name ); // Return to original position.
+		$this->release_bookmark( $start_name );
+		$this->release_bookmark( $end_name );
+
+		$outer_html = substr( $this->html, $start, $end - $start );
+
+		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end, "<$tag>$outer_html</$tag>" );
+		// TODO: Make sure pointer is still pointing correctly to its original position!
+		// TODO: Adjust bookmarks if necessary!
+		return true;
+	}
+
 	/**
 	 * Whether a given HTML element is void (e.g. <br>).
 	 *

From 4e288c89f844e269c880cedcfee1596310796057 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Wed, 15 Mar 2023 17:12:54 +0100
Subject: [PATCH 04/38] Format wp-show

---
 phpunit/directives/attributes/wp-show.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 3a550212..259781a3 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -7,7 +7,7 @@
 
  require_once __DIR__ . '/../../../src/directives/class-wp-directive-context.php';
  require_once __DIR__ . '/../../../src/directives/class-wp-directive-processor.php';
- 
+
  require_once __DIR__ . '/../../../src/directives/wp-html.php';
 
 /**
@@ -23,7 +23,7 @@ public function test_directive_leaves_content_unchanged_if_when_is_true() {
 				I should be shown!
 			</div>
 EOF;
-		$tags = new WP_Directive_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => true ) ) );
@@ -43,7 +43,7 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 				I should be shown!
 			</div>
 EOF;
-		$tags = new WP_Directive_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => false ) ) );

From 86d5d4a81dbd358f948767982d9951f3b2b78cf1 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Wed, 15 Mar 2023 17:16:25 +0100
Subject: [PATCH 05/38] Use wrap_in_tag to implement wp-show

---
 phpunit/directives/attributes/wp-show.php | 4 ++--
 src/directives/attributes/wp-show.php     | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 259781a3..7ccbb484 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -54,9 +54,9 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 		process_wp_show( $tags, $context );
 
 		$updated_markup = <<<EOF
-			<div wp-show="context.myblock.open"><template>
+			<template><div wp-show="context.myblock.open">
 				I should be shown!
-			</template></div>
+			</div></template>
 EOF;
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'wp-show directive changed context' );
diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
index f9a93f84..9499c0a8 100644
--- a/src/directives/attributes/wp-show.php
+++ b/src/directives/attributes/wp-show.php
@@ -14,7 +14,6 @@ function process_wp_show( $tags, $context ) {
 
 	$show = evaluate( $value, $context->get_context() );
 	if ( ! $show ) {
-		$content = $tags->get_inner_html();
-		$tags->set_inner_html( '<template>' . $content . '</template>' );
+		$tags->wrap_in_tag( 'TEMPLATE' );
 	}
 }

From bb9b748f63ae8f24dc18b92e397168ebcf1def9f Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 20 Mar 2023 14:32:08 +0100
Subject: [PATCH 06/38] Add data- prefix

---
 phpunit/directives/attributes/wp-show.php | 12 ++++++------
 src/directives/attributes/wp-show.php     |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 7ccbb484..b9fcce46 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * wp-show tag directive test.
+ * data-wp-show tag directive test.
  */
 
  require_once __DIR__ . '/../../../src/directives/attributes/wp-show.php';
@@ -19,7 +19,7 @@
 class Tests_Directives_WpShow extends WP_UnitTestCase {
 	public function test_directive_leaves_content_unchanged_if_when_is_true() {
 		$markup = <<<EOF
-			<div wp-show="context.myblock.open">
+			<div data-wp-show="context.myblock.open">
 				I should be shown!
 			</div>
 EOF;
@@ -34,12 +34,12 @@ public function test_directive_leaves_content_unchanged_if_when_is_true() {
 		process_wp_show( $tags, $context );
 
 		$this->assertSame( $markup, $tags->get_updated_html() );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'wp-show directive changed context' );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
 
 	public function test_directive_wraps_content_in_template_if_when_is_false() {
 		$markup = <<<EOF
-			<div wp-show="context.myblock.open">
+			<div data-wp-show="context.myblock.open">
 				I should be shown!
 			</div>
 EOF;
@@ -54,11 +54,11 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 		process_wp_show( $tags, $context );
 
 		$updated_markup = <<<EOF
-			<template><div wp-show="context.myblock.open">
+			<template><div data-wp-show="context.myblock.open">
 				I should be shown!
 			</div></template>
 EOF;
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'wp-show directive changed context' );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
 }
diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
index 9499c0a8..a5626c94 100644
--- a/src/directives/attributes/wp-show.php
+++ b/src/directives/attributes/wp-show.php
@@ -7,7 +7,7 @@ function process_wp_show( $tags, $context ) {
 		return;
 	}
 
-	$value = $tags->get_attribute( 'wp-show' );
+	$value = $tags->get_attribute( 'data-wp-show' );
 	if ( null === $value ) {
 		return;
 	}

From 929a6f214d3928c7096f0c234e17374c9cc6e49f Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 20 Mar 2023 14:32:15 +0100
Subject: [PATCH 07/38] Format

---
 phpunit/directives/attributes/wp-show.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index b9fcce46..96d9ddf5 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -3,12 +3,12 @@
  * data-wp-show tag directive test.
  */
 
- require_once __DIR__ . '/../../../src/directives/attributes/wp-show.php';
+require_once __DIR__ . '/../../../src/directives/attributes/wp-show.php';
 
- require_once __DIR__ . '/../../../src/directives/class-wp-directive-context.php';
- require_once __DIR__ . '/../../../src/directives/class-wp-directive-processor.php';
+require_once __DIR__ . '/../../../src/directives/class-wp-directive-context.php';
+require_once __DIR__ . '/../../../src/directives/class-wp-directive-processor.php';
 
- require_once __DIR__ . '/../../../src/directives/wp-html.php';
+require_once __DIR__ . '/../../../src/directives/wp-html.php';
 
 /**
  * Tests for the wp-show tag directive.

From fd977a18b6ffe5d094dac1f6c604668915ad85be Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 20 Mar 2023 16:31:46 +0100
Subject: [PATCH 08/38] Add PHPDoc

---
 src/directives/class-wp-directive-processor.php | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index 408c40c1..b5f815dd 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -131,8 +131,20 @@ public function get_balanced_tag_bookmarks() {
 		return array( $start_name, $end_name );
 	}
 
+	/**
+	 * Wrap the current node in a given tag.
+	 *
+	 * When positioned on a tag opener, locate its matching closer, and wrap everything
+	 * in the tag specified as an argument. When positioned on a void element, wrap that
+	 * element in the argument tag.
+	 *
+	 * @param string $tag An HTML tag, specified in uppercase (e.g. "DIV").
+	 * @return bool Whether the operation was successful.
+	 *
+	 * @todo Allow passing in tags with attributes, e.g. <template id="abc">?
+	 */
 	public function wrap_in_tag( $tag ) {
-		$tag = strtolower( $tag ); // TODO: Allow passing in tags with attributes, e.g. <template id="abc">?
+		$tag = strtolower( $tag );
 
 		$this->get_updated_html(); // Apply potential previous updates.
 

From 5b63332a6d016c7449fce5dee656435a6a720115 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 20 Mar 2023 16:46:40 +0100
Subject: [PATCH 09/38] wrap_in_tag: Cover void tags

---
 phpunit/directives/wp-directive-processor.php | 10 ++++-
 .../class-wp-directive-processor.php          | 41 +++++++++++++------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/phpunit/directives/wp-directive-processor.php b/phpunit/directives/wp-directive-processor.php
index 9c0a3526..4de00a76 100644
--- a/phpunit/directives/wp-directive-processor.php
+++ b/phpunit/directives/wp-directive-processor.php
@@ -126,11 +126,19 @@ public function test_set_inner_html_invalidates_bookmarks_that_point_to_replaced
 		$this->assertFalse( $successful_seek );
 	}
 
-	public function test_wrap_in_tag_wraps_tag_correctly() {
+	public function test_wrap_in_tag_wraps_balanced_tag_correctly() {
 		$tags = new WP_Directive_Processor( self::HTML );
 
 		$tags->next_tag( 'section' );
 		$tags->wrap_in_tag( 'TEMPLATE' );
 		$this->assertSame( '<div>outside</div><template><section><div><img>inside</div></section></template>', $tags->get_updated_html() );
 	}
+
+	public function test_wrap_in_tag_wraps_void_tag_correctly() {
+		$tags = new WP_Directive_Processor( self::HTML );
+
+		$tags->next_tag( 'img' );
+		$tags->wrap_in_tag( 'TEMPLATE' );
+		$this->assertSame( '<div>outside</div><section><div><template><img></template>inside</div></section>', $tags->get_updated_html() );
+	}
 }
diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index b5f815dd..f7efe193 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -144,25 +144,42 @@ public function get_balanced_tag_bookmarks() {
 	 * @todo Allow passing in tags with attributes, e.g. <template id="abc">?
 	 */
 	public function wrap_in_tag( $tag ) {
-		$tag = strtolower( $tag );
-
 		$this->get_updated_html(); // Apply potential previous updates.
 
-		$bookmarks = $this->get_balanced_tag_bookmarks();
-		if ( ! $bookmarks ) {
-			return false;
-		}
-		list( $start_name, $end_name ) = $bookmarks;
+		if ( self::is_html_void_element( $this->get_tag() ) ) {
+			// We don't have direct access to the start and end position of the
+			// current tag. As a workaround, we set a bookmark that we then
+			// release immediately.
+			$i = 0;
+			while ( array_key_exists( 'void' . $i, $this->bookmarks ) ) {
+				++$i;
+			}
+			$bookmark_name = 'void' . $i;
 
-		$start = $this->bookmarks[ $start_name ]->start;
-		$end   = $this->bookmarks[ $end_name ]->end + 1;
+			$this->set_bookmark( $bookmark_name );
 
-		$this->seek( $start_name ); // Return to original position.
-		$this->release_bookmark( $start_name );
-		$this->release_bookmark( $end_name );
+			$start = $this->bookmarks[ $bookmark_name ]->start;
+			$end   = $this->bookmarks[ $bookmark_name ]->end + 1;
+
+			$this->release_bookmark( $bookmark_name );
+		} else {
+			$bookmarks = $this->get_balanced_tag_bookmarks();
+			if ( ! $bookmarks ) {
+				return false;
+			}
+			list( $start_name, $end_name ) = $bookmarks;
+
+			$start = $this->bookmarks[ $start_name ]->start;
+			$end   = $this->bookmarks[ $end_name ]->end + 1;
+
+			$this->seek( $start_name ); // Return to original position.
+			$this->release_bookmark( $start_name );
+			$this->release_bookmark( $end_name );
+		}
 
 		$outer_html = substr( $this->html, $start, $end - $start );
 
+		$tag                     = strtolower( $tag );
 		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end, "<$tag>$outer_html</$tag>" );
 		// TODO: Make sure pointer is still pointing correctly to its original position!
 		// TODO: Adjust bookmarks if necessary!

From 6f281f951fd54ab8673ff2208ba1ddd5eeb6a75b Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 20 Mar 2023 16:48:57 +0100
Subject: [PATCH 10/38] wp-show: Add test to cover void tags

---
 phpunit/directives/attributes/wp-show.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 96d9ddf5..5443a836 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -61,4 +61,22 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
+
+	public function test_directive_wraps_void_tag_in_template_if_when_is_false() {
+		$markup = '<img data-wp-show="context.myblock.open">';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->next_tag();
+
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => false ) ) );
+		$context        = clone $context_before;
+		process_wp_show( $tags, $context );
+
+		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		process_wp_show( $tags, $context );
+
+		$updated_markup = '<template><img data-wp-show="context.myblock.open"></template>';
+
+		$this->assertSame( $updated_markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
+	}
 }

From d5ade51ac2e410a17d9f57fe8c0ee4e8456a2b25 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 20 Mar 2023 17:34:53 +0100
Subject: [PATCH 11/38] Remove now-obsolete TODO comments

---
 src/directives/class-wp-directive-processor.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index f7efe193..3f4158f6 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -181,8 +181,7 @@ public function wrap_in_tag( $tag ) {
 
 		$tag                     = strtolower( $tag );
 		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end, "<$tag>$outer_html</$tag>" );
-		// TODO: Make sure pointer is still pointing correctly to its original position!
-		// TODO: Adjust bookmarks if necessary!
+
 		return true;
 	}
 

From f8e005c663449828cfcf143f926023862384696e Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 14:16:50 +0100
Subject: [PATCH 12/38] Add test to demonstrate issue

---
 phpunit/directives/wp-directive-processor.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/phpunit/directives/wp-directive-processor.php b/phpunit/directives/wp-directive-processor.php
index 4de00a76..9a071b43 100644
--- a/phpunit/directives/wp-directive-processor.php
+++ b/phpunit/directives/wp-directive-processor.php
@@ -141,4 +141,13 @@ public function test_wrap_in_tag_wraps_void_tag_correctly() {
 		$tags->wrap_in_tag( 'TEMPLATE' );
 		$this->assertSame( '<div>outside</div><section><div><template><img></template>inside</div></section>', $tags->get_updated_html() );
 	}
+
+	public function test_wrap_in_tag_followed_by_two_subsequent_calls_of_get_updated_html_works_correctly() {
+		$tags = new WP_Directive_Processor( self::HTML );
+
+		$tags->next_tag( 'img' );
+		$tags->wrap_in_tag( 'TEMPLATE' );
+		$tags->get_updated_html();
+		$this->assertSame( '<div>outside</div><section><div><template><img></template>inside</div></section>', $tags->get_updated_html() );
+	}
 }

From f4fa160e3180a2d7cdb7fcb50d6936889cbc4d6c Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 14:32:31 +0100
Subject: [PATCH 13/38] Return to original position after replacing

---
 src/directives/class-wp-directive-processor.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index 3f4158f6..1a5c599c 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -154,14 +154,12 @@ public function wrap_in_tag( $tag ) {
 			while ( array_key_exists( 'void' . $i, $this->bookmarks ) ) {
 				++$i;
 			}
-			$bookmark_name = 'void' . $i;
+			$start_name = 'void' . $i;
 
-			$this->set_bookmark( $bookmark_name );
+			$this->set_bookmark( $start_name );
 
-			$start = $this->bookmarks[ $bookmark_name ]->start;
-			$end   = $this->bookmarks[ $bookmark_name ]->end + 1;
-
-			$this->release_bookmark( $bookmark_name );
+			$start = $this->bookmarks[ $start_name ]->start;
+			$end   = $this->bookmarks[ $start_name ]->end + 1;
 		} else {
 			$bookmarks = $this->get_balanced_tag_bookmarks();
 			if ( ! $bookmarks ) {
@@ -172,8 +170,6 @@ public function wrap_in_tag( $tag ) {
 			$start = $this->bookmarks[ $start_name ]->start;
 			$end   = $this->bookmarks[ $end_name ]->end + 1;
 
-			$this->seek( $start_name ); // Return to original position.
-			$this->release_bookmark( $start_name );
 			$this->release_bookmark( $end_name );
 		}
 
@@ -182,6 +178,9 @@ public function wrap_in_tag( $tag ) {
 		$tag                     = strtolower( $tag );
 		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end, "<$tag>$outer_html</$tag>" );
 
+		$this->seek( $start_name ); // Return to original position.
+		$this->release_bookmark( $start_name );
+
 		return true;
 	}
 

From cef691c127af4a9712249cb55f3124d8f3be2427 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 14:33:43 +0100
Subject: [PATCH 14/38] wrap_in_tag: Bail early if we're at a tag closer

---
 src/directives/class-wp-directive-processor.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index 1a5c599c..39a36c40 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -144,6 +144,10 @@ public function get_balanced_tag_bookmarks() {
 	 * @todo Allow passing in tags with attributes, e.g. <template id="abc">?
 	 */
 	public function wrap_in_tag( $tag ) {
+		if ( $this->is_tag_closer() ) {
+			return false;
+		}
+
 		$this->get_updated_html(); // Apply potential previous updates.
 
 		if ( self::is_html_void_element( $this->get_tag() ) ) {

From 9eae803d4dc45aec20a0650a6853dad8217e5331 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 14:35:01 +0100
Subject: [PATCH 15/38] Simply insert start and end tag in correct positions

---
 src/directives/class-wp-directive-processor.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index 39a36c40..fbc044b0 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -177,10 +177,9 @@ public function wrap_in_tag( $tag ) {
 			$this->release_bookmark( $end_name );
 		}
 
-		$outer_html = substr( $this->html, $start, $end - $start );
-
 		$tag                     = strtolower( $tag );
-		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $end, "<$tag>$outer_html</$tag>" );
+		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $start, $start, "<$tag>" );
+		$this->lexical_updates[] = new WP_HTML_Text_Replacement( $end, $end, "</$tag>" );
 
 		$this->seek( $start_name ); // Return to original position.
 		$this->release_bookmark( $start_name );

From ba7590095144a241b1d3494a769061d5b00f9201 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 15:02:23 +0100
Subject: [PATCH 16/38] Document that the pointer keeps pointing at the same
 tag

---
 phpunit/directives/wp-directive-processor.php   | 4 ++++
 src/directives/class-wp-directive-processor.php | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/phpunit/directives/wp-directive-processor.php b/phpunit/directives/wp-directive-processor.php
index 9a071b43..f4e50324 100644
--- a/phpunit/directives/wp-directive-processor.php
+++ b/phpunit/directives/wp-directive-processor.php
@@ -132,6 +132,8 @@ public function test_wrap_in_tag_wraps_balanced_tag_correctly() {
 		$tags->next_tag( 'section' );
 		$tags->wrap_in_tag( 'TEMPLATE' );
 		$this->assertSame( '<div>outside</div><template><section><div><img>inside</div></section></template>', $tags->get_updated_html() );
+		$this->assertSame( 'SECTION', $tags->get_tag() );
+		$this->assertFalse( $tags->is_tag_closer() );
 	}
 
 	public function test_wrap_in_tag_wraps_void_tag_correctly() {
@@ -140,6 +142,7 @@ public function test_wrap_in_tag_wraps_void_tag_correctly() {
 		$tags->next_tag( 'img' );
 		$tags->wrap_in_tag( 'TEMPLATE' );
 		$this->assertSame( '<div>outside</div><section><div><template><img></template>inside</div></section>', $tags->get_updated_html() );
+		$this->assertSame( 'IMG', $tags->get_tag() );
 	}
 
 	public function test_wrap_in_tag_followed_by_two_subsequent_calls_of_get_updated_html_works_correctly() {
@@ -149,5 +152,6 @@ public function test_wrap_in_tag_followed_by_two_subsequent_calls_of_get_updated
 		$tags->wrap_in_tag( 'TEMPLATE' );
 		$tags->get_updated_html();
 		$this->assertSame( '<div>outside</div><section><div><template><img></template>inside</div></section>', $tags->get_updated_html() );
+		$this->assertSame( 'IMG', $tags->get_tag() );
 	}
 }
diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index fbc044b0..d76f353f 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -138,6 +138,9 @@ public function get_balanced_tag_bookmarks() {
 	 * in the tag specified as an argument. When positioned on a void element, wrap that
 	 * element in the argument tag.
 	 *
+	 * Note that the internal pointer will continue to point to the same tag as before
+	 * calling the function.
+	 *
 	 * @param string $tag An HTML tag, specified in uppercase (e.g. "DIV").
 	 * @return bool Whether the operation was successful.
 	 *

From 7eb3777746c86fd74e9e40e03e0d62b08385eb13 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 15:26:17 +0100
Subject: [PATCH 17/38] Simplify unit test

---
 phpunit/directives/attributes/wp-show.php | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 5443a836..4f9ed298 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -18,11 +18,7 @@
  */
 class Tests_Directives_WpShow extends WP_UnitTestCase {
 	public function test_directive_leaves_content_unchanged_if_when_is_true() {
-		$markup = <<<EOF
-			<div data-wp-show="context.myblock.open">
-				I should be shown!
-			</div>
-EOF;
+		$markup = '<div data-wp-show="context.myblock.open">I should be shown!</div>';
 		$tags   = new WP_Directive_Processor( $markup );
 		$tags->next_tag();
 
@@ -38,12 +34,9 @@ public function test_directive_leaves_content_unchanged_if_when_is_true() {
 	}
 
 	public function test_directive_wraps_content_in_template_if_when_is_false() {
-		$markup = <<<EOF
-			<div data-wp-show="context.myblock.open">
-				I should be shown!
-			</div>
-EOF;
-		$tags   = new WP_Directive_Processor( $markup );
+		$markup = '<div data-wp-show="context.myblock.open">I should not be shown!</div>';
+
+		$tags = new WP_Directive_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => false ) ) );
@@ -53,11 +46,8 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
 		process_wp_show( $tags, $context );
 
-		$updated_markup = <<<EOF
-			<template><div data-wp-show="context.myblock.open">
-				I should be shown!
-			</div></template>
-EOF;
+		$updated_markup = '<template><div data-wp-show="context.myblock.open">I should not be shown!</div></template>';
+
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}

From 665b4cb1df27d6b2fd4b1289253b17b2bd888dba Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 15:37:58 +0100
Subject: [PATCH 18/38] Move attribute to wrapping tag

---
 phpunit/directives/attributes/wp-show.php       |  4 ++--
 src/directives/attributes/wp-show.php           |  6 +++++-
 src/directives/class-wp-directive-processor.php | 14 ++++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 4f9ed298..f9314c19 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -46,7 +46,7 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
 		process_wp_show( $tags, $context );
 
-		$updated_markup = '<template><div data-wp-show="context.myblock.open">I should not be shown!</div></template>';
+		$updated_markup = '<template data-wp-show="context.myblock.open"><div >I should not be shown!</div></template>';
 
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
@@ -64,7 +64,7 @@ public function test_directive_wraps_void_tag_in_template_if_when_is_false() {
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
 		process_wp_show( $tags, $context );
 
-		$updated_markup = '<template><img data-wp-show="context.myblock.open"></template>';
+		$updated_markup = '<template data-wp-show="context.myblock.open"><img ></template>';
 
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
index a5626c94..141c26ee 100644
--- a/src/directives/attributes/wp-show.php
+++ b/src/directives/attributes/wp-show.php
@@ -14,6 +14,10 @@ function process_wp_show( $tags, $context ) {
 
 	$show = evaluate( $value, $context->get_context() );
 	if ( ! $show ) {
-		$tags->wrap_in_tag( 'TEMPLATE' );
+		$wrapper_bookmark = $tags->wrap_in_tag( 'TEMPLATE' );
+		$tags->seek( $wrapper_bookmark );
+		$tags->set_attribute( 'data-wp-show', $value );
+		$tags->next_tag();
+		$tags->remove_attribute( 'data-wp-show' );
 	}
 }
diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index d76f353f..d52656df 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -142,7 +142,8 @@ public function get_balanced_tag_bookmarks() {
 	 * calling the function.
 	 *
 	 * @param string $tag An HTML tag, specified in uppercase (e.g. "DIV").
-	 * @return bool Whether the operation was successful.
+	 * @return string|false The name of a bookmark pointing to the wrapping tag opener
+	 *                      if successful; false otherwise.
 	 *
 	 * @todo Allow passing in tags with attributes, e.g. <template id="abc">?
 	 */
@@ -187,7 +188,16 @@ public function wrap_in_tag( $tag ) {
 		$this->seek( $start_name ); // Return to original position.
 		$this->release_bookmark( $start_name );
 
-		return true;
+		$i = 0;
+		while ( array_key_exists( $tag . $i, $this->bookmarks ) ) {
+			++$i;
+		}
+		$bookmark_name                     = $tag . $i;
+		$this->bookmarks[ $bookmark_name ] = new WP_HTML_Span(
+			$start,
+			$start + strlen( $tag ) + 2
+		);
+		return $bookmark_name;
 	}
 
 	/**

From f1eee339b9ea59d478b402dee9ac5066d6cc7879 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 21 Mar 2023 15:54:40 +0100
Subject: [PATCH 19/38] Fail if trying to wrap in void tag

---
 phpunit/directives/wp-directive-processor.php   | 10 ++++++++++
 src/directives/class-wp-directive-processor.php |  9 +++++++++
 2 files changed, 19 insertions(+)

diff --git a/phpunit/directives/wp-directive-processor.php b/phpunit/directives/wp-directive-processor.php
index f4e50324..4f01a64f 100644
--- a/phpunit/directives/wp-directive-processor.php
+++ b/phpunit/directives/wp-directive-processor.php
@@ -154,4 +154,14 @@ public function test_wrap_in_tag_followed_by_two_subsequent_calls_of_get_updated
 		$this->assertSame( '<div>outside</div><section><div><template><img></template>inside</div></section>', $tags->get_updated_html() );
 		$this->assertSame( 'IMG', $tags->get_tag() );
 	}
+
+	public function test_wrap_in_tag_fails_if_passed_void_tag() {
+		$tags = new WP_Directive_Processor( self::HTML );
+
+		$tags->next_tag( 'section' );
+
+		$this->assertFalse( $tags->wrap_in_tag( 'IMG' ) );
+		$this->assertSame( self::HTML, $tags->get_updated_html() );
+		$this->assertSame( 'SECTION', $tags->get_tag() );
+	}
 }
diff --git a/src/directives/class-wp-directive-processor.php b/src/directives/class-wp-directive-processor.php
index d52656df..d611203c 100644
--- a/src/directives/class-wp-directive-processor.php
+++ b/src/directives/class-wp-directive-processor.php
@@ -152,6 +152,15 @@ public function wrap_in_tag( $tag ) {
 			return false;
 		}
 
+		if ( self::is_html_void_element( $tag ) ) {
+			// _doing_it_wrong(
+			// __METHOD__,
+			// __( 'Cannot wrap HTML in void tag.' ),
+			// '6.3.0'
+			// );
+			return false;
+		}
+
 		$this->get_updated_html(); // Apply potential previous updates.
 
 		if ( self::is_html_void_element( $this->get_tag() ) ) {

From d2e68d3d44db34cc988eea00de8479f58503994d Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 13 Apr 2023 10:24:01 +0200
Subject: [PATCH 20/38] Increase test coverage -- new test currently fails

---
 phpunit/directives/attributes/wp-show.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index f9314c19..91000bb9 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -52,6 +52,25 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
 
+	public function test_directive_wraps_content_preceded_by_other_html_in_template_if_when_is_false() {
+		$markup = '<p>Some text</p><div data-wp-show="context.myblock.open">I should not be shown!</div>';
+
+		$tags = new WP_Directive_Processor( $markup );
+		$tags->next_tag( 'div' );
+
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => false ) ) );
+		$context        = clone $context_before;
+		process_wp_show( $tags, $context );
+
+		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		process_wp_show( $tags, $context );
+
+		$updated_markup = '<p>Some text</p><template data-wp-show="context.myblock.open"><div >I should not be shown!</div></template>';
+
+		$this->assertSame( $updated_markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
+	}
+
 	public function test_directive_wraps_void_tag_in_template_if_when_is_false() {
 		$markup = '<img data-wp-show="context.myblock.open">';
 		$tags   = new WP_Directive_Processor( $markup );

From 059fe6136e11156c3737e6981d23720d888dfdc7 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 13 Apr 2023 10:56:24 +0200
Subject: [PATCH 21/38] Don't process directives in inner blocks

---
 wp-directives.php | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/wp-directives.php b/wp-directives.php
index 16599a14..d571de5e 100644
--- a/wp-directives.php
+++ b/wp-directives.php
@@ -234,28 +234,37 @@ function wp_directives_mark_interactive_blocks( $block_content, $block, $instanc
  */
 function wp_directives_inner_blocks( $parsed_block, $source_block, $parent_block ) {
 	if (
-		isset( $parent_block ) &&
-		block_has_support(
-			$parent_block->block_type,
-			array(
-				'interactivity',
-				'isolated',
-			)
-		)
+		isset( $parent_block )
 	) {
-		$parsed_block['isolated'] = true;
+		if (
+			block_has_support(
+				$parent_block->block_type,
+				array(
+					'interactivity',
+					'isolated',
+				)
+			)
+		) {
+			$parsed_block['isolated'] = true;
+		}
+		$parsed_block['inner_block'] = true; // TODO: Limit to interactive blocks.
 	}
 	return $parsed_block;
 }
 add_filter( 'render_block_data', 'wp_directives_inner_blocks', 10, 3 );
 
+
 /**
  * Process directives in block.
  *
  * @param string $block_content Block content.
  * @return string Filtered block content.
  */
-function process_directives_in_block( $block_content ) {
+function process_directives_in_block( $block_content, $block, $instance ) {
+	if ( isset( $instance->parsed_block['inner_block'] ) ) {
+		return $block_content;
+	}
+
 	// TODO: Add some directive/components registration mechanism.
 	$directives = array(
 		'data-wp-context' => 'process_wp_context',
@@ -275,7 +284,7 @@ function process_directives_in_block( $block_content ) {
 	'render_block',
 	'process_directives_in_block',
 	10,
-	1
+	3
 );
 
 // TODO: check if priority 9 is enough.

From 87f05325768b826d9e49339e5de0de3c2bb46183 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 13 Apr 2023 14:37:03 +0200
Subject: [PATCH 22/38] Add test case to cover issue

---
 phpunit/directives/attributes/wp-show.php | 80 +++++++++++++++++++++++
 1 file changed, 80 insertions(+)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 91000bb9..e1d712ff 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -71,6 +71,86 @@ public function test_directive_wraps_content_preceded_by_other_html_in_template_
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
 
+	public function test_directive_wraps_complex_content_in_template_if_when_is_false() {
+		$markup = <<<END
+			<ul>
+				<li
+					data-wp-class.wpmovies-active-tab="context.wpmovies.isImagesTab"
+					class="wpmovies-tabs-title"
+				>
+					Images
+				</li>
+				<li
+					data-wp-class.wpmovies-active-tab="context.wpmovies.isVideosTab"
+					class=" wpmovies-tabs-title"
+				>
+					Videos
+				</li>
+			</ul>
+
+			<div data-wp-show="selectors.wpmovies.isImagesTab" class="abc">
+				Images Tab
+			</div>
+
+			<div data-wp-show="selectors.wpmovies.isVideosTab" class="abc">
+				Videos Tab
+			</div>
+END;
+
+		$tags = new WP_Directive_Processor( $markup );
+		$context_before = new WP_Directive_Context(
+			array(
+				'myblock' => array( 'open' => false ),
+				'wpmovies' => array(
+					'isImagesTab' => true,
+					'isVideosTab' => false,
+				),
+			)
+		);
+		$context        = clone $context_before;
+
+		$tags->next_tag( array( 'class_name' => 'wpmovies-tabs-title' ) );
+		process_wp_class( $tags, $context );
+
+		$tags->next_tag( array( 'class_name' => 'wpmovies-tabs-title' ) );
+		process_wp_class( $tags, $context );
+
+		$tags->next_tag( array( 'class_name' => 'abc' ) );
+		process_wp_show( $tags, $context );
+
+		//$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		$tags->next_tag( array( 'class_name' => 'abc' ) );
+		process_wp_show( $tags, $context );
+
+		$updated_markup = <<<END
+			<ul>
+				<li
+					data-wp-class.wpmovies-active-tab="context.wpmovies.isImagesTab"
+					class="wpmovies-tabs-title wpmovies-active-tab"
+				>
+					Images
+				</li>
+				<li
+					data-wp-class.wpmovies-active-tab="context.wpmovies.isVideosTab"
+					class=" wpmovies-tabs-title"
+				>
+					Videos
+				</li>
+			</ul>
+
+			<template data-wp-show="selectors.wpmovies.isImagesTab"><div  class="abc">
+				Images Tab
+			</div></template>
+
+			<div data-wp-show="selectors.wpmovies.isVideosTab" class="abc">
+				Videos Tab
+			</div>
+END;
+
+		$this->assertSame( $updated_markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
+	}
+
 	public function test_directive_wraps_void_tag_in_template_if_when_is_false() {
 		$markup = '<img data-wp-show="context.myblock.open">';
 		$tags   = new WP_Directive_Processor( $markup );

From 042501d5b4a9d8ca2f38fbd44f7835ee30176f9d Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 13 Apr 2023 14:52:36 +0200
Subject: [PATCH 23/38] Fix test

---
 phpunit/directives/attributes/wp-show.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index e1d712ff..4eaea9aa 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -138,13 +138,13 @@ class=" wpmovies-tabs-title"
 				</li>
 			</ul>
 
-			<template data-wp-show="selectors.wpmovies.isImagesTab"><div  class="abc">
+			<div data-wp-show="selectors.wpmovies.isImagesTab" class="abc">
 				Images Tab
-			</div></template>
+			</div>
 
-			<div data-wp-show="selectors.wpmovies.isVideosTab" class="abc">
+			<template data-wp-show="selectors.wpmovies.isVideosTab"><div  class="abc">
 				Videos Tab
-			</div>
+			</div></template>
 END;
 
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );

From e3d1743c44b78e30e6f88bce0cba1f42d9852e15 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 13 Apr 2023 15:07:09 +0200
Subject: [PATCH 24/38] More minimal

---
 phpunit/directives/attributes/wp-show.php | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 4eaea9aa..7c397048 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -80,12 +80,6 @@ class="wpmovies-tabs-title"
 				>
 					Images
 				</li>
-				<li
-					data-wp-class.wpmovies-active-tab="context.wpmovies.isVideosTab"
-					class=" wpmovies-tabs-title"
-				>
-					Videos
-				</li>
 			</ul>
 
 			<div data-wp-show="selectors.wpmovies.isImagesTab" class="abc">
@@ -112,9 +106,6 @@ class=" wpmovies-tabs-title"
 		$tags->next_tag( array( 'class_name' => 'wpmovies-tabs-title' ) );
 		process_wp_class( $tags, $context );
 
-		$tags->next_tag( array( 'class_name' => 'wpmovies-tabs-title' ) );
-		process_wp_class( $tags, $context );
-
 		$tags->next_tag( array( 'class_name' => 'abc' ) );
 		process_wp_show( $tags, $context );
 
@@ -130,12 +121,6 @@ class="wpmovies-tabs-title wpmovies-active-tab"
 				>
 					Images
 				</li>
-				<li
-					data-wp-class.wpmovies-active-tab="context.wpmovies.isVideosTab"
-					class=" wpmovies-tabs-title"
-				>
-					Videos
-				</li>
 			</ul>
 
 			<div data-wp-show="selectors.wpmovies.isImagesTab" class="abc">

From 229c3041a8bc1ddf7cec19d4686c4b473c3f50a8 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 13 Apr 2023 15:18:43 +0200
Subject: [PATCH 25/38] Add another failing test case

---
 phpunit/directives/wp-directive-processor.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/phpunit/directives/wp-directive-processor.php b/phpunit/directives/wp-directive-processor.php
index 4f01a64f..1e035353 100644
--- a/phpunit/directives/wp-directive-processor.php
+++ b/phpunit/directives/wp-directive-processor.php
@@ -136,6 +136,18 @@ public function test_wrap_in_tag_wraps_balanced_tag_correctly() {
 		$this->assertFalse( $tags->is_tag_closer() );
 	}
 
+	public function test_wrap_in_tag_wraps_balanced_tag_correctly_when_called_after_add_class() {
+		$tags = new WP_Directive_Processor( self::HTML );
+
+		$tags->next_tag();
+		$tags->add_class( 'foo' );
+		$tags->next_tag( 'section' );
+		$tags->wrap_in_tag( 'TEMPLATE' );
+		$this->assertSame( '<div class="foo">outside</div><template><section><div><img>inside</div></section></template>', $tags->get_updated_html() );
+		$this->assertSame( 'SECTION', $tags->get_tag() );
+		$this->assertFalse( $tags->is_tag_closer() );
+	}
+
 	public function test_wrap_in_tag_wraps_void_tag_correctly() {
 		$tags = new WP_Directive_Processor( self::HTML );
 

From e8640939cda297293c8aad4ce53605854d852b69 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 17 Apr 2023 16:32:51 +0200
Subject: [PATCH 26/38] We might not want to limit to interactive blocks only

---
 wp-directives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-directives.php b/wp-directives.php
index d571de5e..e5226fbd 100644
--- a/wp-directives.php
+++ b/wp-directives.php
@@ -247,7 +247,7 @@ function wp_directives_inner_blocks( $parsed_block, $source_block, $parent_block
 		) {
 			$parsed_block['isolated'] = true;
 		}
-		$parsed_block['inner_block'] = true; // TODO: Limit to interactive blocks.
+		$parsed_block['inner_block'] = true;
 	}
 	return $parsed_block;
 }

From 81a98468a088dae1dc5ea085f6be6790859e5626 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 18 Apr 2023 14:38:49 +0200
Subject: [PATCH 27/38] Revert "We might not want to limit to interactive
 blocks only"

This reverts commit b7c69257006d71e0c601c2b0b35be9fd2f74299c.
---
 wp-directives.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wp-directives.php b/wp-directives.php
index e5226fbd..d571de5e 100644
--- a/wp-directives.php
+++ b/wp-directives.php
@@ -247,7 +247,7 @@ function wp_directives_inner_blocks( $parsed_block, $source_block, $parent_block
 		) {
 			$parsed_block['isolated'] = true;
 		}
-		$parsed_block['inner_block'] = true;
+		$parsed_block['inner_block'] = true; // TODO: Limit to interactive blocks.
 	}
 	return $parsed_block;
 }

From d9e5271e84d9cd060f4fd7ee04e7ec161bc3f19d Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 18 Apr 2023 14:39:01 +0200
Subject: [PATCH 28/38] Revert "Don't process directives in inner blocks"

This reverts commit 16faac9f07967020b42267f4a85d36cae36fdb2c.
---
 wp-directives.php | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/wp-directives.php b/wp-directives.php
index d571de5e..16599a14 100644
--- a/wp-directives.php
+++ b/wp-directives.php
@@ -234,37 +234,28 @@ function wp_directives_mark_interactive_blocks( $block_content, $block, $instanc
  */
 function wp_directives_inner_blocks( $parsed_block, $source_block, $parent_block ) {
 	if (
-		isset( $parent_block )
-	) {
-		if (
-			block_has_support(
-				$parent_block->block_type,
-				array(
-					'interactivity',
-					'isolated',
-				)
+		isset( $parent_block ) &&
+		block_has_support(
+			$parent_block->block_type,
+			array(
+				'interactivity',
+				'isolated',
 			)
-		) {
-			$parsed_block['isolated'] = true;
-		}
-		$parsed_block['inner_block'] = true; // TODO: Limit to interactive blocks.
+		)
+	) {
+		$parsed_block['isolated'] = true;
 	}
 	return $parsed_block;
 }
 add_filter( 'render_block_data', 'wp_directives_inner_blocks', 10, 3 );
 
-
 /**
  * Process directives in block.
  *
  * @param string $block_content Block content.
  * @return string Filtered block content.
  */
-function process_directives_in_block( $block_content, $block, $instance ) {
-	if ( isset( $instance->parsed_block['inner_block'] ) ) {
-		return $block_content;
-	}
-
+function process_directives_in_block( $block_content ) {
 	// TODO: Add some directive/components registration mechanism.
 	$directives = array(
 		'data-wp-context' => 'process_wp_context',
@@ -284,7 +275,7 @@ function process_directives_in_block( $block_content, $block, $instance ) {
 	'render_block',
 	'process_directives_in_block',
 	10,
-	3
+	1
 );
 
 // TODO: check if priority 9 is enough.

From e431bebff58fe1e5da22852f4c70631f6d782dc8 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 18 Apr 2023 16:14:40 +0200
Subject: [PATCH 29/38] Fix test

---
 phpunit/directives/attributes/wp-show.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 7c397048..b4e34972 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -82,11 +82,11 @@ class="wpmovies-tabs-title"
 				</li>
 			</ul>
 
-			<div data-wp-show="selectors.wpmovies.isImagesTab" class="abc">
+			<div data-wp-show="context.wpmovies.isImagesTab" class="abc">
 				Images Tab
 			</div>
 
-			<div data-wp-show="selectors.wpmovies.isVideosTab" class="abc">
+			<div data-wp-show="context.wpmovies.isVideosTab" class="abc">
 				Videos Tab
 			</div>
 END;
@@ -123,11 +123,11 @@ class="wpmovies-tabs-title wpmovies-active-tab"
 				</li>
 			</ul>
 
-			<div data-wp-show="selectors.wpmovies.isImagesTab" class="abc">
+			<div data-wp-show="context.wpmovies.isImagesTab" class="abc">
 				Images Tab
 			</div>
 
-			<template data-wp-show="selectors.wpmovies.isVideosTab"><div  class="abc">
+			<template data-wp-show="context.wpmovies.isVideosTab"><div  class="abc">
 				Videos Tab
 			</div></template>
 END;

From 39ccb1898d7df53b324c560a5a1c810f2cca498e Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 25 Apr 2023 16:34:14 +0200
Subject: [PATCH 30/38] Rewrite wp-show processor

---
 src/directives/attributes/wp-show.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
index 141c26ee..80a16a5f 100644
--- a/src/directives/attributes/wp-show.php
+++ b/src/directives/attributes/wp-show.php
@@ -13,11 +13,13 @@ function process_wp_show( $tags, $context ) {
 	}
 
 	$show = evaluate( $value, $context->get_context() );
-	if ( ! $show ) {
-		$wrapper_bookmark = $tags->wrap_in_tag( 'TEMPLATE' );
-		$tags->seek( $wrapper_bookmark );
-		$tags->set_attribute( 'data-wp-show', $value );
-		$tags->next_tag();
-		$tags->remove_attribute( 'data-wp-show' );
+	if ( $show ) {
+		return;
 	}
+
+	$wrapper_bookmark = $tags->wrap_in_tag( 'TEMPLATE' );
+	$tags->seek( $wrapper_bookmark );
+	$tags->set_attribute( 'data-wp-show', $value );
+	$tags->next_tag();
+	$tags->remove_attribute( 'data-wp-show' );
 }

From 40ee90de687c9dbeb6d58f0274adb982ff0dde5b Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 25 Apr 2023 16:37:38 +0200
Subject: [PATCH 31/38] Blunt but effective

---
 phpunit/directives/attributes/wp-show.php | 17 +++++++++++++++++
 src/directives/attributes/wp-show.php     |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index b4e34972..efaf58b0 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -52,6 +52,23 @@ public function test_directive_wraps_content_in_template_if_when_is_false() {
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
 
+	public function test_directive_does_not_wrap_template_in_template() {
+		$markup = '<template data-wp-show="context.myblock.open">I should not be shown!</template>';
+
+		$tags = new WP_Directive_Processor( $markup );
+		$tags->next_tag();
+
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'open' => false ) ) );
+		$context        = clone $context_before;
+		process_wp_show( $tags, $context );
+
+		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		process_wp_show( $tags, $context );
+
+		$this->assertSame( $markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
+	}
+
 	public function test_directive_wraps_content_preceded_by_other_html_in_template_if_when_is_false() {
 		$markup = '<p>Some text</p><div data-wp-show="context.myblock.open">I should not be shown!</div>';
 
diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
index 80a16a5f..1f1c68c2 100644
--- a/src/directives/attributes/wp-show.php
+++ b/src/directives/attributes/wp-show.php
@@ -17,6 +17,10 @@ function process_wp_show( $tags, $context ) {
 		return;
 	}
 
+	if ( 'TEMPLATE' === $tags->get_tag() ) {
+		return; // Don't wrap a `<template>` in a `<template>`.
+	}
+
 	$wrapper_bookmark = $tags->wrap_in_tag( 'TEMPLATE' );
 	$tags->seek( $wrapper_bookmark );
 	$tags->set_attribute( 'data-wp-show', $value );

From 4d88309591238d41e8c099d58387011cc7e9bbba Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 25 Apr 2023 18:08:28 +0200
Subject: [PATCH 32/38] Remove now-obsolete unit tests

---
 phpunit/directives/attributes/wp-show.php     | 65 -------------------
 phpunit/directives/wp-directive-processor.php | 12 ----
 2 files changed, 77 deletions(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index efaf58b0..a3a8333c 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -88,71 +88,6 @@ public function test_directive_wraps_content_preceded_by_other_html_in_template_
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
 
-	public function test_directive_wraps_complex_content_in_template_if_when_is_false() {
-		$markup = <<<END
-			<ul>
-				<li
-					data-wp-class.wpmovies-active-tab="context.wpmovies.isImagesTab"
-					class="wpmovies-tabs-title"
-				>
-					Images
-				</li>
-			</ul>
-
-			<div data-wp-show="context.wpmovies.isImagesTab" class="abc">
-				Images Tab
-			</div>
-
-			<div data-wp-show="context.wpmovies.isVideosTab" class="abc">
-				Videos Tab
-			</div>
-END;
-
-		$tags = new WP_Directive_Processor( $markup );
-		$context_before = new WP_Directive_Context(
-			array(
-				'myblock' => array( 'open' => false ),
-				'wpmovies' => array(
-					'isImagesTab' => true,
-					'isVideosTab' => false,
-				),
-			)
-		);
-		$context        = clone $context_before;
-
-		$tags->next_tag( array( 'class_name' => 'wpmovies-tabs-title' ) );
-		process_wp_class( $tags, $context );
-
-		$tags->next_tag( array( 'class_name' => 'abc' ) );
-		process_wp_show( $tags, $context );
-
-		//$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		$tags->next_tag( array( 'class_name' => 'abc' ) );
-		process_wp_show( $tags, $context );
-
-		$updated_markup = <<<END
-			<ul>
-				<li
-					data-wp-class.wpmovies-active-tab="context.wpmovies.isImagesTab"
-					class="wpmovies-tabs-title wpmovies-active-tab"
-				>
-					Images
-				</li>
-			</ul>
-
-			<div data-wp-show="context.wpmovies.isImagesTab" class="abc">
-				Images Tab
-			</div>
-
-			<template data-wp-show="context.wpmovies.isVideosTab"><div  class="abc">
-				Videos Tab
-			</div></template>
-END;
-
-		$this->assertSame( $updated_markup, $tags->get_updated_html() );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
-	}
-
 	public function test_directive_wraps_void_tag_in_template_if_when_is_false() {
 		$markup = '<img data-wp-show="context.myblock.open">';
 		$tags   = new WP_Directive_Processor( $markup );
diff --git a/phpunit/directives/wp-directive-processor.php b/phpunit/directives/wp-directive-processor.php
index 1e035353..4f01a64f 100644
--- a/phpunit/directives/wp-directive-processor.php
+++ b/phpunit/directives/wp-directive-processor.php
@@ -136,18 +136,6 @@ public function test_wrap_in_tag_wraps_balanced_tag_correctly() {
 		$this->assertFalse( $tags->is_tag_closer() );
 	}
 
-	public function test_wrap_in_tag_wraps_balanced_tag_correctly_when_called_after_add_class() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag();
-		$tags->add_class( 'foo' );
-		$tags->next_tag( 'section' );
-		$tags->wrap_in_tag( 'TEMPLATE' );
-		$this->assertSame( '<div class="foo">outside</div><template><section><div><img>inside</div></section></template>', $tags->get_updated_html() );
-		$this->assertSame( 'SECTION', $tags->get_tag() );
-		$this->assertFalse( $tags->is_tag_closer() );
-	}
-
 	public function test_wrap_in_tag_wraps_void_tag_correctly() {
 		$tags = new WP_Directive_Processor( self::HTML );
 

From 2a705772c997ecfb568cff2a0f6d63615570c4d7 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Tue, 25 Apr 2023 18:13:32 +0200
Subject: [PATCH 33/38] PHPDoc

---
 src/directives/attributes/wp-show.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/directives/attributes/wp-show.php b/src/directives/attributes/wp-show.php
index 1f1c68c2..46649f80 100644
--- a/src/directives/attributes/wp-show.php
+++ b/src/directives/attributes/wp-show.php
@@ -1,7 +1,19 @@
 <?php
+/**
+ * Process wp-show directive attribute.
+ *
+ * @package wp-directives
+ */
 
+/** Utility functions */
 require_once __DIR__ . '/../utils.php';
 
+/**
+ * Process wp-show directive attribute.
+ *
+ * @param WP_Directive_Processor $tags Tags.
+ * @param WP_Directive_Context   $context Directive context.
+ */
 function process_wp_show( $tags, $context ) {
 	if ( $tags->is_tag_closer() ) {
 		return;

From 9430be82eae23bc3be42f40c888d8dc68429f1f7 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Mon, 17 Apr 2023 16:06:47 +0200
Subject: [PATCH 34/38] Flush before moving to next tag

---
 src/directives/wp-process-directives.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/directives/wp-process-directives.php b/src/directives/wp-process-directives.php
index 1e398d8e..f1626a70 100644
--- a/src/directives/wp-process-directives.php
+++ b/src/directives/wp-process-directives.php
@@ -68,6 +68,7 @@ function wp_process_directives( $tags, $prefix, $directives ) {
 		foreach ( $attributes as $attribute ) {
 			call_user_func( $directives[ $attribute ], $tags, $context );
 		}
+		$tags->get_updated_html();
 	}
 
 	return $tags;

From 1dc96a29dbfb8d5207836531507d9a5344eb8e5e Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 4 May 2023 14:11:22 +0600
Subject: [PATCH 35/38] Add unit test for nested directives

---
 phpunit/directives/attributes/wp-show.php | 68 +++++++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index a3a8333c..53884612 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -105,4 +105,72 @@ public function test_directive_wraps_void_tag_in_template_if_when_is_false() {
 		$this->assertSame( $updated_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
 	}
+
+	public function test_nested_directives_within_wp_show_with_truthy_value() {
+		$markup = <<<END
+			<div data-wp-show="context.myBlock.open">
+				I should be shown!
+				<div data-wp-show="context.myOtherBlock.open">I should be shown!</div>
+				<div data-wp-show="!context.myOtherBlock.open">I should not be shown!</div>
+			</div>
+END;
+
+		$context_before = new WP_Directive_Context(
+			array(
+				'myBlock'      => array( 'open' => true ),
+				'myOtherBlock' => array( 'open' => true ),
+			)
+		);
+		$context        = clone $context_before;
+
+		$tags = new WP_Directive_Processor( $markup );
+
+		while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+			process_wp_show( $tags, $context );
+		}
+
+		$updated_markup = <<<END
+			<div data-wp-show="context.myBlock.open">
+				I should be shown!
+				<div data-wp-show="context.myOtherBlock.open">I should be shown!</div>
+				<template data-wp-show="!context.myOtherBlock.open"><div >I should not be shown!</div></template>
+			</div>
+END;
+		$this->assertSame( $updated_markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
+	}
+
+	public function test_nested_directives_within_wp_show_with_falsy_value() {
+		$markup = <<<END
+			<div data-wp-show="context.myBlock.open">
+				I should be shown!
+				<div data-wp-show="context.myOtherBlock.open">I should be shown!</div>
+				<div data-wp-show="!context.myOtherBlock.open">I should not be shown!</div>
+			</div>
+END;
+
+		$context_before = new WP_Directive_Context(
+			array(
+				'myBlock'      => array( 'open' => false ),
+				'myOtherBlock' => array( 'open' => true ),
+			)
+		);
+		$context        = clone $context_before;
+
+		$tags = new WP_Directive_Processor( $markup );
+
+		while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+			process_wp_show( $tags, $context );
+		}
+
+		$updated_markup = <<<END
+			<template data-wp-show="context.myBlock.open"><div >
+				I should be shown!
+				<div data-wp-show="context.myOtherBlock.open">I should be shown!</div>
+				<template data-wp-show="!context.myOtherBlock.open"><div >I should not be shown!</div></template>
+			</div></template>
+END;
+		$this->assertSame( $updated_markup, $tags->get_updated_html() );
+		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-show directive changed context' );
+	}
 }

From f1a473a35acaa774c6cef8980ecb396be0c1d596 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 4 May 2023 12:11:50 +0200
Subject: [PATCH 36/38] Fix test string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Greg Ziółkowski <grzegorz@gziolo.pl>
---
 phpunit/directives/attributes/wp-show.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 53884612..481cddcb 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -143,7 +143,7 @@ public function test_nested_directives_within_wp_show_with_truthy_value() {
 	public function test_nested_directives_within_wp_show_with_falsy_value() {
 		$markup = <<<END
 			<div data-wp-show="context.myBlock.open">
-				I should be shown!
+				I should not be shown!
 				<div data-wp-show="context.myOtherBlock.open">I should be shown!</div>
 				<div data-wp-show="!context.myOtherBlock.open">I should not be shown!</div>
 			</div>

From e892856d0f915a447e08ebaafc7164208f3043c5 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 4 May 2023 14:59:26 +0200
Subject: [PATCH 37/38] Update tests accordingly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Greg Ziółkowski <grzegorz@gziolo.pl>
---
 phpunit/directives/attributes/wp-show.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phpunit/directives/attributes/wp-show.php b/phpunit/directives/attributes/wp-show.php
index 481cddcb..a2cc3e73 100644
--- a/phpunit/directives/attributes/wp-show.php
+++ b/phpunit/directives/attributes/wp-show.php
@@ -165,7 +165,7 @@ public function test_nested_directives_within_wp_show_with_falsy_value() {
 
 		$updated_markup = <<<END
 			<template data-wp-show="context.myBlock.open"><div >
-				I should be shown!
+				I should not be shown!
 				<div data-wp-show="context.myOtherBlock.open">I should be shown!</div>
 				<template data-wp-show="!context.myOtherBlock.open"><div >I should not be shown!</div></template>
 			</div></template>

From 9c95d2df881051447818730f0e46d1b432ea7ee2 Mon Sep 17 00:00:00 2001
From: Bernie Reiter <ockham@raz.or.at>
Date: Thu, 1 Jun 2023 12:29:39 +0200
Subject: [PATCH 38/38] Revert "Flush before moving to next tag"

This reverts commit 9430be82eae23bc3be42f40c888d8dc68429f1f7.
---
 src/directives/wp-process-directives.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/directives/wp-process-directives.php b/src/directives/wp-process-directives.php
index f1626a70..1e398d8e 100644
--- a/src/directives/wp-process-directives.php
+++ b/src/directives/wp-process-directives.php
@@ -68,7 +68,6 @@ function wp_process_directives( $tags, $prefix, $directives ) {
 		foreach ( $attributes as $attribute ) {
 			call_user_func( $directives[ $attribute ], $tags, $context );
 		}
-		$tags->get_updated_html();
 	}
 
 	return $tags;