minor fixes and code cleanup

src/jinja.ts

@@ -23,8 +23,7 @@ export type Delimiter = "" | "-" | "+";
 export interface Statement extends Node {
 	type: "statement";
 	keyword: Keyword;
-	startDelimiter: Delimiter;
+	delimiter: Delimiter;
-	endDelimiter: Delimiter;
 }
 
 export interface Block extends Node {

src/parser.ts

@@ -32,103 +32,82 @@ export const parse: Parser<Node>["parse"] = (text) => {
 
 	let match;
 	let i = 0;
-	while ((match = root.content.slice(i).match(regex)) !== null) {
+	while ((match = text.slice(i).match(regex)) !== null) {
 		if (!match.groups || match.index === undefined) {
 			continue;
 		}
+		const matchLength = match[0].length;
+
+		// skip script and style blocks
 		if (match.groups.scriptBlock || match.groups.styleBlock) {
-			i += match.index + match[0].length;
+			i += match.index + matchLength;
 			continue;
 		}
 
 		const pre = match.groups.pre || "";
 		const newline = !!match.groups.newline;
 
-		const node = match.groups.node;
+		const matchText = match.groups.node;
 		const expression = match.groups.expression;
 		const statement = match.groups.statement;
 		const ignoreBlock = match.groups.ignoreBlock;
 		const comment = match.groups.comment;
 
-		if (!node && !expression && !statement && !ignoreBlock && !comment) {
+		if (!matchText && !expression && !statement && !ignoreBlock && !comment) {
 			continue;
 		}
-		const matchText = node;
+		const placeholder = generatePlaceholder();
+
+		const node = {
+			id: placeholder,
+			ownLine: newline,
+			originalText: matchText,
+			index: match.index + i + pre.length,
+			length: matchText.length,
+			nodes: root.nodes,
+		};
 
 		if (ignoreBlock || comment) {
-			const placeholder = generatePlaceholder();
 			root.content = root.content.replace(matchText, placeholder);
-
+			root.nodes[node.id] = {
-			root.nodes[placeholder] = {
+				...node,
-				id: placeholder,
 				type: "ignore",
 				content: ignoreBlock || comment,
-				ownLine: newline,
+			};
-				originalText: matchText,
-				index: match.index + i + pre.length,
-				length: matchText.length,
-				nodes: root.nodes,
-			} as IgnoreBlock;
-			i += match.index;
 		}
 
 		if (expression) {
-			const placeholder = generatePlaceholder();
 			root.content = root.content.replace(matchText, placeholder);
-
+			root.nodes[node.id] = {
-			root.nodes[placeholder] = {
+				...node,
-				id: placeholder,
 				type: "expression",
 				content: expression,
-				ownLine: newline,
+			};
-				originalText: matchText,
-				index: match.index + i + pre.length,
-				length: matchText.length,
-				nodes: root.nodes,
-			} as Expression;
-
-			i += match.index;
 		}
 
 		if (statement) {
 			const keyword = match.groups.keyword as Keyword;
-			const startDelimiter = match.groups.startDelimiter as Delimiter;
+			const delimiter = (match.groups.startDelimiter ||
-			const endDelimiter = match.groups.endDelimiter as Delimiter;
+				match.groups.endDelimiter) as Delimiter;
 
 			if (nonClosingStatements.includes(keyword)) {
-				const placeholder = generatePlaceholder();
 				root.content = root.content.replace(matchText, placeholder);
-				root.nodes[placeholder] = {
+				root.nodes[node.id] = {
-					id: placeholder,
+					...node,
 					type: "statement",
 					content: statement,
-					ownLine: newline,
-					originalText: matchText,
-					index: match.index + i + pre.length,
-					length: matchText.length,
 					keyword,
-					startDelimiter,
+					delimiter,
-					endDelimiter,
-					nodes: root.nodes,
 				} as Statement;
-
-				i += match.index;
 			} else if (!keyword.startsWith("end")) {
-				statementStack.push({
+				root.nodes[node.id] = {
-					id: generatePlaceholder(),
+					...node,
-					type: "statement" as const,
+					type: "statement",
 					content: statement,
-					ownLine: newline,
-					originalText: matchText,
-					index: match.index + i + pre.length,
-					length: matchText.length,
 					keyword,
-					startDelimiter,
+					delimiter,
-					endDelimiter,
+				} as Statement;
-					nodes: root.nodes,
+				statementStack.push(root.nodes[placeholder] as Statement);
-				});
-
-				i += match.index + matchText.length;
 			} else {
 				let start: Statement | undefined;
 				while (!start) {
@@ -143,6 +122,7 @@ export const parse: Parser<Node>["parse"] = (text) => {
 					const startKeyword = keyword.replace("end", "");
 					if (startKeyword !== start.keyword) {
 						if (start.keyword === "set") {
+							root.content = root.content.replace(start.originalText, start.id);
 							start = undefined;
 							continue;
 						}
@@ -154,58 +134,48 @@ export const parse: Parser<Node>["parse"] = (text) => {
 				}
 
 				const end = {
-					id: generatePlaceholder(),
+					...node,
-					type: "statement" as const,
+					type: "statement",
 					content: statement,
-					ownLine: newline,
-					originalText: matchText,
-					index: match.index + i + pre.length,
-					length: matchText.length,
 					keyword,
-					startDelimiter,
+					delimiter,
-					endDelimiter,
+				} as Statement;
-					nodes: root.nodes,
+				root.nodes[end.id] = end;
-				};
 
-				const placeholder = generatePlaceholder();
+				const blockText = root.content.slice(
-				const content = root.content.slice(
+					root.content.indexOf(start.originalText),
-					start.index + start.length,
+					root.content.indexOf(end.originalText) + end.length
-					end.index
 				);
 
-				root.nodes[placeholder] = {
+				const block = {
-					id: placeholder,
+					id: generatePlaceholder(),
 					type: "block",
 					start: start,
 					end: end,
-					content,
+					content: blockText.slice(start.length, blockText.length - end.length),
 					ownLine: newline,
-					originalText: matchText,
+					originalText: text.slice(start.index, end.index + end.length),
 					index: start.index,
 					length: end.index + end.length - start.index,
 					nodes: root.nodes,
 				} as Block;
+				root.nodes[block.id] = block;
 
-				root.nodes[start.id] = start;
+				root.content = root.content.replace(blockText, block.id);
-				root.nodes[end.id] = end;
-
-				root.content =
-					root.content.slice(0, start.index) +
-					placeholder +
-					root.content.slice(end.index + end.length, root.content.length);
-
-				i = start.index + placeholder.length;
 			}
 		}
+
+		i += match.index + matchLength;
 	}
 
-	const remainingStatement = statementStack.find(
+	for (const stmt of statementStack) {
-		(stmt) => stmt.keyword !== "set"
+		if (stmt.keyword === "set") {
-	);
+			root.content = root.content.replace(stmt.originalText, stmt.id);
-	if (remainingStatement) {
+		} else {
-		throw new Error(
+			throw new Error(
-			`No closing statement found for opening statement "${remainingStatement.content}".`
+				`No closing statement found for opening statement "${stmt.content}".`
-		);
+			);
+		}
 	}
 
 	return root;

src/printer.ts

@@ -38,15 +38,7 @@ const printExpression = (node: Expression): builders.Doc => {
 
 const printStatement = (node: Statement): builders.Doc => {
 	const statemnt = builders.group(
-		[
+		["{%", node.delimiter, " ", node.content, " ", node.delimiter, "%}"],
-			"{%",
-			node.startDelimiter,
-			" ",
-			node.content,
-			" ",
-			node.endDelimiter,
-			"%}",
-		],
 		{ shouldBreak: node.ownLine }
 	);
 
@@ -99,6 +91,7 @@ export const embed: Printer<Node>["embed"] = (
 				([start, end]) => currentDoc.slice(start, end + 1) in node.nodes
 			);
 			if (!idxs.length) {
+				ignoreDoc = false;
 				return currentDoc;
 			}
 

test/cases/statement_set/input.html

@@ -6,7 +6,7 @@
 {% endfor %}
 </head>
 <body>
-{% set navigation = [('index.html', 'Index'), ('about.html', 'About')] %}
+{%set navigation = [('index.html', 'Index'), ('about.html', 'About')]  %}
 {% set navigation %}
 <li><a href="/">Index</a></li>
 <li><a href="/downloads">Downloads</a></li>

test/cases/statement_whitespace/expected.html

@@ -1,5 +1,6 @@
 <ul>
+  {%+ set seq +%}
   {%- for item in seq -%}
     <li>{{ item }}</li>
-  {%- endfor %}
+  {%- endfor -%}
 </ul>

test/cases/statement_whitespace/input.html

@@ -1,4 +1,5 @@
 <ul>
+{%  set seq +%}
 {%-for item in seq   -%}
 <li>{{    item}}</li>
 {%- endfor%}