Skip to content

Fix usage of fragments in TSX #783

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
natemoo-re merged 3 commits into from
Jul 7, 2023
Merged

Fix usage of fragments in TSX #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78103ea
test: add test for fragment in TSX
Princesseuh May 2, 2023
b242f58
fix(#782): fix compiler crash on tsx fragment
natemoo-re Jul 7, 2023
a5706b7
chore: add changeset
natemoo-re Jul 7, 2023
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
5 changes: 5 additions & 0 deletions .changeset/rotten-elephants-refuse.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@astrojs/compiler': patch
---

[TSX] fix compiler crash when file only contains an unamed fragment
5 changes: 4 additions & 1 deletion internal/printer/print-to-tsx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,15 @@ declare const Astro: Readonly<import('astro').AstroGlobal<%s>>`, props.Ident)
if len(n.Attr) == 0 {
endLoc = n.Loc[0].Start + len(n.Data) - 1
}
if endLoc == -1 {
endLoc = 0
}
Comment on lines +424 to +426
Copy link
Copy Markdown
Member

@natemoo-re natemoo-re Jul 7, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the problem!

isSelfClosing := false
tmpLoc := endLoc
if len(p.sourcetext) > tmpLoc {
for i := 0; i < len(p.sourcetext[tmpLoc:]); i++ {
c := p.sourcetext[endLoc : endLoc+1][0]
if c == '/' && p.sourcetext[endLoc+1:][0] == '>' {
if c == '/' && len(p.sourcetext) > endLoc+1 && p.sourcetext[endLoc+1:][0] == '>' {
isSelfClosing = true
break
} else if c == '>' {
Expand Down
10 changes: 10 additions & 0 deletions packages/compiler/test/tsx/basic.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,14 @@ export default function __AstroComponent_(_props: Record<string, any>): any {}\n
assert.snapshot(code, output, `expected code to match snapshot`);
});

test('fragment with no name', async () => {
const input = '<>+0123456789</>';
const output = `<Fragment>
<>+0123456789</>
</Fragment>
export default function __AstroComponent_(_props: Record<string, any>): any {}\n`;
const { code } = await convertToTSX(input, { sourcemap: 'external' });
assert.snapshot(code, output, `expected code to match snapshot`);
});

test.run();