fix: add rawTagName #269 #270

taoqf · taoqf · commit 9ac642d7b6a9 · 2024-03-29T09:08:53.000+08:00
diff --git a/src/nodes/comment.ts b/src/nodes/comment.ts
@@ -4,9 +4,9 @@ import NodeType from './type';
 
 export default class CommentNode extends Node {
 	public clone(): CommentNode {
-		return new CommentNode(this.rawText, null);
+		return new CommentNode(this.rawText, null, undefined, this.rawTagName);
 	}
-	public constructor(public rawText: string, parentNode = null as HTMLElement | null, range?: [number, number]) {
+	public constructor(public rawText: string, parentNode = null as HTMLElement | null, range?: [number, number], public rawTagName = '!--') {
 		super(parentNode, range);
 	}
 
diff --git a/src/nodes/node.ts b/src/nodes/node.ts
@@ -6,6 +6,7 @@ import HTMLElement from './html';
  * Node Class as base class for TextNode and HTMLElement.
  */
 export default abstract class Node {
+	abstract rawTagName: string;
 	abstract nodeType: NodeType;
 	public childNodes = [] as Node[];
 	public range: readonly [number, number];
diff --git a/src/nodes/text.ts b/src/nodes/text.ts
@@ -21,6 +21,7 @@ export default class TextNode extends Node {
 	 * @type {Number}
 	 */
 	public nodeType = NodeType.TEXT_NODE;
+	public rawTagName = '';
 
 	private _rawText: string;
 	private _trimmedRawText?: string;
diff --git a/test/tests/issues/269-270.js b/test/tests/issues/269-270.js
@@ -0,0 +1,25 @@
+const { parse } = require('@test/test-target');
+
+describe('issue 269 270', function () {
+	it('node.rawTagName', function () {
+		const root = parse('<div><!--this is comment here -->foo</div>', { comment: true });
+		const div = root.childNodes[0];
+		div.rawTagName.should.eql('div');
+		div.childNodes.length.should.eql(2);
+		const comment = div.childNodes[0];
+		comment.rawTagName.should.eql('!--');
+		const text = div.childNodes[1];
+		text.rawTagName.should.eql('');
+	});
+	it('querySelector for comment nodes', function () {
+		const root = parse(`<html>
+  <body>
+    <h1>TEST</h1>
+    <!-- Some comment here. -->
+  </body>
+</html>`, { comment: true });
+		const div = root.childNodes[0];
+		const comment = div.querySelector('!--');
+		comment.text.should.eql(' Some comment here. ');
+	});
+});

Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ import NodeType from './type';`
`4`	`4`
`5`	`5`	`export default class CommentNode extends Node {`
`6`	`6`	`public clone(): CommentNode {`
`7`		`- return new CommentNode(this.rawText, null);`
	`7`	`+ return new CommentNode(this.rawText, null, undefined, this.rawTagName);`
`8`	`8`	`}`
`9`		`- public constructor(public rawText: string, parentNode = null as HTMLElement \| null, range?: [number, number]) {`
	`9`	`+ public constructor(public rawText: string, parentNode = null as HTMLElement \| null, range?: [number, number], public rawTagName = '!--') {`
`10`	`10`	`super(parentNode, range);`
`11`	`11`	`}`
`12`	`12`