Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/__tests__/attributes.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,8 @@ test("extraneous non-combinating whitespace", " [href] , [class] ", (t, tr
test("newline in attribute selector", '[class="woop \\\nwoop woop"]', (t, tree) => {
t.deepEqual(tree.nodes[0].nodes[0].attribute, "class");
t.deepEqual(tree.nodes[0].nodes[0].operator, "=");
t.deepEqual(tree.nodes[0].nodes[0].value, "woop \nwoop woop");
// CSS string continuations do not contribute a character to the value.
t.deepEqual(tree.nodes[0].nodes[0].value, "woop woop woop");
t.true(tree.nodes[0].nodes[0].quoted);
});

Expand Down
30 changes: 30 additions & 0 deletions src/__tests__/escapes.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,33 @@ for (const [value, expected] of [
t.is(tree.first.first.value, expected);
});
}

for (const quoteMark of ['"', "'"]) {
for (const newline of ["\n", "\r\n", "\r", "\f"]) {
const value = `a\\${newline}b`;
const selector = `[title=${quoteMark}${value}${quoteMark}]`;
test(
`quoted line continuation ${JSON.stringify(quoteMark)} ${JSON.stringify(newline)}`,
selector,
(t, tree) => {
const attribute = tree.first.first;
t.is(attribute.value, "ab");
t.is(attribute.raws.value, `${quoteMark}${value}${quoteMark}`);
t.is(attribute.getQuotedValue(), `${quoteMark}ab${quoteMark}`);
attribute.setValue(attribute.value);
t.is(tree.toString(), `[title=${quoteMark}ab${quoteMark}]`);
},
);
}
}

for (const [value, expected] of [
[`a${"\\".repeat(3)}\nb`, "a\\b"],
["a\\\tb", "a\tb"],
["a\\ b", "a b"],
["a\\a b", "a\nb"],
]) {
test(`quoted continuation boundary ${JSON.stringify(value)}`, `[x="${value}"]`, (t, tree) => {
t.is(tree.first.first.value, expected);
});
}
2 changes: 1 addition & 1 deletion src/selectors/attribute.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export function unescapeValue(value) {
quoteMark = m[1];
unescaped = m[2];
}
unescaped = unesc(unescaped);
unescaped = unesc(unescaped, quoteMark !== null);
if (unescaped !== value) {
deprecatedUsage = true;
}
Expand Down
8 changes: 7 additions & 1 deletion src/util/unesc.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function gobbleHex(str) {

const CONTAINS_ESCAPE = /\\/;

export default function unesc(str) {
export default function unesc(str, inString = false) {
let needToProcess = CONTAINS_ESCAPE.test(str);
if (!needToProcess) {
return str;
Expand All @@ -53,6 +53,12 @@ export default function unesc(str) {

for (let i = 0; i < str.length; i++) {
if (str[i] === "\\") {
const next = str[i + 1];
if (inString && (next === "\n" || next === "\r" || next === "\f")) {
// CSS string continuations contribute no character; CRLF is one newline.
i += next === "\r" && str[i + 2] === "\n" ? 2 : 1;
continue;
}
const gobbled = gobbleHex(str.slice(i + 1, i + 9));
if (gobbled !== undefined) {
ret += gobbled[0];
Expand Down