diff --git a/php-transformer/composer.json b/php-transformer/composer.json index 80ecd4b7..c07d18df 100644 --- a/php-transformer/composer.json +++ b/php-transformer/composer.json @@ -57,6 +57,7 @@ "php tests/unit/subtree-classifier.php", "php tests/unit/custom-block-generator.php", "php tests/unit/css-value-splitter.php", + "php tests/unit/block-style-support-conversion.php", "php tests/unit/content-round-trip-reporter.php", "php tests/unit/content-round-trip-form-echo.php", "php tests/unit/corpus-detectors.php", diff --git a/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php b/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php index 212babeb..50fe9afc 100644 --- a/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php +++ b/php-transformer/src/ArtifactCompiler/ArtifactCompiler.php @@ -286,6 +286,9 @@ private function runtimeIslandsWithMaterializedInlineScripts(array $runtimeIslan 'diagnostic_code' => 'preserved_runtime_island', 'preservation_reason' => 'script_requires_runtime', 'runtime_requirement' => 'client_script_execution', + 'disposition' => 'preserve', + 'preservation_status' => 'accepted_runtime_preservation', + 'js_handling' => 'preserve_verbatim', 'source_snippet' => '', 'source_bytes' => strlen($content), 'source_truncated' => false, diff --git a/php-transformer/src/Contract/ConversionReportProjection.php b/php-transformer/src/Contract/ConversionReportProjection.php index 91fa0e07..24c46729 100644 --- a/php-transformer/src/Contract/ConversionReportProjection.php +++ b/php-transformer/src/Contract/ConversionReportProjection.php @@ -368,6 +368,9 @@ private static function runtimeIslandSummaryEntries(array $sourceReports): array 'tag' => $island['tag'] ?? '', 'conversion_classification' => 'runtime_island_preserved', 'preservation_strategy' => $island['preservation_strategy'] ?? 'scoped_runtime_metadata', + 'disposition' => $island['disposition'] ?? '', + 'preservation_status' => $island['preservation_status'] ?? '', + 'js_handling' => $island['js_handling'] ?? '', ), static fn (mixed $value): bool => '' !== $value ); diff --git a/php-transformer/src/CorpusDiagnostics/CorpusDetectors.php b/php-transformer/src/CorpusDiagnostics/CorpusDetectors.php index 6b7885b8..4ea9dbce 100644 --- a/php-transformer/src/CorpusDiagnostics/CorpusDetectors.php +++ b/php-transformer/src/CorpusDiagnostics/CorpusDetectors.php @@ -269,13 +269,14 @@ public static function varDependentStyling(array $flat): array foreach ( $flat as $block ) { $haystack = self::blockMarkup($block); - if ( '' === $haystack ) { - continue; - } - if ( ! preg_match_all('/var\(\s*(--[A-Za-z0-9_-]+)/', $haystack, $matches) ) { - continue; + if ( '' !== $haystack && preg_match_all('/var\(\s*(--[A-Za-z0-9_-]+)/', $haystack, $matches) ) { + foreach ( $matches[1] as $name ) { + ++$total; + $occurrences[$name] = ($occurrences[$name] ?? 0) + 1; + } } - foreach ( $matches[1] as $name ) { + + foreach ( self::presetVarNamesFromAttrs($block) as $name ) { ++$total; $occurrences[$name] = ($occurrences[$name] ?? 0) + 1; } @@ -729,6 +730,27 @@ private static function blockMarkup(array $block): string return is_string($block['innerHTML'] ?? null) ? $block['innerHTML'] : ''; } + /** + * Native preset color attrs are the valid form of CSS preset vars, so they no + * longer appear in innerHTML. Keep them in var_names for corpus visibility. + * + * @param array $block + * @return array + */ + private static function presetVarNamesFromAttrs(array $block): array + { + $attrs = is_array($block['attrs'] ?? null) ? $block['attrs'] : array(); + $names = array(); + foreach ( array( 'textColor', 'backgroundColor' ) as $attrName ) { + $slug = is_string($attrs[ $attrName ] ?? null) ? strtolower(trim($attrs[ $attrName ])) : ''; + if ( '' !== $slug && preg_match('/^[a-z0-9_-]+$/', $slug) ) { + $names[] = '--wp--preset--color--' . $slug; + } + } + + return $names; + } + /** * RichText content for a paragraph/heading/list-item block: the explicit * content attribute, falling back to saved innerHTML. diff --git a/php-transformer/src/HtmlToBlocks/BlockFactory.php b/php-transformer/src/HtmlToBlocks/BlockFactory.php index a4b07561..54768115 100644 --- a/php-transformer/src/HtmlToBlocks/BlockFactory.php +++ b/php-transformer/src/HtmlToBlocks/BlockFactory.php @@ -33,6 +33,7 @@ private function styleMapper(): StyleAttributeMapper */ public function create(string $name, array $attrs = array(), array $innerBlocks = array()): array { + $attrs = $this->normalizeAttrsForBlock($name, $attrs); $innerHtml = $this->blockHtml($name, $attrs, $innerBlocks); if ( is_array($innerHtml) ) { $innerContent = array( $innerHtml['opening'] ); @@ -54,6 +55,25 @@ public function create(string $name, array $attrs = array(), array $innerBlocks ); } + /** + * @param array $attrs + * @return array + */ + private function normalizeAttrsForBlock(string $name, array $attrs): array + { + if ( in_array($name, array( 'core/buttons', 'core/column', 'core/columns', 'core/group', 'core/heading', 'core/list-item', 'core/paragraph' ), true) ) { + unset($attrs['style']['spacing']['blockGap']); + if ( empty($attrs['style']['spacing']) ) { + unset($attrs['style']['spacing']); + } + if ( empty($attrs['style']) ) { + unset($attrs['style']); + } + } + + return $attrs; + } + /** * @param array $attrs * @return array @@ -236,16 +256,11 @@ private function blockHtml(string $name, array $attrs, array $innerBlocks): stri ); if ( 'button' === ($attrs['tagName'] ?? '') ) { - $buttonAttrs = array_intersect_key($attrs, array_flip(array( 'type', 'role', 'aria-label', 'aria-controls', 'aria-expanded', 'aria-haspopup' ))); - foreach ( $attrs as $attrName => $attrValue ) { - if ( is_string($attrName) && str_starts_with(strtolower($attrName), 'data-') ) { - $buttonAttrs[$attrName] = (string) $attrValue; - } - } - $buttonAttrs = array_merge(array( + $buttonAttrs = array( + 'type' => (string) ($attrs['type'] ?? 'button'), 'class' => $this->mergeClassNames('wp-block-button__link', $support['classes'], 'wp-element-button'), 'style' => $support['style'], - ), $buttonAttrs); + ); return 'htmlAttrs($wrapperAttrs) . '>htmlAttrs($buttonAttrs) . '>' . ($attrs['text'] ?? '') . ''; } @@ -474,11 +489,9 @@ private function buttonStyleSupport(array $attrs): array $text = (string) ($style['color']['text'] ?? ''); if ( '' !== $text ) { $classes[] = 'has-text-color'; - $declarations[] = 'color:' . $text; } if ( '' !== $background ) { $classes[] = 'has-background'; - $declarations[] = 'background-color:' . $background; } $border = is_array($style['border'] ?? null) ? $style['border'] : array(); @@ -486,16 +499,23 @@ private function buttonStyleSupport(array $attrs): array $classes[] = 'has-border-color'; $declarations[] = 'border-color:' . (string) $border['color']; } - if ( isset($border['width']) && '' !== (string) $border['width'] ) { - $declarations[] = 'border-width:' . (string) $border['width']; - } if ( isset($border['style']) && '' !== (string) $border['style'] ) { $declarations[] = 'border-style:' . (string) $border['style']; } + if ( isset($border['width']) && '' !== (string) $border['width'] ) { + $declarations[] = 'border-width:' . (string) $border['width']; + } if ( isset($border['radius']) && '' !== (string) $border['radius'] ) { $declarations[] = 'border-radius:' . (string) $border['radius']; } + if ( '' !== $text ) { + $declarations[] = 'color:' . $text; + } + if ( '' !== $background ) { + $declarations[] = 'background-color:' . $background; + } + $padding = is_array($style['spacing']['padding'] ?? null) ? $style['spacing']['padding'] : array(); foreach ( array( 'top', 'right', 'bottom', 'left' ) as $side ) { if ( isset($padding[$side]) && '' !== (string) $padding[$side] ) { @@ -545,7 +565,9 @@ private function mergeClassNames(string ...$classNames): string private function blockSupportAttrs(array $attrs, string $baseClass = ''): string { $support = $this->styleSupport($attrs['style'] ?? null); - $classes = $this->mergeClassNames($baseClass, $support['classes'], (string) ($attrs['className'] ?? '')); + $presetClasses = $this->presetColorClasses($attrs); + $layoutClasses = $this->layoutClasses($attrs['layout'] ?? null, $baseClass); + $classes = $this->mergeClassNames($baseClass, $presetClasses, $support['classes'], $layoutClasses, (string) ($attrs['className'] ?? '')); return $this->htmlAttrs(array( 'id' => (string) ($attrs['anchor'] ?? ''), 'class' => $classes, @@ -573,6 +595,50 @@ private function styleSupport(mixed $style): array ); } + /** + * @param array $attrs + */ + private function presetColorClasses(array $attrs): string + { + $classes = array(); + $textColor = $this->safeSlug((string) ($attrs['textColor'] ?? '')); + if ( '' !== $textColor ) { + $classes[] = 'has-' . $textColor . '-color'; + $classes[] = 'has-text-color'; + } + + $backgroundColor = $this->safeSlug((string) ($attrs['backgroundColor'] ?? '')); + if ( '' !== $backgroundColor ) { + $classes[] = 'has-' . $backgroundColor . '-background-color'; + $classes[] = 'has-background'; + } + + return implode(' ', $classes); + } + + private function layoutClasses(mixed $layout, string $baseClass): string + { + if ( ! is_array($layout) ) { + return ''; + } + + $type = $this->safeSlug((string) ($layout['type'] ?? '')); + if ( ! in_array($type, array( 'constrained', 'flex', 'flow', 'grid' ), true) ) { + return ''; + } + + return $this->mergeClassNames( + 'is-layout-' . $type, + '' !== $baseClass ? $baseClass . '-is-layout-' . $type : '' + ); + } + + private function safeSlug(string $value): string + { + $value = strtolower(trim($value)); + return preg_match('/^[a-z0-9_-]+$/', $value) ? $value : ''; + } + /** * @param array $attrs * @param array $includeEmpty diff --git a/php-transformer/src/HtmlToBlocks/Diagnostics/DiagnosticsCollector.php b/php-transformer/src/HtmlToBlocks/Diagnostics/DiagnosticsCollector.php index 5d825d0d..6ca3870a 100644 --- a/php-transformer/src/HtmlToBlocks/Diagnostics/DiagnosticsCollector.php +++ b/php-transformer/src/HtmlToBlocks/Diagnostics/DiagnosticsCollector.php @@ -102,6 +102,9 @@ public function collect( 'diagnostic_class' => 'runtime_island_preserved', 'suggested_repair_class' => 'preserve_runtime_island', 'preservation_strategy' => $island['preservation_strategy'] ?? 'bounded_raw_html_runtime_island', + 'disposition' => $island['disposition'] ?? null, + 'preservation_status' => $island['preservation_status'] ?? null, + 'js_handling' => $island['js_handling'] ?? null, 'runtime_requirement' => $island['runtime_requirement'] ?? null, 'kind' => $island['kind'] ?? null, 'reason' => $island['preservation_reason'] ?? null, diff --git a/php-transformer/src/HtmlToBlocks/Diagnostics/FallbackEmitter.php b/php-transformer/src/HtmlToBlocks/Diagnostics/FallbackEmitter.php index 6aa70398..56f75995 100644 --- a/php-transformer/src/HtmlToBlocks/Diagnostics/FallbackEmitter.php +++ b/php-transformer/src/HtmlToBlocks/Diagnostics/FallbackEmitter.php @@ -506,6 +506,9 @@ public function recordRuntimeIsland(DOMElement $element, string $kind, string $r 'diagnostic_code' => 'preserved_runtime_island', 'preservation_reason' => $reason, 'runtime_requirement' => $runtimeRequirement, + 'disposition' => 'preserve', + 'preservation_status' => 'accepted_runtime_preservation', + 'js_handling' => 'client_script_execution' === $runtimeRequirement ? 'preserve_verbatim' : '', 'source_snippet' => $boundedHtml['html'], 'source_bytes' => $boundedHtml['bytes'], 'source_truncated' => $boundedHtml['truncated'], diff --git a/php-transformer/src/HtmlToBlocks/FallbackDiagnostic.php b/php-transformer/src/HtmlToBlocks/FallbackDiagnostic.php index 293190d0..1cf7b333 100644 --- a/php-transformer/src/HtmlToBlocks/FallbackDiagnostic.php +++ b/php-transformer/src/HtmlToBlocks/FallbackDiagnostic.php @@ -84,6 +84,9 @@ private static function defaults(array $fields): array 'conversion_classification' => 'runtime_island_preserved', 'loss_class' => 'runtime_island_preserved', 'diagnostic_class' => 'runtime_island_preserved', + 'disposition' => 'preserve', + 'preservation_status' => 'accepted_runtime_preservation', + 'js_handling' => 'preserve_verbatim', 'preservation_strategy' => 'scoped_runtime_metadata', 'runtime_requirement' => 'client_script_execution', 'recoverability' => 'recoverable_with_script_enqueue_or_component_runtime', diff --git a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php index 51944e1d..c9b07cc6 100644 --- a/php-transformer/src/HtmlToBlocks/HtmlTransformer.php +++ b/php-transformer/src/HtmlToBlocks/HtmlTransformer.php @@ -1099,6 +1099,9 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca if ( preg_match('/^h([1-6])$/', $tagName, $matches) ) { $content = $this->innerHtml($element); + if ( $this->richTextRequiresHtmlFallback($content) ) { + return $this->createBlock('core/html', array( 'content' => $this->restoreSvgCasing($this->outerHtml($element)) ), array(), $element); + } if ( '' === trim($this->runtime->stripAllTags($content)) ) { return null; } @@ -1111,6 +1114,9 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca if ( 'p' === $tagName ) { $content = $this->innerHtml($element); + if ( $this->richTextRequiresHtmlFallback($content) ) { + return $this->createBlock('core/html', array( 'content' => $this->restoreSvgCasing($this->outerHtml($element)) ), array(), $element); + } if ( '' === trim($this->runtime->stripAllTags($content)) ) { if ( $this->isRuntimeDomTarget($element) ) { return $this->createBlock('core/group', $this->presentationAttributes($element), array(), $element); @@ -1418,14 +1424,6 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca return $linkedImage; } - 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); - } - - if ( '' === trim($element->textContent ?? '') ) { - return null; - } - $logo = $this->logoPattern->match( $element, fn (DOMElement $sourceElement): array => $this->presentationAttributes($sourceElement), @@ -1450,6 +1448,14 @@ private function convertElement(DOMElement $element, array &$fallbacks, bool $ca return $button; } + 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); + } + + if ( '' === trim($element->textContent ?? '') ) { + return null; + } + if ( $this->hasBlockContentChildren($element) ) { $children = $this->convertChildren($element, $fallbacks, true); if ( array() !== $children ) { @@ -1829,6 +1835,10 @@ private function createBlock(string $name, array $attrs = array(), array $innerB { $attrs = $this->hoistContentWrappingSpans($name, $attrs); + if ( $sourceElement instanceof DOMElement && in_array($name, array( 'core/paragraph', 'core/heading' ), true) && $this->richTextRequiresHtmlFallback((string) ($attrs['content'] ?? '')) ) { + return $this->blockFactory->create('core/html', array( 'content' => $this->restoreSvgCasing($this->outerHtml($sourceElement)) )); + } + if ( $sourceElement instanceof DOMElement ) { $provenanceId = $this->nextSourceProvenanceId++; $this->recordPresentationProvenance($name, $attrs, $sourceElement); @@ -1880,7 +1890,10 @@ private function createBlock(string $name, array $attrs = array(), array $innerB * - Remaining sibling/partial styling-hook spans are UNWRAPPED to their * inner content. Their per-span class styling cannot ride valid RichText * here, so this is best-effort; the emitted block is always valid. - * Genuine inline formats (strong/em/a/br/…) are never touched. + * Genuine inline formats (strong/em/a/br/…) are kept, but arbitrary + * class/style hooks on links are moved to the block wrapper when the link is + * the sole content wrapper, or dropped when they are partial-content hooks. + * RichText's link format round-trips href/target/rel, not source CSS hooks. * * A list item whose content carries block-level children (an image/heading/ * paragraph "card", e.g. a commerce product grid) is left untouched here: @@ -1897,7 +1910,7 @@ private function hoistContentWrappingSpans(string $name, array $attrs): array } $content = (string) ($attrs['content'] ?? ''); - if ( '' === $content || ! preg_match('/unwrapElement($wrapper); } + $soleAnchor = $this->soleRichTextAnchor($body); + if ( $soleAnchor instanceof DOMElement ) { + $hoistedClasses = trim($hoistedClasses . ' ' . $this->attr($soleAnchor, 'class')); + $anchorStyle = trim($this->attr($soleAnchor, 'style')); + if ( '' !== $anchorStyle ) { + $hoistedDeclarations = array_merge($hoistedDeclarations, $this->cssDeclarations($anchorStyle)); + } + } + + foreach ( $this->richTextAnchors($body) as $anchor ) { + $anchor->removeAttribute('class'); + $anchor->removeAttribute('style'); + } + // Unwrap any remaining styling-hook spans (sibling / partial content): // best-effort, the class styling is not representable as valid RichText. foreach ( $this->stylingHookSpans($body) as $span ) { @@ -1982,6 +2009,22 @@ private function soleStylingHookSpan(DOMElement $container): ?DOMElement return $only instanceof DOMElement && $this->isStylingHookSpan($only) ? $only : null; } + private function soleRichTextAnchor(DOMElement $container): ?DOMElement + { + $only = null; + foreach ( $container->childNodes as $child ) { + if ( XML_TEXT_NODE === $child->nodeType && '' === trim($child->textContent ?? '') ) { + continue; + } + if ( null !== $only ) { + return null; + } + $only = $child; + } + + return $only instanceof DOMElement && 'a' === strtolower($only->tagName) ? $only : null; + } + /** * A `` whose only attributes are class and/or style (at least one * non-empty). These are presentational styling hooks RichText cannot store, @@ -2022,6 +2065,26 @@ private function stylingHookSpans(DOMElement $container): array return $spans; } + /** + * @return array + */ + private function richTextAnchors(DOMElement $container): array + { + $anchors = array(); + foreach ( $container->getElementsByTagName('a') as $anchor ) { + if ( $anchor instanceof DOMElement && ( $anchor->hasAttribute('class') || $anchor->hasAttribute('style') ) ) { + $anchors[] = $anchor; + } + } + + return $anchors; + } + + 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); + } + /** * Replace an element with its children in place, dropping only the wrapper. */ @@ -4372,10 +4435,13 @@ private function isPassiveSvgElement(DOMElement $element, array $allowedTags, ar private function formControls(DOMElement $form): array { $controls = array(); + $order = 0; foreach ( $this->formControlElements($form) as $control ) { $metadata = $this->formControlMetadata($control); if ( array() !== $metadata ) { + $metadata['order'] = $order; $controls[] = $metadata; + ++$order; } } @@ -4383,18 +4449,32 @@ private function formControls(DOMElement $form): array } /** - * @return array + * @return array */ private function formMetadata(DOMElement $form): array { - return array_filter( + $metadata = array_filter( array( - 'action' => $this->attr($form, 'action'), - 'method' => strtolower($this->attr($form, 'method')), - 'enctype' => $this->attr($form, 'enctype'), + 'id' => $this->attr($form, 'id'), + 'name' => $this->attr($form, 'name'), + 'class' => $this->attr($form, 'class'), + 'aria_label' => $this->attr($form, 'aria-label'), + 'action' => $this->attr($form, 'action'), + 'method' => strtolower($this->attr($form, 'method')), + 'enctype' => $this->attr($form, 'enctype'), + 'target' => $this->attr($form, 'target'), + 'autocomplete' => $this->attr($form, 'autocomplete'), ), static fn (string $value): bool => '' !== $value ); + + foreach ( array( 'novalidate' ) as $attribute ) { + if ( $form->hasAttribute($attribute) ) { + $metadata[$attribute] = true; + } + } + + return $metadata; } /** @@ -4752,6 +4832,7 @@ private function formFallbackFinding(DOMElement $element, ?array $readableFormBl 'selector' => $this->elementSelector($element), 'attributes' => $this->htmlAttributes($element), 'form' => $this->formMetadata($element), + 'success_panel' => $this->formSuccessPanelMetadata($element), 'context' => $this->sourceContext($element), 'classification' => $this->fallbackEmitter->classifyFallbackSubtree($element), 'events' => $this->eventMetadata($element), @@ -4766,6 +4847,58 @@ private function formFallbackFinding(DOMElement $element, ?array $readableFormBl ), $this->fallbackProvenance); } + /** + * @return array + */ + private function formSuccessPanelMetadata(DOMElement $form): array + { + for ( $sibling = $form->nextSibling; $sibling instanceof DOMNode; $sibling = $sibling->nextSibling ) { + if ( XML_TEXT_NODE === $sibling->nodeType && '' === trim($sibling->textContent ?? '') ) { + continue; + } + + if ( ! $sibling instanceof DOMElement ) { + return array(); + } + + if ( ! $this->hasSuccessPanelSignal($sibling) ) { + return array(); + } + + $boundedHtml = $this->boundedFallbackHtml($this->safeFallbackHtml($sibling)); + return array_filter(array( + 'selector' => $this->elementSelector($sibling), + 'id' => $this->attr($sibling, 'id'), + 'class' => $this->attr($sibling, 'class'), + 'role' => $this->attr($sibling, 'role'), + 'aria_live' => $this->attr($sibling, 'aria-live'), + 'text' => $this->normalizedSuccessPanelText($sibling), + 'html' => $boundedHtml['html'], + 'html_bytes' => $boundedHtml['bytes'], + 'html_truncated' => $boundedHtml['truncated'], + ), static fn (mixed $value): bool => is_bool($value) || is_int($value) || '' !== trim((string) $value)); + } + + return array(); + } + + private function normalizedSuccessPanelText(DOMElement $element): string + { + $html = preg_replace('/<\/?[a-z][a-z0-9]*\b[^>]*>/i', ' ', $this->innerHtml($element)) ?? $element->textContent ?? ''; + return trim(preg_replace('/\s+/', ' ', html_entity_decode(strip_tags($html), ENT_QUOTES | ENT_HTML5, 'UTF-8')) ?? ''); + } + + private function hasSuccessPanelSignal(DOMElement $element): bool + { + $role = strtolower($this->attr($element, 'role')); + if ( in_array($role, array( 'status', 'alert' ), true) ) { + return true; + } + + $tokens = strtolower(trim($this->attr($element, 'id') . ' ' . $this->attr($element, 'class') . ' ' . $this->attr($element, 'aria-live'))); + return (bool) preg_match('/(?:^|[^a-z0-9])(?:success|sent|submitted|thank|thanks|confirmation|confirmed)(?:[^a-z0-9]|$)/', $tokens); + } + /** * Whether a non-
container behaves as a form: it is the tightest * container that pairs at least one data-entry control with a submit-like @@ -5163,21 +5296,46 @@ private function formControlMetadata(DOMElement $control): array } $tagName = strtolower($control->tagName); + $type = $this->formControlType($control); $metadata = array_filter(array( 'tag' => $tagName, 'selector' => $this->elementSelector($control), + 'id' => $this->attr($control, 'id'), 'name' => $this->attr($control, 'name'), - 'type' => $this->formControlType($control), + 'type' => $type, 'label' => $this->formControlLabel($control), 'placeholder' => $this->attr($control, 'placeholder'), + 'autocomplete' => $this->attr($control, 'autocomplete'), + 'pattern' => $this->attr($control, 'pattern'), + 'min' => $this->attr($control, 'min'), + 'max' => $this->attr($control, 'max'), + 'step' => $this->attr($control, 'step'), + 'maxlength' => $this->attr($control, 'maxlength'), + 'rows' => $this->attr($control, 'rows'), ), static fn (string $value): bool => '' !== $value); + if ( in_array($type, array( 'button', 'reset', 'submit' ), true) ) { + $text = $this->formButtonText($control); + if ( '' !== $text ) { + $metadata['text'] = $text; + } + } + if ( $control->hasAttribute('required') ) { $metadata['required'] = true; } if ( $control->hasAttribute('disabled') ) { $metadata['disabled'] = true; } + if ( $control->hasAttribute('readonly') ) { + $metadata['readonly'] = true; + } + if ( $control->hasAttribute('checked') ) { + $metadata['checked'] = true; + } + if ( $control->hasAttribute('multiple') ) { + $metadata['multiple'] = true; + } $value = $this->attr($control, 'value'); if ( '' !== $value && 'select' !== $tagName ) { @@ -5253,6 +5411,10 @@ private function labelTextWithoutControls(DOMNode $node): string return $node->textContent ?? ''; } + if ( $node instanceof DOMElement && 'true' === strtolower($this->attr($node, 'aria-hidden')) ) { + return ''; + } + if ( $node instanceof DOMElement && $this->isFormControlElement($node) ) { return ''; } @@ -5265,6 +5427,23 @@ private function labelTextWithoutControls(DOMNode $node): string return $text; } + private function formButtonText(DOMElement $control): string + { + foreach ( array( 'aria-label', 'title' ) as $attribute ) { + $label = trim($this->attr($control, $attribute)); + if ( '' !== $label ) { + return $label; + } + } + + $text = trim(preg_replace('/\s+/', ' ', $control->textContent ?? '') ?? ''); + if ( '' !== $text ) { + return $text; + } + + return trim($this->attr($control, 'value')); + } + /** * @return array> */ @@ -5287,6 +5466,9 @@ private function selectOptions(DOMElement $select): array if ( $option->hasAttribute('disabled') ) { $optionMetadata['disabled'] = true; } + if ( '' === trim($this->attr($option, 'value')) && ( $option->hasAttribute('disabled') || $option->hasAttribute('selected') ) ) { + $optionMetadata['placeholder'] = true; + } $options[] = $optionMetadata; } @@ -5405,22 +5587,28 @@ private function namePriceChildren(DOMElement $element): ?array $second = $children[1]; $firstIsPrice = $this->isPriceElement($first); $secondIsPrice = $this->isPriceElement($second); - if ( $firstIsPrice === $secondIsPrice ) { - return null; + if ( $firstIsPrice !== $secondIsPrice ) { + $other = $firstIsPrice ? $second : $first; + if ( $this->isNameElement($other) || $this->hasCommerceToken($element, array( 'menu', 'product', 'pricing', 'price', 'plan', 'tier', 'dish', 'item', 'row' )) ) { + return $children; + } } - $other = $firstIsPrice ? $second : $first; - if ( ! $this->isNameElement($other) && ! $this->hasCommerceToken($element, array( 'menu', 'product', 'pricing', 'price', 'plan', 'tier', 'dish', 'item', 'row' )) ) { - return null; + if ( $this->looksLikeHoursRow($element, $first, $second) ) { + return $children; } - return $children; + if ( $this->looksLikeLabelValueRow($element, $first, $second) ) { + return $children; + } + + return null; } private function isInlineCommerceRowChild(DOMElement $element): bool { $tagName = strtolower($element->tagName); - if ( in_array($tagName, array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'a', 'span', 'strong', 'em', 'small' ), true) ) { + if ( in_array($tagName, array( 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'a', 'span', 'strong', 'em', 'small', 'time' ), true) ) { return ! $this->hasBlockContentChildren($element); } @@ -5437,6 +5625,58 @@ private function isNameElement(DOMElement $element): bool return $this->hasCommerceToken($element, array( 'name', 'title', 'product', 'dish', 'item', 'plan', 'tier' )) || preg_match('/^h[1-6]$/', strtolower($element->tagName)); } + private function looksLikeHoursRow(DOMElement $row, DOMElement $first, DOMElement $second): bool + { + if ( ! $this->hasCommerceToken($row, array( 'hours', 'hour', 'schedule', 'time', 'row' )) ) { + return false; + } + + return ( $this->isDayElement($first) && $this->isTimeValueElement($second) ) + || ( $this->isDayElement($second) && $this->isTimeValueElement($first) ); + } + + private function looksLikeLabelValueRow(DOMElement $row, DOMElement $first, DOMElement $second): bool + { + if ( ! $this->hasCommerceToken($row, array( 'row', 'item', 'pair', 'line', 'entry', 'schedule', 'session', 'meta', 'detail' )) ) { + return false; + } + + $firstIsLabel = $this->isLabelValueLabelElement($first); + $secondIsLabel = $this->isLabelValueLabelElement($second); + $firstIsValue = $this->isLabelValueValueElement($first); + $secondIsValue = $this->isLabelValueValueElement($second); + + return ( $firstIsLabel && $secondIsValue ) || ( $secondIsLabel && $firstIsValue ); + } + + private function isLabelValueLabelElement(DOMElement $element): bool + { + return $this->hasCommerceToken($element, array( 'label', 'term', 'key', 'day', 'date', 'time', 'hour', 'hours', 'duration' )) + || 'time' === strtolower($element->tagName) + || $this->looksLikeDateOrTimeText($element->textContent ?? ''); + } + + private function isLabelValueValueElement(DOMElement $element): bool + { + return $this->hasCommerceToken($element, array( 'value', 'detail', 'title', 'name', 'content', 'description', 'desc', 'meta', 'session', 'event', 'location', 'venue' )) + || preg_match('/^h[1-6]$/', strtolower($element->tagName)); + } + + private function looksLikeDateOrTimeText(string $text): bool + { + return (bool) preg_match('/\b(?:\d{1,2}(?::\d{2})?\s*(?:am|pm)?|\d{1,2}\s*(?:min|mins|minutes|hr|hrs|hours)|mon(?:day)?|tue(?:sday)?|wed(?:nesday)?|thu(?:rsday)?|fri(?:day)?|sat(?:urday)?|sun(?:day)?|day\s+\d+)\b/i', trim($text)); + } + + private function isDayElement(DOMElement $element): bool + { + return $this->hasCommerceToken($element, array( 'day', 'date', 'label' )) || (bool) preg_match('/\b(?:mon(?:day)?|tue(?:sday)?|wed(?:nesday)?|thu(?:rsday)?|fri(?:day)?|sat(?:urday)?|sun(?:day)?|weekdays?|weekends?)\b/i', $element->textContent ?? ''); + } + + private function isTimeValueElement(DOMElement $element): bool + { + return $this->hasCommerceToken($element, array( 'time', 'hours', 'value', 'closed' )) || (bool) preg_match('/\b(?:closed|open|\d{1,2}(?::\d{2})?\s*(?:am|pm)?\s*(?:[\x{2013}\x{2014}-]|to)\s*\d{1,2}(?::\d{2})?\s*(?:am|pm)?)\b/iu', $element->textContent ?? ''); + } + /** * @return array|null */ diff --git a/php-transformer/src/HtmlToBlocks/Patterns/ButtonsPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/ButtonsPattern.php index 2b2009f6..083f7fcf 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/ButtonsPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/ButtonsPattern.php @@ -54,7 +54,7 @@ public function matchButton(DOMElement $button, callable $presentationAttributes $this->buttonRuntimeAttributes($button), array( 'tagName' => 'button', - 'text' => $this->buttonText($innerHtml($button)), + 'text' => $this->buttonText($button, $innerHtml($button)), ) ), array(), $button), ), $button); @@ -96,16 +96,54 @@ public function matchContainer(DOMElement $element, callable $presentationAttrib private function buttonBlockFromAnchor(DOMElement $anchor, callable $presentationAttributes, callable $resolvedStyle, callable $innerHtml, callable $attr, callable $createBlock): array { return $createBlock('core/button', array_filter(array_merge($this->buttonPresentationAttributes($anchor, $presentationAttributes, $resolvedStyle), array( - 'text' => $this->buttonText($innerHtml($anchor)), + 'text' => $this->buttonText($anchor, $innerHtml($anchor)), 'url' => $attr($anchor, 'href'), )), static fn ($value): bool => is_array($value) ? array() !== $value : '' !== $value), array(), $anchor); } - private function buttonText(string $html): string + private function buttonText(DOMElement $element, string $html): string { + $html = preg_replace('/]*>.*?<\/svg>/is', '', $html) ?? $html; + $html = preg_replace('/]*\balt\s*=\s*(["\'])(.*?)\1[^>]*>/is', '$2', $html) ?? $html; + $html = preg_replace('/]*>/is', '', $html) ?? $html; $html = preg_replace('/<([a-z][a-z0-9]*)\b[^>]*\baria-hidden\s*=\s*(["\'])?true\2[^>]*>\s*<\/\1>/i', '', $html) ?? $html; $html = preg_replace('/<\/?(?:' . self::BLOCK_LEVEL_LABEL_TAGS . ')\b[^>]*>/i', '', $html) ?? $html; - return $this->unwrapPresentationalSpan(trim($html)); + $html = $this->unwrapPresentationalSpan(trim($html)); + if ( '' !== trim($this->plainText($html)) ) { + return $html; + } + + return $this->accessibleFallbackLabel($element); + } + + private function plainText(string $html): string + { + return trim(preg_replace('/\s+/', ' ', html_entity_decode(strip_tags($html), ENT_QUOTES | ENT_HTML5, 'UTF-8')) ?? ''); + } + + private function accessibleFallbackLabel(DOMElement $element): string + { + foreach ( array( 'aria-label', 'title' ) as $attribute ) { + $label = trim($element->hasAttribute($attribute) ? $element->getAttribute($attribute) : ''); + if ( '' !== $label ) { + return htmlspecialchars($label, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } + } + + $image = $element->getElementsByTagName('img')->item(0); + if ( $image instanceof DOMElement ) { + $alt = trim($image->hasAttribute('alt') ? $image->getAttribute('alt') : ''); + if ( '' !== $alt ) { + return htmlspecialchars($alt, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } + } + + $title = $element->getElementsByTagName('title')->item(0); + if ( $title instanceof DOMElement && '' !== trim($title->textContent ?? '') ) { + return htmlspecialchars(trim($title->textContent ?? ''), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } + + return ''; } /** @@ -191,20 +229,11 @@ private function buttonPresentationAttributes(DOMElement $element, callable $pre */ private function buttonRuntimeAttributes(DOMElement $button): array { - $attrs = array(); - foreach ( array( 'type', 'role', 'aria-label', 'aria-controls', 'aria-expanded', 'aria-haspopup' ) as $name ) { - if ( $button->hasAttribute($name) ) { - $attrs[$name] = $button->getAttribute($name); - } - } - - foreach ( $button->attributes ?? array() as $attribute ) { - if ( str_starts_with(strtolower($attribute->nodeName), 'data-') ) { - $attrs[$attribute->nodeName] = $attribute->nodeValue ?? ''; - } + if ( ! $button->hasAttribute('type') ) { + return array(); } - return $attrs; + return array( 'type' => $button->getAttribute('type') ); } private function hasOutlineSignal(DOMElement $element, string $style): bool @@ -315,10 +344,15 @@ private function isSimpleAnchor(DOMElement $anchor): bool continue; } - if ( ! in_array(strtolower($child->tagName), array( 'abbr', 'b', 'br', 'cite', 'code', 'em', 'i', 'mark', 'small', 'span', 'strong', 'sub', 'sup', 'time' ), true) ) { + $tagName = strtolower($child->tagName); + if ( ! in_array($tagName, array( 'abbr', 'b', 'br', 'cite', 'code', 'em', 'i', 'mark', 'small', 'span', 'strong', 'sub', 'sup', 'svg', 'time' ), true) ) { return false; } + if ( 'svg' === $tagName ) { + continue; + } + if ( ! $this->isSimpleAnchor($child) ) { return false; } diff --git a/php-transformer/src/HtmlToBlocks/Patterns/LogoPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/LogoPattern.php index c25b6fbe..6e760950 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/LogoPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/LogoPattern.php @@ -25,7 +25,7 @@ public function match(DOMElement $element, callable $presentationAttributes, cal return null; } - $content = 'a' === $tagName ? $outerHtml($element) : $innerHtml($element); + $content = 'a' === $tagName ? $this->anchorLogoContent($element, $innerHtml($element)) : $this->logoLabelHtml($innerHtml($element)); if ( '' === trim($content) ) { return null; } @@ -33,6 +33,119 @@ public function match(DOMElement $element, callable $presentationAttributes, cal return $createBlock('core/paragraph', array_merge($presentationAttributes($element), array( 'content' => $content )), array(), $element); } + private function anchorLogoContent(DOMElement $anchor, string $html): string + { + $label = $this->logoLabelHtml($html); + if ( '' === trim($this->plainText($label)) ) { + $label = $this->accessibleFallbackLabel($anchor); + } + + if ( '' === trim($label) ) { + return ''; + } + + $href = $this->safeNavigationUrl($anchor->hasAttribute('href') ? $anchor->getAttribute('href') : ''); + if ( '' === $href ) { + return $label; + } + + $attrs = array( 'href' => $href ); + foreach ( array( 'target', 'rel', 'title' ) as $name ) { + if ( $anchor->hasAttribute($name) && '' !== trim($anchor->getAttribute($name)) ) { + $attrs[$name] = $anchor->getAttribute($name); + } + } + + return 'htmlAttributeString($attrs) . '>' . $label . ''; + } + + private function logoLabelHtml(string $html): string + { + $html = preg_replace('/]*>.*?<\/svg>/is', '', $html) ?? $html; + $html = preg_replace('/]*\balt\s*=\s*(["\'])(.*?)\1[^>]*>/is', '$2', $html) ?? $html; + $html = preg_replace('/]*>/is', '', $html) ?? $html; + $html = preg_replace('/<([a-z][a-z0-9]*)\b[^>]*\baria-hidden\s*=\s*(["\'])?true\2[^>]*>\s*<\/\1>/i', '', $html) ?? $html; + $text = $this->plainText(preg_replace('/<\/?[a-z][a-z0-9]*\b[^>]*>/i', ' ', $html) ?? $html); + + return '' === $text ? '' : htmlspecialchars($text, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } + + private function unwrapPresentationalSpan(string $html): string + { + while ( preg_match('/^]*>(.*)<\/span>$/is', $html, $matches) === 1 && $this->spanWrapsEntireContent($matches[1]) ) { + $html = trim($matches[1]); + } + + return $html; + } + + private function spanWrapsEntireContent(string $inner): bool + { + $depth = 0; + if ( preg_match_all('/<(\/?)span\b[^>]*>/i', $inner, $matches) ) { + foreach ( $matches[1] as $slash ) { + $depth += '' === $slash ? 1 : -1; + if ( $depth < 0 ) { + return false; + } + } + } + + return 0 === $depth; + } + + private function plainText(string $html): string + { + return trim(preg_replace('/\s+/', ' ', html_entity_decode(strip_tags($html), ENT_QUOTES | ENT_HTML5, 'UTF-8')) ?? ''); + } + + private function accessibleFallbackLabel(DOMElement $element): string + { + foreach ( array( 'aria-label', 'title' ) as $attribute ) { + $label = trim($element->hasAttribute($attribute) ? $element->getAttribute($attribute) : ''); + if ( '' !== $label ) { + return htmlspecialchars($label, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } + } + + $image = $element->getElementsByTagName('img')->item(0); + if ( $image instanceof DOMElement ) { + $alt = trim($image->hasAttribute('alt') ? $image->getAttribute('alt') : ''); + if ( '' !== $alt ) { + return htmlspecialchars($alt, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } + } + + $title = $element->getElementsByTagName('title')->item(0); + if ( $title instanceof DOMElement && '' !== trim($title->textContent ?? '') ) { + return htmlspecialchars(trim($title->textContent ?? ''), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8'); + } + + return ''; + } + + private function safeNavigationUrl(string $url): string + { + $url = trim($url); + if ( '' === $url || preg_match('/[\x00-\x1f\x7f]|javascript\s*:/i', $url) ) { + return ''; + } + + return $url; + } + + /** + * @param array $attrs + */ + private function htmlAttributeString(array $attrs): string + { + $html = ''; + foreach ( $attrs as $name => $value ) { + $html .= ' ' . $name . '="' . htmlspecialchars($value, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . '"'; + } + return $html; + } + private function hasLogoSignal(DOMElement $element): bool { foreach ( array( 'class', 'id' ) as $attribute ) { diff --git a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php index c7f60938..16b0095f 100644 --- a/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php +++ b/php-transformer/src/HtmlToBlocks/Patterns/NavigationPattern.php @@ -39,7 +39,7 @@ public function match(DOMElement $element, PatternContext $context): ?array // `mobile` matches the core default: WP renders the responsive overlay // container and enqueues the `navigation/view` Interactivity module so the // hamburger menu functions on the rendered site (#native-interactivity). - return $createBlock('core/navigation', array_merge($presentationAttributes($element), array( + return $createBlock('core/navigation', array_merge($this->navigationContainerAttributes($element, $presentationAttributes), array( 'overlayMenu' => 'mobile', )), $links, $element); } @@ -251,9 +251,9 @@ private function navigationLabel(string $html): string */ private function navigationItemAttributes(DOMElement $item, DOMElement $anchor, ?DOMElement $submenuContainer, array $baseAttrs, callable $presentationAttributes): array { - $itemAttrs = $item->isSameNode($anchor) ? array() : $presentationAttributes($item); - $anchorAttrs = $presentationAttributes($anchor); - $submenuAttrs = $submenuContainer instanceof DOMElement ? $presentationAttributes($submenuContainer) : array(); + $itemAttrs = $item->isSameNode($anchor) ? array() : $this->withoutCoreNavigationClasses($presentationAttributes($item)); + $anchorAttrs = $this->withoutCoreNavigationClasses($presentationAttributes($anchor)); + $submenuAttrs = $submenuContainer instanceof DOMElement ? $this->withoutCoreNavigationClasses($presentationAttributes($submenuContainer)) : array(); if ( '' === (string) ($itemAttrs['className'] ?? '') && '' !== (string) ($anchorAttrs['className'] ?? '') ) { $itemAttrs['className'] = $anchorAttrs['className']; } @@ -267,6 +267,44 @@ private function navigationItemAttributes(DOMElement $item, DOMElement $anchor, )), static fn ($value): bool => '' !== $value); } + /** + * @return array + */ + private function navigationContainerAttributes(DOMElement $element, callable $presentationAttributes): array + { + return $this->withoutCoreNavigationClasses($presentationAttributes($element)); + } + + /** + * @param array $attrs + * @return array + */ + private function withoutCoreNavigationClasses(array $attrs): array + { + if ( empty($attrs['className']) || ! is_string($attrs['className']) ) { + return $attrs; + } + + $classNames = array_values(array_filter(preg_split('/\s+/', trim($attrs['className'])) ?: array(), static function (string $className): bool { + return ! in_array($className, array( + 'wp-block-navigation', + 'wp-block-navigation-item', + 'wp-block-navigation-link', + 'wp-block-navigation-submenu', + 'wp-block-navigation__container', + 'wp-block-navigation__submenu-container', + ), true); + })); + + if ( array() === $classNames ) { + unset($attrs['className']); + return $attrs; + } + + $attrs['className'] = implode(' ', $classNames); + return $attrs; + } + private function attr(DOMElement $element, string $name): string { return $element->hasAttribute($name) ? $element->getAttribute($name) : ''; @@ -310,7 +348,7 @@ private function submenuContainers(DOMElement $element, DOMElement $primaryAncho } $tagName = strtolower($child->tagName); - if ( in_array($tagName, array( 'ul', 'ol' ), true) || $this->hasSubmenuSignal($child) ) { + if ( in_array($tagName, array( 'nav', 'ul', 'ol' ), true) || $this->hasSubmenuSignal($child) ) { $containers[] = $child; } } @@ -543,7 +581,10 @@ private function hasNavigationSignal(DOMElement $element): bool foreach ( array( 'class', 'id' ) as $attribute ) { $value = $element->hasAttribute($attribute) ? $element->getAttribute($attribute) : ''; foreach ( preg_split('/[^a-z0-9]+/', strtolower($value)) ?: array() as $token ) { - if ( in_array($token, array( 'nav', 'navbar', 'navigation', 'menu', 'links' ), true) ) { + if ( in_array($token, array( 'nav', 'navbar', 'navigation', 'menu' ), true) ) { + return true; + } + if ( 'links' === $token && ! $this->isContactLinkCluster($element) ) { return true; } } @@ -552,6 +593,24 @@ private function hasNavigationSignal(DOMElement $element): bool return false; } + private function isContactLinkCluster(DOMElement $element): bool + { + $anchors = array(); + $this->collectAnchorsExcluding($element, $anchors, array()); + if ( array() === $anchors ) { + return false; + } + + foreach ( $anchors as $anchor ) { + $href = strtolower(trim($anchor->hasAttribute('href') ? $anchor->getAttribute('href') : '')); + if ( ! preg_match('/^(?:tel|mailto|sms):/', $href) ) { + return false; + } + } + + return true; + } + private function hasDirectListNavigationSignal(DOMElement $element): bool { foreach ( $element->childNodes as $child ) { diff --git a/php-transformer/src/HtmlToBlocks/Style/StyleAttributeMapper.php b/php-transformer/src/HtmlToBlocks/Style/StyleAttributeMapper.php index 1d0c56f7..7efaa4a2 100644 --- a/php-transformer/src/HtmlToBlocks/Style/StyleAttributeMapper.php +++ b/php-transformer/src/HtmlToBlocks/Style/StyleAttributeMapper.php @@ -53,7 +53,7 @@ final class StyleAttributeMapper * Map resolved CSS declarations to canonical block style attributes. * * @param array $declarations - * @return array{style: array, leftover: array} + * @return array{style: array, attrs: array, leftover: array} */ public function map(array $declarations): array { @@ -74,7 +74,8 @@ public function map(array $declarations): array $style['typography'] = $typography; } - $color = $this->color($normalized, $consumed); + $attrs = array(); + $color = $this->color($normalized, $consumed, $attrs); if ( array() !== $color ) { $style['color'] = $color; } @@ -92,6 +93,11 @@ public function map(array $declarations): array $style['spacing'] = $spacing; } + $blockGap = $this->blockGap($normalized, $consumed); + if ( '' !== $blockGap ) { + $style['spacing']['blockGap'] = $blockGap; + } + $border = $this->border($normalized, $consumed); if ( array() !== $border ) { $style['border'] = $border; @@ -107,6 +113,7 @@ public function map(array $declarations): array return array( 'style' => $style, + 'attrs' => $attrs, 'leftover' => $leftover, ); } @@ -167,6 +174,10 @@ public function serialize(array $style): array } } } + $blockGap = trim((string) ($spacing['blockGap'] ?? '')); + if ( '' !== $blockGap ) { + $declarations[] = 'gap:' . $blockGap; + } $typography = is_array($style['typography'] ?? null) ? $style['typography'] : array(); $typographyMap = array( @@ -225,7 +236,7 @@ private function typography(array $declarations, array &$consumed): array * @param array $consumed * @return array */ - private function color(array $declarations, array &$consumed): array + private function color(array $declarations, array &$consumed, array &$attrs): array { $color = array(); @@ -233,14 +244,24 @@ private function color(array $declarations, array &$consumed): array $consumed['color'] = true; $text = $this->cssColor($declarations['color']); if ( '' !== $text ) { - $color['text'] = $text; + $preset = $this->presetColorSlug($text); + if ( '' !== $preset ) { + $attrs['textColor'] = $preset; + } else { + $color['text'] = $text; + } } } $gradient = $this->gradient($declarations, $consumed); $background = $this->backgroundColor($declarations, $consumed); if ( '' !== $background ) { - $color['background'] = $background; + $preset = $this->presetColorSlug($background); + if ( '' !== $preset ) { + $attrs['backgroundColor'] = $preset; + } else { + $color['background'] = $background; + } } if ( '' !== $gradient ) { $color['gradient'] = $gradient; @@ -249,6 +270,40 @@ private function color(array $declarations, array &$consumed): array return $color; } + /** + * Gutenberg stores preset colors as top-level block attrs, not custom inline + * style values. Accept both serialized support syntax and CSS custom props. + */ + private function presetColorSlug(string $value): string + { + $value = trim($value); + if ( preg_match('/^var:preset\|color\|([a-z0-9_-]+)$/i', $value, $match) ) { + return strtolower($match[1]); + } + if ( preg_match('/^var\(\s*--wp--preset--color--([a-z0-9_-]+)\s*\)$/i', $value, $match) ) { + return strtolower($match[1]); + } + + return ''; + } + + /** + * @param array $declarations + * @param array $consumed + */ + private function blockGap(array $declarations, array &$consumed): string + { + foreach ( array( 'gap', 'row-gap', 'column-gap' ) as $name ) { + $value = trim((string) ($declarations[ $name ] ?? '')); + if ( '' !== $value ) { + $consumed[ $name ] = true; + return $value; + } + } + + return ''; + } + /** * @param array $declarations * @param array $consumed diff --git a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php index 91fc0583..0bd446b3 100644 --- a/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php +++ b/php-transformer/src/HtmlToBlocks/Style/StyleResolutionTrait.php @@ -48,12 +48,12 @@ private function presentationAttributes(DOMElement $element): array $declarations = $this->stripFrozenHiddenState($element, $this->cssDeclarations($style)); $mapped = $this->styleAttributeMapper()->map($declarations); - return array_filter(array( + return array_filter(array_merge($mapped['attrs'] ?? array(), array( 'anchor' => $this->safeAnchor($this->attr($element, 'id')), 'className' => $this->promotedClassName($this->attr($element, 'class')), 'style' => $mapped['style'], 'layout' => $this->layoutAttribute($element, $this->cssDeclarationString($declarations)), - ), static fn ($value): bool => is_array($value) ? array() !== $value : '' !== trim((string) $value)); + )), static fn ($value): bool => is_array($value) ? array() !== $value : '' !== trim((string) $value)); } /** @@ -420,20 +420,28 @@ private function layoutAttribute(DOMElement $element, string $mergedStyle = ''): } $inlineStyle = strtolower($this->attr($element, 'style')); + $mergedDeclarations = $this->cssDeclarations($mergedStyle); + $inlineDeclarations = $this->cssDeclarations($inlineStyle); if ( preg_match('/(?:^|;)\s*display\s*:\s*(inline-)?flex\b/', $inlineStyle) ) { + $layout = array( 'type' => 'flex' ); // flex-direction: column / column-reverse is a vertical main axis. A // core/group flex layout defaults to a horizontal Row, so the // orientation must be made explicit or the children render // side-by-side instead of stacked. Row / row-reverse / default flex // keeps the implicit horizontal orientation. if ( preg_match('/(?:^|;)\s*flex-direction\s*:\s*column(?:-reverse)?\b/', $inlineStyle) ) { - return array( - 'type' => 'flex', - 'orientation' => 'vertical', - ); + $layout['orientation'] = 'vertical'; + } + $justifyContent = $this->layoutJustifyContent((string) ($inlineDeclarations['justify-content'] ?? $mergedDeclarations['justify-content'] ?? '')); + if ( '' !== $justifyContent ) { + $layout['justifyContent'] = $justifyContent; + } + $flexWrap = $this->layoutFlexWrap((string) ($inlineDeclarations['flex-wrap'] ?? $mergedDeclarations['flex-wrap'] ?? '')); + if ( '' !== $flexWrap ) { + $layout['flexWrap'] = $flexWrap; } - return array( 'type' => 'flex' ); + return $layout; } $style = strtolower('' !== trim($mergedStyle) ? $mergedStyle : $this->attr($element, 'style')); if ( preg_match('/(?:^|;)\s*display\s*:\s*(inline-)?flex\b/', $style) @@ -470,6 +478,29 @@ private function layoutAttribute(DOMElement $element, string $mergedStyle = ''): return array(); } + private function layoutJustifyContent(string $value): string + { + $value = strtolower(trim($value)); + $map = array( + 'flex-start' => 'left', + 'start' => 'left', + 'left' => 'left', + 'center' => 'center', + 'flex-end' => 'right', + 'end' => 'right', + 'right' => 'right', + 'space-between' => 'space-between', + ); + + return $map[ $value ] ?? ''; + } + + private function layoutFlexWrap(string $value): string + { + $value = strtolower(trim($value)); + return in_array($value, array( 'wrap', 'nowrap' ), true) ? $value : ''; + } + /** * Unambiguous grid class tokens: a bare `grid`, a numbered `grid-N`, or any * `*-grid` / `*_grid` suffix (footer-grid, card-grid, mission-grid, …) plus diff --git a/php-transformer/src/HtmlToBlocks/TypographyParityAnalyzer.php b/php-transformer/src/HtmlToBlocks/TypographyParityAnalyzer.php index f9ce2f5d..c8e6d23c 100644 --- a/php-transformer/src/HtmlToBlocks/TypographyParityAnalyzer.php +++ b/php-transformer/src/HtmlToBlocks/TypographyParityAnalyzer.php @@ -63,8 +63,9 @@ public function findings(string $html, string $css, array $inlineHeadingDeclarat ); } + $typographyCss = $this->planBuilder->resolveCssVariables(trim($this->styleBlockCss($html) . "\n" . $css)); $headingDeclarations = array_merge( - $this->headingFamiliesFromCss($this->styleBlockCss($html)), + $this->headingFamiliesFromCss($typographyCss), $this->normalizeInlineHeadingDeclarations($inlineHeadingDeclarations) ); diff --git a/php-transformer/src/StaticSite/FontMaterialization/FontMaterializationPlanBuilder.php b/php-transformer/src/StaticSite/FontMaterialization/FontMaterializationPlanBuilder.php index 8a0ba9e0..503115be 100644 --- a/php-transformer/src/StaticSite/FontMaterialization/FontMaterializationPlanBuilder.php +++ b/php-transformer/src/StaticSite/FontMaterialization/FontMaterializationPlanBuilder.php @@ -304,7 +304,7 @@ private function primaryFamily(string $declaration): string * passes resolve variables whose values reference other variables. Leaves * unresolved references intact so they can be filtered as invalid families. */ - private function resolveCssVariables(string $css): string + public function resolveCssVariables(string $css): string { if ( '' === trim($css) || ! str_contains($css, 'var(') ) { return $css; diff --git a/php-transformer/tests/contract/run.php b/php-transformer/tests/contract/run.php index 81ab0f75..2e7c20f8 100644 --- a/php-transformer/tests/contract/run.php +++ b/php-transformer/tests/contract/run.php @@ -560,10 +560,42 @@ public function match(DOMElement $element, PatternContext $context): ?array $linkedLogoSerialized = (string) ($linkedLogoResult['serialized_blocks'] ?? ''); $assert('core/paragraph' === ($linkedLogoBlock['blockName'] ?? ''), 'linked logo text converts to a paragraph block'); $assert(! array_key_exists('content', is_array($linkedLogoBlock['attrs'] ?? null) ? $linkedLogoBlock['attrs'] : array()), 'paragraph source content is not serialized as a block comment attribute'); -$assert(str_contains($linkedLogoSerialized, ''), 'linked logo paragraph preserves anchor markup in saved HTML'); +$assert(str_contains($linkedLogoSerialized, ''), 'linked logo paragraph hoists link styling hooks to the paragraph wrapper and keeps valid anchor markup'); +$assert(! str_contains($linkedLogoSerialized, '
' +)->toArray(); +$paragraphSvgBlock = $paragraphSvgResult['blocks'][0] ?? array(); +$paragraphSvgSerialized = (string) ($paragraphSvgResult['serialized_blocks'] ?? ''); +$assert('core/html' === ($paragraphSvgBlock['blockName'] ?? ''), 'paragraph content with inline SVG falls back to core/html instead of invalid RichText'); +$assert(str_contains($paragraphSvgSerialized, '.*/s', $paragraphSvgSerialized), 'paragraph inline SVG is not stored inside core/paragraph RichText'); + +$coffeeHtml = (string) file_get_contents(dirname(__DIR__, 3) . '/fixtures/websites/2-onepager-coffee/index.html'); +$coffeeResult = ( new HtmlTransformer() )->transform($coffeeHtml, array())->toArray(); +$coffeeSerialized = (string) ($coffeeResult['serialized_blocks'] ?? ''); +$coffeeRiskCount = 0; +if ( preg_match_all('/(.*?)/s', $coffeeSerialized, $coffeeBlocks, PREG_SET_ORDER) ) { + foreach ( $coffeeBlocks as $coffeeBlock ) { + if ( preg_match('/<(?:span|a)\b[^>]*(?:class|style)=| 'core/button', @@ -787,6 +819,21 @@ public function match(DOMElement $element, PatternContext $context): ?array $assert(5 === ($dropdownHeaderBlockMenu['item_count'] ?? null), 'dropdown header nav counts parent and submenu items consistently'); $assert('Day Hike' === ($dropdownHeaderBlockMenu['items'][2]['label'] ?? ''), 'dropdown header nav preserves submenu item labels'); +$nestedNavMenu = ( new HtmlTransformer() )->transform( + '' +)->toArray(); +$nestedNavMenuSerialized = (string) ($nestedNavMenu['serialized_blocks'] ?? ''); +$nestedNavMenuParity = $nestedNavMenu['source_reports']['semantic_parity'] ?? array(); +$nestedNavMenuBlock = $nestedNavMenuParity['navigation_menus']['blocks'][0] ?? array(); +$assert('pass' === ($nestedNavMenu['source_reports']['wp_block_validity']['status'] ?? ''), 'nested nav/menu serializes to valid WordPress navigation blocks'); +$assert(str_contains($nestedNavMenuSerialized, '" }, + { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "contains", "value": "shift-card" }, { "path": "serialized_blocks", "assert": "contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "
" }, 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 8f3f65e0..d8870d26 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": "not_contains", "value": "Monday\n" } + ] +} diff --git a/php-transformer/tests/fixtures/parity/html-button-custom-filled-cta-style.json b/php-transformer/tests/fixtures/parity/html-button-custom-filled-cta-style.json index 5c4af969..7a461dd3 100644 --- a/php-transformer/tests/fixtures/parity/html-button-custom-filled-cta-style.json +++ b/php-transformer/tests/fixtures/parity/html-button-custom-filled-cta-style.json @@ -24,7 +24,7 @@ { "path": "status", "assert": "equals", "value": "success" }, { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "contains", "value": "class=\"wp-block-button__link has-text-color has-background has-border-color wp-element-button\"" }, - { "path": "serialized_blocks", "assert": "contains", "value": "style=\"color:#fff;background-color:#135e96;border-color:#135e96;border-width:2px;border-style:solid;border-radius:999px;padding-top:14px;padding-right:28px;padding-bottom:14px;padding-left:28px;font-weight:700;text-transform:uppercase\"" }, + { "path": "serialized_blocks", "assert": "contains", "value": "style=\"border-color:#135e96;border-style:solid;border-width:2px;border-radius:999px;color:#fff;background-color:#135e96;padding-top:14px;padding-right:28px;padding-bottom:14px;padding-left:28px;font-weight:700;text-transform:uppercase\"" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "background-color:#f7f7f7" } ] } diff --git a/php-transformer/tests/fixtures/parity/html-button-decorative-svg-label-valid.json b/php-transformer/tests/fixtures/parity/html-button-decorative-svg-label-valid.json new file mode 100644 index 00000000..6ca5a927 --- /dev/null +++ b/php-transformer/tests/fixtures/parity/html-button-decorative-svg-label-valid.json @@ -0,0 +1,31 @@ +{ + "schema": "blocks-engine/php-transformer/parity-fixture/v1", + "name": "html-button-decorative-svg-label-valid", + "description": "Converts button-like anchors with decorative inline SVG icons into valid native button RichText labels.", + "source_reference": { + "repo": "php-transformer", + "path": "tests/fixtures/parity/html-button-decorative-svg-label-valid.json", + "notes": "Generic coverage for CTA labels that include decorative SVG icons." + }, + "legacy_comparison": { + "skip": true, + "reason": "New generic RichText-safe label extraction behavior has no legacy equivalent." + }, + "operation": "html_transformer.transform", + "input": { + "content": "Call now" + }, + "expected_blocks": [ + { "path": "blocks.0", "name": "core/buttons" }, + { "path": "blocks.0.innerBlocks.0", "name": "core/button", "attrs": { "className": "cta-phone", "text": "Call now", "url": "tel:+16165550182" } } + ], + "expected_fallbacks": [], + "expect": [ + { "path": "status", "assert": "equals", "value": "success" }, + { "path": "serialized_blocks", "assert": "contains", "value": "href=\"tel:+16165550182\"" }, + { "path": "serialized_blocks", "assert": "contains", "value": ">Call now" }, + { "path": "serialized_blocks", "assert": "not_contains", "value": "" }, { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "contains", "value": "class=\"wp-block-button__link wp-element-button\"" }, - { "path": "serialized_blocks", "assert": "contains", "value": "style=\"color:#ffffff;background-color:#0a66c2;border-radius:6px;padding-top:12px;padding-right:24px;padding-bottom:12px;padding-left:24px\"" }, + { "path": "serialized_blocks", "assert": "contains", "value": "style=\"border-radius:6px;color:#ffffff;background-color:#0a66c2;padding-top:12px;padding-right:24px;padding-bottom:12px;padding-left:24px\"" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "wp:paragraph" } ] } diff --git a/php-transformer/tests/fixtures/parity/html-button-outline-ghost-cta-style.json b/php-transformer/tests/fixtures/parity/html-button-outline-ghost-cta-style.json index 14dfed72..c98b061c 100644 --- a/php-transformer/tests/fixtures/parity/html-button-outline-ghost-cta-style.json +++ b/php-transformer/tests/fixtures/parity/html-button-outline-ghost-cta-style.json @@ -24,6 +24,6 @@ { "path": "status", "assert": "equals", "value": "success" }, { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "contains", "value": "class=\"wp-block-button__link has-text-color has-background has-border-color wp-element-button\"" }, - { "path": "serialized_blocks", "assert": "contains", "value": "style=\"color:#135e96;background-color:transparent;border-color:currentColor;border-width:2px;border-style:solid;border-radius:8px;padding-top:12px;padding-right:24px;padding-bottom:12px;padding-left:24px;font-weight:600;text-transform:none\"" } + { "path": "serialized_blocks", "assert": "contains", "value": "style=\"border-color:currentColor;border-style:solid;border-width:2px;border-radius:8px;color:#135e96;background-color:transparent;padding-top:12px;padding-right:24px;padding-bottom:12px;padding-left:24px;font-weight:600;text-transform:none\"" } ] } diff --git a/php-transformer/tests/fixtures/parity/html-button-runtime-attrs-omitted-from-native-button.json b/php-transformer/tests/fixtures/parity/html-button-runtime-attrs-omitted-from-native-button.json new file mode 100644 index 00000000..fc78e8e3 --- /dev/null +++ b/php-transformer/tests/fixtures/parity/html-button-runtime-attrs-omitted-from-native-button.json @@ -0,0 +1,39 @@ +{ + "schema": "blocks-engine/php-transformer/parity-fixture/v1", + "name": "html-button-runtime-attrs-omitted-from-native-button", + "description": "Converts runtime-styled source buttons to valid native core/button markup without serializing unsupported data-* or ARIA attrs.", + "source_reference": { + "repo": "php-transformer", + "path": "tests/fixtures/parity/html-button-runtime-attrs-omitted-from-native-button.json", + "notes": "Generic coverage for donation/quantity/toggle controls whose source behavior depends on data-* or ARIA attributes that core/button does not save." + }, + "legacy_comparison": { + "skip": true, + "reason": "New generic block-validity behavior has no legacy equivalent." + }, + "operation": "html_transformer.transform", + "input": { + "content": "" + }, + "expected_blocks": [ + { "path": "blocks.0", "name": "core/buttons" }, + { "path": "blocks.0.innerBlocks.0", "name": "core/button", "attrs": { "className": "amount-btn", "tagName": "button", "type": "button", "text": "$15" } } + ], + "expected_fallbacks": [ + { + "pattern_family": "interactive_control", + "diagnostic_code": "interactive_control_behavior_lost", + "severity": "warning", + "controlled_target": "#donation-form" + } + ], + "expect": [ + { "path": "status", "assert": "equals", "value": "success" }, + { "path": "serialized_blocks", "assert": "contains", "value": "" }, + { "path": "serialized_blocks", "assert": "not_contains", "value": "data-amount" }, + { "path": "serialized_blocks", "assert": "not_contains", "value": "aria-label" }, + { "path": "serialized_blocks", "assert": "not_contains", "value": "aria-controls" }, + { "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": "
" } ] diff --git a/php-transformer/tests/fixtures/parity/html-complex-brand-container.json b/php-transformer/tests/fixtures/parity/html-complex-brand-container.json index e27e1133..6b82a373 100644 --- a/php-transformer/tests/fixtures/parity/html-complex-brand-container.json +++ b/php-transformer/tests/fixtures/parity/html-complex-brand-container.json @@ -22,7 +22,7 @@ { "path": "blocks.0.innerBlocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "className": "tagline", "content": "Dinner plans for busy families." } }, { "path": "blocks.0.innerBlocks.0.innerBlocks.2", "name": "core/html" }, { "path": "blocks.0.innerBlocks.0.innerBlocks.3", "name": "core/paragraph", "attrs": { "className": "success", "content": "You are in." } }, - { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "className": "brand", "content": "SimpleMark" } } + { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "className": "brand", "content": "Simple Mark" } } ], "expected_fallbacks": [ { "type": "html", "reason": "form_requires_runtime", "diagnostic_code": "html_form_fallback" } diff --git a/php-transformer/tests/fixtures/parity/html-contact-links-not-navigation.json b/php-transformer/tests/fixtures/parity/html-contact-links-not-navigation.json new file mode 100644 index 00000000..b8f4f2e7 --- /dev/null +++ b/php-transformer/tests/fixtures/parity/html-contact-links-not-navigation.json @@ -0,0 +1,32 @@ +{ + "schema": "blocks-engine/php-transformer/parity-fixture/v1", + "name": "html-contact-links-not-navigation", + "description": "Keeps tel/mail contact link clusters as content instead of site navigation.", + "source_reference": { + "repo": "php-transformer", + "path": "tests/fixtures/parity/html-contact-links-not-navigation.json", + "notes": "Generic contact details coverage for local-business imports." + }, + "legacy_comparison": { + "skip": true, + "reason": "This upstream primitive fixture has no downstream legacy comparison." + }, + "operation": "html_transformer.transform", + "input": { + "content": "
(503) 841-7220hello@example.com
" + }, + "expected_blocks": [ + { "path": "blocks.0", "name": "core/buttons", "attrs": { "className": "visit-links" } }, + { "path": "blocks.0.innerBlocks.0", "name": "core/button", "attrs": { "text": "(503) 841-7220", "url": "tel:+15038417220" } }, + { "path": "blocks.0.innerBlocks.1", "name": "core/button", "attrs": { "text": "hello@example.com", "url": "mailto:hello@example.com" } } + ], + "expected_fallbacks": [], + "expect": [ + { "path": "status", "assert": "equals", "value": "success" }, + { "path": "serialized_blocks", "assert": "not_contains", "value": "" }, + { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "contains", "value": "\"className\":\"reveal reveal-delay-1\"" }, { "path": "serialized_blocks", "assert": "contains", "value": "" } ] diff --git a/php-transformer/tests/fixtures/parity/html-form-fallback-enriched-metadata.json b/php-transformer/tests/fixtures/parity/html-form-fallback-enriched-metadata.json new file mode 100644 index 00000000..d1ff8ec4 --- /dev/null +++ b/php-transformer/tests/fixtures/parity/html-form-fallback-enriched-metadata.json @@ -0,0 +1,47 @@ +{ + "schema": "blocks-engine/php-transformer/parity-fixture/v1", + "name": "html-form-fallback-enriched-metadata", + "description": "Reports provider-neutral form metadata needed by downstream materializers without changing preserved form HTML output.", + "source_reference": { + "repo": "php-transformer", + "path": "tests/fixtures/parity/html-form-fallback-enriched-metadata.json", + "notes": "Generic contract coverage for form identity, control order/defaults, submit labels, and adjacent success panels." + }, + "legacy_comparison": { + "skip": true, + "reason": "New metadata-only form materialization contract has no legacy equivalent." + }, + "operation": "html_transformer.transform", + "input": { + "content": "

Registration received

Check your email for next steps.

" + }, + "expected_fallbacks": [ + { "type": "html", "reason": "form_requires_runtime", "diagnostic_code": "html_form_fallback" } + ], + "expect": [ + { "path": "status", "assert": "equals", "value": "success" }, + { "path": "fallbacks", "assert": "count", "count": 1 }, + { "path": "fallbacks.0.form.id", "assert": "equals", "value": "registration" }, + { "path": "fallbacks.0.form.class", "assert": "equals", "value": "event-form" }, + { "path": "fallbacks.0.form.action", "assert": "equals", "value": "#" }, + { "path": "fallbacks.0.form.method", "assert": "equals", "value": "post" }, + { "path": "fallbacks.0.form.aria_label", "assert": "equals", "value": "Conference registration form" }, + { "path": "fallbacks.0.form.novalidate", "assert": "equals", "value": true }, + { "path": "fallbacks.0.control_count", "assert": "equals", "value": 3 }, + { "path": "fallbacks.0.controls.0.order", "assert": "equals", "value": 0 }, + { "path": "fallbacks.0.controls.0.tag", "assert": "equals", "value": "select" }, + { "path": "fallbacks.0.controls.0.label", "assert": "equals", "value": "Ticket Type" }, + { "path": "fallbacks.0.controls.0.required", "assert": "equals", "value": true }, + { "path": "fallbacks.0.controls.0.options.0.placeholder", "assert": "equals", "value": true }, + { "path": "fallbacks.0.controls.0.options.1.value", "assert": "equals", "value": "standard" }, + { "path": "fallbacks.0.controls.1.type", "assert": "equals", "value": "checkbox" }, + { "path": "fallbacks.0.controls.1.checked", "assert": "equals", "value": true }, + { "path": "fallbacks.0.controls.2.type", "assert": "equals", "value": "submit" }, + { "path": "fallbacks.0.controls.2.text", "assert": "equals", "value": "Continue to Payment" }, + { "path": "fallbacks.0.success_panel.id", "assert": "equals", "value": "form-success" }, + { "path": "fallbacks.0.success_panel.role", "assert": "equals", "value": "status" }, + { "path": "fallbacks.0.success_panel.aria_live", "assert": "equals", "value": "polite" }, + { "path": "fallbacks.0.success_panel.text", "assert": "equals", "value": "Registration received Check your email for next steps." }, + { "path": "serialized_blocks", "assert": "contains", "value": "
" }, + { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "id=\"foo\" class=\"wp-block-group grid-3 custom-x\" id=" }, { "path": "fallbacks", "assert": "count", "count": 0 } ] diff --git a/php-transformer/tests/fixtures/parity/html-icon-only-button-accessible-label.json b/php-transformer/tests/fixtures/parity/html-icon-only-button-accessible-label.json new file mode 100644 index 00000000..df46006c --- /dev/null +++ b/php-transformer/tests/fixtures/parity/html-icon-only-button-accessible-label.json @@ -0,0 +1,30 @@ +{ + "schema": "blocks-engine/php-transformer/parity-fixture/v1", + "name": "html-icon-only-button-accessible-label", + "description": "Uses an accessible label for icon-only button-like anchors after stripping decorative SVG markup.", + "source_reference": { + "repo": "php-transformer", + "path": "tests/fixtures/parity/html-icon-only-button-accessible-label.json", + "notes": "Generic coverage for accessible icon-only CTA controls." + }, + "legacy_comparison": { + "skip": true, + "reason": "New generic RichText-safe label extraction behavior has no legacy equivalent." + }, + "operation": "html_transformer.transform", + "input": { + "content": "" + }, + "expected_blocks": [ + { "path": "blocks.0", "name": "core/buttons" }, + { "path": "blocks.0.innerBlocks.0", "name": "core/button", "attrs": { "className": "icon-button", "text": "Email us", "url": "mailto:hello@example.com" } } + ], + "expected_fallbacks": [], + "expect": [ + { "path": "status", "assert": "equals", "value": "success" }, + { "path": "serialized_blocks", "assert": "contains", "value": ">Email us" }, + { "path": "serialized_blocks", "assert": "not_contains", "value": "412 Coalyard Lane Pearl District
Portland, OR" } }, { "path": "blocks.0.innerBlocks.2", "name": "core/buttons" } ], diff --git a/php-transformer/tests/fixtures/parity/html-logo-nav-button-classification.json b/php-transformer/tests/fixtures/parity/html-logo-nav-button-classification.json index 558cbf04..8ab1bd0c 100644 --- a/php-transformer/tests/fixtures/parity/html-logo-nav-button-classification.json +++ b/php-transformer/tests/fixtures/parity/html-logo-nav-button-classification.json @@ -17,7 +17,7 @@ }, "expected_blocks": [ { "path": "blocks.0", "name": "core/group", "attrs": { "className": "site-header" } }, - { "path": "blocks.0.innerBlocks.0", "name": "core/paragraph" }, + { "path": "blocks.0.innerBlocks.0", "name": "core/paragraph", "attrs": { "className": "site-logo" } }, { "path": "blocks.0.innerBlocks.1", "name": "core/navigation", "attrs": { "className": "primary-nav" } }, { "path": "blocks.0.innerBlocks.1.innerBlocks.0", "name": "core/navigation-link", "attrs": { "url": "/docs", "kind": "custom" } }, { "path": "blocks.0.innerBlocks.1.innerBlocks.1", "name": "core/navigation-link", "attrs": { "url": "/pricing", "kind": "custom" } }, @@ -38,7 +38,8 @@ { "path": "blocks", "assert": "count", "count": 4 }, { "path": "blocks.0.innerBlocks", "assert": "count", "count": 2 }, { "path": "serialized_blocks", "assert": "contains", "value": "site-logo" }, - { "path": "serialized_blocks", "assert": "contains", "value": "Acme" }, + { "path": "serialized_blocks", "assert": "not_contains", "value": "
" + "content": "
" }, "expected_blocks": [ { "path": "blocks.0", "name": "core/group", "attrs": { "tagName": "main" } }, @@ -29,15 +29,23 @@ { "path": "blocks", "assert": "count", "count": 1 }, { "path": "fallbacks", "assert": "count", "count": 2 }, { "path": "fallbacks.0.diagnostic_code", "assert": "equals", "value": "html_form_fallback" }, + { "path": "fallbacks.0.form.id", "assert": "equals", "value": "contact-form" }, + { "path": "fallbacks.0.form.aria_label", "assert": "equals", "value": "Contact form" }, + { "path": "fallbacks.0.form.novalidate", "assert": "equals", "value": true }, { "path": "fallbacks.0.form.action", "assert": "equals", "value": "/contact" }, { "path": "fallbacks.0.control_count", "assert": "equals", "value": 4 }, { "path": "fallbacks.0.controls.0.name", "assert": "equals", "value": "name" }, + { "path": "fallbacks.0.controls.0.order", "assert": "equals", "value": 0 }, + { "path": "fallbacks.0.controls.0.label", "assert": "equals", "value": "Name" }, + { "path": "fallbacks.0.controls.0.autocomplete", "assert": "equals", "value": "name" }, + { "path": "fallbacks.0.controls.0.maxlength", "assert": "equals", "value": "80" }, { "path": "fallbacks.0.controls.0.required", "assert": "equals", "value": true }, { "path": "fallbacks.0.controls.2.tag", "assert": "equals", "value": "textarea" }, + { "path": "fallbacks.0.controls.3.text", "assert": "equals", "value": "Send" }, { "path": "fallbacks.1.diagnostic_code", "assert": "equals", "value": "html_form_fallback" }, { "path": "fallbacks.1.form.action", "assert": "equals", "value": "/newsletter" }, { "path": "fallbacks.1.control_count", "assert": "equals", "value": 2 }, - { "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": "" }, 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 new file mode 100644 index 00000000..16760a94 --- /dev/null +++ b/php-transformer/tests/fixtures/parity/html-schedule-label-value-rows.json @@ -0,0 +1,36 @@ +{ + "schema": "blocks-engine/php-transformer/parity-fixture/v1", + "name": "html-schedule-label-value-rows", + "description": "Preserves schedule/session label-value rows as editable columns instead of flattening time and title text.", + "source_reference": { + "repo": "php-transformer", + "path": "tests/fixtures/parity/html-schedule-label-value-rows.json", + "notes": "Generic event/session row coverage for static site imports." + }, + "legacy_comparison": { + "skip": true, + "reason": "New generic label-value row behavior has no legacy equivalent." + }, + "operation": "html_transformer.transform", + "input": { + "content": "
Opening keynote
LocationMain Hall
" + }, + "expected_blocks": [ + { "path": "blocks.0", "name": "core/group", "attrs": { "className": "schedule-list" } }, + { "path": "blocks.0.innerBlocks.0", "name": "core/columns", "attrs": { "className": "session-row" } }, + { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/column", "attrs": { "className": "session-time" } }, + { "path": "blocks.0.innerBlocks.0.innerBlocks.1", "name": "core/column", "attrs": { "className": "session-title" } }, + { "path": "blocks.0.innerBlocks.1", "name": "core/columns", "attrs": { "className": "detail-pair" } } + ], + "expected_fallbacks": [], + "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": "not_contains", "value": "10:00 AM\n" }, + { "path": "fallbacks", "assert": "count", "count": 0 } + ] +} diff --git a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json index 644e40a6..4b3e6947 100644 --- a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json +++ b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg-address.json @@ -17,7 +17,7 @@ }, "expected_blocks": [ { "path": "blocks.0", "name": "core/group" }, - { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "illustration-frame", "layout": { "type": "flex" } } }, + { "path": "blocks.0.innerBlocks.0", "name": "core/group", "attrs": { "className": "illustration-frame", "layout": { "type": "flex", "justifyContent": "center" } } }, { "path": "blocks.0.innerBlocks.0.innerBlocks.0", "name": "core/html" }, { "path": "blocks.0.innerBlocks.1", "name": "core/paragraph", "attrs": { "className": "contact-card", "content": "214 Maple Street
Benton Harbor, MI
(269) 555-0193" } } ], diff --git a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json index 835c6800..cc8bcab3 100644 --- a/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json +++ b/php-transformer/tests/fixtures/parity/html-single-child-flex-svg.json @@ -16,7 +16,7 @@ "content": "
GIRTH
" }, "expected_blocks": [ - { "path": "blocks.0", "name": "core/group", "attrs": { "layout": { "type": "flex" } } }, + { "path": "blocks.0", "name": "core/group", "attrs": { "layout": { "type": "flex", "justifyContent": "center" } } }, { "path": "blocks.0.innerBlocks.0", "name": "core/html" } ], "expected_fallbacks": [], diff --git a/php-transformer/tests/fixtures/parity/html-source-styled-button-preserves-style.json b/php-transformer/tests/fixtures/parity/html-source-styled-button-preserves-style.json index 7ec12374..ae021683 100644 --- a/php-transformer/tests/fixtures/parity/html-source-styled-button-preserves-style.json +++ b/php-transformer/tests/fixtures/parity/html-source-styled-button-preserves-style.json @@ -24,7 +24,7 @@ { "path": "status", "assert": "equals", "value": "success" }, { "path": "serialized_blocks", "assert": "contains", "value": "
" }, { "path": "serialized_blocks", "assert": "contains", "value": "class=\"wp-block-button__link has-text-color has-background wp-element-button\"" }, - { "path": "serialized_blocks", "assert": "contains", "value": "style=\"color:#f9fafb;background-color:#111827;border-radius:6px;padding-top:10px;padding-right:20px;padding-bottom:10px;padding-left:20px;font-weight:800;text-transform:uppercase\"" }, + { "path": "serialized_blocks", "assert": "contains", "value": "style=\"border-radius:6px;color:#f9fafb;background-color:#111827;padding-top:10px;padding-right:20px;padding-bottom:10px;padding-left:20px;font-weight:800;text-transform:uppercase\"" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "background-color:#f7f7f7" }, { "path": "serialized_blocks", "assert": "not_contains", "value": "border-width" } ] diff --git a/php-transformer/tests/fixtures/parity/html-vertical-flex-column-becomes-group.json b/php-transformer/tests/fixtures/parity/html-vertical-flex-column-becomes-group.json index bb0c8352..5d65a8d5 100644 --- a/php-transformer/tests/fixtures/parity/html-vertical-flex-column-becomes-group.json +++ b/php-transformer/tests/fixtures/parity/html-vertical-flex-column-becomes-group.json @@ -28,6 +28,7 @@ { "path": "blocks", "assert": "count", "count": 1 }, { "path": "blocks.0.innerBlocks", "assert": "count", "count": 4 }, { "path": "serialized_blocks", "assert": "contains", "value": "