Lint and format src/compiler/compile/render_ssr/handlers/utils/remove_whitespace_children.js

pull/8569/head
Simon Holthausen 3 years ago
parent e6b61ce981
commit c33b34fa62

@ -11,58 +11,55 @@ import { regex_starts_with_whitespace } from '../../../../utils/patterns';
* @returns {INode[]}
*/
export default function remove_whitespace_children(children, next) {
/** @type {INode[]} */
const nodes = [];
/** @type {INode[]} */
const nodes = [];
/** @type {import('../../../nodes/interfaces.js').INode} */
let last_child;
let i = children.length;
while (i--) {
const child = children[i];
if (child.type === 'Text') {
if (child.should_skip()) {
continue;
}
let { data } = child;
if (nodes.length === 0) {
const should_trim = next
? next.type === 'Text' &&
regex_starts_with_whitespace.test(next.data) &&
trimmable_at(child, next)
: !child.has_ancestor('EachBlock');
if (should_trim && !child.keep_space()) {
data = trim_end(data);
if (!data)
continue;
}
}
// glue text nodes (which could e.g. be separated by comments) together
if (last_child && last_child.type === 'Text') {
last_child.data = data + last_child.data;
continue;
}
child.data = data;
nodes.unshift(child);
link(last_child, (last_child = child));
}
else {
nodes.unshift(child);
link(last_child, (last_child = child));
}
}
const first = nodes[0];
if (first && first.type === 'Text' && !first.keep_space()) {
first.data = trim_start(first.data);
if (!first.data) {
first.var = null;
nodes.shift();
if (nodes[0]) {
nodes[0].prev = null;
}
}
}
return nodes;
/** @type {import('../../../nodes/interfaces.js').INode} */
let last_child;
let i = children.length;
while (i--) {
const child = children[i];
if (child.type === 'Text') {
if (child.should_skip()) {
continue;
}
let { data } = child;
if (nodes.length === 0) {
const should_trim = next
? next.type === 'Text' &&
regex_starts_with_whitespace.test(next.data) &&
trimmable_at(child, next)
: !child.has_ancestor('EachBlock');
if (should_trim && !child.keep_space()) {
data = trim_end(data);
if (!data) continue;
}
}
// glue text nodes (which could e.g. be separated by comments) together
if (last_child && last_child.type === 'Text') {
last_child.data = data + last_child.data;
continue;
}
child.data = data;
nodes.unshift(child);
link(last_child, (last_child = child));
} else {
nodes.unshift(child);
link(last_child, (last_child = child));
}
}
const first = nodes[0];
if (first && first.type === 'Text' && !first.keep_space()) {
first.data = trim_start(first.data);
if (!first.data) {
first.var = null;
nodes.shift();
if (nodes[0]) {
nodes[0].prev = null;
}
}
}
return nodes;
}
/**
@ -71,13 +68,11 @@ export default function remove_whitespace_children(children, next) {
* @returns {boolean}
*/
function trimmable_at(child, next_sibling) {
// Whitespace is trimmable if one of the following is true:
// The child and its sibling share a common nearest each block (not at an each block boundary)
// The next sibling's previous node is an each block
return (next_sibling.find_nearest(/EachBlock/) === child.find_nearest(/EachBlock/) ||
next_sibling.prev.type === 'EachBlock');
// Whitespace is trimmable if one of the following is true:
// The child and its sibling share a common nearest each block (not at an each block boundary)
// The next sibling's previous node is an each block
return (
next_sibling.find_nearest(/EachBlock/) === child.find_nearest(/EachBlock/) ||
next_sibling.prev.type === 'EachBlock'
);
}

Loading…
Cancel
Save