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

Fix: Use TSAbstractMethodDefinition for abstract constructors (fixes #228) #229

Merged
merged 1 commit into from
Apr 29, 2017
Merged

Fix: Use TSAbstractMethodDefinition for abstract constructors (fixes #228) #229

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
47 changes: 18 additions & 29 deletions lib/ast-converter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,14 @@ function isESTreeClassMember(node) {
}

/**
* Returns true if the given node is an async function
* @param {TSNode} node TypeScript AST node
* @returns {boolean} is an async function
* Checks if a TSNode has a modifier
* @param {SyntaxKind} modifierKind TypeScript SyntaxKind modifier
* @param {TSNode} node TypeScript AST node
* @returns {boolean} has the modifier specified
*/
function isAsyncFunction(node) {
function hasModifier(modifierKind, node) {
return !!node.modifiers && !!node.modifiers.length && node.modifiers.some(function(modifier) {
return modifier.kind === SyntaxKind.AsyncKeyword;
return modifier.kind === modifierKind;
});
}

Expand Down Expand Up @@ -905,9 +906,7 @@ module.exports = function(ast, extra) {

var functionDeclarationType = "FunctionDeclaration";
if (node.modifiers && node.modifiers.length) {
var isDeclareFunction = node.modifiers.some(function(modifier) {
return modifier.kind === ts.SyntaxKind.DeclareKeyword;
});
var isDeclareFunction = hasModifier(ts.SyntaxKind.DeclareKeyword, node);
if (isDeclareFunction) {
functionDeclarationType = "DeclareFunction";
}
Expand All @@ -925,7 +924,7 @@ module.exports = function(ast, extra) {
id: convertChild(node.name),
generator: !!node.asteriskToken,
expression: false,
async: isAsyncFunction(node),
async: hasModifier(SyntaxKind.AsyncKeyword, node),
params: node.parameters.map(convertChild),
body: convertChild(node.body)
});
Expand Down Expand Up @@ -1114,7 +1113,7 @@ module.exports = function(ast, extra) {
id: null,
generator: false,
expression: false,
async: isAsyncFunction(node),
async: hasModifier(SyntaxKind.AsyncKeyword, node),
body: convertChild(node.body),
range: [ node.parameters.pos - 1, result.range[1]],
loc: {
Expand Down Expand Up @@ -1162,15 +1161,9 @@ module.exports = function(ast, extra) {
/**
* TypeScript class methods can be defined as "abstract"
*/
var methodDefinitionType = "MethodDefinition";
if (node.modifiers && node.modifiers.length) {
var isAbstractMethod = node.modifiers.some(function(modifier) {
return modifier.kind === ts.SyntaxKind.AbstractKeyword;
});
if (isAbstractMethod) {
methodDefinitionType = "TSAbstractMethodDefinition";
}
}
var methodDefinitionType = hasModifier(SyntaxKind.AbstractKeyword, node)
? "TSAbstractMethodDefinition"
: "MethodDefinition";

assign(result, {
type: methodDefinitionType,
Expand Down Expand Up @@ -1206,6 +1199,7 @@ module.exports = function(ast, extra) {
case SyntaxKind.Constructor:

var constructorIsStatic = Boolean(ts.getModifierFlags(node) & ts.ModifierFlags.Static),
constructorIsAbstract = hasModifier(SyntaxKind.AbstractKeyword, node),
firstConstructorToken = constructorIsStatic ? ts.findNextToken(node.getFirstToken(), ast) : node.getFirstToken(),
constructorLoc = ast.getLineAndCharacterOfPosition(node.parameters.pos - 1),
constructor = {
Expand Down Expand Up @@ -1275,7 +1269,7 @@ module.exports = function(ast, extra) {
}

assign(result, {
type: "MethodDefinition",
type: constructorIsAbstract ? "TSAbstractMethodDefinition" : "MethodDefinition",
key: constructorKey,
value: constructor,
computed: constructorIsComputed,
Expand All @@ -1292,7 +1286,7 @@ module.exports = function(ast, extra) {
generator: !!node.asteriskToken,
params: node.parameters.map(convertChild),
body: convertChild(node.body),
async: isAsyncFunction(node),
async: hasModifier(SyntaxKind.AbstractKeyword, node),
expression: false
});
// Process returnType
Expand Down Expand Up @@ -1375,7 +1369,7 @@ module.exports = function(ast, extra) {
id: null,
params: node.parameters.map(convertChild),
body: convertChild(node.body),
async: isAsyncFunction(node),
async: hasModifier(SyntaxKind.AsyncKeyword, node),
expression: node.body.kind !== SyntaxKind.Block
});
// Process returnType
Expand Down Expand Up @@ -1501,9 +1495,7 @@ module.exports = function(ast, extra) {
range: [node.getStart(), node.end],
loc: getLoc(node, ast),
accessibility: getTSNodeAccessibility(node),
isReadonly: node.modifiers.some(function(modifier) {
return modifier.kind === SyntaxKind.ReadonlyKeyword;
}),
isReadonly: hasModifier(SyntaxKind.ReadonlyKeyword, node),
parameter: result
};
}
Expand Down Expand Up @@ -1533,10 +1525,7 @@ module.exports = function(ast, extra) {
* TypeScript class declarations can be defined as "abstract"
*/
if (node.kind === SyntaxKind.ClassDeclaration) {
var isAbstractClass = node.modifiers.some(function(modifier) {
return modifier.kind === ts.SyntaxKind.AbstractKeyword;
});
if (isAbstractClass) {
if (hasModifier(SyntaxKind.AbstractKeyword, node)) {
classNodeType = "TSAbstract" + classNodeType;
}
}
Expand Down
Loading