always add raw property to text nodes

Author: Rich-Harris

src/parse/state/tag.ts

@@ -476,35 +476,28 @@ function read_sequence(parser: Parser, done: () => boolean): Node[] {
 		start: parser.index,
 		end: null,
 		type: 'Text',
-		data: '',
+		raw: '',
+		data: null
 	};
 
+	function flush() {
+		if (current_chunk.raw) {
+			current_chunk.data = decode_character_references(current_chunk.raw);
+			current_chunk.end = parser.index;
+			chunks.push(current_chunk);
+		}
+	}
+
 	const chunks: Node[] = [];
 
 	while (parser.index < parser.template.length) {
 		const index = parser.index;
 
 		if (done()) {
-			current_chunk.end = parser.index;
-
-			if (current_chunk.data) chunks.push(current_chunk);
-
-			chunks.forEach(chunk => {
-				if (chunk.type === 'Text') {
-					let decoded = decode_character_references(chunk.data);
-					if (chunk.data != decoded) {
-						chunk.raw = chunk.data;
-						chunk.data = decoded;
-					}
-				}
-			});
-
+			flush();
 			return chunks;
 		} else if (parser.eat('{')) {
-			if (current_chunk.data) {
-				current_chunk.end = index;
-				chunks.push(current_chunk);
-			}
+			flush();
 
 			parser.allow_whitespace();
 			const expression = read_expression(parser);
@@ -522,10 +515,11 @@ function read_sequence(parser: Parser, done: () => boolean): Node[] {
 				start: parser.index,
 				end: null,
 				type: 'Text',
-				data: '',
+				raw: '',
+				data: null
 			};
 		} else {
-			current_chunk.data += parser.template[parser.index++];
+			current_chunk.raw += parser.template[parser.index++];
 		}
 	}
 

src/parse/state/text.ts

@@ -18,11 +18,9 @@ export default function text(parser: Parser) {
 		start,
 		end: parser.index,
 		type: 'Text',
+		raw: data,
 		data: decode_character_references(data),
 	};
 
-	if (node.data != data)
-		node.raw = data;
-
 	parser.current().children.push(node);
 }

test/parser/samples/action-with-call/output.json

@@ -41,8 +41,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }

test/parser/samples/action-with-identifier/output.json

@@ -27,8 +27,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }

test/parser/samples/action-with-literal/output.json

@@ -28,8 +28,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }

test/parser/samples/action/output.json

@@ -22,8 +22,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }

test/parser/samples/animation/output.json

@@ -35,6 +35,7 @@
 								"start": 51,
 								"end": 56,
 								"type": "Text",
+								"raw": "flips",
 								"data": "flips"
 							}
 						]
@@ -54,8 +55,5 @@
 				}
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }

test/parser/samples/attribute-containing-solidus/output.json

@@ -20,6 +20,7 @@
 								"start": 8,
 								"end": 30,
 								"type": "Text",
+								"raw": "https://www.google.com",
 								"data": "https://www.google.com"
 							}
 						]
@@ -30,13 +31,11 @@
 						"start": 31,
 						"end": 37,
 						"type": "Text",
+						"raw": "Google",
 						"data": "Google"
 					}
 				]
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }

test/parser/samples/attribute-dynamic-boolean/output.json

@@ -33,8 +33,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }

test/parser/samples/attribute-dynamic-reserved/output.json

@@ -33,8 +33,5 @@
 				"children": []
 			}
 		]
-	},
-	"css": null,
-	"instance": null,
-	"module": null
+	}
 }