chore: simplify css pruning slightly (#14432)

pull/14442/head
Rich Harris 1 month ago committed by GitHub
parent 1912459308
commit 4f0dde5207
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

@ -944,15 +944,16 @@ function get_possible_element_siblings(node, adjacent_only) {
let prev = node; let prev = node;
while ((prev = find_previous_sibling(prev))) { while ((prev = find_previous_sibling(prev))) {
if (prev.type === 'RegularElement') { if (prev.type === 'RegularElement') {
if ( const has_slot_attribute = prev.attributes.some(
!prev.attributes.find( (attr) => attr.type === 'Attribute' && attr.name.toLowerCase() === 'slot'
(attr) => attr.type === 'Attribute' && attr.name.toLowerCase() === 'slot' );
)
) { if (!has_slot_attribute) {
result.set(prev, NODE_DEFINITELY_EXISTS); result.set(prev, NODE_DEFINITELY_EXISTS);
}
if (adjacent_only) { if (adjacent_only) {
break; return result;
}
} }
} else if (is_block(prev)) { } else if (is_block(prev)) {
const possible_last_child = get_possible_last_child(prev, adjacent_only); const possible_last_child = get_possible_last_child(prev, adjacent_only);
@ -971,27 +972,25 @@ function get_possible_element_siblings(node, adjacent_only) {
} }
} }
if (!prev || !adjacent_only) { /** @type {Compiler.SvelteNode | null} */
/** @type {Compiler.SvelteNode | null} */ let parent = node;
let parent = node;
while ( while (
// @ts-expect-error TODO // @ts-expect-error TODO
(parent = parent?.parent) && (parent = parent?.parent) &&
is_block(parent) is_block(parent)
) { ) {
const possible_siblings = get_possible_element_siblings(parent, adjacent_only); const possible_siblings = get_possible_element_siblings(parent, adjacent_only);
add_to_map(possible_siblings, result); add_to_map(possible_siblings, result);
// @ts-expect-error // @ts-expect-error
if (parent.type === 'EachBlock' && !parent.fallback?.nodes.includes(node)) { if (parent.type === 'EachBlock' && !parent.fallback?.nodes.includes(node)) {
// `{#each ...}<a /><b />{/each}` — `<b>` can be previous sibling of `<a />` // `{#each ...}<a /><b />{/each}` — `<b>` can be previous sibling of `<a />`
add_to_map(get_possible_last_child(parent, adjacent_only), result); add_to_map(get_possible_last_child(parent, adjacent_only), result);
} }
if (adjacent_only && has_definite_elements(possible_siblings)) { if (adjacent_only && has_definite_elements(possible_siblings)) {
break; break;
}
} }
} }

Loading…
Cancel
Save