Skip to content

Commit 61a5bfb

Browse files
mhegazymhegazy
committed
Report error on export assignment with es6 and above target
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
1 parent e902d84 commit 61a5bfb

7 files changed

Lines changed: 38 additions & 1 deletion

File tree

‎src/compiler/checker.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9940,6 +9940,11 @@ module ts {
99409940
checkExpressionCached(node.expression);
99419941
}
99429942
checkExternalModuleExports(container);
9943+
9944+
if (compilerOptions.target >= ScriptTarget.ES6) {
9945+
// export assignment is deprecated in es6 or above
9946+
grammarErrorOnNode(node, Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_export_default_instead);
9947+
}
99439948
}
99449949

99459950
function getModuleStatements(node: Declaration): ModuleElement[] {

‎src/compiler/diagnosticInformationMap.generated.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ module ts {
158158
An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: DiagnosticCategory.Error, key: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
159159
Unterminated_Unicode_escape_sequence: { code: 1199, category: DiagnosticCategory.Error, key: "Unterminated Unicode escape sequence." },
160160
Import_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_import_Asterisk_from_mod_import_a_from_mod_or_import_d_from_mod_instead: { code: 1200, category: DiagnosticCategory.Error, key: "Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * from \"mod\"', 'import {a} from \"mod\"' or 'import d from \"mod\"' instead." },
161+
Export_assignment_cannot_be_used_when_targeting_ECMAScript_6_or_higher_Consider_using_export_default_instead: { code: 1201, category: DiagnosticCategory.Error, key: "Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead." },
161162
Duplicate_identifier_0: { code: 2300, category: DiagnosticCategory.Error, key: "Duplicate identifier '{0}'." },
162163
Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: DiagnosticCategory.Error, key: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
163164
Static_members_cannot_reference_class_type_parameters: { code: 2302, category: DiagnosticCategory.Error, key: "Static members cannot reference class type parameters." },

‎src/compiler/diagnosticMessages.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,6 +623,10 @@
623623
"category": "Error",
624624
"code": 1200
625625
},
626+
"Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.": {
627+
"category": "Error",
628+
"code": 1201
629+
},
626630

627631
"Duplicate identifier '{0}'.": {
628632
"category": "Error",

‎tests/baselines/reference/es6ExportAssignment.errors.txt‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
tests/cases/compiler/es6ExportAssignment.ts(3,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
2+
tests/cases/compiler/es6ExportAssignment.ts(3,1): error TS1201: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.
3+
4+
5+
==== tests/cases/compiler/es6ExportAssignment.ts (2 errors) ====
6+
7+
var a = 10;
8+
export = a;
9+
~~~~~~~~~~~
10+
!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
11+
~~~~~~~~~~~
12+
!!! error TS1201: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.

‎tests/baselines/reference/es6ExportAssignment.js‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//// [es6ExportAssignment.ts]
2+
3+
var a = 10;
4+
export = a;
5+
6+
//// [es6ExportAssignment.js]
7+
var a = 10;
8+
module.exports = a;

‎tests/baselines/reference/es6ImportEqualsDeclaration.errors.txt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
11
tests/cases/compiler/client.ts(1,1): error TS1200: Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * from "mod"', 'import {a} from "mod"' or 'import d from "mod"' instead.
22
tests/cases/compiler/server.ts(3,1): error TS1148: Cannot compile external modules unless the '--module' flag is provided.
3+
tests/cases/compiler/server.ts(3,1): error TS1201: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.
34

45

56
==== tests/cases/compiler/client.ts (1 errors) ====
67
import a = require("server");
78
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
89
!!! error TS1200: Import assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'import * from "mod"', 'import {a} from "mod"' or 'import d from "mod"' instead.
9-
==== tests/cases/compiler/server.ts (1 errors) ====
10+
==== tests/cases/compiler/server.ts (2 errors) ====
1011

1112
var a = 10;
1213
export = a;
1314
~~~~~~~~~~~
1415
!!! error TS1148: Cannot compile external modules unless the '--module' flag is provided.
16+
~~~~~~~~~~~
17+
!!! error TS1201: Export assignment cannot be used when targeting ECMAScript 6 or higher. Consider using 'export default' instead.
1518

‎tests/cases/compiler/es6ExportAssignment.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// @target: es6
2+
3+
var a = 10;
4+
export = a;

0 commit comments

Comments
 (0)