Skip to content

Fix HTML entity handling in JSX transformer #1695

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 9, 2025
+15 −31
Merged

Fix HTML entity handling in JSX transformer #1695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 6 additions & 7 deletions internal/transformers/jsxtransforms/jsx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,23 +839,22 @@ func (tx *JSXTransformer) visitJsxExpression(expression *ast.JsxExpression) *ast
var htmlEntityMatcher = regexp2.MustCompile(`&((#((\d+)|x([\da-fA-F]+)))|(\w+));`, regexp2.ECMAScript)

func htmlEntityReplacer(m regexp2.Match) string {
decimal := m.GroupByNumber(3)
if decimal != nil {
decimal := m.GroupByNumber(4)
if decimal != nil && decimal.Capture.String() != "" {
parsed, err := strconv.ParseInt(decimal.Capture.String(), 10, 32)
if err == nil {
return string(rune(parsed))
}
}
hex := m.GroupByNumber(4)
if hex != nil {
hex := m.GroupByNumber(5)
if hex != nil && hex.Capture.String() != "" {
parsed, err := strconv.ParseInt(hex.Capture.String(), 16, 32)
if err == nil {
return string(rune(parsed))
}
}
word := m.GroupByNumber(5)
if word != nil {
// If this is not a valid entity, then just use `match` (replace it with itself, i.e. don't replace)
word := m.GroupByNumber(6)
if word != nil && word.Capture.String() != "" {
res, ok := entities[word.Capture.String()]
if ok {
return string(res)
Expand Down
10 changes: 5 additions & 5 deletions testdata/baselines/reference/submodule/conformance/tsxReactEmitEntities.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ declare var React: any;
<div>&#x1F408;&#x1F415;&#128007;&#128017;</div>;

//// [file.js]
React.createElement("div", null, "Dot goes here: &middot; &notAnEntity; ");
React.createElement("div", null, "Be careful of &quot;-ed strings!");
React.createElement("div", null, "{{braces&#x7d;&#x7D;");
React.createElement("div", null, "Dot goes here: \u00B7 &notAnEntity; ");
React.createElement("div", null, "Be careful of \"-ed strings!");
React.createElement("div", null, "{{braces}}");
// Escapes do nothing
React.createElement("div", null, "\\n");
// Also works in string literal attributes
React.createElement("div", { attr: "{&hellip;&#x7D;\\" });
React.createElement("div", { attr: "{\u2026}\\" });
// Does not happen for a string literal that happens to be inside an attribute (and escapes then work)
React.createElement("div", { attr: "&#0123;&hellip;&#x7D;\"" });
// Preserves single quotes
React.createElement("div", { attr: "\"" });
// https://github.com/microsoft/TypeScript/issues/35732
React.createElement("div", null, "&#x1F408;&#x1F415;\uD83D\uDC07\uD83D\uDC11");
React.createElement("div", null, "\uD83D\uDC08\uD83D\uDC15\uD83D\uDC07\uD83D\uDC11");
19 changes: 2 additions & 17 deletions testdata/baselines/reference/submodule/conformance/tsxReactEmitEntities.js.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
--- old.tsxReactEmitEntities.js
+++ new.tsxReactEmitEntities.js
@@= skipped -24, +24 lines =@@
<div>&#x1F408;&#x1F415;&#128007;&#128017;</div>;

//// [file.js]
-React.createElement("div", null, "Dot goes here: \u00B7 &notAnEntity; ");
-React.createElement("div", null, "Be careful of \"-ed strings!");
-React.createElement("div", null, "{{braces}}");
+React.createElement("div", null, "Dot goes here: &middot; &notAnEntity; ");
+React.createElement("div", null, "Be careful of &quot;-ed strings!");
+React.createElement("div", null, "{{braces&#x7d;&#x7D;");
// Escapes do nothing
React.createElement("div", null, "\\n");
// Also works in string literal attributes
-React.createElement("div", { attr: "{\u2026}\\" });
+React.createElement("div", { attr: "{&hellip;&#x7D;\\" });
@@= skipped -34, +34 lines =@@
// Does not happen for a string literal that happens to be inside an attribute (and escapes then work)
React.createElement("div", { attr: "&#0123;&hellip;&#x7D;\"" });
// Preserves single quotes
-React.createElement("div", { attr: '"' });
+React.createElement("div", { attr: "\"" });
// https://github.com/microsoft/TypeScript/issues/35732
-React.createElement("div", null, "\uD83D\uDC08\uD83D\uDC15\uD83D\uDC07\uD83D\uDC11");
+React.createElement("div", null, "&#x1F408;&#x1F415;\uD83D\uDC07\uD83D\uDC11");
React.createElement("div", null, "\uD83D\uDC08\uD83D\uDC15\uD83D\uDC07\uD83D\uDC11");
2 changes: 1 addition & 1 deletion testdata/baselines/reference/submodule/conformance/tsxReactEmitNesting.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ let render = (ctrl, model) =>

//// [file.js]
// A simple render function with nesting and control statements
let render = (ctrl, model) => vdom.createElement("section", { class: "todoapp" }, vdom.createElement("header", { class: "header" }, vdom.createElement("h1", null, "todos &lt;x&gt;"), vdom.createElement("input", { class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model) })), vdom.createElement("section", { class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" } }, vdom.createElement("input", { class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl) }), vdom.createElement("ul", { class: "todo-list" }, model.filteredTodos.map((todo) => vdom.createElement("li", { class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo } }, vdom.createElement("div", { class: "view" }, (!todo.editable) ?
let render = (ctrl, model) => vdom.createElement("section", { class: "todoapp" }, vdom.createElement("header", { class: "header" }, vdom.createElement("h1", null, "todos <x>"), vdom.createElement("input", { class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model) })), vdom.createElement("section", { class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" } }, vdom.createElement("input", { class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl) }), vdom.createElement("ul", { class: "todo-list" }, model.filteredTodos.map((todo) => vdom.createElement("li", { class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo } }, vdom.createElement("div", { class: "view" }, (!todo.editable) ?
vdom.createElement("input", { class: "toggle", type: "checkbox" })
: null, vdom.createElement("label", { onDoubleClick: () => { ctrl.editTodo(todo); } }, todo.title), vdom.createElement("button", { class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo) }), vdom.createElement("div", { class: "iconBorder" }, vdom.createElement("div", { class: "icon" }))))))));
2 changes: 1 addition & 1 deletion testdata/baselines/reference/submodule/conformance/tsxReactEmitNesting.js.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
- vdom.createElement("button", { class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo) }),
- vdom.createElement("div", { class: "iconBorder" },
- vdom.createElement("div", { class: "icon" }))))))));
+let render = (ctrl, model) => vdom.createElement("section", { class: "todoapp" }, vdom.createElement("header", { class: "header" }, vdom.createElement("h1", null, "todos &lt;x&gt;"), vdom.createElement("input", { class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model) })), vdom.createElement("section", { class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" } }, vdom.createElement("input", { class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl) }), vdom.createElement("ul", { class: "todo-list" }, model.filteredTodos.map((todo) => vdom.createElement("li", { class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo } }, vdom.createElement("div", { class: "view" }, (!todo.editable) ?
+let render = (ctrl, model) => vdom.createElement("section", { class: "todoapp" }, vdom.createElement("header", { class: "header" }, vdom.createElement("h1", null, "todos <x>"), vdom.createElement("input", { class: "new-todo", autofocus: true, autocomplete: "off", placeholder: "What needs to be done?", value: model.newTodo, onKeyup: ctrl.addTodo.bind(ctrl, model) })), vdom.createElement("section", { class: "main", style: { display: (model.todos && model.todos.length) ? "block" : "none" } }, vdom.createElement("input", { class: "toggle-all", type: "checkbox", onChange: ctrl.toggleAll.bind(ctrl) }), vdom.createElement("ul", { class: "todo-list" }, model.filteredTodos.map((todo) => vdom.createElement("li", { class: { todo: true, completed: todo.completed, editing: todo == model.editedTodo } }, vdom.createElement("div", { class: "view" }, (!todo.editable) ?
+ vdom.createElement("input", { class: "toggle", type: "checkbox" })
+ : null, vdom.createElement("label", { onDoubleClick: () => { ctrl.editTodo(todo); } }, todo.title), vdom.createElement("button", { class: "destroy", onClick: ctrl.removeTodo.bind(ctrl, todo) }), vdom.createElement("div", { class: "iconBorder" }, vdom.createElement("div", { class: "icon" }))))))));
Loading