Skip to content

Commit 4790da5

Browse files
committed
Fix indent
1 parent 01fb608 commit 4790da5

File tree

2 files changed

+25
-22
lines changed

2 files changed

+25
-22
lines changed

src/Parser.ts

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import {
22
DefaultTreeCommentNode,
33
DefaultTreeDocument,
4+
DefaultTreeDocumentType,
45
DefaultTreeElement,
56
DefaultTreeNode,
67
DefaultTreeTextNode,
@@ -73,36 +74,32 @@ class Parser {
7374
return;
7475
}
7576

76-
for (const treeNode of tree) {
77-
const node = treeNode as DefaultTreeElement;
78-
79-
const pugNode = this.parseHtmlNode(node, indentLevel);
77+
for (const treeNode of tree as DefaultTreeElement[]) {
78+
const pugNode = this.parseHtmlNode(treeNode, indentLevel);
8079
if (pugNode) {
8180
this.pug += `\n${pugNode.toString()}`;
8281
}
8382

8483
if (
85-
Array.isArray(node.childNodes) &&
86-
node.childNodes.length &&
87-
!hasOnlyTextChildNode(node)
84+
Array.isArray(treeNode.childNodes) &&
85+
treeNode.childNodes.length &&
86+
!hasOnlyTextChildNode(treeNode)
8887
) {
89-
yield* this.walk(node.childNodes, indentLevel + 1);
88+
yield* this.walk(treeNode.childNodes, indentLevel + 1);
9089
}
9190
}
9291
}
92+
9393
/**
9494
* Creates a [PugNode] from a #documentType element.
9595
*
9696
* @param indentLevel
9797
*/
98-
private createDoctypeNode = (indentLevel: number): PugNode =>
99-
new PugNode(
100-
Nodes.Doctype,
101-
'doctype html',
102-
indentLevel,
103-
this.tabs,
104-
this.commas,
105-
);
98+
private createDoctypeNode = (
99+
node: DefaultTreeDocumentType,
100+
indentLevel: number,
101+
): PugNode =>
102+
new PugNode(Nodes.Doctype, node.name, indentLevel, this.tabs, this.commas);
106103

107104
/**
108105
* Creates a [PugNode] from a #comment element.
@@ -142,6 +139,7 @@ class Parser {
142139
* Converts an HTML element into a [PugNode].
143140
*
144141
* @param node
142+
* @param indentLevel
145143
*/
146144
private createElementNode(
147145
node: DefaultTreeElement,
@@ -178,7 +176,10 @@ class Parser {
178176
): PugNode | void {
179177
switch (node.nodeName) {
180178
case Nodes.Doctype:
181-
return this.createDoctypeNode(indentLevel);
179+
return this.createDoctypeNode(
180+
node as DefaultTreeDocumentType,
181+
indentLevel,
182+
);
182183
case Nodes.Comment:
183184
return this.createCommentNode(
184185
node as DefaultTreeCommentNode,

src/PugNode.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,12 @@ class PugNode {
2828
this.name = name;
2929
this.value = value;
3030
this.indentLevel = indentLevel;
31-
if (tabs) { this.tabs = tabs; }
32-
if (commas) { this.commas = commas; }
31+
if (tabs) {
32+
this.tabs = tabs;
33+
}
34+
if (commas) {
35+
this.commas = commas;
36+
}
3337
}
3438

3539
/**
@@ -105,9 +109,7 @@ class PugNode {
105109
const hasClassOrId = this.attributes.some((attr: Attribute) =>
106110
['class', 'id'].includes(attr.name),
107111
);
108-
if (hasClassOrId) {
109-
return '';
110-
}
112+
return hasClassOrId ? '' : this.name;
111113
}
112114
default:
113115
return this.name;

0 commit comments

Comments
 (0)