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

Breaking: Only add .implements/.accessibility/.decorators if "truthy" #354

Merged
merged 1 commit into from
Aug 16, 2017
Merged

Breaking: Only add .implements/.accessibility/.decorators if "truthy" #354

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
107 changes: 77 additions & 30 deletions lib/convert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,26 @@ module.exports = function convert(config) {
});
}

/**
* Converts an array of TSNode parameters into an array of ESTreeNode params
* @param {TSNode[]} parameters An array of TSNode params to be converted
* @returns {ESTreeNode[]} an array of converted ESTreeNode params
*/
function convertParameters(parameters) {
if (!parameters || !parameters.length) {
return [];
}
return parameters.map(param => {
const convertedParam = convertChild(param);
if (!param.decorators || !param.decorators.length) {
return convertedParam;
}
return Object.assign(convertedParam, {
decorators: convertDecorators(param.decorators)
});
});
}

/**
* 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 @@ -470,7 +490,7 @@ module.exports = function convert(config) {

case SyntaxKind.ForInStatement:
case SyntaxKind.ForOfStatement: {
const isAwait = node.awaitModifier && node.awaitModifier.kind === SyntaxKind.AwaitKeyword;
const isAwait = !!(node.awaitModifier && node.awaitModifier.kind === SyntaxKind.AwaitKeyword);
Object.assign(result, {
type: SyntaxKind[node.kind],
left: convertChild(node.initializer),
Expand Down Expand Up @@ -507,7 +527,7 @@ module.exports = function convert(config) {
generator: !!node.asteriskToken,
expression: false,
async: nodeUtils.hasModifier(SyntaxKind.AsyncKeyword, node),
params: node.parameters.map(convertChild),
params: convertParameters(node.parameters),
body: convertChild(node.body)
});

Expand Down Expand Up @@ -724,12 +744,19 @@ module.exports = function convert(config) {
value: convertChild(node.initializer),
computed: nodeUtils.isComputedProperty(node.name),
static: nodeUtils.hasStaticModifierFlag(node),
accessibility: nodeUtils.getTSNodeAccessibility(node),
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node),
decorators: convertDecorators(node.decorators),
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null
});

if (node.decorators) {
result.decorators = convertDecorators(node.decorators);
}

const accessibility = nodeUtils.getTSNodeAccessibility(node);
if (accessibility) {
result.accessibility = accessibility;
}

if (node.name.kind === SyntaxKind.Identifier && node.questionToken) {
result.key.optional = true;
}
Expand Down Expand Up @@ -787,11 +814,7 @@ module.exports = function convert(config) {
/**
* Unlike in object literal methods, class method params can have decorators
*/
method.params = node.parameters.map(param => {
const convertedParam = convertChild(param);
convertedParam.decorators = convertDecorators(param.decorators);
return convertedParam;
});
method.params = convertParameters(node.parameters);

/**
* TypeScript class methods can be defined as "abstract"
Expand All @@ -806,11 +829,18 @@ module.exports = function convert(config) {
value: method,
computed: nodeUtils.isComputedProperty(node.name),
static: nodeUtils.hasStaticModifierFlag(node),
kind: "method",
accessibility: nodeUtils.getTSNodeAccessibility(node),
decorators: convertDecorators(node.decorators)
kind: "method"
});

if (node.decorators) {
result.decorators = convertDecorators(node.decorators);
}

const accessibility = nodeUtils.getTSNodeAccessibility(node);
if (accessibility) {
result.accessibility = accessibility;
}

}

if (result.key.type === AST_NODE_TYPES.Identifier && node.questionToken) {
Expand Down Expand Up @@ -844,13 +874,7 @@ module.exports = function convert(config) {
constructor = {
type: AST_NODE_TYPES.FunctionExpression,
id: null,
params: node.parameters.map(param => {
const convertedParam = convertChild(param);
const decorators = convertDecorators(param.decorators);
return Object.assign(convertedParam, {
decorators
});
}),
params: convertParameters(node.parameters),
generator: false,
expression: false,
async: false,
Expand Down Expand Up @@ -910,10 +934,15 @@ module.exports = function convert(config) {
key: constructorKey,
value: constructor,
computed: constructorIsComputed,
accessibility: nodeUtils.getTSNodeAccessibility(node),
static: constructorIsStatic,
kind: (constructorIsStatic || constructorIsComputed) ? "method" : "constructor"
});

const accessibility = nodeUtils.getTSNodeAccessibility(node);
if (accessibility) {
result.accessibility = accessibility;
}

break;

}
Expand All @@ -923,7 +952,7 @@ module.exports = function convert(config) {
type: AST_NODE_TYPES.FunctionExpression,
id: convertChild(node.name),
generator: !!node.asteriskToken,
params: node.parameters.map(convertChild),
params: convertParameters(node.parameters),
body: convertChild(node.body),
async: nodeUtils.hasModifier(SyntaxKind.AsyncKeyword, node),
expression: false
Expand Down Expand Up @@ -1022,7 +1051,7 @@ module.exports = function convert(config) {
type: AST_NODE_TYPES.ArrowFunctionExpression,
generator: false,
id: null,
params: node.parameters.map(convertChild),
params: convertParameters(node.parameters),
body: convertChild(node.body),
async: nodeUtils.hasModifier(SyntaxKind.AsyncKeyword, node),
expression: node.body.kind !== SyntaxKind.Block
Expand Down Expand Up @@ -1271,11 +1300,17 @@ module.exports = function convert(config) {
range: [openBrace.getStart(), result.range[1]],
loc: nodeUtils.getLocFor(openBrace.getStart(), node.end, ast)
},
superClass: (superClass ? convertChild(superClass.types[0].expression) : null),
implements: hasImplements ? heritageClauses[0].types.map(convertClassImplements) : [],
decorators: convertDecorators(node.decorators)
superClass: (superClass ? convertChild(superClass.types[0].expression) : null)
});

if (hasImplements) {
result.implements = heritageClauses[0].types.map(convertClassImplements);
}

if (node.decorators) {
result.decorators = convertDecorators(node.decorators);
}

const filteredMembers = node.members.filter(nodeUtils.isESTreeClassMember);

if (filteredMembers.length) {
Expand Down Expand Up @@ -1836,14 +1871,18 @@ module.exports = function convert(config) {
optional: nodeUtils.isOptional(node),
computed: nodeUtils.isComputedProperty(node.name),
key: convertChild(node.name),
params: node.parameters.map(parameter => convertChild(parameter)),
params: convertParameters(node.parameters),
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
accessibility: nodeUtils.getTSNodeAccessibility(node),
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node),
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
});

const accessibility = nodeUtils.getTSNodeAccessibility(node);
if (accessibility) {
result.accessibility = accessibility;
}

if (node.typeParameters) {
result.typeParameters = convertTSTypeParametersToTypeParametersDeclaration(node.typeParameters);
}
Expand All @@ -1859,12 +1898,16 @@ module.exports = function convert(config) {
key: convertChild(node.name),
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
initializer: convertChild(node.initializer),
accessibility: nodeUtils.getTSNodeAccessibility(node),
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node),
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
});

const accessibility = nodeUtils.getTSNodeAccessibility(node);
if (accessibility) {
result.accessibility = accessibility;
}

break;
}

Expand All @@ -1873,19 +1916,23 @@ module.exports = function convert(config) {
type: AST_NODE_TYPES.TSIndexSignature,
index: convertChild(node.parameters[0]),
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null,
accessibility: nodeUtils.getTSNodeAccessibility(node),
readonly: nodeUtils.hasModifier(SyntaxKind.ReadonlyKeyword, node),
static: nodeUtils.hasModifier(SyntaxKind.StaticKeyword, node),
export: nodeUtils.hasModifier(SyntaxKind.ExportKeyword, node)
});

const accessibility = nodeUtils.getTSNodeAccessibility(node);
if (accessibility) {
result.accessibility = accessibility;
}

break;
}

case SyntaxKind.ConstructSignature: {
Object.assign(result, {
type: AST_NODE_TYPES.TSConstructSignature,
params: node.parameters.map(parameter => convertChild(parameter)),
params: convertParameters(node.parameters),
typeAnnotation: (node.type) ? convertTypeAnnotation(node.type) : null
});

Expand Down
2 changes: 0 additions & 2 deletions tests/lib/__snapshots__/basics.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1084,7 +1084,6 @@ Object {
],
"type": "ClassBody",
},
"decorators": Array [],
"id": Object {
"loc": Object {
"end": Object {
Expand All @@ -1103,7 +1102,6 @@ Object {
],
"type": "Identifier",
},
"implements": Array [],
"loc": Object {
"end": Object {
"column": 1,
Expand Down
4 changes: 0 additions & 4 deletions tests/lib/__snapshots__/comments.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,7 @@ Object {
"body": Object {
"body": Array [
Object {
"accessibility": null,
"computed": false,
"decorators": Array [],
"key": Object {
"loc": Object {
"end": Object {
Expand Down Expand Up @@ -554,9 +552,7 @@ Object {
],
"type": "ClassBody",
},
"decorators": Array [],
"id": null,
"implements": Array [],
"loc": Object {
"end": Object {
"column": 1,
Expand Down
Loading