From 8d613b90e1cec2985d0201bf5eb891a0817863c0 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Mon, 20 Jul 2026 16:27:58 -0400 Subject: [PATCH 01/22] Preserve inline flex item margins --- .../src/HtmlToBlocks/HtmlTransformer.php | 37 ++++++++- .../unit/block-style-support-conversion.php | 80 +++++++++++++++++-- 2 files changed, 108 insertions(+), 9 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index c2cbefdd..6d9d8e1d 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -1815,7 +1815,7 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca return null; } - return $this->createBlock('core/paragraph', array( 'content' => $content )); + return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array( 'content' => $content ))); } if ( 'ul' === $tagName || 'ol' === $tagName ) { @@ -3913,6 +3913,41 @@ private function paragraphBlockFromInlineContentWrapper(DOMElement $element): ?a return $this->createBlock('core/paragraph', array_merge($this->presentationAttributes($element), array( 'content' => $content )), array(), $element); } + /** + * A paragraph is the valid native host for a standalone source inline flex or + * grid item. Its theme default margins are not part of that element's box, so + * use its resolved source margin when present or establish a zero baseline. + * + * @param array $attrs + * @return array + */ + private function paragraphAttributesForNonParagraphContent(DOMElement $element, array $attrs): array + { + $parent = $element->parentNode; + $parentDisplay = $parent instanceof DOMElement ? strtolower(trim((string) ($this->structuralPresentationDeclarations($parent)['display'] ?? ''))) : ''; + if ( ! in_array($parentDisplay, array( 'flex', 'inline-flex', 'grid', 'inline-grid' ), true) ) { + return $attrs; + } + + $sourceMargin = $this->presentationAttributes($element)['style']['spacing']['margin'] ?? array(); + if ( ! is_array($sourceMargin) || array() === $sourceMargin ) { + $sourceMargin = array( + 'top' => '0', + 'right' => '0', + 'bottom' => '0', + 'left' => '0', + ); + } + + return array_replace_recursive(array( + 'style' => array( + 'spacing' => array( + 'margin' => $sourceMargin, + ), + ), + ), $attrs); + } + private function hasAuthorSemanticMarkedChild(DOMElement $element): bool { foreach ( $element->childNodes as $child ) { diff --git a/php-transformer/tests/unit/block-style-support-conversion.php b/php-transformer/tests/unit/block-style-support-conversion.php index 52f34846..ea6f2d79 100644 --- a/php-transformer/tests/unit/block-style-support-conversion.php +++ b/php-transformer/tests/unit/block-style-support-conversion.php @@ -251,25 +251,89 @@ $assert('masthead__bio' === ($textPresetAttrs['className'] ?? ''), '37: source paragraph class remains preserved without generated color class leakage', json_encode($textPresetAttrs)); $assert(! str_contains($textPresetInnerHtml, 'has-text-color has-text-color'), '38: rendered paragraph does not carry duplicate generated text color classes', $textPresetInnerHtml); +$inlineFlexText = ( new HtmlTransformer() )->transform('
Utility copy
')->toArray(); +$inlineFlexParagraph = $inlineFlexText['blocks'][0]['innerBlocks'][0]['innerBlocks'][0] ?? array(); +$inlineFlexMarkup = (string) ($inlineFlexText['serialized_blocks'] ?? ''); +$inlineFlexMargins = $inlineFlexParagraph['attrs']['style']['spacing']['margin'] ?? array(); + +$assert( + array( 'top' => '0', 'right' => '0', 'bottom' => '0', 'left' => '0' ) === $inlineFlexMargins, + '39: standalone inline text retains its zero source margin when canonicalized as a flex-item paragraph', + json_encode($inlineFlexMargins) +); +$assert( + str_contains($inlineFlexMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), + '40: standalone inline text serializes the margin reset through native paragraph supports', + $inlineFlexMarkup +); + +$selectorMarginText = ( new HtmlTransformer() )->transform( + '
LabelCopy
', + array( 'static_css' => '.utility > span:nth-child(2){margin:3px 7px 11px 13px}' ) +)->toArray(); +$selectorMarginCss = implode("\n", array_map(static fn (array $asset): string => (string) ($asset['content'] ?? ''), $selectorMarginText['assets'] ?? array())); +$selectorMarginFlexItem = $selectorMarginText['blocks'][0]['innerBlocks'][1] ?? array(); +$selectorMarginWrapper = $selectorMarginFlexItem['innerBlocks'][0] ?? array(); +$selectorMarginParagraph = $selectorMarginWrapper['innerBlocks'][0] ?? array(); +$selectorMarginClass = (string) ($selectorMarginFlexItem['attrs']['className'] ?? ''); + +$assert( + str_starts_with($selectorMarginClass, 'blocks-engine-semantic-') + && $selectorMarginClass === ($selectorMarginWrapper['attrs']['className'] ?? '') + && str_contains($selectorMarginCss, '.' . $selectorMarginClass) + && ! isset($selectorMarginParagraph['attrs']['style']['spacing']['margin']), + '41: structural-selector margin stays on the emitted flex-item wrapper without a competing paragraph margin', + json_encode(array( 'flex_item' => $selectorMarginFlexItem, 'paragraph' => $selectorMarginParagraph, 'css' => $selectorMarginCss )) +); + +$idMarginText = ( new HtmlTransformer() )->transform( + '
LabelCopy
', + array( 'static_css' => '#utility-copy{margin:3px 7px 11px 13px}' ) +)->toArray(); +$idMarginCss = implode("\n", array_map(static fn (array $asset): string => (string) ($asset['content'] ?? ''), $idMarginText['assets'] ?? array())); +$idMarginFlexItem = $idMarginText['blocks'][0]['innerBlocks'][1] ?? array(); +$idMarginWrapper = $idMarginFlexItem['innerBlocks'][0] ?? array(); +$idMarginParagraph = $idMarginWrapper['innerBlocks'][0] ?? array(); +$idMarginClass = (string) ($idMarginFlexItem['attrs']['className'] ?? ''); + +$assert( + 'utility-copy' === ($idMarginFlexItem['attrs']['anchor'] ?? '') + && $idMarginClass === ($idMarginWrapper['attrs']['className'] ?? '') + && str_contains($idMarginCss, '.' . $idMarginClass) + && ! isset($idMarginParagraph['attrs']['style']['spacing']['margin']), + '42: ID-selector margin stays on the emitted flex-item wrapper without a competing paragraph margin', + json_encode(array( 'flex_item' => $idMarginFlexItem, 'paragraph' => $idMarginParagraph, 'css' => $idMarginCss )) +); + +$inlineMarginText = ( new HtmlTransformer() )->transform('
Copy
')->toArray(); +$inlineMarginParagraph = $inlineMarginText['blocks'][0]['innerBlocks'][0]['innerBlocks'][0] ?? array(); +$inlineMargins = $inlineMarginParagraph['attrs']['style']['spacing']['margin'] ?? array(); + +$assert( + array( 'top' => '3px', 'right' => '7px', 'bottom' => '11px', 'left' => '13px' ) === $inlineMargins, + '43: resolved source inline margins become native paragraph margins after canonicalization', + json_encode($inlineMargins) +); + $paintCss = '.pricing-card{background:radial-gradient(circle at 20% 10%,rgba(255,255,255,.9),rgba(255,255,255,0) 38%),linear-gradient(180deg,#fff,#f5efe4);background-position:center top;background-size:120% 80%,100% 100%;background-repeat:no-repeat;box-shadow:0 28px 80px rgba(20,12,4,.18);padding:2rem;border-radius:24px}'; $paintHtml = '

Roast Club

Fresh coffee every week.

'; $paintResult = ( new HtmlTransformer() )->transform($paintHtml, array('static_css' => $paintCss))->toArray(); $paintBlock = $paintResult['blocks'][0] ?? array(); $paintAttrs = is_array($paintBlock['attrs'] ?? null) ? $paintBlock['attrs'] : array(); -$assert('pricing-card' === ($paintAttrs['className'] ?? ''), '39: high-value card wrapper keeps source class for class-owned paint CSS', json_encode($paintAttrs)); -$assert(! isset($paintAttrs['style']['box-shadow']), '40: class-owned box-shadow is not stored as an unsupported block style attr', json_encode($paintAttrs['style'] ?? array())); -$assert(! isset($paintAttrs['style']['background-position']) && ! isset($paintAttrs['style']['background-size']), '41: background layer controls stay out of block style attrs', json_encode($paintAttrs['style'] ?? array())); +$assert('pricing-card' === ($paintAttrs['className'] ?? ''), '44: high-value card wrapper keeps source class for class-owned paint CSS', json_encode($paintAttrs)); +$assert(! isset($paintAttrs['style']['box-shadow']), '45: class-owned box-shadow is not stored as an unsupported block style attr', json_encode($paintAttrs['style'] ?? array())); +$assert(! isset($paintAttrs['style']['background-position']) && ! isset($paintAttrs['style']['background-size']), '46: background layer controls stay out of block style attrs', json_encode($paintAttrs['style'] ?? array())); $rulesMethod = new ReflectionMethod(HtmlTransformer::class, 'staticStyleRules'); $paintRules = $rulesMethod->invoke(new HtmlTransformer(), '', $paintCss); $paintDeclarations = $paintRules[0]['declarations'] ?? array(); -$assert(($paintDeclarations['background'] ?? '') === 'radial-gradient(circle at 20% 10%,rgba(255,255,255,.9),rgba(255,255,255,0) 38%),linear-gradient(180deg,#fff,#f5efe4)', '42: radial and layered backgrounds survive safe CSS resolution', json_encode($paintDeclarations)); -$assert(($paintDeclarations['background-position'] ?? '') === 'center top', '43: background-position survives safe CSS resolution', json_encode($paintDeclarations)); -$assert(($paintDeclarations['background-size'] ?? '') === '120% 80%,100% 100%', '44: background-size survives safe CSS resolution', json_encode($paintDeclarations)); -$assert(($paintDeclarations['background-repeat'] ?? '') === 'no-repeat', '45: background-repeat survives safe CSS resolution', json_encode($paintDeclarations)); -$assert(($paintDeclarations['box-shadow'] ?? '') === '0 28px 80px rgba(20,12,4,.18)', '46: box-shadow survives safe CSS resolution', json_encode($paintDeclarations)); +$assert(($paintDeclarations['background'] ?? '') === 'radial-gradient(circle at 20% 10%,rgba(255,255,255,.9),rgba(255,255,255,0) 38%),linear-gradient(180deg,#fff,#f5efe4)', '47: radial and layered backgrounds survive safe CSS resolution', json_encode($paintDeclarations)); +$assert(($paintDeclarations['background-position'] ?? '') === 'center top', '48: background-position survives safe CSS resolution', json_encode($paintDeclarations)); +$assert(($paintDeclarations['background-size'] ?? '') === '120% 80%,100% 100%', '49: background-size survives safe CSS resolution', json_encode($paintDeclarations)); +$assert(($paintDeclarations['background-repeat'] ?? '') === 'no-repeat', '50: background-repeat survives safe CSS resolution', json_encode($paintDeclarations)); +$assert(($paintDeclarations['box-shadow'] ?? '') === '0 28px 80px rgba(20,12,4,.18)', '51: box-shadow survives safe CSS resolution', json_encode($paintDeclarations)); if ( $failures > 0 ) { fwrite(STDERR, "Block style support conversion tests: {$failures} failed, {$passes} passed\n"); From 3d3ef79b082be4ad45834bcbe42ce172c8723d40 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Mon, 20 Jul 2026 17:28:46 -0400 Subject: [PATCH 02/22] Preserve native navigation row geometry --- .../Patterns/NavigationPattern.php | 41 +++++++++++++++---- php-transformer/tests/contract/run.php | 25 ++++++++++- ...l-brand-anchor-beside-active-nav-list.json | 2 +- .../parity/html-code-pre-nav-shape.json | 2 +- .../html-list-navigation-classification.json | 2 +- .../html-nav-overlay-menu-interactivity.json | 2 +- .../html-semantic-selector-preservation.json | 2 +- 7 files changed, 62 insertions(+), 14 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php index 38b30114..d1d4a8f2 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php @@ -412,6 +412,11 @@ private function navigationItemAttributes(DOMElement $item, DOMElement $anchor, $itemAttrs = $item->isSameNode($anchor) ? array() : $this->withoutCoreNavigationClasses($presentationAttributes($item)); $anchorAttrs = $this->withoutCoreNavigationClasses($presentationAttributes($anchor)); $submenuAttrs = $submenuContainer instanceof DOMElement ? $this->withoutCoreNavigationClasses($presentationAttributes($submenuContainer)) : array(); + if ( $item->isSameNode($anchor) && isset($anchorAttrs['style']['spacing']['margin']) ) { + // Direct anchors become navigation items. Keep their item margins on + // the item rather than reinterpreting horizontal spacing as row gap. + $itemAttrs['style']['spacing']['margin'] = $anchorAttrs['style']['spacing']['margin']; + } if ( '' === (string) ($itemAttrs['className'] ?? '') && '' !== (string) ($anchorAttrs['className'] ?? '') ) { $itemAttrs['className'] = $anchorAttrs['className']; } @@ -515,20 +520,40 @@ private function navigationContainerAttributes(DOMElement $element, callable $pr if ( $this->isListNavigationSource($element) ) { $attrs['className'] = trim((string) ($attrs['className'] ?? '') . ' blocks-engine-list-navigation'); } - if ( '' !== (string) ($attrs['style']['spacing']['blockGap'] ?? '') ) { - return $attrs; - } + // core/navigation owns the item row. For a direct list, its declarations + // (rather than the nav wrapper's one-child layout) control that row. + $layoutOwner = $element; foreach ( $element->childNodes as $child ) { if ( ! $child instanceof DOMElement || ! in_array(strtolower($child->tagName), array( 'ul', 'ol' ), true) ) { continue; } - $listGap = (string) ($presentationAttributes($child)['style']['spacing']['blockGap'] ?? ''); - if ( '' !== $listGap ) { - $attrs['style']['spacing']['blockGap'] = $listGap; - break; - } + $layoutOwner = $child; + break; + } + + $ownerAttrs = $layoutOwner->isSameNode($element) ? $attrs : $this->withoutCoreNavigationClasses($presentationAttributes($layoutOwner)); + $ownerLayout = is_array($ownerAttrs['layout'] ?? null) ? $ownerAttrs['layout'] : array(); + $ownerGap = (string) ($ownerAttrs['style']['spacing']['blockGap'] ?? ''); + + if ( '' !== $ownerGap ) { + $attrs['style']['spacing']['blockGap'] = $ownerGap; + } else { + // Native navigation supplies a theme gap by default; source inline + // links and un-gapped list rows have no equivalent item spacing. + $attrs['style']['spacing']['blockGap'] = '0'; + } + + if ( 'flex' === ($ownerLayout['type'] ?? '') ) { + $attrs['layout'] = $ownerLayout; + } else { + $attrs['layout'] = array( 'type' => 'flex' ); + } + + if ( 'vertical' !== ($attrs['layout']['orientation'] ?? '') && ! isset($attrs['layout']['flexWrap']) ) { + // CSS flex rows default to nowrap, whereas core/navigation defaults to wrap. + $attrs['layout']['flexWrap'] = 'nowrap'; } return $attrs; diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index cf39a899..20469692 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1220,6 +1220,7 @@ public function match(DOMElement $element, PatternContext $context): ?array $listGapNavigationBlock = $listGapNavigation['blocks'][0] ?? array(); $listGapNavigationSerialized = (string) ($listGapNavigation['serialized_blocks'] ?? ''); $assert('0' === ($listGapNavigationBlock['attrs']['style']['spacing']['blockGap'] ?? ''), 'direct navigation list gap projects onto core/navigation'); +$assert('nowrap' === ($listGapNavigationBlock['attrs']['layout']['flexWrap'] ?? ''), 'direct navigation list preserves its implicit non-wrapping row'); $assert('pass' === ($listGapNavigation['source_reports']['semantic_parity']['status'] ?? ''), 'direct navigation list gap preserves semantic parity'); $assert('pass' === ($listGapNavigation['source_reports']['wp_block_validity']['status'] ?? ''), 'direct navigation list gap serializes to a valid WordPress block'); $assert(str_contains($listGapNavigationSerialized, '" }, + { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "\"label\":\"Mara \\u003cem" }, { "path": "fallbacks", "assert": "count", "count": 0 } diff --git a/php-transformer/tests/fixtures/parity/html-code-pre-nav-shape.json b/php-transformer/tests/fixtures/parity/html-code-pre-nav-shape.json index 5da9d9de..ae2dc9f0 100644 --- a/php-transformer/tests/fixtures/parity/html-code-pre-nav-shape.json +++ b/php-transformer/tests/fixtures/parity/html-code-pre-nav-shape.json @@ -33,7 +33,7 @@ { "path": "blocks.0.innerBlocks.4.innerBlocks", "assert": "count", "count": 2 }, { "path": "fallbacks", "assert": "count", "count": 0 }, { "path": "blocks.0.innerBlocks.4.innerBlocks.1.attrs.url", "assert": "equals", "value": null }, - { "path": "serialized_blocks", "assert": "contains", "value": "" }, + { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "wp-block-navigation__container" }, diff --git a/php-transformer/tests/fixtures/parity/html-list-navigation-classification.json b/php-transformer/tests/fixtures/parity/html-list-navigation-classification.json index dc8808bb..ed1da2cd 100644 --- a/php-transformer/tests/fixtures/parity/html-list-navigation-classification.json +++ b/php-transformer/tests/fixtures/parity/html-list-navigation-classification.json @@ -32,7 +32,7 @@ { "path": "blocks.0.innerBlocks.1.innerBlocks", "assert": "count", "count": 3 }, { "path": "blocks.1.innerBlocks", "assert": "count", "count": 2 }, { "path": "fallbacks", "assert": "count", "count": 0 }, - { "path": "serialized_blocks", "assert": "contains", "value": "" }, - { "path": "serialized_blocks", "assert": "contains", "value": "" }, + { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "
" }, - { "path": "serialized_blocks", "assert": "contains", "value": "" }, + { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "js-site-header" }, From ba412781d1c18e82f7d8b8cf6243b79f89a3bed1 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Mon, 20 Jul 2026 18:04:12 -0400 Subject: [PATCH 03/22] Preserve adjacent navigation link spacing --- .../Patterns/NavigationPattern.php | 68 +++++++++++++++++++ php-transformer/tests/contract/run.php | 16 +++++ 2 files changed, 84 insertions(+) diff --git a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php index d1d4a8f2..1772bb27 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php @@ -73,6 +73,7 @@ public function match(DOMElement $element, PatternContext $context): ?array $navigationAttrs, $commonTextAttrs ); + $this->promoteDirectAnchorSpacing($element, $presentationAttributes, $containerAttrs, $links); $navigation = $createBlock('core/navigation', $navigationAttrs, $links, $element); @@ -559,6 +560,73 @@ private function navigationContainerAttributes(DOMElement $element, callable $pr return $attrs; } + /** + * Core navigation links do not reproduce sibling margins reliably. A uniform + * leading margin on every adjacent direct anchor is equivalent to row gap. + * + * @param array $containerAttrs + * @param array> $links + */ + private function promoteDirectAnchorSpacing(DOMElement $element, callable $presentationAttributes, array &$containerAttrs, array &$links): void + { + if ( 'vertical' === ($containerAttrs['layout']['orientation'] ?? '') ) { + return; + } + + $sourceAttrs = $this->withoutCoreNavigationClasses($presentationAttributes($element)); + if ( '' !== (string) ($sourceAttrs['style']['spacing']['blockGap'] ?? '') ) { + return; + } + + $anchors = array(); + foreach ( $element->childNodes as $child ) { + if ( $child instanceof DOMElement && 'a' === strtolower($child->tagName) ) { + $anchors[] = $child; + } + } + if ( count($anchors) < 2 || count($anchors) !== count($links) ) { + return; + } + + $leadingMargins = array_map(static function (array $link): string { + $margin = trim((string) ($link['attrs']['style']['spacing']['margin']['left'] ?? '')); + return '' === $margin ? '0' : $margin; + }, $links); + foreach ( $links as $link ) { + $trailingMargin = trim((string) ($link['attrs']['style']['spacing']['margin']['right'] ?? '')); + if ( '' !== $trailingMargin && ! in_array($trailingMargin, array( '0', '0px', '0rem', '0em' ), true) ) { + return; + } + } + $gap = $leadingMargins[1]; + if ( ! in_array($leadingMargins[0], array( '0', '0px', '0rem', '0em' ), true) || in_array($gap, array( '0', '0px', '0rem', '0em' ), true) ) { + return; + } + foreach ( array_slice($leadingMargins, 2) as $margin ) { + if ( $gap !== $margin ) { + return; + } + } + + $containerAttrs['style']['spacing']['blockGap'] = $gap; + foreach ( $links as $index => &$link ) { + if ( 0 === $index ) { + continue; + } + unset($link['attrs']['style']['spacing']['margin']['left']); + if ( empty($link['attrs']['style']['spacing']['margin']) ) { + unset($link['attrs']['style']['spacing']['margin']); + } + if ( empty($link['attrs']['style']['spacing']) ) { + unset($link['attrs']['style']['spacing']); + } + if ( empty($link['attrs']['style']) ) { + unset($link['attrs']['style']); + } + } + unset($link); + } + private function isListNavigationSource(DOMElement $element): bool { if ( in_array(strtolower($element->tagName), array( 'ul', 'ol' ), true) ) { diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index 20469692..10611c5c 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1237,6 +1237,22 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert('0' === ($directAnchorNavigationBlock['attrs']['style']['spacing']['blockGap'] ?? ''), 'direct anchor navigation preserves its implicit zero item gap'); $assert('nowrap' === ($directAnchorNavigationBlock['attrs']['layout']['flexWrap'] ?? ''), 'direct anchor navigation preserves its implicit non-wrapping row'); +$uniformMarginNavigation = ( new HtmlTransformer() )->transform( + '' +)->toArray(); +$uniformMarginNavigationBlock = $uniformMarginNavigation['blocks'][0] ?? array(); +$uniformMarginNavigationLinks = $uniformMarginNavigationBlock['innerBlocks'] ?? array(); +$assert('18px' === ($uniformMarginNavigationBlock['attrs']['style']['spacing']['blockGap'] ?? ''), 'uniform adjacent direct-anchor margins become core navigation gap'); +$assert('nowrap' === ($uniformMarginNavigationBlock['attrs']['layout']['flexWrap'] ?? ''), 'uniform adjacent direct-anchor margins retain the non-wrapping row'); +$assert(! isset($uniformMarginNavigationLinks[1]['attrs']['style']['spacing']['margin']['left']) && ! isset($uniformMarginNavigationLinks[2]['attrs']['style']['spacing']['margin']['left']), 'promoted direct-anchor margins are removed from navigation links to avoid duplicate spacing'); + +$explicitGapNavigation = ( new HtmlTransformer() )->transform( + '' +)->toArray(); +$explicitGapNavigationBlock = $explicitGapNavigation['blocks'][0] ?? array(); +$assert('4px' === ($explicitGapNavigationBlock['attrs']['style']['spacing']['blockGap'] ?? ''), 'explicit direct-anchor navigation gap remains authoritative over item margins'); +$assert('18px' === ($explicitGapNavigationBlock['innerBlocks'][1]['attrs']['style']['spacing']['margin']['left'] ?? ''), 'explicit navigation gap leaves authored item margins intact'); + $wrappingNavigation = ( new HtmlTransformer() )->transform( '' )->toArray(); From bbe78051ca66e9d266f60a100128da74e98de4ea Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Mon, 20 Jul 2026 18:14:10 -0400 Subject: [PATCH 04/22] Resolve first-of-type author selectors --- .../src/HtmlToBlocks/Style/CssSelectorMatcher.php | 14 +++++++++++++- php-transformer/tests/contract/run.php | 13 +++++++++++++ .../tests/unit/css-selector-matcher.php | 2 ++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/php-transformer/src/HtmlToBlocks/Style/CssSelectorMatcher.php b/php-transformer/src/HtmlToBlocks/Style/CssSelectorMatcher.php index 5c0b8b56..ed1f00c7 100644 --- a/php-transformer/src/HtmlToBlocks/Style/CssSelectorMatcher.php +++ b/php-transformer/src/HtmlToBlocks/Style/CssSelectorMatcher.php @@ -85,7 +85,7 @@ public static function matches(DOMElement $element, array $selector, bool $accou /** @return array{compound: array, suffix: array{start: int, end: int}|null, type_span: array{start: int, end: int, name: string}|null}|null */ private static function parseCompound(string $source, int $sourceStart, bool $isRightmost): ?array { - $compound = array( 'type' => null, 'universal' => false, 'classes' => array(), 'ids' => array(), 'attributes' => array(), 'nth_child' => null, 'first_child' => false, 'last_child' => false ); + $compound = array( 'type' => null, 'universal' => false, 'classes' => array(), 'ids' => array(), 'attributes' => array(), 'nth_child' => null, 'first_child' => false, 'last_child' => false, 'first_of_type' => false ); $offset = 0; $suffix = null; $typeSpan = null; @@ -115,6 +115,11 @@ private static function parseCompound(string $source, int $sourceStart, bool $is $hasSimple = true; continue; } + if ( 'first-of-type' === $lowerName && '(' !== ($source[ $offset ] ?? '') ) { + $compound['first_of_type'] = true; + $hasSimple = true; + continue; + } if ( 'nth-child' === $lowerName && '(' === ($source[ $offset ] ?? '') ) { $closing = strpos($source, ')', $offset + 1); if ( false === $closing ) { @@ -441,6 +446,13 @@ private static function matchesCompound(DOMElement $element, array $compound): b if ( $compound['last_child'] && self::hasNextElementSibling($element) ) { return false; } + if ( $compound['first_of_type'] ) { + for ( $previous = self::previousElementSibling($element); null !== $previous; $previous = self::previousElementSibling($previous) ) { + if ( 0 === strcasecmp($element->tagName, $previous->tagName) ) { + return false; + } + } + } return true; } diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index 10611c5c..9ca961a3 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1954,6 +1954,19 @@ public function match(DOMElement $element, PatternContext $context): ?array $artifactNavAnchorStaticCss = (string) ($artifactNavAnchorCss['source_reports']['compiled_site']['theme']['static_css'] ?? ''); $assert(str_contains($artifactNavAnchorStaticCss, '.site-header .subnav.wp-block-navigation .wp-block-navigation-item__content, .site-header .subnav .wp-block-navigation .wp-block-navigation-item__content { color:#31251c;text-decoration:none;border-color:#31251c }'), 'artifact static CSS replays nested nav anchor color through direct and descendant core/navigation wrappers'); $assert(str_contains($artifactNavAnchorStaticCss, '.site-header .subnav.wp-block-navigation .wp-block-navigation-item__content:hover, .site-header .subnav .wp-block-navigation .wp-block-navigation-item__content:hover { color:#8f5031;border-color:#8f5031 }'), 'artifact static CSS replays nested nav anchor hover color through core/navigation wrappers'); + +$artifactAdjacentNavSpacing = $compiler->compile( + array( + 'entry' => 'index.html', + 'files' => array( + 'index.html' => '
', + 'styles.css' => '.utility-bar a{margin-left:18px}.utility-bar a:first-of-type{margin-left:0}', + ), + ) +)->toArray(); +$artifactAdjacentNavBlock = $artifactAdjacentNavSpacing['blocks'][0]['innerBlocks'][0] ?? array(); +$assert('18px' === ($artifactAdjacentNavBlock['attrs']['style']['spacing']['blockGap'] ?? ''), 'linked CSS first-of-type reset promotes uniform adjacent navigation spacing to native block gap'); +$assert(! isset($artifactAdjacentNavBlock['innerBlocks'][1]['attrs']['style']['spacing']['margin']['left']), 'linked CSS navigation spacing is not duplicated on promoted child margins'); $assert(! str_contains($artifactNavAnchorStaticCss, '.site-header.wp-block-navigation .subnav'), 'artifact static CSS does not attach core/navigation to the wrong ancestor selector'); $artifactNavAnchorRepairCss = (string) ($artifactNavAnchorCss['source_reports']['compiled_site']['visual_repair']['css'] ?? ''); $assert(str_contains($artifactNavAnchorRepairCss, '.site-header .subnav.wp-block-navigation .wp-block-navigation-item__content, .site-header .subnav .wp-block-navigation .wp-block-navigation-item__content { color:#31251c;text-decoration:none;border-color:#31251c }'), 'artifact visual repair CSS carries nav anchor replay for downstream theme materializers'); diff --git a/php-transformer/tests/unit/css-selector-matcher.php b/php-transformer/tests/unit/css-selector-matcher.php index a5be98b8..20e82d70 100644 --- a/php-transformer/tests/unit/css-selector-matcher.php +++ b/php-transformer/tests/unit/css-selector-matcher.php @@ -66,6 +66,8 @@ $assert($result['supported'] && $result['matches'], "matches structural pseudo-class {$selector}"); } $assert(! $match('p:nth-child(1)', $byId('two'))['matches'], 'rejects a non-matching structural child index'); +$assert($match('input:first-of-type', $byId('control'))['matches'], 'matches first-of-type independently of child position'); +$assert(! $match('p:first-of-type', $byId('two'))['matches'], 'rejects a later sibling of the same type'); foreach ( array( ':disabled', ':not(.x)', ':is(.x)', ':where(.x)', ':has(.x)', ':nth-child(0)', ':nth-child(2n+1)', ':nth-child()', 'p::before', 'svg|a', '.a||.b', '.a, .b', '.a[', '.a >', '-', '.-', '#-', '.10', '\\', ".a\\\n", ".a\\\r", ".a\\\r\n", "[data-value=\"a\nb\"]", "[data-value=\"a\\\nb\"]", "[data-value=\"a\\\r\nb\"]", "[data-value=\"a\\\"]" ) as $selector ) { $assert(! CssSelectorMatcher::parse($selector)['supported'], "rejects unsupported or malformed {$selector}"); From dd509579c3fd7f440fd7cd9b02cecccc6569d863 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Mon, 20 Jul 2026 19:57:50 -0400 Subject: [PATCH 05/22] Preserve imported shell and content structure --- .../src/HtmlToBlocks/HtmlTransformer.php | 29 ++++++++++++------- .../Patterns/NavigationPattern.php | 18 +++++++++++- php-transformer/tests/contract/run.php | 15 ++++++++++ ...tml-richtext-partial-span-visual-mark.json | 2 +- .../artifact-author-stylesheet-projection.php | 2 +- .../tests/unit/author-selector-semantics.php | 12 ++++---- 6 files changed, 59 insertions(+), 19 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index 6d9d8e1d..112927d9 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -769,7 +769,7 @@ private function richTextMarkerResetCss(): string return ''; } - return ':where(mark)[style*="--blocks-engine-richtext-marker:"]{background-color:transparent;color:inherit}'; + return ':where(mark[class*="blocks-engine-richtext-"]){background-color:transparent;color:inherit}'; } /** @param array $options */ @@ -1281,7 +1281,7 @@ private function projectSemanticLeafSelector(string $selector, array $parsed, st private function projectRichTextSemanticSelector(string $selector, array $parsed, string $marker): string { $suffix = null === $parsed['pseudo_state_suffix_span'] ? '' : substr($selector, $parsed['pseudo_state_suffix_span']['start']); - return 'mark[style*="--blocks-engine-richtext-marker:' . $marker . '"]' . $this->selectorSpecificityShims($parsed) . $suffix; + return 'mark.' . $marker . $this->selectorSpecificityShims($parsed) . $suffix; } /** @param array $parsed */ @@ -2985,7 +2985,7 @@ private function richTextContentWithMaterializedInlineStyles(DOMElement $element $inline = $this->richTextInlineVisualDeclarations($sourceInline); $marker = $this->richTextMarkerForElement($sourceInline); if ( '' !== $marker ) { - $inline['--blocks-engine-richtext-marker'] = $marker; + $targetInline->setAttribute('class', $this->mergeClassNames($this->attr($targetInline, 'class'), $marker)); } if ( array() === $inline ) { continue; @@ -3065,15 +3065,17 @@ private function replaceRichTextStylingHookWithMark(DOMElement $element): bool $declarations = $this->richTextInlineVisualDeclarations($element); $existingDeclarations = $this->cssDeclarations($this->attr($element, 'style')); - $marker = trim((string) ($existingDeclarations['--blocks-engine-richtext-marker'] ?? '')); + $marker = ''; + foreach ( preg_split('/\s+/', trim($this->attr($element, 'class'))) ?: array() as $className ) { + if ( preg_match('/^blocks-engine-richtext-[a-f0-9]+-\d+$/', $className) ) { + $marker = $className; + break; + } + } if ( '' === $marker && array() === $declarations ) { return false; } - if ( '' !== $marker ) { - $declarations['--blocks-engine-richtext-marker'] = $marker; - } - if ( '' === $marker && ! isset($declarations['background-color']) ) { $declarations['background-color'] = 'transparent'; } @@ -3087,6 +3089,9 @@ private function replaceRichTextStylingHookWithMark(DOMElement $element): bool } $mark = $document->createElement('mark'); + if ( '' !== $marker ) { + $mark->setAttribute('class', $marker); + } $mark->setAttribute('style', $this->cssDeclarationString($declarations)); while ( null !== $element->firstChild ) { $mark->appendChild($element->firstChild); @@ -3464,8 +3469,12 @@ private function textFlowBlockFromElement(DOMElement $element): ?array } $hasLineBreak = false; + $hasDirectText = false; foreach ( $element->childNodes as $child ) { if ( ! $child instanceof DOMElement ) { + if ( '' !== trim($child->textContent ?? '') ) { + $hasDirectText = true; + } continue; } @@ -3478,11 +3487,11 @@ private function textFlowBlockFromElement(DOMElement $element): ?array } } - if ( ! $hasLineBreak ) { + if ( ! $hasLineBreak && ! $hasDirectText ) { return null; } - $content = $this->richTextContentWithoutDecorativeSvg($element); + $content = $this->richTextContentWithMaterializedInlineStyles($element); if ( '' === trim($this->runtime->stripAllTags($content)) ) { return null; } diff --git a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php index 1772bb27..7bee0ce6 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php @@ -989,7 +989,23 @@ private function hasNavigationSignal(DOMElement $element): bool if ( in_array($token, array( 'nav', 'navbar', 'navigation', 'menu' ), true) ) { return true; } - if ( 'links' === $token && ! $this->isContactLinkCluster($element) ) { + if ( 'links' === $token && ! $this->isContactLinkCluster($element) && ! $this->hasCardLikeDirectAnchor($element) ) { + return true; + } + } + } + + return false; + } + + private function hasCardLikeDirectAnchor(DOMElement $element): bool + { + foreach ( $element->childNodes as $child ) { + if ( ! $child instanceof DOMElement || 'a' !== strtolower($child->tagName) ) { + continue; + } + foreach ( $child->childNodes as $anchorChild ) { + if ( $anchorChild instanceof DOMElement && preg_match('/^(?:' . self::BLOCK_LEVEL_LABEL_TAGS . ')$/i', $anchorChild->tagName) ) { return true; } } diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index 9ca961a3..0dd5e5d3 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1253,6 +1253,20 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert('4px' === ($explicitGapNavigationBlock['attrs']['style']['spacing']['blockGap'] ?? ''), 'explicit direct-anchor navigation gap remains authoritative over item margins'); $assert('18px' === ($explicitGapNavigationBlock['innerBlocks'][1]['attrs']['style']['spacing']['margin']['left'] ?? ''), 'explicit navigation gap leaves authored item margins intact'); +$quickLinkCards = ( new HtmlTransformer() )->transform( + '

Apply

Choose a program.

Visit

Plan your trip.

' +)->toArray(); +$quickLinkCardsBlock = $quickLinkCards['blocks'][0] ?? array(); +$assert('core/group' === ($quickLinkCardsBlock['blockName'] ?? '') && 'quick-links' === ($quickLinkCardsBlock['attrs']['className'] ?? ''), 'card-like quick-links container remains a layout group rather than a navigation menu'); +$assert('core/group' === ($quickLinkCardsBlock['innerBlocks'][0]['blockName'] ?? '') && 'quick-link' === ($quickLinkCardsBlock['innerBlocks'][0]['attrs']['className'] ?? ''), 'block-content quick link remains a card group'); + +$inlineMetadataFlow = ( new HtmlTransformer() )->transform( + '
Committee chair: Prof. Mahalingam · M-302 Mendel Hall
' +)->toArray(); +$inlineMetadataBlock = $inlineMetadataFlow['blocks'][0] ?? array(); +$assert('core/paragraph' === ($inlineMetadataBlock['blockName'] ?? '') && 'event-meta' === ($inlineMetadataBlock['attrs']['className'] ?? ''), 'phrasing-only div with direct text remains one metadata flow'); +$assert(str_contains((string) ($inlineMetadataBlock['attrs']['content'] ?? ''), 'Prof. Mahalingam') && str_contains((string) ($inlineMetadataBlock['attrs']['content'] ?? ''), 'M-302'), 'metadata flow preserves text and inline semantic tokens together'); + $wrappingNavigation = ( new HtmlTransformer() )->transform( '' )->toArray(); @@ -2145,6 +2159,7 @@ public function match(DOMElement $element, PatternContext $context): ?array $footerShellPart = $footerShellTemplateParts[0] ?? array(); $assert(! str_contains((string) ($footerShellIndexPage['block_markup'] ?? ''), 'Global footer copy'), 'compiled site removes global footer shell from page body when a footer template part exists'); $assert(str_contains((string) ($footerShellPart['block_markup'] ?? ''), 'Global footer copy'), 'compiled site preserves global footer copy in the footer template part'); +$assert(str_contains((string) ($footerShellPart['block_markup'] ?? ''), '"className":"site-footer"'), 'compiled footer template part preserves the source shell class boundary'); $assert(str_contains((string) ($footerShellAboutPage['block_markup'] ?? ''), 'Article byline footer'), 'compiled site preserves page-local article footer content while pruning global footer shell'); $assert(! str_contains((string) ($footerShellAboutPage['block_markup'] ?? ''), 'Global footer copy'), 'compiled site does not duplicate global footer shell on secondary page bodies'); diff --git a/php-transformer/tests/fixtures/parity/html-richtext-partial-span-visual-mark.json b/php-transformer/tests/fixtures/parity/html-richtext-partial-span-visual-mark.json index c14e848a..3764a9f9 100644 --- a/php-transformer/tests/fixtures/parity/html-richtext-partial-span-visual-mark.json +++ b/php-transformer/tests/fixtures/parity/html-richtext-partial-span-visual-mark.json @@ -22,7 +22,7 @@ "expect": [ { "path": "status", "assert": "equals", "value": "success" }, { "path": "source_reports.wp_block_validity.status", "assert": "equals", "value": "pass" }, - { "path": "serialized_blocks", "assert": "contains", "value": "Roasters" }, + { "path": "serialized_blocks", "assert": "contains", "value": "Roasters" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "class=\"accent\"" }, { "path": "fallbacks", "assert": "count", "count": 0 } ] diff --git a/php-transformer/tests/unit/artifact-author-stylesheet-projection.php b/php-transformer/tests/unit/artifact-author-stylesheet-projection.php index d527f253..ef72c330 100644 --- a/php-transformer/tests/unit/artifact-author-stylesheet-projection.php +++ b/php-transformer/tests/unit/artifact-author-stylesheet-projection.php @@ -48,7 +48,7 @@ ), ) )->toArray(); $richTextAssets = $richText['assets'] ?? array(); -$assert(str_starts_with((string) ($richTextAssets[0]['content'] ?? ''), ':where(mark)[style*="--blocks-engine-richtext-marker:"]{background-color:transparent;color:inherit}') && str_contains((string) ($richTextAssets[0]['content'] ?? ''), '{color:#e8a020}') && ! str_contains((string) ($richTextAssets[1]['content'] ?? ''), 'background-color:transparent;color:inherit'), 'artifact projection emits one marker reset before the first projected author stylesheet'); +$assert(str_starts_with((string) ($richTextAssets[0]['content'] ?? ''), ':where(mark[class*="blocks-engine-richtext-"]){background-color:transparent;color:inherit}') && str_contains((string) ($richTextAssets[0]['content'] ?? ''), '{color:#e8a020}') && ! str_contains((string) ($richTextAssets[1]['content'] ?? ''), 'background-color:transparent;color:inherit'), 'artifact projection emits one marker reset before the first projected author stylesheet'); $multiPage = ( new ArtifactCompiler() )->compile(array( 'files' => array( diff --git a/php-transformer/tests/unit/author-selector-semantics.php b/php-transformer/tests/unit/author-selector-semantics.php index 0112e152..0828d895 100644 --- a/php-transformer/tests/unit/author-selector-semantics.php +++ b/php-transformer/tests/unit/author-selector-semantics.php @@ -148,17 +148,17 @@ $repeatedMarkup = (string) ($repeatedParents['serialized_blocks'] ?? ''); $repeatedCss = $css($repeatedParents); preg_match_all('/blocks-engine-semantic-[a-f0-9]+-\d+/', $repeatedMarkup . "\n" . $repeatedCss, $repeatedMarkers); -$assert(2 === count(array_unique($repeatedMarkers[0] ?? array())) && 2 === substr_count($repeatedCss, ':where(.blocks-engine-semantic-') && str_contains($repeatedMarkup, '--blocks-engine-richtext-marker:blocks-engine-richtext-') && str_contains($repeatedCss, 'mark[style*="--blocks-engine-richtext-marker:blocks-engine-richtext-'), 'repeated structural parents allocate unique source-path markers without leaking their box styles into an unrelated inline sibling'); +$assert(2 === count(array_unique($repeatedMarkers[0] ?? array())) && 2 === substr_count($repeatedCss, ':where(.blocks-engine-semantic-') && str_contains($repeatedMarkup, 'more.

'); $richTextPillMarkup = (string) ($richTextPill['serialized_blocks'] ?? ''); $richTextPillCss = $css($richTextPill); -$assert(str_contains($richTextPillMarkup, '"Testimonial

'); $richTextColorMarkup = (string) ($richTextColor['serialized_blocks'] ?? ''); $richTextColorCss = $css($richTextColor); -$assert(str_contains($richTextColorMarkup, '--blocks-engine-richtext-marker:blocks-engine-richtext-') && ! str_contains($richTextColorMarkup, 'color:inherit') && ! str_contains($richTextColorMarkup, 'background-color:transparent') && str_contains($richTextColorCss, ':where(mark)[style*="--blocks-engine-richtext-marker:"]{background-color:transparent;color:inherit}') && str_contains($richTextColorCss, '{font-size:4rem;color:var(--amber)}') && strpos($richTextColorCss, 'color:inherit') < strpos($richTextColorCss, 'color:var(--amber)'), 'RichText marker reset stays below projected author paint instead of overriding it inline'); +$assert(str_contains($richTextColorMarkup, '.quote-mark{font-size:4rem}

"The team\'s launch

'); $richTextPunctuationMarkup = (string) ($richTextPunctuation['serialized_blocks'] ?? ''); @@ -179,17 +179,17 @@ $richTextStates = $transform('

Read more.

'); $richTextStatesMarkup = (string) ($richTextStates['serialized_blocks'] ?? ''); $richTextStatesCss = $css($richTextStates); -$assert(str_contains($richTextStatesMarkup, '--blocks-engine-richtext-marker:blocks-engine-richtext-') && 4 === substr_count($richTextStatesCss, 'mark[style*="--blocks-engine-richtext-marker:blocks-engine-richtext-') && str_contains($richTextStatesCss, ':hover{color:red}') && str_contains($richTextStatesCss, ':focus{color:blue}') && str_contains($richTextStatesCss, ':active{color:green}') && str_contains($richTextStatesCss, ':visited{color:purple}') && ! str_contains($richTextStatesMarkup, ':hover') && ! str_contains($richTextStatesMarkup, ':focus') && ! str_contains($richTextStatesMarkup, ':active') && ! str_contains($richTextStatesMarkup, ':visited'), 'RichText marker projections retain dynamic pseudo-state suffixes without inlining a permanent state'); +$assert(str_contains($richTextStatesMarkup, '
Nested
'); $nestedLeafMarkup = (string) ($nestedLeaf['serialized_blocks'] ?? ''); $nestedLeafCss = $css($nestedLeaf); -$assert(! str_contains($nestedLeafMarkup, 'blocks-engine-semantic-') && str_contains($nestedLeafMarkup, '--blocks-engine-richtext-marker:blocks-engine-richtext-') && str_contains($nestedLeafCss, 'mark[style*="--blocks-engine-richtext-marker:blocks-engine-richtext-') && 'pass' === ($nestedLeaf['source_reports']['wp_block_validity']['status'] ?? ''), 'nested selector-addressable leaves retain a valid inline marker instead of becoming a structural group'); +$assert(! str_contains($nestedLeafMarkup, 'blocks-engine-semantic-') && str_contains($nestedLeafMarkup, '
Read new notes.
'); $proseBadgeMarkup = (string) ($proseBadge['serialized_blocks'] ?? ''); $proseBadgeCss = $css($proseBadge); -$assert(! str_contains($proseBadgeMarkup, 'blocks-engine-semantic-') && str_contains($proseBadgeMarkup, '--blocks-engine-richtext-marker:blocks-engine-richtext-') && str_contains($proseBadgeCss, 'mark[style*="--blocks-engine-richtext-marker:blocks-engine-richtext-') && 'pass' === ($proseBadge['source_reports']['wp_block_validity']['status'] ?? ''), 'a padded badge inside prose in a flex card remains an inline RichText marker'); +$assert(! str_contains($proseBadgeMarkup, 'blocks-engine-semantic-') && str_contains($proseBadgeMarkup, '
'); +$linkedBrandMarkup = (string) ($linkedBrand['serialized_blocks'] ?? ''); +$assert(str_contains($linkedBrandMarkup, 'className":"institution blocks-engine-semantic-') && str_contains($linkedBrandMarkup, 'className":"department blocks-engine-semantic-') && 2 === substr_count($linkedBrandMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), 'linked brand text retains independent native flex children without synthetic paragraph margins when shell conversion changes DOM paths'); + $resetInlineMetadata = $transform('

Decision

Byline
'); $resetInlineMetadataMarkup = (string) ($resetInlineMetadata['serialized_blocks'] ?? ''); $assert(! str_contains($resetInlineMetadataMarkup, 'blocks-engine-semantic-') && str_contains($resetInlineMetadataMarkup, 'listen
to the garden." } }, + { "path": "blocks.2.innerBlocks.0", "name": "core/paragraph", "attrs": { "content": "We listen
to the garden.", "style": { "spacing": { "margin": { "top": "0", "right": "0", "bottom": "0", "left": "0" } } } } }, { "path": "blocks.3", "name": "core/quote", "attrs": { "className": "testimonial-card", "citation": "Grace, Founder" } }, { "path": "blocks.3.innerBlocks.0", "name": "core/paragraph", "attrs": { "content": "Stay curious." } }, { "path": "blocks.4", "name": "core/pullquote", "attrs": { "className": "alignfull", "citation": "Critic", "value": "

Quote me.

" } } @@ -35,7 +35,7 @@ { "path": "blocks.3.innerBlocks", "assert": "count", "count": 1 }, { "path": "serialized_blocks", "assert": "contains", "value": "

Build with care.

Then ship it.

Ada
" }, { "path": "serialized_blocks", "assert": "contains", "value": "
Pull this hard.Editor
" }, - { "path": "serialized_blocks", "assert": "contains", "value": "

We listen
to the garden.

The distiller
" }, + { "path": "serialized_blocks", "assert": "contains", "value": "

We listen
to the garden.

The distiller
" }, { "path": "serialized_blocks", "assert": "contains", "value": "

Stay curious.

Grace, Founder
" }, { "path": "serialized_blocks", "assert": "contains", "value": "

Quote me.

Critic
" }, { "path": "fallbacks", "assert": "count", "count": 0 }, diff --git a/php-transformer/tests/unit/author-selector-semantics.php b/php-transformer/tests/unit/author-selector-semantics.php index b24088ea..6b179899 100644 --- a/php-transformer/tests/unit/author-selector-semantics.php +++ b/php-transformer/tests/unit/author-selector-semantics.php @@ -148,11 +148,11 @@ $inlineCss = $css($inlineLeaves); $assert(3 === substr_count($inlineMarkup, '
Jun25
Defense

Thesis title

'); +$flowTokens = $transform('
Jun253:00 PM
Defense

Thesis title

'); $flowTokenMarkup = (string) ($flowTokens['serialized_blocks'] ?? ''); $flowTokenCss = $css($flowTokens); -$assert(6 === substr_count($flowTokenMarkup, 'blocks-engine-semantic-') && 3 <= substr_count($flowTokenCss, ':where(.blocks-engine-semantic-'), 'standalone styled inline leaves in ordinary flow retain independent visual-token wrappers'); -$assert(3 === substr_count($flowTokenMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), 'synthetic visual-token paragraphs do not contribute source-absent spacing'); +$assert(8 === substr_count($flowTokenMarkup, 'blocks-engine-semantic-') && 4 <= substr_count($flowTokenCss, ':where(.blocks-engine-semantic-'), 'standalone styled inline leaves in ordinary flow retain independent visual-token wrappers'); +$assert(4 === substr_count($flowTokenMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), 'synthetic visual-token paragraphs do not contribute source-absent spacing, including tokens inside structural layout parents'); $assert(! str_contains($flowTokenMarkup, 'Brennan UniversityEarth Sciences'); From a3582e30347c3c26b18c82ff7d0c92fdf72508b5 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Tue, 21 Jul 2026 14:59:15 -0400 Subject: [PATCH 10/22] Preserve inline utility navigation geometry --- .../Diagnostics/SemanticParityReporter.php | 75 ++++++++++++++++++- .../Patterns/NavigationPattern.php | 71 ++++++++++++++++++ php-transformer/tests/contract/run.php | 16 ++++ 3 files changed, 160 insertions(+), 2 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/Diagnostics/SemanticParityReporter.php b/php-transformer/src/HtmlToBlocks/Diagnostics/SemanticParityReporter.php index 1805cbc2..76c57f98 100644 --- a/php-transformer/src/HtmlToBlocks/Diagnostics/SemanticParityReporter.php +++ b/php-transformer/src/HtmlToBlocks/Diagnostics/SemanticParityReporter.php @@ -188,7 +188,7 @@ private function collectBlockNavigationLandmarks(array $blocks, array &$counts): continue; } - if ( 'core/navigation' === ($block['blockName'] ?? '') ) { + if ( 'core/navigation' === ($block['blockName'] ?? '') || $this->isStaticNavigationGroup($block) ) { ++$counts['nav']; } @@ -430,6 +430,17 @@ private function collectBlockNavigationMenus(array $blocks, string $path, array $menus[] = array( 'block_path' => $blockPath, 'represented_as_core_navigation' => true, + 'represented_as_native_navigation' => true, + 'item_count' => count($items), + 'items' => $items, + ); + } elseif ( $this->isStaticNavigationGroup($block) ) { + $items = array(); + $this->collectStaticNavigationItems(is_array($block['innerBlocks'] ?? null) ? $block['innerBlocks'] : array(), $items); + $menus[] = array( + 'block_path' => $blockPath, + 'represented_as_core_navigation' => false, + 'represented_as_native_navigation' => true, 'item_count' => count($items), 'items' => $items, ); @@ -466,6 +477,66 @@ private function collectBlockNavigationItems(array $blocks, array &$items): void } } + /** @param array $block */ + private function isStaticNavigationGroup(array $block): bool + { + return 'core/group' === ($block['blockName'] ?? '') + && 'nav' === strtolower((string) ($block['attrs']['tagName'] ?? '')) + && in_array('blocks-engine-inline-navigation', preg_split('/\s+/', trim((string) ($block['attrs']['className'] ?? ''))) ?: array(), true) + && ! $this->containsCoreNavigation(is_array($block['innerBlocks'] ?? null) ? $block['innerBlocks'] : array()); + } + + /** @param array> $blocks */ + private function containsCoreNavigation(array $blocks): bool + { + foreach ( $blocks as $block ) { + if ( ! is_array($block) ) { + continue; + } + if ( 'core/navigation' === ($block['blockName'] ?? '') ) { + return true; + } + if ( $this->containsCoreNavigation(is_array($block['innerBlocks'] ?? null) ? $block['innerBlocks'] : array()) ) { + return true; + } + } + + return false; + } + + /** + * @param array> $blocks + * @param array> $items + */ + private function collectStaticNavigationItems(array $blocks, array &$items): void + { + foreach ( $blocks as $block ) { + if ( ! is_array($block) ) { + continue; + } + + $content = is_string($block['attrs']['content'] ?? null) + ? $block['attrs']['content'] + : (is_string($block['innerHTML'] ?? null) ? $block['innerHTML'] : ''); + if ( '' !== $content && preg_match_all('/]*)>(.*?)<\/a>/is', $content, $matches, PREG_SET_ORDER) ) { + foreach ( $matches as $match ) { + $href = ''; + if ( preg_match('/(?:^|\s)href\s*=\s*(["\'])(.*?)\1/is', (string) $match[1], $hrefMatch) ) { + $href = html_entity_decode((string) $hrefMatch[2], ENT_QUOTES | ENT_HTML5); + } + $items[] = array( + 'label' => $this->normalizedNavigationLabel((string) $match[2]), + 'url' => $href, + ); + } + } + + if ( ! empty($block['innerBlocks']) && is_array($block['innerBlocks']) ) { + $this->collectStaticNavigationItems($block['innerBlocks'], $items); + } + } + } + private function sourceNavigationAnchorLabel(DOMElement $anchor): string { $label = $this->normalizedNavigationLabel($anchor->textContent ?? ''); @@ -536,7 +607,7 @@ private function semanticParityFindings(array $sourceLandmarks, array $blockLand continue; } - if ( true !== ($blockMenu['represented_as_core_navigation'] ?? false) ) { + if ( true !== ($blockMenu['represented_as_native_navigation'] ?? $blockMenu['represented_as_core_navigation'] ?? false) ) { $findings[] = array( 'code' => 'navigation_core_block_missing', 'severity' => 'warning', diff --git a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php index 7bee0ce6..3f96bf9c 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php @@ -44,6 +44,27 @@ public function match(DOMElement $element, PatternContext $context): ?array return null; } + if ( $this->isInlineUtilityNavigation($element) ) { + $content = $this->inlineUtilityNavigationContent($element); + if ( '' !== $content ) { + $paragraph = $createBlock('core/paragraph', array( + 'content' => $content, + 'style' => array( 'spacing' => array( 'margin' => array( + 'top' => '0', + 'right' => '0', + 'bottom' => '0', + 'left' => '0', + ) ) ), + )); + + $groupAttrs = $presentationAttributes($element); + $groupAttrs['tagName'] = 'nav'; + $groupAttrs['className'] = trim((string) ($groupAttrs['className'] ?? '') . ' blocks-engine-inline-navigation'); + + return $createBlock('core/group', $groupAttrs, array( $paragraph ), $element); + } + } + $links = $this->navigationBlocks($element, $presentationAttributes, $innerHtml, $createBlock, $isRuntimeDomTarget, false, $navigationUnderlineColor); if ( array() === $links ) { @@ -115,6 +136,56 @@ private function nestedLabeledNavigationAttributes(DOMElement $element, callable ); } + private function isInlineUtilityNavigation(DOMElement $element): bool + { + if ( 'nav' !== strtolower($element->tagName) || '' !== trim($this->attr($element, 'class')) || '' !== trim($this->attr($element, 'id')) || '' === trim($this->attr($element, 'aria-label')) ) { + return false; + } + + $anchorCount = 0; + foreach ( $element->childNodes as $child ) { + if ( ! $child instanceof DOMElement ) { + continue; + } + if ( 'a' !== strtolower($child->tagName) ) { + return false; + } + $anchorCount++; + } + + return $anchorCount > 1; + } + + private function inlineUtilityNavigationContent(DOMElement $element): string + { + $anchors = array(); + foreach ( $element->childNodes as $child ) { + if ( ! $child instanceof DOMElement || 'a' !== strtolower($child->tagName) ) { + continue; + } + + $href = $this->safeNavigationUrl($this->attr($child, 'href')); + if ( '' === $href ) { + continue; + } + + $attributes = ' href="' . htmlspecialchars($href, ENT_QUOTES | ENT_HTML5) . '"'; + foreach ( array( 'class', 'target', 'rel', 'aria-label' ) as $name ) { + $value = trim($this->attr($child, $name)); + if ( '' !== $value ) { + $attributes .= ' ' . $name . '="' . htmlspecialchars($value, ENT_QUOTES | ENT_HTML5) . '"'; + } + } + $label = trim((string) $child->textContent); + if ( '' === $label ) { + continue; + } + $anchors[] = '' . htmlspecialchars($label, ENT_QUOTES | ENT_HTML5) . ''; + } + + return implode(' ', $anchors); + } + /** * Core navigation links render text styles from their parent block context. * Promote only values shared by every link so mixed menus retain their own diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index 8e48e3a1..3fd2cde6 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1238,6 +1238,22 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert('0' === ($directAnchorNavigationBlock['attrs']['style']['spacing']['blockGap'] ?? ''), 'direct anchor navigation preserves its implicit zero item gap'); $assert('nowrap' === ($directAnchorNavigationBlock['attrs']['layout']['flexWrap'] ?? ''), 'direct anchor navigation preserves its implicit non-wrapping row'); +$inlineUtilityNavigation = ( new HtmlTransformer() )->transform( + '' +)->toArray(); +$inlineUtilityNavigationBlock = $inlineUtilityNavigation['blocks'][0] ?? array(); +$inlineUtilityNavigationParagraph = $inlineUtilityNavigationBlock['innerBlocks'][0] ?? array(); +$inlineUtilityNavigationParity = $inlineUtilityNavigation['source_reports']['semantic_parity'] ?? array(); +$assert('core/group' === ($inlineUtilityNavigationBlock['blockName'] ?? '') && 'nav' === ($inlineUtilityNavigationBlock['attrs']['tagName'] ?? '') && str_contains((string) ($inlineUtilityNavigationBlock['attrs']['className'] ?? ''), 'blocks-engine-inline-navigation'), 'anonymous labeled direct-link navigation retains inline source flow in a native semantic group'); +$assert('core/paragraph' === ($inlineUtilityNavigationParagraph['blockName'] ?? '') && str_contains((string) ($inlineUtilityNavigationParagraph['innerHTML'] ?? ''), 'Portal & tools'), 'inline utility navigation keeps escaped editable links in one source-equivalent line box'); +$assert('pass' === ($inlineUtilityNavigationParity['status'] ?? '') && 1 === ($inlineUtilityNavigationParity['landmarks']['blocks']['nav'] ?? 0), 'native static navigation groups satisfy landmark semantic parity'); +$assert(2 === ($inlineUtilityNavigationParity['navigation_menus']['blocks'][0]['item_count'] ?? 0) && false === ($inlineUtilityNavigationParity['navigation_menus']['blocks'][0]['represented_as_core_navigation'] ?? true), 'native static navigation groups preserve menu labels and URLs in semantic parity'); + +$unsafeInlineUtilityNavigation = ( new HtmlTransformer() )->transform( + '' +)->toArray(); +$assert(! str_contains((string) ($unsafeInlineUtilityNavigation['serialized_blocks'] ?? ''), 'javascript:'), 'inline utility navigation drops unsafe link URLs'); + $uniformMarginNavigation = ( new HtmlTransformer() )->transform( '' )->toArray(); From 9f74a0e43b5317ece295a175999db55869d51bb2 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Tue, 21 Jul 2026 15:25:22 -0400 Subject: [PATCH 11/22] Preserve synthetic SVG flex sizing --- .../src/HtmlToBlocks/HtmlTransformer.php | 17 +++++++++++++--- .../Style/StyleResolutionTrait.php | 20 +++++++++++++++++++ .../tests/unit/author-selector-semantics.php | 4 +++- 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index c050e0f6..ae9a8231 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -1720,6 +1720,17 @@ private function navigationUnderlineColor(DOMElement $item, DOMElement $anchor): ); } + /** @return array */ + private function svgPhrasingHostAttributes(DOMElement $element, string $imageMarkup): array + { + $className = $this->syntheticFlexItemClassName($element); + + return array_filter(array( + 'content' => $imageMarkup, + 'className' => $className, + ), static fn (string $value): bool => '' !== $value); + } + /** * @param array> $fallbacks * @return array|null @@ -1741,7 +1752,7 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca if ( 'svg' === $tagName && $this->svgNeedsPhrasingHost($element) ) { $imageMarkup = $this->inlineSvgRichTextImageMarkup($element); if ( null !== $imageMarkup ) { - return $this->createBlock('core/paragraph', array( 'content' => $imageMarkup ), array(), $element); + return $this->createBlock('core/paragraph', $this->svgPhrasingHostAttributes($element, $imageMarkup), array(), $element); } } @@ -2204,7 +2215,7 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca if ( $this->svgNeedsPhrasingHost($element) ) { $imageMarkup = $this->inlineSvgRichTextImageMarkup($element); if ( null !== $imageMarkup ) { - return $this->createBlock('core/paragraph', array( 'content' => $imageMarkup ), array(), $element); + return $this->createBlock('core/paragraph', $this->svgPhrasingHostAttributes($element, $imageMarkup), array(), $element); } } $svgBlock = $this->inlineSvgBlockFromElement($element); @@ -2221,7 +2232,7 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca if ( $this->svgNeedsPhrasingHost($element) ) { $imageMarkup = $this->inlineSvgRichTextImageMarkup($element); if ( null !== $imageMarkup ) { - return $this->createBlock('core/paragraph', array( 'content' => $imageMarkup ), array(), $element); + return $this->createBlock('core/paragraph', $this->svgPhrasingHostAttributes($element, $imageMarkup), array(), $element); } } diff --git a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php index 83e6421d..9f59ba7b 100644 --- a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php +++ b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php @@ -353,6 +353,25 @@ private function generatedGeometryCss(string $serializedBlocks): string return implode("\n", $rules); } + private function syntheticFlexItemClassName(DOMElement $element): string + { + $parent = $element->parentNode; + if ( ! $parent instanceof DOMElement || ! in_array(strtolower((string) ($this->structuralPresentationDeclarations($parent)['display'] ?? '')), array( 'flex', 'inline-flex' ), true) ) { + return ''; + } + + $flexShrink = trim((string) ($this->structuralPresentationDeclarations($element)['flex-shrink'] ?? '')); + if ( '' === $flexShrink || preg_match('/[{}<>;]/', $flexShrink) ) { + return ''; + } + + $rule = 'flex-shrink:' . $flexShrink; + $className = ($this->geometryCarrierClassAllocator ??= new GeometryCarrierClassAllocator())->allocate($this->geometryStructuralPath($element) . "\nsynthetic-flex-item\n" . $rule); + $this->generatedGeometryRules[$className] = '.' . $className . '{' . $rule . '}'; + + return $className; + } + /** * @return array */ @@ -811,6 +830,7 @@ private function safeVisualDeclarations(array $declarations): array 'column-gap', 'display', 'flex-direction', + 'flex-shrink', 'flex-wrap', 'font-family', 'font-size', diff --git a/php-transformer/tests/unit/author-selector-semantics.php b/php-transformer/tests/unit/author-selector-semantics.php index 6b179899..ea296e03 100644 --- a/php-transformer/tests/unit/author-selector-semantics.php +++ b/php-transformer/tests/unit/author-selector-semantics.php @@ -155,9 +155,11 @@ $assert(4 === substr_count($flowTokenMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), 'synthetic visual-token paragraphs do not contribute source-absent spacing, including tokens inside structural layout parents'); $assert(! str_contains($flowTokenMarkup, 'Brennan UniversityEarth Sciences'); +$linkedBrand = $transform('
Brennan UniversityEarth Sciences
'); $linkedBrandMarkup = (string) ($linkedBrand['serialized_blocks'] ?? ''); +$linkedBrandCss = implode("\n", array_map(static fn (array $asset): string => (string) ($asset['content'] ?? ''), array_filter($linkedBrand['assets'] ?? array(), static fn (array $asset): bool => 'text/css' === ($asset['mime_type'] ?? '')))); $assert(str_contains($linkedBrandMarkup, 'className":"institution blocks-engine-semantic-') && str_contains($linkedBrandMarkup, 'className":"department blocks-engine-semantic-') && 2 === substr_count($linkedBrandMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), 'linked brand text retains independent native flex children without synthetic paragraph margins when shell conversion changes DOM paths'); +$assert(str_contains($linkedBrandMarkup, 'be-inline-geometry-') && str_contains($linkedBrandCss, '{flex-shrink:0}'), 'synthetic SVG phrasing hosts inherit source flex-item shrink constraints'); $resetInlineMetadata = $transform('

Decision

Byline
'); $resetInlineMetadataMarkup = (string) ($resetInlineMetadata['serialized_blocks'] ?? ''); From 51ce1a5325cae8f9bc668c6813efd40bc2fdc9ba Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Tue, 21 Jul 2026 18:13:35 -0400 Subject: [PATCH 12/22] Preserve shared shell identity across routes --- php-transformer/src/HtmlToBlocks/HtmlTransformer.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index ae9a8231..d0d76229 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -538,13 +538,14 @@ public function transform(string $html, array $options = array()): TransformerRe ); } - $this->markCurrentNavigationLinks($body, (string) ($options['source'] ?? '')); $this->prepareAuthorSelectorSemantics($html, (string) ($options['static_css'] ?? ''), $body, $options); $fallbacks = array(); $interactionCandidates = $this->interactionCandidates($body); $this->collectSupersededNavToggleSelectors($body); $shellArtifacts = !array_key_exists('extract_global_shell', $options) || !empty($options['extract_global_shell']) ? $this->globalShellArtifacts($body, (string) ($options['source'] ?? 'html')) : array(); + // Shared shell identity must not vary by route-derived current state. + $this->markCurrentNavigationLinks($body, (string) ($options['source'] ?? '')); $blocks = $this->deduplicateNavigationBlocks($this->convertChildren($body, $fallbacks, true)); $this->recordRuntimeIslandsForPreservedHtmlBlocks($blocks); $this->appendInteractiveControlBehaviorLossFallbacks($body, $fallbacks); From 0bc5f207810033047736a6ffac603eb19bcc0210 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Tue, 21 Jul 2026 18:13:35 -0400 Subject: [PATCH 13/22] Deduplicate generated site plan assets --- .../src/WordPressSitePlan/WordPressSitePlan.php | 10 +++++++++- php-transformer/tests/contract/wordpress-site-plan.php | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/php-transformer/src/WordPressSitePlan/WordPressSitePlan.php b/php-transformer/src/WordPressSitePlan/WordPressSitePlan.php index 81b76787..7ac3c84f 100644 --- a/php-transformer/src/WordPressSitePlan/WordPressSitePlan.php +++ b/php-transformer/src/WordPressSitePlan/WordPressSitePlan.php @@ -357,6 +357,7 @@ private function assets(mixed $assets): array { if ( ! is_array($assets) ) throw new InvalidArgumentException('Compiled site assets must be an array.'); $rows = array(); + $rowsBySource = array(); foreach ( $assets as $asset ) { if ( ! is_array($asset) || ! self::safePath($asset['path'] ?? null) ) throw new InvalidArgumentException('Compiled site asset lacks a safe source identity.'); // The compiler retains rejected source assets for diagnostics. They have no @@ -367,7 +368,14 @@ private function assets(mixed $assets): array $target = 'assets/' . str_replace('\\', '/', $compiledTarget); if ( ! self::safePath($target) ) throw new InvalidArgumentException('Compiled site asset lacks a safe target identity.'); $payload = is_string($asset['content_base64'] ?? null) ? $asset['content_base64'] : (string) ($asset['content'] ?? ''); - $rows[] = array('source_path' => $asset['path'], 'target_path' => $target, 'token' => 'asset-' . substr(hash('sha256', $target), 0, 16), 'source' => self::value($asset, 'source'), 'kind' => self::value($asset, 'kind'), 'role' => self::value($asset, 'role'), 'intent' => self::value($asset, 'intent'), 'mime_type' => self::value($asset, 'mime_type'), 'media' => self::value($asset, 'media'), 'bytes' => (int) ($asset['bytes'] ?? 0), 'hash' => self::value($asset, 'hash'), 'content' => $asset['content'] ?? null, 'content_base64' => $asset['content_base64'] ?? null, 'binary' => ! empty($asset['binary']), 'reconciliation_identity' => self::identity('asset', $asset['path'], $target), 'content_hash' => self::contentHash($payload)); + $row = array('source_path' => $asset['path'], 'target_path' => $target, 'token' => 'asset-' . substr(hash('sha256', $target), 0, 16), 'source' => self::value($asset, 'source'), 'kind' => self::value($asset, 'kind'), 'role' => self::value($asset, 'role'), 'intent' => self::value($asset, 'intent'), 'mime_type' => self::value($asset, 'mime_type'), 'media' => self::value($asset, 'media'), 'bytes' => (int) ($asset['bytes'] ?? 0), 'hash' => self::value($asset, 'hash'), 'content' => $asset['content'] ?? null, 'content_base64' => $asset['content_base64'] ?? null, 'binary' => ! empty($asset['binary']), 'reconciliation_identity' => self::identity('asset', $asset['path'], $target), 'content_hash' => self::contentHash($payload)); + $sourceIdentity = str_replace('\\', '/', strtolower($row['source_path'])); + if ( isset($rowsBySource[$sourceIdentity]) ) { + if ( $rowsBySource[$sourceIdentity] !== $row ) throw new InvalidArgumentException('Compiled site assets have colliding source identities with different payloads.'); + continue; + } + $rowsBySource[$sourceIdentity] = $row; + $rows[] = $row; } return $rows; } diff --git a/php-transformer/tests/contract/wordpress-site-plan.php b/php-transformer/tests/contract/wordpress-site-plan.php index 05c5d241..49b4a2ce 100644 --- a/php-transformer/tests/contract/wordpress-site-plan.php +++ b/php-transformer/tests/contract/wordpress-site-plan.php @@ -139,6 +139,14 @@ $assert(isset($externalCommaUrl['source_reports']['wordpress_site_plan']), 'External browser URLs containing commas are validated as one URL rather than srcset candidates.'); $nestedDataUrl = (new ArtifactCompiler())->compile(array('entrypoint' => 'index.html', 'files' => array('index.html' => '
Texture
')))->toArray(); $assert(isset($nestedDataUrl['source_reports']['wordpress_site_plan']), 'Quoted CSS data URLs may contain encoded nested URL fragments without fabricating local references.'); + +$repeatedGeneratedAsset = (new ArtifactCompiler())->compile(array('entrypoint' => 'index.html', 'files' => array( + 'index.html' => '
', + 'about.html' => '
', +)))->toArray(); +$repeatedGeneratedPlan = $repeatedGeneratedAsset['source_reports']['wordpress_site_plan'] ?? array(); +$repeatedGeneratedSvgAssets = array_values(array_filter($repeatedGeneratedPlan['assets'] ?? array(), static fn(array $asset): bool => 'image/svg+xml' === ($asset['mime_type'] ?? null))); +$assert(1 === count($repeatedGeneratedSvgAssets) && !isset($repeatedGeneratedAsset['source_reports']['wordpress_site_plan_diagnostics']), 'Byte-identical generated assets shared by multiple pages produce one canonical site-plan identity.'); $publicationSvg = 'Example'; $publicationCss = '@font-face{font-family:Example;src:url(font.woff2)}'; $publicationToken = 'asset-' . substr(hash('sha256', 'assets/assets/font.woff2'), 0, 16); From bfe726545f00dac586971eaefee6b02640566399 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Tue, 21 Jul 2026 18:26:43 -0400 Subject: [PATCH 14/22] Supersede native navigation runtime targets --- .../src/HtmlToBlocks/HtmlTransformer.php | 13 ++++++++++--- .../NavigationToggleSuppressionTrait.php | 14 +++++++------- php-transformer/tests/contract/run.php | 19 +++++++++++++++++++ 3 files changed, 36 insertions(+), 10 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index d0d76229..a3e5ecbe 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -6032,18 +6032,25 @@ private function runtimeCanvasSelectorsFromOptions(array $options): array private function isRuntimeDomTarget(DOMElement $element): bool { $id = trim($this->attr($element, 'id')); - if ( '' !== $id && isset($this->runtimeDomSelectors['#' . $id]) && ! $this->isPresentationalAnimationSelector('#' . $id) ) { + if ( '' !== $id + && isset($this->runtimeDomSelectors['#' . $id]) + && ! isset($this->supersededRuntimeSelectors['#' . $id]) + && ! $this->isPresentationalAnimationSelector('#' . $id) ) { return true; } foreach ( preg_split('/\s+/', trim($this->attr($element, 'class'))) ?: array() as $class ) { - if ( '' !== $class && isset($this->runtimeDomSelectors['.' . $class]) && ! $this->isPresentationalAnimationSelector('.' . $class) ) { + if ( '' !== $class + && isset($this->runtimeDomSelectors['.' . $class]) + && ! isset($this->supersededRuntimeSelectors['.' . $class]) + && ! $this->isPresentationalAnimationSelector('.' . $class) ) { return true; } } foreach ( array_keys($this->runtimeDomSelectors) as $selector ) { - if ( $this->isPresentationalAnimationSelector((string) $selector) ) { + if ( isset($this->supersededRuntimeSelectors[(string) $selector]) + || $this->isPresentationalAnimationSelector((string) $selector) ) { continue; } diff --git a/php-transformer/src/HtmlToBlocks/Support/NavigationToggleSuppressionTrait.php b/php-transformer/src/HtmlToBlocks/Support/NavigationToggleSuppressionTrait.php index e4a7da16..92cb8b07 100644 --- a/php-transformer/src/HtmlToBlocks/Support/NavigationToggleSuppressionTrait.php +++ b/php-transformer/src/HtmlToBlocks/Support/NavigationToggleSuppressionTrait.php @@ -56,10 +56,10 @@ private function collectSupersededNavToggleSelectors(DOMElement $root): void /** * Record the source selectors made redundant when a hamburger menu-toggle is * dropped in favor of the native navigation overlay: the toggle's own id and - * class selectors, plus the id/class selectors of the menu/overlay it - * controlled via `aria-controls`. A preserved site script may still reference - * these selectors (e.g. `.nav-toggle`, `#nav-mobile`); the runtime-dependency - * parity report uses this set to mark a resulting "missing DOM target" + * class selectors, plus the id/class selectors of a native-convertible + * menu/overlay it controlled via `aria-controls`. A preserved site script may + * still reference these selectors (e.g. `.nav-toggle`, `#nav-mobile`); the + * runtime-dependency parity report uses this set to mark a resulting "missing DOM target" * finding as a superseded, acceptable loss rather than a materialization bug. * Only selectors of menu-toggles the transformer actually removed are * recorded, so genuinely-broken targets stay flagged. @@ -74,10 +74,10 @@ private function recordSupersededNavToggleSelectors(DOMElement $toggle): void continue; } - $this->supersededRuntimeSelectors['#' . $controlledId] = true; - $target = $this->elementWithId($toggle, $controlledId); - if ( $target instanceof DOMElement && ! $target->isSameNode($toggle) ) { + if ( $target instanceof DOMElement + && ! $target->isSameNode($toggle) + && $this->convertsToCoreNavigation($target) ) { $this->recordSupersededSelectorsForElement($target); } } diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index 3fd2cde6..8919dcf5 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1409,6 +1409,16 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert(! str_contains($redundantToggleSerialized, '" }, - { "path": "serialized_blocks", "assert": "contains", "value": "" }, + { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "\"label\":\"Mara \\u003cem" }, { "path": "fallbacks", "assert": "count", "count": 0 } ] diff --git a/php-transformer/tests/fixtures/parity/html-linked-card-anchor-grid.json b/php-transformer/tests/fixtures/parity/html-linked-card-anchor-grid.json index 87cd415d..67c94bef 100644 --- a/php-transformer/tests/fixtures/parity/html-linked-card-anchor-grid.json +++ b/php-transformer/tests/fixtures/parity/html-linked-card-anchor-grid.json @@ -21,7 +21,7 @@ { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "article-card featured" } }, { "path": "blocks.0.innerBlocks.0.innerBlocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "article-thumb" } }, { "path": "blocks.0.innerBlocks.0.innerBlocks.0.innerBlocks.1", "name": "core/group", "attrs": { "className": "article-card-body" } }, - { "path": "blocks.0.innerBlocks.0.innerBlocks.0.innerBlocks.1.innerBlocks.1", "name": "core/heading", "attrs": { "className": "article-headline", "content": "City Hall Rewrites the Map", "level": 3 } }, + { "path": "blocks.0.innerBlocks.0.innerBlocks.0.innerBlocks.1.innerBlocks.1", "name": "core/heading", "attrs": { "className": "article-headline", "content": "City Hall Rewrites the Map", "level": 3 } }, { "path": "blocks.0.innerBlocks.0.innerBlocks.1", "name": "core/group", "attrs": { "className": "article-card" } }, { "path": "blocks.0.innerBlocks.1", "name": "core/buttons", "attrs": { "className": "link-row" } }, { "path": "blocks.0.innerBlocks.1.innerBlocks.0", "name": "core/button", "attrs": { "text": "Start", "url": "/start" } }, diff --git a/php-transformer/tests/fixtures/parity/html-whole-element-link-card-propagated.json b/php-transformer/tests/fixtures/parity/html-whole-element-link-card-propagated.json index 2f486b7e..7d9c89bf 100644 --- a/php-transformer/tests/fixtures/parity/html-whole-element-link-card-propagated.json +++ b/php-transformer/tests/fixtures/parity/html-whole-element-link-card-propagated.json @@ -18,7 +18,7 @@ "expected_blocks": [ { "path": "blocks.0", "name": "core/group", "attrs": { "className": "feature-card" } }, { "path": "blocks.0.innerBlocks.0", "name": "core/image", "attrs": { "url": "/img/feature.jpg", "alt": "Feature", "href": "https://example.com/feature/", "linkDestination": "custom" } }, - { "path": "blocks.0.innerBlocks.1", "name": "core/heading", "attrs": { "content": "Feature Title", "level": 3 } }, + { "path": "blocks.0.innerBlocks.1", "name": "core/heading", "attrs": { "content": "Feature Title", "level": 3 } }, { "path": "blocks.0.innerBlocks.2", "name": "core/paragraph" } ], "expected_fallbacks": [], @@ -31,9 +31,9 @@ { "path": "blocks.0.innerBlocks.0.blockName", "assert": "equals", "value": "core/image" }, { "path": "blocks.0.innerBlocks.0.attrs.href", "assert": "equals", "value": "https://example.com/feature/" }, { "path": "blocks.0.innerBlocks.0.attrs.linkDestination", "assert": "equals", "value": "custom" }, - { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "Feature Title" }, + { "path": "blocks.0.innerBlocks.1.attrs.content", "assert": "contains", "value": "Feature Title" }, { "path": "serialized_blocks", "assert": "contains", "value": "Feature Title" }, + { "path": "serialized_blocks", "assert": "contains", "value": "Feature Title" }, { "path": "serialized_blocks", "assert": "contains", "value": "Feature description text." }, { "path": "serialized_blocks", "assert": "not_contains", "value": "\"className\":\"feature-card\",\"href\"" }, { "path": "source_reports.html.dropped_link_wrappers", "assert": "count", "count": 0 }, diff --git a/php-transformer/tests/fixtures/parity/html-whole-element-link-group-no-href.json b/php-transformer/tests/fixtures/parity/html-whole-element-link-group-no-href.json index 81279e43..aa59bc90 100644 --- a/php-transformer/tests/fixtures/parity/html-whole-element-link-group-no-href.json +++ b/php-transformer/tests/fixtures/parity/html-whole-element-link-group-no-href.json @@ -17,7 +17,7 @@ }, "expected_blocks": [ { "path": "blocks.0", "name": "core/group", "attrs": { "className": "panel-link" } }, - { "path": "blocks.0.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Quarterly Review", "level": 2 } }, + { "path": "blocks.0.innerBlocks.0", "name": "core/heading", "attrs": { "content": "Quarterly Review", "level": 2 } }, { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph" } ], "expected_fallbacks": [], @@ -27,8 +27,8 @@ { "path": "blocks.0.blockName", "assert": "equals", "value": "core/group" }, { "path": "blocks.0.attrs.href", "assert": "equals", "value": null }, { "path": "blocks.0.innerBlocks", "assert": "count", "count": 2 }, - { "path": "serialized_blocks", "assert": "contains", "value": "Quarterly Review" }, - { "path": "serialized_blocks", "assert": "contains", "value": "A summary of the latest reporting period." }, + { "path": "serialized_blocks", "assert": "contains", "value": "Quarterly Review" }, + { "path": "serialized_blocks", "assert": "contains", "value": "A summary of the latest reporting period." }, { "path": "serialized_blocks", "assert": "contains", "value": "Quarterly Review" }, { "path": "serialized_blocks", "assert": "contains", "value": "A summary of the latest reporting period." }, { "path": "serialized_blocks", "assert": "not_contains", "value": "\"href\":\"https://example.com/details/\"" }, diff --git a/php-transformer/tests/unit/author-selector-semantics.php b/php-transformer/tests/unit/author-selector-semantics.php index ea296e03..279631c0 100644 --- a/php-transformer/tests/unit/author-selector-semantics.php +++ b/php-transformer/tests/unit/author-selector-semantics.php @@ -39,6 +39,10 @@ $currentNavigation = ( new HtmlTransformer() )->transform('', array( 'source' => 'index.html' ))->toArray(); $currentNavigationMarkup = (string) ($currentNavigation['serialized_blocks'] ?? ''); $assert(str_contains($currentNavigationMarkup, 'anchorClassName":"active') && str_contains($currentNavigationMarkup, 'textDecoration":"underline') && 1 === substr_count($currentNavigationMarkup, 'anchorClassName":"active'), 'source-matching navigation links retain their current-page state before routes are rewritten'); +$assert((bool) preg_match('/\.wp-block-navigation-item\.blocks-engine-navigation-control-[^,{]+[^{}]*> \.wp-block-navigation-item__content\{color:gold;border-bottom-color:gold\}/', $css($currentNavigation)), 'current navigation anchor paint projects through the exact native navigation item identity'); + +$richTextAnchor = $transform('

Read the full story.

'); +$assert(str_contains((string) ($richTextAnchor['serialized_blocks'] ?? ''), 'Go'); $controlCss = $css($controls); From 6d57e89776cc556692b456db175893dd14fd4c7a Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Wed, 22 Jul 2026 15:29:45 -0400 Subject: [PATCH 18/22] Preserve authored SVG image geometry --- .../Support/SvgMaterializationTrait.php | 21 ++++++++++++++++++- php-transformer/tests/contract/run.php | 11 ++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/php-transformer/src/HtmlToBlocks/Support/SvgMaterializationTrait.php b/php-transformer/src/HtmlToBlocks/Support/SvgMaterializationTrait.php index 93bf470b..340acb97 100644 --- a/php-transformer/src/HtmlToBlocks/Support/SvgMaterializationTrait.php +++ b/php-transformer/src/HtmlToBlocks/Support/SvgMaterializationTrait.php @@ -77,7 +77,7 @@ private function inlineSvgImageAttributesFromMarkup(DOMElement $element, string return null; } - $html = $this->ensureSvgImageNamespace($this->minifyInlineSvgForImage($html)); + $html = $this->ensureSvgImageNamespace($this->minifyInlineSvgForImage($this->stripProjectedSvgImageBoxStyle($html, $element))); $path = $this->materializedInlineSvgPath($element, $html); $this->generatedAssets[$path] = array( 'source' => 'inline-svg', @@ -339,6 +339,25 @@ private function minifyInlineSvgForImage(string $html): string return trim($html); } + private function stripProjectedSvgImageBoxStyle(string $html, DOMElement $element): string + { + if ( ! preg_match('/]*\sstyle\s*=\s*(["\'])(.*?)\1/i', $html, $match) ) { + return $html; + } + + $declarations = $this->cssDeclarations($match[2]); + $authoredDeclarations = $this->cssDeclarations($this->attr($element, 'style')); + foreach ( array( 'aspect-ratio', 'display', 'height', 'max-height', 'max-width', 'min-height', 'min-width', 'width' ) as $property ) { + if ( ! array_key_exists($property, $authoredDeclarations) ) { + unset($declarations[$property]); + } + } + $style = $this->cssDeclarationString($declarations); + $replacement = '' === $style ? '' : ' style="' . htmlspecialchars($style, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . '"'; + + return preg_replace('/\sstyle\s*=\s*(["\'])(.*?)\1/i', $replacement, $html, 1) ?? $html; + } + private function ensureSvgImageNamespace(string $html): string { if ( preg_match('/]*\sxmlns\s*=/i', $html) ) { diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index 445224b5..c191763c 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -573,7 +573,18 @@ public function match(DOMElement $element, PatternContext $context): ?array '
' )->toArray(); $classSizedInlineSvgCss = implode("\n", array_map(static fn (array $asset): string => 'css' === ($asset['kind'] ?? '') ? (string) ($asset['content'] ?? '') : '', $classSizedInlineSvgArtwork['assets'] ?? array())); +$classSizedInlineSvgAssets = array_values(array_filter($classSizedInlineSvgArtwork['assets'] ?? array(), static fn (array $asset): bool => 'svg' === ($asset['kind'] ?? ''))); $assert(str_contains($classSizedInlineSvgCss, '>img{display:inline;vertical-align:baseline;width:100%}'), 'inline SVG core/image applies class-owned responsive width to the image element'); +$assert(1 === count($classSizedInlineSvgAssets) && ! str_contains((string) ($classSizedInlineSvgAssets[0]['content'] ?? ''), 'style="width:100%"'), 'external SVG asset omits stylesheet-projected media-box declarations already carried by the native image'); + +$inlineStyledSvgArtwork = ( new HtmlTransformer() )->transform( + '
' +)->toArray(); +$inlineStyledSvgAssets = array_values(array_filter($inlineStyledSvgArtwork['assets'] ?? array(), static fn (array $asset): bool => 'svg' === ($asset['kind'] ?? ''))); +$inlineStyledSvgContent = (string) ($inlineStyledSvgAssets[0]['content'] ?? ''); +$assert(1 === count($inlineStyledSvgAssets), 'authored inline SVG geometry materializes one generated SVG asset'); +$assert(str_contains($inlineStyledSvgContent, 'display:block') && str_contains($inlineStyledSvgContent, 'width:120px') && str_contains($inlineStyledSvgContent, 'height:80px') && str_contains($inlineStyledSvgContent, 'aspect-ratio:3/2'), 'external SVG assets preserve authored inline media-box declarations'); +$assert(str_contains($inlineStyledSvgContent, 'color:#123456'), 'external SVG assets preserve authored non-geometry declarations'); $emptyVisualCluster = ( new HtmlTransformer() )->transform( '
' From 1ff41fa353a60346084b61fb1f215532f1f30d51 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Wed, 22 Jul 2026 20:44:39 -0400 Subject: [PATCH 19/22] Preserve template part shell classes --- php-transformer/src/ArtifactCompiler/ArtifactCompiler.php | 6 +++--- php-transformer/src/HtmlToBlocks/HtmlTransformer.php | 4 ++++ php-transformer/tests/contract/shared-shell-plan.php | 4 +++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php b/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php index 53a6577d..9562085a 100644 --- a/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php +++ b/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php @@ -2014,9 +2014,9 @@ private function compiledSiteReport(array $artifact, string $entryPath, array $d $shellArtifact['slug'] = 'entry-' . $slug; } $partSlugs[(string) $shellArtifact['slug']] = true; - if ( is_string($shellArtifact['inner_block_markup'] ?? null) ) { - $shellArtifact['block_markup'] = $shellArtifact['inner_block_markup']; - unset($shellArtifact['inner_block_markup']); + if ( is_string($shellArtifact['template_part_block_markup'] ?? null) ) { + $shellArtifact['block_markup'] = $shellArtifact['template_part_block_markup']; + unset($shellArtifact['inner_block_markup'], $shellArtifact['template_part_block_markup']); } $templateParts[] = $shellArtifact; } diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index c56a839b..073cfcd9 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -676,6 +676,9 @@ private function globalShellArtifacts(DOMElement $body, string $source, bool $re // landmark around an independently converted landmark block. $blocks = array($this->createBlock('core/group', $wrapperAttrs, $blocks, $child)); $markup = $this->runtime->serializeBlocks($blocks); + $templatePartBlocks = $blocks; + unset($templatePartBlocks[0]['attrs']['tagName']); + $templatePartMarkup = $this->runtime->serializeBlocks($templatePartBlocks); if ( '' === trim($markup) ) { continue; } @@ -687,6 +690,7 @@ private function globalShellArtifacts(DOMElement $body, string $source, bool $re 'body_format' => 'blocks', 'block_markup' => $markup, 'inner_block_markup' => $innerMarkup, + 'template_part_block_markup' => $templatePartMarkup, 'source_selector' => strtolower($child->tagName), 'source_classes' => $this->shellSourceClasses($child), 'source_hash' => hash('sha256', $this->outerHtml($child)), diff --git a/php-transformer/tests/contract/shared-shell-plan.php b/php-transformer/tests/contract/shared-shell-plan.php index 7d2ed1b0..289c10b6 100644 --- a/php-transformer/tests/contract/shared-shell-plan.php +++ b/php-transformer/tests/contract/shared-shell-plan.php @@ -51,7 +51,9 @@ $assert(str_contains($singleHeader['canonical_block_markup'] ?? '', '"tagName":"header"') && str_contains($singleHeader['canonical_block_markup'] ?? '', 'solo') && str_contains($singleHeader['canonical_block_markup'] ?? '', 'Solo') && !str_contains($pages($single)['index.html']['canonical_block_markup'] ?? '', 'Solo

'), 'Single-page entry chrome preserves its semantic landmark and source presentation while removing it from post content.'); $compiledHeader = array_values(array_filter($singleResult['source_reports']['compiled_site']['template_parts'] ?? array(), static fn(array $part): bool => 'header' === ($part['area'] ?? null)))[0] ?? array(); $compiledPage = $singleResult['source_reports']['compiled_site']['pages'][0] ?? array(); -$assert('entry_shell' === ($compiledHeader['placement']['kind'] ?? null) && !str_contains($compiledHeader['block_markup'] ?? '', '"tagName":"header"') && str_contains($compiledHeader['block_markup'] ?? '', 'Solo') && !str_contains($compiledPage['block_markup'] ?? '', 'Solo

'), 'The compiled-site compatibility report retains its established single-page entry shell projection without duplicate page chrome.'); +$assert('entry_shell' === ($compiledHeader['placement']['kind'] ?? null) && !str_contains($compiledHeader['block_markup'] ?? '', '"tagName":"header"') && str_contains($compiledHeader['block_markup'] ?? '', '"className":"solo"') && str_contains($compiledHeader['block_markup'] ?? '', 'Solo') && !str_contains($compiledPage['block_markup'] ?? '', 'Solo

'), 'The compiled-site compatibility report retains source shell classes on a non-landmark wrapper without duplicate page chrome.'); +$materializedHeader = array_values(array_filter($singleResult['source_reports']['materialization_plan']['template_part_writes'] ?? array(), static fn(array $write): bool => 'header' === ($write['area'] ?? null)))[0] ?? array(); +$assert(str_contains($materializedHeader['content'] ?? '', '"className":"solo"') && !str_contains($materializedHeader['content'] ?? '', '"tagName":"header"'), 'The v1 materialization projection carries source shell classes without nesting a header landmark inside the template-part wrapper.'); $incomplete = (new ArtifactCompiler())->compile(array('entrypoint' => 'index.html', 'files' => array('index.html' => '
Shared
Home
', 'about.html' => '
Shared
About
', 'contact.html' => '
Contact
')))->toArray()['source_reports']['wordpress_site_plan']; $multiple = (new ArtifactCompiler())->compile(array('entrypoint' => 'index.html', 'files' => array('index.html' => '
One
Two
Home
', 'about.html' => '
One
Two
About
')))->toArray()['source_reports']['wordpress_site_plan']; From d0ce1b7d4501758eb5ae27d52e9f86eb3225823b Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Wed, 22 Jul 2026 21:51:11 -0400 Subject: [PATCH 20/22] Neutralize synthetic text host margins --- .../src/HtmlToBlocks/HtmlTransformer.php | 35 ++++++++----------- .../Support/ButtonLinkDispatchTrait.php | 4 +-- php-transformer/tests/contract/run.php | 11 +++++- .../parity/html-anchor-inline-patterns.json | 2 +- .../html-business-hours-label-value-rows.json | 4 +-- .../html-schedule-label-value-rows.json | 8 ++--- 6 files changed, 34 insertions(+), 30 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index 073cfcd9..cf08c31e 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -1976,7 +1976,7 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca return null; } - return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array( 'content' => $content ))); + return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array( 'content' => $content ), false)); } if ( 'ul' === $tagName || 'ol' === $tagName ) { @@ -3747,7 +3747,7 @@ private function textFlowBlockFromElement(DOMElement $element): ?array return null; } - return $this->createBlock('core/paragraph', array_merge($this->presentationAttributes($element), array( 'content' => $content )), array(), $element); + return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array_merge($this->presentationAttributes($element), array( 'content' => $content ))), array(), $element); } private function richTextContentWithoutDecorativeSvg(DOMElement $element): string @@ -4174,29 +4174,24 @@ private function paragraphBlockFromInlineContentWrapper(DOMElement $element): ?a } /** - * A paragraph is the valid native host for a standalone source inline flex or - * grid item. Its theme default margins are not part of that element's box, so - * use its resolved source margin when present or establish a zero baseline. + * A paragraph is the valid native host for non-paragraph source content. Its + * theme default margins are not part of that source box, so fill unspecified + * wrapper margins with zero while retaining margins projected onto the host. * * @param array $attrs * @return array */ - private function paragraphAttributesForNonParagraphContent(DOMElement $element, array $attrs): array + private function paragraphAttributesForNonParagraphContent(DOMElement $element, array $attrs, bool $sourcePresentationOnWrapper = true): array { - $parent = $element->parentNode; - $parentDisplay = $parent instanceof DOMElement ? strtolower(trim((string) ($this->structuralPresentationDeclarations($parent)['display'] ?? ''))) : ''; - if ( ! in_array($parentDisplay, array( 'flex', 'inline-flex', 'grid', 'inline-grid' ), true) ) { - return $attrs; - } - - $sourceMargin = $this->presentationAttributes($element)['style']['spacing']['margin'] ?? array(); - if ( ! is_array($sourceMargin) || array() === $sourceMargin ) { - $sourceMargin = array( - 'top' => '0', - 'right' => '0', - 'bottom' => '0', - 'left' => '0', - ); + $sourceMargin = $attrs['style']['spacing']['margin'] ?? array(); + $sourceMargin = is_array($sourceMargin) ? $sourceMargin : array(); + $declarations = $sourcePresentationOnWrapper + ? array_merge($this->structuralPresentationDeclarations($element), $this->presentationDeclarations($element)) + : array(); + foreach ( array( 'top', 'right', 'bottom', 'left' ) as $side ) { + if ( ! array_key_exists($side, $sourceMargin) && (! $sourcePresentationOnWrapper || (! isset($declarations['margin']) && ! isset($declarations['margin-' . $side]))) ) { + $sourceMargin[$side] = '0'; + } } return array_replace_recursive(array( diff --git a/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php b/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php index b1b2e78e..0b91220e 100644 --- a/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php +++ b/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php @@ -45,7 +45,7 @@ private function convertAnchorDispatchElement(DOMElement $element, array &$fallb } if ( '' === trim($element->textContent ?? '') && '' !== $this->safeLinkUrl($this->attr($element, 'href')) && '' !== trim($this->attr($element, 'aria-label')) ) { - return $this->createBlock('core/paragraph', array_merge($this->presentationAttributes($element), array( 'content' => $this->outerHtml($element) )), array(), $element); + return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array_merge($this->presentationAttributes($element), array( 'content' => $this->outerHtml($element) ))), array(), $element); } if ( '' === trim($element->textContent ?? '') ) { @@ -62,7 +62,7 @@ private function convertAnchorDispatchElement(DOMElement $element, array &$fallb // A non-button anchor has no native width support. Promote its source // presentation to the paragraph wrapper so generated geometry remains // attached to the rendered block rather than being silently discarded. - return $this->createBlock('core/paragraph', array_merge($this->presentationAttributes($element), array( 'content' => $this->outerHtml($element) )), array(), $element); + return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array_merge($this->presentationAttributes($element), array( 'content' => $this->outerHtml($element) ))), array(), $element); } /** diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index c191763c..b0c6bb7e 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1299,11 +1299,20 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert(str_contains($captionedPlaceholderCss, 'position:absolute') && str_contains($captionedPlaceholderCss, 'left:12px') && str_contains($captionedPlaceholderCss, 'bottom:10px') && str_contains($captionedPlaceholderCss, 'margin:0'), 'materialized placeholder caption preserves pseudo-element overlay geometry without affecting layout flow'); $inlineMetadataFlow = ( new HtmlTransformer() )->transform( - '
Committee chair: Prof. Mahalingam · M-302 Mendel Hall
' + '
Committee chair: Prof. Mahalingam · M-302 Mendel Hall
' )->toArray(); $inlineMetadataBlock = $inlineMetadataFlow['blocks'][0] ?? array(); $assert('core/paragraph' === ($inlineMetadataBlock['blockName'] ?? '') && 'event-meta' === ($inlineMetadataBlock['attrs']['className'] ?? ''), 'phrasing-only div with direct text remains one metadata flow'); $assert(str_contains((string) ($inlineMetadataBlock['attrs']['content'] ?? ''), 'Prof. Mahalingam') && str_contains((string) ($inlineMetadataBlock['attrs']['content'] ?? ''), 'M-302'), 'metadata flow preserves text and inline semantic tokens together'); +$assert(array('top' => '0', 'right' => '0', 'left' => '0') === ($inlineMetadataBlock['attrs']['style']['spacing']['margin'] ?? array()), 'non-paragraph metadata hosts leave authored stylesheet margins active and neutralize unspecified paragraph margins'); + +$standaloneTextControls = ( new HtmlTransformer() )->transform( + '
All news
Jun25
' +)->toArray(); +$standaloneLinkBlock = $standaloneTextControls['blocks'][0]['innerBlocks'][0] ?? array(); +$standaloneTimeBlock = $standaloneTextControls['blocks'][1]['innerBlocks'][2] ?? array(); +$assert(array('top' => '0', 'right' => '0', 'left' => '0') === ($standaloneLinkBlock['attrs']['style']['spacing']['margin'] ?? array()), 'standalone source links leave authored stylesheet margins active without paragraph theme defaults'); +$assert(array('top' => '0', 'right' => '0', 'bottom' => '0', 'left' => '0') === ($standaloneTimeBlock['attrs']['style']['spacing']['margin'] ?? array()) && str_contains((string) ($standaloneTimeBlock['attrs']['content'] ?? ''), 'class="time"'), 'inline source elements hosted by paragraphs keep their source-owned inner margin and a neutral wrapper margin'); $wrappingNavigation = ( new HtmlTransformer() )->transform( '' diff --git a/php-transformer/tests/fixtures/parity/html-anchor-inline-patterns.json b/php-transformer/tests/fixtures/parity/html-anchor-inline-patterns.json index d8870d26..474b085b 100644 --- a/php-transformer/tests/fixtures/parity/html-anchor-inline-patterns.json +++ b/php-transformer/tests/fixtures/parity/html-anchor-inline-patterns.json @@ -25,7 +25,7 @@ { "path": "blocks", "assert": "count", "count": 2 }, { "path": "serialized_blocks", "assert": "contains", "value": "" }, - { "path": "serialized_blocks", "assert": "contains", "value": "

Monday

" }, - { "path": "serialized_blocks", "assert": "contains", "value": "

Closed

" }, + { "path": "serialized_blocks", "assert": "contains", "value": "

Monday

" }, + { "path": "serialized_blocks", "assert": "contains", "value": "

Closed

" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "Monday\n" } ] } diff --git a/php-transformer/tests/fixtures/parity/html-schedule-label-value-rows.json b/php-transformer/tests/fixtures/parity/html-schedule-label-value-rows.json index 16760a94..2468e845 100644 --- a/php-transformer/tests/fixtures/parity/html-schedule-label-value-rows.json +++ b/php-transformer/tests/fixtures/parity/html-schedule-label-value-rows.json @@ -26,10 +26,10 @@ "expect": [ { "path": "status", "assert": "equals", "value": "success" }, { "path": "serialized_blocks", "assert": "contains", "value": "" }, - { "path": "serialized_blocks", "assert": "contains", "value": "

" }, - { "path": "serialized_blocks", "assert": "contains", "value": "

Opening keynote

" }, - { "path": "serialized_blocks", "assert": "contains", "value": "

Location

" }, - { "path": "serialized_blocks", "assert": "contains", "value": "

Main Hall

" }, + { "path": "serialized_blocks", "assert": "contains", "value": "

" }, + { "path": "serialized_blocks", "assert": "contains", "value": "

Opening keynote

" }, + { "path": "serialized_blocks", "assert": "contains", "value": "

Location

" }, + { "path": "serialized_blocks", "assert": "contains", "value": "

Main Hall

" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "10:00 AM\n" }, { "path": "fallbacks", "assert": "count", "count": 0 } ] From 6ee8976b01debefd4b4731f1c1e9aa040bc2c8f9 Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Thu, 23 Jul 2026 22:43:23 -0400 Subject: [PATCH 21/22] Preserve authored inline presentation --- .../src/HtmlToBlocks/HtmlTransformer.php | 33 +++++++++++++++---- .../Style/StyleResolutionTrait.php | 24 ++++++++++++++ .../Support/ButtonLinkDispatchTrait.php | 4 ++- php-transformer/tests/contract/run.php | 24 +++++++++++--- .../tests/unit/author-selector-semantics.php | 2 +- 5 files changed, 74 insertions(+), 13 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index cf08c31e..16b07c43 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -748,7 +748,8 @@ private function materializeAuthorStylesheet(string $html, string $staticCss, bo $cssParts[] = $markerReset; } if ( str_contains($serializedBlocks, 'blocks-engine-list-navigation') ) { - $cssParts[] = '.wp-block-navigation.blocks-engine-list-navigation .wp-block-navigation-item.wp-block-navigation-link{display:list-item;font:inherit}' + $cssParts[] = '.wp-block-navigation.blocks-engine-list-navigation{align-items:normal}' + . "\n" . '.wp-block-navigation.blocks-engine-list-navigation .wp-block-navigation-item.wp-block-navigation-link{display:list-item;font:inherit}' . "\n" . '.wp-block-navigation.blocks-engine-list-navigation .wp-block-navigation-item__content{display:inline}'; } if ( $includeAuthorStyles && '' !== $this->combinedAuthorCss ) { @@ -1785,10 +1786,10 @@ private function svgPhrasingHostAttributes(DOMElement $element, string $imageMar { $className = $this->syntheticFlexItemClassName($element); - return array_filter(array( + return $this->paragraphAttributesForNonParagraphContent($element, array_filter(array( 'content' => $imageMarkup, 'className' => $className, - ), static fn (string $value): bool => '' !== $value); + ), static fn (string $value): bool => '' !== $value), false); } /** @@ -3185,9 +3186,12 @@ private function richTextRequiresHtmlFallback(string $content): bool return (bool) preg_match('/<(?:svg|canvas|img|picture|video|audio|iframe|object|embed|input|button|select|textarea|form)\b/i', $content); } - private function richTextContentWithMaterializedInlineStyles(DOMElement $element): string + /** @param list $excludedDescendantTags */ + private function richTextContentWithMaterializedInlineStyles(DOMElement $element, array $excludedDescendantTags = array()): string { - $content = $this->innerHtml($element); + $content = array() === $excludedDescendantTags + ? $this->innerHtml($element) + : $this->innerHtmlWithoutTags($element, $excludedDescendantTags); if ( '' === $content || ! preg_match('/<(?:a|span|em|i|strong|b|mark|small|sub|sup)\b/i', $content) ) { return $content; } @@ -3205,7 +3209,9 @@ private function richTextContentWithMaterializedInlineStyles(DOMElement $element $sourceInlines = array(); foreach ( $element->getElementsByTagName('*') as $sourceInline ) { - if ( $sourceInline instanceof DOMElement && in_array(strtolower($sourceInline->tagName), array( 'a', 'span', 'em', 'i', 'strong', 'b', 'mark', 'small', 'sub', 'sup' ), true) ) { + if ( $sourceInline instanceof DOMElement + && in_array(strtolower($sourceInline->tagName), array( 'a', 'span', 'em', 'i', 'strong', 'b', 'mark', 'small', 'sub', 'sup' ), true) + && ! $this->hasExcludedRichTextAncestor($sourceInline, $element, $excludedDescendantTags) ) { $sourceInlines[] = $sourceInline; } } @@ -3249,6 +3255,18 @@ private function richTextContentWithMaterializedInlineStyles(DOMElement $element return $this->innerHtml($body); } + /** @param list $excludedTags */ + private function hasExcludedRichTextAncestor(DOMElement $element, DOMElement $root, array $excludedTags): bool + { + for ( $parent = $element->parentNode; $parent instanceof DOMElement && $parent !== $root; $parent = $parent->parentNode ) { + if ( in_array(strtolower($parent->tagName), $excludedTags, true) ) { + return true; + } + } + + return false; + } + /** * @return array */ @@ -3272,6 +3290,7 @@ private function richTextInlineVisualDeclarations(DOMElement $element): array 'font-family', 'font-size', 'font-style', + 'font-variant-caps', 'font-weight', 'letter-spacing', 'line-height', @@ -5807,7 +5826,7 @@ private function listItems(DOMElement $list, array &$fallbacks): array } } - $content = $this->innerHtmlWithoutTags($child, array( 'ul', 'ol' )); + $content = $this->richTextContentWithMaterializedInlineStyles($child, array( 'ul', 'ol' )); if ( '' === trim($this->runtime->stripAllTags($content)) && array() === $nested ) { continue; } diff --git a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php index 4d17e38d..f7ed4144 100644 --- a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php +++ b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php @@ -372,6 +372,28 @@ private function syntheticFlexItemClassName(DOMElement $element): string return $className; } + private function blockifiedLinkClassName(DOMElement $element): string + { + $parent = $element->parentNode; + $parentDisplay = $parent instanceof DOMElement + ? strtolower(trim((string) ($this->structuralPresentationDeclarations($parent)['display'] ?? ''))) + : ''; + if ( ! in_array($parentDisplay, array( 'flex', 'inline-flex', 'grid', 'inline-grid' ), true) ) { + return ''; + } + + $sourceDisplay = strtolower(trim((string) ($this->structuralPresentationDeclarations($element)['display'] ?? ''))); + $display = match ( $sourceDisplay ) { + 'flex', 'inline-flex' => 'flex', + 'grid', 'inline-grid' => 'grid', + default => 'block', + }; + $className = ($this->geometryCarrierClassAllocator ??= new GeometryCarrierClassAllocator())->allocate($this->geometryStructuralPath($element) . "\nblockified-link\n" . $display); + $this->generatedGeometryRules[$className] = '.' . $className . '>a{display:' . $display . '}'; + + return $className; + } + /** * @return array */ @@ -835,6 +857,7 @@ private function safeVisualDeclarations(array $declarations): array 'font-family', 'font-size', 'font-style', + 'font-variant-caps', 'font-weight', 'letter-spacing', 'gap', @@ -865,6 +888,7 @@ private function safeVisualDeclarations(array $declarations): array 'row-gap', 'text-align', 'text-decoration', + 'text-shadow', 'text-transform', 'width', 'z-index', diff --git a/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php b/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php index 0b91220e..2510fa52 100644 --- a/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php +++ b/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php @@ -62,7 +62,9 @@ private function convertAnchorDispatchElement(DOMElement $element, array &$fallb // A non-button anchor has no native width support. Promote its source // presentation to the paragraph wrapper so generated geometry remains // attached to the rendered block rather than being silently discarded. - return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array_merge($this->presentationAttributes($element), array( 'content' => $this->outerHtml($element) ))), array(), $element); + $attrs = $this->presentationAttributes($element); + $attrs['className'] = $this->mergePresentationClassNames((string) ($attrs['className'] ?? ''), $this->blockifiedLinkClassName($element)); + return $this->createBlock('core/paragraph', $this->paragraphAttributesForNonParagraphContent($element, array_merge($attrs, array( 'content' => $this->outerHtml($element) ))), array(), $element); } /** diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index b0c6bb7e..09e2bfee 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -1282,21 +1282,35 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert('18px' === ($explicitGapNavigationBlock['innerBlocks'][1]['attrs']['style']['spacing']['margin']['left'] ?? ''), 'explicit navigation gap leaves authored item margins intact'); $quickLinkCards = ( new HtmlTransformer() )->transform( - '

Apply

Choose a program.

Visit

Plan your trip.

' + '

Apply

Choose a program.

Visit

Plan your trip.

' )->toArray(); $quickLinkCardsBlock = $quickLinkCards['blocks'][0] ?? array(); $quickLinkCardsCss = implode("\n", array_map(static fn (array $asset): string => 'css' === ($asset['kind'] ?? '') ? (string) ($asset['content'] ?? '') : '', $quickLinkCards['assets'] ?? array())); $assert('core/group' === ($quickLinkCardsBlock['blockName'] ?? '') && 'quick-links' === ($quickLinkCardsBlock['attrs']['className'] ?? ''), 'card-like quick-links container remains a layout group rather than a navigation menu'); $assert('core/group' === ($quickLinkCardsBlock['innerBlocks'][0]['blockName'] ?? '') && 'quick-link' === ($quickLinkCardsBlock['innerBlocks'][0]['attrs']['className'] ?? ''), 'block-content quick link remains a card group'); +$assert(array('top' => '0', 'right' => '0', 'bottom' => '0', 'left' => '0') === ($quickLinkCardsBlock['innerBlocks'][0]['innerBlocks'][0]['attrs']['style']['spacing']['margin'] ?? array()), 'synthetic SVG image-object host does not add paragraph margins to card layout'); $assert(str_contains((string) ($quickLinkCards['serialized_blocks'] ?? ''), '') && str_contains($quickLinkCardsCss, '.blocks-engine-propagated-link{background-color:transparent;color:inherit}.blocks-engine-propagated-link>a{color:inherit;border:0;text-decoration:inherit}'), 'synthetic card link wrappers inherit source card paint instead of acquiring browser mark, standalone link color, or borders'); $captionedPlaceholder = ( new HtmlTransformer() )->transform( - '' + '' )->toArray(); $captionedPlaceholderMarkup = (string) ($captionedPlaceholder['serialized_blocks'] ?? ''); $captionedPlaceholderCss = implode("\n", array_map(static fn (array $asset): string => 'css' === ($asset['kind'] ?? '') ? (string) ($asset['content'] ?? '') : '', $captionedPlaceholder['assets'] ?? array())); $assert(str_contains($captionedPlaceholderMarkup, 'blocks-engine-placeholder-media') && str_contains($captionedPlaceholderMarkup, 'Spring research cruise') && str_contains($captionedPlaceholderMarkup, 'blocks-engine-placeholder-caption-'), 'CSS visual placeholder materializes its generated caption as editable native text'); -$assert(str_contains($captionedPlaceholderCss, 'position:absolute') && str_contains($captionedPlaceholderCss, 'left:12px') && str_contains($captionedPlaceholderCss, 'bottom:10px') && str_contains($captionedPlaceholderCss, 'margin:0'), 'materialized placeholder caption preserves pseudo-element overlay geometry without affecting layout flow'); +$assert(str_contains($captionedPlaceholderCss, 'position:absolute') && str_contains($captionedPlaceholderCss, 'left:12px') && str_contains($captionedPlaceholderCss, 'bottom:10px') && str_contains($captionedPlaceholderCss, 'text-shadow:0 1px 2px rgba(0,0,0,.6)') && str_contains($captionedPlaceholderCss, 'margin:0'), 'materialized placeholder caption preserves pseudo-element paint and overlay geometry without affecting layout flow'); + +$listItemDescendantLinks = ( new HtmlTransformer() )->transform( + '' +)->toArray(); +$listItemDescendantLinkMarkup = (string) ($listItemDescendantLinks['serialized_blocks'] ?? ''); +$listItemDescendantLinkCss = implode("\n", array_map(static fn (array $asset): string => 'css' === ($asset['kind'] ?? '') ? (string) ($asset['content'] ?? '') : '', $listItemDescendantLinks['assets'] ?? array())); +$assert((bool) preg_match('/Programs<\\/a><\\/mark>/', $listItemDescendantLinkMarkup), 'list-item RichText materializes projected anchor identity around valid link content'); +$assert((bool) preg_match('/mark\.blocks-engine-richtext-anchor-[^{]+>a\{color:#fff\}/', $listItemDescendantLinkCss), 'descendant link paint remains attached after list-item RichText projection'); + +$richTextVariantCaps = ( new HtmlTransformer() )->transform( + '

Founded est. 1947

' +)->toArray(); +$assert(str_contains((string) ($richTextVariantCaps['serialized_blocks'] ?? ''), 'font-variant-caps:all-small-caps'), 'RichText materialization preserves authored font variant caps'); $inlineMetadataFlow = ( new HtmlTransformer() )->transform( '
Committee chair: Prof. Mahalingam · M-302 Mendel Hall
' @@ -1307,11 +1321,13 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert(array('top' => '0', 'right' => '0', 'left' => '0') === ($inlineMetadataBlock['attrs']['style']['spacing']['margin'] ?? array()), 'non-paragraph metadata hosts leave authored stylesheet margins active and neutralize unspecified paragraph margins'); $standaloneTextControls = ( new HtmlTransformer() )->transform( - '
All news
Jun25
' + '
All news
Jun25
' )->toArray(); $standaloneLinkBlock = $standaloneTextControls['blocks'][0]['innerBlocks'][0] ?? array(); $standaloneTimeBlock = $standaloneTextControls['blocks'][1]['innerBlocks'][2] ?? array(); +$standaloneTextControlsCss = implode("\n", array_map(static fn (array $asset): string => 'css' === ($asset['kind'] ?? '') ? (string) ($asset['content'] ?? '') : '', $standaloneTextControls['assets'] ?? array())); $assert(array('top' => '0', 'right' => '0', 'left' => '0') === ($standaloneLinkBlock['attrs']['style']['spacing']['margin'] ?? array()), 'standalone source links leave authored stylesheet margins active without paragraph theme defaults'); +$assert(preg_match('/\.be-inline-geometry-[a-f0-9]+>a\{display:block\}/', $standaloneTextControlsCss) && str_contains((string) ($standaloneLinkBlock['attrs']['className'] ?? ''), 'be-inline-geometry-'), 'direct flex-item links retain their blockified border box after paragraph hosting'); $assert(array('top' => '0', 'right' => '0', 'bottom' => '0', 'left' => '0') === ($standaloneTimeBlock['attrs']['style']['spacing']['margin'] ?? array()) && str_contains((string) ($standaloneTimeBlock['attrs']['content'] ?? ''), 'class="time"'), 'inline source elements hosted by paragraphs keep their source-owned inner margin and a neutral wrapper margin'); $wrappingNavigation = ( new HtmlTransformer() )->transform( diff --git a/php-transformer/tests/unit/author-selector-semantics.php b/php-transformer/tests/unit/author-selector-semantics.php index 279631c0..572fdbb9 100644 --- a/php-transformer/tests/unit/author-selector-semantics.php +++ b/php-transformer/tests/unit/author-selector-semantics.php @@ -162,7 +162,7 @@ $linkedBrand = $transform('
Brennan UniversityEarth Sciences
'); $linkedBrandMarkup = (string) ($linkedBrand['serialized_blocks'] ?? ''); $linkedBrandCss = implode("\n", array_map(static fn (array $asset): string => (string) ($asset['content'] ?? ''), array_filter($linkedBrand['assets'] ?? array(), static fn (array $asset): bool => 'text/css' === ($asset['mime_type'] ?? '')))); -$assert(str_contains($linkedBrandMarkup, 'className":"institution blocks-engine-semantic-') && str_contains($linkedBrandMarkup, 'className":"department blocks-engine-semantic-') && 2 === substr_count($linkedBrandMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), 'linked brand text retains independent native flex children without synthetic paragraph margins when shell conversion changes DOM paths'); +$assert(str_contains($linkedBrandMarkup, 'className":"institution blocks-engine-semantic-') && str_contains($linkedBrandMarkup, 'className":"department blocks-engine-semantic-') && 3 === substr_count($linkedBrandMarkup, 'margin-top:0;margin-right:0;margin-bottom:0;margin-left:0'), 'linked brand SVG and text retain independent native flex children without synthetic paragraph margins when shell conversion changes DOM paths'); $assert(str_contains($linkedBrandMarkup, 'be-inline-geometry-') && str_contains($linkedBrandCss, '{flex-shrink:0}'), 'synthetic SVG phrasing hosts inherit source flex-item shrink constraints'); $resetInlineMetadata = $transform('

Decision

Byline
'); From 0b9428dc824447803bf39e4011dd973be831689a Mon Sep 17 00:00:00 2001 From: Chris Huber Date: Thu, 23 Jul 2026 23:27:30 -0400 Subject: [PATCH 22/22] Reconcile university fixes with current trunk --- .../src/HtmlToBlocks/HtmlTransformer.php | 12 +++++++--- .../Patterns/NavigationPattern.php | 2 +- .../Style/StyleResolutionTrait.php | 24 +++++++++++++++++++ .../Support/ButtonLinkDispatchTrait.php | 8 +++++++ .../tests/unit/author-selector-semantics.php | 6 ++--- .../unit/block-style-support-conversion.php | 7 +++--- 6 files changed, 49 insertions(+), 10 deletions(-) diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index 16b07c43..5a3571e3 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -1945,9 +1945,9 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca if ( 'transparent' === strtolower((string) ($declarations['-webkit-text-fill-color'] ?? '')) ) { $declarations['color'] = 'transparent'; } - $declarations['--blocks-engine-richtext-marker'] = $richTextMarker; + $style = $this->cssDeclarationString($declarations); return $this->createBlock('core/paragraph', array( - 'content' => '' . $content . '', + 'content' => '' . $content . '', ), array(), $element); } } @@ -4189,7 +4189,13 @@ private function paragraphBlockFromInlineContentWrapper(DOMElement $element): ?a return null; } - return $this->createBlock('core/paragraph', array_merge($this->presentationAttributes($element), array( 'content' => $content )), array(), $element); + $attrs = array_merge($this->presentationAttributes($element), array( 'content' => $content )); + $declarations = array_merge($this->structuralPresentationDeclarations($element), $this->presentationDeclarations($element)); + if ( array_filter(array_keys($declarations), static fn (string $property): bool => 'margin' === $property || str_starts_with($property, 'margin-')) ) { + $attrs = $this->paragraphAttributesForNonParagraphContent($element, $attrs); + } + + return $this->createBlock('core/paragraph', $attrs, array(), $element); } /** diff --git a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php index 3f96bf9c..9653d549 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php @@ -94,7 +94,7 @@ public function match(DOMElement $element, PatternContext $context): ?array $navigationAttrs, $commonTextAttrs ); - $this->promoteDirectAnchorSpacing($element, $presentationAttributes, $containerAttrs, $links); + $this->promoteDirectAnchorSpacing($element, $presentationAttributes, $navigationAttrs, $links); $navigation = $createBlock('core/navigation', $navigationAttrs, $links, $element); diff --git a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php index f7ed4144..2e4e48a9 100644 --- a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php +++ b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php @@ -394,6 +394,30 @@ private function blockifiedLinkClassName(DOMElement $element): string return $className; } + private function buttonLinkLayoutClassName(DOMElement $element): string + { + $inline = $this->cssDeclarations($this->attr($element, 'style')); + $declarations = array_intersect_key($inline, array_flip(array( + 'display', + 'align-items', + 'justify-content', + 'flex-direction', + 'flex-wrap', + 'gap', + 'row-gap', + 'column-gap', + ))); + if ( array() === $declarations ) { + return ''; + } + + $rule = $this->cssDeclarationString($declarations); + $className = ($this->geometryCarrierClassAllocator ??= new GeometryCarrierClassAllocator())->allocate($this->geometryStructuralPath($element) . "\nbutton-link-layout\n" . $rule); + $this->generatedGeometryRules[$className] = '.' . $className . '> .wp-block-button__link{' . $rule . '}'; + + return $className; + } + /** * @return array */ diff --git a/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php b/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php index 2510fa52..d3316cad 100644 --- a/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php +++ b/php-transformer/src/HtmlToBlocks/Support/ButtonLinkDispatchTrait.php @@ -27,6 +27,14 @@ private function convertAnchorDispatchElement(DOMElement $element, array &$fallb fn (string $name, array $attrs = array(), array $innerBlocks = array(), ?DOMElement $sourceElement = null, ?DOMElement $logicalSourceElement = null): array => $this->createBlock($name, $attrs, $innerBlocks, $sourceElement, $logicalSourceElement) ); if ( null !== $logo ) { + $button = $logo['innerBlocks'][0] ?? null; + $layoutClass = $this->buttonLinkLayoutClassName($element); + if ( is_array($button) && '' !== $layoutClass ) { + $buttonAttrs = is_array($button['attrs'] ?? null) ? $button['attrs'] : array(); + $buttonAttrs['className'] = $this->mergePresentationClassNames((string) ($buttonAttrs['className'] ?? ''), $layoutClass); + $logo['innerBlocks'][0] = $this->rebuildBlock($button, $buttonAttrs); + $logo = $this->rebuildBlock($logo, is_array($logo['attrs'] ?? null) ? $logo['attrs'] : array()); + } return $logo; } diff --git a/php-transformer/tests/unit/author-selector-semantics.php b/php-transformer/tests/unit/author-selector-semantics.php index 572fdbb9..a379a67a 100644 --- a/php-transformer/tests/unit/author-selector-semantics.php +++ b/php-transformer/tests/unit/author-selector-semantics.php @@ -129,7 +129,7 @@ $svgLogo = $transform('
'); $svgLogoMarkup = (string) ($svgLogo['serialized_blocks'] ?? ''); -$assert(str_contains($svgLogoMarkup, 'Block Party') && 1 === count(array_filter($svgLogo['assets'] ?? array(), static fn (array $asset): bool => 'inline-svg' === ($asset['source'] ?? ''))) && 'pass' === ($svgLogo['source_reports']['wp_block_validity']['status'] ?? ''), 'structured text logos preserve passive inline SVG artwork and native RichText-safe container geometry'); +$assert(str_contains($svgLogoMarkup, 'Block Party') && 1 === count(array_filter($svgLogo['assets'] ?? array(), static fn (array $asset): bool => 'inline-svg' === ($asset['source'] ?? ''))) && 'pass' === ($svgLogo['source_reports']['wp_block_validity']['status'] ?? ''), 'structured text logos preserve passive inline SVG artwork and native RichText-safe container geometry'); $plainSvgLogo = $transform('
'); $plainSvgLogoMarkup = (string) ($plainSvgLogo['serialized_blocks'] ?? ''); @@ -191,11 +191,11 @@ $standaloneBadge = $transform('

Feature

Stable
'); $standaloneBadgeMarkup = (string) ($standaloneBadge['serialized_blocks'] ?? ''); -$assert(str_contains($standaloneBadgeMarkup, '.stat-num{font-size:4rem}.stat-num .suffix{font-size:2rem;color:#6040cc}
43%
'); $inlineStatMarkup = (string) ($inlineStat['serialized_blocks'] ?? ''); -$assert(1 === substr_count($inlineStatMarkup, '