microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-16 05:58:32 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Object rest emit for method and accessor parameters

Browse Source 
I missed these before, so emit was incorrect for object rest in a method
or accessor parameter.
This commit is contained in:
Nathan Shively-Sanders 2016-11-15 09:50:29 -08:00
parent f437c8f318
commit b4d3bca32b
2 changed files with 69 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/compiler/binder.ts
View File

@ -2771,6 +2771,11 @@ namespace ts {
transformFlags |= TransformFlags.AssertTypeScript;
}
// a method declaration with object rest destructuring is ES Next syntax
if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
transformFlags |= TransformFlags.AssertESNext;
}
// An async method declaration is ES2017 syntax.
if (hasModifier(node, ModifierFlags.Async)) {
transformFlags |= TransformFlags.AssertES2017;
@ -2797,6 +2802,11 @@ namespace ts {
transformFlags |= TransformFlags.AssertTypeScript;
}
// a method declaration with object rest destructuring is ES Next syntax
if (subtreeFlags & TransformFlags.ContainsSpreadExpression) {
transformFlags |= TransformFlags.AssertESNext;
}
node.transformFlags = transformFlags | TransformFlags.HasComputedFlags;
return transformFlags & ~TransformFlags.MethodOrAccessorExcludes;
}

75
src/compiler/transformers/esnext.ts
View File

@ -46,6 +46,11 @@ namespace ts {
return visitFunctionExpression(node as FunctionExpression);
case SyntaxKind.ArrowFunction:
return visitArrowFunction(node as ArrowFunction);
case SyntaxKind.MethodDeclaration:
return visitMethodDeclaration(node as MethodDeclaration);
case SyntaxKind.GetAccessor:
case SyntaxKind.SetAccessor:
return visitAccessorDeclaration(node as AccessorDeclaration);
case SyntaxKind.Parameter:
return visitParameter(node as ParameterDeclaration);
default:
@ -208,11 +213,6 @@ namespace ts {
}
function visitFunctionDeclaration(node: FunctionDeclaration): FunctionDeclaration {
const hasRest = forEach(node.parameters, isObjectRestParameter);
const body = hasRest ?
transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
visitEachChild(node.body, visitor, context);
return setOriginalNode(
createFunctionDeclaration(
/*decorators*/ undefined,
@ -222,17 +222,13 @@ namespace ts {
/*typeParameters*/ undefined,
visitNodes(node.parameters, visitor, isParameter),
/*type*/ undefined,
body,
transformFunctionBodyIfNeeded(node),
/*location*/ node
),
/*original*/ node);
}
function visitArrowFunction(node: ArrowFunction) {
const hasRest = forEach(node.parameters, isObjectRestParameter);
const body = hasRest ?
transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
visitEachChild(node.body, visitor, context);
const func = setOriginalNode(
createArrowFunction(
/*modifiers*/ undefined,
@ -240,7 +236,7 @@ namespace ts {
visitNodes(node.parameters, visitor, isParameter),
/*type*/ undefined,
node.equalsGreaterThanToken,
body,
transformFunctionBodyIfNeeded(node),
/*location*/ node
),
/*original*/ node
@ -250,10 +246,6 @@ namespace ts {
}
function visitFunctionExpression(node: FunctionExpression): Expression {
const hasRest = forEach(node.parameters, isObjectRestParameter);
const body = hasRest ?
transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) as Block :
visitEachChild(node.body, visitor, context);
return setOriginalNode(
createFunctionExpression(
/*modifiers*/ undefined,
@ -262,11 +254,62 @@ namespace ts {
/*typeParameters*/ undefined,
visitNodes(node.parameters, visitor, isParameter),
/*type*/ undefined,
body,
transformFunctionBodyIfNeeded(node),
/*location*/ node
),
/*original*/ node
);
}
function visitMethodDeclaration(node: MethodDeclaration): MethodDeclaration {
return setOriginalNode(
createMethod(
/*decorators*/ undefined,
node.modifiers,
node.asteriskToken,
node.name,
/*typeParameters*/ undefined,
visitNodes(node.parameters, visitor, isParameter),
/*type*/ undefined,
transformFunctionBodyIfNeeded(node),
/*location*/ node
),
/*original*/ node);
}
function visitAccessorDeclaration(node: AccessorDeclaration): AccessorDeclaration {
if (node.kind === SyntaxKind.GetAccessor) {
return setOriginalNode(
createGetAccessor(
/*decorators*/ undefined,
node.modifiers,
node.name,
visitNodes(node.parameters, visitor, isParameter),
/*type*/ undefined,
transformFunctionBodyIfNeeded(node),
/*location*/ node
),
/*original*/ node);
}
else {
return setOriginalNode(
createSetAccessor(
/*decorators*/ undefined,
node.modifiers,
node.name,
visitNodes(node.parameters, visitor, isParameter),
transformFunctionBodyIfNeeded(node),
/*location*/ node
),
/*original*/ node);
}
}
function transformFunctionBodyIfNeeded(node: FunctionLikeDeclaration): Block {
const hasRest = forEach(node.parameters, isObjectRestParameter);
return hasRest ?
transformFunctionBody(node, visitor, currentSourceFile, context, noop, /*convertObjectRest*/ true) :
visitEachChild(node.body, visitor, context) as Block;
}
}
}