Skip to content

Fix implied export default with satisfies #341

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
gitKrystan merged 2 commits into from
Mar 31, 2025
Merged

Fix implied export default with satisfies #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30650b5
Failing test: implied export default with satisfies
ef4 Mar 31, 2025
2c7fba8
Fixing satisfies case
ef4 Mar 31, 2025
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
"dependencies": {
"@babel/core": "^7.23.6",
"content-tag": "^3.1.1",
"content-tag": "^3.1.2",
Copy link
Contributor Author

@ef4 ef4 Mar 31, 2025

Choose a reason for hiding this comment

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

This patch fixes a different bug in the handling of implied export default.

"prettier": "^3.1.1"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/parse/preprocess.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function preprocessTemplateRange(
suffix = '*/}';

const nextToken = code.slice(template.range.end).toString().match(/\S+/);
if (nextToken && nextToken[0] === 'as') {
if (nextToken && (nextToken[0] === 'as' || nextToken[0] === 'satisfies')) {
// Replace with parenthesized ObjectExpression
prefix = '(' + prefix;
suffix = suffix + ')';
Expand Down
5 changes: 5 additions & 0 deletions tests/cases/gts/implied-export-default-satisfies.gts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import type { TemplateOnlyComponent } from '@ember/component/template-only';

<template>
Implied Export Default with Satisfies
</template> satisfies TemplateOnlyComponent;
9 changes: 9 additions & 0 deletions tests/unit-tests/__snapshots__/format.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,15 @@ export const Exported = <template>
"
`;

exports[`format > config > default > it formats ../cases/gts/implied-export-default-satisfies.gts 1`] = `
"import type { TemplateOnlyComponent } from "@ember/component/template-only";

<template>
Implied Export Default with Satisfies
</template> satisfies TemplateOnlyComponent;
"
`;

exports[`format > config > default > it formats ../cases/gts/issue-191.gts 1`] = `
"import Component from "@glimmer/component";

Expand Down
9 changes: 9 additions & 0 deletions tests/unit-tests/config/__snapshots__/semi-false.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,15 @@ export const Exported = <template>
"
`;

exports[`config > semi: false > it formats ../cases/gts/implied-export-default-satisfies.gts 1`] = `
"import type { TemplateOnlyComponent } from "@ember/component/template-only"

;<template>
Implied Export Default with Satisfies
</template> satisfies TemplateOnlyComponent
"
`;

exports[`config > semi: false > it formats ../cases/gts/issue-191.gts 1`] = `
"import Component from "@glimmer/component"

Expand Down
9 changes: 9 additions & 0 deletions tests/unit-tests/config/__snapshots__/template-export-default.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,15 @@ export const Exported = <template>
"
`;

exports[`config > templateExportDefault: true > it formats ../cases/gts/implied-export-default-satisfies.gts 1`] = `
"import type { TemplateOnlyComponent } from "@ember/component/template-only";

<template>
Implied Export Default with Satisfies
</template> satisfies TemplateOnlyComponent;
"
`;

exports[`config > templateExportDefault: true > it formats ../cases/gts/issue-191.gts 1`] = `
"import Component from "@glimmer/component";

Expand Down