Merge branch 'main' of github.com:taoqf/node-html-parser

taoqf · Feb 21, 2023 · 0d4f6bf · 0d4f6bf
2 parents c6c2c58 + 34d2551
commit 0d4f6bf
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/nodes/html.ts b/src/nodes/html.ts
@@ -690,13 +690,13 @@ export default class HTMLElement extends Node {
 		}
 		const attrs = {} as RawAttributes;
 		if (this.rawAttrs) {
-			const re = /([a-zA-Z()[\]#@$.?][a-zA-Z0-9-_:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
+			const re = /([a-zA-Z()[\]#@$.?:][a-zA-Z0-9-_:()[\]#]*)(?:\s*=\s*((?:'[^']*')|(?:"[^"]*")|\S+))?/g;
 			let match: RegExpExecArray;
 			while ((match = re.exec(this.rawAttrs))) {
 				const key = match[1];
 				let val = match[2] || null;
 				if (val && (val[0] === `'` || val[0] === `"`)) val = val.slice(1, val.length - 1);
-				attrs[key] = val;
+				attrs[key] = attrs[key] || val;
 			}
 		}
 		this._rawAttrs = attrs;

diff --git a/test/tests/html.js b/test/tests/html.js
@@ -333,6 +333,11 @@ describe('HTML Parser', function () {
 				root.firstChild.getAttribute('a').should.eql('a1b');
 			});
 
+			it('should return value of the first attribute', function () {
+				const root = parseHTML('<p a="a1b" a="fail"></p>');
+				root.firstChild.getAttribute('a').should.eql('a1b');
+			});
+
 			it('should return null when there is no such attribute', function () {
 				const root = parseHTML('<p></p>');
 				should.equal(root.firstChild.getAttribute('b'), null);