Merge branch 'master' into errorInFileWithDeepImport

Author: sheetalkamat

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -16,10 +16,10 @@ Please fill in the *entire* template below.
 -->
 
 <!-- Please try to reproduce the issue with `typescript@next`. It may have already been fixed. -->
-**TypeScript Version:**  3.0.0-dev.201xxxxx
+**TypeScript Version:**  3.1.0-dev.201xxxxx
 
 <!-- Search terms you tried before logging this (so others can find this issue more easily) -->
-**Search Terms:** 
+**Search Terms:**
 
 **Code**
 
@@ -32,6 +32,6 @@ Please fill in the *entire* template below.
 
 **Actual behavior:**
 
-**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior --> 
+**Playground Link:** <!-- A link to a TypeScript Playground "Share" link which demonstrates this behavior -->
 
 **Related Issues:** <!-- Did you find other bugs that looked similar? -->

.mailmap

@@ -163,7 +163,7 @@ Rostislav Galimsky  <[email protected]>
 Richard Knoll <[email protected]> Richard Knoll <[email protected]>
 Richard Karmazín  <[email protected]>
 Rowan Wyborn <[email protected]>
-Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]>
+Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh <[email protected]> Ryan Cavanaugh  <[email protected]>
 Ryohei Ikegami <[email protected]>
 Sarangan Rajamanickam <[email protected]>
 Sébastien Arod <[email protected]>
@@ -340,4 +340,22 @@ EcoleKeine  <[email protected]> # Ecole Keine
 Khải  <[email protected]>
 rhysd  <[email protected]> # @rhysd
 Zen  <[email protected]> Zzzen  <[email protected]> # @Zzzen
-bluelovers  <[email protected]> # @bluelovers
+bluelovers  <[email protected]> # @bluelovers
+Dan Freeman  <[email protected]>
+David Sherret  <[email protected]>
+David Staheli  <[email protected]>
+Elizabeth Dinella  <[email protected]>
+John Doe  <[email protected]>
+Kevin Gibbons  <[email protected]>
+Markus Johnsson  <[email protected]>
+Martin Probst  <[email protected]>
+Mateusz Burzyński  <[email protected]>
+Steven  <[email protected]> # @styfle
+Pi Lanningham  <[email protected]>
+Sam Bostock  <[email protected]>
+Vimal Raghubir  <[email protected]>
+Vyacheslav Pukhanov  <[email protected]>
+dangoo  <[email protected]> # Daniel Gooss
+krk  <[email protected]> # Kerem Kat
+micnic  <[email protected]> # Nicu Micleușanu
+rflorian  <[email protected]> # @rflorian

.npmignore

@@ -19,8 +19,10 @@ Jakefile.js
 .circleci
 .vscode/
 .parallelperf.json
+.mailmap
 test.config
 package-lock.json
 yarn.lock
 .github/
 CONTRIBUTING.md
+TEST-results.xml

.travis.yml

@@ -19,6 +19,7 @@ branches:
   - release-2.7
   - release-2.8
   - release-2.9
+  - release-3.0
 
 install:
   - npm uninstall typescript --no-save

AUTHORS.md

@@ -74,15 +74,19 @@ TypeScript is authored by:
 * Dafrok Zhang
 * Dahan Gong
 * Dan Corder
+* Dan Freeman 
 * Dan Quirk
+* Daniel Gooss
 * Daniel Hollocher
 * Daniel Król 
 * Daniel Lehenbauer
 * Daniel Rosenwasser
 * David Kmenta
 * David Li
 * David Sheldrick 
+* David Sherret 
 * David Souther
+* David Staheli 
 * Denis Nedelyaev
 * Derek P Sifford 
 * Dhruv Rajvanshi 
@@ -96,6 +100,7 @@ TypeScript is authored by:
 * @e-cloud
 * Ecole Keine
 * Elisée Maurer
+* Elizabeth Dinella 
 * Emilio García-Pumarino
 * Eric Grube 
 * Eric Tsang
@@ -161,6 +166,7 @@ TypeScript is authored by:
 * Joel Day 
 * Joey Wilson
 * Johannes Rieken
+* John Doe 
 * John Vilk
 * Jonathan Bond-Caron
 * Jonathan Park
@@ -184,7 +190,9 @@ TypeScript is authored by:
 * Keith Mashinter
 * Ken Howard
 * Kenji Imamula
+* Kerem Kat
 * Kevin Donnelly 
+* Kevin Gibbons 
 * Kevin Lang 
 * Khải 
 * Kitson Kelly 
@@ -201,10 +209,13 @@ TypeScript is authored by:
 * Manish Giri
 * Marin Marinov
 * Marius Schulz 
+* Markus Johnsson 
 * Martin Hiller 
+* Martin Probst 
 * Martin Vseticka
 * Martyn Janes 
 * Masahiro Wakame
+* Mateusz Burzyński 
 * Matt Bierner 
 * Matt McCutchen
 * Matt Mitchell 
@@ -223,10 +234,10 @@ TypeScript is authored by:
 * Mohamed Hegazy
 * Mohsen Azimi 
 * Myles Megyesi 
-* Natalie Coley
 * Nathan Shively-Sanders
 * Nathan Yee
 * Nicolas Henry
+* Nicu Micleușanu
 * @nieltg
 * Nima Zahedi
 * Noah Chen 
@@ -248,6 +259,7 @@ TypeScript is authored by:
 * Peter Burns
 * Philip Bulley
 * Philippe Voinov 
+* Pi Lanningham 
 * Piero Cangianiello
 * @piloopin
 * Prayag Verma
@@ -270,6 +282,7 @@ TypeScript is authored by:
 * Rowan Wyborn
 * Ryan Cavanaugh
 * Ryohei Ikegami
+* Sam Bostock 
 * Sam El-Husseini 
 * Sarangan Rajamanickam
 * Sean Barag 
@@ -290,6 +303,7 @@ TypeScript is authored by:
 * Stas Vilchik 
 * Stephan Ginthör 
 * Steve Lucco
+* @styfle
 * Sudheesh Singanamalla 
 * Sébastien Arod
 * @T18970237136
@@ -316,8 +330,10 @@ TypeScript is authored by:
 * Vidar Tonaas Fauske
 * Viktor Zozulyak
 * Vilic Vane
+* Vimal Raghubir 
 * Vladimir Kurchatkin 
 * Vladimir Matveev
+* Vyacheslav Pukhanov 
 * Wenlu Wang 
 * Wesley Wigham
 * William Orr 

CONTRIBUTING.md

@@ -61,7 +61,7 @@ Design changes will not be accepted at this time. If you have a design change pr
 
 You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
 
-Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. 
+Please submit a Contributor License Agreement (CLA) before submitting a pull request. You may visit https://cla.microsoft.com to sign digitally. Alternatively, download the agreement ([Microsoft Contribution License Agreement.pdf](https://opensource.microsoft.com/pdf/microsoft-contribution-license-agreement.pdf)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. 
 
 ## Housekeeping
 

Jakefile.js

@@ -51,7 +51,8 @@ const TaskNames = {
     configureInsiders: "configure-insiders",
     publishInsiders: "publish-insiders",
     configureNightly: "configure-nightly",
-    publishNightly: "publish-nightly"
+    publishNightly: "publish-nightly",
+    help: "help"
 };
 
 const Paths = {};
@@ -258,6 +259,11 @@ task(TaskNames.publishNightly, [TaskNames.coreBuild, TaskNames.configureNightly,
     exec(cmd, () => complete());
 }, { async: true });
 
+task(TaskNames.help, function() {
+    var cmd = "jake --tasks";
+    exec(cmd, () => complete());
+})
+
 task(TaskNames.configureInsiders, [TaskNames.scripts], function () {
     const cmd = `${host} ${Paths.scripts.configurePrerelease} insiders ${Paths.packageJson} ${Paths.versionFile}`;
     exec(cmd, () => complete());
@@ -817,7 +823,7 @@ function diagnosticsToString(diagnostics, pretty) {
  * Concatenate a list of sourceFiles to a destinationFile
  * @param {string} destinationFile
  * @param {string[]} sourceFiles
- * @param {string} extraContent
+ * @param {string=} extraContent
  */
 function concatenateFiles(destinationFile, sourceFiles, extraContent) {
     var temp = "temptemp";

package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "http://typescriptlang.org/",
-    "version": "3.0.0",
+    "version": "3.1.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [

src/compiler/binder.ts

@@ -225,11 +225,11 @@ namespace ts {
             node.symbol = symbol;
             symbol.declarations = append(symbol.declarations, node);
 
-            if (symbolFlags & SymbolFlags.HasExports && !symbol.exports) {
+            if (symbolFlags & (SymbolFlags.Class | SymbolFlags.Enum | SymbolFlags.Module | SymbolFlags.Variable) && !symbol.exports) {
                 symbol.exports = createSymbolTable();
             }
 
-            if (symbolFlags & SymbolFlags.HasMembers && !symbol.members) {
+            if (symbolFlags & (SymbolFlags.Class | SymbolFlags.Interface | SymbolFlags.TypeLiteral | SymbolFlags.ObjectLiteral) && !symbol.members) {
                 symbol.members = createSymbolTable();
             }
 
@@ -306,7 +306,7 @@ namespace ts {
         }
 
         function getDisplayName(node: Declaration): string {
-            return isNamedDeclaration(node) ? declarationNameToString(node.name) : unescapeLeadingUnderscores(getDeclarationName(node)!); // TODO: GH#18217
+            return isNamedDeclaration(node) ? declarationNameToString(node.name) : unescapeLeadingUnderscores(Debug.assertDefined(getDeclarationName(node)));
         }
 
         /**
@@ -383,9 +383,11 @@ namespace ts {
                         let message = symbol.flags & SymbolFlags.BlockScopedVariable
                             ? Diagnostics.Cannot_redeclare_block_scoped_variable_0
                             : Diagnostics.Duplicate_identifier_0;
+                        let messageNeedsName = true;
 
                         if (symbol.flags & SymbolFlags.Enum || includes & SymbolFlags.Enum) {
                             message = Diagnostics.Enum_declarations_can_only_merge_with_namespace_or_other_enum_declarations;
+                            messageNeedsName = false;
                         }
 
                         if (symbol.declarations && symbol.declarations.length) {
@@ -394,6 +396,7 @@ namespace ts {
                             // We'll know whether we have other default exports depending on if `symbol` already has a declaration list set.
                             if (isDefaultExport) {
                                 message = Diagnostics.A_module_cannot_have_multiple_default_exports;
+                                messageNeedsName = false;
                             }
                             else {
                                 // This is to properly report an error in the case "export default { }" is after export default of class declaration or function declaration.
@@ -403,14 +406,16 @@ namespace ts {
                                 if (symbol.declarations && symbol.declarations.length &&
                                     (node.kind === SyntaxKind.ExportAssignment && !(<ExportAssignment>node).isExportEquals)) {
                                     message = Diagnostics.A_module_cannot_have_multiple_default_exports;
+                                    messageNeedsName = false;
                                 }
                             }
                         }
 
-                        forEach(symbol.declarations, declaration => {
-                            file.bindDiagnostics.push(createDiagnosticForNode(getNameOfDeclaration(declaration) || declaration, message, getDisplayName(declaration)));
-                        });
-                        file.bindDiagnostics.push(createDiagnosticForNode(getNameOfDeclaration(node) || node, message, getDisplayName(node)));
+                        const addError = (decl: Declaration): void => {
+                            file.bindDiagnostics.push(createDiagnosticForNode(getNameOfDeclaration(decl) || decl, message, messageNeedsName ? getDisplayName(decl) : undefined));
+                        };
+                        forEach(symbol.declarations, addError);
+                        addError(node);
 
                         symbol = createSymbol(SymbolFlags.None, name);
                     }
@@ -1913,6 +1918,15 @@ namespace ts {
             }
         }
 
+        function checkStrictModeLabeledStatement(node: LabeledStatement) {
+            // Grammar checking for labeledStatement
+            if (inStrictMode && options.target! >= ScriptTarget.ES2015) {
+                if (isDeclarationStatement(node.statement) || isVariableStatement(node.statement)) {
+                    errorOnFirstToken(node.label, Diagnostics.A_label_is_not_allowed_here);
+                }
+            }
+        }
+
         function errorOnFirstToken(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any) {
             const span = getSpanOfTokenAtPosition(file, node.pos);
             file.bindDiagnostics.push(createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
@@ -2058,6 +2072,13 @@ namespace ts {
                     if (isSpecialPropertyDeclaration(node as PropertyAccessExpression)) {
                         bindSpecialPropertyDeclaration(node as PropertyAccessExpression);
                     }
+                    if (isInJavaScriptFile(node) &&
+                        file.commonJsModuleIndicator &&
+                        isModuleExportsPropertyAccessExpression(node as PropertyAccessExpression) &&
+                        !lookupSymbolForNameWorker(container, "module" as __String)) {
+                        declareSymbol(container.locals!, /*parent*/ undefined, (node as PropertyAccessExpression).expression as Identifier,
+                            SymbolFlags.FunctionScopedVariable | SymbolFlags.ModuleExports, SymbolFlags.FunctionScopedVariableExcludes);
+                    }
                     break;
                 case SyntaxKind.BinaryExpression:
                     const specialKind = getSpecialPropertyAssignmentKind(node as BinaryExpression);
@@ -2099,6 +2120,8 @@ namespace ts {
                     return checkStrictModePrefixUnaryExpression(<PrefixUnaryExpression>node);
                 case SyntaxKind.WithStatement:
                     return checkStrictModeWithStatement(<WithStatement>node);
+                case SyntaxKind.LabeledStatement:
+                    return checkStrictModeLabeledStatement(<LabeledStatement>node);
                 case SyntaxKind.ThisType:
                     seenThisKeyword = true;
                     return;