Skip to content

Add ES2017 target #11407

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

Merged
rbuckton merged 15 commits into from
Oct 15, 2016
Merged

Add ES2017 target #11407

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2c46f9b
Add ES8/ES2017 target (#10768)
andrejbaran Oct 5, 2016
d16e846
ES8/ES2017 target tests
andrejbaran Oct 5, 2016
f42c791
Don't use es8. Add es2016 target.
andrejbaran Oct 12, 2016
5d52c9f
Move async/await into separate es2017 transformer
andrejbaran Oct 12, 2016
1b4c0e3
Add es2017 async conformance
andrejbaran Oct 12, 2016
e60e97f
Cleanup comments
andrejbaran Oct 12, 2016
f0fd77a
Make async/await an ES2017 feature only
andrejbaran Oct 13, 2016
4284a74
Adjust some async conformance baselines
andrejbaran Oct 13, 2016
7df3fda
Refactor createFunctionExpresson
andrejbaran Oct 13, 2016
c5ddf27
Remove constant substitution from ES2017 transformer
andrejbaran Oct 13, 2016
b871b53
Favor use of ES2015 instead of ES6
andrejbaran Oct 13, 2016
a500fd9
Merge branch 'master' into es2017-target
andrejbaran Oct 13, 2016
86784a5
Get rid of ES6 completely
andrejbaran Oct 14, 2016
7352e97
Cleanup ES2017 async tests
andrejbaran Oct 14, 2016
17d60d5
Merged master into es2017-target
andrejbaran Oct 15, 2016
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
Next Next commit
Add ES8/ES2017 target (#10768)
  • Loading branch information
@andrejbaran
andrejbaran committed Oct 5, 2016
commit 2c46f9b6870348bd14973c1e5abb2f3ba893c084
2 changes: 2 additions & 0 deletions src/compiler/commandLineParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,9 @@ namespace ts {
"es3": ScriptTarget.ES3,
"es5": ScriptTarget.ES5,
"es6": ScriptTarget.ES6,
"es8": ScriptTarget.ES8,

@mhegazy mhegazy Oct 5, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Officially there is no ES8, it is ES2017, so i would not add ES8 here or anywhere else. i would just leave it to ES2017

@andrejbaran andrejbaran Oct 12, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@mhegazy mhegazy Oct 5, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add ES2016. it is a bit funny that we skip one ES 2016 (though not very useful but should be there for consistency).

@andrejbaran andrejbaran Oct 12, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@mhegazy mhegazy Oct 5, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you also need to update getDefaultLibFileName to inject the right library based on the target.

@andrejbaran andrejbaran Oct 12, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

"es2015": ScriptTarget.ES2015,
"es2017": ScriptTarget.ES2017,
}),
description: Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
paramType: Diagnostics.VERSION,
Expand Down
2 changes: 1 addition & 1 deletion src/compiler/core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ namespace ts {
export function getEmitModuleKind(compilerOptions: CompilerOptions) {
return typeof compilerOptions.module === "number" ?
compilerOptions.module :
getEmitScriptTarget(compilerOptions) === ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS;
getEmitScriptTarget(compilerOptions) >= ScriptTarget.ES6 ? ModuleKind.ES6 : ModuleKind.CommonJS;
}

/* @internal */
Expand Down
5 changes: 4 additions & 1 deletion src/compiler/emitter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2192,7 +2192,10 @@ const _super = (function (geti, seti) {
helpersEmitted = true;
}

if (!awaiterEmitted && node.flags & NodeFlags.HasAsyncFunctions) {
// Only emit __awaiter function when target ES5/ES6.
// Only emit __generator function when target ES5.
// For target ES8 and above, we can emit async/await as is.
if ((languageVersion < ScriptTarget.ES8) && (!awaiterEmitted && node.flags & NodeFlags.HasAsyncFunctions)) {
writeLines(awaiterHelper);
if (languageVersion < ScriptTarget.ES6) {
writeLines(generatorHelper);
Expand Down
6 changes: 4 additions & 2 deletions src/compiler/transformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,9 @@ namespace ts {
transformers.push(transformJsx);
}

transformers.push(transformES7);
if (languageVersion < ScriptTarget.ES8) {
transformers.push(transformES7);
}

if (languageVersion < ScriptTarget.ES6) {
transformers.push(transformES6);
Expand Down Expand Up @@ -339,4 +341,4 @@ namespace ts {
return statements;
}
}
}
}
41 changes: 33 additions & 8 deletions src/compiler/transformers/ts.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,14 @@ namespace ts {
// ES6 export and default modifiers are elided when inside a namespace.
return currentNamespace ? undefined : node;

case SyntaxKind.AsyncKeyword:
// Async keyword is not elided for target ES8
return languageVersion < ScriptTarget.ES8 ? undefined : node;

case SyntaxKind.PublicKeyword:
case SyntaxKind.PrivateKeyword:
case SyntaxKind.ProtectedKeyword:
case SyntaxKind.AbstractKeyword:
case SyntaxKind.AsyncKeyword:
case SyntaxKind.ConstKeyword:
case SyntaxKind.DeclareKeyword:
case SyntaxKind.ReadonlyKeyword:
Expand Down Expand Up @@ -2223,6 +2226,14 @@ namespace ts {
/*location*/ node
);

// Add ES8 async function expression modifier
// Not sure this is the right place? Might be better to move this
// into createFunctionExpression itself.
if ((languageVersion >= ScriptTarget.ES8) && isAsyncFunctionLike(node)) {
const funcModifiers = visitNodes(node.modifiers, visitor, isModifier);
func.modifiers = createNodeArray(funcModifiers);
}

setOriginalNode(func, node);

return func;
Expand All @@ -2235,7 +2246,7 @@ namespace ts {
*/
function visitArrowFunction(node: ArrowFunction) {
const func = createArrowFunction(
/*modifiers*/ undefined,
visitNodes(node.modifiers, visitor, isModifier),
/*typeParameters*/ undefined,
visitNodes(node.parameters, visitor, isParameter),
/*type*/ undefined,
Expand All @@ -2250,7 +2261,7 @@ namespace ts {
}

function transformFunctionBody(node: MethodDeclaration | AccessorDeclaration | FunctionDeclaration | FunctionExpression): FunctionBody {
if (isAsyncFunctionLike(node)) {
if (isAsyncFunctionLike(node) && languageVersion < ScriptTarget.ES8) {
return <FunctionBody>transformAsyncFunctionBody(node);
}

Expand All @@ -2270,7 +2281,7 @@ namespace ts {
}

function transformConciseBody(node: ArrowFunction): ConciseBody {
if (isAsyncFunctionLike(node)) {
if (isAsyncFunctionLike(node) && languageVersion < ScriptTarget.ES8) {
return transformAsyncFunctionBody(node);
}

Expand Down Expand Up @@ -2453,14 +2464,28 @@ namespace ts {
* @param node The await expression node.
*/
function visitAwaitExpression(node: AwaitExpression): Expression {

@mhegazy mhegazy Oct 6, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

async/await should be split into its own transform, es2017.ts, then we do not need to run it in this case, just like ES7 transform.

@andrejbaran andrejbaran Oct 12, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@rbuckton rbuckton Oct 13, 2016

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just remove this function altogether.

@andrejbaran andrejbaran Oct 13, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

const targetAtLeastES8 = languageVersion >= ScriptTarget.ES8;
return setOriginalNode(
createYield(
targetAtLeastES8 ? createAwaitExpression() : createYieldExpression(),
node
);

function createAwaitExpression() {
const awaitExpression = createAwait(
visitNode(node.expression, visitor, isExpression),
/*location*/ node
);
return awaitExpression;
}

function createYieldExpression() {
const yieldExpression = createYield(
/*asteriskToken*/ undefined,
visitNode(node.expression, visitor, isExpression),
/*location*/ node
),
node
);
);
return yieldExpression;
}
}

/**
Expand Down
4 changes: 3 additions & 1 deletion src/compiler/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2831,8 +2831,10 @@ namespace ts {
ES3 = 0,
ES5 = 1,
ES6 = 2,

@sandersn sandersn Oct 13, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is minor, but can you make ES2015=2 and ES6=ES2015 ?

@sandersn sandersn Oct 13, 2016

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or maybe even delete ES6 if it's not used any more. I can't remember if this has anything to do with command line parsing, so it might be hard to tell.

@andrejbaran andrejbaran Oct 14, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The only place where ES6 is used (other than comments) is in command line/compiler options parsing.

@andrejbaran andrejbaran Oct 14, 2016

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed ES6 completely

ES8 = 3,
ES2015 = ES6,
Latest = ES6,
ES2017 = ES8,
Latest = ES8,
}

export const enum LanguageVariant {
Expand Down