html-validate
diff --git a/‎src/dom/selector/condition.ts
Lines changed: 4 additions & 3 deletions b/‎src/dom/selector/condition.ts
Lines changed: 4 additions & 3 deletions
diff --git a/‎src/dom/selector/selector.spec.ts
Lines changed: 39 additions & 0 deletions b/‎src/dom/selector/selector.spec.ts
Lines changed: 39 additions & 0 deletions
@@ -59,15 +59,15 @@ export class IdCondition extends Condition {
  */
 export class AttributeCondition extends Condition {
 	private readonly key: string;
-	private readonly op: string;
-	private readonly value: string;
+	private readonly op: string | undefined;
+	private readonly value: string | undefined;
 
 	public constructor(attr: string) {
 		super();
 		const [, key, op, value] = /^(.+?)(?:([~^$*|]?=)"([^"]+?)")?$/.exec(attr)!; // eslint-disable-line @typescript-eslint/no-non-null-assertion -- will always match
 		this.key = key;
 		this.op = op;
-		this.value = value;
+		this.value = typeof value === "string" ? stripslashes(value) : value;
 	}
 
 	public match(node: HtmlElement): boolean {
@@ -77,6 +77,7 @@ export class AttributeCondition extends Condition {
 				case undefined:
 					return true; /* attribute exists */
 				case "=":
+					/* eslint-disable-next-line sonarjs/different-types-comparison -- false positive */
 					return cur.value === this.value;
 				default:
 					throw new Error(`Attribute selector operator ${this.op} is not implemented yet`);
 
@@ -174,6 +174,12 @@ describe("generateIdSelector()", () => {
 		const id = "foo,bar";
 		expect(generateIdSelector(id)).toBe("#foo\\,bar");
 	});
+
+	it("should handle leading digits and comma", () => {
+		expect.assertions(1);
+		const id = "1foo,bar";
+		expect(generateIdSelector(id)).toBe('[id="1foo\\,bar"]');
+	});
 });
 
 describe("Selector", () => {
@@ -318,6 +324,39 @@ describe("Selector", () => {
 		expect(fetch(selector.match(document))).toEqual([expect.objectContaining({ tagName: "div" })]);
 	});
 
+	it("should match id with leading number", async () => {
+		expect.assertions(2);
+		const resolvedConfig = await Config.empty().resolve();
+		const parser = new Parser(resolvedConfig);
+		const document = parser.parseHtml(`<div id="1foo"></div>`);
+		const text = generateIdSelector("1foo");
+		const selector = new Selector(text);
+		expect(text).toBe('[id="1foo"]');
+		expect(fetch(selector.match(document))).toEqual([expect.objectContaining({ tagName: "div" })]);
+	});
+
+	it("should match id with comma", async () => {
+		expect.assertions(2);
+		const resolvedConfig = await Config.empty().resolve();
+		const parser = new Parser(resolvedConfig);
+		const document = parser.parseHtml(`<div id="foo,bar"></div>`);
+		const text = generateIdSelector("foo,bar");
+		const selector = new Selector(text);
+		expect(text).toBe("#foo\\,bar");
+		expect(fetch(selector.match(document))).toEqual([expect.objectContaining({ tagName: "div" })]);
+	});
+
+	it("should match id with leading number and comma", async () => {
+		expect.assertions(2);
+		const resolvedConfig = await Config.empty().resolve();
+		const parser = new Parser(resolvedConfig);
+		const document = parser.parseHtml(`<div id="1foo,bar"></div>`);
+		const text = generateIdSelector("1foo,bar");
+		const selector = new Selector(text);
+		expect(text).toBe('[id="1foo\\,bar"]');
+		expect(fetch(selector.match(document))).toEqual([expect.objectContaining({ tagName: "div" })]);
+	});
+
 	it("should match having attribute ([wilma])", () => {
 		expect.assertions(1);
 		const selector = new Selector("[wilma]");