Skip to content
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

Jump to bottom

feat(typescript-estree): throw errors on interface with implements #6551

Merged
merged 7 commits into from Mar 8, 2023
Merged

feat(typescript-estree): throw errors on interface with implements #6551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7880301
feat(typescript-estree): throw errors on interface with implements
fisker Mar 1, 2023
288288c
Update packages/typescript-estree/src/convert.ts
bradzacher Mar 6, 2023
3eddd46
format
bradzacher Mar 6, 2023
d69cf1d
Merge branch 'v6' into interface-implements
fisker Mar 7, 2023
c7de567
Use `this.#throwError`
fisker Mar 7, 2023
0d1836a
Safer
fisker Mar 7, 2023
c2e8575
Merge branch 'v6' into pr/fisker/6551
bradzacher Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion ...tures/errorRecovery/fixtures/_error_/interface-implements/snapshots/1-TSESTree-Error.shot
View file
Open in desktop
@@ -1,3 +1,10 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`AST Fixtures legacy-fixtures errorRecovery _error_ interface-implements TSESTree - Error 1`] = `"NO ERROR"`;
exports[`AST Fixtures legacy-fixtures errorRecovery _error_ interface-implements TSESTree - Error 1`] = `
"TSError
1 | // TODO: This fixture might be too large, and if so should be split up.
2 |
> 3 | interface d implements e {}
| ^^^^^^^^^^^^ Interface declaration cannot have 'implements' clause.
4 |"
`;
2 changes: 1 addition & 1 deletion ...ures/errorRecovery/fixtures/_error_/interface-implements/snapshots/3-Alignment-Error.shot
View file
Open in desktop
@@ -1,3 +1,3 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`AST Fixtures legacy-fixtures errorRecovery _error_ interface-implements Error Alignment 1`] = `"Babel errored but TSESTree didn't"`;
exports[`AST Fixtures legacy-fixtures errorRecovery _error_ interface-implements Error Alignment 1`] = `"Both errored"`;
1 change: 0 additions & 1 deletion packages/ast-spec/tests/fixtures-with-differences-errors.shot
View file
Open in desktop
Expand Up @@ -56,7 +56,6 @@ Object {
"legacy-fixtures/errorRecovery/fixtures/_error_/enum-with-keywords/fixture.ts",
"legacy-fixtures/errorRecovery/fixtures/_error_/index-signature-parameters/fixture.ts",
"legacy-fixtures/errorRecovery/fixtures/_error_/interface-empty-extends/fixture.ts",
"legacy-fixtures/errorRecovery/fixtures/_error_/interface-implements/fixture.ts",
"legacy-fixtures/errorRecovery/fixtures/_error_/interface-index-signature-private/fixture.ts",
"legacy-fixtures/errorRecovery/fixtures/_error_/interface-index-signature-protected/fixture.ts",
"legacy-fixtures/errorRecovery/fixtures/_error_/interface-index-signature-public/fixture.ts",
Expand Down
34 changes: 23 additions & 11 deletions packages/typescript-estree/src/convert.ts
View file
Open in desktop
Expand Up @@ -2623,6 +2623,28 @@ export class Converter {
this.#checkIllegalDecorators(node);

const interfaceHeritageClauses = node.heritageClauses ?? [];
const interfaceExtends: TSESTree.TSInterfaceHeritage[] = [];

for (const heritageClause of interfaceHeritageClauses) {
if (heritageClause.token !== SyntaxKind.ExtendsKeyword) {
this.#throwError(
heritageClause,
heritageClause.token === SyntaxKind.ImplementsKeyword
? "Interface declaration cannot have 'implements' clause."
: 'Unexpected token.',
);
}

for (const heritageType of heritageClause.types) {
interfaceExtends.push(
this.convertChild(
heritageType,
node,
) as TSESTree.TSInterfaceHeritage,
);
}
}

const result = this.createNode<TSESTree.TSInterfaceDeclaration>(node, {
type: AST_NODE_TYPES.TSInterfaceDeclaration,
body: this.createNode<TSESTree.TSInterfaceBody>(node, {
Expand All @@ -2631,17 +2653,7 @@ export class Converter {
range: [node.members.pos - 1, node.end],
}),
declare: hasModifier(SyntaxKind.DeclareKeyword, node),
extends: interfaceHeritageClauses
.filter(
heritageClause =>
heritageClause.token === SyntaxKind.ExtendsKeyword,
)
.flatMap(heritageClause =>
heritageClause.types.map(
n => this.convertChild(n, node) as TSESTree.TSInterfaceHeritage,
),
),

extends: interfaceExtends,
id: this.convertChild(node.name),
typeParameters:
node.typeParameters &&
Expand Down