@markuplint/pug-parser 3.9.1 → 3.11.0

package/lib/parse.js

@@ -127,12 +127,9 @@ class Parser {
                     offsetLine: originNode.line - 1,
                     offsetColumn: originNode.column - 1,
                 });
-                const nodes = htmlDoc.nodeList;
-                for (const node of nodes) {
-                    if (!node.parentNode) {
-                        node.parentNode = parentNode;
-                    }
-                }
+                const nodes = htmlDoc.nodeList.filter(node => {
+                    return node.parentNode == null && node.type !== 'endtag';
+                });
                 return nodes;
             }
             case 'Comment': {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/pug-parser",
-	"version": "3.9.1",
+	"version": "3.11.0",
 	"description": "Pug parser for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -16,12 +16,12 @@
 		"clean": "tsc --build --clean"
 	},
 	"dependencies": {
-		"@markuplint/html-parser": "3.10.1",
+		"@markuplint/html-parser": "3.12.0",
 		"@markuplint/ml-ast": "3.2.0",
-		"@markuplint/parser-utils": "3.10.1",
+		"@markuplint/parser-utils": "3.12.0",
 		"pug-lexer": "^5.0.1",
 		"pug-parser": "^6.0.0",
 		"tslib": "^2.6.2"
 	},
-	"gitHead": "09100b8baa14dd930602daa458197322197c79c2"
+	"gitHead": "e2adbe92c74631af9c98cb816286287f9f983053"
 }

package/test/index.spec.js

@@ -554,3 +554,32 @@ html
 		expect(doc.nodeList[2].namespace).toBe('http://www.w3.org/2000/svg');
 	});
 });
+
+describe('Issues', () => {
+	test('#1221', () => {
+		const doc = parse('html: p <span>text</span>');
+		const map = nodeListToDebugMaps(doc.nodeList);
+		expect(map).toStrictEqual([
+			'[1:1]>[1:5](0,4)html: html',
+			'[1:7]>[1:8](6,7)p: p',
+			'[1:9]>[1:15](8,14)span: <span>',
+			'[1:15]>[1:19](14,18)#text: text',
+			'[1:19]>[1:26](18,25)span: </span>',
+		]);
+
+		const html = doc.nodeList[0];
+		const p = doc.nodeList[1];
+		const span = doc.nodeList[2];
+		const text = doc.nodeList[3];
+		const spanClose = doc.nodeList[4];
+
+		expect(html.uuid).toBe(p.parentNode.uuid);
+		expect(html.childNodes.length).toBe(1);
+		expect(p.uuid).toBe(html.childNodes[0].uuid);
+		expect(p.childNodes.length).toBe(1);
+		expect(span.uuid).toBe(p.childNodes[0].uuid);
+		expect(span.childNodes.length).toBe(1);
+		expect(text.uuid).toBe(span.childNodes[0].uuid);
+		expect(spanClose.uuid).toBe(span.pearNode.uuid);
+	});
+});