Skip to content
This repository was archived by the owner on Jan 19, 2019. It is now read-only.

Breaking: Change how interface node gets converted (fixes #201) #241

Merged
merged 1 commit into from
May 1, 2017
Merged

Breaking: Change how interface node gets converted (fixes #201) #241

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
51 changes: 51 additions & 0 deletions lib/ast-converter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -676,6 +676,25 @@ module.exports = function(ast, extra) {
return classImplementsNode;
}

/**
* Converts a child into a interface heritage node.
* @param {TSNode} child The TypeScript AST node to convert.
* @returns {ESTreeNode} The type annotation node.
*/
function convertInterfaceHeritageClause(child) {
var id = convertChild(child.expression);
var classImplementsNode = {
type: "TSInterfaceHeritage",
loc: id.loc,
range: id.range,
id: id
};
if (child.typeArguments && child.typeArguments.length) {
classImplementsNode.typeParameters = convertTypeArgumentsToTypeParameters(child.typeArguments);
}
return classImplementsNode;
}

/**
* For nodes that are copied directly from the TypeScript AST into
* ESTree mostly as-is. The only difference is the addition of a type
Expand Down Expand Up @@ -2079,6 +2098,38 @@ module.exports = function(ast, extra) {

break;

case SyntaxKind.InterfaceDeclaration:
var interfaceHeritageClauses = node.heritageClauses || [];
var interfaceLastClassToken = interfaceHeritageClauses.length ? interfaceHeritageClauses[interfaceHeritageClauses.length - 1] : node.name;

if (node.typeParameters && node.typeParameters.length) {
var interfaceLastTypeParameter = node.typeParameters[node.typeParameters.length - 1];
if (!interfaceLastClassToken || interfaceLastTypeParameter.pos > interfaceLastClassToken.pos) {
interfaceLastClassToken = ts.findNextToken(interfaceLastTypeParameter, ast);
}
result.typeParameters = convertTSTypeParametersToTypeParametersDeclaration(node.typeParameters);
}

var hasImplementsClause = interfaceHeritageClauses.length > 0;
var interfaceOpenBrace = ts.findNextToken(interfaceLastClassToken, ast);

var interfaceBody = {
type: "TSInterfaceBody",
body: node.members.map(function(member) {
return convertChild(member);
}),
range: [ interfaceOpenBrace.getStart(), result.range[1] ],
loc: getLocFor(interfaceOpenBrace.getStart(), node.end, ast)
};

assign(result, {
type: "TSInterfaceDeclaration",
body: interfaceBody,
id: convertChild(node.name),
heritage: hasImplementsClause ? interfaceHeritageClauses[0].types.map(convertInterfaceHeritageClause) : []
});
break;

default:
deeplyCopy();
}
Expand Down
24 changes: 21 additions & 3 deletions tests/fixtures/typescript/basics/class-with-mixin.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,25 @@ module.exports = {
"column": 15
}
},
"name": {
"body": {
"type": "TSInterfaceBody",
"body": [],
"range": [
154,
157
],
"loc": {
"start": {
"line": 8,
"column": 12
},
"end": {
"line": 8,
"column": 15
}
}
},
"id": {
"type": "Identifier",
"range": [
152,
Expand All @@ -616,7 +634,7 @@ module.exports = {
},
"name": "I"
},
"members": []
"heritage": []
},
{
"type": "VariableDeclaration",
Expand Down Expand Up @@ -2024,4 +2042,4 @@ module.exports = {
}
}
]
};
};
291 changes: 291 additions & 0 deletions tests/fixtures/typescript/basics/interface-extends-multiple.result.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,291 @@
module.exports = {
"type": "Program",
"range": [
0,
34
],
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"body": [
{
"type": "TSInterfaceDeclaration",
"range": [
0,
34
],
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
},
"body": {
"type": "TSInterfaceBody",
"body": [],
"range": [
30,
34
],
"loc": {
"start": {
"line": 1,
"column": 30
},
"end": {
"line": 3,
"column": 1
}
}
},
"id": {
"type": "Identifier",
"range": [
10,
13
],
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 13
}
},
"name": "Foo"
},
"heritage": [
{
"type": "TSInterfaceHeritage",
"loc": {
"start": {
"line": 1,
"column": 22
},
"end": {
"line": 1,
"column": 25
}
},
"range": [
22,
25
],
"id": {
"type": "Identifier",
"range": [
22,
25
],
"loc": {
"start": {
"line": 1,
"column": 22
},
"end": {
"line": 1,
"column": 25
}
},
"name": "Bar"
}
},
{
"type": "TSInterfaceHeritage",
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 29
}
},
"range": [
26,
29
],
"id": {
"type": "Identifier",
"range": [
26,
29
],
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 29
}
},
"name": "Baz"
}
}
]
}
],
"sourceType": "script",
"tokens": [
{
"type": "Keyword",
"value": "interface",
"range": [
0,
9
],
"loc": {
"start": {
"line": 1,
"column": 0
},
"end": {
"line": 1,
"column": 9
}
}
},
{
"type": "Identifier",
"value": "Foo",
"range": [
10,
13
],
"loc": {
"start": {
"line": 1,
"column": 10
},
"end": {
"line": 1,
"column": 13
}
}
},
{
"type": "Keyword",
"value": "extends",
"range": [
14,
21
],
"loc": {
"start": {
"line": 1,
"column": 14
},
"end": {
"line": 1,
"column": 21
}
}
},
{
"type": "Identifier",
"value": "Bar",
"range": [
22,
25
],
"loc": {
"start": {
"line": 1,
"column": 22
},
"end": {
"line": 1,
"column": 25
}
}
},
{
"type": "Punctuator",
"value": ",",
"range": [
25,
26
],
"loc": {
"start": {
"line": 1,
"column": 25
},
"end": {
"line": 1,
"column": 26
}
}
},
{
"type": "Identifier",
"value": "Baz",
"range": [
26,
29
],
"loc": {
"start": {
"line": 1,
"column": 26
},
"end": {
"line": 1,
"column": 29
}
}
},
{
"type": "Punctuator",
"value": "{",
"range": [
30,
31
],
"loc": {
"start": {
"line": 1,
"column": 30
},
"end": {
"line": 1,
"column": 31
}
}
},
{
"type": "Punctuator",
"value": "}",
"range": [
33,
34
],
"loc": {
"start": {
"line": 3,
"column": 0
},
"end": {
"line": 3,
"column": 1
}
}
}
]
};
Loading