ES6 emit for new import / export syntax #2335

mhegazy · 2015-03-13T00:30:05Z

This is mostly @sheetalkamat's work in #2065, just bringing it up to date and adding implementation for export default.

Notes:

Emitting class in ES6 is in tracked in Class emit for ES6 #2333, and i will merge with that and fix the class baselines
Emitting declarations is not done yet, so declaration files in baselines are not correct.

Conflicts: src/compiler/checker.ts src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json

Conflicts: src/compiler/checker.ts tests/baselines/reference/es6ImportDefaultBinding.errors.txt tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport1.errors.txt tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt tests/cases/compiler/es6ImportNameSpaceImportMergeErrors.ts tests/cases/compiler/es6ImportNameSpaceImportNoNamedExports.ts tests/cases/compiler/es6ImportNamedImportInExportAssignment.ts tests/cases/compiler/es6ImportNamedImportInIndirectExportAssignment.ts tests/cases/compiler/es6ImportNamedImportNoNamedExports.ts

Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json src/compiler/program.ts tests/baselines/reference/constDeclarations-access5.errors.txt tests/baselines/reference/es6ExportAssignment.errors.txt tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.errors.txt tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBinding.js tests/baselines/reference/es6ImportDefaultBindingMergeErrors.errors.txt tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt tests/cases/compiler/es6ImportDefaultBinding.ts tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport.ts tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImport1.ts tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamedImportDts.ts tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding.ts tests/cases/compiler/es6ImportDefaultBindingFollowedWithNamespaceBinding1.ts tests/cases/compiler/es6ImportDefaultBindingMergeErrors.ts tests/cases/compiler/es6ImportDefaultBindingNoDefaultProperty.ts tests/cases/compiler/es6ImportNameSpaceImport.ts tests/cases/compiler/es6ImportNamedImport.ts tests/cases/compiler/es6ImportNamedImportMergeErrors.ts tests/cases/compiler/es6ImportNamedImportNoExportMember.ts tests/cases/compiler/es6ImportWithoutFromClause.ts tests/cases/compiler/es6ImportWithoutFromClauseNonInstantiatedModule.ts

Conflicts: src/compiler/emitter.ts tests/baselines/reference/es6ImportDefaultBinding.js tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js tests/baselines/reference/es6ImportNameSpaceImport.js tests/baselines/reference/es6ImportNamedImport.js

Conflicts: tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js tests/baselines/reference/es6ImportNamedImport.js

…modules Conflicts: src/compiler/checker.ts tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js tests/baselines/reference/es6ImportNamedImport.js

Conflicts: src/compiler/emitter.ts tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js tests/baselines/reference/es6ImportNamedImport.js

Conflicts: src/compiler/emitter.ts tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js

Conflicts: src/compiler/emitter.ts

Note since we havent yet changed the emitting of class declaration to es6 format, we are just exporting the constructor function Conflicts: src/compiler/emitter.ts

Conflicts: src/compiler/emitter.ts tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClause.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js

CyrusNajmabadi · 2015-03-13T11:31:18Z

src/compiler/checker.ts

+                else {
+                    if (languageVersion >= ScriptTarget.ES6) {
+                        // Import equals declaration is deprecated in es6 or above
+                        grammarErrorOnNode(node, Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_or_import_d_from_mod_instead);


Is this documented with Jonathan as a breaking change? (it seems like a very big one, erroring on an entire feature if you move to ES6).

yes. that is the current design. we will have a blog post about moving to the new module syntax.

Conflicts: src/compiler/checker.ts src/compiler/emitter.ts src/compiler/program.ts

Conflicts: src/compiler/checker.ts src/compiler/emitter.ts tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportInEs5.js tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImportWithExport.js tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingDts.js tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingInEs5.js tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamespaceBindingWithExport.js

Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json

vladima · 2015-03-16T22:09:22Z

src/compiler/emitter.ts

+
+                // ES6 import
+                if (node.importClause) {
+                    let shouldEmitDefaultBindings = node.importClause.name && resolver.isReferencedAliasDeclaration(node.importClause);


seems it should be isReferencedAliasDeclaration(node.importClause.name)

Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json

… name of an export default class

vladima · 2015-03-17T19:43:13Z

src/compiler/checker.ts

-                return "exports." + unescapeIdentifier(symbol.name);
+                var symbolName = unescapeIdentifier(symbol.name);
+                if (languageVersion >= ScriptTarget.ES6) {
+                    return symbolName;


can you add a comment why we don't prefix export name with 'exports.' when emitting for ES6+?

ES6 emit for new import / export syntax

mhegazy · 2015-03-17T21:17:17Z

@csnover this is now in master the declaration emit (#2139) should follow shortly.

mhegazy and others added 22 commits March 11, 2015 21:40

ES6 doesnt support import id = require("mod") syntax

e902d84

Conflicts: src/compiler/checker.ts src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json

Add tests

a6e4e04

Handel isDeclaration visible for imports

04ea7fe

Add tests

4ef687c

Simplify module kind selection

3ed8bcc

Fix the checks with language version to use default es3

4b75484

Remove references with exports.id as es6 module doesnt have exports.id

006ed82

Conflicts: tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js tests/baselines/reference/es6ImportNamedImport.js

Do not rewrite substitute named import reference when generating es6 …

29b2214

…modules Conflicts: src/compiler/checker.ts tests/baselines/reference/es6ImportDefaultBindingFollowedWithNamedImport.js tests/baselines/reference/es6ImportNamedImport.js

Es6 module emit for export VarDeclaration, export LexicalDeclaration

05932fd

Conflicts: src/compiler/emitter.ts tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js tests/baselines/reference/es6ImportNamedImport.js

Emit es6 export ModuleDeclaration

b9f63a8

Conflicts: src/compiler/emitter.ts tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js

Emit ES6 module enum declaration

58d1959

Conflicts: src/compiler/emitter.ts

Emit export function declaration in es6 format

b091fa5

Conflicts: src/compiler/emitter.ts

Emit export class declaration in es6 format.

6bcbe82

Note since we havent yet changed the emitting of class declaration to es6 format, we are just exporting the constructor function Conflicts: src/compiler/emitter.ts

Emit export internal import equals declaration in es6 format

680cf6d

Export * and export { names } emit in es6 format

fe9fff5

Conflicts: src/compiler/emitter.ts tests/baselines/reference/es6ExportAll.js tests/baselines/reference/es6ExportClause.js tests/baselines/reference/es6ExportClauseWithoutModuleSpecifier.js

Emit export default in ES6

b3c8bcb

Update error message

b6bbf06

Merge branch 'master' into es6ImportExportEmit

8e06265

msftclas added the cla-not-required label Mar 13, 2015

mhegazy mentioned this pull request Mar 13, 2015

Es6 module emit #2065

Closed

CyrusNajmabadi reviewed Mar 13, 2015
View reviewed changes

mhegazy added 5 commits March 15, 2015 15:48

Merge branch 'master' into es6ImportExportEmit

b6a6d85

Conflicts: src/compiler/checker.ts src/compiler/emitter.ts src/compiler/program.ts

Add tests

c877b1e

Merge branch 'master' into es6ImportExportEmit

090148f

Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json

Merge branch 'master' into es6ImportExportEmit

5845d2d

vladima reviewed Mar 16, 2015
View reviewed changes

mhegazy added 5 commits March 16, 2015 19:25

Respond to code review comments

eb954e1

Merge branch 'master' into es6ImportExportEmit

cb012e0

Conflicts: src/compiler/diagnosticInformationMap.generated.ts src/compiler/diagnosticMessages.json

Do not emit "export" for classes within modules, and do not write the…

9910869

… name of an export default class

Export classes defined wihtin internal modules correctelly

3d80243

Handel export name bindings in internal modules in ES6

1932f72

vladima reviewed Mar 17, 2015
View reviewed changes

mhegazy added 2 commits March 17, 2015 13:03

Add comments

766cb68

Merge branch 'master' into es6ImportExportEmit

a06ce61

mhegazy added a commit that referenced this pull request Mar 17, 2015

Merge pull request #2335 from Microsoft/es6ImportExportEmit

42a0c34

ES6 emit for new import / export syntax

mhegazy merged commit 42a0c34 into master Mar 17, 2015

mhegazy deleted the es6ImportExportEmit branch March 17, 2015 20:59

microsoft locked and limited conversation to collaborators Jun 18, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ES6 emit for new import / export syntax #2335

ES6 emit for new import / export syntax #2335

mhegazy commented Mar 13, 2015

CyrusNajmabadi Mar 13, 2015

mhegazy Mar 13, 2015

vladima Mar 16, 2015

vladima Mar 17, 2015

mhegazy Mar 17, 2015

mhegazy commented Mar 17, 2015

ES6 emit for new import / export syntax #2335

ES6 emit for new import / export syntax #2335

Conversation

mhegazy commented Mar 13, 2015

CyrusNajmabadi Mar 13, 2015

Choose a reason for hiding this comment

mhegazy Mar 13, 2015

Choose a reason for hiding this comment

vladima Mar 16, 2015

Choose a reason for hiding this comment

vladima Mar 17, 2015

Choose a reason for hiding this comment

mhegazy Mar 17, 2015

Choose a reason for hiding this comment

mhegazy commented Mar 17, 2015