Skip to content

fix(id): escape values assigned through the value setter #326

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
greymoth-jp wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(id): escape values assigned through the value setter #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 9 additions & 0 deletions src/__tests__/id.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,15 @@ test("id selector", "#one", (t, tree) => {
t.deepEqual(tree.nodes[0].nodes[0].type, "id");
});

test("ID#set value", "#fo\\o", (t, selectors) => {
let id = selectors.first.first;
t.deepEqual(id.raws, { value: "fo\\o" });
id.value = "bar";
t.deepEqual(id.raws, {});
id.value = "foo.bar";
t.deepEqual(id.raws, { value: "foo\\.bar" });
});

test("id selector with universal", "*#z98y ", (t, tree) => {
t.deepEqual(tree.nodes[0].nodes[0].value, "*");
t.deepEqual(tree.nodes[0].nodes[0].type, "universal");
Expand Down
20 changes: 20 additions & 0 deletions src/selectors/id.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,30 @@
import cssesc from "cssesc";
import { ensureObject } from "../util";
import Node from "./node";
import { ID as IDType } from "./types";

export default class ID extends Node {
constructor(opts) {
super(opts);
this.type = IDType;
this._constructed = true;
}

set value(v) {
if (this._constructed) {
let escaped = cssesc(v, { isIdentifier: true });
if (escaped !== v) {
ensureObject(this, "raws");
this.raws.value = escaped;
} else if (this.raws) {
delete this.raws.value;
}
}
this._value = v;
}

get value() {
return this._value;
}

valueToString() {
Expand Down