Merge branch 'master' into es3

Author: saschanaz

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -16,7 +16,7 @@ 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.3.0-dev.201xxxxx
+**TypeScript Version:**  3.4.0-dev.201xxxxx
 
 <!-- Search terms you tried before logging this (so others can find this issue more easily) -->
 **Search Terms:**

.mailmap

@@ -121,6 +121,7 @@ Ken Howard <[email protected]>
 Kevin Lang  <[email protected]>
 kimamula <[email protected]> # Kenji Imamula
 Kitson Kelly  <[email protected]>
+Krishnadas Babu <[email protected]>
 Klaus Meinhardt  <[email protected]>
 Kyle Kelley <[email protected]>
 Lorant Pinter <[email protected]>

CONTRIBUTING.md

@@ -47,6 +47,16 @@ In general, things we find useful when reviewing suggestions are:
 
 # Instructions for Contributing Code
 
+## Tips
+
+### Faster clones
+
+The TypeScript repository is relatively large. To save some time, you might want to clone it without the repo's full history using `git clone --depth=1`.
+
+### Using local builds
+
+Run `gulp build` to build a version of the compiler/language service that reflects changes you've made. You can then run `node <repo-root>/built/local/tsc.js` in place of `tsc` in your project. For example, to run `tsc --watch` from within the root of the repository on a file called `test.ts`, you can run `node ./built/local/tsc.js --watch test.ts`.
+
 ## Contributing bug fixes
 
 TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.

Gulpfile.js

@@ -8,10 +8,8 @@ const path = require("path");
 const fold = require("travis-fold");
 const ts = require("./lib/typescript");
 const del = require("del");
-const getDirSize = require("./scripts/build/getDirSize");
+const { getDirSize, needsUpdate, flatten } = require("./scripts/build/utils");
 const { base64VLQFormatEncode } = require("./scripts/build/sourcemaps");
-const needsUpdate = require("./scripts/build/needsUpdate");
-const { flatten } = require("./scripts/build/project");
 
 // add node_modules to path so we don't need global modules, prefer the modules by adding them first
 var nodeModulesPathPrefix = path.resolve("./node_modules/.bin/") + path.delimiter;
@@ -25,6 +23,10 @@ else if (process.env.PATH !== undefined) {
 const host = process.env.TYPESCRIPT_HOST || process.env.host || "node";
 
 const defaultTestTimeout = 40000;
+const useBuilt =
+    process.env.USE_BUILT === "true" ? true :
+    process.env.LKG === "true" ? false :
+    false;
 
 let useDebugMode = true;
 
@@ -298,7 +300,7 @@ task(TaskNames.buildFoldEnd, [], function () {
 
 desc("Compiles tslint rules to js");
 task(TaskNames.buildRules, [], function () {
-    tsbuild(ConfigFileFor.lint, false, () => complete());
+    tsbuild(ConfigFileFor.lint, !useBuilt, () => complete());
 }, { async: true });
 
 desc("Cleans the compiler output, declare files, and tests");
@@ -361,7 +363,7 @@ file(ConfigFileFor.tsserverLibrary, [], function () {
         compilerOptions: {
             "removeComments": false,
             "stripInternal": true,
-            "declarationMap": false,
+            "declaration": true,
             "outFile": "tsserverlibrary.out.js"
         }
     })
@@ -370,7 +372,7 @@ file(ConfigFileFor.tsserverLibrary, [], function () {
 // tsserverlibrary.js
 // tsserverlibrary.d.ts
 file(Paths.tsserverLibraryFile, [TaskNames.coreBuild, ConfigFileFor.tsserverLibrary], function() {
-    tsbuild(ConfigFileFor.tsserverLibrary, false, () => {
+    tsbuild(ConfigFileFor.tsserverLibrary, !useBuilt, () => {
         if (needsUpdate([Paths.tsserverLibraryOutFile, Paths.tsserverLibraryDefinitionOutFile], [Paths.tsserverLibraryFile, Paths.tsserverLibraryDefinitionFile])) {
             const copyright = readFileSync(Paths.copyright);
 
@@ -429,7 +431,7 @@ file(ConfigFileFor.typescriptServices, [], function () {
 // typescriptServices.js
 // typescriptServices.d.ts
 file(Paths.servicesFile, [TaskNames.coreBuild, ConfigFileFor.typescriptServices], function() {
-    tsbuild(ConfigFileFor.typescriptServices, false, () => {
+    tsbuild(ConfigFileFor.typescriptServices, !useBuilt, () => {
         if (needsUpdate([Paths.servicesOutFile, Paths.servicesDefinitionOutFile], [Paths.servicesFile, Paths.servicesDefinitionFile])) {
             const copyright = readFileSync(Paths.copyright);
 

Jakefile.js

@@ -1,5 +1,5 @@
 [![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
-[![VSTS Build Status](https://typescript.visualstudio.com/_apis/public/build/definitions/cf7ac146-d525-443c-b23c-0d58337efebc/4/badge)](https://typescript.visualstudio.com/TypeScript/_build/latest?definitionId=4&view=logs) 
+[![VSTS Build Status](https://dev.azure.com/typescript/TypeScript/_apis/build/status/Typescript/node10)](https://dev.azure.com/typescript/TypeScript/_build/latest?definitionId=4&view=logs) 
 [![npm version](https://badge.fury.io/js/typescript.svg)](https://www.npmjs.com/package/typescript)
 [![Downloads](https://img.shields.io/npm/dm/typescript.svg)](https://www.npmjs.com/package/typescript)
 

README.md

@@ -239,7 +239,7 @@ TypeScript is a trademark of Microsoft Corporation.
 
 # <a name="1"/>1 Introduction
 
-JavaScript applications such as web e-mail, maps, document editing, and collaboration tools are becoming an increasingly important part of the everyday computing. We designed TypeScript to meet the needs of the JavaScript programming teams that build and maintain large JavaScript programs. TypeScript helps programming teams to define interfaces between software components and to gain insight into the behavior of existing JavaScript libraries. TypeScript also enables teams to reduce naming conflicts by organizing their code into dynamically-loadable modules. TypeScript's optional type system enables JavaScript programmers to use highly-productive development tools and practices: static checking, symbol-based navigation, statement completion, and code re-factoring.
+JavaScript applications such as web e-mail, maps, document editing, and collaboration tools are becoming an increasingly important part of the everyday computing. We designed TypeScript to meet the needs of the JavaScript programming teams that build and maintain large JavaScript programs. TypeScript helps programming teams to define interfaces between software components and to gain insight into the behavior of existing JavaScript libraries. TypeScript also enables teams to reduce naming conflicts by organizing their code into dynamically-loadable modules. TypeScript's optional type system enables JavaScript programmers to use highly-productive development tools and practices: static checking, symbol-based navigation, statement completion, and code refactoring.
 
 TypeScript is a syntactic sugar for JavaScript. TypeScript syntax is a superset of ECMAScript 2015 (ES2015) syntax. Every JavaScript program is also a TypeScript program. The TypeScript compiler performs only file-local transformations on TypeScript programs and does not re-order variables declared in TypeScript. This leads to JavaScript output that closely matches the TypeScript input. TypeScript does not transform variable names, making tractable the direct debugging of emitted JavaScript. TypeScript optionally provides source maps, enabling source-level debugging. TypeScript tools typically emit JavaScript upon file save, preserving the test, edit, refresh cycle commonly used in JavaScript development.
 
@@ -263,7 +263,7 @@ function f() {
 }
 ```
 
-To benefit from this inference, a programmer can use the TypeScript language service. For example, a code editor can incorporate the TypeScript language service and use the service to find the members of a string object as in the following screen shot.
+To benefit from this inference, a programmer can use the TypeScript language service. For example, a code editor can incorporate the TypeScript language service and use the service to find the members of a string object as in the following screenshot.
 
 &emsp;&emsp;![](images/image1.png)
 
@@ -411,7 +411,7 @@ We mentioned above that the '$' function behaves differently depending on the ty
 
 This signature denotes that a function may be passed as the parameter of the '$' function. When a function is passed to '$', the jQuery library will invoke that function when a DOM document is ready. Because TypeScript supports overloading, tools can use TypeScript to show all available function signatures with their documentation tips and to give the correct documentation once a function has been called with a particular signature.
 
-A typical client would not need to add any additional typing but could just use a community-supplied typing to discover (through statement completion with documentation tips) and verify (through static checking) correct use of the library, as in the following screen shot.
+A typical client would not need to add any additional typing but could just use a community-supplied typing to discover (through statement completion with documentation tips) and verify (through static checking) correct use of the library, as in the following screenshot.
 
 &emsp;&emsp;![](images/image2.png)
 
@@ -628,7 +628,7 @@ JavaScript implementations can use these explicit constants to generate efficien
 
 An important goal of TypeScript is to provide accurate and straightforward types for existing JavaScript programming patterns. To that end, TypeScript includes generic types, discussed in the next section, and *overloading on string parameters*, the topic of this section.
 
-JavaScript programming interfaces often include functions whose behavior is discriminated by a string constant passed to the function. The Document Object Model makes heavy use of this pattern. For example, the following screen shot shows that the 'createElement' method of the 'document' object has multiple signatures, some of which identify the types returned when specific strings are passed into the method.
+JavaScript programming interfaces often include functions whose behavior is discriminated by a string constant passed to the function. The Document Object Model makes heavy use of this pattern. For example, the following screenshot shows that the 'createElement' method of the 'document' object has multiple signatures, some of which identify the types returned when specific strings are passed into the method.
 
 &emsp;&emsp;![](images/image3.png)
 
@@ -639,7 +639,7 @@ var span = document.createElement("span");
 span.isMultiLine = false;  // OK: HTMLSpanElement has isMultiline property
 ```
 
-In the following screen shot, a programming tool combines information from overloading on string parameters with contextual typing to infer that the type of the variable 'e' is 'MouseEvent' and that therefore 'e' has a 'clientX' property.
+In the following screenshot, a programming tool combines information from overloading on string parameters with contextual typing to infer that the type of the variable 'e' is 'MouseEvent' and that therefore 'e' has a 'clientX' property.
 
 &emsp;&emsp;![](images/image4.png)
 
@@ -3715,7 +3715,7 @@ the array literal initializer expression is contextually typed by the implied ty
 
 ## <a name="5.3"/>5.3 Let and Const Declarations
 
-Let and const declarations are exended to include optional type annotations.
+Let and const declarations are extended to include optional type annotations.
 
 &emsp;&emsp;*LexicalBinding:*  *( Modified )*  
 &emsp;&emsp;&emsp;*SimpleLexicalBinding*  

doc/spec.md

@@ -1046,14 +1046,14 @@ interface JSON {
       * @param reviver A function that transforms the results. This function is called for each member of the object.
       * If a member contains nested objects, the nested objects are transformed before the parent object is.
       */
-    parse(text: string, reviver?: (key: any, value: any) => any): any;
+    parse(text: string, reviver?: (this: any, key: string, value: any) => any): any;
     /**
       * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
       * @param value A JavaScript value, usually an object or array, to be converted.
       * @param replacer A function that transforms the results.
       * @param space Adds indentation, white space, and line break characters to the return-value JSON text to make it easier to read.
       */
-    stringify(value: any, replacer?: (key: string, value: any) => any, space?: string | number): string;
+    stringify(value: any, replacer?: (this: any, key: string, value: any) => any, space?: string | number): string;
     /**
       * Converts a JavaScript value to a JavaScript Object Notation (JSON) string.
       * @param value A JavaScript value, usually an object or array, to be converted.

lib/lib.es5.d.ts

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "3.3.0",
+    "version": "3.4.0",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -35,10 +35,8 @@
         "@types/convert-source-map": "latest",
         "@types/del": "latest",
         "@types/glob": "latest",
-        "@types/gulp": "3.X",
+        "@types/gulp": "^4.0.5",
         "@types/gulp-concat": "latest",
-        "@types/gulp-help": "latest",
-        "@types/gulp-if": "0.0.33",
         "@types/gulp-newer": "latest",
         "@types/gulp-rename": "0.0.33",
         "@types/gulp-sourcemaps": "0.0.32",
@@ -50,7 +48,6 @@
         "@types/mocha": "latest",
         "@types/node": "8.5.5",
         "@types/q": "latest",
-        "@types/run-sequence": "latest",
         "@types/source-map-support": "latest",
         "@types/through2": "latest",
         "@types/travis-fold": "latest",
@@ -63,16 +60,12 @@
         "del": "latest",
         "fancy-log": "latest",
         "fs-extra": "^6.0.1",
-        "gulp": "3.X",
-        "gulp-clone": "latest",
+        "gulp": "^4.0.0",
         "gulp-concat": "latest",
-        "gulp-help": "latest",
-        "gulp-if": "latest",
         "gulp-insert": "latest",
         "gulp-newer": "latest",
         "gulp-rename": "latest",
         "gulp-sourcemaps": "latest",
-        "gulp-typescript": "latest",
         "istanbul": "latest",
         "jake": "latest",
         "lodash": "4.17.10",
@@ -86,7 +79,6 @@
         "prex": "^0.4.3",
         "q": "latest",
         "remove-internal": "^2.9.2",
-        "run-sequence": "latest",
         "source-map-support": "latest",
         "through2": "latest",
         "travis-fold": "latest",

package.json

@@ -4,7 +4,7 @@ import child_process = require("child_process");
 
 type Author = {
     displayNames: string[];
-    preferedName?: string;
+    preferredName?: string;
     emails: string[];
 };
 
@@ -20,7 +20,7 @@ const authorsPath = path.resolve("../AUTHORS.md");
 
 function getKnownAuthors(): Author[] {
     const segmentRegExp = /\s?([^<]+)\s+<([^>]+)>/g;
-    const preferedNameRegeExp = /\s?#\s?([^#]+)$/;
+    const preferredNameRegeExp = /\s?#\s?([^#]+)$/;
     const knownAuthors: Author[] = [];
 
     if (!fs.existsSync(mailMapPath)) {
@@ -37,13 +37,13 @@ function getKnownAuthors(): Author[] {
             author.displayNames.push(match[1]);
             author.emails.push(match[2]);
         }
-        if (match = preferedNameRegeExp.exec(line)) {
-            author.preferedName = match[1];
+        if (match = preferredNameRegeExp.exec(line)) {
+            author.preferredName = match[1];
         }
         if (!author.emails) continue;
         knownAuthors.push(author);
-        if (line.indexOf("#") > 0 && !author.preferedName) {
-            throw new Error("Could not match prefered name for: " + line);
+        if (line.indexOf("#") > 0 && !author.preferredName) {
+            throw new Error("Could not match preferred name for: " + line);
         }
         // console.log("===> line: " + line);
         // console.log(JSON.stringify(author, undefined, 2));
@@ -52,7 +52,7 @@ function getKnownAuthors(): Author[] {
 }
 
 function getAuthorName(author: Author) {
-    return author.preferedName || author.displayNames[0];
+    return author.preferredName || author.displayNames[0];
 }
 
 function getKnownAuthorMaps() {

scripts/authors.ts

@@ -5,7 +5,7 @@
 import cp = require('child_process');
 import fs = require('fs');
 
-// Slice off 'node bisect-test.js' from the commandline args
+// Slice off 'node bisect-test.js' from the command line args
 var args = process.argv.slice(2);
 
 function tsc(tscArgs: string, onExit: (exitCode: number) => void) {

scripts/bisect-test.ts

@@ -1,12 +1,10 @@
 // @ts-check
 const browserify = require("browserify");
-const Vinyl = require("./vinyl");
+const Vinyl = require("vinyl");
 const { Transform } = require("stream");
 const { streamFromFile } = require("./utils");
 const { replaceContents } = require("./sourcemaps");
 
-module.exports = browserifyFile;
-
 /**
  * @param {import("browserify").Options} [opts]
  */
@@ -31,4 +29,5 @@ function browserifyFile(opts) {
             }
         }
     });
-}
+}
+exports.browserify = browserifyFile;